From 405a247c2c0b83f45fd3d42bf00edf67a349acb9 Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <m.bruker@digitalmedia.de>
Date: Sun, 20 Dec 2009 16:55:19 +0100
Subject: [PATCH] updated german translation

---
 cockatrice/src/dlg_cardsearch.h          |    1 +
 cockatrice/translations/cockatrice_de.ts | 1171 ++++++++++++++------
 cockatrice/translations/cockatrice_en.ts | 1259 +++++++++++++---------
 3 files changed, 1601 insertions(+), 830 deletions(-)

diff --git a/cockatrice/src/dlg_cardsearch.h b/cockatrice/src/dlg_cardsearch.h
index 86073fe0..43f8fee3 100644
--- a/cockatrice/src/dlg_cardsearch.h
+++ b/cockatrice/src/dlg_cardsearch.h
@@ -9,6 +9,7 @@ class QLineEdit;
 class QCheckBox;
 
 class DlgCardSearch : public QDialog {
+	Q_OBJECT
 private:
 	QLineEdit *cardNameEdit, *cardTextEdit;
 	QList<QCheckBox *> cardTypeCheckBoxes, cardColorCheckBoxes;
diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts
index e22d3014..4f886b4b 100644
--- a/cockatrice/translations/cockatrice_de.ts
+++ b/cockatrice/translations/cockatrice_de.ts
@@ -27,49 +27,49 @@
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="270"/>
+        <location filename="../src/dlg_settings.cpp" line="271"/>
         <source>Zone background pictures</source>
         <translation>Hintergrundbilder für Kartenzonen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="271"/>
+        <location filename="../src/dlg_settings.cpp" line="272"/>
         <source>Path to hand background:</source>
         <translation>Hintergrundbild für die Hand:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="272"/>
+        <location filename="../src/dlg_settings.cpp" line="273"/>
         <source>Path to table background:</source>
         <translation>Hintergrundbild für das Spielfeld:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="273"/>
+        <location filename="../src/dlg_settings.cpp" line="274"/>
         <source>Path to player info background:</source>
         <translation>Hintergrundbild für den Spielerbereich:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="275"/>
+        <location filename="../src/dlg_settings.cpp" line="276"/>
         <source>Table grid layout</source>
         <translation>Spielfeldraster</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="276"/>
+        <location filename="../src/dlg_settings.cpp" line="277"/>
         <source>Economic layout</source>
         <translation>Platzsparende Anordnung</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="278"/>
+        <location filename="../src/dlg_settings.cpp" line="279"/>
         <source>Zone view layout</source>
         <translation>Aussehen des Zonenbetrachters</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="279"/>
+        <location filename="../src/dlg_settings.cpp" line="280"/>
         <source>Sort alphabetically by default</source>
         <translation>standardmäßig alphabetisch sortieren</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="284"/>
-        <location filename="../src/dlg_settings.cpp" line="297"/>
-        <location filename="../src/dlg_settings.cpp" line="310"/>
+        <location filename="../src/dlg_settings.cpp" line="285"/>
+        <location filename="../src/dlg_settings.cpp" line="298"/>
+        <location filename="../src/dlg_settings.cpp" line="311"/>
         <source>Choose path</source>
         <translation>Pfad auswählen</translation>
     </message>
@@ -105,22 +105,22 @@
 <context>
     <name>CardInfoWidget</name>
     <message>
-        <location filename="../src/cardinfowidget.cpp" line="103"/>
+        <location filename="../src/cardinfowidget.cpp" line="106"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../src/cardinfowidget.cpp" line="104"/>
+        <location filename="../src/cardinfowidget.cpp" line="107"/>
         <source>Mana cost:</source>
         <translation>Manakosten:</translation>
     </message>
     <message>
-        <location filename="../src/cardinfowidget.cpp" line="105"/>
+        <location filename="../src/cardinfowidget.cpp" line="108"/>
         <source>Card type:</source>
         <translation>Kartentyp:</translation>
     </message>
     <message>
-        <location filename="../src/cardinfowidget.cpp" line="106"/>
+        <location filename="../src/cardinfowidget.cpp" line="109"/>
         <source>P / T:</source>
         <translation>S/W:</translation>
     </message>
@@ -249,36 +249,59 @@
 <context>
     <name>ChannelWidget</name>
     <message>
-        <location filename="../src/chatwidget.cpp" line="47"/>
         <source>%1 has joined the channel.</source>
-        <translation>%1 hat den Raum betreten.</translation>
+        <translation type="obsolete">%1 hat den Raum betreten.</translation>
     </message>
     <message>
-        <location filename="../src/chatwidget.cpp" line="58"/>
         <source>%1 has left the channel.</source>
-        <translation>%1 hat den Raum verlassen.</translation>
+        <translation type="obsolete">%1 hat den Raum verlassen.</translation>
+    </message>
+</context>
+<context>
+    <name>ChatChannelSelector</name>
+    <message>
+        <location filename="../src/tab_server.cpp" line="139"/>
+        <source>Chat channels</source>
+        <translation>Chaträume</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_server.cpp" line="140"/>
+        <source>Joi&amp;n</source>
+        <translation>Teil&amp;nehmen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_server.cpp" line="143"/>
+        <source>Channel</source>
+        <translation>Raum</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_server.cpp" line="144"/>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_server.cpp" line="145"/>
+        <source>Players</source>
+        <translation>Spieler</translation>
     </message>
 </context>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../src/chatwidget.cpp" line="105"/>
         <source>Joi&amp;n</source>
-        <translation>Teil&amp;nehmen</translation>
+        <translation type="obsolete">Teil&amp;nehmen</translation>
     </message>
     <message>
-        <location filename="../src/chatwidget.cpp" line="108"/>
         <source>Channel</source>
-        <translation>Raum</translation>
+        <translation type="obsolete">Raum</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
-        <location filename="../src/chatwidget.cpp" line="109"/>
         <source>Players</source>
-        <translation>Spielerzahl</translation>
+        <translation type="obsolete">Spielerzahl</translation>
     </message>
 </context>
 <context>
@@ -317,34 +340,77 @@
 <context>
     <name>DeckList</name>
     <message>
-        <location filename="../src/decklist.cpp" line="316"/>
         <source>Load deck</source>
-        <translation>Deck laden</translation>
+        <translation type="obsolete">Deck laden</translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="341"/>
         <source>Save deck</source>
-        <translation>Deck speichern</translation>
+        <translation type="obsolete">Deck speichern</translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="383"/>
         <source>Caching card pictures...</source>
-        <translation>Kartenbilder werden gecached...</translation>
+        <translation type="obsolete">Kartenbilder werden gecached...</translation>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../src/decklistmodel.cpp" line="145"/>
+        <location filename="../src/decklistmodel.cpp" line="148"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../src/decklistmodel.cpp" line="146"/>
+        <location filename="../src/decklistmodel.cpp" line="149"/>
         <source>Card</source>
         <translation>Karte</translation>
     </message>
 </context>
+<context>
+    <name>Deck_PictureCacher</name>
+    <message>
+        <location filename="../src/deck_picturecacher.cpp" line="23"/>
+        <source>Caching card pictures...</source>
+        <translation>Kartenbilder werden vorgeladen...</translation>
+    </message>
+</context>
+<context>
+    <name>DlgCardSearch</name>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <source>Card name:</source>
+        <translation>Kartenname:</translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <source>Card text:</source>
+        <translation>Kartentext:</translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <source>Card type (OR):</source>
+        <translation>Kartentyp (ODER):</translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <source>Color (OR):</source>
+        <translation>Farbe (ODER):</translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <source>O&amp;K</source>
+        <translation>O&amp;K</translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <source>Card search</source>
+        <translation>Kartensuche</translation>
+    </message>
+</context>
 <context>
     <name>DlgConnect</name>
     <message>
@@ -386,53 +452,53 @@
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="7"/>
+        <location filename="../src/dlg_creategame.cpp" line="8"/>
         <source>&amp;Description:</source>
         <translation>&amp;Beschreibung:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="11"/>
+        <location filename="../src/dlg_creategame.cpp" line="12"/>
         <source>&amp;Password:</source>
         <translation>&amp;Passwort:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="15"/>
+        <location filename="../src/dlg_creategame.cpp" line="16"/>
         <source>P&amp;layers:</source>
         <translation>&amp;Spieler:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="19"/>
+        <location filename="../src/dlg_creategame.cpp" line="20"/>
         <source>&amp;Spectators allowed</source>
         <translation>&amp;Zuschauer zugelassen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="31"/>
+        <location filename="../src/dlg_creategame.cpp" line="32"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="33"/>
+        <location filename="../src/dlg_creategame.cpp" line="34"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbruch</translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="46"/>
+        <location filename="../src/dlg_creategame.cpp" line="47"/>
         <source>Create game</source>
         <translation>Spiel erstellen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="58"/>
-        <location filename="../src/dlg_creategame.cpp" line="75"/>
+        <location filename="../src/dlg_creategame.cpp" line="59"/>
+        <location filename="../src/dlg_creategame.cpp" line="78"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="58"/>
+        <location filename="../src/dlg_creategame.cpp" line="59"/>
         <source>Invalid number of players.</source>
         <translation>Ungültige Anzahl an Spielern.</translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="75"/>
+        <location filename="../src/dlg_creategame.cpp" line="78"/>
         <source>Server error.</source>
         <translation>Serverfehler.</translation>
     </message>
@@ -468,30 +534,48 @@
         <translation type="obsolete">Mitteilung hinzufügen</translation>
     </message>
 </context>
+<context>
+    <name>DlgLoadRemoteDeck</name>
+    <message>
+        <location filename="../src/dlg_load_remote_deck.cpp" line="13"/>
+        <source>O&amp;K</source>
+        <translation>O&amp;K</translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_load_remote_deck.cpp" line="17"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_load_remote_deck.cpp" line="30"/>
+        <source>Load deck</source>
+        <translation>Deck laden</translation>
+    </message>
+</context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="491"/>
+        <location filename="../src/dlg_settings.cpp" line="492"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="493"/>
+        <location filename="../src/dlg_settings.cpp" line="494"/>
         <source>General</source>
         <translation>Allgemeines</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="494"/>
+        <location filename="../src/dlg_settings.cpp" line="495"/>
         <source>Appearance</source>
         <translation>Erscheinungsbild</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="495"/>
+        <location filename="../src/dlg_settings.cpp" line="496"/>
         <source>Messages</source>
         <translation>Nachrichten</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="497"/>
+        <location filename="../src/dlg_settings.cpp" line="498"/>
         <source>&amp;Close</source>
         <translation>S&amp;chließen</translation>
     </message>
@@ -499,19 +583,16 @@
 <context>
     <name>DlgStartGame</name>
     <message>
-        <location filename="../src/dlg_startgame.cpp" line="15"/>
         <source>&amp;Load...</source>
-        <translation>&amp;Laden...</translation>
+        <translation type="obsolete">&amp;Laden...</translation>
     </message>
     <message>
-        <location filename="../src/dlg_startgame.cpp" line="16"/>
         <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
+        <translation type="obsolete">&amp;OK</translation>
     </message>
     <message>
-        <location filename="../src/dlg_startgame.cpp" line="30"/>
         <source>Start game</source>
-        <translation>Spiel starten</translation>
+        <translation type="obsolete">Spiel starten</translation>
     </message>
 </context>
 <context>
@@ -589,79 +670,64 @@
         <translation type="obsolete">Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="106"/>
         <source>&amp;Game</source>
-        <translation>Spi&amp;el</translation>
+        <translation type="obsolete">Spi&amp;el</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="107"/>
         <source>Next &amp;phase</source>
-        <translation>Nächste &amp;Phase</translation>
+        <translation type="obsolete">Nächste &amp;Phase</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="108"/>
         <source>Ctrl+Space</source>
-        <translation>Ctrl+Space</translation>
+        <translation type="obsolete">Ctrl+Space</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="109"/>
         <source>Next &amp;turn</source>
-        <translation>Nächster &amp;Zug</translation>
+        <translation type="obsolete">Nächster &amp;Zug</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="110"/>
         <source>Ctrl+Enter</source>
-        <translation>Ctrl+Enter</translation>
+        <translation type="obsolete">Ctrl+Enter</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="110"/>
         <source>Ctrl+Return</source>
-        <translation>Ctrl+Return</translation>
+        <translation type="obsolete">Ctrl+Return</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="111"/>
         <source>&amp;Remove all local arrows</source>
-        <translation>&amp;Lokale Pfeile entfernen</translation>
+        <translation type="obsolete">&amp;Lokale Pfeile entfernen</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="112"/>
         <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <translation type="obsolete">Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="114"/>
         <source>C&amp;ard</source>
-        <translation>&amp;Karte</translation>
+        <translation type="obsolete">&amp;Karte</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="122"/>
         <source>&amp;top of library</source>
-        <translation>&amp;auf die Bibliothek</translation>
+        <translation type="obsolete">&amp;auf die Bibliothek</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="123"/>
         <source>&amp;bottom of library</source>
-        <translation>&amp;unter die Bibliothek</translation>
+        <translation type="obsolete">&amp;unter die Bibliothek</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="124"/>
         <source>&amp;graveyard</source>
-        <translation>in den &amp;Friedhof</translation>
+        <translation type="obsolete">in den &amp;Friedhof</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="125"/>
         <source>Ctrl+Del</source>
-        <translation>Ctrl+Del</translation>
+        <translation type="obsolete">Ctrl+Del</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="126"/>
         <source>&amp;exile</source>
-        <translation>ins &amp;Exil</translation>
+        <translation type="obsolete">ins &amp;Exil</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="128"/>
         <source>&amp;Move to</source>
-        <translation>&amp;Verschieben</translation>
+        <translation type="obsolete">&amp;Verschieben</translation>
     </message>
     <message>
         <source>&amp;Edit messages...</source>
@@ -672,39 +738,32 @@
         <translation type="obsolete">&amp;Sagen</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="115"/>
         <source>&amp;Tap</source>
-        <translation>&amp;Tappen</translation>
+        <translation type="obsolete">&amp;Tappen</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="116"/>
         <source>&amp;Untap</source>
-        <translation>E&amp;nttappen</translation>
+        <translation type="obsolete">E&amp;nttappen</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="117"/>
         <source>Toggle &amp;normal untapping</source>
-        <translation>&amp;Normales enttappen umschalten</translation>
+        <translation type="obsolete">&amp;Normales enttappen umschalten</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="118"/>
         <source>&amp;Flip</source>
-        <translation>&amp;Umdrehen</translation>
+        <translation type="obsolete">&amp;Umdrehen</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="119"/>
         <source>&amp;Add counter</source>
-        <translation>Zählm&amp;arke hinzufügen</translation>
+        <translation type="obsolete">Zählm&amp;arke hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="120"/>
         <source>&amp;Remove counter</source>
-        <translation>Zählma&amp;rke entfernen</translation>
+        <translation type="obsolete">Zählma&amp;rke entfernen</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="121"/>
         <source>&amp;Set counters...</source>
-        <translation>&amp;Setze Zählmarken...</translation>
+        <translation type="obsolete">&amp;Setze Zählmarken...</translation>
     </message>
     <message>
         <source>&amp;Rearrange</source>
@@ -755,9 +814,8 @@
         <translation type="obsolete">Karten ziehen</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="499"/>
         <source>Number:</source>
-        <translation>Anzahl:</translation>
+        <translation type="obsolete">Anzahl:</translation>
     </message>
     <message>
         <source>Create token</source>
@@ -776,28 +834,27 @@
         <translation type="obsolete">Name:</translation>
     </message>
     <message>
-        <location filename="../src/game.cpp" line="499"/>
         <source>Set counters</source>
-        <translation>Setze Zählmarke</translation>
+        <translation type="obsolete">Setze Zählmarke</translation>
     </message>
 </context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="../src/gameselector.cpp" line="116"/>
+        <location filename="../src/tab_server.cpp" line="103"/>
         <source>C&amp;reate</source>
         <translation>Spiel e&amp;rstellen</translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="117"/>
+        <location filename="../src/tab_server.cpp" line="104"/>
         <source>&amp;Join</source>
         <translation>&amp;Teilnehmen</translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="62"/>
-        <location filename="../src/gameselector.cpp" line="63"/>
-        <location filename="../src/gameselector.cpp" line="64"/>
-        <location filename="../src/gameselector.cpp" line="65"/>
+        <location filename="../src/tab_server.cpp" line="66"/>
+        <location filename="../src/tab_server.cpp" line="67"/>
+        <location filename="../src/tab_server.cpp" line="68"/>
+        <location filename="../src/tab_server.cpp" line="69"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
@@ -806,42 +863,47 @@
         <translation type="obsolete">XXX</translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="62"/>
+        <location filename="../src/tab_server.cpp" line="66"/>
         <source>Wrong password.</source>
         <translation>Falsches Passwort.</translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="63"/>
+        <location filename="../src/tab_server.cpp" line="67"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>In diesem Spiel sind keine Zuschauer zugelassen.</translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="64"/>
+        <location filename="../src/tab_server.cpp" line="68"/>
         <source>The game is already full.</source>
         <translation>Das Spiel ist bereits voll.</translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="65"/>
+        <location filename="../src/tab_server.cpp" line="69"/>
         <source>The game does not exist any more.</source>
         <translation>Dieses Spiel gibt es nicht mehr.</translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="81"/>
+        <location filename="../src/tab_server.cpp" line="85"/>
         <source>Join game</source>
         <translation>Spiel beitreten</translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="81"/>
+        <location filename="../src/tab_server.cpp" line="85"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="115"/>
+        <location filename="../src/tab_server.cpp" line="101"/>
+        <source>Games</source>
+        <translation>Spiele</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_server.cpp" line="102"/>
         <source>&amp;Show full games</source>
         <translation>&amp;Volle Spiele anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="118"/>
+        <location filename="../src/tab_server.cpp" line="105"/>
         <source>J&amp;oin as spectator</source>
         <translation>&amp;Zuschauen</translation>
     </message>
@@ -849,12 +911,12 @@
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="24"/>
+        <location filename="../src/gamesmodel.cpp" line="30"/>
         <source>yes</source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="24"/>
+        <location filename="../src/gamesmodel.cpp" line="30"/>
         <source>no</source>
         <translation>nein</translation>
     </message>
@@ -863,32 +925,32 @@
         <translation type="obsolete">Spiel ID</translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="37"/>
+        <location filename="../src/gamesmodel.cpp" line="43"/>
         <source>Creator</source>
         <translation>Ersteller</translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="36"/>
+        <location filename="../src/gamesmodel.cpp" line="42"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="26"/>
+        <location filename="../src/gamesmodel.cpp" line="32"/>
         <source>not allowed</source>
         <translation>nicht erlaubt</translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="38"/>
+        <location filename="../src/gamesmodel.cpp" line="44"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="39"/>
+        <location filename="../src/gamesmodel.cpp" line="45"/>
         <source>Players</source>
         <translation>Spieler</translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="40"/>
+        <location filename="../src/gamesmodel.cpp" line="46"/>
         <source>Spectators</source>
         <translation>Zuschauer</translation>
     </message>
@@ -896,51 +958,51 @@
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="114"/>
-        <location filename="../src/dlg_settings.cpp" line="125"/>
-        <location filename="../src/dlg_settings.cpp" line="138"/>
-        <location filename="../src/dlg_settings.cpp" line="151"/>
+        <location filename="../src/dlg_settings.cpp" line="115"/>
+        <location filename="../src/dlg_settings.cpp" line="126"/>
+        <location filename="../src/dlg_settings.cpp" line="139"/>
+        <location filename="../src/dlg_settings.cpp" line="152"/>
         <source>Choose path</source>
         <translation>Pfad auswählen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="182"/>
+        <location filename="../src/dlg_settings.cpp" line="183"/>
         <source>Personal settings</source>
         <translation>Persönliche Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="183"/>
+        <location filename="../src/dlg_settings.cpp" line="184"/>
         <source>Language:</source>
         <translation>Sprache:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="184"/>
+        <location filename="../src/dlg_settings.cpp" line="185"/>
         <source>Download card pictures on the fly</source>
         <translation>Kartenbilder dynamisch herunterladen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="185"/>
+        <location filename="../src/dlg_settings.cpp" line="186"/>
         <source>Paths</source>
         <translation>Pfade</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="186"/>
+        <location filename="../src/dlg_settings.cpp" line="187"/>
         <source>Decks directory:</source>
         <translation>Verzeichnis mit Decklisten:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="187"/>
+        <location filename="../src/dlg_settings.cpp" line="188"/>
         <source>Pictures directory:</source>
         <translation>Verzeichnis mit Bilddateien:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="188"/>
+        <location filename="../src/dlg_settings.cpp" line="189"/>
         <source>Path to card database:</source>
         <translation>Pfad zur Kartendatenbank:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="21"/>
-        <location filename="../src/dlg_settings.cpp" line="109"/>
+        <location filename="../src/dlg_settings.cpp" line="22"/>
+        <location filename="../src/dlg_settings.cpp" line="110"/>
         <source>English</source>
         <translation>Deutsch</translation>
     </message>
@@ -948,77 +1010,105 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/window_main.cpp" line="206"/>
+        <location filename="../src/window_main.cpp" line="104"/>
+        <location filename="../src/window_main.cpp" line="110"/>
+        <location filename="../src/window_main.cpp" line="117"/>
+        <location filename="../src/window_main.cpp" line="122"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="206"/>
+        <location filename="../src/window_main.cpp" line="104"/>
         <source>Server timeout</source>
         <translation>Server Zeitüberschreitung</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="213"/>
+        <location filename="../src/window_main.cpp" line="110"/>
+        <source>Invalid login data.</source>
+        <translation>Ungültige Anmeldedaten.</translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="117"/>
+        <source>Socket error: %1</source>
+        <translation>Netzwerkfehler: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="122"/>
+        <source>Protocol version mismatch. Local version: %1, remote version: %2.</source>
+        <translation>Protokollversionen stimmen nicht überein. Lokale Version: %1, Serverversion: %2.</translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="128"/>
+        <source>Connecting to %1...</source>
+        <translation>Verbinde zu %1...</translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="129"/>
+        <source>Disconnected</source>
+        <translation>nicht verbunden</translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="130"/>
+        <source>Logged in at %1</source>
+        <translation>Angemeldet bei %1</translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="139"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Verbinden...</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="214"/>
+        <location filename="../src/window_main.cpp" line="140"/>
         <source>&amp;Disconnect</source>
         <translation>Verbindung &amp;trennen</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="215"/>
         <source>&amp;Restart game...</source>
-        <translation>Spiel neu sta&amp;rten...</translation>
+        <translation type="obsolete">Spiel neu sta&amp;rten...</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="216"/>
         <source>F2</source>
-        <translation>F2</translation>
+        <translation type="obsolete">F2</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="217"/>
         <source>&amp;Leave game</source>
-        <translation>Spiel ver&amp;lassen</translation>
+        <translation type="obsolete">Spiel ver&amp;lassen</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="218"/>
+        <location filename="../src/window_main.cpp" line="141"/>
         <source>&amp;Deck editor</source>
         <translation>&amp;Deck-Editor</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="219"/>
+        <location filename="../src/window_main.cpp" line="142"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Vollbild</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="220"/>
+        <location filename="../src/window_main.cpp" line="143"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="221"/>
+        <location filename="../src/window_main.cpp" line="144"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="222"/>
+        <location filename="../src/window_main.cpp" line="145"/>
         <source>&amp;Exit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="223"/>
         <source>Close most recent zone view</source>
-        <translation>Letzte Zonenansicht schließen</translation>
+        <translation type="obsolete">Letzte Zonenansicht schließen</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="224"/>
         <source>Esc</source>
-        <translation>Esc</translation>
+        <translation type="obsolete">Esc</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="226"/>
+        <location filename="../src/window_main.cpp" line="147"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
@@ -1035,56 +1125,51 @@
         <translation type="obsolete">&amp;Karte</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="228"/>
         <source>&amp;Say:</source>
-        <translation>&amp;Sagen:</translation>
+        <translation type="obsolete">&amp;Sagen:</translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="211"/>
         <source>Cockatrice</source>
-        <translation>Cockatrice</translation>
+        <translation type="obsolete">Cockatrice</translation>
     </message>
 </context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="17"/>
+        <location filename="../src/messagelogwidget.cpp" line="16"/>
         <source>Connecting to %1...</source>
         <translation>Verbinde zu %1...</translation>
     </message>
     <message>
+        <location filename="../src/messagelogwidget.cpp" line="21"/>
         <source>Connected.</source>
-        <translation type="obsolete">Verbunden.</translation>
+        <translation>Verbunden.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="27"/>
+        <location filename="../src/messagelogwidget.cpp" line="26"/>
         <source>Disconnected from server.</source>
         <translation>Verbindung zum Server getrennt.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="38"/>
+        <location filename="../src/messagelogwidget.cpp" line="37"/>
         <source>Invalid password.</source>
         <translation>Ungültiges Passwort.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="56"/>
         <source>You have joined the game. Player list:</source>
-        <translation>Du bist dem Spiel beigetreten. Spielerliste:</translation>
+        <translation type="obsolete">Du bist dem Spiel beigetreten. Spielerliste:</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="64"/>
         <source>%1 has joined the game</source>
-        <translation>%1 ist dem Spiel beigetreten</translation>
+        <translation type="obsolete">%1 ist dem Spiel beigetreten</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="69"/>
         <source>%1 has left the game</source>
-        <translation>%1 hat das Spiel verlassen</translation>
+        <translation type="obsolete">%1 hat das Spiel verlassen</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="89"/>
         <source>%1 is ready to start a new game.</source>
-        <translation>%1 ist bereit ein neues Spiel zu starten.</translation>
+        <translation type="obsolete">%1 ist bereit ein neues Spiel zu starten.</translation>
     </message>
     <message>
         <source>Game has started.</source>
@@ -1107,7 +1192,7 @@
         <translation type="obsolete">%1 zieht %2 Karten</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="180"/>
+        <location filename="../src/messagelogwidget.cpp" line="188"/>
         <source>a card</source>
         <translation>eine Karte</translation>
     </message>
@@ -1164,12 +1249,12 @@
         <translation type="obsolete">%1s Sideboard</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="94"/>
+        <location filename="../src/messagelogwidget.cpp" line="102"/>
         <source>The game has started.</source>
         <translation>Das Spiel hat begonnen.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="104"/>
+        <location filename="../src/messagelogwidget.cpp" line="112"/>
         <source>%1 shuffles his library.</source>
         <translation>%1 mischt seine Bibliothek.</translation>
     </message>
@@ -1178,152 +1263,190 @@
         <translation type="obsolete">%1 würfelt eine %2 mit einem %3-seitigen Würfel.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="22"/>
         <source>Connected: %1</source>
-        <translation>Verbunden: %1</translation>
+        <translation type="obsolete">Verbunden: %1</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="45"/>
         <source>Protocol version mismatch.</source>
-        <translation>Protokollversion stimmt nicht überein.</translation>
+        <translation type="obsolete">Protokollversion stimmt nicht überein.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="50"/>
+        <location filename="../src/messagelogwidget.cpp" line="44"/>
+        <source>Protocol version mismatch. Client: %1, Server: %2</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="49"/>
         <source>Protocol error.</source>
         <translation>Protokollfehler.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="74"/>
+        <location filename="../src/messagelogwidget.cpp" line="54"/>
+        <source>You have joined game #%1.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="59"/>
+        <source>%1 has joined the game.</source>
+        <translation>%1 ist dem Spiel beigetreten.</translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="64"/>
+        <source>%1 has left the game.</source>
+        <translation>%1 hat das Spiel verlassen.</translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="69"/>
         <source>The game has been closed.</source>
         <translation>Das Spiel wurde geschlossen.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="79"/>
+        <location filename="../src/messagelogwidget.cpp" line="74"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 schaut nun dem Spiel zu.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="84"/>
+        <location filename="../src/messagelogwidget.cpp" line="79"/>
         <source>%1 is not watching the game any more.</source>
         <translation>%1 schaut dem Spiel nicht mehr zu.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="109"/>
+        <location filename="../src/messagelogwidget.cpp" line="85"/>
+        <source>%1 has loaded a local deck.</source>
+        <translation>%1 hat ein lokales Deck geladen.</translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="87"/>
+        <source>%1 has loaded deck #%2.</source>
+        <translation>%1 hat das Deck Nr. %2 geladen.</translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="92"/>
+        <source>%1 is ready to start the game.</source>
+        <translation>%1 ist bereit, das Spiel zu starten.</translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="97"/>
+        <source>%1 has conceded the game.</source>
+        <translation>%1 hat das Spiel aufgegeben.</translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="117"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 würfelt eine %2 mit einem %3-seitigen Würfel.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="115"/>
+        <location filename="../src/messagelogwidget.cpp" line="123"/>
         <source>%1 draws a card.</source>
         <translation>%1 zieht eine Karte.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="117"/>
+        <location filename="../src/messagelogwidget.cpp" line="125"/>
         <source>%1 draws %2 cards.</source>
         <translation>%1 zieht %2 Karten.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="130"/>
+        <location filename="../src/messagelogwidget.cpp" line="138"/>
         <source> from table</source>
         <translation> vom Spielfeld</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="132"/>
+        <location filename="../src/messagelogwidget.cpp" line="140"/>
         <source> from graveyard</source>
         <translation> aus dem Friedhof</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="134"/>
+        <location filename="../src/messagelogwidget.cpp" line="142"/>
         <source> from exile</source>
         <translation> aus dem Exil</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="136"/>
+        <location filename="../src/messagelogwidget.cpp" line="144"/>
         <source> from hand</source>
         <translation> von der Hand</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="140"/>
+        <location filename="../src/messagelogwidget.cpp" line="148"/>
         <source>the bottom card of his library</source>
         <translation>die unterste Karte seiner Bibliothek</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="143"/>
+        <location filename="../src/messagelogwidget.cpp" line="151"/>
         <source> from the bottom of his library</source>
         <translation>, die unterste Karte seiner Bibliothek,</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="146"/>
+        <location filename="../src/messagelogwidget.cpp" line="154"/>
         <source>the top card of his library</source>
         <translation>die oberste Karte seiner Bibliothek</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="149"/>
+        <location filename="../src/messagelogwidget.cpp" line="157"/>
         <source> from the top of his library</source>
         <translation>, die oberste Karte seiner Bibliothek,</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="151"/>
+        <location filename="../src/messagelogwidget.cpp" line="159"/>
         <source> from library</source>
         <translation> aus der Bibliothek</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="153"/>
+        <location filename="../src/messagelogwidget.cpp" line="161"/>
         <source> from sideboard</source>
         <translation> aus dem Sideboard</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="157"/>
+        <location filename="../src/messagelogwidget.cpp" line="165"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 bringt %2%3 ins Spiel.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="159"/>
+        <location filename="../src/messagelogwidget.cpp" line="167"/>
         <source>%1 puts %2%3 into graveyard.</source>
         <translation>%1 legt %2%3 auf den Friedhof.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="161"/>
+        <location filename="../src/messagelogwidget.cpp" line="169"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 schickt %2%3 ins Exil.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="163"/>
+        <location filename="../src/messagelogwidget.cpp" line="171"/>
         <source>%1 moves %2%3 to hand.</source>
         <translation>%1 nimmt %2%3 auf die Hand.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="166"/>
+        <location filename="../src/messagelogwidget.cpp" line="174"/>
         <source>%1 puts %2%3 into his library.</source>
         <translation>%1 legt %2%3 in seine Bibliothek.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="168"/>
+        <location filename="../src/messagelogwidget.cpp" line="176"/>
         <source>%1 puts %2%3 on bottom of his library.</source>
         <translation>%1 legt %2%3 unter seine Bibliothek.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="170"/>
+        <location filename="../src/messagelogwidget.cpp" line="178"/>
         <source>%1 puts %2%3 on top of his library.</source>
         <translation>%1 legt %2%3 auf die Bibliothek.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="172"/>
+        <location filename="../src/messagelogwidget.cpp" line="180"/>
         <source>%1 puts %2%3 into his library at position %4.</source>
         <translation>%1 legt %2%3 in seine Bibliothek an %4. Stelle.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="174"/>
+        <location filename="../src/messagelogwidget.cpp" line="182"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 legt %2%3 in sein Sideboard.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="194"/>
+        <location filename="../src/messagelogwidget.cpp" line="202"/>
         <source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source>
         <translation>%1 zeigt von %2s %3 auf %4s %5.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="241"/>
+        <location filename="../src/messagelogwidget.cpp" line="249"/>
         <source>%1 is looking at the top %2 cards %3.</source>
         <translation>%1 sieht sich die obersten %2 Karten %3 an.</translation>
     </message>
@@ -1408,27 +1531,27 @@
         <translation type="obsolete">%1 legt %2%3in sein Sideboard.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="189"/>
+        <location filename="../src/messagelogwidget.cpp" line="197"/>
         <source>%1 creates token: %2.</source>
         <translation>%1 erstellt Token: %2.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="207"/>
+        <location filename="../src/messagelogwidget.cpp" line="215"/>
         <source>%1 places %2 counters on %3 (now %4).</source>
         <translation>%1 legt %2 Zählmarken auf %3 (jetzt %4).</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="209"/>
+        <location filename="../src/messagelogwidget.cpp" line="217"/>
         <source>%1 removes %2 counters from %3 (now %4).</source>
         <translation>%1 entfernt %2 Zählmarken von %3 (jetzt %4).</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="220"/>
+        <location filename="../src/messagelogwidget.cpp" line="228"/>
         <source>%1 %2 %3.</source>
         <translation>%1 %2 %3.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="225"/>
+        <location filename="../src/messagelogwidget.cpp" line="233"/>
         <source>%1 sets counter &quot;%2&quot; to %3 (%4%5).</source>
         <translation>%1 setzt Zählmarke &quot;%2&quot; auf %3 (%4%5).</translation>
     </message>
@@ -1437,17 +1560,17 @@
         <translation type="obsolete">%1 sieht sich die obersten %2 Karten %3 an.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="243"/>
+        <location filename="../src/messagelogwidget.cpp" line="251"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 sieht sich %2 an.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="249"/>
+        <location filename="../src/messagelogwidget.cpp" line="257"/>
         <source>%1 stops looking at %2.</source>
         <translation>%1 sieht sich %2 nicht mehr an.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="273"/>
+        <location filename="../src/messagelogwidget.cpp" line="281"/>
         <source>ending phase</source>
         <translation>die Zugendphase</translation>
     </message>
@@ -1476,57 +1599,57 @@
         <translation type="obsolete">%1 sieht sich %2s %3 nicht mehr an</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="255"/>
+        <location filename="../src/messagelogwidget.cpp" line="263"/>
         <source>It is now %1&apos;s turn.</source>
         <translation>%1 ist am Zug.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="263"/>
+        <location filename="../src/messagelogwidget.cpp" line="271"/>
         <source>untap step</source>
         <translation>das Enttappsegment</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="264"/>
+        <location filename="../src/messagelogwidget.cpp" line="272"/>
         <source>upkeep step</source>
         <translation>das Versorgungssegment</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="265"/>
+        <location filename="../src/messagelogwidget.cpp" line="273"/>
         <source>draw step</source>
         <translation>das Ziehsegment</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="266"/>
+        <location filename="../src/messagelogwidget.cpp" line="274"/>
         <source>first main phase</source>
         <translation>die erste Hauptphase</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="267"/>
+        <location filename="../src/messagelogwidget.cpp" line="275"/>
         <source>beginning of combat step</source>
         <translation>das Anfangssegment der Kampfphase</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="268"/>
+        <location filename="../src/messagelogwidget.cpp" line="276"/>
         <source>declare attackers step</source>
         <translation>das Angreifer-Deklarieren-Segment</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="269"/>
+        <location filename="../src/messagelogwidget.cpp" line="277"/>
         <source>declare blockers step</source>
         <translation>das Blocker-Deklarieren-Segment</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="270"/>
+        <location filename="../src/messagelogwidget.cpp" line="278"/>
         <source>combat damage step</source>
         <translation>das Kampfschadenssegment</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="271"/>
+        <location filename="../src/messagelogwidget.cpp" line="279"/>
         <source>end of combat step</source>
         <translation>das Endsegment der Kampfphase</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="272"/>
+        <location filename="../src/messagelogwidget.cpp" line="280"/>
         <source>second main phase</source>
         <translation>die zweite Hauptphase</translation>
     </message>
@@ -1535,7 +1658,7 @@
         <translation type="obsolete">das Ende-des-Zuges-Segment</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="275"/>
+        <location filename="../src/messagelogwidget.cpp" line="283"/>
         <source>It is now the %1.</source>
         <translation>Es ist nun %1.</translation>
     </message>
@@ -1544,12 +1667,12 @@
         <translation type="obsolete">%1 bewegt %2 %3 nach %4</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="220"/>
+        <location filename="../src/messagelogwidget.cpp" line="228"/>
         <source>taps</source>
         <translation>tappt</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="220"/>
+        <location filename="../src/messagelogwidget.cpp" line="228"/>
         <source>untaps</source>
         <translation>enttappt</translation>
     </message>
@@ -1574,7 +1697,7 @@
         <translation type="obsolete">%1 entfernt %2 Zählmarken von %3 (jetzt %4)</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="217"/>
+        <location filename="../src/messagelogwidget.cpp" line="225"/>
         <source>his permanents</source>
         <translation>seine bleibenden Karten</translation>
     </message>
@@ -1587,12 +1710,12 @@
         <translation type="obsolete">%1 setzt Zähler &quot;%2&quot; auf %3 (%4%5)</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="232"/>
+        <location filename="../src/messagelogwidget.cpp" line="240"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 setzt %2 auf explizites Enttappen.</translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="234"/>
+        <location filename="../src/messagelogwidget.cpp" line="242"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 setzt %2 auf normales Enttappen.</translation>
     </message>
@@ -1608,12 +1731,12 @@
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="396"/>
+        <location filename="../src/dlg_settings.cpp" line="397"/>
         <source>&amp;Add</source>
         <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="397"/>
+        <location filename="../src/dlg_settings.cpp" line="398"/>
         <source>&amp;Remove</source>
         <translation>&amp;Entfernen</translation>
     </message>
@@ -1626,12 +1749,12 @@
         <translation type="obsolete">Entfernen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="379"/>
+        <location filename="../src/dlg_settings.cpp" line="380"/>
         <source>Add message</source>
         <translation>Nachricht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="379"/>
+        <location filename="../src/dlg_settings.cpp" line="380"/>
         <source>Message:</source>
         <translation>Nachricht:</translation>
     </message>
@@ -1639,57 +1762,57 @@
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="114"/>
+        <location filename="../src/phasestoolbar.cpp" line="115"/>
         <source>Untap step</source>
         <translation>Enttappsegment</translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="115"/>
+        <location filename="../src/phasestoolbar.cpp" line="116"/>
         <source>Upkeep step</source>
         <translation>Versorgungssegment</translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="116"/>
+        <location filename="../src/phasestoolbar.cpp" line="117"/>
         <source>Draw step</source>
         <translation>Ziehsegment</translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="117"/>
+        <location filename="../src/phasestoolbar.cpp" line="118"/>
         <source>First main phase</source>
         <translation>erste Hauptphase</translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="118"/>
+        <location filename="../src/phasestoolbar.cpp" line="119"/>
         <source>Beginning of combat step</source>
         <translation>Anfangssegment der Kampfphase</translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="119"/>
+        <location filename="../src/phasestoolbar.cpp" line="120"/>
         <source>Declare attackers step</source>
         <translation>Angreifer-Deklarieren-Segment</translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="120"/>
+        <location filename="../src/phasestoolbar.cpp" line="121"/>
         <source>Declare blockers step</source>
         <translation>Blocker-Deklarieren-Segment</translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="121"/>
+        <location filename="../src/phasestoolbar.cpp" line="122"/>
         <source>Combat damage step</source>
         <translation>Kampfschadenssegment</translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="122"/>
+        <location filename="../src/phasestoolbar.cpp" line="123"/>
         <source>End of combat step</source>
         <translation>Endsegment der Kampfphase</translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="123"/>
+        <location filename="../src/phasestoolbar.cpp" line="124"/>
         <source>Second main phase</source>
         <translation>zweite Hauptphase</translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="124"/>
+        <location filename="../src/phasestoolbar.cpp" line="125"/>
         <source>End of turn step</source>
         <translation>Ende-des-Zuges-Segment</translation>
     </message>
@@ -1697,41 +1820,41 @@
 <context>
     <name>Player</name>
     <message>
-        <location filename="../src/player.cpp" line="228"/>
-        <location filename="../src/player.cpp" line="232"/>
-        <location filename="../src/player.cpp" line="236"/>
+        <location filename="../src/player.cpp" line="284"/>
+        <location filename="../src/player.cpp" line="288"/>
+        <location filename="../src/player.cpp" line="292"/>
         <source>Move to &amp;top of library</source>
         <translation>Oben auf die Biblio&amp;thek legen</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="229"/>
-        <location filename="../src/player.cpp" line="233"/>
-        <location filename="../src/player.cpp" line="237"/>
+        <location filename="../src/player.cpp" line="285"/>
+        <location filename="../src/player.cpp" line="289"/>
+        <location filename="../src/player.cpp" line="293"/>
         <source>Move to &amp;bottom of library</source>
         <translation>Unter die &amp;Bibliothek legen</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="240"/>
+        <location filename="../src/player.cpp" line="296"/>
         <source>&amp;View library</source>
         <translation>&amp;Zeige Bibliothek</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="241"/>
+        <location filename="../src/player.cpp" line="297"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="242"/>
+        <location filename="../src/player.cpp" line="298"/>
         <source>View &amp;top cards of library...</source>
         <translation>Zeige die oberen Kar&amp;ten der Bibliothek...</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="221"/>
+        <location filename="../src/player.cpp" line="277"/>
         <source>&amp;View graveyard</source>
         <translation>&amp;Zeige Friedhof</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="243"/>
+        <location filename="../src/player.cpp" line="299"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
@@ -1740,32 +1863,32 @@
         <translation type="obsolete">Zeige ent&amp;fernte Karten</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="244"/>
+        <location filename="../src/player.cpp" line="300"/>
         <source>&amp;View sideboard</source>
         <translation>Zeige &amp;Sideboard</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="223"/>
+        <location filename="../src/player.cpp" line="279"/>
         <source>Player &quot;%1&quot;</source>
         <translation>Spieler &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="249"/>
+        <location filename="../src/player.cpp" line="305"/>
         <source>Take &amp;mulligan</source>
         <translation>&amp;Mulligan nehmen</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="254"/>
+        <location filename="../src/player.cpp" line="310"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="256"/>
+        <location filename="../src/player.cpp" line="312"/>
         <source>&amp;Library</source>
         <translation>Bib&amp;liothek</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="224"/>
+        <location filename="../src/player.cpp" line="280"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Friedhof</translation>
     </message>
@@ -1774,65 +1897,65 @@
         <translation type="obsolete">Entfe&amp;rnte Karten</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="255"/>
+        <location filename="../src/player.cpp" line="311"/>
         <source>&amp;Sideboard</source>
         <translation>&amp;Sideboard</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="305"/>
+        <location filename="../src/player.cpp" line="377"/>
         <source>View top cards of library</source>
         <translation>Zeige die obersten Karten der Bibliothek</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="305"/>
+        <location filename="../src/player.cpp" line="377"/>
         <source>Number of cards:</source>
         <translation>Anzahl der Karten:</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="245"/>
+        <location filename="../src/player.cpp" line="301"/>
         <source>&amp;Draw card</source>
         <translation>Karte &amp;ziehen</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="222"/>
+        <location filename="../src/player.cpp" line="278"/>
         <source>&amp;View exile</source>
         <translation>&amp;Zeige Exil</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="225"/>
+        <location filename="../src/player.cpp" line="281"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="234"/>
-        <location filename="../src/player.cpp" line="238"/>
+        <location filename="../src/player.cpp" line="290"/>
+        <location filename="../src/player.cpp" line="294"/>
         <source>Move to &amp;hand</source>
         <translation>auf die &amp;Hand nehmen</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="230"/>
-        <location filename="../src/player.cpp" line="239"/>
+        <location filename="../src/player.cpp" line="286"/>
+        <location filename="../src/player.cpp" line="295"/>
         <source>Move to g&amp;raveyard</source>
         <translation>auf den &amp;Friedhof legen</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="231"/>
-        <location filename="../src/player.cpp" line="235"/>
+        <location filename="../src/player.cpp" line="287"/>
+        <location filename="../src/player.cpp" line="291"/>
         <source>Move to &amp;exile</source>
         <translation>ins &amp;Exil schicken</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="246"/>
+        <location filename="../src/player.cpp" line="302"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="247"/>
+        <location filename="../src/player.cpp" line="303"/>
         <source>D&amp;raw cards...</source>
         <translation>Ka&amp;rten ziehen...</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="248"/>
+        <location filename="../src/player.cpp" line="304"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
@@ -1841,32 +1964,32 @@
         <translation type="obsolete">&amp;Mulligan nehmen...</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="250"/>
+        <location filename="../src/player.cpp" line="306"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="251"/>
+        <location filename="../src/player.cpp" line="307"/>
         <source>&amp;Shuffle</source>
         <translation>Mi&amp;schen</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="252"/>
+        <location filename="../src/player.cpp" line="308"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="257"/>
+        <location filename="../src/player.cpp" line="313"/>
         <source>&amp;Counters</source>
         <translation>&amp;Zähler</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="259"/>
+        <location filename="../src/player.cpp" line="315"/>
         <source>&amp;Untap all permanents</source>
         <translation>&amp;Enttappe alle bleibenden Karten</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="260"/>
+        <location filename="../src/player.cpp" line="316"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
@@ -1895,70 +2018,146 @@
         <translation type="obsolete">Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="261"/>
+        <location filename="../src/player.cpp" line="317"/>
         <source>R&amp;oll die...</source>
         <translation>&amp;Würfeln...</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="262"/>
+        <location filename="../src/player.cpp" line="318"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="263"/>
+        <location filename="../src/player.cpp" line="319"/>
         <source>&amp;Create token...</source>
         <translation>&amp;Token erstellen...</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="264"/>
+        <location filename="../src/player.cpp" line="320"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="265"/>
+        <location filename="../src/player.cpp" line="321"/>
         <source>S&amp;ay</source>
         <translation>&amp;Sagen</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="284"/>
+        <location filename="../src/player.cpp" line="327"/>
+        <source>C&amp;ard</source>
+        <translation>&amp;Karte</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="328"/>
+        <source>&amp;Tap</source>
+        <translation>&amp;Tappen</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="329"/>
+        <source>&amp;Untap</source>
+        <translation>E&amp;nttappen</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="330"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>&amp;Normales Enttappen umschalten</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="331"/>
+        <source>&amp;Flip</source>
+        <translation>&amp;Umdrehen</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="332"/>
+        <source>&amp;Add counter</source>
+        <translation>Zählm&amp;arke hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="333"/>
+        <source>&amp;Remove counter</source>
+        <translation>Zählma&amp;rke entfernen</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="334"/>
+        <source>&amp;Set counters...</source>
+        <translation>&amp;Setze Zählmarken...</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="335"/>
+        <source>&amp;top of library</source>
+        <translation>&amp;auf die Bibliothek</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="336"/>
+        <source>&amp;bottom of library</source>
+        <translation>&amp;unter die Bibliothek</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="337"/>
+        <source>&amp;graveyard</source>
+        <translation>in den &amp;Friedhof</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="338"/>
+        <source>Ctrl+Del</source>
+        <translation>Ctrl+Del</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="339"/>
+        <source>&amp;exile</source>
+        <translation>ins &amp;Exil</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="341"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Verschieben</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="356"/>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="285"/>
+        <location filename="../src/player.cpp" line="357"/>
         <source>F6</source>
         <translation>F6</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="286"/>
+        <location filename="../src/player.cpp" line="358"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="287"/>
+        <location filename="../src/player.cpp" line="359"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="288"/>
+        <location filename="../src/player.cpp" line="360"/>
         <source>F9</source>
         <translation>F9</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="289"/>
+        <location filename="../src/player.cpp" line="361"/>
         <source>F10</source>
         <translation>F10</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="351"/>
+        <location filename="../src/player.cpp" line="416"/>
         <source>Draw cards</source>
         <translation>Karten ziehen</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="351"/>
+        <location filename="../src/player.cpp" line="416"/>
+        <location filename="../src/player.cpp" line="963"/>
         <source>Number:</source>
         <translation>Anzahl:</translation>
     </message>
+    <message>
+        <location filename="../src/player.cpp" line="963"/>
+        <source>Set counters</source>
+        <translation>Setze Zählmarken</translation>
+    </message>
     <message>
         <source>Set life</source>
         <translation type="obsolete">Lebenspunkte setzen</translation>
@@ -1968,54 +2167,103 @@
         <translation type="obsolete">Neue Lebenspunkte insgesamt:</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="364"/>
+        <location filename="../src/player.cpp" line="429"/>
         <source>Roll die</source>
         <translation>Würfeln</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="364"/>
+        <location filename="../src/player.cpp" line="429"/>
         <source>Number of sides:</source>
         <translation>Anzahl der Seiten:</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="371"/>
+        <location filename="../src/player.cpp" line="436"/>
         <source>Create token</source>
         <translation>Token erstellen</translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="371"/>
+        <location filename="../src/player.cpp" line="436"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
 </context>
+<context>
+    <name>PlayerListWidget</name>
+    <message>
+        <location filename="../src/playerlistwidget.cpp" line="15"/>
+        <source>Player name</source>
+        <translation>Spielername</translation>
+    </message>
+    <message>
+        <location filename="../src/playerlistwidget.cpp" line="16"/>
+        <source>Role</source>
+        <translation>Rolle</translation>
+    </message>
+    <message>
+        <location filename="../src/playerlistwidget.cpp" line="23"/>
+        <source>Spectator</source>
+        <translation>Zuschauer</translation>
+    </message>
+    <message>
+        <location filename="../src/playerlistwidget.cpp" line="23"/>
+        <source>Player</source>
+        <translation>Spieler</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/decklist.cpp" line="35"/>
+        <location filename="../../common/decklist.cpp" line="45"/>
         <source>Maindeck</source>
         <translation>Hauptdeck</translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="37"/>
+        <location filename="../../common/decklist.cpp" line="47"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="296"/>
+        <location filename="../../common/decklist.cpp" line="195"/>
         <source>Cockatrice decks (*.cod)</source>
         <translation>Cockatrice Decks (*.cod)</translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="297"/>
+        <location filename="../../common/decklist.cpp" line="196"/>
         <source>Plain text decks (*.dec *.mwDeck)</source>
         <translation>Text Decks (*.dec *.mwDeck)</translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="298"/>
+        <location filename="../../common/decklist.cpp" line="197"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
 </context>
+<context>
+    <name>RemoteDeckList_TreeModel</name>
+    <message>
+        <location filename="../src/remotedecklist_treewidget.cpp" line="153"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../src/remotedecklist_treewidget.cpp" line="154"/>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <location filename="../src/remotedecklist_treewidget.cpp" line="155"/>
+        <source>Upload time</source>
+        <translation>Änderungsdatum</translation>
+    </message>
+</context>
+<context>
+    <name>ServerMessageLog</name>
+    <message>
+        <location filename="../src/tab_server.cpp" line="219"/>
+        <source>Server messages</source>
+        <translation>Servernachrichten</translation>
+    </message>
+</context>
 <context>
     <name>SetsModel</name>
     <message>
@@ -2029,40 +2277,257 @@
         <translation>Langer Name</translation>
     </message>
 </context>
+<context>
+    <name>TabChatChannel</name>
+    <message>
+        <location filename="../src/tab_chatchannel.cpp" line="42"/>
+        <source>C&amp;hat channel</source>
+        <translation>C&amp;hatraum</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_chatchannel.cpp" line="43"/>
+        <source>&amp;Leave channel</source>
+        <translation>Raum ver&amp;lassen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_chatchannel.cpp" line="81"/>
+        <source>%1 has joined the channel.</source>
+        <translation>%1 hat den Raum betreten.</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_chatchannel.cpp" line="87"/>
+        <source>%1 has left the channel.</source>
+        <translation>%1 hat den Raum verlassen.</translation>
+    </message>
+</context>
+<context>
+    <name>TabDeckStorage</name>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="95"/>
+        <source>Local file system</source>
+        <translation>Lokales Dateisystem</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="96"/>
+        <source>Server deck storage</source>
+        <translation>Deckspeicherplatz auf dem Server</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="98"/>
+        <location filename="../src/tab_deck_storage.cpp" line="100"/>
+        <source>Open in deck editor</source>
+        <translation>Im Deckeditor öffnen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="99"/>
+        <source>Upload deck</source>
+        <translation>Deck hochladen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="101"/>
+        <source>Download deck</source>
+        <translation>Deck herunterladen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="102"/>
+        <location filename="../src/tab_deck_storage.cpp" line="221"/>
+        <source>New folder</source>
+        <translation>Neuer Ordner</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="103"/>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="132"/>
+        <source>Enter deck name</source>
+        <translation>Decknamen eingeben</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="132"/>
+        <source>This decklist does not have a name.
+Please enter a name:</source>
+        <translation>Diese Deckliste hat keinen Namen.
+Bitte geben Sie einen Namen ein:</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="132"/>
+        <location filename="../src/tab_deck_storage.cpp" line="136"/>
+        <source>Unnamed deck</source>
+        <translation>Unbenanntes Deck</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="221"/>
+        <source>Name of new folder:</source>
+        <translation>Name für den neuen Ordner:</translation>
+    </message>
+</context>
+<context>
+    <name>TabGame</name>
+    <message>
+        <location filename="../src/tab_game.cpp" line="134"/>
+        <source>&amp;Game</source>
+        <translation>Spi&amp;el</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="135"/>
+        <source>Next &amp;phase</source>
+        <translation>Nächste &amp;Phase</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="136"/>
+        <source>Ctrl+Space</source>
+        <translation>Ctrl+Space</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="137"/>
+        <source>Next &amp;turn</source>
+        <translation>Nächster &amp;Zug</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="138"/>
+        <source>Ctrl+Return</source>
+        <translation>Ctrl+Return</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="138"/>
+        <source>Ctrl+Enter</source>
+        <translation>Ctrl+Enter</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="139"/>
+        <source>&amp;Remove all local arrows</source>
+        <translation>&amp;Lokale Pfeile entfernen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="140"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="141"/>
+        <source>&amp;Concede</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="142"/>
+        <source>F2</source>
+        <translation>F2</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="143"/>
+        <source>&amp;Leave game</source>
+        <translation>Spiel ver&amp;lassen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="145"/>
+        <source>Load &amp;local deck</source>
+        <translation>&amp;Lokales Deck laden</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="146"/>
+        <source>Load d&amp;eck from server</source>
+        <translation>Deck vom S&amp;server laden</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="147"/>
+        <source>S&amp;tart game</source>
+        <translation>Spiel s&amp;tarten</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="148"/>
+        <source>&amp;Say:</source>
+        <translation>&amp;Sagen:</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="151"/>
+        <source>Close most recent zone view</source>
+        <translation>Letzte Zonenansicht schließen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="152"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="161"/>
+        <source>Concede</source>
+        <translation>Aufgeben</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="161"/>
+        <source>Are you sure you want to concede this game?</source>
+        <translation>Sind Sie sicher, dass Sie das Spiel aufgeben möchten?</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="169"/>
+        <source>Leave game</source>
+        <translation>Spiel verlassen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="169"/>
+        <source>Are you sure you want to leave this game?</source>
+        <translation>Sind Sie sicher, dass Sie das Spiel verlassen möchten?</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="397"/>
+        <source>Load deck</source>
+        <translation>Deck laden</translation>
+    </message>
+</context>
+<context>
+    <name>TabSupervisor</name>
+    <message>
+        <location filename="../src/tab_supervisor.cpp" line="20"/>
+        <source>Server</source>
+        <translation>Server</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_supervisor.cpp" line="24"/>
+        <source>Deck storage</source>
+        <translation>Deckspeicherplatz</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_supervisor.cpp" line="94"/>
+        <source>Game %1</source>
+        <translation>Spiel %1</translation>
+    </message>
+</context>
 <context>
     <name>WndDeckEditor</name>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="19"/>
+        <location filename="../src/window_deckeditor.cpp" line="29"/>
         <source>&amp;Search for:</source>
         <translation>&amp;Suchen nach:</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="71"/>
+        <location filename="../src/window_deckeditor.cpp" line="89"/>
         <source>Deck &amp;name:</source>
         <translation>Deck &amp;Name:</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="75"/>
+        <location filename="../src/window_deckeditor.cpp" line="93"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Kommentare:</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="99"/>
+        <location filename="../src/window_deckeditor.cpp" line="117"/>
         <source>Deck editor [*]</source>
         <translation>Deck-Editor [*]</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="101"/>
+        <location filename="../src/window_deckeditor.cpp" line="119"/>
         <source>&amp;New deck</source>
         <translation>&amp;Neues Deck</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="104"/>
+        <location filename="../src/window_deckeditor.cpp" line="122"/>
         <source>&amp;Load deck...</source>
         <translation>Deck &amp;laden...</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="107"/>
+        <location filename="../src/window_deckeditor.cpp" line="125"/>
         <source>&amp;Save deck</source>
         <translation>Deck &amp;speichern</translation>
     </message>
@@ -2071,62 +2536,61 @@
         <translation type="obsolete">Deck &amp;speichern unter...</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="110"/>
+        <location filename="../src/window_deckeditor.cpp" line="128"/>
         <source>Save deck &amp;as...</source>
         <translation>Deck s&amp;peichern unter...</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="113"/>
+        <location filename="../src/window_deckeditor.cpp" line="131"/>
         <source>&amp;Print deck...</source>
         <translation>Deck &amp;drucken...</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="116"/>
+        <location filename="../src/window_deckeditor.cpp" line="134"/>
         <source>&amp;Close</source>
         <translation>S&amp;chließen</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="117"/>
+        <location filename="../src/window_deckeditor.cpp" line="135"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="120"/>
+        <location filename="../src/window_deckeditor.cpp" line="138"/>
         <source>&amp;Edit sets...</source>
         <translation>&amp;Editionen bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="123"/>
+        <location filename="../src/window_deckeditor.cpp" line="141"/>
         <source>&amp;Deck</source>
         <translation>&amp;Deck</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="133"/>
         <source>&amp;Sets</source>
-        <translation>&amp;Editionen</translation>
+        <translation type="obsolete">&amp;Editionen</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="136"/>
+        <location filename="../src/window_deckeditor.cpp" line="157"/>
         <source>Add card to &amp;maindeck</source>
         <translation>Karte zu&amp;m Hauptdeck hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="137"/>
+        <location filename="../src/window_deckeditor.cpp" line="158"/>
         <source>Return</source>
         <translation>Return</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="137"/>
+        <location filename="../src/window_deckeditor.cpp" line="158"/>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="142"/>
+        <location filename="../src/window_deckeditor.cpp" line="163"/>
         <source>Ctrl+Return</source>
         <translation>Ctrl+Return</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="142"/>
+        <location filename="../src/window_deckeditor.cpp" line="163"/>
         <source>Ctrl+Enter</source>
         <translation>Ctrl+Enter</translation>
     </message>
@@ -2135,7 +2599,7 @@
         <translation type="obsolete">Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="140"/>
+        <location filename="../src/window_deckeditor.cpp" line="161"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Karte zum &amp;Sideboard hinzufügen</translation>
     </message>
@@ -2144,52 +2608,77 @@
         <translation type="obsolete">Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="144"/>
+        <location filename="../src/window_deckeditor.cpp" line="22"/>
+        <source>&amp;Search...</source>
+        <translation>&amp;Suchen...</translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="25"/>
+        <source>&amp;Clear search</source>
+        <translation>Suche a&amp;ufheben</translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="151"/>
+        <source>&amp;Card database</source>
+        <translation>&amp;Kartendatenbank</translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="165"/>
         <source>&amp;Remove row</source>
         <translation>Zeile entfe&amp;rnen</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="145"/>
+        <location filename="../src/window_deckeditor.cpp" line="166"/>
         <source>Del</source>
         <translation>Entf</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="148"/>
+        <location filename="../src/window_deckeditor.cpp" line="169"/>
         <source>&amp;Increment number</source>
         <translation>Anzahl er&amp;höhen</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="149"/>
+        <location filename="../src/window_deckeditor.cpp" line="170"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="152"/>
+        <location filename="../src/window_deckeditor.cpp" line="173"/>
         <source>&amp;Decrement number</source>
         <translation>Anzahl v&amp;erringern</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="154"/>
+        <location filename="../src/window_deckeditor.cpp" line="175"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="204"/>
+        <location filename="../src/window_deckeditor.cpp" line="226"/>
         <source>Are you sure?</source>
         <translation>Bist du sicher?</translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="205"/>
+        <location filename="../src/window_deckeditor.cpp" line="227"/>
         <source>The decklist has been modified.
 Do you want to save the changes?</source>
         <translation>Die Deckliste wurde verändert.
 Willst du die Änderungen speichern?</translation>
     </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="262"/>
+        <source>Load deck</source>
+        <translation>Deck laden</translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="291"/>
+        <source>Save deck</source>
+        <translation>Deck speichern</translation>
+    </message>
 </context>
 <context>
     <name>WndSets</name>
     <message>
-        <location filename="../src/window_sets.cpp" line="27"/>
+        <location filename="../src/window_sets.cpp" line="28"/>
         <source>Edit sets</source>
         <translation>Editionen bearbeiten</translation>
     </message>
@@ -2197,12 +2686,12 @@ Willst du die Änderungen speichern?</translation>
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="../src/zoneviewwidget.cpp" line="72"/>
+        <location filename="../src/zoneviewwidget.cpp" line="73"/>
         <source>sort alphabetically</source>
         <translation>alphabetisch sortieren</translation>
     </message>
     <message>
-        <location filename="../src/zoneviewwidget.cpp" line="74"/>
+        <location filename="../src/zoneviewwidget.cpp" line="75"/>
         <source>shuffle when closing</source>
         <translation>beim Schließen mischen</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts
index 00fd4cbd..c516dd4e 100644
--- a/cockatrice/translations/cockatrice_en.ts
+++ b/cockatrice/translations/cockatrice_en.ts
@@ -4,49 +4,49 @@
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="270"/>
+        <location filename="../src/dlg_settings.cpp" line="271"/>
         <source>Zone background pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="271"/>
+        <location filename="../src/dlg_settings.cpp" line="272"/>
         <source>Path to hand background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="272"/>
+        <location filename="../src/dlg_settings.cpp" line="273"/>
         <source>Path to table background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="273"/>
+        <location filename="../src/dlg_settings.cpp" line="274"/>
         <source>Path to player info background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="275"/>
+        <location filename="../src/dlg_settings.cpp" line="276"/>
         <source>Table grid layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="276"/>
+        <location filename="../src/dlg_settings.cpp" line="277"/>
         <source>Economic layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="278"/>
+        <location filename="../src/dlg_settings.cpp" line="279"/>
         <source>Zone view layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="279"/>
+        <location filename="../src/dlg_settings.cpp" line="280"/>
         <source>Sort alphabetically by default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="284"/>
-        <location filename="../src/dlg_settings.cpp" line="297"/>
-        <location filename="../src/dlg_settings.cpp" line="310"/>
+        <location filename="../src/dlg_settings.cpp" line="285"/>
+        <location filename="../src/dlg_settings.cpp" line="298"/>
+        <location filename="../src/dlg_settings.cpp" line="311"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -82,22 +82,22 @@
 <context>
     <name>CardInfoWidget</name>
     <message>
-        <location filename="../src/cardinfowidget.cpp" line="103"/>
+        <location filename="../src/cardinfowidget.cpp" line="106"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cardinfowidget.cpp" line="104"/>
+        <location filename="../src/cardinfowidget.cpp" line="107"/>
         <source>Mana cost:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cardinfowidget.cpp" line="105"/>
+        <location filename="../src/cardinfowidget.cpp" line="108"/>
         <source>Card type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cardinfowidget.cpp" line="106"/>
+        <location filename="../src/cardinfowidget.cpp" line="109"/>
         <source>P / T:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -216,32 +216,29 @@
     </message>
 </context>
 <context>
-    <name>ChannelWidget</name>
+    <name>ChatChannelSelector</name>
     <message>
-        <location filename="../src/chatwidget.cpp" line="47"/>
-        <source>%1 has joined the channel.</source>
+        <location filename="../src/tab_server.cpp" line="139"/>
+        <source>Chat channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/chatwidget.cpp" line="58"/>
-        <source>%1 has left the channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ChatWidget</name>
-    <message>
-        <location filename="../src/chatwidget.cpp" line="105"/>
+        <location filename="../src/tab_server.cpp" line="140"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/chatwidget.cpp" line="108"/>
+        <location filename="../src/tab_server.cpp" line="143"/>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/chatwidget.cpp" line="109"/>
+        <location filename="../src/tab_server.cpp" line="144"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_server.cpp" line="145"/>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,33 +277,61 @@
     </message>
 </context>
 <context>
-    <name>DeckList</name>
+    <name>DeckListModel</name>
     <message>
-        <location filename="../src/decklist.cpp" line="316"/>
-        <source>Load deck</source>
+        <location filename="../src/decklistmodel.cpp" line="148"/>
+        <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="341"/>
-        <source>Save deck</source>
+        <location filename="../src/decklistmodel.cpp" line="149"/>
+        <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Deck_PictureCacher</name>
     <message>
-        <location filename="../src/decklist.cpp" line="383"/>
+        <location filename="../src/deck_picturecacher.cpp" line="23"/>
         <source>Caching card pictures...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DeckListModel</name>
+    <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/decklistmodel.cpp" line="145"/>
-        <source>Number</source>
+        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <source>Card name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/decklistmodel.cpp" line="146"/>
-        <source>Card</source>
+        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <source>Card text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <source>Card type (OR):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <source>Color (OR):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <source>O&amp;K</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <source>Card search</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -351,283 +376,165 @@
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="7"/>
+        <location filename="../src/dlg_creategame.cpp" line="8"/>
         <source>&amp;Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="11"/>
+        <location filename="../src/dlg_creategame.cpp" line="12"/>
         <source>&amp;Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="15"/>
+        <location filename="../src/dlg_creategame.cpp" line="16"/>
         <source>P&amp;layers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="19"/>
+        <location filename="../src/dlg_creategame.cpp" line="20"/>
         <source>&amp;Spectators allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="31"/>
+        <location filename="../src/dlg_creategame.cpp" line="32"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="33"/>
+        <location filename="../src/dlg_creategame.cpp" line="34"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="46"/>
+        <location filename="../src/dlg_creategame.cpp" line="47"/>
         <source>Create game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="58"/>
-        <location filename="../src/dlg_creategame.cpp" line="75"/>
+        <location filename="../src/dlg_creategame.cpp" line="59"/>
+        <location filename="../src/dlg_creategame.cpp" line="78"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="58"/>
+        <location filename="../src/dlg_creategame.cpp" line="59"/>
         <source>Invalid number of players.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_creategame.cpp" line="75"/>
+        <location filename="../src/dlg_creategame.cpp" line="78"/>
         <source>Server error.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DlgLoadRemoteDeck</name>
+    <message>
+        <location filename="../src/dlg_load_remote_deck.cpp" line="13"/>
+        <source>O&amp;K</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_load_remote_deck.cpp" line="17"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_load_remote_deck.cpp" line="30"/>
+        <source>Load deck</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="491"/>
+        <location filename="../src/dlg_settings.cpp" line="492"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="493"/>
+        <location filename="../src/dlg_settings.cpp" line="494"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="494"/>
+        <location filename="../src/dlg_settings.cpp" line="495"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="495"/>
+        <location filename="../src/dlg_settings.cpp" line="496"/>
         <source>Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="497"/>
+        <location filename="../src/dlg_settings.cpp" line="498"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DlgStartGame</name>
-    <message>
-        <location filename="../src/dlg_startgame.cpp" line="15"/>
-        <source>&amp;Load...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/dlg_startgame.cpp" line="16"/>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/dlg_startgame.cpp" line="30"/>
-        <source>Start game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Game</name>
-    <message>
-        <location filename="../src/game.cpp" line="107"/>
-        <source>Next &amp;phase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="108"/>
-        <source>Ctrl+Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="109"/>
-        <source>Next &amp;turn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="110"/>
-        <source>Ctrl+Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="110"/>
-        <source>Ctrl+Return</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="106"/>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="111"/>
-        <source>&amp;Remove all local arrows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="112"/>
-        <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="114"/>
-        <source>C&amp;ard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="115"/>
-        <source>&amp;Tap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="116"/>
-        <source>&amp;Untap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="117"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="118"/>
-        <source>&amp;Flip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="119"/>
-        <source>&amp;Add counter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="120"/>
-        <source>&amp;Remove counter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="121"/>
-        <source>&amp;Set counters...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="122"/>
-        <source>&amp;top of library</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="123"/>
-        <source>&amp;bottom of library</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="124"/>
-        <source>&amp;graveyard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="125"/>
-        <source>Ctrl+Del</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="126"/>
-        <source>&amp;exile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="128"/>
-        <source>&amp;Move to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="499"/>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/game.cpp" line="499"/>
-        <source>Set counters</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="../src/gameselector.cpp" line="116"/>
+        <location filename="../src/tab_server.cpp" line="103"/>
         <source>C&amp;reate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="117"/>
+        <location filename="../src/tab_server.cpp" line="104"/>
         <source>&amp;Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="62"/>
-        <location filename="../src/gameselector.cpp" line="63"/>
-        <location filename="../src/gameselector.cpp" line="64"/>
-        <location filename="../src/gameselector.cpp" line="65"/>
+        <location filename="../src/tab_server.cpp" line="66"/>
+        <location filename="../src/tab_server.cpp" line="67"/>
+        <location filename="../src/tab_server.cpp" line="68"/>
+        <location filename="../src/tab_server.cpp" line="69"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="62"/>
+        <location filename="../src/tab_server.cpp" line="66"/>
         <source>Wrong password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="63"/>
+        <location filename="../src/tab_server.cpp" line="67"/>
         <source>Spectators are not allowed in this game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="64"/>
+        <location filename="../src/tab_server.cpp" line="68"/>
         <source>The game is already full.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="65"/>
+        <location filename="../src/tab_server.cpp" line="69"/>
         <source>The game does not exist any more.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="81"/>
+        <location filename="../src/tab_server.cpp" line="85"/>
         <source>Join game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="81"/>
+        <location filename="../src/tab_server.cpp" line="85"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="115"/>
+        <location filename="../src/tab_server.cpp" line="101"/>
+        <source>Games</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_server.cpp" line="102"/>
         <source>&amp;Show full games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gameselector.cpp" line="118"/>
+        <location filename="../src/tab_server.cpp" line="105"/>
         <source>J&amp;oin as spectator</source>
         <translation type="unfinished"></translation>
     </message>
@@ -635,42 +542,42 @@
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="24"/>
+        <location filename="../src/gamesmodel.cpp" line="30"/>
         <source>yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="24"/>
+        <location filename="../src/gamesmodel.cpp" line="30"/>
         <source>no</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="37"/>
+        <location filename="../src/gamesmodel.cpp" line="43"/>
         <source>Creator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="36"/>
+        <location filename="../src/gamesmodel.cpp" line="42"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="26"/>
+        <location filename="../src/gamesmodel.cpp" line="32"/>
         <source>not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="38"/>
+        <location filename="../src/gamesmodel.cpp" line="44"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="39"/>
+        <location filename="../src/gamesmodel.cpp" line="45"/>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gamesmodel.cpp" line="40"/>
+        <location filename="../src/gamesmodel.cpp" line="46"/>
         <source>Spectators</source>
         <translation type="unfinished"></translation>
     </message>
@@ -678,51 +585,51 @@
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="114"/>
-        <location filename="../src/dlg_settings.cpp" line="125"/>
-        <location filename="../src/dlg_settings.cpp" line="138"/>
-        <location filename="../src/dlg_settings.cpp" line="151"/>
+        <location filename="../src/dlg_settings.cpp" line="115"/>
+        <location filename="../src/dlg_settings.cpp" line="126"/>
+        <location filename="../src/dlg_settings.cpp" line="139"/>
+        <location filename="../src/dlg_settings.cpp" line="152"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="182"/>
+        <location filename="../src/dlg_settings.cpp" line="183"/>
         <source>Personal settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="183"/>
+        <location filename="../src/dlg_settings.cpp" line="184"/>
         <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="184"/>
+        <location filename="../src/dlg_settings.cpp" line="185"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="185"/>
+        <location filename="../src/dlg_settings.cpp" line="186"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="186"/>
+        <location filename="../src/dlg_settings.cpp" line="187"/>
         <source>Decks directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="187"/>
+        <location filename="../src/dlg_settings.cpp" line="188"/>
         <source>Pictures directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="188"/>
+        <location filename="../src/dlg_settings.cpp" line="189"/>
         <source>Path to card database:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="21"/>
-        <location filename="../src/dlg_settings.cpp" line="109"/>
+        <location filename="../src/dlg_settings.cpp" line="22"/>
+        <location filename="../src/dlg_settings.cpp" line="110"/>
         <source>English</source>
         <translation>English</translation>
     </message>
@@ -730,415 +637,428 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/window_main.cpp" line="206"/>
+        <location filename="../src/window_main.cpp" line="104"/>
+        <location filename="../src/window_main.cpp" line="110"/>
+        <location filename="../src/window_main.cpp" line="117"/>
+        <location filename="../src/window_main.cpp" line="122"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="206"/>
+        <location filename="../src/window_main.cpp" line="104"/>
         <source>Server timeout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="213"/>
+        <location filename="../src/window_main.cpp" line="110"/>
+        <source>Invalid login data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="117"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="122"/>
+        <source>Protocol version mismatch. Local version: %1, remote version: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="128"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="129"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="130"/>
+        <source>Logged in at %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_main.cpp" line="139"/>
         <source>&amp;Connect...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="214"/>
+        <location filename="../src/window_main.cpp" line="140"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="215"/>
-        <source>&amp;Restart game...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/window_main.cpp" line="216"/>
-        <source>F2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/window_main.cpp" line="217"/>
-        <source>&amp;Leave game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/window_main.cpp" line="218"/>
+        <location filename="../src/window_main.cpp" line="141"/>
         <source>&amp;Deck editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="219"/>
+        <location filename="../src/window_main.cpp" line="142"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="220"/>
+        <location filename="../src/window_main.cpp" line="143"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="221"/>
+        <location filename="../src/window_main.cpp" line="144"/>
         <source>&amp;Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="222"/>
+        <location filename="../src/window_main.cpp" line="145"/>
         <source>&amp;Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_main.cpp" line="223"/>
-        <source>Close most recent zone view</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/window_main.cpp" line="224"/>
-        <source>Esc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/window_main.cpp" line="226"/>
+        <location filename="../src/window_main.cpp" line="147"/>
         <source>&amp;Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/window_main.cpp" line="228"/>
-        <source>&amp;Say:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/window_main.cpp" line="211"/>
-        <source>Cockatrice</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="17"/>
+        <location filename="../src/messagelogwidget.cpp" line="16"/>
         <source>Connecting to %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="27"/>
+        <location filename="../src/messagelogwidget.cpp" line="26"/>
         <source>Disconnected from server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="38"/>
+        <location filename="../src/messagelogwidget.cpp" line="37"/>
         <source>Invalid password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="45"/>
-        <source>Protocol version mismatch.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/messagelogwidget.cpp" line="50"/>
+        <location filename="../src/messagelogwidget.cpp" line="49"/>
         <source>Protocol error.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/messagelogwidget.cpp" line="56"/>
-        <source>You have joined the game. Player list:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/messagelogwidget.cpp" line="64"/>
-        <source>%1 has joined the game</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/messagelogwidget.cpp" line="69"/>
-        <source>%1 has left the game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/messagelogwidget.cpp" line="74"/>
         <source>The game has been closed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="79"/>
+        <location filename="../src/messagelogwidget.cpp" line="74"/>
         <source>%1 is now watching the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="84"/>
+        <location filename="../src/messagelogwidget.cpp" line="79"/>
         <source>%1 is not watching the game any more.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="89"/>
-        <source>%1 is ready to start a new game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/messagelogwidget.cpp" line="109"/>
+        <location filename="../src/messagelogwidget.cpp" line="117"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="130"/>
+        <location filename="../src/messagelogwidget.cpp" line="138"/>
         <source> from table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="132"/>
+        <location filename="../src/messagelogwidget.cpp" line="140"/>
         <source> from graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="134"/>
+        <location filename="../src/messagelogwidget.cpp" line="142"/>
         <source> from exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="136"/>
+        <location filename="../src/messagelogwidget.cpp" line="144"/>
         <source> from hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="140"/>
+        <location filename="../src/messagelogwidget.cpp" line="148"/>
         <source>the bottom card of his library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="143"/>
+        <location filename="../src/messagelogwidget.cpp" line="151"/>
         <source> from the bottom of his library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="146"/>
+        <location filename="../src/messagelogwidget.cpp" line="154"/>
         <source>the top card of his library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="149"/>
+        <location filename="../src/messagelogwidget.cpp" line="157"/>
         <source> from the top of his library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="151"/>
+        <location filename="../src/messagelogwidget.cpp" line="159"/>
         <source> from library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="153"/>
+        <location filename="../src/messagelogwidget.cpp" line="161"/>
         <source> from sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="157"/>
+        <location filename="../src/messagelogwidget.cpp" line="165"/>
         <source>%1 puts %2 into play%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="159"/>
+        <location filename="../src/messagelogwidget.cpp" line="167"/>
         <source>%1 puts %2%3 into graveyard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="161"/>
+        <location filename="../src/messagelogwidget.cpp" line="169"/>
         <source>%1 exiles %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="163"/>
+        <location filename="../src/messagelogwidget.cpp" line="171"/>
         <source>%1 moves %2%3 to hand.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="166"/>
+        <location filename="../src/messagelogwidget.cpp" line="174"/>
         <source>%1 puts %2%3 into his library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="168"/>
+        <location filename="../src/messagelogwidget.cpp" line="176"/>
         <source>%1 puts %2%3 on bottom of his library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="170"/>
+        <location filename="../src/messagelogwidget.cpp" line="178"/>
         <source>%1 puts %2%3 on top of his library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="172"/>
+        <location filename="../src/messagelogwidget.cpp" line="180"/>
         <source>%1 puts %2%3 into his library at position %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="174"/>
+        <location filename="../src/messagelogwidget.cpp" line="182"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="180"/>
+        <location filename="../src/messagelogwidget.cpp" line="188"/>
         <source>a card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="194"/>
+        <location filename="../src/messagelogwidget.cpp" line="202"/>
         <source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="241"/>
+        <location filename="../src/messagelogwidget.cpp" line="249"/>
         <source>%1 is looking at the top %2 cards %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="94"/>
+        <location filename="../src/messagelogwidget.cpp" line="102"/>
         <source>The game has started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="115"/>
+        <location filename="../src/messagelogwidget.cpp" line="21"/>
+        <source>Connected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="44"/>
+        <source>Protocol version mismatch. Client: %1, Server: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="54"/>
+        <source>You have joined game #%1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="59"/>
+        <source>%1 has joined the game.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="64"/>
+        <source>%1 has left the game.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="85"/>
+        <source>%1 has loaded a local deck.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="87"/>
+        <source>%1 has loaded deck #%2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="92"/>
+        <source>%1 is ready to start the game.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="97"/>
+        <source>%1 has conceded the game.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="123"/>
         <source>%1 draws a card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="117"/>
+        <location filename="../src/messagelogwidget.cpp" line="125"/>
         <source>%1 draws %2 cards.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="189"/>
+        <location filename="../src/messagelogwidget.cpp" line="197"/>
         <source>%1 creates token: %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="207"/>
+        <location filename="../src/messagelogwidget.cpp" line="215"/>
         <source>%1 places %2 counters on %3 (now %4).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="209"/>
+        <location filename="../src/messagelogwidget.cpp" line="217"/>
         <source>%1 removes %2 counters from %3 (now %4).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="220"/>
+        <location filename="../src/messagelogwidget.cpp" line="228"/>
         <source>%1 %2 %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="225"/>
+        <location filename="../src/messagelogwidget.cpp" line="233"/>
         <source>%1 sets counter &quot;%2&quot; to %3 (%4%5).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="243"/>
+        <location filename="../src/messagelogwidget.cpp" line="251"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="249"/>
+        <location filename="../src/messagelogwidget.cpp" line="257"/>
         <source>%1 stops looking at %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="273"/>
+        <location filename="../src/messagelogwidget.cpp" line="281"/>
         <source>ending phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="255"/>
+        <location filename="../src/messagelogwidget.cpp" line="263"/>
         <source>It is now %1&apos;s turn.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="22"/>
-        <source>Connected: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/messagelogwidget.cpp" line="104"/>
+        <location filename="../src/messagelogwidget.cpp" line="112"/>
         <source>%1 shuffles his library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="263"/>
+        <location filename="../src/messagelogwidget.cpp" line="271"/>
         <source>untap step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="264"/>
+        <location filename="../src/messagelogwidget.cpp" line="272"/>
         <source>upkeep step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="265"/>
+        <location filename="../src/messagelogwidget.cpp" line="273"/>
         <source>draw step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="266"/>
+        <location filename="../src/messagelogwidget.cpp" line="274"/>
         <source>first main phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="267"/>
+        <location filename="../src/messagelogwidget.cpp" line="275"/>
         <source>beginning of combat step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="268"/>
+        <location filename="../src/messagelogwidget.cpp" line="276"/>
         <source>declare attackers step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="269"/>
+        <location filename="../src/messagelogwidget.cpp" line="277"/>
         <source>declare blockers step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="270"/>
+        <location filename="../src/messagelogwidget.cpp" line="278"/>
         <source>combat damage step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="271"/>
+        <location filename="../src/messagelogwidget.cpp" line="279"/>
         <source>end of combat step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="272"/>
+        <location filename="../src/messagelogwidget.cpp" line="280"/>
         <source>second main phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="275"/>
+        <location filename="../src/messagelogwidget.cpp" line="283"/>
         <source>It is now the %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="220"/>
+        <location filename="../src/messagelogwidget.cpp" line="228"/>
         <source>taps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="220"/>
+        <location filename="../src/messagelogwidget.cpp" line="228"/>
         <source>untaps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="232"/>
+        <location filename="../src/messagelogwidget.cpp" line="240"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="234"/>
+        <location filename="../src/messagelogwidget.cpp" line="242"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/messagelogwidget.cpp" line="217"/>
+        <location filename="../src/messagelogwidget.cpp" line="225"/>
         <source>his permanents</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1146,22 +1066,22 @@
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="396"/>
+        <location filename="../src/dlg_settings.cpp" line="397"/>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="397"/>
+        <location filename="../src/dlg_settings.cpp" line="398"/>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="379"/>
+        <location filename="../src/dlg_settings.cpp" line="380"/>
         <source>Add message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_settings.cpp" line="379"/>
+        <location filename="../src/dlg_settings.cpp" line="380"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1169,57 +1089,57 @@
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="114"/>
+        <location filename="../src/phasestoolbar.cpp" line="115"/>
         <source>Untap step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="115"/>
+        <location filename="../src/phasestoolbar.cpp" line="116"/>
         <source>Upkeep step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="116"/>
+        <location filename="../src/phasestoolbar.cpp" line="117"/>
         <source>Draw step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="117"/>
+        <location filename="../src/phasestoolbar.cpp" line="118"/>
         <source>First main phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="118"/>
+        <location filename="../src/phasestoolbar.cpp" line="119"/>
         <source>Beginning of combat step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="119"/>
+        <location filename="../src/phasestoolbar.cpp" line="120"/>
         <source>Declare attackers step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="120"/>
+        <location filename="../src/phasestoolbar.cpp" line="121"/>
         <source>Declare blockers step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="121"/>
+        <location filename="../src/phasestoolbar.cpp" line="122"/>
         <source>Combat damage step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="122"/>
+        <location filename="../src/phasestoolbar.cpp" line="123"/>
         <source>End of combat step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="123"/>
+        <location filename="../src/phasestoolbar.cpp" line="124"/>
         <source>Second main phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/phasestoolbar.cpp" line="124"/>
+        <location filename="../src/phasestoolbar.cpp" line="125"/>
         <source>End of turn step</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1227,281 +1147,406 @@
 <context>
     <name>Player</name>
     <message>
-        <location filename="../src/player.cpp" line="228"/>
-        <location filename="../src/player.cpp" line="232"/>
-        <location filename="../src/player.cpp" line="236"/>
+        <location filename="../src/player.cpp" line="284"/>
+        <location filename="../src/player.cpp" line="288"/>
+        <location filename="../src/player.cpp" line="292"/>
         <source>Move to &amp;top of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="229"/>
-        <location filename="../src/player.cpp" line="233"/>
-        <location filename="../src/player.cpp" line="237"/>
+        <location filename="../src/player.cpp" line="285"/>
+        <location filename="../src/player.cpp" line="289"/>
+        <location filename="../src/player.cpp" line="293"/>
         <source>Move to &amp;bottom of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="240"/>
+        <location filename="../src/player.cpp" line="296"/>
         <source>&amp;View library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="241"/>
+        <location filename="../src/player.cpp" line="297"/>
         <source>F3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="242"/>
+        <location filename="../src/player.cpp" line="298"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="221"/>
+        <location filename="../src/player.cpp" line="277"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="243"/>
+        <location filename="../src/player.cpp" line="299"/>
         <source>F4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="244"/>
+        <location filename="../src/player.cpp" line="300"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="223"/>
+        <location filename="../src/player.cpp" line="279"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="254"/>
+        <location filename="../src/player.cpp" line="310"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="256"/>
+        <location filename="../src/player.cpp" line="312"/>
         <source>&amp;Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="224"/>
+        <location filename="../src/player.cpp" line="280"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="255"/>
+        <location filename="../src/player.cpp" line="311"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="305"/>
+        <location filename="../src/player.cpp" line="377"/>
         <source>View top cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="305"/>
+        <location filename="../src/player.cpp" line="377"/>
         <source>Number of cards:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="245"/>
+        <location filename="../src/player.cpp" line="301"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="222"/>
+        <location filename="../src/player.cpp" line="278"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="225"/>
+        <location filename="../src/player.cpp" line="281"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="234"/>
-        <location filename="../src/player.cpp" line="238"/>
+        <location filename="../src/player.cpp" line="290"/>
+        <location filename="../src/player.cpp" line="294"/>
         <source>Move to &amp;hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="230"/>
-        <location filename="../src/player.cpp" line="239"/>
+        <location filename="../src/player.cpp" line="286"/>
+        <location filename="../src/player.cpp" line="295"/>
         <source>Move to g&amp;raveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="231"/>
-        <location filename="../src/player.cpp" line="235"/>
+        <location filename="../src/player.cpp" line="287"/>
+        <location filename="../src/player.cpp" line="291"/>
         <source>Move to &amp;exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="246"/>
+        <location filename="../src/player.cpp" line="302"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="247"/>
+        <location filename="../src/player.cpp" line="303"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="248"/>
+        <location filename="../src/player.cpp" line="304"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="249"/>
+        <location filename="../src/player.cpp" line="305"/>
         <source>Take &amp;mulligan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="250"/>
+        <location filename="../src/player.cpp" line="306"/>
         <source>Ctrl+M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="251"/>
+        <location filename="../src/player.cpp" line="307"/>
         <source>&amp;Shuffle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="252"/>
+        <location filename="../src/player.cpp" line="308"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="257"/>
+        <location filename="../src/player.cpp" line="313"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="259"/>
+        <location filename="../src/player.cpp" line="315"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="260"/>
+        <location filename="../src/player.cpp" line="316"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="261"/>
+        <location filename="../src/player.cpp" line="317"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="262"/>
+        <location filename="../src/player.cpp" line="318"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="263"/>
+        <location filename="../src/player.cpp" line="319"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="264"/>
+        <location filename="../src/player.cpp" line="320"/>
         <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="265"/>
+        <location filename="../src/player.cpp" line="321"/>
         <source>S&amp;ay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="284"/>
+        <location filename="../src/player.cpp" line="327"/>
+        <source>C&amp;ard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="328"/>
+        <source>&amp;Tap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="329"/>
+        <source>&amp;Untap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="330"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="331"/>
+        <source>&amp;Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="332"/>
+        <source>&amp;Add counter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="333"/>
+        <source>&amp;Remove counter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="334"/>
+        <source>&amp;Set counters...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="335"/>
+        <source>&amp;top of library</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="336"/>
+        <source>&amp;bottom of library</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="337"/>
+        <source>&amp;graveyard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="338"/>
+        <source>Ctrl+Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="339"/>
+        <source>&amp;exile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="341"/>
+        <source>&amp;Move to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="356"/>
         <source>F5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="285"/>
+        <location filename="../src/player.cpp" line="357"/>
         <source>F6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="286"/>
+        <location filename="../src/player.cpp" line="358"/>
         <source>F7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="287"/>
+        <location filename="../src/player.cpp" line="359"/>
         <source>F8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="288"/>
+        <location filename="../src/player.cpp" line="360"/>
         <source>F9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="289"/>
+        <location filename="../src/player.cpp" line="361"/>
         <source>F10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="351"/>
+        <location filename="../src/player.cpp" line="416"/>
         <source>Draw cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="351"/>
+        <location filename="../src/player.cpp" line="416"/>
+        <location filename="../src/player.cpp" line="963"/>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="364"/>
+        <location filename="../src/player.cpp" line="429"/>
         <source>Roll die</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="364"/>
+        <location filename="../src/player.cpp" line="429"/>
         <source>Number of sides:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="371"/>
+        <location filename="../src/player.cpp" line="436"/>
         <source>Create token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/player.cpp" line="371"/>
+        <location filename="../src/player.cpp" line="436"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/player.cpp" line="963"/>
+        <source>Set counters</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayerListWidget</name>
+    <message>
+        <location filename="../src/playerlistwidget.cpp" line="15"/>
+        <source>Player name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/playerlistwidget.cpp" line="16"/>
+        <source>Role</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/playerlistwidget.cpp" line="23"/>
+        <source>Spectator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/playerlistwidget.cpp" line="23"/>
+        <source>Player</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/decklist.cpp" line="35"/>
+        <location filename="../../common/decklist.cpp" line="45"/>
         <source>Maindeck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="37"/>
+        <location filename="../../common/decklist.cpp" line="47"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="296"/>
+        <location filename="../../common/decklist.cpp" line="195"/>
         <source>Cockatrice decks (*.cod)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="297"/>
+        <location filename="../../common/decklist.cpp" line="196"/>
         <source>Plain text decks (*.dec *.mwDeck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/decklist.cpp" line="298"/>
+        <location filename="../../common/decklist.cpp" line="197"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>RemoteDeckList_TreeModel</name>
+    <message>
+        <location filename="../src/remotedecklist_treewidget.cpp" line="153"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/remotedecklist_treewidget.cpp" line="154"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/remotedecklist_treewidget.cpp" line="155"/>
+        <source>Upload time</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerMessageLog</name>
+    <message>
+        <location filename="../src/tab_server.cpp" line="219"/>
+        <source>Server messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SetsModel</name>
     <message>
@@ -1516,144 +1561,380 @@
     </message>
 </context>
 <context>
-    <name>WndDeckEditor</name>
+    <name>TabChatChannel</name>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="19"/>
-        <source>&amp;Search for:</source>
+        <location filename="../src/tab_chatchannel.cpp" line="42"/>
+        <source>C&amp;hat channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="71"/>
-        <source>Deck &amp;name:</source>
+        <location filename="../src/tab_chatchannel.cpp" line="43"/>
+        <source>&amp;Leave channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="75"/>
-        <source>&amp;Comments:</source>
+        <location filename="../src/tab_chatchannel.cpp" line="81"/>
+        <source>%1 has joined the channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="99"/>
-        <source>Deck editor [*]</source>
+        <location filename="../src/tab_chatchannel.cpp" line="87"/>
+        <source>%1 has left the channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TabDeckStorage</name>
+    <message>
+        <location filename="../src/tab_deck_storage.cpp" line="95"/>
+        <source>Local file system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="101"/>
-        <source>&amp;New deck</source>
+        <location filename="../src/tab_deck_storage.cpp" line="96"/>
+        <source>Server deck storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="104"/>
-        <source>&amp;Load deck...</source>
+        <location filename="../src/tab_deck_storage.cpp" line="98"/>
+        <location filename="../src/tab_deck_storage.cpp" line="100"/>
+        <source>Open in deck editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="107"/>
-        <source>&amp;Save deck</source>
+        <location filename="../src/tab_deck_storage.cpp" line="99"/>
+        <source>Upload deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="110"/>
-        <source>Save deck &amp;as...</source>
+        <location filename="../src/tab_deck_storage.cpp" line="101"/>
+        <source>Download deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="113"/>
-        <source>&amp;Print deck...</source>
+        <location filename="../src/tab_deck_storage.cpp" line="102"/>
+        <location filename="../src/tab_deck_storage.cpp" line="221"/>
+        <source>New folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="116"/>
-        <source>&amp;Close</source>
+        <location filename="../src/tab_deck_storage.cpp" line="103"/>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="117"/>
-        <source>Ctrl+Q</source>
+        <location filename="../src/tab_deck_storage.cpp" line="132"/>
+        <source>Enter deck name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="120"/>
-        <source>&amp;Edit sets...</source>
+        <location filename="../src/tab_deck_storage.cpp" line="132"/>
+        <source>This decklist does not have a name.
+Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="123"/>
-        <source>&amp;Deck</source>
+        <location filename="../src/tab_deck_storage.cpp" line="132"/>
+        <location filename="../src/tab_deck_storage.cpp" line="136"/>
+        <source>Unnamed deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="133"/>
-        <source>&amp;Sets</source>
+        <location filename="../src/tab_deck_storage.cpp" line="221"/>
+        <source>Name of new folder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TabGame</name>
+    <message>
+        <location filename="../src/tab_game.cpp" line="134"/>
+        <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="136"/>
-        <source>Add card to &amp;maindeck</source>
+        <location filename="../src/tab_game.cpp" line="135"/>
+        <source>Next &amp;phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="137"/>
-        <source>Return</source>
+        <location filename="../src/tab_game.cpp" line="136"/>
+        <source>Ctrl+Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="137"/>
-        <source>Enter</source>
+        <location filename="../src/tab_game.cpp" line="137"/>
+        <source>Next &amp;turn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="142"/>
+        <location filename="../src/tab_game.cpp" line="138"/>
         <source>Ctrl+Return</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="142"/>
+        <location filename="../src/tab_game.cpp" line="138"/>
         <source>Ctrl+Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="140"/>
+        <location filename="../src/tab_game.cpp" line="139"/>
+        <source>&amp;Remove all local arrows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="140"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="141"/>
+        <source>&amp;Concede</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="142"/>
+        <source>F2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="143"/>
+        <source>&amp;Leave game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="145"/>
+        <source>Load &amp;local deck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="146"/>
+        <source>Load d&amp;eck from server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="147"/>
+        <source>S&amp;tart game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="148"/>
+        <source>&amp;Say:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="151"/>
+        <source>Close most recent zone view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="152"/>
+        <source>Esc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="161"/>
+        <source>Concede</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="161"/>
+        <source>Are you sure you want to concede this game?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="169"/>
+        <source>Leave game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="169"/>
+        <source>Are you sure you want to leave this game?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_game.cpp" line="397"/>
+        <source>Load deck</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TabSupervisor</name>
+    <message>
+        <location filename="../src/tab_supervisor.cpp" line="20"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_supervisor.cpp" line="24"/>
+        <source>Deck storage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/tab_supervisor.cpp" line="94"/>
+        <source>Game %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WndDeckEditor</name>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="29"/>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="89"/>
+        <source>Deck &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="93"/>
+        <source>&amp;Comments:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="117"/>
+        <source>Deck editor [*]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="119"/>
+        <source>&amp;New deck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="122"/>
+        <source>&amp;Load deck...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="125"/>
+        <source>&amp;Save deck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="128"/>
+        <source>Save deck &amp;as...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="131"/>
+        <source>&amp;Print deck...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="134"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="135"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="138"/>
+        <source>&amp;Edit sets...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="141"/>
+        <source>&amp;Deck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="262"/>
+        <source>Load deck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="291"/>
+        <source>Save deck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="157"/>
+        <source>Add card to &amp;maindeck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="158"/>
+        <source>Return</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="158"/>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="163"/>
+        <source>Ctrl+Return</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="163"/>
+        <source>Ctrl+Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="161"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="144"/>
+        <location filename="../src/window_deckeditor.cpp" line="22"/>
+        <source>&amp;Search...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="25"/>
+        <source>&amp;Clear search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="151"/>
+        <source>&amp;Card database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/window_deckeditor.cpp" line="165"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="145"/>
+        <location filename="../src/window_deckeditor.cpp" line="166"/>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="148"/>
+        <location filename="../src/window_deckeditor.cpp" line="169"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="149"/>
+        <location filename="../src/window_deckeditor.cpp" line="170"/>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="152"/>
+        <location filename="../src/window_deckeditor.cpp" line="173"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="154"/>
+        <location filename="../src/window_deckeditor.cpp" line="175"/>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="204"/>
+        <location filename="../src/window_deckeditor.cpp" line="226"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/window_deckeditor.cpp" line="205"/>
+        <location filename="../src/window_deckeditor.cpp" line="227"/>
         <source>The decklist has been modified.
 Do you want to save the changes?</source>
         <translation type="unfinished"></translation>
@@ -1662,7 +1943,7 @@ Do you want to save the changes?</source>
 <context>
     <name>WndSets</name>
     <message>
-        <location filename="../src/window_sets.cpp" line="27"/>
+        <location filename="../src/window_sets.cpp" line="28"/>
         <source>Edit sets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1670,12 +1951,12 @@ Do you want to save the changes?</source>
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="../src/zoneviewwidget.cpp" line="72"/>
+        <location filename="../src/zoneviewwidget.cpp" line="73"/>
         <source>sort alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/zoneviewwidget.cpp" line="74"/>
+        <location filename="../src/zoneviewwidget.cpp" line="75"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"></translation>
     </message>