implemented direct chat

2026-07-30 04:40:23 -07:00 · 2010-09-18 23:47:39 +02:00 · 2010-09-18 23:47:39 +02:00 · e597325ec3
commit e597325ec3
parent a8e166b609
24 changed files with 821 additions and 335 deletions
--- a/cockatrice/translations/cockatrice_de.ts
+++ b/cockatrice/translations/cockatrice_de.ts
@ -398,27 +398,27 @@
 <context>
    <name>ChatChannelSelector</name>
    <message>
-        <location filename="../src/tab_server.cpp" line="150"/>
+        <location filename="../src/tab_server.cpp" line="152"/>
        <source>Chat channels</source>
        <translation>Chaträume</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="151"/>
+        <location filename="../src/tab_server.cpp" line="153"/>
        <source>Joi&amp;n</source>
        <translation>Teil&amp;nehmen</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="154"/>
+        <location filename="../src/tab_server.cpp" line="156"/>
        <source>Channel</source>
        <translation>Raum</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="155"/>
+        <location filename="../src/tab_server.cpp" line="157"/>
        <source>Description</source>
        <translation>Beschreibung</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="156"/>
+        <location filename="../src/tab_server.cpp" line="158"/>
        <source>Players</source>
        <translation>Spieler</translation>
    </message>
@ -1162,20 +1162,20 @@
 <context>
    <name>GameSelector</name>
    <message>
-        <location filename="../src/tab_server.cpp" line="114"/>
+        <location filename="../src/tab_server.cpp" line="116"/>
        <source>C&amp;reate</source>
        <translation>Spiel e&amp;rstellen</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="115"/>
+        <location filename="../src/tab_server.cpp" line="117"/>
        <source>&amp;Join</source>
        <translation>&amp;Teilnehmen</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="77"/>
-        <location filename="../src/tab_server.cpp" line="78"/>
        <location filename="../src/tab_server.cpp" line="79"/>
        <location filename="../src/tab_server.cpp" line="80"/>
+        <location filename="../src/tab_server.cpp" line="81"/>
+        <location filename="../src/tab_server.cpp" line="82"/>
        <source>Error</source>
        <translation>Fehler</translation>
    </message>
@ -1184,47 +1184,47 @@
        <translation type="obsolete">XXX</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="77"/>
+        <location filename="../src/tab_server.cpp" line="79"/>
        <source>Wrong password.</source>
        <translation>Falsches Passwort.</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="78"/>
+        <location filename="../src/tab_server.cpp" line="80"/>
        <source>Spectators are not allowed in this game.</source>
        <translation>In diesem Spiel sind keine Zuschauer zugelassen.</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="79"/>
+        <location filename="../src/tab_server.cpp" line="81"/>
        <source>The game is already full.</source>
        <translation>Das Spiel ist bereits voll.</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="80"/>
+        <location filename="../src/tab_server.cpp" line="82"/>
        <source>The game does not exist any more.</source>
        <translation>Dieses Spiel gibt es nicht mehr.</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="96"/>
+        <location filename="../src/tab_server.cpp" line="98"/>
        <source>Join game</source>
        <translation>Spiel beitreten</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="96"/>
+        <location filename="../src/tab_server.cpp" line="98"/>
        <source>Password:</source>
        <translation>Passwort:</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="112"/>
+        <location filename="../src/tab_server.cpp" line="114"/>
        <source>Games</source>
        <translation>Spiele</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="113"/>
+        <location filename="../src/tab_server.cpp" line="115"/>
        <source>&amp;Show full games</source>
        <translation>&amp;Volle Spiele anzeigen</translation>
    </message>
    <message>
-        <location filename="../src/tab_server.cpp" line="116"/>
+        <location filename="../src/tab_server.cpp" line="118"/>
        <source>J&amp;oin as spectator</source>
        <translation>&amp;Zuschauen</translation>
    </message>
@ -1810,27 +1810,37 @@
        <translation>%1 legt %2%3 in sein Sideboard.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="207"/>
+        <location filename="../src/messagelogwidget.cpp" line="208"/>
+        <source>%1 flips %2 face-down.</source>
+        <translation>%1 wendet %2 auf die Rückseite.</translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="210"/>
+        <source>%1 flips %2 face-up.</source>
+        <translation>%1 wendet %2 auf die Vorderseite.</translation>
+    </message>
+    <message>
+        <location filename="../src/messagelogwidget.cpp" line="215"/>
        <source>%1 destroys %2.</source>
        <translation>%1 zerstört %2.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="212"/>
+        <location filename="../src/messagelogwidget.cpp" line="220"/>
        <source>%1 attaches %2 to %3&apos;s %4.</source>
        <translation>%1 legt %2 an %3s %4 an.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="217"/>
+        <location filename="../src/messagelogwidget.cpp" line="225"/>
        <source>%1 unattaches %2.</source>
        <translation>%1 löst %2 ab.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="222"/>
+        <location filename="../src/messagelogwidget.cpp" line="230"/>
        <source>%1 creates token: %2%3.</source>
        <translation>%1 erstellt Token: %2%3.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="228"/>
+        <location filename="../src/messagelogwidget.cpp" line="236"/>
        <source>%1 points from %2&apos;s %3 to %4.</source>
        <translation>%1 zeigt von %2s %3 auf %4.</translation>
    </message>
@ -1839,12 +1849,12 @@
        <translation type="obsolete">%1 erstellt einen Spielstein: %2 (%3).</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="235"/>
+        <location filename="../src/messagelogwidget.cpp" line="243"/>
        <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 numerus="yes">
-        <location filename="../src/messagelogwidget.cpp" line="250"/>
+        <location filename="../src/messagelogwidget.cpp" line="258"/>
        <source>%1 places %n counter(s) (%2) on %3 (now %4).</source>
        <translation>
            <numerusform>%1 legt eine Marke (%2) auf %3 (jetzt %4).</numerusform>
@ -1852,7 +1862,7 @@
        </translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/messagelogwidget.cpp" line="252"/>
+        <location filename="../src/messagelogwidget.cpp" line="260"/>
        <source>%1 removes %n counter(s) (%2) from %3 (now %4).</source>
        <translation>
            <numerusform>%1 entfernt eine Marke (%2) von %3 (jetzt %4).</numerusform>
@ -1860,37 +1870,37 @@
        </translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="255"/>
+        <location filename="../src/messagelogwidget.cpp" line="263"/>
        <source>red</source>
        <translation>rot</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="256"/>
+        <location filename="../src/messagelogwidget.cpp" line="264"/>
        <source>yellow</source>
        <translation>gelb</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="257"/>
+        <location filename="../src/messagelogwidget.cpp" line="265"/>
        <source>green</source>
        <translation>grün</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="276"/>
+        <location filename="../src/messagelogwidget.cpp" line="284"/>
        <source>%1 sets counter %2 to %3 (%4%5).</source>
        <translation>%1 setzt Zähler %2 auf %3 (%4%5).</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="291"/>
+        <location filename="../src/messagelogwidget.cpp" line="299"/>
        <source>%1 sets PT of %2 to %3.</source>
        <translation>%1 setzt Kampfwerte von %2 auf %3.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="296"/>
+        <location filename="../src/messagelogwidget.cpp" line="304"/>
        <source>%1 sets annotation of %2 to %3.</source>
        <translation>%1 versieht %2 mit dem Hinweis %3.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="302"/>
+        <location filename="../src/messagelogwidget.cpp" line="310"/>
        <source>%1 is looking at the top %2 cards %3.</source>
        <translation>%1 sieht sich die obersten %2 Karten %3 an.</translation>
    </message>
@ -1987,7 +1997,7 @@
        <translation type="obsolete">%1 entfernt %2 Zählmarken von %3 (jetzt %4).</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="271"/>
+        <location filename="../src/messagelogwidget.cpp" line="279"/>
        <source>%1 %2 %3.</source>
        <translation>%1 %2 %3.</translation>
    </message>
@ -2000,17 +2010,17 @@
        <translation type="obsolete">%1 sieht sich die obersten %2 Karten %3 an.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="304"/>
+        <location filename="../src/messagelogwidget.cpp" line="312"/>
        <source>%1 is looking at %2.</source>
        <translation>%1 sieht sich %2 an.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="310"/>
+        <location filename="../src/messagelogwidget.cpp" line="318"/>
        <source>%1 stops looking at %2.</source>
        <translation>%1 sieht sich %2 nicht mehr an.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="334"/>
+        <location filename="../src/messagelogwidget.cpp" line="342"/>
        <source>ending phase</source>
        <translation>die Zugendphase</translation>
    </message>
@ -2039,57 +2049,57 @@
        <translation type="obsolete">%1 sieht sich %2s %3 nicht mehr an</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="316"/>
+        <location filename="../src/messagelogwidget.cpp" line="324"/>
        <source>It is now %1&apos;s turn.</source>
        <translation>%1 ist am Zug.</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="324"/>
+        <location filename="../src/messagelogwidget.cpp" line="332"/>
        <source>untap step</source>
        <translation>das Enttappsegment</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="325"/>
+        <location filename="../src/messagelogwidget.cpp" line="333"/>
        <source>upkeep step</source>
        <translation>das Versorgungssegment</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="326"/>
+        <location filename="../src/messagelogwidget.cpp" line="334"/>
        <source>draw step</source>
        <translation>das Ziehsegment</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="327"/>
+        <location filename="../src/messagelogwidget.cpp" line="335"/>
        <source>first main phase</source>
        <translation>die erste Hauptphase</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="328"/>
+        <location filename="../src/messagelogwidget.cpp" line="336"/>
        <source>beginning of combat step</source>
        <translation>das Anfangssegment der Kampfphase</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="329"/>
+        <location filename="../src/messagelogwidget.cpp" line="337"/>
        <source>declare attackers step</source>
        <translation>das Angreifer-Deklarieren-Segment</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="330"/>
+        <location filename="../src/messagelogwidget.cpp" line="338"/>
        <source>declare blockers step</source>
        <translation>das Blocker-Deklarieren-Segment</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="331"/>
+        <location filename="../src/messagelogwidget.cpp" line="339"/>
        <source>combat damage step</source>
        <translation>das Kampfschadenssegment</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="332"/>
+        <location filename="../src/messagelogwidget.cpp" line="340"/>
        <source>end of combat step</source>
        <translation>das Endsegment der Kampfphase</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="333"/>
+        <location filename="../src/messagelogwidget.cpp" line="341"/>
        <source>second main phase</source>
        <translation>die zweite Hauptphase</translation>
    </message>
@ -2098,7 +2108,7 @@
        <translation type="obsolete">das Ende-des-Zuges-Segment</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="336"/>
+        <location filename="../src/messagelogwidget.cpp" line="344"/>
        <source>It is now the %1.</source>
        <translation>Es ist nun %1.</translation>
    </message>
@ -2107,12 +2117,12 @@
        <translation type="obsolete">%1 bewegt %2 %3 nach %4</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="271"/>
+        <location filename="../src/messagelogwidget.cpp" line="279"/>
        <source>taps</source>
        <translation>tappt</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="271"/>
+        <location filename="../src/messagelogwidget.cpp" line="279"/>
        <source>untaps</source>
        <translation>enttappt</translation>
    </message>
@ -2137,7 +2147,7 @@
        <translation type="obsolete">%1 entfernt %2 Zählmarken von %3 (jetzt %4)</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="268"/>
+        <location filename="../src/messagelogwidget.cpp" line="276"/>
        <source>his permanents</source>
        <translation>seine bleibenden Karten</translation>
    </message>
@ -2150,12 +2160,12 @@
        <translation type="obsolete">%1 setzt Zähler &quot;%2&quot; auf %3 (%4%5)</translation>
    </message>
    <message>
-        <location filename="../src/messagelogwidget.cpp" line="283"/>
+        <location filename="../src/messagelogwidget.cpp" line="291"/>
        <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="285"/>
+        <location filename="../src/messagelogwidget.cpp" line="293"/>
        <source>%1 sets %2 to untap normally.</source>
        <translation>%1 setzt %2 auf normales Enttappen.</translation>
    </message>
@ -2260,41 +2270,51 @@
 <context>
    <name>Player</name>
    <message>
-        <location filename="../src/player.cpp" line="290"/>
-        <location filename="../src/player.cpp" line="294"/>
-        <location filename="../src/player.cpp" line="298"/>
+        <location filename="../src/player.cpp" line="297"/>
+        <location filename="../src/player.cpp" line="301"/>
+        <location filename="../src/player.cpp" line="305"/>
        <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="291"/>
-        <location filename="../src/player.cpp" line="295"/>
-        <location filename="../src/player.cpp" line="299"/>
+        <location filename="../src/player.cpp" line="298"/>
+        <location filename="../src/player.cpp" line="302"/>
+        <location filename="../src/player.cpp" line="306"/>
        <source>Move to &amp;bottom of library</source>
        <translation>Unter die &amp;Bibliothek legen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="302"/>
+        <location filename="../src/player.cpp" line="309"/>
        <source>&amp;View library</source>
        <translation>&amp;Zeige Bibliothek</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="337"/>
+        <location filename="../src/player.cpp" line="316"/>
+        <source>Move top cards to g&amp;raveyard...</source>
+        <translation>Oberste Karten in den F&amp;riedhof legen...</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="317"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>Oberste Karten ins &amp;Exil schicken...</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="346"/>
        <source>F3</source>
        <translation>F3</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="303"/>
+        <location filename="../src/player.cpp" line="310"/>
        <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="283"/>
+        <location filename="../src/player.cpp" line="290"/>
        <source>&amp;View graveyard</source>
        <translation>&amp;Zeige Friedhof</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="339"/>
+        <location filename="../src/player.cpp" line="348"/>
        <source>F4</source>
        <translation>F4</translation>
    </message>
@ -2303,32 +2323,32 @@
        <translation type="obsolete">Zeige ent&amp;fernte Karten</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="304"/>
+        <location filename="../src/player.cpp" line="311"/>
        <source>&amp;View sideboard</source>
        <translation>Zeige &amp;Sideboard</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="285"/>
+        <location filename="../src/player.cpp" line="292"/>
        <source>Player &quot;%1&quot;</source>
        <translation>Spieler &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="307"/>
+        <location filename="../src/player.cpp" line="314"/>
        <source>Take &amp;mulligan</source>
        <translation>&amp;Mulligan nehmen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="310"/>
+        <location filename="../src/player.cpp" line="319"/>
        <source>&amp;Hand</source>
        <translation>&amp;Hand</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="312"/>
+        <location filename="../src/player.cpp" line="321"/>
        <source>&amp;Library</source>
        <translation>Bib&amp;liothek</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="286"/>
+        <location filename="../src/player.cpp" line="293"/>
        <source>&amp;Graveyard</source>
        <translation>&amp;Friedhof</translation>
    </message>
@ -2337,7 +2357,7 @@
        <translation type="obsolete">Entfe&amp;rnte Karten</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="311"/>
+        <location filename="../src/player.cpp" line="320"/>
        <source>&amp;Sideboard</source>
        <translation>&amp;Sideboard</translation>
    </message>
@ -2350,65 +2370,65 @@
        <translation type="obsolete">&amp;Hinweis setzen...</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="399"/>
+        <location filename="../src/player.cpp" line="408"/>
        <source>View top cards of library</source>
        <translation>Zeige die obersten Karten der Bibliothek</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="399"/>
+        <location filename="../src/player.cpp" line="408"/>
        <source>Number of cards:</source>
        <translation>Anzahl der Karten:</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="305"/>
+        <location filename="../src/player.cpp" line="312"/>
        <source>&amp;Draw card</source>
        <translation>Karte &amp;ziehen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="284"/>
+        <location filename="../src/player.cpp" line="291"/>
        <source>&amp;View exile</source>
        <translation>&amp;Zeige Exil</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="287"/>
+        <location filename="../src/player.cpp" line="294"/>
        <source>&amp;Exile</source>
        <translation>&amp;Exil</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="296"/>
-        <location filename="../src/player.cpp" line="300"/>
+        <location filename="../src/player.cpp" line="303"/>
+        <location filename="../src/player.cpp" line="307"/>
        <source>Move to &amp;hand</source>
        <translation>auf die &amp;Hand nehmen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="292"/>
-        <location filename="../src/player.cpp" line="301"/>
+        <location filename="../src/player.cpp" line="299"/>
+        <location filename="../src/player.cpp" line="308"/>
        <source>Move to g&amp;raveyard</source>
        <translation>auf den &amp;Friedhof legen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="293"/>
-        <location filename="../src/player.cpp" line="297"/>
+        <location filename="../src/player.cpp" line="300"/>
+        <location filename="../src/player.cpp" line="304"/>
        <source>Move to &amp;exile</source>
        <translation>ins &amp;Exil schicken</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="338"/>
+        <location filename="../src/player.cpp" line="347"/>
        <source>Ctrl+W</source>
        <translation>Ctrl+W</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="340"/>
+        <location filename="../src/player.cpp" line="349"/>
        <source>Ctrl+D</source>
        <translation>Ctrl+D</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="306"/>
+        <location filename="../src/player.cpp" line="313"/>
        <source>D&amp;raw cards...</source>
        <translation>Ka&amp;rten ziehen...</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="341"/>
+        <location filename="../src/player.cpp" line="350"/>
        <source>Ctrl+E</source>
        <translation>Ctrl+E</translation>
    </message>
@ -2417,32 +2437,32 @@
        <translation type="obsolete">&amp;Mulligan nehmen...</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="342"/>
+        <location filename="../src/player.cpp" line="351"/>
        <source>Ctrl+M</source>
        <translation>Ctrl+M</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="308"/>
+        <location filename="../src/player.cpp" line="315"/>
        <source>&amp;Shuffle</source>
        <translation>Mi&amp;schen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="343"/>
+        <location filename="../src/player.cpp" line="352"/>
        <source>Ctrl+S</source>
        <translation>Ctrl+S</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="313"/>
+        <location filename="../src/player.cpp" line="322"/>
        <source>&amp;Counters</source>
        <translation>&amp;Zähler</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="315"/>
+        <location filename="../src/player.cpp" line="324"/>
        <source>&amp;Untap all permanents</source>
        <translation>&amp;Enttappe alle bleibenden Karten</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="344"/>
+        <location filename="../src/player.cpp" line="353"/>
        <source>Ctrl+U</source>
        <translation>Ctrl+U</translation>
    </message>
@ -2471,42 +2491,42 @@
        <translation type="obsolete">Ctrl+L</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="316"/>
+        <location filename="../src/player.cpp" line="325"/>
        <source>R&amp;oll die...</source>
        <translation>&amp;Würfeln...</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="345"/>
+        <location filename="../src/player.cpp" line="354"/>
        <source>Ctrl+I</source>
        <translation>Ctrl+I</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="317"/>
+        <location filename="../src/player.cpp" line="326"/>
        <source>&amp;Create token...</source>
        <translation>Spiels&amp;tein erstellen...</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="346"/>
+        <location filename="../src/player.cpp" line="355"/>
        <source>Ctrl+T</source>
        <translation>Ctrl+T</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="318"/>
+        <location filename="../src/player.cpp" line="327"/>
        <source>C&amp;reate another token</source>
        <translation>&amp;Noch einen Spielstein erstellen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="347"/>
+        <location filename="../src/player.cpp" line="356"/>
        <source>Ctrl+G</source>
        <translation>Ctrl+G</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="319"/>
+        <location filename="../src/player.cpp" line="328"/>
        <source>S&amp;ay</source>
        <translation>S&amp;agen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="325"/>
+        <location filename="../src/player.cpp" line="334"/>
        <source>C&amp;ard</source>
        <translation>&amp;Karte</translation>
    </message>
@ -2599,38 +2619,50 @@
        <translation type="obsolete">F10</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="438"/>
+        <location filename="../src/player.cpp" line="447"/>
        <source>Draw cards</source>
        <translation>Karten ziehen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="438"/>
-        <location filename="../src/player.cpp" line="1185"/>
+        <location filename="../src/player.cpp" line="447"/>
+        <location filename="../src/player.cpp" line="454"/>
+        <location filename="../src/player.cpp" line="469"/>
+        <location filename="../src/player.cpp" line="1242"/>
        <source>Number:</source>
        <translation>Anzahl:</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="1103"/>
+        <location filename="../src/player.cpp" line="454"/>
+        <source>Move top cards to grave</source>
+        <translation>Oberste Karten in den Friedhof legen</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="469"/>
+        <source>Move top cards to exile</source>
+        <translation>Oberste Karten ins Exil schicken</translation>
+    </message>
+    <message>
+        <location filename="../src/player.cpp" line="1160"/>
        <source>Set power/toughness</source>
        <translation>Kampfwerte setzen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="1103"/>
+        <location filename="../src/player.cpp" line="1160"/>
        <source>Please enter the new PT:</source>
        <translation>Bitte die neuen Kampfwerte eingeben:</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="1129"/>
+        <location filename="../src/player.cpp" line="1186"/>
        <source>Set annotation</source>
        <translation>Hinweis setzen</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="1129"/>
+        <location filename="../src/player.cpp" line="1186"/>
        <source>Please enter the new annotation:</source>
        <translation>Bitte den Hinweis eingeben:</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="1185"/>
+        <location filename="../src/player.cpp" line="1242"/>
        <source>Set counters</source>
        <translation>Setze Zählmarken</translation>
    </message>
@ -2643,12 +2675,12 @@
        <translation type="obsolete">Neue Lebenspunkte insgesamt:</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="451"/>
+        <location filename="../src/player.cpp" line="490"/>
        <source>Roll die</source>
        <translation>Würfeln</translation>
    </message>
    <message>
-        <location filename="../src/player.cpp" line="451"/>
+        <location filename="../src/player.cpp" line="490"/>
        <source>Number of sides:</source>
        <translation>Anzahl der Seiten:</translation>
    </message>
@ -2664,29 +2696,41 @@
 <context>
    <name>PlayerListWidget</name>
    <message>
-        <location filename="../src/playerlistwidget.cpp" line="27"/>
+        <location filename="../src/playerlistwidget.cpp" line="29"/>
        <source>Player name</source>
        <translation>Spielername</translation>
    </message>
    <message>
-        <location filename="../src/playerlistwidget.cpp" line="28"/>
+        <location filename="../src/playerlistwidget.cpp" line="30"/>
        <source>Deck</source>
        <translation>Deck</translation>
    </message>
    <message>
-        <location filename="../src/playerlistwidget.cpp" line="52"/>
+        <location filename="../src/playerlistwidget.cpp" line="56"/>
+        <source>---</source>
+        <translation>---</translation>
+    </message>
+    <message>
+        <location filename="../src/playerlistwidget.cpp" line="57"/>
+        <source>local</source>
+        <translation>lokal</translation>
+    </message>
+    <message>
+        <location filename="../src/playerlistwidget.cpp" line="58"/>
+        <source>#%1</source>
+        <translation>#%1</translation>
+    </message>
+    <message>
        <source>no deck</source>
-        <translation>kein Deck</translation>
+        <translation type="obsolete">kein Deck</translation>
    </message>
    <message>
-        <location filename="../src/playerlistwidget.cpp" line="53"/>
        <source>local deck</source>
-        <translation>lokales Deck</translation>
+        <translation type="obsolete">lokales Deck</translation>
    </message>
    <message>
-        <location filename="../src/playerlistwidget.cpp" line="54"/>
        <source>ID #%1</source>
-        <translation>ID #%1</translation>
+        <translation type="obsolete">ID #%1</translation>
    </message>
    <message>
        <source>Role</source>
@ -2750,7 +2794,7 @@
 <context>
    <name>ServerMessageLog</name>
    <message>
-        <location filename="../src/tab_server.cpp" line="230"/>
+        <location filename="../src/tab_server.cpp" line="232"/>
        <source>Server messages</source>
        <translation>Servernachrichten</translation>
    </message>
@ -2781,12 +2825,12 @@
        <translation>Raum ver&amp;lassen</translation>
    </message>
    <message>
-        <location filename="../src/tab_chatchannel.cpp" line="87"/>
+        <location filename="../src/tab_chatchannel.cpp" line="95"/>
        <source>%1 has joined the channel.</source>
        <translation>%1 hat den Raum betreten.</translation>
    </message>
    <message>
-        <location filename="../src/tab_chatchannel.cpp" line="94"/>
+        <location filename="../src/tab_chatchannel.cpp" line="102"/>
        <source>%1 has left the channel.</source>
        <translation>%1 hat den Raum verlassen.</translation>
    </message>
@ -2975,10 +3019,33 @@ Bitte geben Sie einen Namen ein:</translation>
        <translation>Spiel %1: %2</translation>
    </message>
 </context>
+<context>
+    <name>TabMessage</name>
+    <message>
+        <location filename="../src/tab_message.cpp" line="40"/>
+        <source>Personal &amp;talk</source>
+        <translation>Persönliches &amp;Gespräch</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_message.cpp" line="41"/>
+        <source>&amp;Leave</source>
+        <translation>Ver&amp;lassen</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_message.cpp" line="75"/>
+        <source>%1 has left the server.</source>
+        <translation>%1 hat den Server verlassen.</translation>
+    </message>
+    <message>
+        <location filename="../src/tab_message.h" line="35"/>
+        <source>Talking to %1</source>
+        <translation>Gespräch mit %1</translation>
+    </message>
+</context>
 <context>
    <name>TabServer</name>
    <message>
-        <location filename="../src/tab_server.h" line="88"/>
+        <location filename="../src/tab_server.h" line="113"/>
        <source>Server</source>
        <translation>Server</translation>
    </message>
@ -3011,6 +3078,14 @@ Bitte geben Sie einen Namen ein:</translation>
        <translation>Karten durch &amp;Doppelklick ausspielen (statt Einzelklick)</translation>
    </message>
 </context>
+<context>
+    <name>UserList</name>
+    <message>
+        <location filename="../src/tab_server.cpp" line="268"/>
+        <source>Users online: %1</source>
+        <translation>Benutzer online: %1</translation>
+    </message>
+</context>
 <context>
    <name>WndDeckEditor</name>
    <message>