protocol changes, menu cleanups, phase button speed improvement

This commit is contained in:
Max-Wilhelm Bruker 2009-09-21 20:21:11 +02:00
parent ab3858239f
commit 890740bcc9
19 changed files with 514 additions and 442 deletions

View file

@ -368,33 +368,38 @@
<translation>&amp;Spieler:</translation>
</message>
<message>
<location filename="../src/dlg_creategame.cpp" line="27"/>
<location filename="../src/dlg_creategame.cpp" line="19"/>
<source>&amp;Spectators allowed</source>
<translation>&amp;Zuschauer zugelassen</translation>
</message>
<message>
<location filename="../src/dlg_creategame.cpp" line="31"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
<message>
<location filename="../src/dlg_creategame.cpp" line="29"/>
<location filename="../src/dlg_creategame.cpp" line="33"/>
<source>&amp;Cancel</source>
<translation>&amp;Abbruch</translation>
</message>
<message>
<location filename="../src/dlg_creategame.cpp" line="42"/>
<location filename="../src/dlg_creategame.cpp" line="46"/>
<source>Create game</source>
<translation>Spiel erstellen</translation>
</message>
<message>
<location filename="../src/dlg_creategame.cpp" line="54"/>
<location filename="../src/dlg_creategame.cpp" line="71"/>
<location filename="../src/dlg_creategame.cpp" line="58"/>
<location filename="../src/dlg_creategame.cpp" line="75"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../src/dlg_creategame.cpp" line="54"/>
<location filename="../src/dlg_creategame.cpp" line="58"/>
<source>Invalid number of players.</source>
<translation>Ungültige Anzahl an Spielern.</translation>
</message>
<message>
<location filename="../src/dlg_creategame.cpp" line="71"/>
<location filename="../src/dlg_creategame.cpp" line="75"/>
<source>XXX</source>
<translation>XXX</translation>
</message>
@ -691,12 +696,12 @@
<translation>F10</translation>
</message>
<message>
<location filename="../src/game.cpp" line="390"/>
<location filename="../src/game.cpp" line="408"/>
<source>Set life</source>
<translation>Setze Leben</translation>
</message>
<message>
<location filename="../src/game.cpp" line="390"/>
<location filename="../src/game.cpp" line="408"/>
<source>New life total:</source>
<translation>Neues Leben insgesammt:</translation>
</message>
@ -705,7 +710,7 @@
<translation type="obsolete">Würfeln</translation>
</message>
<message>
<location filename="../src/game.cpp" line="398"/>
<location filename="../src/game.cpp" line="416"/>
<source>Number of sides:</source>
<translation>Anzahl der Seiten:</translation>
</message>
@ -714,12 +719,12 @@
<translation type="obsolete">Karten ziehen</translation>
</message>
<message>
<location filename="../src/game.cpp" line="469"/>
<location filename="../src/game.cpp" line="487"/>
<source>Number:</source>
<translation>Anzahl:</translation>
</message>
<message>
<location filename="../src/game.cpp" line="405"/>
<location filename="../src/game.cpp" line="423"/>
<source>Create token</source>
<translation>Token erstellen</translation>
</message>
@ -729,17 +734,17 @@
<translation>&amp;Würfeln...</translation>
</message>
<message>
<location filename="../src/game.cpp" line="398"/>
<location filename="../src/game.cpp" line="416"/>
<source>Roll die</source>
<translation>Würfeln</translation>
</message>
<message>
<location filename="../src/game.cpp" line="405"/>
<location filename="../src/game.cpp" line="423"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
<location filename="../src/game.cpp" line="469"/>
<location filename="../src/game.cpp" line="487"/>
<source>Set counters</source>
<translation>Setze Zählmarke</translation>
</message>
@ -747,35 +752,40 @@
<context>
<name>GameSelector</name>
<message>
<location filename="../src/gameselector.cpp" line="100"/>
<location filename="../src/gameselector.cpp" line="107"/>
<source>C&amp;reate</source>
<translation>Spiel e&amp;rstellen</translation>
</message>
<message>
<location filename="../src/gameselector.cpp" line="101"/>
<location filename="../src/gameselector.cpp" line="108"/>
<source>&amp;Join</source>
<translation>&amp;Teilnehmen</translation>
</message>
<message>
<location filename="../src/gameselector.cpp" line="53"/>
<location filename="../src/gameselector.cpp" line="57"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../src/gameselector.cpp" line="53"/>
<location filename="../src/gameselector.cpp" line="57"/>
<source>XXX</source>
<translation>XXX</translation>
</message>
<message>
<location filename="../src/gameselector.cpp" line="67"/>
<location filename="../src/gameselector.cpp" line="73"/>
<source>Join game</source>
<translation>Spiel beitreten</translation>
</message>
<message>
<location filename="../src/gameselector.cpp" line="67"/>
<location filename="../src/gameselector.cpp" line="73"/>
<source>Password:</source>
<translation>Passwort:</translation>
</message>
<message>
<location filename="../src/gameselector.cpp" line="109"/>
<source>J&amp;oin as spectator</source>
<translation>&amp;Zuschauen</translation>
</message>
</context>
<context>
<name>GamesModel</name>
@ -973,37 +983,36 @@
<translation>Verbinde zu %1...</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="22"/>
<source>Connected.</source>
<translation>Verbunden.</translation>
<translation type="obsolete">Verbunden.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="31"/>
<location filename="../src/messagelogwidget.cpp" line="27"/>
<source>Disconnected from server.</source>
<translation>Verbindung zum Server getrennt.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="42"/>
<location filename="../src/messagelogwidget.cpp" line="38"/>
<source>Invalid password.</source>
<translation>Ungültiges Passwort.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="50"/>
<location filename="../src/messagelogwidget.cpp" line="51"/>
<source>You have joined the game. Player list:</source>
<translation>Du bist dem Spiel beigetreten. Spielerliste:</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="58"/>
<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="63"/>
<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="68"/>
<location filename="../src/messagelogwidget.cpp" line="79"/>
<source>%1 is ready to start a new game.</source>
<translation>%1 ist bereit ein neues Spiel zu starten.</translation>
</message>
@ -1028,7 +1037,7 @@
<translation type="obsolete">%1 zieht %2 Karten</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="159"/>
<location filename="../src/messagelogwidget.cpp" line="170"/>
<source>a card</source>
<translation>eine Karte</translation>
</message>
@ -1085,12 +1094,12 @@
<translation type="obsolete">%1s Sideboard</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="73"/>
<location filename="../src/messagelogwidget.cpp" line="84"/>
<source>The game has started.</source>
<translation>Das Spiel hat begonnen.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="83"/>
<location filename="../src/messagelogwidget.cpp" line="94"/>
<source>%1 shuffles his library.</source>
<translation>%1 mischt seine Bibliothek.</translation>
</message>
@ -1099,117 +1108,137 @@
<translation type="obsolete">%1 würfelt eine %2 mit einem %3-seitigen Würfel.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="88"/>
<location filename="../src/messagelogwidget.cpp" line="22"/>
<source>Connected: %1</source>
<translation>Verbunden: %1</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="45"/>
<source>Protocol version mismatch.</source>
<translation>Protokollversion stimmt nicht überein.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="69"/>
<source>%1 is now watching the game.</source>
<translation>%1 schaut nun dem Spiel zu.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="74"/>
<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="99"/>
<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="94"/>
<location filename="../src/messagelogwidget.cpp" line="105"/>
<source>%1 draws a card.</source>
<translation>%1 zieht eine Karte.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="96"/>
<location filename="../src/messagelogwidget.cpp" line="107"/>
<source>%1 draws %2 cards.</source>
<translation>%1 zieht %2 Karten.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="109"/>
<location filename="../src/messagelogwidget.cpp" line="120"/>
<source> from table</source>
<translation> vom Spielfeld</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="111"/>
<location filename="../src/messagelogwidget.cpp" line="122"/>
<source> from graveyard</source>
<translation> aus dem Friedhof</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="113"/>
<location filename="../src/messagelogwidget.cpp" line="124"/>
<source> from exile</source>
<translation> aus dem Exil</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="115"/>
<location filename="../src/messagelogwidget.cpp" line="126"/>
<source> from hand</source>
<translation> von der Hand</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="119"/>
<location filename="../src/messagelogwidget.cpp" line="130"/>
<source>the bottom card of his library</source>
<translation>die unterste Karte seiner Bibliothek</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="122"/>
<location filename="../src/messagelogwidget.cpp" line="133"/>
<source> from the bottom of his library</source>
<translation>, die unterste Karte seiner Bibliothek,</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="125"/>
<location filename="../src/messagelogwidget.cpp" line="136"/>
<source>the top card of his library</source>
<translation>die oberste Karte seiner Bibliothek</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="128"/>
<location filename="../src/messagelogwidget.cpp" line="139"/>
<source> from the top of his library</source>
<translation>, die oberste Karte seiner Bibliothek,</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="130"/>
<location filename="../src/messagelogwidget.cpp" line="141"/>
<source> from library</source>
<translation> aus der Bibliothek</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="132"/>
<location filename="../src/messagelogwidget.cpp" line="143"/>
<source> from sideboard</source>
<translation> aus dem Sideboard</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="136"/>
<location filename="../src/messagelogwidget.cpp" line="147"/>
<source>%1 puts %2 into play%3.</source>
<translation>%1 bringt %2%3 ins Spiel.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="138"/>
<location filename="../src/messagelogwidget.cpp" line="149"/>
<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="140"/>
<location filename="../src/messagelogwidget.cpp" line="151"/>
<source>%1 exiles %2%3.</source>
<translation>%1 schickt %2%3 ins Exil.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="142"/>
<location filename="../src/messagelogwidget.cpp" line="153"/>
<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="145"/>
<location filename="../src/messagelogwidget.cpp" line="156"/>
<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="147"/>
<location filename="../src/messagelogwidget.cpp" line="158"/>
<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="149"/>
<location filename="../src/messagelogwidget.cpp" line="160"/>
<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="151"/>
<location filename="../src/messagelogwidget.cpp" line="162"/>
<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="153"/>
<location filename="../src/messagelogwidget.cpp" line="164"/>
<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="209"/>
<location filename="../src/messagelogwidget.cpp" line="220"/>
<source>%1 is looking at the top %2 cards %3.</source>
<translation>%1 sieht sich die obersten %2 Karten %3 an.</translation>
</message>
@ -1294,27 +1323,27 @@
<translation type="obsolete">%1 legt %2%3in sein Sideboard.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="168"/>
<location filename="../src/messagelogwidget.cpp" line="179"/>
<source>%1 creates token: %2.</source>
<translation>%1 erstellt Token: %2.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="175"/>
<location filename="../src/messagelogwidget.cpp" line="186"/>
<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="177"/>
<location filename="../src/messagelogwidget.cpp" line="188"/>
<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="188"/>
<location filename="../src/messagelogwidget.cpp" line="199"/>
<source>%1 %2 %3.</source>
<translation>%1 %2 %3.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="193"/>
<location filename="../src/messagelogwidget.cpp" line="204"/>
<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>
@ -1323,17 +1352,17 @@
<translation type="obsolete">%1 sieht sich die obersten %2 Karten %3 an.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="211"/>
<location filename="../src/messagelogwidget.cpp" line="222"/>
<source>%1 is looking at %2.</source>
<translation>%1 sieht sich %2 an.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="217"/>
<location filename="../src/messagelogwidget.cpp" line="228"/>
<source>%1 stops looking at %2.</source>
<translation>%1 sieht sich %2 nicht mehr an.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="241"/>
<location filename="../src/messagelogwidget.cpp" line="252"/>
<source>ending phase</source>
<translation>die Zugendphase</translation>
</message>
@ -1362,57 +1391,57 @@
<translation type="obsolete">%1 sieht sich %2s %3 nicht mehr an</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="223"/>
<location filename="../src/messagelogwidget.cpp" line="234"/>
<source>It is now %1&apos;s turn.</source>
<translation>%1 ist am Zug.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="231"/>
<location filename="../src/messagelogwidget.cpp" line="242"/>
<source>untap step</source>
<translation>das Enttappsegment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="232"/>
<location filename="../src/messagelogwidget.cpp" line="243"/>
<source>upkeep step</source>
<translation>das Versorgungssegment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="233"/>
<location filename="../src/messagelogwidget.cpp" line="244"/>
<source>draw step</source>
<translation>das Ziehsegment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="234"/>
<location filename="../src/messagelogwidget.cpp" line="245"/>
<source>first main phase</source>
<translation>die erste Hauptphase</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="235"/>
<location filename="../src/messagelogwidget.cpp" line="246"/>
<source>beginning of combat step</source>
<translation>das Anfangssegment der Kampfphase</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="236"/>
<location filename="../src/messagelogwidget.cpp" line="247"/>
<source>declare attackers step</source>
<translation>das Angreifer-Deklarieren-Segment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="237"/>
<location filename="../src/messagelogwidget.cpp" line="248"/>
<source>declare blockers step</source>
<translation>das Blocker-Deklarieren-Segment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="238"/>
<location filename="../src/messagelogwidget.cpp" line="249"/>
<source>combat damage step</source>
<translation>das Kampfschadenssegment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="239"/>
<location filename="../src/messagelogwidget.cpp" line="250"/>
<source>end of combat step</source>
<translation>das Endsegment der Kampfphase</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="240"/>
<location filename="../src/messagelogwidget.cpp" line="251"/>
<source>second main phase</source>
<translation>die zweite Hauptphase</translation>
</message>
@ -1421,7 +1450,7 @@
<translation type="obsolete">das Ende-des-Zuges-Segment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="243"/>
<location filename="../src/messagelogwidget.cpp" line="254"/>
<source>It is now the %1.</source>
<translation>Es ist nun %1.</translation>
</message>
@ -1430,12 +1459,12 @@
<translation type="obsolete">%1 bewegt %2 %3 nach %4</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="188"/>
<location filename="../src/messagelogwidget.cpp" line="199"/>
<source>taps</source>
<translation>tappt</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="188"/>
<location filename="../src/messagelogwidget.cpp" line="199"/>
<source>untaps</source>
<translation>enttappt</translation>
</message>
@ -1460,7 +1489,7 @@
<translation type="obsolete">%1 entfernt %2 Zählmarken von %3 (jetzt %4)</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="185"/>
<location filename="../src/messagelogwidget.cpp" line="196"/>
<source>his permanents</source>
<translation>seine bleibenden Karten</translation>
</message>
@ -1473,12 +1502,12 @@
<translation type="obsolete">%1 setzt Zähler &quot;%2&quot; auf %3 (%4%5)</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="200"/>
<location filename="../src/messagelogwidget.cpp" line="211"/>
<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="202"/>
<location filename="../src/messagelogwidget.cpp" line="213"/>
<source>%1 sets %2 to untap normally.</source>
<translation>%1 setzt %2 auf normales Enttappen.</translation>
</message>
@ -1907,12 +1936,12 @@ Willst du die Änderungen speichern?</translation>
<context>
<name>ZoneViewWidget</name>
<message>
<location filename="../src/zoneviewwidget.cpp" line="69"/>
<location filename="../src/zoneviewwidget.cpp" line="72"/>
<source>sort alphabetically</source>
<translation>alphabetisch sortieren</translation>
</message>
<message>
<location filename="../src/zoneviewwidget.cpp" line="71"/>
<location filename="../src/zoneviewwidget.cpp" line="74"/>
<source>shuffle when closing</source>
<translation>beim Schließen mischen</translation>
</message>