aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

phases + small message log fix

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-08-19 14:26:09 +02:00
parent 5f110af562
commit 05f63bb631
6 changed files with 235 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cockatrice/src/game.cpp
View file

@ -14,7 +14,7 @@
#include "counter.h"
Game::Game(CardDatabase *_db, Client *_client, QGraphicsScene *_scene, QMenu *_actionsMenu, QMenu *_cardMenu, int playerId, const QString &playerName, QObject *parent)
: QObject(parent), actionsMenu(_actionsMenu), cardMenu(_cardMenu), db(_db), client(_client), scene(_scene), started(false)
: QObject(parent), actionsMenu(_actionsMenu), cardMenu(_cardMenu), db(_db), client(_client), scene(_scene), started(false), currentPhase(-1)
{
QRectF sr = scene->sceneRect();
localPlayer = addPlayer(playerId, playerName, QPointF(0, sr.y() + sr.height() / 2 + 2), true);
@ -53,6 +53,16 @@ Game::Game(CardDatabase *_db, Client *_client, QGraphicsScene *_scene, QMenu *_a
aCreateToken->setShortcut(tr("Ctrl+T"));
connect(aCreateToken, SIGNAL(triggered()), this, SLOT(actCreateToken()));
aNextPhase = new QAction(tr("Next &phase"), this);
aNextPhase->setShortcut(tr("Ctrl+Space"));
connect(aNextPhase, SIGNAL(triggered()), this, SLOT(actNextPhase()));
aNextTurn = new QAction(tr("Next &turn"), this);
aNextTurn->setShortcut(tr("Ctrl+Enter"));
connect(aNextTurn, SIGNAL(triggered()), this, SLOT(actNextTurn()));
actionsMenu->addAction(aNextPhase);
actionsMenu->addAction(aNextTurn);
actionsMenu->addSeparator();
actionsMenu->addAction(aUntapAll);
actionsMenu->addSeparator();
actionsMenu->addAction(aDecLife);
@ -240,6 +250,7 @@ void Game::gameEvent(const ServerEventData &msg)
case eventSetActivePhase: {
QStringList data = msg.getEventData();
int phase = data[0].toInt();
currentPhase = phase;
emit setActivePhase(phase);
break;
}
@ -284,6 +295,19 @@ void Game::gameEvent(const ServerEventData &msg)
}
}
void Game::actNextPhase()
{
int phase = currentPhase;
if (++phase >= phaseCount)
phase = 0;
client->setActivePhase(phase);
}
void Game::actNextTurn()
{
client->nextTurn();
}
void Game::actUntapAll()
{
client->setCardAttr("table", -1, "tapped", "false");

7
cockatrice/src/game.h
View file

@ -15,9 +15,11 @@ class CardItem;
class Game : public QObject {
Q_OBJECT
private:
static const int phaseCount = 11;
QMenu *actionsMenu, *sayMenu, *cardMenu;
QAction *aTap, *aUntap, *aDoesntUntap, *aFlip, *aAddCounter, *aRemoveCounter, *aSetCounters,
*aUntapAll, *aDecLife, *aIncLife, *aSetLife, *aShuffle, *aDraw, *aDrawCards, *aRollDice, *aCreateToken;
*aNextPhase, *aNextTurn, *aUntapAll, *aDecLife, *aIncLife, *aSetLife, *aShuffle, *aDraw, *aDrawCards, *aRollDice, *aCreateToken;
DlgStartGame *dlgStartGame;
CardDatabase *db;
@ -26,9 +28,12 @@ private:
PlayerList players;
Player *localPlayer;
bool started;
int currentPhase;
Player *addPlayer(int playerId, const QString &playerName, QPointF base, bool local);
void initSayMenu();
private slots:
void actNextPhase();
void actNextTurn();
void actUntapAll();
void actIncLife();
void actDecLife();

5
cockatrice/src/messagelogwidget.cpp
View file

@ -97,9 +97,6 @@ void MessageLogWidget::logDraw(Player *player, int number)
void MessageLogWidget::logMoveCard(Player *player, QString cardName, CardZone *startZone, int oldX, CardZone *targetZone, int newX)
{
if (cardName.isEmpty())
cardName = tr("a card");
QString startName = startZone->getName();
QString targetName = targetZone->getName();
if (((startName == "table") && (targetName == "table")) || ((startName == "hand") && (targetName == "hand")))
@ -144,7 +141,7 @@ void MessageLogWidget::logMoveCard(Player *player, QString cardName, CardZone *s
} else if (targetName == "sb")
finalStr = tr("%1 moves %2 %3 to sideboard");
append(finalStr.arg(sanitizeHtml(player->getName())).arg(QString("<font color=\"blue\">%1</font>").arg(sanitizeHtml(cardName))).arg(fromStr).arg(newX));
append(finalStr.arg(sanitizeHtml(player->getName())).arg(cardName.isEmpty() ? tr("a card") : QString("<font color=\"blue\">%1</font>").arg(sanitizeHtml(cardName))).arg(fromStr).arg(newX));
}
void MessageLogWidget::logCreateToken(Player *player, QString cardName)

11
cockatrice/src/phasestoolbar.cpp
View file

@ -7,7 +7,7 @@
PhaseButton::PhaseButton(QIcon icon)
: QPushButton(icon, QString()), active(false)
{
setFixedSize(50, 50);
}
void PhaseButton::update()
@ -23,18 +23,16 @@ void PhaseButton::paintEvent(QPaintEvent *event)
int height = size().height();
int width = size().width();
QPen pen;
pen.setColor(QColor::fromRgb(180, 0, 0, 200));
painter.setPen(pen);
painter.setPen(QPen(Qt::transparent));
QRadialGradient grad(QPointF(0.5, 0.5), 0.5);
grad.setCoordinateMode(QGradient::ObjectBoundingMode);
grad.setColorAt(0, QColor(180, 0, 0, 0));
grad.setColorAt(0.8, QColor(180, 0, 0, 0));
grad.setColorAt(1, QColor(180, 0, 0, 200));
grad.setColorAt(1, QColor(180, 0, 0, 255));
painter.setBrush(QBrush(grad));
painter.drawRect(3, 3, width - 7, height - 7);
painter.drawRect(2, 2, width - 4, height - 4);
}
}
@ -70,6 +68,7 @@ PhasesToolbar::PhasesToolbar(QWidget *parent)
QPushButton *nextTurnButton = new QPushButton(QIcon(":/resources/icon_nextturn.svg"), QString());
nextTurnButton->setIconSize(QSize(36, 36));
nextTurnButton->setFixedSize(50, 50);
connect(nextTurnButton, SIGNAL(clicked()), this, SIGNAL(signalNextTurn()));
QVBoxLayout *layout = new QVBoxLayout;

178
cockatrice/translations/cockatrice_de.ts
View file

@ -367,47 +367,67 @@
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
<location filename="../src/game.cpp" line="56"/>
<source>Next &amp;phase</source>
<translation>Nächste &amp;Phase</translation>
</message>
<message>
<location filename="../src/game.cpp" line="57"/>
<source>Ctrl+Space</source>
<translation>Ctrl+Space</translation>
</message>
<message>
<location filename="../src/game.cpp" line="59"/>
<source>Next &amp;turn</source>
<translation>Nächster &amp;Zug</translation>
</message>
<message>
<location filename="../src/game.cpp" line="60"/>
<source>Ctrl+Enter</source>
<translation>Ctrl+Enter</translation>
</message>
<message>
<source>&amp;Edit messages...</source>
<translation type="obsolete">Mitteilungen &amp;bearbeiten...</translation>
</message>
<message>
<location filename="../src/game.cpp" line="69"/>
<location filename="../src/game.cpp" line="79"/>
<source>S&amp;ay</source>
<translation>&amp;Sagen</translation>
</message>
<message>
<location filename="../src/game.cpp" line="72"/>
<location filename="../src/game.cpp" line="82"/>
<source>&amp;Tap</source>
<translation>&amp;Tappen</translation>
</message>
<message>
<location filename="../src/game.cpp" line="74"/>
<location filename="../src/game.cpp" line="84"/>
<source>&amp;Untap</source>
<translation>E&amp;nttappen</translation>
</message>
<message>
<location filename="../src/game.cpp" line="76"/>
<location filename="../src/game.cpp" line="86"/>
<source>Toggle &amp;normal untapping</source>
<translation>&amp;Normales enttappen umschalten</translation>
</message>
<message>
<location filename="../src/game.cpp" line="78"/>
<location filename="../src/game.cpp" line="88"/>
<source>&amp;Flip</source>
<translation>&amp;Umdrehen</translation>
</message>
<message>
<location filename="../src/game.cpp" line="80"/>
<location filename="../src/game.cpp" line="90"/>
<source>&amp;Add counter</source>
<translation>Zählm&amp;arke hinzufügen</translation>
</message>
<message>
<location filename="../src/game.cpp" line="82"/>
<location filename="../src/game.cpp" line="92"/>
<source>&amp;Remove counter</source>
<translation>Zählma&amp;rke entfernen</translation>
</message>
<message>
<location filename="../src/game.cpp" line="84"/>
<location filename="../src/game.cpp" line="94"/>
<source>&amp;Set counters...</source>
<translation>&amp;Setze Zählmarken...</translation>
</message>
@ -416,78 +436,78 @@
<translation type="obsolete">Neu a&amp;rrangieren</translation>
</message>
<message>
<location filename="../src/game.cpp" line="122"/>
<location filename="../src/game.cpp" line="132"/>
<source>F5</source>
<translation>F5</translation>
</message>
<message>
<location filename="../src/game.cpp" line="123"/>
<location filename="../src/game.cpp" line="133"/>
<source>F6</source>
<translation>F6</translation>
</message>
<message>
<location filename="../src/game.cpp" line="124"/>
<location filename="../src/game.cpp" line="134"/>
<source>F7</source>
<translation>F7</translation>
</message>
<message>
<location filename="../src/game.cpp" line="125"/>
<location filename="../src/game.cpp" line="135"/>
<source>F8</source>
<translation>F8</translation>
</message>
<message>
<location filename="../src/game.cpp" line="126"/>
<location filename="../src/game.cpp" line="136"/>
<source>F9</source>
<translation>F9</translation>
</message>
<message>
<location filename="../src/game.cpp" line="127"/>
<location filename="../src/game.cpp" line="137"/>
<source>F10</source>
<translation>F10</translation>
</message>
<message>
<location filename="../src/game.cpp" line="305"/>
<location filename="../src/game.cpp" line="329"/>
<source>Set life</source>
<translation>Setze Leben</translation>
</message>
<message>
<location filename="../src/game.cpp" line="305"/>
<location filename="../src/game.cpp" line="329"/>
<source>New life total:</source>
<translation>Neues Leben insgesammt:</translation>
</message>
<message>
<location filename="../src/game.cpp" line="318"/>
<location filename="../src/game.cpp" line="342"/>
<source>Roll dice</source>
<translation>Würfeln</translation>
</message>
<message>
<location filename="../src/game.cpp" line="318"/>
<location filename="../src/game.cpp" line="342"/>
<source>Number of sides:</source>
<translation>Anzahl der Seiten:</translation>
</message>
<message>
<location filename="../src/game.cpp" line="330"/>
<location filename="../src/game.cpp" line="354"/>
<source>Draw cards</source>
<translation>Karten ziehen</translation>
</message>
<message>
<location filename="../src/game.cpp" line="330"/>
<location filename="../src/game.cpp" line="408"/>
<location filename="../src/game.cpp" line="354"/>
<location filename="../src/game.cpp" line="432"/>
<source>Number:</source>
<translation>Anzahl:</translation>
</message>
<message>
<location filename="../src/game.cpp" line="337"/>
<location filename="../src/game.cpp" line="361"/>
<source>Create token</source>
<translation>Token erstellen</translation>
</message>
<message>
<location filename="../src/game.cpp" line="337"/>
<location filename="../src/game.cpp" line="361"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
<location filename="../src/game.cpp" line="408"/>
<location filename="../src/game.cpp" line="432"/>
<source>Set counters</source>
<translation>Setze Zählmarke</translation>
</message>
@ -776,162 +796,162 @@
<translation>%1 zieht %2 Karten</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="101"/>
<location filename="../src/messagelogwidget.cpp" line="144"/>
<source>a card</source>
<translation>eine Karte</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="109"/>
<location filename="../src/messagelogwidget.cpp" line="106"/>
<source>from table</source>
<translation>vom Spielfeld</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="111"/>
<location filename="../src/messagelogwidget.cpp" line="108"/>
<source>from graveyard</source>
<translation>aus dem Friedhof</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="113"/>
<location filename="../src/messagelogwidget.cpp" line="110"/>
<source>from exile</source>
<translation>aus dem Exil</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="115"/>
<location filename="../src/messagelogwidget.cpp" line="112"/>
<source>from hand</source>
<translation>von der Hand</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="118"/>
<location filename="../src/messagelogwidget.cpp" line="115"/>
<source>from the bottom of his library</source>
<translation>von der Unterseite seiner Bibliothek</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="120"/>
<location filename="../src/messagelogwidget.cpp" line="117"/>
<source>from the top of his library</source>
<translation>oben von seiner Bibliothek</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="122"/>
<location filename="../src/messagelogwidget.cpp" line="119"/>
<source>from library</source>
<translation>von der Bibliothek</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="124"/>
<location filename="../src/messagelogwidget.cpp" line="121"/>
<source>from sideboard</source>
<translation>aus seinem Sideboard</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="128"/>
<location filename="../src/messagelogwidget.cpp" line="125"/>
<source>%1 puts %2 into play %3</source>
<translation>%1 bringt %2 %3 ins Spiel</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="130"/>
<location filename="../src/messagelogwidget.cpp" line="127"/>
<source>%1 puts %2 %3 into graveyard</source>
<translation>%1 legt %2 %3 in den Friedhof</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="132"/>
<location filename="../src/messagelogwidget.cpp" line="129"/>
<source>%1 exiles %2 %3</source>
<translation>%1 schickt %2 %3 ins Exil</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="134"/>
<location filename="../src/messagelogwidget.cpp" line="131"/>
<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="137"/>
<location filename="../src/messagelogwidget.cpp" line="134"/>
<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="139"/>
<location filename="../src/messagelogwidget.cpp" line="136"/>
<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="141"/>
<location filename="../src/messagelogwidget.cpp" line="138"/>
<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="143"/>
<location filename="../src/messagelogwidget.cpp" line="140"/>
<source>%1 puts %2 %3 into his library at position %4</source>
<translation>%1 legt %2 %3 in seine Bibliothek an Stelle %4</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="145"/>
<location filename="../src/messagelogwidget.cpp" line="142"/>
<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="200"/>
<location filename="../src/messagelogwidget.cpp" line="197"/>
<source>%1 stops looking at %2&apos;s %3</source>
<translation>%1 sieht sich %2s %3 nicht mehr an</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="206"/>
<location filename="../src/messagelogwidget.cpp" line="203"/>
<source>It is now %1&apos;s turn.</source>
<translation>%1 ist am Zug.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="214"/>
<location filename="../src/messagelogwidget.cpp" line="211"/>
<source>untap step</source>
<translation>das Enttappsegment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="215"/>
<location filename="../src/messagelogwidget.cpp" line="212"/>
<source>upkeep step</source>
<translation>das Versorgungssegment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="216"/>
<location filename="../src/messagelogwidget.cpp" line="213"/>
<source>draw step</source>
<translation>das Ziehsegment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="217"/>
<location filename="../src/messagelogwidget.cpp" line="214"/>
<source>first main phase</source>
<translation>die erste Hauptphase</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="218"/>
<location filename="../src/messagelogwidget.cpp" line="215"/>
<source>beginning of combat step</source>
<translation>das Anfangssegment der Kampfphase</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="219"/>
<location filename="../src/messagelogwidget.cpp" line="216"/>
<source>declare attackers step</source>
<translation>das Angreifer-Deklarieren-Segment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="220"/>
<location filename="../src/messagelogwidget.cpp" line="217"/>
<source>declare blockers step</source>
<translation>das Blocker-Deklarieren-Segment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="221"/>
<location filename="../src/messagelogwidget.cpp" line="218"/>
<source>combat damage step</source>
<translation>das Kampfschadenssegment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="222"/>
<location filename="../src/messagelogwidget.cpp" line="219"/>
<source>end of combat step</source>
<translation>das Endsegment der Kampfphase</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="223"/>
<location filename="../src/messagelogwidget.cpp" line="220"/>
<source>second main phase</source>
<translation>die zweite Hauptphase</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="224"/>
<location filename="../src/messagelogwidget.cpp" line="221"/>
<source>end of turn step</source>
<translation>das Ende-des-Zuges-Segment</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="226"/>
<location filename="../src/messagelogwidget.cpp" line="223"/>
<source>It is now the %1.</source>
<translation>Es ist nun %1.</translation>
</message>
@ -940,12 +960,12 @@
<translation type="obsolete">%1 bewegt %2 %3 nach %4</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="172"/>
<location filename="../src/messagelogwidget.cpp" line="169"/>
<source>taps</source>
<translation>tappt</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="172"/>
<location filename="../src/messagelogwidget.cpp" line="169"/>
<source>untaps</source>
<translation>enttappt</translation>
</message>
@ -958,52 +978,52 @@
<translation type="obsolete">%1 bewegt %2 von %3 nach %4</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="152"/>
<location filename="../src/messagelogwidget.cpp" line="149"/>
<source>%1 creates token: %2</source>
<translation>%1 erstellt Token: %2</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="159"/>
<location filename="../src/messagelogwidget.cpp" line="156"/>
<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="161"/>
<location filename="../src/messagelogwidget.cpp" line="158"/>
<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="169"/>
<location filename="../src/messagelogwidget.cpp" line="166"/>
<source>his permanents</source>
<translation>seine bleibenden Karten</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="172"/>
<location filename="../src/messagelogwidget.cpp" line="169"/>
<source>%1 %2 %3</source>
<translation>%1 %2 %3</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="177"/>
<location filename="../src/messagelogwidget.cpp" line="174"/>
<source>%1 sets counter &quot;%2&quot; to %3 (%4%5)</source>
<translation>%1 setzt Zähler &quot;%2&quot; auf %3 (%4%5)</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="184"/>
<location filename="../src/messagelogwidget.cpp" line="181"/>
<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="186"/>
<location filename="../src/messagelogwidget.cpp" line="183"/>
<source>%1 sets %2 to untap normally.</source>
<translation>%1 setzt %2 auf normales Enttappen.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="193"/>
<location filename="../src/messagelogwidget.cpp" line="190"/>
<source>%1 is looking at the top %2 cards of %3&apos;s %4</source>
<translation>%1 sieht sich die obersten %2 Karten von %3s %4 an</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="195"/>
<location filename="../src/messagelogwidget.cpp" line="192"/>
<source>%1 is looking at %2&apos;s %3</source>
<translation>%1 sieht sich %2s %3 an</translation>
</message>
@ -1042,57 +1062,57 @@
<context>
<name>PhasesToolbar</name>
<message>
<location filename="../src/phasestoolbar.cpp" line="104"/>
<location filename="../src/phasestoolbar.cpp" line="103"/>
<source>Untap step</source>
<translation>Enttappsegment</translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="105"/>
<location filename="../src/phasestoolbar.cpp" line="104"/>
<source>Upkeep step</source>
<translation>Versorgungssegment</translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="106"/>
<location filename="../src/phasestoolbar.cpp" line="105"/>
<source>Draw step</source>
<translation>Ziehsegment</translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="107"/>
<location filename="../src/phasestoolbar.cpp" line="106"/>
<source>First main phase</source>
<translation>erste Hauptphase</translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="108"/>
<location filename="../src/phasestoolbar.cpp" line="107"/>
<source>Beginning of combat step</source>
<translation>Anfangssegment der Kampfphase</translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="109"/>
<location filename="../src/phasestoolbar.cpp" line="108"/>
<source>Declare attackers step</source>
<translation>Angreifer-Deklarieren-Segment</translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="110"/>
<location filename="../src/phasestoolbar.cpp" line="109"/>
<source>Declare blockers step</source>
<translation>Blocker-Deklarieren-Segment</translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="111"/>
<location filename="../src/phasestoolbar.cpp" line="110"/>
<source>Combat damage step</source>
<translation>Kampfschadenssegment</translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="112"/>
<location filename="../src/phasestoolbar.cpp" line="111"/>
<source>End of combat step</source>
<translation>Endsegment der Kampfphase</translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="113"/>
<location filename="../src/phasestoolbar.cpp" line="112"/>
<source>Second main phase</source>
<translation>zweite Hauptphase</translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="114"/>
<location filename="../src/phasestoolbar.cpp" line="113"/>
<source>End of turn step</source>
<translation>Ende-des-Zuges-Segment</translation>
</message>

178
cockatrice/translations/cockatrice_en.ts
View file

@ -309,118 +309,138 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="69"/>
<location filename="../src/game.cpp" line="56"/>
<source>Next &amp;phase</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="57"/>
<source>Ctrl+Space</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="59"/>
<source>Next &amp;turn</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="60"/>
<source>Ctrl+Enter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="79"/>
<source>S&amp;ay</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="72"/>
<location filename="../src/game.cpp" line="82"/>
<source>&amp;Tap</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="74"/>
<location filename="../src/game.cpp" line="84"/>
<source>&amp;Untap</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="76"/>
<location filename="../src/game.cpp" line="86"/>
<source>Toggle &amp;normal untapping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="78"/>
<location filename="../src/game.cpp" line="88"/>
<source>&amp;Flip</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="80"/>
<location filename="../src/game.cpp" line="90"/>
<source>&amp;Add counter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="82"/>
<location filename="../src/game.cpp" line="92"/>
<source>&amp;Remove counter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="84"/>
<location filename="../src/game.cpp" line="94"/>
<source>&amp;Set counters...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="122"/>
<location filename="../src/game.cpp" line="132"/>
<source>F5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="123"/>
<location filename="../src/game.cpp" line="133"/>
<source>F6</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="124"/>
<location filename="../src/game.cpp" line="134"/>
<source>F7</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="125"/>
<location filename="../src/game.cpp" line="135"/>
<source>F8</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="126"/>
<location filename="../src/game.cpp" line="136"/>
<source>F9</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="127"/>
<location filename="../src/game.cpp" line="137"/>
<source>F10</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="305"/>
<location filename="../src/game.cpp" line="329"/>
<source>Set life</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="305"/>
<location filename="../src/game.cpp" line="329"/>
<source>New life total:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="318"/>
<location filename="../src/game.cpp" line="342"/>
<source>Roll dice</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="318"/>
<location filename="../src/game.cpp" line="342"/>
<source>Number of sides:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="330"/>
<location filename="../src/game.cpp" line="354"/>
<source>Draw cards</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="330"/>
<location filename="../src/game.cpp" line="408"/>
<location filename="../src/game.cpp" line="354"/>
<location filename="../src/game.cpp" line="432"/>
<source>Number:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="337"/>
<location filename="../src/game.cpp" line="361"/>
<source>Create token</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="337"/>
<location filename="../src/game.cpp" line="361"/>
<source>Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/game.cpp" line="408"/>
<location filename="../src/game.cpp" line="432"/>
<source>Set counters</source>
<translation type="unfinished"></translation>
</message>
@ -709,222 +729,222 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="101"/>
<location filename="../src/messagelogwidget.cpp" line="144"/>
<source>a card</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="109"/>
<location filename="../src/messagelogwidget.cpp" line="106"/>
<source>from table</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="111"/>
<location filename="../src/messagelogwidget.cpp" line="108"/>
<source>from graveyard</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="113"/>
<location filename="../src/messagelogwidget.cpp" line="110"/>
<source>from exile</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="115"/>
<location filename="../src/messagelogwidget.cpp" line="112"/>
<source>from hand</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="118"/>
<location filename="../src/messagelogwidget.cpp" line="115"/>
<source>from the bottom of his library</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="120"/>
<location filename="../src/messagelogwidget.cpp" line="117"/>
<source>from the top of his library</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="122"/>
<location filename="../src/messagelogwidget.cpp" line="119"/>
<source>from library</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="124"/>
<location filename="../src/messagelogwidget.cpp" line="121"/>
<source>from sideboard</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="128"/>
<location filename="../src/messagelogwidget.cpp" line="125"/>
<source>%1 puts %2 into play %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="130"/>
<location filename="../src/messagelogwidget.cpp" line="127"/>
<source>%1 puts %2 %3 into graveyard</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="132"/>
<location filename="../src/messagelogwidget.cpp" line="129"/>
<source>%1 exiles %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="134"/>
<location filename="../src/messagelogwidget.cpp" line="131"/>
<source>%1 moves %2 %3 to hand</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="137"/>
<location filename="../src/messagelogwidget.cpp" line="134"/>
<source>%1 puts %2 %3 into his library</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="139"/>
<location filename="../src/messagelogwidget.cpp" line="136"/>
<source>%1 puts %2 %3 on bottom of his library</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="141"/>
<location filename="../src/messagelogwidget.cpp" line="138"/>
<source>%1 puts %2 %3 on top of his library</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="143"/>
<location filename="../src/messagelogwidget.cpp" line="140"/>
<source>%1 puts %2 %3 into his library at position %4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="145"/>
<location filename="../src/messagelogwidget.cpp" line="142"/>
<source>%1 moves %2 %3 to sideboard</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="200"/>
<location filename="../src/messagelogwidget.cpp" line="197"/>
<source>%1 stops looking at %2&apos;s %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="206"/>
<location filename="../src/messagelogwidget.cpp" line="203"/>
<source>It is now %1&apos;s turn.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="214"/>
<location filename="../src/messagelogwidget.cpp" line="211"/>
<source>untap step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="215"/>
<location filename="../src/messagelogwidget.cpp" line="212"/>
<source>upkeep step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="216"/>
<location filename="../src/messagelogwidget.cpp" line="213"/>
<source>draw step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="217"/>
<location filename="../src/messagelogwidget.cpp" line="214"/>
<source>first main phase</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="218"/>
<location filename="../src/messagelogwidget.cpp" line="215"/>
<source>beginning of combat step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="219"/>
<location filename="../src/messagelogwidget.cpp" line="216"/>
<source>declare attackers step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="220"/>
<location filename="../src/messagelogwidget.cpp" line="217"/>
<source>declare blockers step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="221"/>
<location filename="../src/messagelogwidget.cpp" line="218"/>
<source>combat damage step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="222"/>
<location filename="../src/messagelogwidget.cpp" line="219"/>
<source>end of combat step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="223"/>
<location filename="../src/messagelogwidget.cpp" line="220"/>
<source>second main phase</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="224"/>
<location filename="../src/messagelogwidget.cpp" line="221"/>
<source>end of turn step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="226"/>
<location filename="../src/messagelogwidget.cpp" line="223"/>
<source>It is now the %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="152"/>
<location filename="../src/messagelogwidget.cpp" line="149"/>
<source>%1 creates token: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="159"/>
<location filename="../src/messagelogwidget.cpp" line="156"/>
<source>%1 places %2 counters on %3 (now %4)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="161"/>
<location filename="../src/messagelogwidget.cpp" line="158"/>
<source>%1 removes %2 counters from %3 (now %4)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="172"/>
<location filename="../src/messagelogwidget.cpp" line="169"/>
<source>%1 %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="172"/>
<location filename="../src/messagelogwidget.cpp" line="169"/>
<source>taps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="172"/>
<location filename="../src/messagelogwidget.cpp" line="169"/>
<source>untaps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="177"/>
<location filename="../src/messagelogwidget.cpp" line="174"/>
<source>%1 sets counter &quot;%2&quot; to %3 (%4%5)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="184"/>
<location filename="../src/messagelogwidget.cpp" line="181"/>
<source>%1 sets %2 to not untap normally.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="186"/>
<location filename="../src/messagelogwidget.cpp" line="183"/>
<source>%1 sets %2 to untap normally.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="193"/>
<location filename="../src/messagelogwidget.cpp" line="190"/>
<source>%1 is looking at the top %2 cards of %3&apos;s %4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="195"/>
<location filename="../src/messagelogwidget.cpp" line="192"/>
<source>%1 is looking at %2&apos;s %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="169"/>
<location filename="../src/messagelogwidget.cpp" line="166"/>
<source>his permanents</source>
<translation type="unfinished"></translation>
</message>
@ -955,57 +975,57 @@
<context>
<name>PhasesToolbar</name>
<message>
<location filename="../src/phasestoolbar.cpp" line="104"/>
<location filename="../src/phasestoolbar.cpp" line="103"/>
<source>Untap step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="105"/>
<location filename="../src/phasestoolbar.cpp" line="104"/>
<source>Upkeep step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="106"/>
<location filename="../src/phasestoolbar.cpp" line="105"/>
<source>Draw step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="107"/>
<location filename="../src/phasestoolbar.cpp" line="106"/>
<source>First main phase</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="108"/>
<location filename="../src/phasestoolbar.cpp" line="107"/>
<source>Beginning of combat step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="109"/>
<location filename="../src/phasestoolbar.cpp" line="108"/>
<source>Declare attackers step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="110"/>
<location filename="../src/phasestoolbar.cpp" line="109"/>
<source>Declare blockers step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="111"/>
<location filename="../src/phasestoolbar.cpp" line="110"/>
<source>Combat damage step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="112"/>
<location filename="../src/phasestoolbar.cpp" line="111"/>
<source>End of combat step</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="113"/>
<location filename="../src/phasestoolbar.cpp" line="112"/>
<source>Second main phase</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/phasestoolbar.cpp" line="114"/>
<location filename="../src/phasestoolbar.cpp" line="113"/>
<source>End of turn step</source>
<translation type="unfinished"></translation>
</message>