Skip to content
GitLab
Commit cd6c5108 authored by Max-Wilhelm Bruker's avatar Max-Wilhelm Bruker
Browse files

small changes and initial commit for phases toolbar

parent 938825f2
Hide whitespace changes
Inline Side-by-side
cockatrice/cockatrice.pro
View file @ cd6c5108
...@@ -16,8 +16,8 @@ QT += network svg ...@@ -16,8 +16,8 @@ QT += network svg
#QTPLUGIN += qjpeg #QTPLUGIN += qjpeg
# Input # Input
HEADERS += src/counter.h src/gameselector.h src/dlg_creategame.h src/dlg_connect.h src/gamesmodel.h src/client.h src/window_main.h src/servergame.h src/servereventdata.h src/zonelist.h src/cardzone.h src/player.h src/cardlist.h src/carditem.h src/tablezone.h src/handzone.h src/playerlist.h src/game.h src/carddatabase.h src/gameview.h src/decklistmodel.h src/dlg_startgame.h src/cardinfowidget.h src/messagelogwidget.h src/serverzonecard.h src/zoneviewzone.h src/zoneviewwidget.h src/pilezone.h src/carddragitem.h src/zoneviewlayout.h src/playerarea.h src/carddatabasemodel.h src/window_deckeditor.h src/decklist.h setsmodel.h src/window_sets.h src/abstractgraphicsitem.h src/dlg_settings.h HEADERS += src/counter.h src/gameselector.h src/dlg_creategame.h src/dlg_connect.h src/gamesmodel.h src/client.h src/window_main.h src/servergame.h src/servereventdata.h src/zonelist.h src/cardzone.h src/player.h src/cardlist.h src/carditem.h src/tablezone.h src/handzone.h src/playerlist.h src/game.h src/carddatabase.h src/gameview.h src/decklistmodel.h src/dlg_startgame.h src/cardinfowidget.h src/messagelogwidget.h src/serverzonecard.h src/zoneviewzone.h src/zoneviewwidget.h src/pilezone.h src/carddragitem.h src/zoneviewlayout.h src/playerarea.h src/carddatabasemodel.h src/window_deckeditor.h src/decklist.h setsmodel.h src/window_sets.h src/abstractgraphicsitem.h src/dlg_settings.h src/phasestoolbar.h
SOURCES += src/counter.cpp src/gameselector.cpp src/dlg_creategame.cpp src/dlg_connect.cpp src/client.cpp src/main.cpp src/window_main.cpp src/servereventdata.cpp src/gamesmodel.cpp src/player.cpp src/cardzone.cpp src/zonelist.cpp src/cardlist.cpp src/carditem.cpp src/tablezone.cpp src/handzone.cpp src/playerlist.cpp src/game.cpp src/carddatabase.cpp src/gameview.cpp src/decklistmodel.cpp src/dlg_startgame.cpp src/cardinfowidget.cpp src/messagelogwidget.cpp src/zoneviewzone.cpp src/zoneviewwidget.cpp src/pilezone.cpp src/carddragitem.cpp src/zoneviewlayout.cpp src/playerarea.cpp src/carddatabasemodel.cpp src/window_deckeditor.cpp src/decklist.cpp src/setsmodel.cpp src/window_sets.cpp src/abstractgraphicsitem.cpp src/dlg_settings.cpp SOURCES += src/counter.cpp src/gameselector.cpp src/dlg_creategame.cpp src/dlg_connect.cpp src/client.cpp src/main.cpp src/window_main.cpp src/servereventdata.cpp src/gamesmodel.cpp src/player.cpp src/cardzone.cpp src/zonelist.cpp src/cardlist.cpp src/carditem.cpp src/tablezone.cpp src/handzone.cpp src/playerlist.cpp src/game.cpp src/carddatabase.cpp src/gameview.cpp src/decklistmodel.cpp src/dlg_startgame.cpp src/cardinfowidget.cpp src/messagelogwidget.cpp src/zoneviewzone.cpp src/zoneviewwidget.cpp src/pilezone.cpp src/carddragitem.cpp src/zoneviewlayout.cpp src/playerarea.cpp src/carddatabasemodel.cpp src/window_deckeditor.cpp src/decklist.cpp src/setsmodel.cpp src/window_sets.cpp src/abstractgraphicsitem.cpp src/dlg_settings.cpp src/phasestoolbar.cpp
TRANSLATIONS += \ TRANSLATIONS += \
translations/cockatrice_de.ts \ translations/cockatrice_de.ts \
translations/cockatrice_en.ts translations/cockatrice_en.ts
......
cockatrice/cockatrice.qrc
View file @ cd6c5108
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
<file alias="back.svg">resources/back.svg</file> <file alias="back.svg">resources/back.svg</file>
<file>resources/icon_config_general.svg</file> <file>resources/icon_config_general.svg</file>
<file>resources/icon_config_messages.svg</file> <file>resources/icon_config_messages.svg</file>
<file>resources/icon_phase_untap.svg</file>
<file>resources/icon_phase_upkeep.svg</file>
<file>resources/icon_phase_draw.svg</file>
<file>resources/icon_phase_combat.svg</file>
<file>resources/icon_phase_cleanup.svg</file>
<file>translations/cockatrice_de.qm</file> <file>translations/cockatrice_de.qm</file>
<file>translations/cockatrice_en.qm</file> <file>translations/cockatrice_en.qm</file>
......
cockatrice/src/client.cpp
View file @ cd6c5108
...@@ -177,8 +177,10 @@ void Client::readLine() ...@@ -177,8 +177,10 @@ void Client::readLine()
void Client::setStatus(const ProtocolStatus _status) void Client::setStatus(const ProtocolStatus _status)
{ {
ProtocolStatus oldStatus = status;
status = _status; status = _status;
emit statusChanged(_status); if (oldStatus != _status)
emit statusChanged(_status);
} }
void Client::msg(const QString &s) void Client::msg(const QString &s)
......
cockatrice/src/game.cpp
View file @ cd6c5108
...@@ -137,7 +137,7 @@ Player *Game::addPlayer(int playerId, const QString &playerName, QPointF base, b ...@@ -137,7 +137,7 @@ Player *Game::addPlayer(int playerId, const QString &playerName, QPointF base, b
Player *newPlayer = new Player(playerName, playerId, base, local, db, client, scene, this); Player *newPlayer = new Player(playerName, playerId, base, local, db, client, scene, this);
connect(newPlayer, SIGNAL(sigShowCardMenu(QPoint)), this, SLOT(showCardMenu(QPoint))); connect(newPlayer, SIGNAL(sigShowCardMenu(QPoint)), this, SLOT(showCardMenu(QPoint)));
connect(newPlayer, SIGNAL(logMoveCard(Player *, QString, QString, int, QString, int)), this, SIGNAL(logMoveCard(Player *, QString, QString, int, QString, int))); connect(newPlayer, SIGNAL(logMoveCard(Player *, QString, CardZone *, int, CardZone *, int)), this, SIGNAL(logMoveCard(Player *, QString, CardZone *, int, CardZone *, int)));
connect(newPlayer, SIGNAL(logCreateToken(Player *, QString)), this, SIGNAL(logCreateToken(Player *, QString))); connect(newPlayer, SIGNAL(logCreateToken(Player *, QString)), this, SIGNAL(logCreateToken(Player *, QString)));
connect(newPlayer, SIGNAL(logSetCardCounters(Player *, QString, int, int)), this, SIGNAL(logSetCardCounters(Player *, QString, int, int))); connect(newPlayer, SIGNAL(logSetCardCounters(Player *, QString, int, int)), this, SIGNAL(logSetCardCounters(Player *, QString, int, int)));
connect(newPlayer, SIGNAL(logSetTapped(Player *, QString, bool)), this, SIGNAL(logSetTapped(Player *, QString, bool))); connect(newPlayer, SIGNAL(logSetTapped(Player *, QString, bool)), this, SIGNAL(logSetTapped(Player *, QString, bool)));
......
cockatrice/src/game.h
View file @ cd6c5108
...@@ -70,7 +70,7 @@ signals: ...@@ -70,7 +70,7 @@ signals:
void logShuffle(Player *player); void logShuffle(Player *player);
void logRollDice(Player *player, int sides, int roll); void logRollDice(Player *player, int sides, int roll);
void logDraw(Player *player, int number); void logDraw(Player *player, int number);
void logMoveCard(Player *player, QString cardName, QString startZone, int oldX, QString targetZone, int newX); void logMoveCard(Player *player, QString cardName, CardZone *startZone, int oldX, CardZone *targetZone, int newX);
void logCreateToken(Player *player, QString cardName); void logCreateToken(Player *player, QString cardName);
void logSetCardCounters(Player *player, QString cardName, int value, int oldValue); void logSetCardCounters(Player *player, QString cardName, int value, int oldValue);
void logSetTapped(Player *player, QString cardName, bool tapped); void logSetTapped(Player *player, QString cardName, bool tapped);
......
cockatrice/src/messagelogwidget.cpp
View file @ cd6c5108
#include "messagelogwidget.h" #include "messagelogwidget.h"
#include "game.h" #include "game.h"
#include "player.h" #include "player.h"
#include "cardzone.h"
QString MessageLogWidget::sanitizeHtml(QString dirty) QString MessageLogWidget::sanitizeHtml(QString dirty)
{ {
...@@ -94,38 +95,53 @@ void MessageLogWidget::logDraw(Player *player, int number) ...@@ -94,38 +95,53 @@ void MessageLogWidget::logDraw(Player *player, int number)
append(tr("%1 draws %2 cards").arg(sanitizeHtml(player->getName())).arg(number)); append(tr("%1 draws %2 cards").arg(sanitizeHtml(player->getName())).arg(number));
} }
void MessageLogWidget::logMoveCard(Player *player, QString cardName, QString startZone, int oldX, QString targetZone, int newX) void MessageLogWidget::logMoveCard(Player *player, QString cardName, CardZone *startZone, int oldX, CardZone *targetZone, int newX)
{ {
if ((startZone == "table") && (targetZone == "table")) QString startName = startZone->getName();
QString targetName = targetZone->getName();
if (((startName == "table") && (targetName == "table")) || ((startName == "hand") && (targetName == "hand")))
return; return;
QString fromStr; QString fromStr;
if (startZone == "table") if (startName == "table")
fromStr = tr("from table"); fromStr = tr("from table");
else if (startZone == "grave") else if (startName == "grave")
fromStr = tr("from graveyard"); fromStr = tr("from graveyard");
else if (startZone == "rfg") else if (startName == "rfg")
fromStr = tr("from exile"); fromStr = tr("from exile");
else if (startZone == "hand") else if (startName == "hand")
fromStr = tr("from hand"); fromStr = tr("from hand");
else if (startZone == "deck") else if (startName == "deck") {
fromStr = tr("from library"); if (oldX == startZone->getCards().size() - 1)
fromStr = tr("from the bottom of his library");
else if (oldX == 0)
fromStr = tr("from the top of his library");
else
fromStr = tr("from library");
} else if (startName == "sb")
fromStr = tr("from sideboard");
QString finalStr; QString finalStr;
if (targetZone == "table") if (targetName == "table")
finalStr = tr("%1 puts %2 into play %3"); finalStr = tr("%1 puts %2 into play %3");
else { else if (targetName == "grave")
if (targetZone == "grave") finalStr = tr("%1 puts %2 %3 into graveyard");
finalStr = tr("%1 puts %2 %3 into graveyard"); else if (targetName == "rfg")
else if (targetZone == "rfg") finalStr = tr("%1 exiles %2 %3");
finalStr = tr("%1 exiles %2 %3"); else if (targetName == "hand")
else if (targetZone == "hand") finalStr = tr("%1 moves %2 %3 to hand");
finalStr = tr("%1 moves %2 %3 to hand"); else if (targetName == "deck") {
else if (targetZone == "deck") if (newX == -1)
finalStr = tr("%1 puts %2 %3 into his library");
else if (newX == targetZone->getCards().size())
finalStr = tr("%1 puts %2 %3 on bottom of his library");
else if (newX == 0)
finalStr = tr("%1 puts %2 %3 on top of his library"); finalStr = tr("%1 puts %2 %3 on top of his library");
else else
finalStr = tr("%1 moves %2 %3 to %4"); finalStr = tr("%1 puts %2 %3 into his library at position %4");
} } else if (targetName == "sb")
append(finalStr.arg(sanitizeHtml(player->getName())).arg(QString("<font color=\"blue\">%1</font>").arg(sanitizeHtml(cardName))).arg(fromStr).arg(targetZone)); 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));
} }
void MessageLogWidget::logCreateToken(Player *player, QString cardName) void MessageLogWidget::logCreateToken(Player *player, QString cardName)
...@@ -192,7 +208,7 @@ void MessageLogWidget::connectToGame(Game *game) ...@@ -192,7 +208,7 @@ void MessageLogWidget::connectToGame(Game *game)
connect(game, SIGNAL(logShuffle(Player *)), this, SLOT(logShuffle(Player *))); connect(game, SIGNAL(logShuffle(Player *)), this, SLOT(logShuffle(Player *)));
connect(game, SIGNAL(logRollDice(Player *, int, int)), this, SLOT(logRollDice(Player *, int, int))); connect(game, SIGNAL(logRollDice(Player *, int, int)), this, SLOT(logRollDice(Player *, int, int)));
connect(game, SIGNAL(logDraw(Player *, int)), this, SLOT(logDraw(Player *, int))); connect(game, SIGNAL(logDraw(Player *, int)), this, SLOT(logDraw(Player *, int)));
connect(game, SIGNAL(logMoveCard(Player *, QString, QString, int, QString, int)), this, SLOT(logMoveCard(Player *, QString, QString, int, QString, int))); connect(game, SIGNAL(logMoveCard(Player *, QString, CardZone *, int, CardZone *, int)), this, SLOT(logMoveCard(Player *, QString, CardZone *, int, CardZone *, int)));
connect(game, SIGNAL(logCreateToken(Player *, QString)), this, SLOT(logCreateToken(Player *, QString))); connect(game, SIGNAL(logCreateToken(Player *, QString)), this, SLOT(logCreateToken(Player *, QString)));
connect(game, SIGNAL(logSetCardCounters(Player *, QString, int, int)), this, SLOT(logSetCardCounters(Player *, QString, int, int))); connect(game, SIGNAL(logSetCardCounters(Player *, QString, int, int)), this, SLOT(logSetCardCounters(Player *, QString, int, int)));
connect(game, SIGNAL(logSetTapped(Player *, QString, bool)), this, SLOT(logSetTapped(Player *, QString, bool))); connect(game, SIGNAL(logSetTapped(Player *, QString, bool)), this, SLOT(logSetTapped(Player *, QString, bool)));
......
cockatrice/src/messagelogwidget.h
View file @ cd6c5108
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
class Game; class Game;
class Player; class Player;
class CardZone;
class MessageLogWidget : public QTextEdit { class MessageLogWidget : public QTextEdit {
Q_OBJECT Q_OBJECT
...@@ -28,7 +29,7 @@ private slots: ...@@ -28,7 +29,7 @@ private slots:
void logShuffle(Player *player); void logShuffle(Player *player);
void logRollDice(Player *player, int sides, int roll); void logRollDice(Player *player, int sides, int roll);
void logDraw(Player *player, int number); void logDraw(Player *player, int number);
void logMoveCard(Player *player, QString cardName, QString startZone, int oldX, QString targetZone, int newX); void logMoveCard(Player *player, QString cardName, CardZone *startZone, int oldX, CardZone *targetZone, int newX);
void logCreateToken(Player *player, QString cardName); void logCreateToken(Player *player, QString cardName);
void logSetCardCounters(Player *player, QString cardName, int value, int oldValue); void logSetCardCounters(Player *player, QString cardName, int value, int oldValue);
void logSetTapped(Player *player, QString cardName, bool tapped); void logSetTapped(Player *player, QString cardName, bool tapped);
......
cockatrice/src/player.cpp
View file @ cd6c5108
...@@ -236,7 +236,7 @@ void Player::gameEvent(const ServerEventData &event) ...@@ -236,7 +236,7 @@ void Player::gameEvent(const ServerEventData &event)
// The log event has to be sent before the card is added to the target zone // The log event has to be sent before the card is added to the target zone
// because the addCard function can modify the card object. // because the addCard function can modify the card object.
emit logMoveCard(this, card->getName(), startZone->getName(), logPosition, targetZone->getName(), logX); emit logMoveCard(this, card->getName(), startZone, logPosition, targetZone, logX);
targetZone->addCard(card, true, x, y); targetZone->addCard(card, true, x, y);
......
cockatrice/src/player.h
View file @ cd6c5108
...@@ -23,7 +23,7 @@ signals: ...@@ -23,7 +23,7 @@ signals:
void toggleZoneView(Player *player, QString zoneName, int number); void toggleZoneView(Player *player, QString zoneName, int number);
void sigShowCardMenu(QPoint p); void sigShowCardMenu(QPoint p);
// Log events // Log events
void logMoveCard(Player *player, QString cardName, QString startZone, int oldX, QString targetZone, int newX); void logMoveCard(Player *player, QString cardName, CardZone *startZone, int oldX, CardZone *targetZone, int newX);
void logCreateToken(Player *player, QString cardName); void logCreateToken(Player *player, QString cardName);
void logSetCardCounters(Player *player, QString cardName, int value, int oldValue); void logSetCardCounters(Player *player, QString cardName, int value, int oldValue);
void logSetTapped(Player *player, QString cardName, bool tapped); void logSetTapped(Player *player, QString cardName, bool tapped);
......
cockatrice/src/window_main.cpp
View file @ cd6c5108
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "window_deckeditor.h" #include "window_deckeditor.h"
#include "cardinfowidget.h" #include "cardinfowidget.h"
#include "messagelogwidget.h" #include "messagelogwidget.h"
#include "phasestoolbar.h"
#include "gameview.h" #include "gameview.h"
#include "player.h" #include "player.h"
#include "game.h" #include "game.h"
...@@ -289,7 +289,10 @@ MainWindow::MainWindow(QTranslator *_translator, QWidget *parent) ...@@ -289,7 +289,10 @@ MainWindow::MainWindow(QTranslator *_translator, QWidget *parent)
viewLayout = new QVBoxLayout; viewLayout = new QVBoxLayout;
viewLayout->addWidget(view); viewLayout->addWidget(view);
PhasesToolbar *phasesToolbar = new PhasesToolbar;
QHBoxLayout *mainLayout = new QHBoxLayout; QHBoxLayout *mainLayout = new QHBoxLayout;
mainLayout->addWidget(phasesToolbar);
mainLayout->addLayout(viewLayout, 10); mainLayout->addLayout(viewLayout, 10);
mainLayout->addLayout(verticalLayout); mainLayout->addLayout(verticalLayout);
......
cockatrice/translations/cockatrice_de.ts
View file @ cd6c5108
...@@ -232,27 +232,27 @@ ...@@ -232,27 +232,27 @@
<context> <context>
<name>DlgSettings</name> <name>DlgSettings</name>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="329"/> <location filename="../src/dlg_settings.cpp" line="334"/>
<source>Settings</source> <source>Settings</source>
<translation>Einstellungen</translation> <translation>Einstellungen</translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="331"/> <location filename="../src/dlg_settings.cpp" line="336"/>
<source>General</source> <source>General</source>
<translation>Allgemeines</translation> <translation>Allgemeines</translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="334"/> <location filename="../src/dlg_settings.cpp" line="337"/>
<source>Appearance</source> <source>Appearance</source>
<translation>Erscheinungsbild</translation> <translation>Erscheinungsbild</translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="337"/> <location filename="../src/dlg_settings.cpp" line="338"/>
<source>Messages</source> <source>Messages</source>
<translation>Nachrichten</translation> <translation>Nachrichten</translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="339"/> <location filename="../src/dlg_settings.cpp" line="340"/>
<source>&amp;Close</source> <source>&amp;Close</source>
<translation>S&amp;chließen</translation> <translation>S&amp;chließen</translation>
</message> </message>
...@@ -446,48 +446,48 @@ ...@@ -446,48 +446,48 @@
<translation>F10</translation> <translation>F10</translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="285"/> <location filename="../src/game.cpp" line="290"/>
<source>Set life</source> <source>Set life</source>
<translation>Setze Leben</translation> <translation>Setze Leben</translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="285"/> <location filename="../src/game.cpp" line="290"/>
<source>New life total:</source> <source>New life total:</source>
<translation>Neues Leben insgesammt:</translation> <translation>Neues Leben insgesammt:</translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="298"/> <location filename="../src/game.cpp" line="303"/>
<source>Roll dice</source> <source>Roll dice</source>
<translation>Würfeln</translation> <translation>Würfeln</translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="298"/> <location filename="../src/game.cpp" line="303"/>
<source>Number of sides:</source> <source>Number of sides:</source>
<translation>Anzahl der Seiten:</translation> <translation>Anzahl der Seiten:</translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="310"/> <location filename="../src/game.cpp" line="315"/>
<source>Draw cards</source> <source>Draw cards</source>
<translation>Karten ziehen</translation> <translation>Karten ziehen</translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="310"/> <location filename="../src/game.cpp" line="315"/>
<location filename="../src/game.cpp" line="388"/> <location filename="../src/game.cpp" line="393"/>
<source>Number:</source> <source>Number:</source>
<translation>Anzahl:</translation> <translation>Anzahl:</translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="317"/> <location filename="../src/game.cpp" line="322"/>
<source>Create token</source> <source>Create token</source>
<translation>Token erstellen</translation> <translation>Token erstellen</translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="317"/> <location filename="../src/game.cpp" line="322"/>
<source>Name:</source> <source>Name:</source>
<translation>Name:</translation> <translation>Name:</translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="388"/> <location filename="../src/game.cpp" line="393"/>
<source>Set counters</source> <source>Set counters</source>
<translation>Setze Zählmarke</translation> <translation>Setze Zählmarke</translation>
</message> </message>
...@@ -706,132 +706,171 @@ ...@@ -706,132 +706,171 @@
<context> <context>
<name>MessageLogWidget</name> <name>MessageLogWidget</name>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="15"/> <location filename="../src/messagelogwidget.cpp" line="16"/>
<source>Connecting to %1...</source> <source>Connecting to %1...</source>
<translation>Verbinde zu %1...</translation> <translation>Verbinde zu %1...</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="20"/> <location filename="../src/messagelogwidget.cpp" line="21"/>
<source>Connected.</source> <source>Connected.</source>
<translation>Verbunden.</translation> <translation>Verbunden.</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="29"/> <location filename="../src/messagelogwidget.cpp" line="30"/>
<source>Disconnected from server.</source> <source>Disconnected from server.</source>
<translation>Verbindung zum Server trennen.</translation> <translation>Verbindung zum Server getrennt.</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="40"/> <location filename="../src/messagelogwidget.cpp" line="41"/>
<source>Invalid password.</source> <source>Invalid password.</source>
<translation>Ungültiges Passwort.</translation> <translation>Ungültiges Passwort.</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="48"/> <location filename="../src/messagelogwidget.cpp" line="49"/>
<source>You have joined the game. Player list:</source> <source>You have joined the game. Player list:</source>
<translation>Du bist dem Spiel beigetreten. Spielerliste:</translation> <translation>Du bist dem Spiel beigetreten. Spielerliste:</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="56"/> <location filename="../src/messagelogwidget.cpp" line="57"/>
<source>%1 has joined the game</source> <source>%1 has joined the game</source>
<translation>%1 ist dem Spiel beigetreten</translation> <translation>%1 ist dem Spiel beigetreten</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="61"/> <location filename="../src/messagelogwidget.cpp" line="62"/>
<source>%1 has left the game</source> <source>%1 has left the game</source>
<translation>%1 hat das Spiel verlassen</translation> <translation>%1 hat das Spiel verlassen</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="66"/> <location filename="../src/messagelogwidget.cpp" line="67"/>
<source>%1 is ready to start a new game.</source> <source>%1 is ready to start a new game.</source>
<translation>%1 ist bereit ein neues Spiel zu starten.</translation> <translation>%1 ist bereit ein neues Spiel zu starten.</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="71"/> <location filename="../src/messagelogwidget.cpp" line="72"/>
<source>Game has started.</source> <source>Game has started.</source>
<translation>Spiel hat begonnen.</translation> <translation>Spiel hat begonnen.</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="81"/> <location filename="../src/messagelogwidget.cpp" line="82"/>
<source>%1 shuffles his/her library</source> <source>%1 shuffles his/her library</source>
<translation>%1 mischt seine/ihre Bibliothek</translation> <translation>%1 mischt seine/ihre Bibliothek</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="86"/> <location filename="../src/messagelogwidget.cpp" line="87"/>
<source>%1 rolled a %2 with a %3-sided dice</source> <source>%1 rolled a %2 with a %3-sided dice</source>
<translation>%1 würfelte eine %2 mit einem %3-seitigen Würfel</translation> <translation>%1 würfelte eine %2 mit einem %3-seitigen Würfel</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="92"/> <location filename="../src/messagelogwidget.cpp" line="93"/>
<source>%1 draws a card</source> <source>%1 draws a card</source>
<translation>%1 zieht eine Karte</translation> <translation>%1 zieht eine Karte</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="94"/> <location filename="../src/messagelogwidget.cpp" line="95"/>
<source>%1 draws %2 cards</source> <source>%1 draws %2 cards</source>
<translation>%1 zieht %2 Karten</translation> <translation>%1 zieht %2 Karten</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="103"/> <location filename="../src/messagelogwidget.cpp" line="106"/>
<source>from table</source> <source>from table</source>
<translation>vom Spielfeld</translation> <translation>vom Spielfeld</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="105"/> <location filename="../src/messagelogwidget.cpp" line="108"/>
<source>from graveyard</source> <source>from graveyard</source>
<translation>aus dem Friedhof</translation> <translation>aus dem Friedhof</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="107"/> <location filename="../src/messagelogwidget.cpp" line="110"/>
<source>from exile</source> <source>from exile</source>
<translation>aus dem Exil</translation> <translation>aus dem Exil</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="109"/> <location filename="../src/messagelogwidget.cpp" line="112"/>
<source>from hand</source> <source>from hand</source>
<translation>von der Hand</translation> <translation>von der Hand</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="111"/> <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="117"/>
<source>from the top of his library</source>
<translation>oben von seiner Bibliothek</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="119"/>
<source>from library</source> <source>from library</source>
<translation>von der Bibliothek</translation> <translation>von der Bibliothek</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="115"/> <location filename="../src/messagelogwidget.cpp" line="121"/>
<source>from sideboard</source>
<translation>aus seinem Sideboard</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="125"/>
<source>%1 puts %2 into play %3</source> <source>%1 puts %2 into play %3</source>
<translation>%1 bringt %2 %3 ins Spiel</translation> <translation>%1 bringt %2 %3 ins Spiel</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="118"/> <location filename="../src/messagelogwidget.cpp" line="127"/>
<source>%1 puts %2 %3 into graveyard</source> <source>%1 puts %2 %3 into graveyard</source>
<translation>%1 legt %2 %3 in den Friedhof</translation> <translation>%1 legt %2 %3 in den Friedhof</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="120"/> <location filename="../src/messagelogwidget.cpp" line="129"/>
<source>%1 exiles %2 %3</source> <source>%1 exiles %2 %3</source>
<translation>%1 schickt %2 %3 ins Exil</translation> <translation>%1 schickt %2 %3 ins Exil</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="122"/> <location filename="../src/messagelogwidget.cpp" line="131"/>
<source>%1 moves %2 %3 to hand</source> <source>%1 moves %2 %3 to hand</source>
<translation>%1 nimmt %2 %3 auf die Hand</translation> <translation>%1 nimmt %2 %3 auf die Hand</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="124"/> <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="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="138"/>
<source>%1 puts %2 %3 on top of his library</source> <source>%1 puts %2 %3 on top of his library</source>
<translation>%1 legt %2 %3 auf die Bibliothek</translation> <translation>%1 legt %2 %3 auf die Bibliothek</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="126"/> <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="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="197"/>
<source>%1 stops looking at %2&apos;s %3</source>
<translation>%1 sieht sich %2s %3 nicht mehr an</translation>
</message>
<message>
<source>%1 moves %2 %3 to %4</source> <source>%1 moves %2 %3 to %4</source>
<translation>%1 bewegt %2 %3 nach %4</translation> <translation type="obsolete">%1 bewegt %2 %3 nach %4</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="150"/> <location filename="../src/messagelogwidget.cpp" line="169"/>
<source>taps</source> <source>taps</source>
<translation>tappt</translation> <translation>tappt</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="150"/> <location filename="../src/messagelogwidget.cpp" line="169"/>
<source>untaps</source> <source>untaps</source>
<translation>enttappt</translation> <translation>enttappt</translation>
</message> </message>
...@@ -844,52 +883,52 @@ ...@@ -844,52 +883,52 @@
<translation type="obsolete">%1 bewegt %2 von %3 nach %4</translation> <translation type="obsolete">%1 bewegt %2 von %3 nach %4</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="133"/> <location filename="../src/messagelogwidget.cpp" line="149"/>
<source>%1 creates token: %2</source> <source>%1 creates token: %2</source>
<translation>%1 erstellt Token: %2</translation> <translation>%1 erstellt Token: %2</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="140"/> <location filename="../src/messagelogwidget.cpp" line="156"/>
<source>%1 places %2 counters on %3 (now %4)</source> <source>%1 places %2 counters on %3 (now %4)</source>
<translation>%1 legt %2 Zählmarken auf %3 (jetzt %4)</translation> <translation>%1 legt %2 Zählmarken auf %3 (jetzt %4)</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="142"/> <location filename="../src/messagelogwidget.cpp" line="158"/>
<source>%1 removes %2 counters from %3 (now %4)</source> <source>%1 removes %2 counters from %3 (now %4)</source>
<translation>%1 entfernt %2 Zählmarken von %3 (jetzt %4)</translation> <translation>%1 entfernt %2 Zählmarken von %3 (jetzt %4)</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="149"/> <location filename="../src/messagelogwidget.cpp" line="166"/>
<source>his permanents</source> <source>his permanents</source>
<translation>seine bleibenden Karten</translation> <translation>seine bleibenden Karten</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="150"/> <location filename="../src/messagelogwidget.cpp" line="169"/>
<source>%1 %2 %3</source> <source>%1 %2 %3</source>
<translation>%1 %2 %3</translation> <translation>%1 %2 %3</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="155"/> <location filename="../src/messagelogwidget.cpp" line="174"/>
<source>%1 sets counter &quot;%2&quot; to %3 (%4%5)</source> <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> <translation>%1 setzt Zähler &quot;%2&quot; auf %3 (%4%5)</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="162"/> <location filename="../src/messagelogwidget.cpp" line="181"/>
<source>%1 sets %2 to not untap normally.</source> <source>%1 sets %2 to not untap normally.</source>
<translation>%1 setzt %2 auf explizites Enttappen.</translation> <translation>%1 setzt %2 auf explizites Enttappen.</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="164"/> <location filename="../src/messagelogwidget.cpp" line="183"/>
<source>%1 sets %2 to untap normally.</source> <source>%1 sets %2 to untap normally.</source>
<translation>%1 setzt %2 auf normales Enttappen.</translation> <translation>%1 setzt %2 auf normales Enttappen.</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="171"/> <location filename="../src/messagelogwidget.cpp" line="190"/>
<source>%1 is looking at the top %2 cards of %3&apos;s %4</source> <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> <translation>%1 sieht sich die obersten %2 Karten von %3s %4 an</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="173"/> <location filename="../src/messagelogwidget.cpp" line="192"/>
<source>%1 is looking at %2&apos;s %3</source> <source>%1 is looking at %2&apos;s %3</source>
<translation>%1 sieht sich %2s %3 an</translation> <translation>%1 sieht sich %2s %3 an</translation>
</message> </message>
......
cockatrice/translations/cockatrice_en.ts
View file @ cd6c5108
...@@ -173,27 +173,27 @@ ...@@ -173,27 +173,27 @@
<context> <context>
<name>DlgSettings</name> <name>DlgSettings</name>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="329"/> <location filename="../src/dlg_settings.cpp" line="334"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="331"/> <location filename="../src/dlg_settings.cpp" line="336"/>
<source>General</source> <source>General</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="334"/> <location filename="../src/dlg_settings.cpp" line="337"/>
<source>Appearance</source> <source>Appearance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="337"/> <location filename="../src/dlg_settings.cpp" line="338"/>
<source>Messages</source> <source>Messages</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="339"/> <location filename="../src/dlg_settings.cpp" line="340"/>
<source>&amp;Close</source> <source>&amp;Close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
...@@ -379,48 +379,48 @@ ...@@ -379,48 +379,48 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="285"/> <location filename="../src/game.cpp" line="290"/>
<source>Set life</source> <source>Set life</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="285"/> <location filename="../src/game.cpp" line="290"/>
<source>New life total:</source> <source>New life total:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="298"/> <location filename="../src/game.cpp" line="303"/>
<source>Roll dice</source> <source>Roll dice</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="298"/> <location filename="../src/game.cpp" line="303"/>
<source>Number of sides:</source> <source>Number of sides:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="310"/> <location filename="../src/game.cpp" line="315"/>
<source>Draw cards</source> <source>Draw cards</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="310"/> <location filename="../src/game.cpp" line="315"/>
<location filename="../src/game.cpp" line="388"/> <location filename="../src/game.cpp" line="393"/>
<source>Number:</source> <source>Number:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="317"/> <location filename="../src/game.cpp" line="322"/>
<source>Create token</source> <source>Create token</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="317"/> <location filename="../src/game.cpp" line="322"/>
<source>Name:</source> <source>Name:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/game.cpp" line="388"/> <location filename="../src/game.cpp" line="393"/>
<source>Set counters</source> <source>Set counters</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
...@@ -639,182 +639,217 @@ ...@@ -639,182 +639,217 @@
<context> <context>
<name>MessageLogWidget</name> <name>MessageLogWidget</name>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="15"/> <location filename="../src/messagelogwidget.cpp" line="16"/>
<source>Connecting to %1...</source> <source>Connecting to %1...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="20"/> <location filename="../src/messagelogwidget.cpp" line="21"/>
<source>Connected.</source> <source>Connected.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="29"/> <location filename="../src/messagelogwidget.cpp" line="30"/>
<source>Disconnected from server.</source> <source>Disconnected from server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="40"/> <location filename="../src/messagelogwidget.cpp" line="41"/>
<source>Invalid password.</source> <source>Invalid password.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="48"/> <location filename="../src/messagelogwidget.cpp" line="49"/>
<source>You have joined the game. Player list:</source> <source>You have joined the game. Player list:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="56"/> <location filename="../src/messagelogwidget.cpp" line="57"/>
<source>%1 has joined the game</source> <source>%1 has joined the game</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="61"/> <location filename="../src/messagelogwidget.cpp" line="62"/>
<source>%1 has left the game</source> <source>%1 has left the game</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="66"/> <location filename="../src/messagelogwidget.cpp" line="67"/>
<source>%1 is ready to start a new game.</source> <source>%1 is ready to start a new game.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="71"/> <location filename="../src/messagelogwidget.cpp" line="72"/>
<source>Game has started.</source> <source>Game has started.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="81"/> <location filename="../src/messagelogwidget.cpp" line="82"/>
<source>%1 shuffles his/her library</source> <source>%1 shuffles his/her library</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="86"/> <location filename="../src/messagelogwidget.cpp" line="87"/>
<source>%1 rolled a %2 with a %3-sided dice</source> <source>%1 rolled a %2 with a %3-sided dice</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="92"/> <location filename="../src/messagelogwidget.cpp" line="93"/>
<source>%1 draws a card</source> <source>%1 draws a card</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="94"/> <location filename="../src/messagelogwidget.cpp" line="95"/>
<source>%1 draws %2 cards</source> <source>%1 draws %2 cards</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="103"/> <location filename="../src/messagelogwidget.cpp" line="106"/>
<source>from table</source> <source>from table</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="105"/> <location filename="../src/messagelogwidget.cpp" line="108"/>
<source>from graveyard</source> <source>from graveyard</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="107"/> <location filename="../src/messagelogwidget.cpp" line="110"/>
<source>from exile</source> <source>from exile</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="109"/> <location filename="../src/messagelogwidget.cpp" line="112"/>
<source>from hand</source> <source>from hand</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="111"/> <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="117"/>
<source>from the top of his library</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="119"/>
<source>from library</source> <source>from library</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="115"/> <location filename="../src/messagelogwidget.cpp" line="121"/>
<source>from sideboard</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="125"/>
<source>%1 puts %2 into play %3</source> <source>%1 puts %2 into play %3</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="118"/> <location filename="../src/messagelogwidget.cpp" line="127"/>
<source>%1 puts %2 %3 into graveyard</source> <source>%1 puts %2 %3 into graveyard</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="120"/> <location filename="../src/messagelogwidget.cpp" line="129"/>
<source>%1 exiles %2 %3</source> <source>%1 exiles %2 %3</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="122"/> <location filename="../src/messagelogwidget.cpp" line="131"/>
<source>%1 moves %2 %3 to hand</source> <source>%1 moves %2 %3 to hand</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="124"/> <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="136"/>
<source>%1 puts %2 %3 on bottom of his library</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="138"/>
<source>%1 puts %2 %3 on top of his library</source> <source>%1 puts %2 %3 on top of his library</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="126"/> <location filename="../src/messagelogwidget.cpp" line="140"/>
<source>%1 moves %2 %3 to %4</source> <source>%1 puts %2 %3 into his library at position %4</source>
<translation type="unfinished"></translation>
</message>
<message>
<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="197"/>
<source>%1 stops looking at %2&apos;s %3</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="133"/> <location filename="../src/messagelogwidget.cpp" line="149"/>
<source>%1 creates token: %2</source> <source>%1 creates token: %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="140"/> <location filename="../src/messagelogwidget.cpp" line="156"/>
<source>%1 places %2 counters on %3 (now %4)</source> <source>%1 places %2 counters on %3 (now %4)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="142"/> <location filename="../src/messagelogwidget.cpp" line="158"/>
<source>%1 removes %2 counters from %3 (now %4)</source> <source>%1 removes %2 counters from %3 (now %4)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="150"/> <location filename="../src/messagelogwidget.cpp" line="169"/>
<source>%1 %2 %3</source> <source>%1 %2 %3</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="150"/> <location filename="../src/messagelogwidget.cpp" line="169"/>
<source>taps</source> <source>taps</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="150"/> <location filename="../src/messagelogwidget.cpp" line="169"/>
<source>untaps</source> <source>untaps</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="155"/> <location filename="../src/messagelogwidget.cpp" line="174"/>
<source>%1 sets counter &quot;%2&quot; to %3 (%4%5)</source> <source>%1 sets counter &quot;%2&quot; to %3 (%4%5)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="162"/> <location filename="../src/messagelogwidget.cpp" line="181"/>
<source>%1 sets %2 to not untap normally.</source> <source>%1 sets %2 to not untap normally.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="164"/> <location filename="../src/messagelogwidget.cpp" line="183"/>
<source>%1 sets %2 to untap normally.</source> <source>%1 sets %2 to untap normally.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="171"/> <location filename="../src/messagelogwidget.cpp" line="190"/>
<source>%1 is looking at the top %2 cards of %3&apos;s %4</source> <source>%1 is looking at the top %2 cards of %3&apos;s %4</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="173"/> <location filename="../src/messagelogwidget.cpp" line="192"/>
<source>%1 is looking at %2&apos;s %3</source> <source>%1 is looking at %2&apos;s %3</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="149"/> <location filename="../src/messagelogwidget.cpp" line="166"/>
<source>his permanents</source> <source>his permanents</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
......
servatrice/src/playerzone.h
View file @ cd6c5108
...@@ -49,7 +49,7 @@ public: ...@@ -49,7 +49,7 @@ public:
Card *getCard(int id, bool remove, int *position = NULL); Card *getCard(int id, bool remove, int *position = NULL);
int getCardsBeingLookedAt() const { return cardsBeingLookedAt; } int getCardsBeingLookedAt() const { return cardsBeingLookedAt; }
void setCardsBeingLookedAt(bool _cardsBeingLookedAt) { cardsBeingLookedAt = _cardsBeingLookedAt; } void setCardsBeingLookedAt(int _cardsBeingLookedAt) { cardsBeingLookedAt = _cardsBeingLookedAt; }
bool hasCoords() const { return has_coords; } bool hasCoords() const { return has_coords; }
ZoneType getType() const { return type; } ZoneType getType() const { return type; }
QString getName() const { return name; } QString getName() const { return name; }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment