diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 5e9d9140f..e0fb0b963 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -72,6 +72,7 @@
resources/countries/fi.svgresources/countries/fr.svgresources/countries/gr.svg
+ resources/countries/gt.svgresources/countries/hu.svgresources/countries/ie.svgresources/countries/il.svg
diff --git a/cockatrice/src/decklistmodel.cpp b/cockatrice/src/decklistmodel.cpp
index 82a443264..8c7ede32e 100644
--- a/cockatrice/src/decklistmodel.cpp
+++ b/cockatrice/src/decklistmodel.cpp
@@ -17,6 +17,7 @@ DeckListModel::DeckListModel(QObject *parent)
{
deckList = new DeckList;
connect(deckList, SIGNAL(deckLoaded()), this, SLOT(rebuildTree()));
+ connect(deckList, SIGNAL(deckHashChanged()), this, SIGNAL(deckHashChanged()));
root = new InnerDecklistNode;
}
@@ -194,6 +195,7 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, int
default: return false;
}
emitRecursiveUpdates(index);
+ deckList->updateDeckHash();
return true;
}
@@ -310,6 +312,8 @@ void DeckListModel::setDeckList(DeckList *_deck)
{
delete deckList;
deckList = _deck;
+ connect(deckList, SIGNAL(deckLoaded()), this, SLOT(rebuildTree()));
+ connect(deckList, SIGNAL(deckHashChanged()), this, SIGNAL(deckHashChanged()));
rebuildTree();
}
diff --git a/cockatrice/src/decklistmodel.h b/cockatrice/src/decklistmodel.h
index a8a22c78b..bab462330 100644
--- a/cockatrice/src/decklistmodel.h
+++ b/cockatrice/src/decklistmodel.h
@@ -30,6 +30,8 @@ private slots:
void rebuildTree();
public slots:
void printDeckList(QPrinter *printer);
+signals:
+ void deckHashChanged();
public:
DeckListModel(QObject *parent = 0);
~DeckListModel();
diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp
index 98b61c907..40f4b5771 100644
--- a/cockatrice/src/messagelogwidget.cpp
+++ b/cockatrice/src/messagelogwidget.cpp
@@ -58,19 +58,12 @@ void MessageLogWidget::logLeaveSpectator(QString name)
appendHtml(tr("%1 is not watching the game any more.").arg(sanitizeHtml(name)));
}
-void MessageLogWidget::logDeckSelect(Player *player, int deckId)
+void MessageLogWidget::logDeckSelect(Player *player, QString deckHash)
{
- if (deckId == -1) {
- if (isFemale(player))
- appendHtml(tr("%1 has loaded a local deck.", "female").arg(sanitizeHtml(player->getName())));
- else
- appendHtml(tr("%1 has loaded a local deck.", "male").arg(sanitizeHtml(player->getName())));
- } else {
- if (isFemale(player))
- appendHtml(tr("%1 has loaded deck #%2.", "female").arg(sanitizeHtml(player->getName())).arg(deckId));
- else
- appendHtml(tr("%1 has loaded deck #%2.", "male").arg(sanitizeHtml(player->getName())).arg(deckId));
- }
+ if (isFemale(player))
+ appendHtml(tr("%1 has loaded a deck (%2).", "female").arg(sanitizeHtml(player->getName())).arg(deckHash));
+ else
+ appendHtml(tr("%1 has loaded a deck (%2).", "male").arg(sanitizeHtml(player->getName())).arg(deckHash));
}
void MessageLogWidget::logReadyStart(Player *player)
diff --git a/cockatrice/src/messagelogwidget.h b/cockatrice/src/messagelogwidget.h
index 37d4a2422..b472dbd49 100644
--- a/cockatrice/src/messagelogwidget.h
+++ b/cockatrice/src/messagelogwidget.h
@@ -46,7 +46,7 @@ public slots:
void logGameClosed();
void logJoinSpectator(QString name);
void logLeaveSpectator(QString name);
- void logDeckSelect(Player *player, int deckId);
+ void logDeckSelect(Player *player, QString deckHash);
void logReadyStart(Player *player);
void logNotReadyStart(Player *player);
void logConcede(Player *player);
diff --git a/cockatrice/src/playerlistwidget.cpp b/cockatrice/src/playerlistwidget.cpp
index 6f0e27ed4..fee463d0e 100644
--- a/cockatrice/src/playerlistwidget.cpp
+++ b/cockatrice/src/playerlistwidget.cpp
@@ -98,15 +98,7 @@ void PlayerListWidget::updatePlayerProperties(ServerInfo_PlayerProperties *prop)
player->setIcon(4, QIcon(CountryPixmapGenerator::generatePixmap(12, prop->getUserInfo()->getCountry())));
player->setData(4, Qt::UserRole, prop->getUserInfo()->getName());
player->setData(4, Qt::UserRole + 1, prop->getPlayerId());
-
- QString deckText;
- if (!prop->getSpectator())
- switch (prop->getDeckId()) {
- case -2: deckText = QString(); break;
- case -1: deckText = tr("local deck"); break;
- default: deckText = tr("deck #%1").arg(prop->getDeckId());
- }
- player->setText(5, deckText);
+ player->setText(5, prop->getDeckHash());
}
void PlayerListWidget::removePlayer(int playerId)
diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp
index d6e70b08a..513bf9857 100644
--- a/cockatrice/src/tab_game.cpp
+++ b/cockatrice/src/tab_game.cpp
@@ -620,7 +620,7 @@ void TabGame::eventPlayerPropertiesChanged(Event_PlayerPropertiesChanged *event,
break;
}
- case ItemId_Context_DeckSelect: messageLog->logDeckSelect(player, static_cast(context)->getDeckId()); break;
+ case ItemId_Context_DeckSelect: messageLog->logDeckSelect(player, static_cast(context)->getDeckHash()); break;
default: ;
}
}
diff --git a/cockatrice/src/window_deckeditor.cpp b/cockatrice/src/window_deckeditor.cpp
index 5387e4c52..c8723f0a6 100644
--- a/cockatrice/src/window_deckeditor.cpp
+++ b/cockatrice/src/window_deckeditor.cpp
@@ -99,6 +99,7 @@ WndDeckEditor::WndDeckEditor(QWidget *parent)
middleFrame->addLayout(verticalToolBarLayout);
deckModel = new DeckListModel(this);
+ connect(deckModel, SIGNAL(deckHashChanged()), this, SLOT(updateHash()));
deckView = new QTreeView();
deckView->setModel(deckModel);
deckView->setUniformRowHeights(true);
@@ -114,6 +115,8 @@ WndDeckEditor::WndDeckEditor(QWidget *parent)
commentsEdit->setMaximumHeight(70);
commentsLabel->setBuddy(commentsEdit);
connect(commentsEdit, SIGNAL(textChanged()), this, SLOT(updateComments()));
+ QLabel *hashLabel1 = new QLabel(tr("Hash:"));
+ hashLabel = new QLabel;
QGridLayout *grid = new QGridLayout;
grid->addWidget(nameLabel, 0, 0);
@@ -121,6 +124,9 @@ WndDeckEditor::WndDeckEditor(QWidget *parent)
grid->addWidget(commentsLabel, 1, 0);
grid->addWidget(commentsEdit, 1, 1);
+
+ grid->addWidget(hashLabel1, 2, 0);
+ grid->addWidget(hashLabel, 2, 1);
// Update price
aUpdatePrices = new QAction(tr("&Update prices"), this);
@@ -140,10 +146,9 @@ WndDeckEditor::WndDeckEditor(QWidget *parent)
deckToolbarLayout->addWidget(deckToolBar);
deckToolbarLayout->addStretch();
-
QVBoxLayout *rightFrame = new QVBoxLayout;
rightFrame->addLayout(grid);
- rightFrame->addWidget(deckView);
+ rightFrame->addWidget(deckView, 10);
rightFrame->addLayout(deckToolbarLayout);
QHBoxLayout *mainLayout = new QHBoxLayout;
@@ -230,6 +235,7 @@ WndDeckEditor::WndDeckEditor(QWidget *parent)
verticalToolBar->addAction(aRemoveCard);
verticalToolBar->addAction(aIncrement);
verticalToolBar->addAction(aDecrement);
+ verticalToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
dlgCardSearch = new DlgCardSearch(this);
@@ -273,6 +279,11 @@ void WndDeckEditor::updateSearch(const QString &search)
databaseView->selectionModel()->setCurrentIndex(databaseDisplayModel->index(0, 0), QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
}
+void WndDeckEditor::updateHash()
+{
+ hashLabel->setText(deckModel->getDeckList()->getDeckHash());
+}
+
bool WndDeckEditor::confirmClose()
{
if (isWindowModified()) {
@@ -305,6 +316,7 @@ void WndDeckEditor::actNewDeck()
nameEdit->setText(QString());
commentsEdit->setText(QString());
lastFileName = QString();
+ setWindowModified(false);
}
void WndDeckEditor::actLoadDeck()
@@ -506,6 +518,7 @@ void WndDeckEditor::setDeck(DeckList *_deck, const QString &_lastFileName, DeckL
lastFileFormat = _lastFileFormat;
nameEdit->setText(_deck->getName());
commentsEdit->setText(_deck->getComments());
+ updateHash();
deckModel->sort(1);
deckView->expandAll();
setWindowModified(false);
diff --git a/cockatrice/src/window_deckeditor.h b/cockatrice/src/window_deckeditor.h
index 92a90bb99..7f3dd927c 100644
--- a/cockatrice/src/window_deckeditor.h
+++ b/cockatrice/src/window_deckeditor.h
@@ -14,6 +14,7 @@ class QTableView;
class CardInfoWidget;
class QTextEdit;
class DlgCardSearch;
+class QLabel;
class SearchLineEdit : public QLineEdit {
private:
@@ -30,6 +31,7 @@ class WndDeckEditor : public QMainWindow {
private slots:
void updateName(const QString &name);
void updateComments();
+ void updateHash();
void updateCardInfoLeft(const QModelIndex ¤t, const QModelIndex &previous);
void updateCardInfoRight(const QModelIndex ¤t, const QModelIndex &previous);
void updateSearch(const QString &search);
@@ -72,6 +74,7 @@ private:
SearchLineEdit *searchEdit;
QLineEdit *nameEdit;
QTextEdit *commentsEdit;
+ QLabel *hashLabel;
DlgCardSearch *dlgCardSearch;
QMenu *deckMenu, *dbMenu;
diff --git a/cockatrice/translations/cockatrice_cs.ts b/cockatrice/translations/cockatrice_cs.ts
index 41e756dbd..2cba7f4c2 100644
--- a/cockatrice/translations/cockatrice_cs.ts
+++ b/cockatrice/translations/cockatrice_cs.ts
@@ -136,23 +136,23 @@ Enter 0 for an indefinite ban.
Hodnota 0 je pro ban bez omezení.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.
-
+ &OK&OK
-
+ &Cancel
-
+ Ban user from server
@@ -960,17 +960,17 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckListModel
-
+ NumberPočet
-
+ CardKarta
-
+ PriceCena
@@ -1629,8 +1629,6 @@ All running games will be lost.
Reason for shutdown: %1
-
-
@@ -1910,7 +1908,7 @@ Lokální verze je %1, verze serveru je %2.
%1 ukončil hru.
-
+ The game has started.Hra začíná.
@@ -1967,115 +1965,123 @@ Lokální verze je %1, verze serveru je %2.
%1 opustil hru.
- %1 has loaded a local deck.female
- %1 nahrál lokální balíček.
+ %1 nahrál lokální balíček.
- %1 has loaded a local deck.male
- %1 nahrál lokální balíček.
+ %1 nahrál lokální balíček.
- %1 has loaded deck #%2.female
- %1 nahrál balíček #%2.
+ %1 nahrál balíček #%2.
+
+
+ %1 has loaded deck #%2.
+ male
+ %1 nahrál balíček #%2.
+
+
+
+ %1 has loaded a deck (%2).
+ female
+ %1 nahrál balíček %2.
+
+
+
+ %1 has loaded a deck (%2).
+ male
+ %1 nahrál balíček %2.
- %1 has loaded deck #%2.
- male
- %1 nahrál balíček #%2.
-
-
- %1 is ready to start the game.female%1 je připraven ke hře.
-
+ %1 is ready to start the game.male%1 je připraven ke hře.
-
+ %1 is not ready to start the game any more.female%1 již není připraven ke hře.
-
+ %1 is not ready to start the game any more.male%1 již není připraven ke hře.
-
+ %1 has conceded the game.female%1 ukončil hru.
-
+ %1 has conceded the game.male%1 ukončil hru.
+
+
+ %1 has restored connection to the game.
+ female
+
+
+
+
+ %1 has restored connection to the game.
+ male
+
+
+
+
+ %1 has lost connection to the game.
+ female
+
+
- %1 has restored connection to the game.
- female
-
-
-
-
- %1 has restored connection to the game.
- male
-
-
-
-
- %1 has lost connection to the game.
- female
-
-
-
- %1 has lost connection to the game.male
-
+ %1 shuffles %2.female
+
+
+ %1 shuffles %2.
+ male
+
+
- %1 shuffles %2.
- male
-
-
-
- %1 rolls a %2 with a %3-sided die.female%1 hodil kostkou %2 (%3 stěn).
-
+ %1 rolls a %2 with a %3-sided die.male%1 hodil kostkou %2 (%3 stěn).
-
+ %1 draws %n card(s).female
@@ -2085,198 +2091,198 @@ Lokální verze je %1, verze serveru je %2.
+
+ %1 draws %n card(s).
+ male
+
+ %1 si lízl %n kartu.
+ %1 si lízl %n karty.
+ %1 si lízl %n karet.
+
+
+
- %1 draws %n card(s).
- male
-
- %1 si lízl %n kartu.
- %1 si lízl %n karty.
- %1 si lízl %n karet.
-
-
-
- %1 undoes his last draw.%1 vrátil zpět svoje poslední líznutí.
-
+ %1 undoes her last draw.
-
+ %1 undoes his last draw (%2).%1 vrátil svoje poslední líznutí (%2).
-
+ %1 undoes her last draw (%2).
-
+ from table z bojiště
-
+ from graveyard ze hřbitova
-
+ from exile z exilnutých karet
-
+ from hand z ruky
-
+ the bottom card of his libraryspodní kartu knihovny
-
+ the bottom card of her library
-
+ from the bottom of his library ze spodku knihovny
-
+ from the bottom of her library
-
+ the top card of his libraryvrchní kartu knihovny
-
+ the top card of her library
-
+ from the top of his libraryz vršku knihovny
-
+ from the top of her library
-
+ from library z knihovny
-
+ from sideboard ze sideboardu
-
+ from the stack ze stacku
-
-
+
+ a cardkartu
-
+ %1 gives %2 control over %3.%1 předává kontrolu hráči %2 karty %3.
-
+ %1 puts %2 into play tapped%3.%1 dává kartu %2 do hry %3 tapnutou.
-
+ %1 puts %2 into play%3.%1 dává kartu %2 %3 do hry.
-
+ %1 puts %2%3 into graveyard.%1 dává kartu %2%3 do hřbitova.
-
+ %1 exiles %2%3.%1 exiluje %2%3.
-
+ %1 moves %2%3 to hand.%1 přesouvá %2%3 do ruky.
-
+ %1 puts %2%3 into his library.%1 dává %2%3 do knihovny.
-
+ %1 puts %2%3 into her library.
-
+ %1 puts %2%3 on bottom of his library.%1 dává %2%3 na spodek knihovny.
-
+ %1 puts %2%3 on bottom of her library.
-
+ %1 puts %2%3 on top of his library.%1 dává %2%3 na vršek knihovny.
-
+ %1 puts %2%3 on top of her library.
-
+ %1 puts %2%3 into his library at position %4.%1 dává %2%3 knihovny na pozici %4.
-
+ %1 puts %2%3 into her library at position %4.
-
+ %1 moves %2%3 to sideboard.%1 přesouvá %2%3 do sideboardu.
-
+ %1 plays %2%3.%1 sesílá %2%3.
-
+ %1 takes a mulligan to %n.female
@@ -2286,7 +2292,7 @@ Lokální verze je %1, verze serveru je %2.
-
+ %1 takes a mulligan to %n.male
@@ -2296,312 +2302,312 @@ Lokální verze je %1, verze serveru je %2.
-
+ %1 draws her initial hand.
-
+ %1 flips %2 face-down.female%1 otáčí %2 lícem dolů.
-
+ %1 flips %2 face-down.male%1 otáčí %2 lícem dolů.
-
+ %1 flips %2 face-up.female%1 otáčí %2 lícem vzhůru.
+
+
+ %1 flips %2 face-up.
+ male
+ %1 otáčí %2 lícem vzhůru.
+
- %1 flips %2 face-up.
- male
- %1 otáčí %2 lícem vzhůru.
-
-
- %1 destroys %2.female%1 ničí %2.
-
+ %1 destroys %2.male%1 ničí %2.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 female%1 připojuje %2 k %3 %4.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male%1 připojuje %2 k %3 %4.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female%1 připojuje %2 k %3 %4.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male%1 připojuje %2 k %3 %4.
-
+ %1 unattaches %2.female%1 odpojuje %2.
-
+ %1 unattaches %2.male%1 odpojuje %2.
-
+ %1 creates token: %2%3.female%1 vykládá token %2%3.
-
+ %1 creates token: %2%3.male%1 vykládá token %2%3.
-
+ %1 points from her %2 to herself.female
-
+ %1 points from his %2 to himself.male
-
+ %1 points from her %2 to %3.p1 female, p2 female
-
+ %1 points from her %2 to %3.p1 female, p2 male
-
+ %1 points from his %2 to %3.p1 male, p2 female
-
+ %1 points from his %2 to %3.p1 male, p2 male
-
+ %1 points from %2's %3 to herself.card owner female, target female
-
+ %1 points from %2's %3 to herself.card owner male, target female
-
+ %1 points from %2's %3 to himself.card owner female, target male
-
+ %1 points from %2's %3 to himself.card owner male, target male
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 female%1 ukazuje kartou %3 (hráče %2) na %4.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 male%1 ukazuje kartou %3 (hráče %2) na %4.
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+ %1 ukazuje kartou %3 (hráče %2) na %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 male
+ %1 ukazuje kartou %3 (hráče %2) na %4.
+ %1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 ukazuje kartou %3 (hráče %2) na %4.%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+ %1 ukazuje kartou %3 (hráče %2) na %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 ukazuje kartou %3 (hráče %2) na %4.%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
- %1 ukazuje kartou %3 (hráče %2) na %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
- %1 ukazuje kartou %3 (hráče %2) na %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
- %1 ukazuje kartou %3 (hráče %2) na %4.
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male%1 ukazuje kartou %3 (hráče %2) na %4.
-
+ %1 points from her %2 to her %3.female
-
+ %1 points from his %2 to his %3.male
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male
-
+ %1 points from %2's %3 to her own %4.card owner female, target female
-
+ %1 points from %2's %3 to her own %4.card owner male, target female
-
+ %1 points from %2's %3 to his own %4.card owner female, target male
-
+ %1 points from %2's %3 to his own %4.card owner male, target male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female%1 ukazuje kartou %3 (hráče %2) na %5 (hráče %4).
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male%1 ukazuje kartou %3 (hráče %2) na %5 (hráče %4).
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female%1 ukazuje kartou %3 (hráče %2) na %5 (hráče %4).
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male%1 ukazuje kartou %3 (hráče %2) na %5 (hráče %4).
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female%1 ukazuje kartou %3 (hráče %2) na %5 (hráče %4).
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male%1 ukazuje kartou %3 (hráče %2) na %5 (hráče %4).
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female%1 ukazuje kartou %3 (hráče %2) na %5 (hráče %4).
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male%1 ukazuje kartou %3 (hráče %2) na %5 (hráče %4).
-
+ %1 places %n %2 counter(s) on %3 (now %4).female
@@ -2611,7 +2617,7 @@ Lokální verze je %1, verze serveru je %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).male
@@ -2621,7 +2627,7 @@ Lokální verze je %1, verze serveru je %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).female
@@ -2631,7 +2637,7 @@ Lokální verze je %1, verze serveru je %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).male
@@ -2641,265 +2647,265 @@ Lokální verze je %1, verze serveru je %2.
-
+ %1 taps her permanents.female
-
+ %1 untaps her permanents.female
-
+ %1 taps his permanents.male
-
+ %1 untaps his permanents.male
+
+
+ %1 taps %2.
+ female
+
+
+
+
+ %1 untaps %2.
+ female
+
+
+
+
+ %1 taps %2.
+ male
+
+
- %1 taps %2.
- female
-
-
-
-
- %1 untaps %2.
- female
-
-
-
-
- %1 taps %2.
- male
-
-
-
- %1 untaps %2.male
-
+ %1 sets counter %2 to %3 (%4%5).female%1 nastavuje počet %2 žetonů na %3 (%4%5).
-
+ %1 sets counter %2 to %3 (%4%5).male%1 nastavuje počet %2 žetonů na %3 (%4%5).
+
+
+ %1 sets %2 to not untap normally.
+ female
+ %1 nastavuje %2 na neodtapování.
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+ %1 nastavuje %2 na neodtapování.
+
+
+
+ %1 sets %2 to untap normally.
+ female
+ %1 nastavuje %2 na standardní odtapnutí.
+
- %1 sets %2 to not untap normally.
- female
- %1 nastavuje %2 na neodtapování.
-
-
-
- %1 sets %2 to not untap normally.
- male
- %1 nastavuje %2 na neodtapování.
-
-
-
- %1 sets %2 to untap normally.
- female
- %1 nastavuje %2 na standardní odtapnutí.
-
-
- %1 sets %2 to untap normally.male%1 nastavuje %2 na standardní odtapnutí.
-
+ %1 sets PT of %2 to %3.female%1 nastavuje sílu a odolnost pro %2 na %3.
-
+ %1 sets PT of %2 to %3.male%1 nastavuje sílu a odolnost pro %2 na %3.
-
+ %1 sets annotation of %2 to %3.female%1 nastavuje poznámku pro %2 na %3.
-
+ %1 sets annotation of %2 to %3.male%1 nastavuje poznámku pro %2 na %3.
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+ %1 si prohlíží %2 vrchních karet %3.
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+ %1 si prohlíží %2 vrchních karet %3.
+
+
+
+ %1 is looking at %2.
+ female
+ %1 si prohlíží %2.
+
- %1 is looking at the top %2 cards %3.
- female
- %1 si prohlíží %2 vrchních karet %3.
-
-
-
- %1 is looking at the top %2 cards %3.
- male
- %1 si prohlíží %2 vrchních karet %3.
-
-
-
- %1 is looking at %2.
- female
- %1 si prohlíží %2.
-
-
- %1 is looking at %2.male%1 si prohlíží %2.
-
+ %1 stops looking at %2.female%1 si přestává prohlížet %2.
-
+ %1 stops looking at %2.male%1 si přestává prohlížet %2.
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+ %1 ukazuje %2 hráči %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+ %1 ukazuje %2 hráči %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+ %1 ukazuje %2 hráči %3.
+ %1 reveals %2 to %3.
- p1 female, p2 female
- %1 ukazuje %2 hráči %3.
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
+ p1 male, p2 male%1 ukazuje %2 hráči %3.
- %1 reveals %2 to %3.
- p1 male, p2 female
- %1 ukazuje %2 hráči %3.
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 male
- %1 ukazuje %2 hráči %3.
-
-
- %1 reveals %2.female%1 ukazuje %2.
-
+ %1 reveals %2.male%1 ukazuje %2.
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+ %1 náhodně ukazuje %2%3 hráči %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+ %1 náhodně ukazuje %2%3 hráči %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+ %1 náhodně ukazuje %2%3 hráči %4.
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
- %1 náhodně ukazuje %2%3 hráči %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
+ p1 male, p2 male%1 náhodně ukazuje %2%3 hráči %4.
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
- %1 náhodně ukazuje %2%3 hráči %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 male
- %1 náhodně ukazuje %2%3 hráči %4.
-
-
- %1 randomly reveals %2%3.female%1 náhodně ukazuje %2%3.
-
+ %1 randomly reveals %2%3.male%1 náhodně ukazuje %2%3.
-
+ %1 reveals %2%3 to %4.p1 female, p2 female%1 ukazuje %2%3 hráči %4.
-
+ %1 reveals %2%3 to %4.p1 female, p2 male%1 ukazuje %2%3 hráči %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 female%1 ukazuje %2%3 hráči %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 male%1 ukazuje %2%3 hráči %4.
-
+ %1 reveals %2%3.female%1 ukazuje %2%3.
-
+ %1 reveals %2%3.male%1 ukazuje %2%3.
-
+ It is now %1's turn.femaleNyní je kolo hráče %1.
-
+ It is now %1's turn.maleNyní je kolo hráče %1.
@@ -2913,7 +2919,7 @@ Lokální verze je %1, verze serveru je %2.
-
+ %1 draws his initial hand.%1 líže startovní ruku.
@@ -2966,7 +2972,7 @@ Lokální verze je %1, verze serveru je %2.
-
+ redčervený
@@ -2975,7 +2981,7 @@ Lokální verze je %1, verze serveru je %2.
-
+ yellowžlutý
@@ -2984,7 +2990,7 @@ Lokální verze je %1, verze serveru je %2.
-
+ greenzelený
@@ -3069,62 +3075,62 @@ Lokální verze je %1, verze serveru je %2.Nyní je kolo hráče %1.
-
+ untap stepOdtapovací fáze
-
+ upkeep stepUpkeep
-
+ draw stepLízací fáze
-
+ first main phasePrvní hlavní fáze
-
+ beginning of combat stepZačátek bojové fáze
-
+ declare attackers stepOznámení útočníků
-
+ declare blockers stepOznámení blokujících
-
+ combat damage stepUdělení bojového zranění
-
+ end of combat stepKonec bojové fáze
-
+ second main phaseDruhá hlavní fáze
-
+ ending phaseKonec kola
-
+ It is now the %1.Nyní je %1.
@@ -3483,7 +3489,7 @@ Lokální verze je %1, verze serveru je %2.
-
+ Number:Počet:
@@ -3508,27 +3514,27 @@ Lokální verze je %1, verze serveru je %2.
Počet stran:
-
+ Set power/toughnessNastavit sílu/odolnost
-
+ Please enter the new PT:Vložte novou odolnost/sílu:
-
+ Set annotationNastavit poznámku
-
+ Please enter the new annotation:Vložte novou poznámku:
-
+ Set countersNastavit žetony
@@ -3536,47 +3542,45 @@ Lokální verze je %1, verze serveru je %2.
PlayerListWidget
- local deck
- lokální balíček
+ lokální balíček
- deck #%1
- bal94ek #%1
+ bal94ek #%1
-
+ User &detailsDetaily &uživatele
-
+ Direct &chat&Chatovat
-
+ Add to &buddy listPřidat mezi &přátele
-
+ Remove from &buddy listOdstranit z &přátel
-
+ Add to &ignore listPřidat do &ignorovaných
-
+ Remove from &ignore listOdstranit z &ignorovaných
-
+ Kick from &gameVyhodit ze &hry
@@ -3584,27 +3588,27 @@ Lokální verze je %1, verze serveru je %2.
QObject
-
+ MaindeckMaindeck
-
+ SideboardSideboard
-
+ Cockatrice decks (*.cod)Balíčky cockatrice (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)Čistý text (*.dec*.mwDeck)
-
+ All files (*.*)Všechny soubory (*.*)
@@ -3934,17 +3938,17 @@ Prosím vložte jméno:
Opravdu chcete opustit tuto hru?
-
+ KickedVyhozen
-
+ You have been kicked out of the game.Byli jste vyhozeni ze hry.
-
+ Game %1: %2Hra %1: %2
@@ -3985,27 +3989,27 @@ Prosím vložte jméno:
TabRoom
-
+ &Say:&Chat:
-
+ ChatChatovat
-
+ &Room&Místnost
-
+ &Leave room&Opustit místnost
-
+ You are flooding the chat. Please wait a couple of seconds.Píšete příliš intenzivně. Počkejte pár sekund.
@@ -4119,67 +4123,67 @@ Prosím vložte jméno:
UserList
-
+ Users online: %1Připojených uživatelů: %1
-
+ Users in this room: %1Uživatelů v této místnosti: %1
-
+ Buddies online: %1 / %2Přátelé online: %1 / %2
-
+ Ignored users online: %1 / %2Ignorovaných online: %1 / %2
-
+ %1's games
-
+ User &details&Detaily uživatele
-
+ Direct &chat&Chatovat
-
+ Show this user's &games
-
+ Add to &buddy listPřidat mezi &přátele
-
+ Remove from &buddy listOdstranit z &přátel
-
+ Add to &ignore listPřidat mezi &ignorované
-
+ Remove from &ignore listOdstranit z &ignorovaných
-
+ Ban from &server&Zabanovat
@@ -4212,183 +4216,188 @@ Hodnota 0 je pro ban bez omezení.
&Vyhledat:
-
+ Deck &name:&Název balíčku:
-
+ &Comments:&Komentář:
-
+
+ Hash:
+
+
+
+ &Update pricesAkt&ualizovat ceny
-
+ Ctrl+UCTRL+U
-
+ Deck editor [*]Editor balíčků [*]
-
+ &New deck&Nový balíček
-
+ &Load deck...&Nahrát balíček...
-
+ &Save deck&Uložit balíček
-
+ Save deck &as...Uložit balíček &jako...
-
+ Load deck from cl&ipboard...Nahrát balíček ze s&chránky...
-
+ Save deck to clip&boardVložit balíček do &schránky
-
+ &Print deck...&Vytisknout balíček...
-
+ &Close&Zavřít
-
+ Ctrl+QCTRL+Q
-
+ &Edit sets...&Upravit sasy...
-
+ &Deck&Balíček
-
+ &Card databaseDatabáze &karet
-
+ Add card to &maindeckPřidat kartu do &balíčku
-
+ ReturnReturn
-
+ EnterEnter
-
+ Add card to &sideboardPřidat kartu do &sideboardu
-
+ Ctrl+ReturnCtrl+Return
-
+ Ctrl+EnterCtrl+Enter
-
+ &Remove row&Smazat řádek
-
+ DelDel
-
+ &Increment number&Zvýšit počet
-
+ ++
-
+ &Decrement number&Snížit počet
-
+ --
-
+ Are you sure?Jste si jisti?
-
+ The decklist has been modified.
Do you want to save the changes?Balíček byl upraven.
Chcete uložit změny?
-
+ Load deckNahrát balíček
-
-
+
+ ErrorChyba
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.Balíček nebylo možné uložit.
Zkontrolujte, jestli lze zapisovat do cílového adresáře a zkuste to znovu.
-
+ Save deckUložit balíček
diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts
index 8eef5cd19..84f76dc94 100644
--- a/cockatrice/translations/cockatrice_de.ts
+++ b/cockatrice/translations/cockatrice_de.ts
@@ -175,24 +175,24 @@ Geben Sie 0 ein für einen unbefristeten Bann.
Bitte geben Sie den Grund für den Bann ein. Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nicht gesehen werden.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.Bitte geben Sie den Grund für den Bann ein.
Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nicht gesehen werden.
-
+ &OK&OK
-
+ &Cancel&Abbrechen
-
+ Ban user from serverBenutzer vom Server bannen
@@ -1237,17 +1237,17 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
DeckListModel
-
+ NumberNummer
-
+ CardKarte
-
+ PricePreis
@@ -2543,8 +2543,8 @@ Lokale Version ist %1, Serverversion ist %2.
%1 zieht %2 Karten
-
-
+
+ a cardeine Karte
@@ -2601,7 +2601,7 @@ Lokale Version ist %1, Serverversion ist %2.
%1s Sideboard
-
+ The game has started.Das Spiel hat begonnen.
@@ -2740,115 +2740,111 @@ Lokale Version ist %1, Serverversion ist %2.
%1 hat das Spiel verlassen.
- %1 has loaded a local deck.female
- %1 hat ein lokales Deck geladen.
+ %1 hat ein lokales Deck geladen.
- %1 has loaded a local deck.male
- %1 hat ein lokales Deck geladen.
+ %1 hat ein lokales Deck geladen.
- %1 has loaded deck #%2.female
- %1 hat das Deck Nr. %2 geladen.
+ %1 hat das Deck Nr. %2 geladen.
+
+
+ %1 has loaded deck #%2.
+ male
+ %1 hat das Deck Nr. %2 geladen.
- %1 has loaded deck #%2.
- male
- %1 hat das Deck Nr. %2 geladen.
-
-
- %1 is ready to start the game.female%1 ist bereit, das Spiel zu starten.
-
+ %1 is ready to start the game.male%1 ist bereit, das Spiel zu starten.
-
+ %1 is not ready to start the game any more.female%1 ist nicht mehr bereit, das Spiel zu starten.
-
+ %1 is not ready to start the game any more.male%1 ist nicht mehr bereit, das Spiel zu starten.
-
+ %1 has conceded the game.female%1 hat das Spiel aufgegeben.
-
+ %1 has conceded the game.male%1 hat das Spiel aufgegeben.
+
+
+ %1 has restored connection to the game.
+ female
+ %1 ist wieder mit dem Spiel verbunden.
+
+
+
+ %1 has restored connection to the game.
+ male
+ %1 ist wieder mit dem Spiel verbunden.
+
+
+
+ %1 has lost connection to the game.
+ female
+ %1 hat die Verbindung zum Spiel verloren.
+
- %1 has restored connection to the game.
- female
- %1 ist wieder mit dem Spiel verbunden.
-
-
-
- %1 has restored connection to the game.
- male
- %1 ist wieder mit dem Spiel verbunden.
-
-
-
- %1 has lost connection to the game.
- female
- %1 hat die Verbindung zum Spiel verloren.
-
-
- %1 has lost connection to the game.male%1 hat die Verbindung zum Spiel verloren.
-
+ %1 shuffles %2.female%1 mischt %2.
+
+
+ %1 shuffles %2.
+ male
+ %1 mischt %2.
+
- %1 shuffles %2.
- male
- %1 mischt %2.
-
-
- %1 rolls a %2 with a %3-sided die.female%1 würfelt eine %2 mit einem %3-seitigen Würfel.
-
+ %1 rolls a %2 with a %3-sided die.male%1 würfelt eine %2 mit einem %3-seitigen Würfel.
-
+ %1 draws %n card(s).female
@@ -2857,191 +2853,191 @@ Lokale Version ist %1, Serverversion ist %2.
+
+ %1 draws %n card(s).
+ male
+
+ %1 zieht eine Karte.
+ %1 zieht %n Karten.
+
+
+
- %1 draws %n card(s).
- male
-
- %1 zieht eine Karte.
- %1 zieht %n Karten.
-
-
-
- %1 undoes his last draw.%1 legt die zuletzt gezogene Karte zurück.
-
+ %1 undoes her last draw.%1 legt die zuletzt gezogene Karte zurück.
-
+ %1 undoes his last draw (%2).%1 legt die zuletzt gezogene Karte zurück (%2).
-
+ %1 undoes her last draw (%2).%1 legt die zuletzt gezogene Karte zurück (%2).
-
+ from table vom Spielfeld
-
+ from graveyard aus dem Friedhof
-
+ from exile aus dem Exil
-
+ from hand von der Hand
-
+ the bottom card of his librarydie unterste Karte seiner Bibliothek
-
+ the bottom card of her librarydie unterste Karte ihrer Bibliothek
-
+ from the bottom of his library, die unterste Karte seiner Bibliothek,
-
+ from the bottom of her library, die unterste Karte ihrer Bibliothek,
-
+ the top card of his librarydie oberste Karte seiner Bibliothek
-
+ the top card of her librarydie oberste Karte ihrer Bibliothek
-
+ from the top of his library, die oberste Karte seiner Bibliothek,
-
+ from the top of her library, die oberste Karte ihrer Bibliothek,
-
+ from library aus der Bibliothek
-
+ from sideboard aus dem Sideboard
-
+ from the stack vom Stapel
-
+ %1 gives %2 control over %3.%1 überlässt %2 die Kontrolle über %3.
-
+ %1 puts %2 into play tapped%3.%1 bringt %2 getappt%3 ins Spiel.
-
+ %1 puts %2 into play%3.%1 bringt %2%3 ins Spiel.
-
+ %1 puts %2%3 into graveyard.%1 legt %2%3 auf den Friedhof.
-
+ %1 exiles %2%3.%1 schickt %2%3 ins Exil.
-
+ %1 moves %2%3 to hand.%1 nimmt %2%3 auf die Hand.
-
+ %1 puts %2%3 into his library.%1 legt %2%3 in seine Bibliothek.
-
+ %1 puts %2%3 into her library.%1 legt %2%3 in ihre Bibliothek.
-
+ %1 puts %2%3 on bottom of his library.%1 legt %2%3 unter seine Bibliothek.
-
+ %1 puts %2%3 on bottom of her library.%1 legt %2%3 unter ihre Bibliothek.
-
+ %1 puts %2%3 on top of his library.%1 legt %2%3 auf die Bibliothek.
-
+ %1 puts %2%3 on top of her library.%1 legt %2%3 auf die Bibliothek.
-
+ %1 puts %2%3 into his library at position %4.%1 legt %2%3 in seine Bibliothek an %4. Stelle.
-
+ %1 puts %2%3 into her library at position %4.%1 legt %2%3 in ihre Bibliothek an %4. Stelle.
-
+ %1 moves %2%3 to sideboard.%1 legt %2%3 in sein Sideboard.
-
+ %1 plays %2%3.%1 spielt %2%3 aus.
-
+ %1 takes a mulligan to %n.female
@@ -3050,7 +3046,7 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ %1 takes a mulligan to %n.male
@@ -3059,37 +3055,37 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ %1 flips %2 face-down.female%1 wendet %2 auf die Rückseite.
-
+ %1 flips %2 face-down.male%1 wendet %2 auf die Rückseite.
-
+ %1 flips %2 face-up.female%1 wendet %2 auf die Vorderseite.
+
+
+ %1 flips %2 face-up.
+ male
+ %1 wendet %2 auf die Vorderseite.
+
- %1 flips %2 face-up.
- male
- %1 wendet %2 auf die Vorderseite.
-
-
- %1 destroys %2.female%1 zerstört %2.
-
+ %1 destroys %2.male%1 zerstört %2.
@@ -3105,271 +3101,283 @@ Lokale Version ist %1, Serverversion ist %2.
%1 legt %2 an %3s %4 an.
-
+
+ %1 has loaded a deck (%2).
+ female
+ %1 hat ein Deck geladen (%2).
+
+
+
+ %1 has loaded a deck (%2).
+ male
+ %1 hat ein Deck geladen (%2).
+
+
+ %1 attaches %2 to %3's %4.p1 female, p2 female%1 legt %2 an %3s %4 an.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male%1 legt %2 an %3s %4 an.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female%1 legt %2 an %3s %4 an.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male%1 legt %2 an %3s %4 an.
-
+ %1 unattaches %2.female%1 löst %2 ab.
-
+ %1 unattaches %2.male%1 löst %2 ab.
-
+ %1 creates token: %2%3.female%1 erstellt Token: %2%3.
-
+ %1 creates token: %2%3.male%1 erstellt Token: %2%3.
-
+ %1 points from her %2 to herself.female%1 zeigt von ihrem %2 auf sich selbst.
-
+ %1 points from his %2 to himself.male%1 zeigt von seinem %2 auf sich selbst.
-
+ %1 points from her %2 to %3.p1 female, p2 female%1 zeigt von ihrem %2 auf %3.
-
+ %1 points from her %2 to %3.p1 female, p2 male%1 zeigt von ihrem %2 auf %3.
-
+ %1 points from his %2 to %3.p1 male, p2 female%1 zeigt von seinem %2 auf %3.
-
+ %1 points from his %2 to %3.p1 male, p2 male%1 zeigt von seinem %2 auf %3.
-
+ %1 points from %2's %3 to herself.card owner female, target female%1 zeigt von %2s %3 auf sich selbst.
-
+ %1 points from %2's %3 to herself.card owner male, target female%1 zeigt von %2s %3 auf sich selbst.
-
+ %1 points from %2's %3 to himself.card owner female, target male%1 zeigt von %2s %3 auf sich selbst.
-
+ %1 points from %2's %3 to himself.card owner male, target male%1 zeigt von %2s %3 auf sich selbst.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 female%1 zeigt von %2s %3 auf %4.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 male%1 zeigt von %2s %3 auf %4.
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+ %1 zeigt von %2s %3 auf %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 male
+ %1 zeigt von %2s %3 auf %4.
+ %1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 zeigt von %2s %3 auf %4.%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+ %1 zeigt von %2s %3 auf %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 zeigt von %2s %3 auf %4.%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
- %1 zeigt von %2s %3 auf %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
- %1 zeigt von %2s %3 auf %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
- %1 zeigt von %2s %3 auf %4.
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male%1 zeigt von %2s %3 auf %4.
-
+ %1 points from her %2 to her %3.female%1 zeigt von ihrem %2 auf ihren %3.
-
+ %1 points from his %2 to his %3.male%1 zeigt von seinem %2 auf seinen %3.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female%1 zeigt von ihrem %2 auf %3s %4.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male%1 zeigt von ihrem %2 auf %3s %4.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female%1 zeigt von seinem %2 auf %3s %4.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male%1 zeigt von seinem %2 auf %3s %4.
-
+ %1 points from %2's %3 to her own %4.card owner female, target female%1 zeigt von %2s %3 auf ihren eigenen %4.
-
+ %1 points from %2's %3 to her own %4.card owner male, target female%1 zeigt von %2s %3 auf ihren eigenen %4.
-
+ %1 points from %2's %3 to his own %4.card owner female, target male%1 zeigt von %2s %3 auf seinen eigenen %4.
-
+ %1 points from %2's %3 to his own %4.card owner male, target male%1 zeigt von %2s %3 auf seinen eigenen %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female%1 zeigt von %2s %3 auf %4s %5.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male%1 zeigt von %2s %3 auf %4s %5.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female%1 zeigt von %2s %3 auf %4s %5.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male%1 zeigt von %2s %3 auf %4s %5.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female%1 zeigt von %2s %3 auf %4s %5.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male%1 zeigt von %2s %3 auf %4s %5.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female%1 zeigt von %2s %3 auf %4s %5.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male%1 zeigt von %2s %3 auf %4s %5.
-
+ %1 places %n %2 counter(s) on %3 (now %4).female
@@ -3378,7 +3386,7 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).male
@@ -3387,7 +3395,7 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).female
@@ -3396,7 +3404,7 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).male
@@ -3405,265 +3413,265 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ %1 taps her permanents.female%1 tappt ihre bleibenden Karten.
-
+ %1 untaps her permanents.female%1 enttappt ihre bleibenden Karten.
-
+ %1 taps his permanents.male%1 tappt seine bleibenden Karten.
-
+ %1 untaps his permanents.male%1 enttappt seine bleibenden Karten.
+
+
+ %1 taps %2.
+ female
+ %1 tappt %2.
+
+
+
+ %1 untaps %2.
+ female
+ %1 enttappt %2.
+
+
+
+ %1 taps %2.
+ male
+ %1 tappt %2.
+
- %1 taps %2.
- female
- %1 tappt %2.
-
-
-
- %1 untaps %2.
- female
- %1 enttappt %2.
-
-
-
- %1 taps %2.
- male
- %1 tappt %2.
-
-
- %1 untaps %2.male%1 enttappt %2.
-
+ %1 sets counter %2 to %3 (%4%5).female%1 setzt Zähler %2 auf %3 (%4%5).
-
+ %1 sets counter %2 to %3 (%4%5).male%1 setzt Zähler %2 auf %3 (%4%5).
+
+
+ %1 sets %2 to not untap normally.
+ female
+ %1 setzt %2 auf explizites Enttappen.
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+ %1 setzt %2 auf explizites Enttappen.
+
+
+
+ %1 sets %2 to untap normally.
+ female
+ %1 setzt %2 auf normales Enttappen.
+
- %1 sets %2 to not untap normally.
- female
- %1 setzt %2 auf explizites Enttappen.
-
-
-
- %1 sets %2 to not untap normally.
- male
- %1 setzt %2 auf explizites Enttappen.
-
-
-
- %1 sets %2 to untap normally.
- female
- %1 setzt %2 auf normales Enttappen.
-
-
- %1 sets %2 to untap normally.male%1 setzt %2 auf normales Enttappen.
-
+ %1 sets PT of %2 to %3.female%1 setzt Kampfwerte von %2 auf %3.
-
+ %1 sets PT of %2 to %3.male%1 setzt Kampfwerte von %2 auf %3.
-
+ %1 sets annotation of %2 to %3.female%1 versieht %2 mit dem Hinweis %3.
-
+ %1 sets annotation of %2 to %3.male%1 versieht %2 mit dem Hinweis %3.
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+ %1 sieht sich die obersten %2 Karten %3 an.
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+ %1 sieht sich die obersten %2 Karten %3 an.
+
+
+
+ %1 is looking at %2.
+ female
+ %1 sieht sich %2 an.
+
- %1 is looking at the top %2 cards %3.
- female
- %1 sieht sich die obersten %2 Karten %3 an.
-
-
-
- %1 is looking at the top %2 cards %3.
- male
- %1 sieht sich die obersten %2 Karten %3 an.
-
-
-
- %1 is looking at %2.
- female
- %1 sieht sich %2 an.
-
-
- %1 is looking at %2.male%1 sieht sich %2 an.
-
+ %1 stops looking at %2.female%1 sieht sich %2 nicht mehr an.
-
+ %1 stops looking at %2.male%1 sieht sich %2 nicht mehr an.
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+ %1 zeigt %3 %2.
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+ %1 zeigt %3 %2.
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+ %1 zeigt %3 %2.
+ %1 reveals %2 to %3.
- p1 female, p2 female
- %1 zeigt %3 %2.
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
+ p1 male, p2 male%1 zeigt %3 %2.
- %1 reveals %2 to %3.
- p1 male, p2 female
- %1 zeigt %3 %2.
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 male
- %1 zeigt %3 %2.
-
-
- %1 reveals %2.female%1 zeigt %2 offen vor.
-
+ %1 reveals %2.male%1 zeigt %2 offen vor.
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+ %1 zeigt %4 zufällig %2%3 vor.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+ %1 zeigt %4 zufällig %2%3 vor.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+ %1 zeigt %4 zufällig %2%3 vor.
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
- %1 zeigt %4 zufällig %2%3 vor.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
+ p1 male, p2 male%1 zeigt %4 zufällig %2%3 vor.
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
- %1 zeigt %4 zufällig %2%3 vor.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 male
- %1 zeigt %4 zufällig %2%3 vor.
-
-
- %1 randomly reveals %2%3.female%1 zeigt zufällig %2%3 offen vor.
-
+ %1 randomly reveals %2%3.male%1 zeigt zufällig %2%3 offen vor.
-
+ %1 reveals %2%3 to %4.p1 female, p2 female%1 zeigt %4 %2%3 vor.
-
+ %1 reveals %2%3 to %4.p1 female, p2 male%1 zeigt %4 %2%3 vor.
-
+ %1 reveals %2%3 to %4.p1 male, p2 female%1 zeigt %4 %2%3 vor.
-
+ %1 reveals %2%3 to %4.p1 male, p2 male%1 zeigt %4 %2%3 vor.
-
+ %1 reveals %2%3.female%1 zeigt %2%3 offen vor.
-
+ %1 reveals %2%3.male%1 zeigt %2%3 offen vor.
-
+ It is now %1's turn.female%1 ist am Zug.
-
+ It is now %1's turn.male%1 ist am Zug.
@@ -3676,12 +3684,12 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ %1 draws his initial hand.%1 zieht seine Starthand.
-
+ %1 draws her initial hand.%1 zieht ihre Starthand.
@@ -3770,7 +3778,7 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ redrote
@@ -3778,7 +3786,7 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ yellowgelbe
@@ -3786,7 +3794,7 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ greengrüne
@@ -3946,7 +3954,7 @@ Lokale Version ist %1, Serverversion ist %2.%1 zeigt %2 aus %3 offen vor.
-
+ ending phasedie Zugendphase
@@ -3979,52 +3987,52 @@ Lokale Version ist %1, Serverversion ist %2.
%1 ist am Zug.
-
+ untap stepdas Enttappsegment
-
+ upkeep stepdas Versorgungssegment
-
+ draw stepdas Ziehsegment
-
+ first main phasedie erste Hauptphase
-
+ beginning of combat stepdas Anfangssegment der Kampfphase
-
+ declare attackers stepdas Angreifer-Deklarieren-Segment
-
+ declare blockers stepdas Blocker-Deklarieren-Segment
-
+ combat damage stepdas Kampfschadenssegment
-
+ end of combat stepdas Endsegment der Kampfphase
-
+ second main phasedie zweite Hauptphase
@@ -4033,7 +4041,7 @@ Lokale Version ist %1, Serverversion ist %2.
das Ende-des-Zuges-Segment
-
+ It is now the %1.Es ist nun %1.
@@ -4600,7 +4608,7 @@ Lokale Version ist %1, Serverversion ist %2.
-
+ Number:Anzahl:
@@ -4615,27 +4623,27 @@ Lokale Version ist %1, Serverversion ist %2.
Oberste Karten ins Exil schicken
-
+ Set power/toughnessKampfwerte setzen
-
+ Please enter the new PT:Bitte die neuen Kampfwerte eingeben:
-
+ Set annotationHinweis setzen
-
+ Please enter the new annotation:Bitte den Hinweis eingeben:
-
+ Set countersSetze Zählmarken
@@ -4693,47 +4701,45 @@ Lokale Version ist %1, Serverversion ist %2.
kein Deck
- local deck
- lokales Deck
+ lokales Deck
- deck #%1
- Deck #%1
+ Deck #%1
-
+ User &detailsBenutzer&details
-
+ Direct &chat&Persönliches Gespräch
-
+ Add to &buddy listZur &Freundesliste hinzufügen
-
+ Remove from &buddy listVon &Freundesliste entfernen
-
+ Add to &ignore list&Ignorieren
-
+ Remove from &ignore listNicht mehr &ignorieren
-
+ Kick from &gameAus dem &Spiel werfen
@@ -4757,27 +4763,27 @@ Lokale Version ist %1, Serverversion ist %2.
QObject
-
+ MaindeckHauptdeck
-
+ SideboardSideboard
-
+ Cockatrice decks (*.cod)Cockatrice Decks (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)Text Decks (*.dec *.mwDeck)
-
+ All files (*.*)Alle Dateien (*.*)
@@ -5112,12 +5118,12 @@ Bitte geben Sie einen Namen ein:
Ctrl+Q
-
+ KickedHerausgeworfen
-
+ You have been kicked out of the game.Sie wurden aus dem Spiel geworfen.
@@ -5175,7 +5181,7 @@ Bitte geben Sie einen Namen ein:
Deck laden
-
+ Game %1: %2Spiel %1: %2
@@ -5216,27 +5222,27 @@ Bitte geben Sie einen Namen ein:
TabRoom
-
+ &Say:&Sagen:
-
+ ChatUnterhaltung
-
+ &Room&Raum
-
+ &Leave roomRaum ver&lassen
-
+ You are flooding the chat. Please wait a couple of seconds.Sie überfluten den Chatraum. Bitte warten Sie ein paar Sekunden.
@@ -5373,67 +5379,67 @@ Bitte geben Sie einen Namen ein:
UserList
-
+ Users online: %1Benutzer online: %1
-
+ Users in this room: %1Benutzer in diesem Raum: %1
-
+ Buddies online: %1 / %2Freunde online: %1 / %2
-
+ Ignored users online: %1 / %2Ignorierte Benutzer online: %1 / %2
-
+ %1's games%1s Spiele
-
+ User &detailsBenutzer&details
-
+ Direct &chat&Persönliches Gespräch
-
+ Show this user's &gamesSpiele dieses &Benutzers anzeigen
-
+ Add to &buddy listZur &Freundesliste hinzufügen
-
+ Remove from &buddy listVon &Freundesliste entfernen
-
+ Add to &ignore list&Ignorieren
-
+ Remove from &ignore listNicht mehr &ignorieren
-
+ Ban from &serverVom &Server bannen
@@ -5456,32 +5462,32 @@ Geben Sie 0 ein für einen unbefristeten Bann.
&Suchen nach:
-
+ Deck &name:Deck &Name:
-
+ &Comments:&Kommentare:
-
+ Deck editor [*]Deck-Editor [*]
-
+ &New deck&Neues Deck
-
+ &Load deck...Deck &laden...
-
+ &Save deckDeck &speichern
@@ -5490,37 +5496,37 @@ Geben Sie 0 ein für einen unbefristeten Bann.
Deck &speichern unter...
-
+ Save deck &as...Deck s&peichern unter...
-
+ Save deck to clip&boardDeck in Z&wischenablage speichern
-
+ &Print deck...Deck &drucken...
-
+ &CloseS&chließen
-
+ Ctrl+QCtrl+Q
-
+ &Edit sets...&Editionen bearbeiten...
-
+ &Deck&Deck
@@ -5529,27 +5535,27 @@ Geben Sie 0 ein für einen unbefristeten Bann.
&Editionen
-
+ Add card to &maindeckKarte zu&m Hauptdeck hinzufügen
-
+ ReturnReturn
-
+ EnterEnter
-
+ Ctrl+ReturnCtrl+Return
-
+ Ctrl+EnterCtrl+Enter
@@ -5558,7 +5564,7 @@ Geben Sie 0 ein für einen unbefristeten Bann.
Ctrl+M
-
+ Add card to &sideboardKarte zum &Sideboard hinzufügen
@@ -5577,88 +5583,93 @@ Geben Sie 0 ein für einen unbefristeten Bann.
Suche a&ufheben
-
+
+ Hash:
+
+
+
+ &Update prices&Preise aktualisieren
-
+ Ctrl+UCtrl+U
-
+ Load deck from cl&ipboard...Deck aus &Zwischenablage laden...
-
+ &Card database&Kartendatenbank
-
+ &Remove rowZeile entfe&rnen
-
+ DelEntf
-
+ &Increment numberAnzahl er&höhen
-
+ ++
-
+ &Decrement numberAnzahl v&erringern
-
+ --
-
+ Are you sure?Bist du sicher?
-
+ The decklist has been modified.
Do you want to save the changes?Die Deckliste wurde verändert.
Willst du die Änderungen speichern?
-
+ Load deckDeck laden
-
-
+
+ ErrorFehler
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.Das Deck konnte nicht gespeichert werden.
Bitte überprüfen Sie, dass Sie Schreibrechte in dem Verzeichnis haben, und versuchen Sie es erneut.
-
+ Save deckDeck speichern
diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts
index 1a6b56a24..110cccd26 100644
--- a/cockatrice/translations/cockatrice_en.ts
+++ b/cockatrice/translations/cockatrice_en.ts
@@ -135,23 +135,23 @@ Enter 0 for an indefinite ban.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.
-
+ &OK
-
+ &Cancel
-
+ Ban user from server
@@ -809,17 +809,17 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckListModel
-
+ Number
-
+ Card
-
+ Price
@@ -1740,116 +1740,92 @@ Local version is %1, remote version is %2.
male
-
-
- %1 has loaded a local deck.
- female
-
-
-
-
- %1 has loaded a local deck.
- male
-
-
-
-
- %1 has loaded deck #%2.
- female
-
-
- %1 has loaded deck #%2.
- male
-
-
-
- %1 is ready to start the game.female
-
+ %1 is ready to start the game.male
-
+ %1 is not ready to start the game any more.female
-
+ %1 is not ready to start the game any more.male
-
+ %1 has conceded the game.female
-
+ %1 has conceded the game.male
+
+
+ %1 has restored connection to the game.
+ female
+
+
+
+
+ %1 has restored connection to the game.
+ male
+
+
+
+
+ %1 has lost connection to the game.
+ female
+
+
- %1 has restored connection to the game.
- female
-
-
-
-
- %1 has restored connection to the game.
- male
-
-
-
-
- %1 has lost connection to the game.
- female
-
-
-
- %1 has lost connection to the game.male
-
+ %1 shuffles %2.female
+
+
+ %1 shuffles %2.
+ male
+
+
- %1 shuffles %2.
- male
-
-
-
- %1 rolls a %2 with a %3-sided die.female
-
+ %1 rolls a %2 with a %3-sided die.male
-
+ %1 draws %n card(s).female
@@ -1858,191 +1834,191 @@ Local version is %1, remote version is %2.
+
+ %1 draws %n card(s).
+ male
+
+ %1 draws a card.
+ %1 draws %n cards.
+
+
+
- %1 draws %n card(s).
- male
-
- %1 draws a card.
- %1 draws %n cards.
-
-
-
- %1 undoes his last draw.
-
+ %1 undoes her last draw.
-
+ %1 undoes his last draw (%2).
-
+ %1 undoes her last draw (%2).
-
+ from table
-
+ from graveyard
-
+ from exile
-
+ from hand
-
+ the bottom card of his library
-
+ the bottom card of her library
-
+ from the bottom of his library
-
+ from the bottom of her library
-
+ the top card of his library
-
+ the top card of her library
-
+ from the top of his library
-
+ from the top of her library
-
+ from library
-
+ from sideboard
-
+ from the stack
-
+ %1 gives %2 control over %3.
-
+ %1 puts %2 into play tapped%3.
-
+ %1 puts %2 into play%3.
-
+ %1 puts %2%3 into graveyard.
-
+ %1 exiles %2%3.
-
+ %1 moves %2%3 to hand.
-
+ %1 puts %2%3 into his library.
-
+ %1 puts %2%3 into her library.
-
+ %1 puts %2%3 on bottom of his library.
-
+ %1 puts %2%3 on bottom of her library.
-
+ %1 puts %2%3 on top of his library.
-
+ %1 puts %2%3 on top of her library.
-
+ %1 puts %2%3 into his library at position %4.
-
+ %1 puts %2%3 into her library at position %4.
-
+ %1 moves %2%3 to sideboard.
-
+ %1 plays %2%3.
-
+ %1 takes a mulligan to %n.female
@@ -2051,7 +2027,7 @@ Local version is %1, remote version is %2.
-
+ %1 takes a mulligan to %n.male
@@ -2060,283 +2036,283 @@ Local version is %1, remote version is %2.
-
+ %1 flips %2 face-down.female
-
+ %1 flips %2 face-down.male
-
+ %1 flips %2 face-up.female
+
+
+ %1 flips %2 face-up.
+ male
+
+
- %1 flips %2 face-up.
- male
-
-
-
- %1 destroys %2.female
-
+ %1 destroys %2.male
-
+ %1 unattaches %2.female
-
+ %1 unattaches %2.male
-
+ %1 creates token: %2%3.female
-
+ %1 creates token: %2%3.male
-
+ %1 points from her %2 to herself.female
-
+ %1 points from his %2 to himself.male
-
+ %1 points from her %2 to %3.p1 female, p2 female
-
+ %1 points from her %2 to %3.p1 female, p2 male
-
+ %1 points from his %2 to %3.p1 male, p2 female
-
+ %1 points from his %2 to %3.p1 male, p2 male
-
+ %1 points from %2's %3 to herself.card owner female, target female
-
+ %1 points from %2's %3 to herself.card owner male, target female
-
+ %1 points from %2's %3 to himself.card owner female, target male
-
+ %1 points from %2's %3 to himself.card owner male, target male
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 female, p3 female
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 female, p3 male
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+
+ %1 points from %2's %3 to %4.
- p1 female, p2 female, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 female, p2 female, p3 male
+ p1 female, p2 male, p3 male%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male
-
+ %1 points from her %2 to her %3.female
-
+ %1 points from his %2 to his %3.male
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male
-
+ %1 points from %2's %3 to her own %4.card owner female, target female
-
+ %1 points from %2's %3 to her own %4.card owner male, target female
-
+ %1 points from %2's %3 to his own %4.card owner female, target male
-
+ %1 points from %2's %3 to his own %4.card owner male, target male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male
-
+ %1 places %n %2 counter(s) on %3 (now %4).female
@@ -2345,7 +2321,7 @@ Local version is %1, remote version is %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).male
@@ -2354,7 +2330,7 @@ Local version is %1, remote version is %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).female
@@ -2363,7 +2339,7 @@ Local version is %1, remote version is %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).male
@@ -2372,272 +2348,272 @@ Local version is %1, remote version is %2.
-
+ %1 taps her permanents.female
-
+ %1 untaps her permanents.female
-
+ %1 taps his permanents.male
-
+ %1 untaps his permanents.male
+
+
+ %1 taps %2.
+ female
+
+
+
+
+ %1 untaps %2.
+ female
+
+
+
+
+ %1 taps %2.
+ male
+
+
- %1 taps %2.
- female
-
-
-
-
- %1 untaps %2.
- female
-
-
-
-
- %1 taps %2.
- male
-
-
-
- %1 untaps %2.male
-
+ %1 sets counter %2 to %3 (%4%5).female
-
+ %1 sets counter %2 to %3 (%4%5).male
+
+
+ %1 sets %2 to not untap normally.
+ female
+
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+
+
+
+
+ %1 sets %2 to untap normally.
+ female
+
+
- %1 sets %2 to not untap normally.
- female
-
-
-
-
- %1 sets %2 to not untap normally.
- male
-
-
-
-
- %1 sets %2 to untap normally.
- female
-
-
-
- %1 sets %2 to untap normally.male
-
+ %1 sets PT of %2 to %3.female
-
+ %1 sets PT of %2 to %3.male
-
+ %1 sets annotation of %2 to %3.female
-
+ %1 sets annotation of %2 to %3.male
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+
+
+
+
+ %1 is looking at %2.
+ female
+
+
- %1 is looking at the top %2 cards %3.
- female
-
-
-
-
- %1 is looking at the top %2 cards %3.
- male
-
-
-
-
- %1 is looking at %2.
- female
-
-
-
- %1 is looking at %2.male
-
+ %1 stops looking at %2.female
-
+ %1 stops looking at %2.male
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+
+ %1 reveals %2 to %3.
- p1 female, p2 female
-
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
-
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 female
-
-
-
-
- %1 reveals %2 to %3.p1 male, p2 male
-
+ %1 reveals %2.female
-
+ %1 reveals %2.male
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
-
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
-
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
-
-
-
-
- %1 randomly reveals %2%3 to %4.p1 male, p2 male
-
+ %1 randomly reveals %2%3.female
-
+ %1 randomly reveals %2%3.male
+
+
+ %1 reveals %2%3 to %4.
+ p1 female, p2 female
+
+
+
+
+ %1 reveals %2%3 to %4.
+ p1 female, p2 male
+
+
+
+
+ %1 reveals %2%3 to %4.
+ p1 male, p2 female
+
+ %1 reveals %2%3 to %4.
- p1 female, p2 female
-
-
-
-
- %1 reveals %2%3 to %4.
- p1 female, p2 male
-
-
-
-
- %1 reveals %2%3 to %4.
- p1 male, p2 female
-
-
-
-
- %1 reveals %2%3 to %4.p1 male, p2 male
-
+ %1 reveals %2%3.female
-
+ %1 reveals %2%3.male
-
+ It is now %1's turn.female
-
+ It is now %1's turn.male
-
-
+
+ a card
@@ -2656,7 +2632,7 @@ Local version is %1, remote version is %2.
-
+ red
@@ -2664,7 +2640,7 @@ Local version is %1, remote version is %2.
-
+ yellow
@@ -2672,7 +2648,7 @@ Local version is %1, remote version is %2.
-
+ green
@@ -2680,17 +2656,17 @@ Local version is %1, remote version is %2.
-
+ The game has started.
-
+ %1 draws his initial hand.
-
+ %1 draws her initial hand.
@@ -2709,86 +2685,98 @@ Local version is %1, remote version is %2.
-
+ ending phase
-
+ untap step
-
+
+ %1 has loaded a deck (%2).
+ female
+
+
+
+
+ %1 has loaded a deck (%2).
+ male
+
+
+
+ %1 attaches %2 to %3's %4.p1 female, p2 female
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male
-
+ upkeep step
-
+ draw step
-
+ first main phase
-
+ beginning of combat step
-
+ declare attackers step
-
+ declare blockers step
-
+ combat damage step
-
+ end of combat step
-
+ second main phase
-
+ It is now the %1.
@@ -3147,7 +3135,7 @@ Local version is %1, remote version is %2.
-
+ Number:
@@ -3172,27 +3160,27 @@ Local version is %1, remote version is %2.
-
+ Set power/toughness
-
+ Please enter the new PT:
-
+ Set annotation
-
+ Please enter the new annotation:
-
+ Set counters
@@ -3200,47 +3188,37 @@ Local version is %1, remote version is %2.
PlayerListWidget
-
- local deck
-
-
-
-
- deck #%1
-
-
-
-
+ User &details
-
+ Direct &chat
-
+ Add to &buddy list
-
+ Remove from &buddy list
-
+ Add to &ignore list
-
+ Remove from &ignore list
-
+ Kick from &game
@@ -3248,27 +3226,27 @@ Local version is %1, remote version is %2.
QObject
-
+ Maindeck
-
+ Sideboard
-
+ Cockatrice decks (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)
-
+ All files (*.*)
@@ -3597,17 +3575,17 @@ Please enter a name:
-
+ Kicked
-
+ You have been kicked out of the game.
-
+ Game %1: %2
@@ -3648,27 +3626,27 @@ Please enter a name:
TabRoom
-
+ &Say:
-
+ Chat
-
+ &Room
-
+ &Leave room
-
+ You are flooding the chat. Please wait a couple of seconds.
@@ -3778,67 +3756,67 @@ Please enter a name:
UserList
-
+ Users online: %1
-
+ Users in this room: %1
-
+ Buddies online: %1 / %2
-
+ Ignored users online: %1 / %2
-
+ %1's games
-
+ User &details
-
+ Direct &chat
-
+ Show this user's &games
-
+ Add to &buddy list
-
+ Remove from &buddy list
-
+ Add to &ignore list
-
+ Remove from &ignore list
-
+ Ban from &server
@@ -3851,135 +3829,140 @@ Please enter a name:
-
+ Deck &name:
-
+ &Comments:
-
+ Deck editor [*]
-
+ &New deck
-
+ &Load deck...
-
+ Load deck from cl&ipboard...
-
+ &Save deck
-
+
+ Hash:
+
+
+
+ &Update prices
-
+ Ctrl+U
-
+ Save deck &as...
-
+ Save deck to clip&board
-
+ &Print deck...
-
+ &Close
-
+ Ctrl+Q
-
+ &Edit sets...
-
+ &Deck
-
+ Load deck
-
-
+
+ Error
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.
-
+ Save deck
-
+ Add card to &maindeck
-
+ Return
-
+ Enter
-
+ Ctrl+Return
-
+ Ctrl+Enter
-
+ Add card to &sideboard
@@ -3994,47 +3977,47 @@ Please check that the directory is writable and try again.
-
+ &Card database
-
+ &Remove row
-
+ Del
-
+ &Increment number
-
+ +
-
+ &Decrement number
-
+ -
-
+ Are you sure?
-
+ The decklist has been modified.
Do you want to save the changes?
diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts
index ba41d2334..11b540cb9 100644
--- a/cockatrice/translations/cockatrice_es.ts
+++ b/cockatrice/translations/cockatrice_es.ts
@@ -144,24 +144,24 @@ Enter 0 for an indefinite ban.
Indica 0 para un ban indefinido.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.Por favor, introduce el motivo del ban
Se almacenará unicamente para moderadores y no podrá ser visto por la persona baneada.
-
+ &OK&Aceptar
-
+ &Cancel&Cancelar
-
+ Ban user from serverBanear usuario del servidor
@@ -1153,17 +1153,17 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
DeckListModel
-
+ NumberNúmero
-
+ CardCarta
-
+ PricePrecio
@@ -2144,115 +2144,111 @@ La versión local es %1, la versión remota es %2.
%1 ha dejado la partida.
- %1 has loaded a local deck.female
- %1 ha cargado un mazo local.
+ %1 ha cargado un mazo local.
- %1 has loaded a local deck.male
- %1 ha cargado un mazo local.
+ %1 ha cargado un mazo local.
- %1 has loaded deck #%2.female
- %1 ha cargado el mazo #%2.
+ %1 ha cargado el mazo #%2.
+
+
+ %1 has loaded deck #%2.
+ male
+ %1 ha cargado el mazo #%2.
- %1 has loaded deck #%2.
- male
- %1 ha cargado el mazo #%2.
-
-
- %1 is ready to start the game.female%1 está preparado para empezar la partida.
-
+ %1 is ready to start the game.male%1 está preparado para empezar la partida.
-
+ %1 is not ready to start the game any more.female%1 ya no está listo para empezar el juego.
-
+ %1 is not ready to start the game any more.male%1 ya no está listo para empezar el juego.
-
+ %1 has conceded the game.female%1 ha concedido la partida.
-
+ %1 has conceded the game.male%1 ha concedido la partida.
+
+
+ %1 has restored connection to the game.
+ female
+ %1 ha recuperado la conexión a la partida.
+
+
+
+ %1 has restored connection to the game.
+ male
+ %1 ha recuperado la conexión a la partida.
+
+
+
+ %1 has lost connection to the game.
+ female
+ %1 ha perdido la conexión a la partida.
+
- %1 has restored connection to the game.
- female
- %1 ha recuperado la conexión a la partida.
-
-
-
- %1 has restored connection to the game.
- male
- %1 ha recuperado la conexión a la partida.
-
-
-
- %1 has lost connection to the game.
- female
- %1 ha perdido la conexión a la partida.
-
-
- %1 has lost connection to the game.male%1 ha perdido la conexión a la partida.
-
+ %1 shuffles %2.female%1 baraja %2.
+
+
+ %1 shuffles %2.
+ male
+ %1 baraja %2.
+
- %1 shuffles %2.
- male
- %1 baraja %2.
-
-
- %1 rolls a %2 with a %3-sided die.female%1 sacó un %2 con un dado de %3 caras.
-
+ %1 rolls a %2 with a %3-sided die.male%1 sacó un %2 con un dado de %3 caras.
-
+ %1 draws %n card(s).female
@@ -2261,191 +2257,191 @@ La versión local es %1, la versión remota es %2.
+
+ %1 draws %n card(s).
+ male
+
+ %1 roba %n carta.
+ %1 roba %n cartas.
+
+
+
- %1 draws %n card(s).
- male
-
- %1 roba %n carta.
- %1 roba %n cartas.
-
-
-
- %1 undoes his last draw.%1 deshace su último robo.
-
+ %1 undoes her last draw.%1 deshace su último robo.
-
+ %1 undoes his last draw (%2).%1 deshace su último robo (%2).
-
+ %1 undoes her last draw (%2).%1 deshace su último robo (%2).
-
+ from table de la mesa
-
+ from graveyard del cementerio
-
+ from exile del exilio
-
+ from hand de la mano
-
+ the bottom card of his libraryla carta de la parte inferior de su biblioteca
-
+ the bottom card of her libraryla carta de la parte inferior de su biblioteca
-
+ from the bottom of his library de la parte inferior de su biblioteca
-
+ from the bottom of her library de la parte inferior de su biblioteca
-
+ the top card of his libraryla parte superior de su biblioteca
-
+ the top card of her libraryla carta superior de su biblioteca
-
+ from the top of his library de la parte superior de su biblioteca
-
+ from the top of her library de la parte superior de su biblioteca
-
+ from library de la biblioteca
-
+ from sideboard de la reserva
-
+ from the stack de la pila
-
+ %1 gives %2 control over %3.%1 entrega a %2 el control sobre %3.
-
+ %1 puts %2 into play tapped%3.%1 pone %2 en juego%3 girado.
-
+ %1 puts %2 into play%3.%1 pone %2 en juego%3.
-
+ %1 puts %2%3 into graveyard.%1 pone %2%3 en el cementerio.
-
+ %1 exiles %2%3.%1 exilia %2%3.
-
+ %1 moves %2%3 to hand.%1 mueve %2%3 a la mano.
-
+ %1 puts %2%3 into his library.%1 pone %2%3 en su biblioteca.
-
+ %1 puts %2%3 into her library.%1 pone %2%3 en su biblioteca.
-
+ %1 puts %2%3 on bottom of his library.%1 pone %2%3 en la parte inferior de su biblioteca.
-
+ %1 puts %2%3 on bottom of her library.%1 pone %2%3 en la parte inferior de su biblioteca.
-
+ %1 puts %2%3 on top of his library.%1 pone %2%3 en la parte superior de su biblioteca.
-
+ %1 puts %2%3 on top of her library.%1 pone %2%3 en la parte superior de su biblioteca.
-
+ %1 puts %2%3 into his library at position %4.%1 pone %2%3 en su biblioteca en la posición %4.
-
+ %1 puts %2%3 into her library at position %4.%1 pone %2%3 en su biblioteca en la posición %4.
-
+ %1 moves %2%3 to sideboard.%1 mueve %2%3 a la reserva.
-
+ %1 plays %2%3.%1 juega %2%3.
-
+ %1 takes a mulligan to %n.female
@@ -2454,7 +2450,7 @@ La versión local es %1, la versión remota es %2.
-
+ %1 takes a mulligan to %n.male
@@ -2463,37 +2459,37 @@ La versión local es %1, la versión remota es %2.
-
+ %1 flips %2 face-down.female%1 voltea %2 boca abajo.
-
+ %1 flips %2 face-down.male%1 voltea %2 boca abajo.
-
+ %1 flips %2 face-up.female%1 voltea %2 boca arriba.
+
+
+ %1 flips %2 face-up.
+ male
+ %1 voltea %2 boca arriba.
+
- %1 flips %2 face-up.
- male
- %1 voltea %2 boca arriba.
-
-
- %1 destroys %2.female%1 destruye %2.
-
+ %1 destroys %2.male%1 destruye %2.
@@ -2509,271 +2505,283 @@ La versión local es %1, la versión remota es %2.
%1 anexa %2 a el %4 de %3.
-
+
+ %1 has loaded a deck (%2).
+ female
+ %1 ha cargado el mazo %2.
+
+
+
+ %1 has loaded a deck (%2).
+ male
+ %1 ha cargado el mazo %2.
+
+
+ %1 attaches %2 to %3's %4.p1 female, p2 female%1 anexa %2 a el %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male%1 anexa %2 a el %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female%1 anexa %2 a el %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male%1 anexa %2 a el %4 de %3.
-
+ %1 unattaches %2.female%1 desanexa %2.
-
+ %1 unattaches %2.male%1 desanexa %2.
-
+ %1 creates token: %2%3.female%1 crea una ficha: %2%3.
-
+ %1 creates token: %2%3.male%1 crea una ficha: %2%3.
-
+ %1 points from her %2 to herself.female%1 apunta desde su %2 a si misma.
-
+ %1 points from his %2 to himself.male%1 apunta desde su %2 a si mismo.
-
+ %1 points from her %2 to %3.p1 female, p2 female%1 apunta desde su %2 a %3.
-
+ %1 points from her %2 to %3.p1 female, p2 male%1 apunta desde su %2 a %3.
-
+ %1 points from his %2 to %3.p1 male, p2 female%1 apunta desde su %2 a %3.
-
+ %1 points from his %2 to %3.p1 male, p2 male%1 apunta desde su %2 a %3.
-
+ %1 points from %2's %3 to herself.card owner female, target female%1 apunta desde el %3 de %2 a ella misma.
-
+ %1 points from %2's %3 to herself.card owner male, target female%1 apunta desde el %3 de %2 a ella misma.
-
+ %1 points from %2's %3 to himself.card owner female, target male%1 apunta desde el %3 de %2 a él mismo.
-
+ %1 points from %2's %3 to himself.card owner male, target male%1 apunta desde el %3 de %2 a él mismo.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 female%1 apunta desde el %3 de %2 a %4.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 male%1 apunta desde el %3 de %2 a %4.
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+ %1 apunta desde el %3 de %2 a %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 male
+ %1 apunta desde el %3 de %2 a %4.
+ %1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 apunta desde el %3 de %2 a %4.%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+ %1 apunta desde el %3 de %2 a %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 apunta desde el %3 de %2 a %4.%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
- %1 apunta desde el %3 de %2 a %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
- %1 apunta desde el %3 de %2 a %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
- %1 apunta desde el %3 de %2 a %4.
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male%1 apunta desde el %3 de %2 a %4.
-
+ %1 points from her %2 to her %3.female%1 apunta desde su %2 a su %3.
-
+ %1 points from his %2 to his %3.male%1 apunta desde su %2 a su %3.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female%1 apunta desde su %2 al %4 de %3.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male%1 apunta desde su %2 al %4 de %3.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female%1 apunta desde su %2 al %4 de %3.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male%1 apunta desde su %2 al %4 de %3.
-
+ %1 points from %2's %3 to her own %4.card owner female, target female%1 apunta desde el %3 de %2 a su propio %4.
-
+ %1 points from %2's %3 to her own %4.card owner male, target female%1 apunta desde el %3 de %2 a su propio %4.
-
+ %1 points from %2's %3 to his own %4.card owner female, target male%1 apunta desde el %3 de %2 a su propio %4.
-
+ %1 points from %2's %3 to his own %4.card owner male, target male%1 apunta desde el %3 de %2 a su propio %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female%1 apunta desde el %3 de %2 al %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male%1 apunta desde el %3 de %2 al %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female%1 apunta desde el %3 de %2 al %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male%1 apunta desde el %3 de %2 al %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female%1 apunta desde el %3 de %2 al %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male%1 apunta desde el %3 de %2 al %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female%1 apunta desde el %3 de %2 al %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male%1 apunta desde el %3 de %2 al %5 de %4.
-
+ %1 places %n %2 counter(s) on %3 (now %4).female
@@ -2782,7 +2790,7 @@ La versión local es %1, la versión remota es %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).male
@@ -2791,7 +2799,7 @@ La versión local es %1, la versión remota es %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).female
@@ -2800,7 +2808,7 @@ La versión local es %1, la versión remota es %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).male
@@ -2809,272 +2817,272 @@ La versión local es %1, la versión remota es %2.
-
+ %1 taps her permanents.female%1 gira sus permanentes.
-
+ %1 untaps her permanents.female%1 endereza sus permanentes.
-
+ %1 taps his permanents.male%1 gira sus permanentes.
-
+ %1 untaps his permanents.male%1 endereza sus permanentes.
+
+
+ %1 taps %2.
+ female
+ %1 gira %2.
+
+
+
+ %1 untaps %2.
+ female
+ %1 endereza %2.
+
+
+
+ %1 taps %2.
+ male
+ %1 gira %2.
+
- %1 taps %2.
- female
- %1 gira %2.
-
-
-
- %1 untaps %2.
- female
- %1 endereza %2.
-
-
-
- %1 taps %2.
- male
- %1 gira %2.
-
-
- %1 untaps %2.male%1 endereza %2.
-
+ %1 sets counter %2 to %3 (%4%5).female%1 establece los contadores de %2 a %3 (%4%5).
-
+ %1 sets counter %2 to %3 (%4%5).male%1 establece los contadores de %2 a %3 (%4%5).
+
+
+ %1 sets %2 to not untap normally.
+ female
+ %1 establece que %2 no se endereze normalmente.
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+ %1 establece que %2 no se endereze normalmente.
+
+
+
+ %1 sets %2 to untap normally.
+ female
+ %1 establece que %2 se endereze normalmente.
+
- %1 sets %2 to not untap normally.
- female
- %1 establece que %2 no se endereze normalmente.
-
-
-
- %1 sets %2 to not untap normally.
- male
- %1 establece que %2 no se endereze normalmente.
-
-
-
- %1 sets %2 to untap normally.
- female
- %1 establece que %2 se endereze normalmente.
-
-
- %1 sets %2 to untap normally.male%1 establece que %2 se endereze normalmente.
-
+ %1 sets PT of %2 to %3.female%1 establece la F/R de %2 a %3.
-
+ %1 sets PT of %2 to %3.male%1 establece la F/R de %2 a %3.
-
+ %1 sets annotation of %2 to %3.female%1 establece la anotación de %2 a %3.
-
+ %1 sets annotation of %2 to %3.male%1 establece la anotación de %2 a %3.
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+ %1 esta mirando las primeras %2 cartas de %3.
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+ %1 esta mirando las primeras %2 cartas de %3.
+
+
+
+ %1 is looking at %2.
+ female
+ %1 está mirando a %2.
+
- %1 is looking at the top %2 cards %3.
- female
- %1 esta mirando las primeras %2 cartas de %3.
-
-
-
- %1 is looking at the top %2 cards %3.
- male
- %1 esta mirando las primeras %2 cartas de %3.
-
-
-
- %1 is looking at %2.
- female
- %1 está mirando a %2.
-
-
- %1 is looking at %2.male%1 está mirando a %2.
-
+ %1 stops looking at %2.female%1 termina de mirar a %2.
-
+ %1 stops looking at %2.male%1 termina de mirar a %2.
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+ %1 revela %2 a %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+ %1 revela %2 a %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+ %1 revela %2 a %3.
+ %1 reveals %2 to %3.
- p1 female, p2 female
- %1 revela %2 a %3.
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
+ p1 male, p2 male%1 revela %2 a %3.
- %1 reveals %2 to %3.
- p1 male, p2 female
- %1 revela %2 a %3.
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 male
- %1 revela %2 a %3.
-
-
- %1 reveals %2.female%1 revela %2.
-
+ %1 reveals %2.male%1 revela %2.
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+ %1 revela aleatoriamente %2%3 a %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+ %1 revela aleatoriamente %2%3 a %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+ %1 revela aleatoriamente %2%3 a %4.
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
- %1 revela aleatoriamente %2%3 a %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
+ p1 male, p2 male%1 revela aleatoriamente %2%3 a %4.
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
- %1 revela aleatoriamente %2%3 a %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 male
- %1 revela aleatoriamente %2%3 a %4.
-
-
- %1 randomly reveals %2%3.female%1 revela aleatoriamente %2%3.
-
+ %1 randomly reveals %2%3.male%1 revela aleatoriamente %2%3.
-
+ %1 reveals %2%3 to %4.p1 female, p2 female%1 revela %2%3 a %4.
-
+ %1 reveals %2%3 to %4.p1 female, p2 male%1 revela %2%3 a %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 female%1 revela %2%3 a %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 male%1 revela %2%3 a %4.
-
+ %1 reveals %2%3.female%1 revela %2%3.
-
+ %1 reveals %2%3.male%1 revela %2%3.
-
+ It is now %1's turn.femaleEs el turno de %1.
-
+ It is now %1's turn.maleEs el turno de %1.
-
-
+
+ a carduna carta
@@ -3113,7 +3121,7 @@ La versión local es %1, la versión remota es %2.
-
+ redrojo
@@ -3121,7 +3129,7 @@ La versión local es %1, la versión remota es %2.
-
+ yellowamarillo
@@ -3129,7 +3137,7 @@ La versión local es %1, la versión remota es %2.
-
+ greenverde
@@ -3153,7 +3161,7 @@ La versión local es %1, la versión remota es %2.%1 esta mirando las primeras %2 cartas de %3.
-
+ The game has started.La partida ha comenzado.
@@ -3248,7 +3256,7 @@ La versión local es %1, la versión remota es %2.
%1 revela %2.
-
+ ending phasefase de fin de turno
@@ -3261,12 +3269,12 @@ La versión local es %1, la versión remota es %2.
%1 baraja su biblioteca.
-
+ %1 draws his initial hand.%1 roba su mano inicial.
-
+ %1 draws her initial hand.%1 roba su mano inicial.
@@ -3287,57 +3295,57 @@ La versión local es %1, la versión remota es %2.
%1 revela %2%3.
-
+ untap steppaso de enderezar
-
+ upkeep steppaso de mantenimiento
-
+ draw steppaso de robar
-
+ first main phaseprimera fase principal
-
+ beginning of combat steppaso de inicio de combate
-
+ declare attackers steppaso de declarar atacantes
-
+ declare blockers steppaso de declarar bloqueadores
-
+ combat damage steppaso de daño de combate
-
+ end of combat steppaso de fin de combate
-
+ second main phasesegunda fase principal
-
+ It is now the %1.Ahora es el %1.
@@ -3724,7 +3732,7 @@ La versión local es %1, la versión remota es %2.
-
+ Number:Número:
@@ -3749,27 +3757,27 @@ La versión local es %1, la versión remota es %2.
Número de caras:
-
+ Set power/toughnessEstablecer fuerza/resistencia
-
+ Please enter the new PT:Por favor, introduzca la nueva F/R:
-
+ Set annotationEscribir anotación
-
+ Please enter the new annotation:Por favor, introduza la nueva anotación:
-
+ Set countersEstablecer contadores
@@ -3801,47 +3809,45 @@ La versión local es %1, la versión remota es %2.
no mazo
- local deck
- mazo local
+ mazo local
- deck #%1
- mazo #%1
+ mazo #%1
-
+ User &details&Detalles del usuario
-
+ Direct &chat&Chat privado
-
+ Add to &buddy listAñadir a la lista de &amigos
-
+ Remove from &buddy listQuitar de la lista de &amigos
-
+ Add to &ignore listAñadir a la lista de &ignorados
-
+ Remove from &ignore listQuitar de la lista de &ignorados
-
+ Kick from &gameExpulsar de la &partida
@@ -3853,27 +3859,27 @@ La versión local es %1, la versión remota es %2.
QObject
-
+ MaindeckMazo principal
-
+ SideboardReserva
-
+ Cockatrice decks (*.cod)Mazos de Cockatrice (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)Archivos de texto plano (*.dec *.mwDeck)
-
+ All files (*.*)Todos los archivos (*.*)
@@ -4229,17 +4235,17 @@ Por favor, introduzca un nombre:
¿Estás seguro de que quieres abandonar la partida?
-
+ KickedExpulsado
-
+ You have been kicked out of the game.Has sido expulsado de la partida.
-
+ Game %1: %2Partida %1: %2
@@ -4280,27 +4286,27 @@ Por favor, introduzca un nombre:
TabRoom
-
+ &Say:&Decir:
-
+ ChatChat
-
+ &Room&Sala
-
+ &Leave room&Dejar sala
-
+ You are flooding the chat. Please wait a couple of seconds.Estás floodeando el chat. Por favor, espera unos segundos.
@@ -4422,67 +4428,67 @@ Por favor, introduzca un nombre:
UserList
-
+ Users online: %1Usuarios online: %1
-
+ Users in this room: %1Usuarios en esta sala: %1
-
+ Buddies online: %1 / %2Amigos online: %1 / %2
-
+ Ignored users online: %1 / %2Usuarios ignorados online: %1 / %2
-
+ %1's gamesPartidas de %1
-
+ User &details&Detalles del usuario
-
+ Direct &chat&Chat privado
-
+ Show this user's &gamesMostrar &partidas de este usuario
-
+ Add to &buddy listAñadir a la lista de &amigos
-
+ Remove from &buddy listQuitar de la lista de &amigos
-
+ Add to &ignore listAñadir a la lista de &ignorados
-
+ Remove from &ignore listQuitar de la lista de &ignorados
-
+ Ban from &serverBanear del &servidor
@@ -4505,136 +4511,141 @@ Indica 0 para un ban indefinido.
&Buscar por:
-
+ Deck &name:&Nombre del mazo:
-
+ &Comments:&Comentarios:
-
+ Deck editor [*]Editor de mazos [*]
-
+ &New deck&Nuevo mazo
-
+ &Load deck...&Cargar mazo...
-
+ Load deck from cl&ipboard...Cargar mazo del &portapapeles...
-
+ &Save deck&Guardar mazo
-
+
+ Hash:
+
+
+
+ &Update prices&Actualizar precios
-
+ Ctrl+UCtrl+U
-
+ Save deck &as...Guardar mazo &como...
-
+ Save deck to clip&boardGuardar mazo al p&ortapales
-
+ &Print deck...Im&primir mazo...
-
+ &Close&Cerrar
-
+ Ctrl+QCtrl+Q
-
+ &Edit sets...&Editar ediciones...
-
+ &Deck&Mazo
-
+ Load deckCargar mazo
-
-
+
+ ErrorError
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.El mazo no puede guardarse
Por favor, compruebe que tiene permisos de escritura en el directorio e intentelo de nuevo.
-
+ Save deckGuardar mazo
-
+ Add card to &maindeckAñadir carta al &mazo principal
-
+ ReturnReturn
-
+ EnterEnter
-
+ Ctrl+ReturnCtrl+Return
-
+ Ctrl+EnterCtrl+Enter
-
+ Add card to &sideboardAñadir carta a la &reserva
@@ -4649,47 +4660,47 @@ Por favor, compruebe que tiene permisos de escritura en el directorio e intentel
&Limpiar busqueda
-
+ &Card database&Base de datos de cartas
-
+ &Remove row&Eliminar columna
-
+ DelDel
-
+ &Increment number&Incrementar número
-
+ ++
-
+ &Decrement number&Decrementar número
-
+ --
-
+ Are you sure?¿Estás seguro?
-
+ The decklist has been modified.
Do you want to save the changes?La lista del mazo ha sido modificada
diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts
index 1895af80e..45ca8e9cb 100644
--- a/cockatrice/translations/cockatrice_fr.ts
+++ b/cockatrice/translations/cockatrice_fr.ts
@@ -136,24 +136,24 @@ Enter 0 for an indefinite ban.
Entrez 0 pour une durée illimitée du ban.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.Veuillez expliquer la raison du ban.
Cette information ne sera consultable que par les modérateurs.
-
+ &OK&OK
-
+ &Cancel&Annuler
-
+ Ban user from serverBannir le joueur du serveur
@@ -1015,17 +1015,17 @@ Cette information ne sera consultable que par les modérateurs.
DeckListModel
-
+ NumberNombre
-
+ CardCarte
-
+ PricePrix
@@ -1421,7 +1421,6 @@ Cette information ne sera consultable que par les modérateurs.
GameSelector
-
@@ -1429,71 +1428,72 @@ Cette information ne sera consultable que par les modérateurs.
+ ErrorErreur
-
+ Please join the appropriate room first.Veuillez d'abord rejoindre le bon salon.
-
+ Wrong password.Mot de passe erroné.
-
+ Spectators are not allowed in this game.Les spectateurs ne sont pas autorisés dans cette partie.
-
+ The game is already full.Cette partie est déjà pleine.
-
+ The game does not exist any more.La partie n'existe plus.
-
+ This game is only open to registered users.Cette partie n'est accessible qu'aux joueurs enregistrés.
-
+ This game is only open to its creator's buddies.Cette partie n'est accessible qu'aux amis.
-
+ You are being ignored by the creator of this game.Vous avez été ignoré par le créateur de la partie.
-
+ Join gameRejoindre partie
-
+ Password:Mot de passe:
-
+ GamesParties
-
+ Show &full gamesMontrer les pa&rties pleines
-
+ Show &running gamesMontrer les &parties en cours
@@ -1503,17 +1503,17 @@ Cette information ne sera consultable que par les modérateurs.
&Montrer toutes les parties
-
+ C&reateC&réer
-
+ &JoinRe&joindre
-
+ J&oin as spectatorRej&oindre en tant que spectateur
@@ -1559,12 +1559,12 @@ Cette information ne sera consultable que par les modérateurs.
non autorisé
-
+ RoomSalon
-
+ DescriptionDescription
@@ -1991,7 +1991,7 @@ La version la plus récente est %1, l'ancienne version est %2.%1 a concédé la partie.
-
+ The game has started.La partie commence.
@@ -2049,115 +2049,111 @@ La version la plus récente est %1, l'ancienne version est %2.%1 a quitté la partie.
- %1 has loaded a local deck.female
- %1 a chargé un deck local.
+ %1 a chargé un deck local.
- %1 has loaded a local deck.male
- %1 a chargé un deck local.
+ %1 a chargé un deck local.
- %1 has loaded deck #%2.female
- %1 a chargé le deck #%2.
+ %1 a chargé le deck #%2.
+
+
+ %1 has loaded deck #%2.
+ male
+ %1 a chargé le deck #%2.
- %1 has loaded deck #%2.
- male
- %1 a chargé le deck #%2.
-
-
- %1 is ready to start the game.female%1 est prête à démarrer la partie.
-
+ %1 is ready to start the game.male%1 est prêt à démarrer la partie.
-
+ %1 is not ready to start the game any more.female%1 n'est plus prête à démarrer la partie.
-
+ %1 is not ready to start the game any more.male%1 n'est plus prêt à démarrer la partie.
-
+ %1 has conceded the game.female%1 a concédé la partie.
-
+ %1 has conceded the game.male%1 a concédé la partie.
-
+ %1 has restored connection to the game.female%1 est revenue dans la partie.
-
+ %1 has restored connection to the game.male%1 est revenu dans la partie.
-
+ %1 has lost connection to the game.female%1 s'est déconnectée de la partie.
-
+ %1 has lost connection to the game.male%1 s'est déconnecté de la partie.
-
+ %1 shuffles %2.female%1 mélange %2.
+
+
+ %1 shuffles %2.
+ male
+ %1 mélange %2.
+
- %1 shuffles %2.
- male
- %1 mélange %2.
-
-
- %1 rolls a %2 with a %3-sided die.female%1 a fait %2 avec un dé %3 faces.
-
+ %1 rolls a %2 with a %3-sided die.male%1 a fait %2 avec un dé %3 faces.
-
+ %1 draws %n card(s).female
@@ -2166,7 +2162,7 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ %1 draws %n card(s).male
@@ -2175,158 +2171,158 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ from table depuis le champ de bataille
-
+ from graveyard depuis son cimetière
-
+ from exile depuis la zone exil
-
+ from hand depuis sa main
-
+ the bottom card of his libraryla carte du dessous de sa bibliothèque
-
+ the bottom card of her libraryla carte du dessous de sa bibliothèque
-
+ from the bottom of his library du dessous de sa bibliothèque
-
+ from the bottom of her library du dessous de sa bibliothèque
-
+ the top card of his libraryle carte du dessus de sa bibliothèque
-
+ the top card of her libraryle carte du dessus de sa bibliothèque
-
+ from the top of his library du dessus de sa bibliothèque
-
+ from the top of her library du dessus de sa bibliothèque
-
+ from library depuis sa bibliothèque
-
+ from sideboard depuis sa réserve
-
+ from the stack depuis la pile
-
+ %1 puts %2 into play tapped%3.%1 met %2 en jeu engagé%3.
-
+ %1 puts %2 into play%3.what is %3? plz exemple (resp. by Ranma : XX met island en jeu -depuis sa main-.)%1 met %2 en jeu %3.
-
+ %1 puts %2%3 into graveyard.%1 met %2%3 dans son cimetière.
-
+ %1 exiles %2%3.%1 exile %2%3.
-
+ %1 moves %2%3 to hand.%1 met %2%3 dans sa main.
-
+ %1 puts %2%3 into his library.%1 met %2%3 dans sa bibliothèque.
-
+ %1 puts %2%3 into her library.%1 met %2%3 dans sa bibliothèque.
-
+ %1 puts %2%3 on bottom of his library.%1 met %2%3 en-dessous de sa bibliothèque.
-
+ %1 puts %2%3 on bottom of her library.%1 met %2%3 en-dessous de sa bibliothèque.
-
+ %1 puts %2%3 on top of his library.%1 met %2%3 au-dessus de sa bibliothèque.
-
+ %1 puts %2%3 on top of her library.%1 met %2%3 au-dessus de sa bibliothèque.
-
+ %1 puts %2%3 into his library at position %4.%1 met %2%3 dans sa bibliothèque à la position n°%4.
-
+ %1 puts %2%3 into her library at position %4.%1 met %2%3 dans sa bibliothèque à la position n°%4.
-
+ %1 moves %2%3 to sideboard.%1 met %2%3 à sa réserve.
-
+ %1 plays %2%3.%1 joue %2%3.
-
+ %1 takes a mulligan to %n.female
@@ -2335,7 +2331,7 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ %1 takes a mulligan to %n.male
@@ -2344,37 +2340,37 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ %1 flips %2 face-down.female%1 retourne %2 face cachée.
-
+ %1 flips %2 face-down.male%1 retourne %2 face cachée.
-
+ %1 flips %2 face-up.female%1 retourne %2 face visible.
+
+
+ %1 flips %2 face-up.
+ male
+ %1 retourne %2 face visible.
+
- %1 flips %2 face-up.
- male
- %1 retourne %2 face visible.
-
-
- %1 destroys %2.female%1 détruit %2.
-
+ %1 destroys %2.male%1 détruit %2.
@@ -2390,271 +2386,283 @@ La version la plus récente est %1, l'ancienne version est %2.%1 attache %2 sur %4 de %3.
-
+
+ %1 has loaded a deck (%2).
+ female
+ %1 a chargé le deck %2.
+
+
+
+ %1 has loaded a deck (%2).
+ male
+ %1 a chargé le deck %2.
+
+
+ %1 attaches %2 to %3's %4.p1 female, p2 female%1 attache %2 sur %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male%1 attache %2 sur %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female%1 attache %2 sur %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male%1 attache %2 sur %4 de %3.
-
+ %1 unattaches %2.female%1 détache %2.
-
+ %1 unattaches %2.male%1 détache %2.
-
+ %1 creates token: %2%3.female%1 crée un jeton %2%3.
-
+ %1 creates token: %2%3.male%1 crée un jeton %2%3.
-
+ %1 points from her %2 to herself.female%1 se cible avec %2.
-
+ %1 points from his %2 to himself.male%1 se cible avec %2.
-
+ %1 points from her %2 to %3.p1 female, p2 female%1 cible %3 avec %2.
-
+ %1 points from her %2 to %3.p1 female, p2 male%1 cible %3 avec %2.
-
+ %1 points from his %2 to %3.p1 male, p2 female%1 cible %3 avec %2.
-
+ %1 points from his %2 to %3.p1 male, p2 male%1 cible %3 avec %2.
-
+ %1 points from %2's %3 to herself.card owner female, target female%1 se cible avec %3 de %2.
-
+ %1 points from %2's %3 to herself.card owner male, target female%1 se cible avec %3 de %2.
-
+ %1 points from %2's %3 to himself.card owner female, target male%1 se cible avec %3 de %2.
-
+ %1 points from %2's %3 to himself.card owner male, target male%1 se cible avec %3 de %2.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 female%1 cible %4 avec %3 de %2.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 male%1 cible %4 avec %3 de %2.
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+ %1 cible %4 avec %3 de %2.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 male
+ %1 cible %4 avec %3 de %2.
+ %1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 cible %4 avec %3 de %2.%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+ %1 cible %4 avec %3 de %2.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 cible %4 avec %3 de %2.%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
- %1 cible %4 avec %3 de %2.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
- %1 cible %4 avec %3 de %2.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
- %1 cible %4 avec %3 de %2.
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male%1 cible %4 avec %3 de %2.
-
+ %1 points from her %2 to her %3.female%1 cible %3 avec %2.
-
+ %1 points from his %2 to his %3.male%1 cible %3 avec %2.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female%1 cible %3 de %4 avec %2.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male%1 cible %3 de %4 avec %2.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female%1 cible %3 de %4 avec %2.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male%1 cible %3 de %4 avec %2.
-
+ %1 points from %2's %3 to her own %4.card owner female, target female%1 cible %4 avec %3 de %2.
-
+ %1 points from %2's %3 to her own %4.card owner male, target female%1 cible %4 avec %3 de %2.
-
+ %1 points from %2's %3 to his own %4.card owner female, target male%1 cible %4 avec %3 de %2.
-
+ %1 points from %2's %3 to his own %4.card owner male, target male%1 cible %4 avec %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female%1 cible %5 de %4 avec %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male%1 cible %5 de %4 avec %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female%1 cible %5 de %4 avec %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male%1 cible %5 de %4 avec %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female%1 cible %5 de %4 avec %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male%1 cible %5 de %4 avec %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female%1 cible %5 de %4 avec %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male%1 cible %5 de %4 avec %3 de %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).female
@@ -2663,7 +2671,7 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).male
@@ -2672,7 +2680,7 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).female
@@ -2681,7 +2689,7 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).male
@@ -2690,272 +2698,272 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ %1 taps her permanents.female%1 engage ses permanents.
-
+ %1 untaps her permanents.female%1 dégage ses permanents.
-
+ %1 taps his permanents.male%1 engage ses permanents.
-
+ %1 untaps his permanents.male%1 dégage ses permanents.
+
+
+ %1 taps %2.
+ female
+ %1 engage %2.
+
+
+
+ %1 untaps %2.
+ female
+ %1 dégage %2.
+
+
+
+ %1 taps %2.
+ male
+ %1 engage %2.
+
- %1 taps %2.
- female
- %1 engage %2.
-
-
-
- %1 untaps %2.
- female
- %1 dégage %2.
-
-
-
- %1 taps %2.
- male
- %1 engage %2.
-
-
- %1 untaps %2.male%1 dégage %2.
-
+ %1 sets counter %2 to %3 (%4%5).female%1 met les marqueurs %2 à %3 (%4%5).
-
+ %1 sets counter %2 to %3 (%4%5).male%1 met les marqueurs %2 à %3 (%4%5).
+
+
+ %1 sets %2 to not untap normally.
+ female
+ %2 de %1 ne se dégagera pas lors de l'étape de dégagement.
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+ %2 de %1 ne se dégagera pas lors de l'étape de dégagement.
+
+
+
+ %1 sets %2 to untap normally.
+ female
+ %2 de %1 se dégagera lors de l'étape de dégagement.
+
- %1 sets %2 to not untap normally.
- female
- %2 de %1 ne se dégagera pas lors de l'étape de dégagement.
-
-
-
- %1 sets %2 to not untap normally.
- male
- %2 de %1 ne se dégagera pas lors de l'étape de dégagement.
-
-
-
- %1 sets %2 to untap normally.
- female
- %2 de %1 se dégagera lors de l'étape de dégagement.
-
-
- %1 sets %2 to untap normally.male%2 de %1 se dégagera lors de l'étape de dégagement.
-
+ %1 sets PT of %2 to %3.female%1 change la F/E de %2 à %3.
-
+ %1 sets PT of %2 to %3.male%1 change la F/E de %2 à %3.
-
+ %1 sets annotation of %2 to %3.female%1 met l'annotation %3 à %2.
-
+ %1 sets annotation of %2 to %3.male%1 met l'annotation %3 à %2.
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+ %1 regarde les %2 cartes du dessus %3.
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+ %1 regarde les %2 cartes du dessus %3.
+
+
+
+ %1 is looking at %2.
+ female
+ %1 regarde %2.
+
- %1 is looking at the top %2 cards %3.
- female
- %1 regarde les %2 cartes du dessus %3.
-
-
-
- %1 is looking at the top %2 cards %3.
- male
- %1 regarde les %2 cartes du dessus %3.
-
-
-
- %1 is looking at %2.
- female
- %1 regarde %2.
-
-
- %1 is looking at %2.male%1 regarde %2.
-
+ %1 stops looking at %2.female%1 arrête de regarder %2.
-
+ %1 stops looking at %2.male%1 arrête de regarder %2.
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+ %1 révèle %2 à %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+ %1 révèle %2 à %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+ %1 révèle %2 à %3.
+ %1 reveals %2 to %3.
- p1 female, p2 female
- %1 révèle %2 à %3.
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
+ p1 male, p2 male%1 révèle %2 à %3.
- %1 reveals %2 to %3.
- p1 male, p2 female
- %1 révèle %2 à %3.
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 male
- %1 révèle %2 à %3.
-
-
- %1 reveals %2.female%1 révèle %2.
-
+ %1 reveals %2.male%1 révèle %2.
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+ %1 révèle au hasard %2%3 à %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+ %1 révèle au hasard %2%3 à %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+ %1 révèle au hasard %2%3 à %4.
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
- %1 révèle au hasard %2%3 à %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
+ p1 male, p2 male%1 révèle au hasard %2%3 à %4.
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
- %1 révèle au hasard %2%3 à %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 male
- %1 révèle au hasard %2%3 à %4.
-
-
- %1 randomly reveals %2%3.female%1 révèle au hasard %2%3.
-
+ %1 randomly reveals %2%3.male%1 révèle au hasard %2%3.
-
+ %1 reveals %2%3 to %4.p1 female, p2 female%1 révèle %2%3 à %4.
-
+ %1 reveals %2%3 to %4.p1 female, p2 male%1 révèle %2%3 à %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 female%1 révèle %2%3 à %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 male%1 révèle %2%3 à %4.
-
+ %1 reveals %2%3.female%1 révèle %2%3.
-
+ %1 reveals %2%3.male%1 révèle %2%3.
-
+ It is now %1's turn.femaleC'est maintenant le tour de %1.
-
+ It is now %1's turn.maleC'est maintenant le tour de %1.
-
-
+
+ a cardune carte
@@ -2967,37 +2975,37 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ %1 undoes his last draw.%1 annule sa dernière pioche.
-
+ %1 undoes her last draw.%1 annule sa dernière pioche.
-
+ %1 undoes his last draw (%2).%1 annule sa dernière pioche (%2).
-
+ %1 undoes her last draw (%2).%1 annule sa dernière pioche (%2).
-
+ %1 gives %2 control over %3.%1 donne le contrôle de %2 à %3.
-
+ %1 draws his initial hand.%1 pioche sa main de départ.
-
+ %1 draws her initial hand.%1 pioche sa main de départ.
@@ -3067,7 +3075,7 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ redrouge
@@ -3075,7 +3083,7 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ yellowjaune
@@ -3083,7 +3091,7 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ greenvert
@@ -3174,62 +3182,62 @@ La version la plus récente est %1, l'ancienne version est %2.C'est maintenant le tour de %1.
-
+ untap stepétape de dégagement
-
+ upkeep stepétape d'entretien
-
+ draw stepétape de pioche
-
+ first main phasepremière phase principale
-
+ beginning of combat stepétape de début du combat
-
+ declare attackers stepétape de déclaration des attaquants
-
+ declare blockers stepétape de déclaration des bloqueurs
-
+ combat damage stepétape de répartition et de résolution des blessures
-
+ end of combat stepétape de fin de combat
-
+ second main phaseseconde phase principale
-
+ ending phasephase de fin de tour
-
+ It is now the %1.need exempleC'est maintenant %1.
@@ -3589,7 +3597,7 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ Number:Nombre:
@@ -3614,28 +3622,28 @@ La version la plus récente est %1, l'ancienne version est %2.Nombre de faces:
-
+ Set power/toughnessFixer force/endurance
-
+ Please enter the new PT:maybe better with /Entrer la nouvelle F/E:
-
+ Set annotationMettre une note
-
+ Please enter the new annotation:Entrez la nouvelle note:
-
+ Set countersMettre des marqueurs
@@ -3663,47 +3671,45 @@ La version la plus récente est %1, l'ancienne version est %2.#%1
- local deck
- deck local
+ deck local
- deck #%1
- deck #%1
+ deck #%1
-
+ User &details&Détails utilisateur
-
+ Direct &chat&Chat direct
-
+ Add to &buddy listAjouter à la liste d'&amis
-
+ Remove from &buddy listRetirer de la liste d'&amis
-
+ Add to &ignore listAjouter à la liste &noire
-
+ Remove from &ignore listRetirer de la liste &noire
-
+ Kick from &gameExclure de la &partie
@@ -3711,27 +3717,27 @@ La version la plus récente est %1, l'ancienne version est %2.
QObject
-
+ MaindeckDeck
-
+ SideboardRéserve
-
+ Cockatrice decks (*.cod)Decks format Cockatrice (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)Decks au format texte (*.dec *.mwDeck)
-
+ All files (*.*)Tous les fichiers (*.*)
@@ -3928,7 +3934,7 @@ La version la plus récente est %1, l'ancienne version est %2.
-
+ New folderNouveau dossier
@@ -3938,25 +3944,24 @@ La version la plus récente est %1, l'ancienne version est %2.Supprimer
-
+ Enter deck nameEntrez le nom du deck
-
+ This decklist does not have a name.
Please enter a name:Ce deck n'a pas de nom.
Entrez un nom s'il vous plaît:
-
-
+ Unnamed deckDeck sans nom
-
+ Name of new folder:Nom du nouveau dossier:
@@ -4089,17 +4094,17 @@ Entrez un nom s'il vous plaît:
Êtes-vous sûr de vouloir quitter la partie?
-
+ KickedExclu
-
+ You have been kicked out of the game.Vous avez été exclu de la partie.
-
+ Game %1: %2Partie %1:%2
@@ -4141,27 +4146,27 @@ Entrez un nom s'il vous plaît:
TabRoom
-
+ &Say:&Dire:
-
+ ChatChat
-
+ &Room&Salon
-
+ &Leave room&Quitter le salon
-
+ You are flooding the chat. Please wait a couple of seconds.Vous floodez le chat. Veuillez patienter quelques secondes.
@@ -4284,68 +4289,68 @@ Entrez un nom s'il vous plaît:
UserList
-
+ Users online: %1Utilisateurs en ligne:%1
-
+ Users in this room: %1Utilisateurs dans ce salon: %1
-
+ Buddies online: %1 / %2Amis connectés; %1 / %2
-
+ Ignored users online: %1 / %2Personnes sur liste noire connectés: %1 / %2
-
+ %1's gamesParties de %1
-
+ User &details&Détails utilisateur
-
+ Direct &chat&Chat direct
-
+ Show this user's &gamesMissing the female version : "Montrer les parties de cette joueuse"Montrer les &parties de de ce joueur
-
+ Add to &buddy listAjouter à la liste d'&amis
-
+ Remove from &buddy listRetirer de la liste d'&amis
-
+ Add to &ignore listAjouter à la liste &noire
-
+ Remove from &ignore listRetirer de la liste &noire
-
+ Ban from &serverBannir du &serveur
@@ -4378,185 +4383,190 @@ Entrez 0 pour une durée illimitée du ban.
&Rechercher:
-
+ Deck &name:&Nom du deck:
-
+ &Comments:&Commentaires:
-
+
+ Hash:
+
+
+
+ &Update pricesMettre à &jour les prix
-
+ Ctrl+UCtrl+U
-
+ Deck editor [*]Editeur de deck [*]
-
+ &New deck&Nouveau deck
-
+ &Load deck...Char&ger deck...
-
+ &Save deck&Sauvegarder le deck
-
+ Save deck &as...S&auvegarder le deck sous...
-
+ Load deck from cl&ipboard...Charger deck depuis le presse-pap&ier...
-
+ Save deck to clip&boardSauve&garder le deck dans le presse-papier
-
+ &Print deck...Im&primer le deck...
-
+ &Close&Fermer
-
+ Ctrl+QCtrl+Q
-
+ &Edit sets...&Editer les editions...
-
+ &Deck&Deck
-
+ &Card databaseBase de &cartes
-
+ Add card to &maindeckAjouter carte au &deck
-
+ ReturnRetour
-
+ EnterEntrer
-
+ Add card to &sideboardAjouter carte à la ré&serve
-
+ Ctrl+ReturnCtrl+Return
-
+ Ctrl+EnterCtrl+Enter
-
+ &Remove row&Retirer la ligne
-
+ DelSupprimer
-
+ &Increment numberto check&Augmenter quantité
-
+ ++
-
+ &Decrement numberto check&Diminuer quantité
-
+ --
-
+ Are you sure?Êtes-vous sûr?
-
+ The decklist has been modified.
Do you want to save the changes?Le deck a été modifié.
Voulez vous enregistrer les modifications?
-
+ Load deckCharger deck
-
-
+
+ ErrorErreur
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.Le deck n'a pas pu être enregistré.
Vérifiez que le répertoire ne soit pas en lecture seule et réessayez.
-
+ Save deckSauvegarder le deck
@@ -4572,17 +4582,17 @@ Vérifiez que le répertoire ne soit pas en lecture seule et réessayez.
ZoneViewWidget
-
+ sort by nametri par nom
-
+ sort by typetri par type
-
+ shuffle when closingmélanger en quittant
diff --git a/cockatrice/translations/cockatrice_it.ts b/cockatrice/translations/cockatrice_it.ts
index d89fe2b0f..0e7735f14 100644
--- a/cockatrice/translations/cockatrice_it.ts
+++ b/cockatrice/translations/cockatrice_it.ts
@@ -136,24 +136,24 @@ Enter 0 for an indefinite ban.
Inserisci 0 per un periodo indefinito.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.Per favore inserisci la ragione del ban.
Questo è solo visibile ai moderatori e non alla persona bannata.
-
+ &OK&OK
-
+ &Cancel&Annulla
-
+ Ban user from serverBanna utente dal server
@@ -811,17 +811,17 @@ Questo è solo visibile ai moderatori e non alla persona bannata.
DeckListModel
-
+ NumberNumero
-
+ CardCarta
-
+ PricePrezzo
@@ -1744,120 +1744,128 @@ La tua versione è la %1, la versione online è la %2.
%1 non sta più osservando la partita.
- %1 has loaded a local deck.female
- %1 ha aperto un mazzo locale.
+ %1 ha aperto un mazzo locale.
- %1 has loaded a local deck.male
- %1 ha aperto un mazzo locale.
+ %1 ha aperto un mazzo locale.
- %1 has loaded deck #%2.female
- %1 ha aperto un mazzo #%2.
+ %1 ha aperto un mazzo #%2.
+
+
+ %1 has loaded deck #%2.
+ male
+ %1 ha aperto un mazzo #%2.
+
+
+
+ %1 has loaded a deck (%2).
+ female
+ %1 ha aperto un mazzo %2.
+
+
+
+ %1 has loaded a deck (%2).
+ male
+ %1 ha aperto un mazzo %2.
- %1 has loaded deck #%2.
- male
- %1 ha aperto un mazzo #%2.
-
-
- %1 is ready to start the game.female%1 è pronta a iniziare la partita.
-
+ %1 is ready to start the game.male%1 è pronto a iniziare la partita.
-
+ %1 is not ready to start the game any more.female%1 non è più pronta a iniziare la partita.
-
+ %1 is not ready to start the game any more.male%1 non è più pronto a iniziare la partita.
-
+ %1 has conceded the game.female%1 ha concesso la partita.
-
+ %1 has conceded the game.male%1 ha concesso la partita.
-
+ The game has started.La partita è iniziata.
+
+
+ %1 has restored connection to the game.
+ female
+ %1 ha ripristinato il collegamento alla partita.
+
+
+
+ %1 has restored connection to the game.
+ male
+ %1 ha ripristinato il collegamento alla partita.
+
+
+
+ %1 has lost connection to the game.
+ female
+ %1 ha perso il collegamento alla partita.
+
- %1 has restored connection to the game.
- female
- %1 ha ripristinato il collegamento alla partita.
-
-
-
- %1 has restored connection to the game.
- male
- %1 ha ripristinato il collegamento alla partita.
-
-
-
- %1 has lost connection to the game.
- female
- %1 ha perso il collegamento alla partita.
-
-
- %1 has lost connection to the game.male%1 ha perso il collegamento alla partita.
-
+ %1 shuffles %2.female%1 mischia %2.
+
+
+ %1 shuffles %2.
+ male
+ %1 mischia %2.
+
- %1 shuffles %2.
- male
- %1 mischia %2.
-
-
- %1 rolls a %2 with a %3-sided die.female%1 lancia un %2 con %3 facce.
-
+ %1 rolls a %2 with a %3-sided die.male%1 lancia un %2 con %3 facce.
-
+ %1 draws %n card(s).female
@@ -1866,197 +1874,197 @@ La tua versione è la %1, la versione online è la %2.
+
+ %1 draws %n card(s).
+ male
+
+ %1 pesca una carta.
+ %1 pesca %n carte.
+
+
+
- %1 draws %n card(s).
- male
-
- %1 pesca una carta.
- %1 pesca %n carte.
-
-
-
- %1 undoes her last draw.%1 annulla la sua ultima pescata.
-
+ %1 undoes his last draw.%1 annulla la sua ultima pescata.
-
+ %1 undoes her last draw (%2).%1 annulla la sua ultima pescata (%2).
-
+ %1 undoes his last draw (%2).%1 annulla la sua ultima pescata (%2).
-
+ from table dal tavolo
-
+ from graveyard dal cimitero
-
+ from exile dall'esilio
-
+ from hand dalla mano
-
+ the bottom card of her libraryl'ultima carta del suo grimorio
-
+ the bottom card of his libraryl'ultima carta del suo grimorio
-
+ from the bottom of her librarydal fondo del suo grimorio
-
+ from the bottom of his librarydal fondo del suo grimorio
-
+ the top card of her libraryla prima carta del suo grimorio
-
+ the top card of his libraryla prima carta del suo grimorio
-
+ from the top of her library dalla cima del suo grimorio
-
+ from the top of his library dalla cima del suo grimorio
-
+ from library dal grimorio
-
+ from sideboard dalla sideboard
-
+ from the stack dalla pila
-
-
+
+ a carduna carta
-
+ %1 gives %2 control over %3.%1 da il controllo di %2 a %3.
-
+ %1 puts %2 into play tapped%3.%1 metti %2 in gioco tappata%3.
-
+ %1 puts %2 into play%3.%1 mette %2 in gioco%3.
-
+ %1 puts %2%3 into graveyard.%1 mette %2%3 nel cimitero.
-
+ %1 exiles %2%3.%1 esilia %2%3.
-
+ %1 moves %2%3 to hand.%1 prende %2%3 in mano.
-
+ %1 puts %2%3 into her library.%1 mette %2%3 nel suo grimorio.
-
+ %1 puts %2%3 into his library.%1 mette %2%3 nel suo grimorio.
-
+ %1 puts %2%3 on bottom of her library.%1 mette %2%3 in fondo al suo grimorio.
-
+ %1 puts %2%3 on bottom of his library.%1 mette %2%3 in fondo al suo grimorio.
-
+ %1 puts %2%3 on top of her library.%1 mette %2%3 in cima al suo grimorio.
-
+ %1 puts %2%3 on top of his library.%1 mette %2%3 in cima al suo grimorio.
-
+ %1 puts %2%3 into her library at position %4.%1 mette %2%3 nel suo grimorio alla posizione %4.
-
+ %1 puts %2%3 into his library at position %4.%1 mette %2%3 nel suo grimorio alla posizione %4.
-
+ %1 moves %2%3 to sideboard.%1 mette %2%3 in sideboard.
-
+ %1 plays %2%3.%1 gioca %2%3.
-
+ %1 takes a mulligan to %n.female
@@ -2065,7 +2073,7 @@ La tua versione è la %1, la versione online è la %2.
-
+ %1 takes a mulligan to %n.male
@@ -2074,344 +2082,344 @@ La tua versione è la %1, la versione online è la %2.
-
+ %1 draws her initial hand.%1 pesca la sua mano iniziale.
-
+ %1 draws his initial hand.%1 pesca la sua mano iniziale.
-
+ %1 flips %2 face-down.female%1 gira %2 a faccia in giù.
-
+ %1 flips %2 face-down.male%1 gira %2 a faccia in giù.
-
+ %1 flips %2 face-up.female%1 gira %2 a faccia in sù.
-
+ %1 flips %2 face-up.male
-
+ %1 destroys %2.female%1 distrugge %2.
-
+ %1 destroys %2.male%1 distrugge %2.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 female%1 attacca %2 a %3 di %4.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male%1 attacca %2 a %3 di %4.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female%1 attacca %2 a %3 di %4.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male%1 attacca %2 a %3 di %4.
-
+ %1 unattaches %2.female%1 stacca %2.
-
+ %1 unattaches %2.male%1 stacca %2.
-
+ %1 creates token: %2%3.female%1 crea una pedina: %2%3.
-
+ %1 creates token: %2%3.male%1 crea una pedina: %2%3.
-
+ %1 points from her %2 to herself.female%1 disegna una freccia dal suo %2 a sé stessa.
-
+ %1 points from his %2 to himself.male%1 disegna una freccia dal suo %2 a sé stesso.
-
+ %1 points from her %2 to %3.p1 female, p2 female%1 disegna una freccia dal suo %2 a %3.
-
+ %1 points from her %2 to %3.p1 female, p2 male%1 disegna una freccia dal suo %2 a %3.
-
+ %1 points from his %2 to %3.p1 male, p2 female%1 disegna una freccia dal suo %2 a %3.
-
+ %1 points from his %2 to %3.p1 male, p2 male%1 disegna una freccia dal suo %2 a %3.
-
+ %1 points from %2's %3 to herself.card owner female, target female%1 disegna una freccia dal %3 di %2 a sé stessa.
-
+ %1 points from %2's %3 to herself.card owner male, target female%1 disegna una freccia dal %3 di %2 a sé stessa.
-
+ %1 points from %2's %3 to himself.card owner female, target male%1 disegna una freccia dal %3 di %2 a sé stesso.
-
+ %1 points from %2's %3 to himself.card owner male, target male%1 disegna una freccia dal %3 di %2 a sé stesso.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 female%1 disegna una freccia dal %3 di %2 a %4.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 male%1 disegna una freccia dal %3 di %2 a %4.
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+ %1 disegna una freccia dal %3 di %2 a %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 male
+ %1 disegna una freccia dal %3 di %2 a %4.
+ %1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 disegna una freccia dal %3 di %2 a %4.%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+ %1 disegna una freccia dal %3 di %2 a %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 disegna una freccia dal %3 di %2 a %4.%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
- %1 disegna una freccia dal %3 di %2 a %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
- %1 disegna una freccia dal %3 di %2 a %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
- %1 disegna una freccia dal %3 di %2 a %4.
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male%1 disegna una freccia dal %3 di %2 a %4.
-
+ %1 points from her %2 to her %3.female%1 disegna una freccia dal suo %2 al suo %3.
-
+ %1 points from his %2 to his %3.male%1 disegna una freccia dal suo %2 al suo %3.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female%1 disegna una freccia dal suo %2 al %4 di %3.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male%1 disegna una freccia dal suo %2 al %4 di %3.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female%1 disegna una freccia dal suo %2 al %4 di %3.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male%1 disegna una freccia dal suo %2 al %4 di %3.
-
+ %1 points from %2's %3 to her own %4.card owner female, target female%1 disegna una freccia dal %3 di %2 al proprio %4.
-
+ %1 points from %2's %3 to her own %4.card owner male, target female%1 disegna una freccia dal %3 di %2 al proprio %4.
-
+ %1 points from %2's %3 to his own %4.card owner female, target male%1 disegna una freccia dal %3 di %2 al proprio %4.
-
+ %1 points from %2's %3 to his own %4.card owner male, target male%1 disegna una freccia dal %3 di %2 al proprio %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female%1 disegna una freccia dal %3 di %2 al %5 di %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male%1 disegna una freccia dal %3 di %2 al %5 di %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female%1 disegna una freccia dal %3 di %2 al %5 di %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male%1 disegna una freccia dal %3 di %2 al %5 di %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female%1 disegna una freccia dal %3 di %2 al %5 di %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male%1 disegna una freccia dal %3 di %2 al %5 di %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female%1 disegna una freccia dal %3 di %2 al %5 di %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male%1 disegna una freccia dal %3 di %2 al %5 di %4.
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+ female
+
+ %1 mette uno segnalino %2 su %3 (adesso ne ha %4).
+ %1 mette %n segnalini %2 su %3 (adesso ne ha %4).
+
+
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+ male
+
+ %1 mette uno segnalino %2 su %3 (adesso ne ha %4).
+ %1 mette %n segnalini %2 su %3 (adesso ne ha %4).
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
+ female
+
+ %1 rimuove uno segnalino %2 su %3 (adesso ne ha %4).
+ %1 rimuove %n segnalini %2 su %3 (adesso ne ha %4).
+
+
- %1 places %n %2 counter(s) on %3 (now %4).
- female
-
- %1 mette uno segnalino %2 su %3 (adesso ne ha %4).
- %1 mette %n segnalini %2 su %3 (adesso ne ha %4).
-
-
-
-
- %1 places %n %2 counter(s) on %3 (now %4).
- male
-
- %1 mette uno segnalino %2 su %3 (adesso ne ha %4).
- %1 mette %n segnalini %2 su %3 (adesso ne ha %4).
-
-
-
-
- %1 removes %n %2 counter(s) from %3 (now %4).
- female
-
- %1 rimuove uno segnalino %2 su %3 (adesso ne ha %4).
- %1 rimuove %n segnalini %2 su %3 (adesso ne ha %4).
-
-
-
- %1 removes %n %2 counter(s) from %3 (now %4).male
@@ -2420,7 +2428,7 @@ La tua versione è la %1, la versione online è la %2.
-
+ redrosso
@@ -2428,7 +2436,7 @@ La tua versione è la %1, la versione online è la %2.
-
+ yellowgiallo
@@ -2436,7 +2444,7 @@ La tua versione è la %1, la versione online è la %2.
-
+ greenverde
@@ -2444,326 +2452,326 @@ La tua versione è la %1, la versione online è la %2.
-
+ %1 taps her permanents.female%1 tappa i suoi permanenti.
-
+ %1 untaps her permanents.female%1 stappa i suoi permanenti.
-
+ %1 taps his permanents.male%1 tappa i suoi permanenti.
-
+ %1 untaps his permanents.male%1 stappa i suoi permanenti.
+
+
+ %1 taps %2.
+ female
+ %1 tappa %2.
+
+
+
+ %1 untaps %2.
+ female
+ %1 stappa %2.
+
+
+
+ %1 taps %2.
+ male
+ %1 tappa %2.
+
- %1 taps %2.
- female
- %1 tappa %2.
-
-
-
- %1 untaps %2.
- female
- %1 stappa %2.
-
-
-
- %1 taps %2.
- male
- %1 tappa %2.
-
-
- %1 untaps %2.male%1 stappa %2.
-
+ %1 sets counter %2 to %3 (%4%5).female%1 imposta i segnalini %2 a %3 (%4%5).
-
+ %1 sets counter %2 to %3 (%4%5).male%1 imposta i segnalini %2 a %3 (%4%5).
+
+
+ %1 sets %2 to not untap normally.
+ female
+ %1 imposta che %2 non stappa normalmente.
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+ %1 imposta che %2 non stappa normalmente.
+
+
+
+ %1 sets %2 to untap normally.
+ female
+ %1 imposta che %2 stappa normalmente.
+
- %1 sets %2 to not untap normally.
- female
- %1 imposta che %2 non stappa normalmente.
-
-
-
- %1 sets %2 to not untap normally.
- male
- %1 imposta che %2 non stappa normalmente.
-
-
-
- %1 sets %2 to untap normally.
- female
- %1 imposta che %2 stappa normalmente.
-
-
- %1 sets %2 to untap normally.male%1 imposta che %2 stappa normalmente.
-
+ %1 sets PT of %2 to %3.female%1 imposta la FC di %2 a %3.
-
+ %1 sets PT of %2 to %3.male%1 imposta la FC di %2 a %3.
-
+ %1 sets annotation of %2 to %3.female%1 imposta le annotazioni di %2 con %3.
-
+ %1 sets annotation of %2 to %3.male%1 imposta le annotazioni di %2 con %3.
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+ %1 sta guardando le prime %2 carte di %3.
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+ %1 sta guardando le prime %2 carte di %3.
+
+
+
+ %1 is looking at %2.
+ female
+ %1 sta guarda il %2.
+
- %1 is looking at the top %2 cards %3.
- female
- %1 sta guardando le prime %2 carte di %3.
-
-
-
- %1 is looking at the top %2 cards %3.
- male
- %1 sta guardando le prime %2 carte di %3.
-
-
-
- %1 is looking at %2.
- female
- %1 sta guarda il %2.
-
-
- %1 is looking at %2.male%1 sta guarda il %2.
-
+ %1 stops looking at %2.female%1 non sta più guardando il %2.
-
+ %1 stops looking at %2.male%1 non sta più guardando il %2.
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+ %1 rivela %2 a %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+ %1 rivela %2 a %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+ %1 rivela %2 a %3.
+ %1 reveals %2 to %3.
- p1 female, p2 female
- %1 rivela %2 a %3.
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
+ p1 male, p2 male%1 rivela %2 a %3.
- %1 reveals %2 to %3.
- p1 male, p2 female
- %1 rivela %2 a %3.
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 male
- %1 rivela %2 a %3.
-
-
- %1 reveals %2.female%1 rivela %2.
-
+ %1 reveals %2.male%1 rivela %2.
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+ %1 rivela a caso %2%3 a %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+ %1 rivela a caso %2%3 a %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+ %1 rivela a caso %2%3 a %4.
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
- %1 rivela a caso %2%3 a %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
+ p1 male, p2 male%1 rivela a caso %2%3 a %4.
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
- %1 rivela a caso %2%3 a %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 male
- %1 rivela a caso %2%3 a %4.
-
-
- %1 randomly reveals %2%3.female%1 rivela a caso %2%3.
-
+ %1 randomly reveals %2%3.male%1 rivela a caso %2%3.
-
+ %1 reveals %2%3 to %4.p1 female, p2 female%1 rivela %2%3 a %4.
-
+ %1 reveals %2%3 to %4.p1 female, p2 male%1 rivela %2%3 a %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 female%1 rivela %2%3 a %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 male%1 rivela %2%3 a %4.
-
+ %1 reveals %2%3.female%1 rivela %2%3.
-
+ %1 reveals %2%3.male%1 rivela %2%3.
-
+ It is now %1's turn.femaleÈ il turno di %1.
-
+ It is now %1's turn.maleÈ il turno di %1.
-
+ untap stepInterfase di stappo
-
+ upkeep stepInterfase di matenimento
-
+ draw stepInterfase di pescaggio
-
+ first main phasePrima fase principale
-
+ beginning of combat stepInterfase di inizio combattimento
-
+ declare attackers stepInterfase di dichiarazione degli attaccanti
-
+ declare blockers stepInterfase di dichiarazione dei bloccanti
-
+ combat damage stepInterfase di risoluzione del danno da combattimento
-
+ end of combat stepInterfase di fine combattimento
-
+ second main phaseSeconda fase principale
-
+ ending phaseFase finale
-
+ It is now the %1.È adesso la %1.
@@ -3122,7 +3130,7 @@ La tua versione è la %1, la versione online è la %2.
-
+ Number:Numero:
@@ -3147,27 +3155,27 @@ La tua versione è la %1, la versione online è la %2.
Numero di facce:
-
+ Set power/toughnessImposta forza/costituzione
-
+ Please enter the new PT:Inserisci la nuova FC:
-
+ Set annotationImposta annotazione
-
+ Please enter the new annotation:Inserisci le nuove annotazioni:
-
+ Set countersImposta i segnalini
@@ -3175,47 +3183,45 @@ La tua versione è la %1, la versione online è la %2.
PlayerListWidget
- local deck
- carica mazzo
+ carica mazzo
- deck #%1
- deck #%1
+ deck #%1
-
+ User &details&Dettagli utente
-
+ Direct &chat&Chat diretta
-
+ Add to &buddy listAggiungi alla lista &amici
-
+ Remove from &buddy listRimuovi dalla lista &amici
-
+ Add to &ignore listAggiungi alla lista &ignorati
-
+ Remove from &ignore listRimuovi dalla lista &ignorati
-
+ Kick from &gameCaccia dalla &partita
@@ -3223,27 +3229,27 @@ La tua versione è la %1, la versione online è la %2.
QObject
-
+ MaindeckGrimorio
-
+ SideboardSideboard
-
+ Cockatrice decks (*.cod)Cockatrice decks (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)Testo di mazzo
-
+ All files (*.*)Tutti i files (*.*)
@@ -3572,17 +3578,17 @@ Please enter a name:
Sei sicuro di voler lasciare la partita?
-
+ KickedCaccia
-
+ You have been kicked out of the game.Sei stato cacciato dalla partita.
-
+ Game %1: %2Partita %1: %2
@@ -3623,27 +3629,27 @@ Please enter a name:
TabRoom
-
+ &Say:&Parla:
-
+ ChatChat
-
+ &Room&Stanza
-
+ &Leave room&Lascia stanza
-
+ You are flooding the chat. Please wait a couple of seconds.Stai spammando la chat. Attendi un paio di secondi.
@@ -3753,67 +3759,67 @@ Please enter a name:
UserList
-
+ Users online: %1Utenti online: %1
-
+ Users in this room: %1Utenti in questa stanza: %1
-
+ Buddies online: %1 / %2Amici online: %1 / %2
-
+ Ignored users online: %1 / %2Utenti ignorati online: %1 / %2
-
+ %1's gamesPartite di %1
-
+ User &detailsDettagli &utente
-
+ Direct &chatChat &diretta
-
+ Show this user's &gamesVisualizza le &partite dell'utente
-
+ Add to &buddy listAggiungi alla lista &amici
-
+ Remove from &buddy listRimuovi dalla lista &amici
-
+ Add to &ignore listAggiungi alla lista &ignorati
-
+ Remove from &ignore listRimuovi dalla lista &ignorati
-
+ Ban from &serverBanna dal &server
@@ -3836,183 +3842,188 @@ Please enter a name:
&Cerca per:
-
+ Deck &name:&Nome mazzo:
-
+ &Comments:&Commenti:
-
+
+ Hash:
+
+
+
+ &Update prices&Aggiorna prezzo
-
+ Ctrl+UCtrl+U
-
+ Deck editor [*]Editore di mazzi [*]
-
+ &New deck&Nuovo mazzo
-
+ &Load deck...&Carica mazzo...
-
+ &Save deck&Salva mazzo
-
+ Save deck &as...Salva mazzo &con nome...
-
+ Load deck from cl&ipboard...Carica mazzo dagli app&unti...
-
+ Save deck to clip&boardSalva mazzo nei app&unti
-
+ &Print deck...&Stampa mazzo...
-
+ &Close&Chiudi
-
+ Ctrl+QCtrl+Q
-
+ &Edit sets...&Modifica impostazioni...
-
+ &Deck&Mazzo
-
+ &Card database&Database delle carte
-
+ Add card to &maindeckAggiungi carta al &grimorio
-
+ ReturnBackspace
-
+ EnterInvio
-
+ Add card to &sideboardAggiungi carta al &sideboard
-
+ Ctrl+ReturnCtrl+Backspace
-
+ Ctrl+EnterCtrl+Invio
-
+ &Remove row&Rimuovi carta
-
+ DelElimina
-
+ &Increment number&Aumenta il numero
-
+ ++
-
+ &Decrement number&Diminuisci il numero
-
+ --
-
+ Are you sure?Sei sicuro?
-
+ The decklist has been modified.
Do you want to save the changes?La lista del mazzo è stata modificata.
Vuoi salvare i cambiamenti?
-
+ Load deckCarica mazzo
-
-
+
+ ErrorErrore
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.Il mazzo non può essere salvato.
Controlla se la cartella è valida e prova ancora.
-
+ Save deckSalva mazzo
diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts
index 168a23d25..af0c7d9ee 100644
--- a/cockatrice/translations/cockatrice_ja.ts
+++ b/cockatrice/translations/cockatrice_ja.ts
@@ -140,23 +140,23 @@ Enter 0 for an indefinite ban.
バンする期間を入力してください(分単位).0でバンを解除します.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.Banの理由を入れてください.これはモデレーターによって保存されBanされた人間には見えません.
-
+ &OKOK
-
+ &CancelCancel
-
+ Ban user from serverサーバーからBanされたユーザーです
@@ -858,17 +858,17 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckListModel
-
+ Numberカード枚数
-
+ Cardカード名
-
+ Price価格
@@ -1793,116 +1793,112 @@ Local version is %1, remote version is %2.
%1はゲームから抜けました.
- %1 has loaded a local deck.female
- %1はローカルデッキをロードしました.
+ %1はローカルデッキをロードしました.
- %1 has loaded a local deck.male
- %1はローカルデッキをロードしました.
+ %1はローカルデッキをロードしました.
- %1 has loaded deck #%2.female
- %1はデッキ#%2をロードしました.
+ %1はデッキ#%2をロードしました.
+
+
+ %1 has loaded deck #%2.
+ male
+ %1はデッキ#%2をロードしました.
- %1 has loaded deck #%2.
- male
- %1はデッキ#%2をロードしました.
-
-
- %1 is ready to start the game.female%1はゲーム開始の準備が出来ました.
-
+ %1 is ready to start the game.male%1はゲーム開始の準備が出来ました.
-
+ %1 is not ready to start the game any more.female%1はゲーム開始の準備がまだ出来ていません.
-
+ %1 is not ready to start the game any more.male%1はゲーム開始の準備がまだ出来ていません.
-
+ %1 has conceded the game.female%1が投了しました.
-
+ %1 has conceded the game.male%1が投了しました.
+
+
+ %1 has restored connection to the game.
+ female
+ %1がこのゲームに再接続しました.
+
+
+
+ %1 has restored connection to the game.
+ male
+ %1がこのゲームに再接続しました.
+
+
+
+ %1 has lost connection to the game.
+ female
+ %1はこのゲームから切断されました.
+
- %1 has restored connection to the game.
- female
- %1がこのゲームに再接続しました.
-
-
-
- %1 has restored connection to the game.
- male
- %1がこのゲームに再接続しました.
-
-
-
- %1 has lost connection to the game.
- female
- %1はこのゲームから切断されました.
-
-
- %1 has lost connection to the game.male%1はこのゲームから切断されました.
-
+ %1 shuffles %2.female%1は%2をシャッフルします.
+
+
+ %1 shuffles %2.
+ male
+ %1は%2をシャッフルします.
+
- %1 shuffles %2.
- male
- %1は%2をシャッフルします.
-
-
- %1 rolls a %2 with a %3-sided die.femaleちょっと怪しいです 要チェック%1は%3面ダイスを使用して%2を割り振ります.
-
+ %1 rolls a %2 with a %3-sided die.male%1は%3面ダイスを使用して%2を割り振ります.
-
+ %1 draws %n card(s).female
@@ -1910,7 +1906,7 @@ Local version is %1, remote version is %2.
-
+ %1 draws %n card(s).male
@@ -1918,182 +1914,182 @@ Local version is %1, remote version is %2.
-
+ %1 undoes his last draw.%1は最後のドローを取り消しました.
-
+ %1 undoes her last draw.%1は最後のドローを取り消しました.
-
+ %1 undoes his last draw (%2).%1は最後のドローを取り消しました(%2).
-
+ %1 undoes her last draw (%2).%1は最後のドローを取り消しました(%2).
-
+ from table
-
+ from graveyard
-
+ from exile
-
+ from hand
-
+ the bottom card of his library
-
+ the bottom card of her library
-
+ from the bottom of his library
-
+ from the bottom of her library
-
+ the top card of his library
-
+ the top card of her library
-
+ from the top of his library
-
+ from the top of her library
-
+ from library
-
+ from sideboard
-
+ from the stack
-
+ %1 gives %2 control over %3.
-
+ %1 puts %2 into play tapped%3.
-
+ %1 puts %2 into play%3.
-
+ %1 puts %2%3 into graveyard.
-
+ %1 exiles %2%3.
-
+ %1 moves %2%3 to hand.
-
+ %1 puts %2%3 into his library.
-
+ %1 puts %2%3 into her library.
-
+ %1 puts %2%3 on bottom of his library.
-
+ %1 puts %2%3 on bottom of her library.
-
+ %1 puts %2%3 on top of his library.
-
+ %1 puts %2%3 on top of her library.
-
+ %1 puts %2%3 into his library at position %4.
-
+ %1 puts %2%3 into her library at position %4.
-
+ %1 moves %2%3 to sideboard.
-
+ %1 plays %2%3.
-
+ %1 takes a mulligan to %n.female
@@ -2101,7 +2097,7 @@ Local version is %1, remote version is %2.
-
+ %1 takes a mulligan to %n.male
@@ -2109,283 +2105,283 @@ Local version is %1, remote version is %2.
-
+ %1 flips %2 face-down.female%1は%2を裏返しにしました.
-
+ %1 flips %2 face-down.male%1は%2を裏返しにしました.
-
+ %1 flips %2 face-up.female%1は%2を表返しにしました.
+
+
+ %1 flips %2 face-up.
+ male
+ %1は%2を表返しにしました.
+
- %1 flips %2 face-up.
- male
- %1は%2を表返しにしました.
-
-
- %1 destroys %2.female%1は%2を破壊しました.
-
+ %1 destroys %2.male%1は%2を破壊しました.
-
+ %1 unattaches %2.female%1は%2を外しました.
-
+ %1 unattaches %2.male%1は%2を外しました.
-
+ %1 creates token: %2%3.female%1はトークン:%2%3を作りました.
-
+ %1 creates token: %2%3.male%1はトークン:%2%3を作りました.
-
+ %1 points from her %2 to herself.female
-
+ %1 points from his %2 to himself.male
-
+ %1 points from her %2 to %3.p1 female, p2 female
-
+ %1 points from her %2 to %3.p1 female, p2 male
-
+ %1 points from his %2 to %3.p1 male, p2 female
-
+ %1 points from his %2 to %3.p1 male, p2 male
-
+ %1 points from %2's %3 to herself.card owner female, target female
-
+ %1 points from %2's %3 to herself.card owner male, target female
-
+ %1 points from %2's %3 to himself.card owner female, target male
-
+ %1 points from %2's %3 to himself.card owner male, target male
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 female, p3 female
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 female, p3 male
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+
+ %1 points from %2's %3 to %4.
- p1 female, p2 female, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 female, p2 female, p3 male
+ p1 female, p2 male, p3 male%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male
-
+ %1 points from her %2 to her %3.female
-
+ %1 points from his %2 to his %3.male
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male
-
+ %1 points from %2's %3 to her own %4.card owner female, target female
-
+ %1 points from %2's %3 to her own %4.card owner male, target female
-
+ %1 points from %2's %3 to his own %4.card owner female, target male
-
+ %1 points from %2's %3 to his own %4.card owner male, target male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male
-
+ %1 places %n %2 counter(s) on %3 (now %4).female
@@ -2393,7 +2389,7 @@ Local version is %1, remote version is %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).male
@@ -2401,7 +2397,7 @@ Local version is %1, remote version is %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).female
@@ -2409,7 +2405,7 @@ Local version is %1, remote version is %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).male
@@ -2417,272 +2413,272 @@ Local version is %1, remote version is %2.
-
+ %1 taps her permanents.female
-
+ %1 untaps her permanents.female
-
+ %1 taps his permanents.male
-
+ %1 untaps his permanents.male
+
+
+ %1 taps %2.
+ female
+
+
+
+
+ %1 untaps %2.
+ female
+
+
+
+
+ %1 taps %2.
+ male
+
+
- %1 taps %2.
- female
-
-
-
-
- %1 untaps %2.
- female
-
-
-
-
- %1 taps %2.
- male
-
-
-
- %1 untaps %2.male
-
+ %1 sets counter %2 to %3 (%4%5).female
-
+ %1 sets counter %2 to %3 (%4%5).male
+
+
+ %1 sets %2 to not untap normally.
+ female
+
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+
+
+
+
+ %1 sets %2 to untap normally.
+ female
+
+
- %1 sets %2 to not untap normally.
- female
-
-
-
-
- %1 sets %2 to not untap normally.
- male
-
-
-
-
- %1 sets %2 to untap normally.
- female
-
-
-
- %1 sets %2 to untap normally.male
-
+ %1 sets PT of %2 to %3.female
-
+ %1 sets PT of %2 to %3.male
-
+ %1 sets annotation of %2 to %3.female
-
+ %1 sets annotation of %2 to %3.male
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+
+
+
+
+ %1 is looking at %2.
+ female
+
+
- %1 is looking at the top %2 cards %3.
- female
-
-
-
-
- %1 is looking at the top %2 cards %3.
- male
-
-
-
-
- %1 is looking at %2.
- female
-
-
-
- %1 is looking at %2.male
-
+ %1 stops looking at %2.female
-
+ %1 stops looking at %2.male
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+
+ %1 reveals %2 to %3.
- p1 female, p2 female
-
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
-
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 female
-
-
-
-
- %1 reveals %2 to %3.p1 male, p2 male
-
+ %1 reveals %2.female
-
+ %1 reveals %2.male
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
-
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
-
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
-
-
-
-
- %1 randomly reveals %2%3 to %4.p1 male, p2 male
-
+ %1 randomly reveals %2%3.female
-
+ %1 randomly reveals %2%3.male
+
+
+ %1 reveals %2%3 to %4.
+ p1 female, p2 female
+
+
+
+
+ %1 reveals %2%3 to %4.
+ p1 female, p2 male
+
+
+
+
+ %1 reveals %2%3 to %4.
+ p1 male, p2 female
+
+ %1 reveals %2%3 to %4.
- p1 female, p2 female
-
-
-
-
- %1 reveals %2%3 to %4.
- p1 female, p2 male
-
-
-
-
- %1 reveals %2%3 to %4.
- p1 male, p2 female
-
-
-
-
- %1 reveals %2%3 to %4.p1 male, p2 male
-
+ %1 reveals %2%3.female
-
+ %1 reveals %2%3.male
-
+ It is now %1's turn.female
-
+ It is now %1's turn.male
-
-
+
+ a card
@@ -2699,122 +2695,134 @@ Local version is %1, remote version is %2.
-
+ red赤
-
+ yellow黄
-
+ green緑
-
+ The game has started.
-
+ %1 draws his initial hand.
-
+ %1 draws her initial hand.
-
+ ending phase
-
+ untap step
-
+
+ %1 has loaded a deck (%2).
+ female
+ %1はデッキ%2をロードしました.
+
+
+
+ %1 has loaded a deck (%2).
+ male
+ %1はデッキ%2をロードしました.
+
+
+ %1 attaches %2 to %3's %4.p1 female, p2 female
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male
-
+ upkeep step
-
+ draw step
-
+ first main phase
-
+ beginning of combat step
-
+ declare attackers step
-
+ declare blockers step
-
+ combat damage step
-
+ end of combat step
-
+ second main phase
-
+ It is now the %1.
@@ -3173,7 +3181,7 @@ Local version is %1, remote version is %2.
-
+ Number:枚数
@@ -3198,27 +3206,27 @@ Local version is %1, remote version is %2.
面の数:
-
+ Set power/toughnessパワーとタフネスを設定する
-
+ Please enter the new PT:新しいP/Tを入力してください
-
+ Set annotation補足を付ける
-
+ Please enter the new annotation:新しい補足を付けてください
-
+ Set countersカウンターを設定する
@@ -3238,47 +3246,45 @@ Local version is %1, remote version is %2.
ローカル
- local deck
- ローカルデッキ
+ ローカルデッキ
- deck #%1
- デッキ #%1
+ デッキ #%1
-
+ User &detailsユーザー補足
-
+ Direct &chat個人チャット
-
+ Add to &buddy listフレンドリストに追加
-
+ Remove from &buddy listフレンドリストから削除
-
+ Add to &ignore list無視リストに追加
-
+ Remove from &ignore list無視リストから削除
-
+ Kick from &gameゲームからキックする
@@ -3286,27 +3292,27 @@ Local version is %1, remote version is %2.
QObject
-
+ Maindeckメインデッキ
-
+ Sideboardサイドボード
-
+ Cockatrice decks (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)
-
+ All files (*.*)全てのファイル (*.*)
@@ -3661,17 +3667,17 @@ Please enter a name:
本当にこのゲームから退出しますか?
-
+ Kickedキック
-
+ You have been kicked out of the game.あなたはこのゲームからキックされました.
-
+ Game %1: %2ゲーム %1: %2
@@ -3712,27 +3718,27 @@ Please enter a name:
TabRoom
-
+ &Say:発言する
-
+ Chatチャット
-
+ &Room部屋
-
+ &Leave room部屋から出る
-
+ You are flooding the chat. Please wait a couple of seconds.あなたはチャットルームから弾かれました.少々お待ちください.
@@ -3854,67 +3860,67 @@ Please enter a name:
UserList
-
+ Users online: %1ユーザー オンライン: %1
-
+ Users in this room: %1部屋のユーザー数: %1
-
+ Buddies online: %1 / %2フレンドオンライン: %1 / %2
-
+ Ignored users online: %1 / %2無視ユーザーオンライン: %1 / %2
-
+ %1's games%1のゲーム
-
+ User &detailsユーザー補足
-
+ Direct &chat個人チャット
-
+ Show this user's &gamesこのユーザーのゲームを表示する
-
+ Add to &buddy listフレンドリストに追加
-
+ Remove from &buddy listフレンドリストから削除
-
+ Add to &ignore list無視リストに追加
-
+ Remove from &ignore list無視リストから削除
-
+ Ban from &serverサーバーからバンする
@@ -3936,136 +3942,141 @@ Enter 0 for an indefinite ban.
検索:
-
+ Deck &name:デッキ名:
-
+ &Comments:コメント:
-
+ Deck editor [*]デッキエディター [*]
-
+ &New deck新しいデッキ
-
+ &Load deck...デッキをロード...
-
+ Load deck from cl&ipboard...クリップボードからデッキをロード...
-
+ &Save deckデッキを保存
-
+
+ Hash:
+
+
+
+ &Update prices価格を更新する
-
+ Ctrl+U
-
+ Save deck &as...名前を付けてデッキを保存...
-
+ Save deck to clip&boardクリップボードにデッキを保存
-
+ &Print deck...デッキを印刷...
-
+ &Close閉じる
-
+ Ctrl+Q
-
+ &Edit sets...セットの設定...
-
+ &Deckデッキ
-
+ Load deckデッキをロード
-
-
+
+ Errorエラー
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.要検証このデッキは保存されていません. ディレクトリをチェックして再度上書きしてください.
-
+ Save deckデッキを保存
-
+ Add card to &maindeckメインデッキにカードを加える
-
+ Return
-
+ Enter
-
+ Ctrl+Return
-
+ Ctrl+Enter
-
+ Add card to &sideboardサイドボードにカードを加える
@@ -4080,47 +4091,47 @@ Please check that the directory is writable and try again.
検索を解除
-
+ &Card databaseカードデータベース
-
+ &Remove row全て取り除く
-
+ Del
-
+ &Increment number枚数を増やす
-
+ +
-
+ &Decrement number枚数を減らす
-
+ -
-
+ Are you sure?本当によろしいですか?
-
+ The decklist has been modified.
Do you want to save the changes?このデッキリストは変更されています.変更を保存しますか?
diff --git a/cockatrice/translations/cockatrice_pl.ts b/cockatrice/translations/cockatrice_pl.ts
index 60003fd80..a9f8edc14 100644
--- a/cockatrice/translations/cockatrice_pl.ts
+++ b/cockatrice/translations/cockatrice_pl.ts
@@ -135,23 +135,23 @@ Enter 0 for an indefinite ban.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.
-
+ &OK
-
+ &Cancel
-
+ Ban user from server
@@ -809,17 +809,17 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckListModel
-
+ Number
-
+ Card
-
+ Price
@@ -1477,8 +1477,6 @@ All running games will be lost.
Reason for shutdown: %1
-
-
@@ -1699,7 +1697,7 @@ Local version is %1, remote version is %2.
-
+ The game has started.
@@ -1739,1033 +1737,999 @@ Local version is %1, remote version is %2.
male
-
-
- %1 has loaded a local deck.
- female
-
-
-
-
- %1 has loaded a local deck.
- male
-
-
-
-
- %1 has loaded deck #%2.
- female
-
-
- %1 has loaded deck #%2.
- male
-
-
-
- %1 is ready to start the game.female
-
+ %1 is ready to start the game.male
-
+ %1 is not ready to start the game any more.female
-
+ %1 is not ready to start the game any more.male
-
+ %1 has conceded the game.female
-
+ %1 has conceded the game.male
+
+
+ %1 has restored connection to the game.
+ female
+
+
+
+
+ %1 has restored connection to the game.
+ male
+
+
+
+
+ %1 has lost connection to the game.
+ female
+
+
- %1 has restored connection to the game.
- female
-
-
-
-
- %1 has restored connection to the game.
- male
-
-
-
-
- %1 has lost connection to the game.
- female
-
-
-
- %1 has lost connection to the game.male
-
+ %1 shuffles %2.female
+
+
+ %1 shuffles %2.
+ male
+
+
- %1 shuffles %2.
- male
-
-
-
- %1 rolls a %2 with a %3-sided die.female
-
+ %1 rolls a %2 with a %3-sided die.male
-
+ %1 draws %n card(s).female
-
-
+
+ %1 draws %n card(s).
+ male
+
+
+
+
+
- %1 draws %n card(s).
- male
-
-
-
-
-
-
-
- %1 undoes his last draw.
-
+ %1 undoes her last draw.
-
+ %1 undoes his last draw (%2).
-
+ %1 undoes her last draw (%2).
-
+ from table
-
+ from graveyard
-
+ from exile
-
+ from hand
-
+ the bottom card of his library
-
+ the bottom card of her library
-
+ from the bottom of his library
-
+ from the bottom of her library
-
+ the top card of his library
-
+ the top card of her library
-
+ from the top of his library
-
+ from the top of her library
-
+ from library
-
+ from sideboard
-
+ from the stack
-
-
+
+ a card
-
+ %1 gives %2 control over %3.
-
+ %1 puts %2 into play tapped%3.
-
+ %1 puts %2 into play%3.
-
+ %1 puts %2%3 into graveyard.
-
+ %1 exiles %2%3.
-
+ %1 moves %2%3 to hand.
-
+ %1 puts %2%3 into his library.
-
+ %1 puts %2%3 into her library.
-
+ %1 puts %2%3 on bottom of his library.
-
+ %1 puts %2%3 on bottom of her library.
-
+ %1 puts %2%3 on top of his library.
-
+ %1 puts %2%3 on top of her library.
-
+ %1 puts %2%3 into his library at position %4.
-
+ %1 puts %2%3 into her library at position %4.
-
+ %1 moves %2%3 to sideboard.
-
+ %1 plays %2%3.
-
+ %1 takes a mulligan to %n.female
-
-
-
+ %1 takes a mulligan to %n.male
-
-
-
+ %1 flips %2 face-down.female
-
+ %1 flips %2 face-down.male
-
+ %1 flips %2 face-up.female
+
+
+ %1 flips %2 face-up.
+ male
+
+
- %1 flips %2 face-up.
- male
-
-
-
- %1 destroys %2.female
-
+ %1 destroys %2.male
-
+ %1 unattaches %2.female
-
+ %1 unattaches %2.male
-
+ %1 creates token: %2%3.female
-
+ %1 creates token: %2%3.male
-
+ %1 points from her %2 to herself.female
-
+ %1 points from his %2 to himself.male
-
+ %1 points from her %2 to %3.p1 female, p2 female
-
+ %1 points from her %2 to %3.p1 female, p2 male
-
+ %1 points from his %2 to %3.p1 male, p2 female
-
+ %1 points from his %2 to %3.p1 male, p2 male
-
+ %1 points from %2's %3 to herself.card owner female, target female
-
+ %1 points from %2's %3 to herself.card owner male, target female
-
+ %1 points from %2's %3 to himself.card owner female, target male
-
+ %1 points from %2's %3 to himself.card owner male, target male
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 female, p3 female
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 female, p3 male
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+
+ %1 points from %2's %3 to %4.
- p1 female, p2 female, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 female, p2 female, p3 male
+ p1 female, p2 male, p3 male%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male
-
+ %1 points from her %2 to her %3.female
-
+ %1 points from his %2 to his %3.male
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male
-
+ %1 points from %2's %3 to her own %4.card owner female, target female
-
+ %1 points from %2's %3 to her own %4.card owner male, target female
-
+ %1 points from %2's %3 to his own %4.card owner female, target male
-
+ %1 points from %2's %3 to his own %4.card owner male, target male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+ female
+
+
+
+
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+ male
+
+
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
+ female
+
+
+
+
- %1 places %n %2 counter(s) on %3 (now %4).
- female
-
-
-
-
-
-
-
-
- %1 places %n %2 counter(s) on %3 (now %4).
- male
-
-
-
-
-
-
-
-
- %1 removes %n %2 counter(s) from %3 (now %4).
- female
-
-
-
-
-
-
-
- %1 removes %n %2 counter(s) from %3 (now %4).male
-
-
-
+ %1 taps her permanents.female
-
+ %1 untaps her permanents.female
-
+ %1 taps his permanents.male
-
+ %1 untaps his permanents.male
+
+
+ %1 taps %2.
+ female
+
+
+
+
+ %1 untaps %2.
+ female
+
+
+
+
+ %1 taps %2.
+ male
+
+
- %1 taps %2.
- female
-
-
-
-
- %1 untaps %2.
- female
-
-
-
-
- %1 taps %2.
- male
-
-
-
- %1 untaps %2.male
-
+ %1 sets counter %2 to %3 (%4%5).female
-
+ %1 sets counter %2 to %3 (%4%5).male
+
+
+ %1 sets %2 to not untap normally.
+ female
+
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+
+
+
+
+ %1 sets %2 to untap normally.
+ female
+
+
- %1 sets %2 to not untap normally.
- female
-
-
-
-
- %1 sets %2 to not untap normally.
- male
-
-
-
-
- %1 sets %2 to untap normally.
- female
-
-
-
- %1 sets %2 to untap normally.male
-
+ %1 sets PT of %2 to %3.female
-
+ %1 sets PT of %2 to %3.male
-
+ %1 sets annotation of %2 to %3.female
-
+ %1 sets annotation of %2 to %3.male
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+
+
+
+
+ %1 is looking at %2.
+ female
+
+
- %1 is looking at the top %2 cards %3.
- female
-
-
-
-
- %1 is looking at the top %2 cards %3.
- male
-
-
-
-
- %1 is looking at %2.
- female
-
-
-
- %1 is looking at %2.male
-
+ %1 stops looking at %2.female
-
+ %1 stops looking at %2.male
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+
+ %1 reveals %2 to %3.
- p1 female, p2 female
-
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
-
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 female
-
-
-
-
- %1 reveals %2 to %3.p1 male, p2 male
-
+ %1 reveals %2.female
-
+ %1 reveals %2.male
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
-
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
-
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
-
-
-
-
- %1 randomly reveals %2%3 to %4.p1 male, p2 male
-
+ %1 randomly reveals %2%3.female
-
+ %1 randomly reveals %2%3.male
+
+
+ %1 reveals %2%3 to %4.
+ p1 female, p2 female
+
+
+
+
+ %1 reveals %2%3 to %4.
+ p1 female, p2 male
+
+
+
+
+ %1 reveals %2%3 to %4.
+ p1 male, p2 female
+
+ %1 reveals %2%3 to %4.
- p1 female, p2 female
-
-
-
-
- %1 reveals %2%3 to %4.
- p1 female, p2 male
-
-
-
-
- %1 reveals %2%3 to %4.
- p1 male, p2 female
-
-
-
-
- %1 reveals %2%3 to %4.p1 male, p2 male
-
+ %1 reveals %2%3.female
-
+ %1 reveals %2%3.male
-
+ It is now %1's turn.female
-
+ It is now %1's turn.male
-
+ %1 draws his initial hand.
-
+
+ %1 has loaded a deck (%2).
+ female
+
+
+
+
+ %1 has loaded a deck (%2).
+ male
+
+
+
+ %1 draws her initial hand.
+
+
+ %1 attaches %2 to %3's %4.
+ p1 female, p2 female
+
+
+
+
+ %1 attaches %2 to %3's %4.
+ p1 female, p2 male
+
+
+
+
+ %1 attaches %2 to %3's %4.
+ p1 male, p2 female
+
+ %1 attaches %2 to %3's %4.
- p1 female, p2 female
-
-
-
-
- %1 attaches %2 to %3's %4.
- p1 female, p2 male
-
-
-
-
- %1 attaches %2 to %3's %4.
- p1 male, p2 female
-
-
-
-
- %1 attaches %2 to %3's %4.p1 male, p2 male
-
+ red
-
-
-
+ yellow
-
-
-
+ green
-
-
-
+ untap step
-
+ upkeep step
-
+ draw step
-
+ first main phase
-
+ beginning of combat step
-
+ declare attackers step
-
+ declare blockers step
-
+ combat damage step
-
+ end of combat step
-
+ second main phase
-
+ ending phase
-
+ It is now the %1.
@@ -3124,7 +3088,7 @@ Local version is %1, remote version is %2.
-
+ Number:
@@ -3149,27 +3113,27 @@ Local version is %1, remote version is %2.
-
+ Set power/toughness
-
+ Please enter the new PT:
-
+ Set annotation
-
+ Please enter the new annotation:
-
+ Set counters
@@ -3177,47 +3141,37 @@ Local version is %1, remote version is %2.
PlayerListWidget
-
- local deck
-
-
-
-
- deck #%1
-
-
-
-
+ User &details
-
+ Direct &chat
-
+ Add to &buddy list
-
+ Remove from &buddy list
-
+ Add to &ignore list
-
+ Remove from &ignore list
-
+ Kick from &game
@@ -3225,27 +3179,27 @@ Local version is %1, remote version is %2.
QObject
-
+ Maindeck
-
+ Sideboard
-
+ Cockatrice decks (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)
-
+ All files (*.*)
@@ -3574,17 +3528,17 @@ Please enter a name:
-
+ Kicked
-
+ You have been kicked out of the game.
-
+ Game %1: %2
@@ -3625,27 +3579,27 @@ Please enter a name:
TabRoom
-
+ &Say:
-
+ Chat
-
+ &Room
-
+ &Leave room
-
+ You are flooding the chat. Please wait a couple of seconds.
@@ -3755,67 +3709,67 @@ Please enter a name:
UserList
-
+ Users online: %1
-
+ Users in this room: %1
-
+ Buddies online: %1 / %2
-
+ Ignored users online: %1 / %2
-
+ %1's games
-
+ User &details
-
+ Direct &chat
-
+ Show this user's &games
-
+ Add to &buddy list
-
+ Remove from &buddy list
-
+ Add to &ignore list
-
+ Remove from &ignore list
-
+ Ban from &server
@@ -3838,181 +3792,186 @@ Please enter a name:
-
+ Deck &name:
-
+ &Comments:
-
+
+ Hash:
+
+
+
+ &Update prices
-
+ Ctrl+U
-
+ Deck editor [*]
-
+ &New deck
-
+ &Load deck...
-
+ &Save deck
-
+ Save deck &as...
-
+ Load deck from cl&ipboard...
-
+ Save deck to clip&board
-
+ &Print deck...
-
+ &Close
-
+ Ctrl+Q
-
+ &Edit sets...
-
+ &Deck
-
+ &Card database
-
+ Add card to &maindeck
-
+ Return
-
+ Enter
-
+ Add card to &sideboard
-
+ Ctrl+Return
-
+ Ctrl+Enter
-
+ &Remove row
-
+ Del
-
+ &Increment number
-
+ +
-
+ &Decrement number
-
+ -
-
+ Are you sure?
-
+ The decklist has been modified.
Do you want to save the changes?
-
+ Load deck
-
-
+
+ Error
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.
-
+ Save deck
diff --git a/cockatrice/translations/cockatrice_pt-br.ts b/cockatrice/translations/cockatrice_pt-br.ts
index 94962bbe6..6f7079a97 100644
--- a/cockatrice/translations/cockatrice_pt-br.ts
+++ b/cockatrice/translations/cockatrice_pt-br.ts
@@ -140,23 +140,23 @@ Enter 0 for an indefinite ban.
Digite 0 para banir indefinidamente.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.
-
+ &OK&OK
-
+ &Cancel&Cancelar
-
+ Ban user from server
@@ -1018,17 +1018,17 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckListModel
-
+ NumberNúmero
-
+ CardCard
-
+ Price
@@ -1797,7 +1797,6 @@ All running games will be lost.
Reason for shutdown: %1
-
@@ -1997,115 +1996,111 @@ A versão local é %1 e a versão remota é %2.
%1 saiu do jogo.
- %1 has loaded a local deck.female
- %1 carregou um deck local.
+ %1 carregou um deck local.
- %1 has loaded a local deck.male
- %1 carregou um deck local.
+ %1 carregou um deck local.
- %1 has loaded deck #%2.female
- %1 carregou o deck nº %2.
+ %1 carregou o deck nº %2.
+
+
+ %1 has loaded deck #%2.
+ male
+ %1 carregou o deck nº %2.
- %1 has loaded deck #%2.
- male
- %1 carregou o deck nº %2.
-
-
- %1 is ready to start the game.female%1 está pronto para começar o jogo.
-
+ %1 is ready to start the game.male%1 está pronto para começar o jogo.
-
+ %1 is not ready to start the game any more.female%1 não está mais pronto para começar o jogo.
-
+ %1 is not ready to start the game any more.male%1 não está mais pronto para começar o jogo.
-
+ %1 has conceded the game.female%1 concedeu o jogo.
-
+ %1 has conceded the game.male%1 concedeu o jogo.
+
+
+ %1 has restored connection to the game.
+ female
+
+
+
+
+ %1 has restored connection to the game.
+ male
+
+
+
+
+ %1 has lost connection to the game.
+ female
+
+
- %1 has restored connection to the game.
- female
-
-
-
-
- %1 has restored connection to the game.
- male
-
-
-
-
- %1 has lost connection to the game.
- female
-
-
-
- %1 has lost connection to the game.male
-
+ %1 shuffles %2.female
+
+
+ %1 shuffles %2.
+ male
+
+
- %1 shuffles %2.
- male
-
-
-
- %1 rolls a %2 with a %3-sided die.female%1 tirou um %2 com um dado de %3 lados.
-
+ %1 rolls a %2 with a %3-sided die.male%1 tirou um %2 com um dado de %3 lados.
-
+ %1 draws %n card(s).female
@@ -2114,239 +2109,237 @@ A versão local é %1 e a versão remota é %2.
+
+ %1 draws %n card(s).
+ male
+
+ %1 compra %n card.
+ %1 compra %n cards.
+
+
+
- %1 draws %n card(s).
- male
-
- %1 compra %n card.
- %1 compra %n cards.
-
-
-
- %1 undoes his last draw.%1 desfaz sua última compra.
-
+ %1 undoes her last draw.
-
+ %1 undoes his last draw (%2).%1 desfaz sua última compra (%2).
-
+ %1 undoes her last draw (%2).
-
+ from table vindo do campo de batalha
-
+ from graveyard vindo do cemitério
-
+ from exile vindo do exílio
-
+ from hand vindo da mão
-
+ the bottom card of his libraryo card do fundo do seu grimório
-
+ the bottom card of her library
-
+ from the bottom of his library vindo do fundo do seu grimório
-
+ from the bottom of her library
-
+ the top card of his libraryo card do topo do seu grimório
-
+ the top card of her library
-
+ from the top of his library vindo do topo do seu grimório
-
+ from the top of her library
-
+ from library vindo do grimório
-
+ from sideboard vindo do sideboard
-
+ from the stack vindo da pilha
-
+ %1 gives %2 control over %3.%1 dá controle para %2 sobre %3.
-
+ %1 puts %2 into play tapped%3.%1 põe %2 em jogo virado%3.
-
+ %1 puts %2 into play%3.%1 põe %2 no campo de batalha %3.
-
+ %1 puts %2%3 into graveyard.%1 põe %2 no cemitério%3.
-
+ %1 exiles %2%3.%1 exila %2%3.
-
+ %1 moves %2%3 to hand.%1 move %2 para a mão%3.
-
+ %1 puts %2%3 into his library.%1 põe %2 no seu grimório%3.
-
+ %1 puts %2%3 into her library.
-
+ %1 puts %2%3 on bottom of his library.%1 põe %2 no fundo do seu grimório%3.
-
+ %1 puts %2%3 on bottom of her library.
-
+ %1 puts %2%3 on top of his library.%1 põe %2 no topo do seu grimório%3.
-
+ %1 puts %2%3 on top of her library.
-
+ %1 puts %2%3 into his library at position %4.%1 põe %2 no seu grimório na posição %4%3.
-
+ %1 puts %2%3 into her library at position %4.
-
+ %1 moves %2%3 to sideboard.%1 move %2 para o sideboard%3.
-
+ %1 plays %2%3.%1 põe %2 na pilha%3.
-
+ %1 takes a mulligan to %n.female
-
-
+ %1 takes a mulligan to %n.male
-
-
+ %1 flips %2 face-down.female%1 vira %2 para baixo.
-
+ %1 flips %2 face-down.male%1 vira %2 para baixo.
-
+ %1 flips %2 face-up.female%1 vira %2 para cima.
+
+
+ %1 flips %2 face-up.
+ male
+ %1 vira %2 para cima.
+
- %1 flips %2 face-up.
- male
- %1 vira %2 para cima.
-
-
- %1 destroys %2.female%1 destrói %2.
-
+ %1 destroys %2.male%1 destrói %2.
@@ -2362,271 +2355,283 @@ A versão local é %1 e a versão remota é %2.
%1 anexa %2 a %4 de %3.
-
+
+ %1 has loaded a deck (%2).
+ female
+ %1 carregou o deck %2.
+
+
+
+ %1 has loaded a deck (%2).
+ male
+ %1 carregou o deck %2.
+
+
+ %1 attaches %2 to %3's %4.p1 female, p2 female%1 anexa %2 a %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male%1 anexa %2 a %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female%1 anexa %2 a %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male%1 anexa %2 a %4 de %3.
-
+ %1 unattaches %2.female%1 desanexa %2.
-
+ %1 unattaches %2.male%1 desanexa %2.
-
+ %1 creates token: %2%3.female%1 cria a ficha: %2%3.
-
+ %1 creates token: %2%3.male%1 cria a ficha: %2%3.
-
+ %1 points from her %2 to herself.female
-
+ %1 points from his %2 to himself.male
-
+ %1 points from her %2 to %3.p1 female, p2 female
-
+ %1 points from her %2 to %3.p1 female, p2 male
-
+ %1 points from his %2 to %3.p1 male, p2 female
-
+ %1 points from his %2 to %3.p1 male, p2 male
-
+ %1 points from %2's %3 to herself.card owner female, target female
-
+ %1 points from %2's %3 to herself.card owner male, target female
-
+ %1 points from %2's %3 to himself.card owner female, target male
-
+ %1 points from %2's %3 to himself.card owner male, target male
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 female%1 aponta para %4 com %3 de %2 .
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 male%1 aponta para %4 com %3 de %2 .
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+ %1 aponta para %4 com %3 de %2 .
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 male
+ %1 aponta para %4 com %3 de %2 .
+ %1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 aponta para %4 com %3 de %2 .%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+ %1 aponta para %4 com %3 de %2 .
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 aponta para %4 com %3 de %2 .%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
- %1 aponta para %4 com %3 de %2 .
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
- %1 aponta para %4 com %3 de %2 .
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
- %1 aponta para %4 com %3 de %2 .
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male%1 aponta para %4 com %3 de %2 .
-
+ %1 points from her %2 to her %3.female
-
+ %1 points from his %2 to his %3.male
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male
-
+ %1 points from %2's %3 to her own %4.card owner female, target female
-
+ %1 points from %2's %3 to her own %4.card owner male, target female
-
+ %1 points from %2's %3 to his own %4.card owner female, target male
-
+ %1 points from %2's %3 to his own %4.card owner male, target male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female%1 aponta para %5 de %4 com %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male%1 aponta para %5 de %4 com %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female%1 aponta para %5 de %4 com %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male%1 aponta para %5 de %4 com %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female%1 aponta para %5 de %4 com %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male%1 aponta para %5 de %4 com %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female%1 aponta para %5 de %4 com %3 de %2.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male%1 aponta para %5 de %4 com %3 de %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).female
@@ -2635,7 +2640,7 @@ A versão local é %1 e a versão remota é %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).male
@@ -2644,7 +2649,7 @@ A versão local é %1 e a versão remota é %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).female
@@ -2653,7 +2658,7 @@ A versão local é %1 e a versão remota é %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).male
@@ -2662,272 +2667,272 @@ A versão local é %1 e a versão remota é %2.
-
+ %1 taps her permanents.female
-
+ %1 untaps her permanents.female
-
+ %1 taps his permanents.male
-
+ %1 untaps his permanents.male
+
+
+ %1 taps %2.
+ female
+
+
+
+
+ %1 untaps %2.
+ female
+
+
+
+
+ %1 taps %2.
+ male
+
+
- %1 taps %2.
- female
-
-
-
-
- %1 untaps %2.
- female
-
-
-
-
- %1 taps %2.
- male
-
-
-
- %1 untaps %2.male
-
+ %1 sets counter %2 to %3 (%4%5).female%1 altera o marcador %2 para %3 (%4%5).
-
+ %1 sets counter %2 to %3 (%4%5).male%1 altera o marcador %2 para %3 (%4%5).
+
+
+ %1 sets %2 to not untap normally.
+ female
+ %1 define que %2 não desvira normalmente.
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+ %1 define que %2 não desvira normalmente.
+
+
+
+ %1 sets %2 to untap normally.
+ female
+ %1 define que %2 desvira normalmente.
+
- %1 sets %2 to not untap normally.
- female
- %1 define que %2 não desvira normalmente.
-
-
-
- %1 sets %2 to not untap normally.
- male
- %1 define que %2 não desvira normalmente.
-
-
-
- %1 sets %2 to untap normally.
- female
- %1 define que %2 desvira normalmente.
-
-
- %1 sets %2 to untap normally.male%1 define que %2 desvira normalmente.
-
+ %1 sets PT of %2 to %3.female%1 altera o P/R de %2 para %3.
-
+ %1 sets PT of %2 to %3.male%1 altera o P/R de %2 para %3.
-
+ %1 sets annotation of %2 to %3.female%1 altera a nota de %2 para%3.
-
+ %1 sets annotation of %2 to %3.male%1 altera a nota de %2 para%3.
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+ %1 está olhando para os %2 cards do topo %3.
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+ %1 está olhando para os %2 cards do topo %3.
+
+
+
+ %1 is looking at %2.
+ female
+ %1 está olhando para %2.
+
- %1 is looking at the top %2 cards %3.
- female
- %1 está olhando para os %2 cards do topo %3.
-
-
-
- %1 is looking at the top %2 cards %3.
- male
- %1 está olhando para os %2 cards do topo %3.
-
-
-
- %1 is looking at %2.
- female
- %1 está olhando para %2.
-
-
- %1 is looking at %2.male%1 está olhando para %2.
-
+ %1 stops looking at %2.female%1 para de olhar para %2.
-
+ %1 stops looking at %2.male%1 para de olhar para %2.
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+ %1 revela %2 para %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+ %1 revela %2 para %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+ %1 revela %2 para %3.
+ %1 reveals %2 to %3.
- p1 female, p2 female
- %1 revela %2 para %3.
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
+ p1 male, p2 male%1 revela %2 para %3.
- %1 reveals %2 to %3.
- p1 male, p2 female
- %1 revela %2 para %3.
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 male
- %1 revela %2 para %3.
-
-
- %1 reveals %2.female%1 revela %2.
-
+ %1 reveals %2.male%1 revela %2.
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+ %1 revela aleatoriamente %2%3. para %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+ %1 revela aleatoriamente %2%3. para %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+ %1 revela aleatoriamente %2%3. para %4.
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
- %1 revela aleatoriamente %2%3. para %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
+ p1 male, p2 male%1 revela aleatoriamente %2%3. para %4.
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
- %1 revela aleatoriamente %2%3. para %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 male
- %1 revela aleatoriamente %2%3. para %4.
-
-
- %1 randomly reveals %2%3.female%1 revela aleatoriamente %2%3.
-
+ %1 randomly reveals %2%3.male%1 revela aleatoriamente %2%3.
-
+ %1 reveals %2%3 to %4.p1 female, p2 female%1 revela %2%3 para %4.
-
+ %1 reveals %2%3 to %4.p1 female, p2 male%1 revela %2%3 para %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 female%1 revela %2%3 para %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 male%1 revela %2%3 para %4.
-
+ %1 reveals %2%3.female%1 revela %2%3.
-
+ %1 reveals %2%3.male%1 revela %2%3.
-
+ It is now %1's turn.femaleAgora é o turno de %1.
-
+ It is now %1's turn.maleAgora é o turno de %1.
-
-
+
+ a cardum card
@@ -2966,7 +2971,7 @@ A versão local é %1 e a versão remota é %2.
-
+ redvermelho
@@ -2974,7 +2979,7 @@ A versão local é %1 e a versão remota é %2.
-
+ yellowamarelo
@@ -2982,7 +2987,7 @@ A versão local é %1 e a versão remota é %2.
-
+ greenverde
@@ -3006,7 +3011,7 @@ A versão local é %1 e a versão remota é %2.%1 está olhando para os %2 cards do topo %3.
-
+ The game has started.O jogo começou.
@@ -3101,7 +3106,7 @@ A versão local é %1 e a versão remota é %2.
%1 revela %2.
-
+ ending phasefase final
@@ -3114,12 +3119,12 @@ A versão local é %1 e a versão remota é %2.
%1 embaralha o seu grimório.
-
+ %1 draws his initial hand.
-
+ %1 draws her initial hand.
@@ -3140,57 +3145,57 @@ A versão local é %1 e a versão remota é %2.
%1 revela %2%3.
-
+ untap stepetapa de desvirar
-
+ upkeep stepetapa de manutenção
-
+ draw stepetapa de compra
-
+ first main phaseprimeira fase principal
-
+ beginning of combat stepetapa de início de combate
-
+ declare attackers stepetapa de declaracão de atacantes
-
+ declare blockers stepetapa de declaração de bloqueadores
-
+ combat damage stepetapa de dano de combate
-
+ end of combat stepetapa de fim de combate
-
+ second main phasesegunda fase principal
-
+ It is now the %1.Agora é a %1.
@@ -3569,7 +3574,7 @@ A versão local é %1 e a versão remota é %2.
-
+ Number:Número:
@@ -3594,27 +3599,27 @@ A versão local é %1 e a versão remota é %2.
Número de lados:
-
+ Set power/toughnessAlterar poder/resistência
-
+ Please enter the new PT:Por favor, entre com o novo P/R:
-
+ Set annotationAlterar nota
-
+ Please enter the new annotation:Por favor, entre com a nova nota:
-
+ Set countersAlterar marcadores
@@ -3642,47 +3647,45 @@ A versão local é %1 e a versão remota é %2.
nº %1
- local deck
- deck local
+ deck local
- deck #%1
- deck #%1
+ deck #%1
-
+ User &details&Detalhes do usuário
-
+ Direct &chat&Chat direto
-
+ Add to &buddy listAdicionar à &lista de amigos
-
+ Remove from &buddy listRemover da li&sta de amigos
-
+ Add to &ignore listAdicionar à li&sta dos ignorados
-
+ Remove from &ignore listRemover da lista dos i&gnorados
-
+ Kick from &gameC&hutar do jogo
@@ -3690,27 +3693,27 @@ A versão local é %1 e a versão remota é %2.
QObject
-
+ MaindeckDeck principal
-
+ SideboardSideboard
-
+ Cockatrice decks (*.cod)Decks Cockatrice (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)Decks de texto simples (*.dec *.mwDeck)
-
+ All files (*.*)Todos os arquivos (*.*)
@@ -4066,17 +4069,17 @@ Por favor, entre um nome:
Você tem certeza que deseja sair deste jogo?
-
+ KickedChutado
-
+ You have been kicked out of the game.Você foi chutado do jogo.
-
+ Game %1: %2Jogo %1: %2
@@ -4117,27 +4120,27 @@ Por favor, entre um nome:
TabRoom
-
+ &Say:&Falar:
-
+ ChatChat
-
+ &Room&Sala
-
+ &Leave roomS&air da sala
-
+ You are flooding the chat. Please wait a couple of seconds.Você está flodando o chat. Por favor, espere alguns segundos.
@@ -4259,67 +4262,67 @@ Por favor, entre um nome:
UserList
-
+ Users online: %1Usuários online: %1
-
+ Users in this room: %1Usuários nesta sala: %1
-
+ Buddies online: %1 / %2Amigos online: %1 / %2
-
+ Ignored users online: %1 / %2Usuários ignorados online: %1 / %2
-
+ %1's games
-
+ User &details&Detalhes do usuário
-
+ Direct &chat&Chat direto
-
+ Show this user's &games
-
+ Add to &buddy listAdicionar à &lista de amigos
-
+ Remove from &buddy listRemover da li&sta de amigos
-
+ Add to &ignore listAdicionar à li&sta dos ignorados
-
+ Remove from &ignore listRemover da lista dos i&gnorados
-
+ Ban from &serverBan&ir do servidor
@@ -4342,136 +4345,141 @@ Digite 0 para banir indefinidamente.
&Buscar por:
-
+ Deck &name:Nome do &deck:
-
+ &Comments:&Comentários:
-
+ Deck editor [*]Editor de decks [*]
-
+ &New deck&Novo deck
-
+ &Load deck...&Abrir deck...
-
+ Load deck from cl&ipboard...Carregar deck da área de &transferência...
-
+ &Save deck&Salvar deck
-
+
+ Hash:
+
+
+
+ &Update prices
-
+ Ctrl+UCtrl+U
-
+ Save deck &as...Salvar deck c&omo...
-
+ Save deck to clip&boardSalvar deck para a área de t&ransferência
-
+ &Print deck...&Imprimir deck...
-
+ &Close&Fechar
-
+ Ctrl+QCtrl+Q
-
+ &Edit sets...E&ditar expansões...
-
+ &Deck&Deck
-
+ Load deckAbrir deck
-
-
+
+ ErrorErro
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.O deck não pôde ser salvo.
Por favor, verifique se o diretório não é somente leitura e tente novamente.
-
+ Save deckSalvar deck
-
+ Add card to &maindeckIncluir no deck &principal
-
+ ReturnReturn
-
+ EnterEnter
-
+ Ctrl+ReturnCtrl+Return
-
+ Ctrl+EnterCtrl+Enter
-
+ Add card to &sideboardIncluir no side&board
@@ -4486,47 +4494,47 @@ Por favor, verifique se o diretório não é somente leitura e tente novamente.<
&Limpar busca
-
+ &Card databaseBanco de dados de &cards
-
+ &Remove row&Apagar linha
-
+ DelDel
-
+ &Increment number&Aumentar quantidade
-
+ ++
-
+ &Decrement number&Diminuir quantidade
-
+ --
-
+ Are you sure?Você tem certeza?
-
+ The decklist has been modified.
Do you want to save the changes?O deck foi modificado.
diff --git a/cockatrice/translations/cockatrice_pt.ts b/cockatrice/translations/cockatrice_pt.ts
index 28559f5ec..23eb5435c 100644
--- a/cockatrice/translations/cockatrice_pt.ts
+++ b/cockatrice/translations/cockatrice_pt.ts
@@ -140,24 +140,24 @@ Enter 0 for an indefinite ban.
Introduza 0 para um banimento indefinido.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.Por favor introduza o motivo do banimento.
Isto apenas é guardado para os moderadores e não é visível para a pessoa banida.
-
+ &OK
-
+ &Cancel&Cancelar
-
+ Ban user from serverBanir utilizador do servidor
@@ -1019,17 +1019,17 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
DeckListModel
-
+ NumberNúmero
-
+ CardCarta
-
+ PricePreço
@@ -1993,7 +1993,7 @@ Versão local é %1, versão remota é %2.
%1 concedeu o jogo.
-
+ The game has started.O jogo começou.
@@ -2050,115 +2050,111 @@ Versão local é %1, versão remota é %2.
%1 abandonou o jogo.
- %1 has loaded a local deck.female
- %1 carregou um deck local.
+ %1 carregou um deck local.
- %1 has loaded a local deck.male
- %1 carregou um deck local.
+ %1 carregou um deck local.
- %1 has loaded deck #%2.female
- %1 carregou o deck #%2.
+ %1 carregou o deck #%2.
+
+
+ %1 has loaded deck #%2.
+ male
+ %1 carregou o deck #%2.
- %1 has loaded deck #%2.
- male
- %1 carregou o deck #%2.
-
-
- %1 is ready to start the game.female%1 está pronta a começar o jogo.
-
+ %1 is ready to start the game.male%1 está pronto a começar o jogo.
-
+ %1 is not ready to start the game any more.female%1 já não está pronta a começar o jogo.
-
+ %1 is not ready to start the game any more.male%1 já não está pronto a começar o jogo.
-
+ %1 has conceded the game.female%1 concedeu o jogo.
-
+ %1 has conceded the game.male%1 concedeu o jogo.
+
+
+ %1 has restored connection to the game.
+ female
+ %1 restabeleceu a ligação ao jogo.
+
+
+
+ %1 has restored connection to the game.
+ male
+ %1 restabeleceu a ligação ao jogo.
+
+
+
+ %1 has lost connection to the game.
+ female
+ %1 perdeu a ligação ao jogo.
+
- %1 has restored connection to the game.
- female
- %1 restabeleceu a ligação ao jogo.
-
-
-
- %1 has restored connection to the game.
- male
- %1 restabeleceu a ligação ao jogo.
-
-
-
- %1 has lost connection to the game.
- female
- %1 perdeu a ligação ao jogo.
-
-
- %1 has lost connection to the game.male%1 perdeu a ligação ao jogo.
-
+ %1 shuffles %2.female%1 baralha %2.
+
+
+ %1 shuffles %2.
+ male
+ %1 baralha %2.
+
- %1 shuffles %2.
- male
- %1 baralha %2.
-
-
- %1 rolls a %2 with a %3-sided die.female%1 obteve %2 com um dado de %3 faces.
-
+ %1 rolls a %2 with a %3-sided die.male%1 obteve %2 com um dado de %3 faces.
-
+ %1 draws %n card(s).female
@@ -2167,7 +2163,7 @@ Versão local é %1, versão remota é %2.
-
+ %1 draws %n card(s).male
@@ -2176,157 +2172,157 @@ Versão local é %1, versão remota é %2.
-
+ from table vindo da mesa
-
+ from graveyard vindo do cemitério
-
+ from exile vindo do exílio
-
+ from hand vindo da mão
-
+ the bottom card of his librarya carta do fundo do seu grimório
-
+ the bottom card of her librarya carta do fundo do seu grimório
-
+ from the bottom of his library do fundo do seu grimório
-
+ from the bottom of her library do fundo do seu grimório
-
+ the top card of his librarya carta do topo do seu grimório
-
+ the top card of her librarya carta do topo do seu grimório
-
+ from the top of his library do topo do seu grimório
-
+ from the top of her library do topo do seu grimório
-
+ from library do grimório
-
+ from sideboard do sideboard
-
+ from the stack da pilha
-
+ %1 puts %2 into play tapped%3.%1 coloca %2 em jogo virado(a)%3.
-
+ %1 puts %2 into play%3.%1 coloca %2 em jogo %3.
-
+ %1 puts %2%3 into graveyard.%1 coloca %2%3 no cemitério.
-
+ %1 exiles %2%3.%1 exila %2%3.
-
+ %1 moves %2%3 to hand.%1 move %2%3 para a mão.
-
+ %1 puts %2%3 into his library.%1 coloca %2%3 no seu grimório.
-
+ %1 puts %2%3 into her library.%1 coloca %2%3 no seu grimório.
-
+ %1 puts %2%3 on bottom of his library.%1 coloca %2%3 no fundo do seu grimório.
-
+ %1 puts %2%3 on bottom of her library.%1 coloca %2%3 no fundo do seu grimório.
-
+ %1 puts %2%3 on top of his library.%1 coloca %2%3 no topo do seu grimório.
-
+ %1 puts %2%3 on top of her library.%1 coloca %2%3 no topo do seu grimório.
-
+ %1 puts %2%3 into his library at position %4.%1 coloca %2%3 no seu grimório na posição %4.
-
+ %1 puts %2%3 into her library at position %4.%1 coloca %2%3 no seu grimório na posição %4.
-
+ %1 moves %2%3 to sideboard.%1 move %2%3 para o sideboard.
-
+ %1 plays %2%3.%1 joga %2%3.
-
+ %1 takes a mulligan to %n.female
@@ -2335,7 +2331,7 @@ Versão local é %1, versão remota é %2.
-
+ %1 takes a mulligan to %n.male
@@ -2344,37 +2340,37 @@ Versão local é %1, versão remota é %2.
-
+ %1 flips %2 face-down.female%1 volta a face de %2 para baixo.
-
+ %1 flips %2 face-down.male%1 volta a face de %2 para baixo.
-
+ %1 flips %2 face-up.female%1 volta a face de %2 para cima.
+
+
+ %1 flips %2 face-up.
+ male
+ %1 volta a face de %2 para cima.
+
- %1 flips %2 face-up.
- male
- %1 volta a face de %2 para cima.
-
-
- %1 destroys %2.female%1 destrói %2.
-
+ %1 destroys %2.male%1 destrói %2.
@@ -2390,271 +2386,271 @@ Versão local é %1, versão remota é %2.
%1 anexa %2 a %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 female%1 anexa %2 a %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male%1 anexa %2 a %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female%1 anexa %2 a %4 de %3.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male%1 anexa %2 a %4 de %3.
-
+ %1 unattaches %2.female%1 desanexa %2.
-
+ %1 unattaches %2.male%1 desanexa %2.
-
+ %1 creates token: %2%3.female%1 cria ficha: %2%3.
-
+ %1 creates token: %2%3.male%1 cria ficha: %2%3.
-
+ %1 points from her %2 to herself.female%1 aponta do seu %2 para si própria.
-
+ %1 points from his %2 to himself.male%1 aponta do seu %2 para si próprio.
-
+ %1 points from her %2 to %3.p1 female, p2 female%1 aponta do seu %2 para %3.
-
+ %1 points from her %2 to %3.p1 female, p2 male%1 aponta do seu %2 para %3.
-
+ %1 points from his %2 to %3.p1 male, p2 female%1 aponta do seu %2 para %3.
-
+ %1 points from his %2 to %3.p1 male, p2 male%1 aponta do seu %2 para %3.
-
+ %1 points from %2's %3 to herself.card owner female, target female%1 aponta do %3 de %2 para si própria.
-
+ %1 points from %2's %3 to herself.card owner male, target female%1 aponta do %3 de %2 para si própria.
-
+ %1 points from %2's %3 to himself.card owner female, target male%1 aponta do %3 de %2 para si próprio.
-
+ %1 points from %2's %3 to himself.card owner male, target male%1 aponta do %3 de %2 para si próprio.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 female%1 aponta de %3 de %2 para %4.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 male%1 aponta de %3 de %2 para %4.
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+ %1 aponta de %3 de %2 para %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 male
+ %1 aponta de %3 de %2 para %4.
+ %1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 aponta de %3 de %2 para %4.%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+ %1 aponta de %3 de %2 para %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 aponta de %3 de %2 para %4.%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
- %1 aponta de %3 de %2 para %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
- %1 aponta de %3 de %2 para %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
- %1 aponta de %3 de %2 para %4.
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male%1 aponta de %3 de %2 para %4.
-
+ %1 points from her %2 to her %3.female%1 aponta do seu %2 para o seu %3.
-
+ %1 points from his %2 to his %3.male%1 aponta do seu %2 para o seu %3.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female%1 aponta do seu %2 para o %4 de %3.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male%1 aponta do seu %2 para o %4 de %3.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female%1 aponta do seu %2 para o %4 de %3.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male%1 aponta do seu %2 para o %4 de %3.
-
+ %1 points from %2's %3 to her own %4.card owner female, target female%1 aponta de %3 de %2 para o seu %4.
-
+ %1 points from %2's %3 to her own %4.card owner male, target female%1 aponta de %3 de %2 para o seu %4.
-
+ %1 points from %2's %3 to his own %4.card owner female, target male%1 aponta de %3 de %2 para o seu %4.
-
+ %1 points from %2's %3 to his own %4.card owner male, target male%1 aponta de %3 de %2 para o seu %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female%1 aponta de %3 de %2 para %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male%1 aponta de %3 de %2 para %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female%1 aponta de %3 de %2 para %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male%1 aponta de %3 de %2 para %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female%1 aponta de %3 de %2 para %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male%1 aponta de %3 de %2 para %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female%1 aponta de %3 de %2 para %5 de %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male%1 aponta de %3 de %2 para %5 de %4.
-
+ %1 places %n %2 counter(s) on %3 (now %4).female
@@ -2663,7 +2659,7 @@ Versão local é %1, versão remota é %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).male
@@ -2672,7 +2668,7 @@ Versão local é %1, versão remota é %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).female
@@ -2681,7 +2677,7 @@ Versão local é %1, versão remota é %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).male
@@ -2690,276 +2686,288 @@ Versão local é %1, versão remota é %2.
-
+ %1 taps her permanents.female%1 vira as suas permanentes.
-
+ %1 untaps her permanents.female%1 desvira as suas permanentes.
-
+ %1 taps his permanents.male%1 vira as suas permanentes.
-
+ %1 untaps his permanents.male%1 desvira as suas permanentes.
+
+
+ %1 taps %2.
+ female
+ %1 vira %2.
+
+
+
+ %1 untaps %2.
+ female
+ %1 desvira %2.
+
+
+
+ %1 taps %2.
+ male
+ %1 vira %2.
+
- %1 taps %2.
- female
- %1 vira %2.
-
-
-
- %1 untaps %2.
- female
- %1 desvira %2.
-
-
-
- %1 taps %2.
- male
- %1 vira %2.
-
-
- %1 untaps %2.male%1 desvira %2.
-
+ %1 sets counter %2 to %3 (%4%5).female%1 altera o número de marcadores %2 para %3(%4%5).
-
+ %1 sets counter %2 to %3 (%4%5).male%1 altera o número de marcadores %2 para %3(%4%5).
+
+
+ %1 sets %2 to not untap normally.
+ female
+ %1 define %2 para não desvirar normalmente.
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+ %1 define %2 para não desvirar normalmente.
+
+
+
+ %1 sets %2 to untap normally.
+ female
+ %1 define %2 para desvirar normalmente.
+
- %1 sets %2 to not untap normally.
- female
- %1 define %2 para não desvirar normalmente.
-
-
-
- %1 sets %2 to not untap normally.
- male
- %1 define %2 para não desvirar normalmente.
-
-
-
- %1 sets %2 to untap normally.
- female
- %1 define %2 para desvirar normalmente.
-
-
- %1 sets %2 to untap normally.male%1 define %2 para desvirar normalmente.
-
+ %1 sets PT of %2 to %3.female%1 define o P/R de %2 como %3.
-
+ %1 sets PT of %2 to %3.male%1 define o P/R de %2 como %3.
-
+ %1 sets annotation of %2 to %3.female%1 coloca uma nota de %2 em%3.
-
+ %1 sets annotation of %2 to %3.male%1 coloca uma nota de %2 em%3.
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+ %1 está a olhar para as %2 cartas do topo %3.
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+ %1 está a olhar para as %2 cartas do topo %3.
+
+
+
+ %1 is looking at %2.
+ female
+ %1 está a olhar para %2.
+
- %1 is looking at the top %2 cards %3.
- female
- %1 está a olhar para as %2 cartas do topo %3.
-
-
-
- %1 is looking at the top %2 cards %3.
- male
- %1 está a olhar para as %2 cartas do topo %3.
-
-
-
- %1 is looking at %2.
- female
- %1 está a olhar para %2.
-
-
- %1 is looking at %2.male%1 está a olhar para %2.
-
+ %1 stops looking at %2.female%1 pára de olhar para %2.
-
+ %1 stops looking at %2.male%1 pára de olhar para %2.
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+ %1 revela %2 a %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+ %1 revela %2 a %3.
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+ %1 revela %2 a %3.
+ %1 reveals %2 to %3.
- p1 female, p2 female
- %1 revela %2 a %3.
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
+ p1 male, p2 male%1 revela %2 a %3.
- %1 reveals %2 to %3.
- p1 male, p2 female
- %1 revela %2 a %3.
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 male
- %1 revela %2 a %3.
-
-
- %1 reveals %2.female%1 revela %2.
-
+ %1 reveals %2.male%1 revela %2.
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+ %1 revela aleatoreamente %2%3. a %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+ %1 revela aleatoreamente %2%3. a %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+ %1 revela aleatoreamente %2%3. a %4.
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
- %1 revela aleatoreamente %2%3. a %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
+ p1 male, p2 male%1 revela aleatoreamente %2%3. a %4.
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
- %1 revela aleatoreamente %2%3. a %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 male
- %1 revela aleatoreamente %2%3. a %4.
-
-
- %1 randomly reveals %2%3.female%1 revela aleatoreamente %2%3.
-
+ %1 randomly reveals %2%3.male%1 revela aleatoreamente %2%3.
-
+ %1 reveals %2%3 to %4.p1 female, p2 female%1 revela %2%3 a %4.
-
+ %1 reveals %2%3 to %4.p1 female, p2 male%1 revela %2%3 a %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 female%1 revela %2%3 a %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 male%1 revela %2%3 a %4.
-
+ %1 reveals %2%3.female%1 revela %2%3.
-
+ %1 reveals %2%3.male%1 revela %2%3.
-
+ It is now %1's turn.femaleÉ agora o turno de %1.
-
+ It is now %1's turn.maleÉ agora o turno de %1.
-
+ %1 draws his initial hand.%1 compra a sua mão inicial.
-
+
+ %1 has loaded a deck (%2).
+ female
+ %1 carregou o deck %2.
+
+
+
+ %1 has loaded a deck (%2).
+ male
+ %1 carregou o deck %2.
+
+
+ %1 draws her initial hand.%1 compra a sua mão inicial.
@@ -2978,8 +2986,8 @@ Versão local é %1, versão remota é %2.
-
-
+
+ a carduma carta
@@ -2991,27 +2999,27 @@ Versão local é %1, versão remota é %2.
-
+ %1 undoes his last draw.%1 desfaz a sua última compra.
-
+ %1 undoes her last draw.%1 desfaz a sua última compra.
-
+ %1 undoes his last draw (%2).%1 desfaz a sua última compra (%2).
-
+ %1 undoes her last draw (%2).%1 desfaz a sua última compra (%2).
-
+ %1 gives %2 control over %3.%1 dá controlo sobre %3 a %2.
@@ -3062,7 +3070,7 @@ Versão local é %1, versão remota é %2.
-
+ redvermelho
@@ -3070,7 +3078,7 @@ Versão local é %1, versão remota é %2.
-
+ yellowamarelo
@@ -3078,7 +3086,7 @@ Versão local é %1, versão remota é %2.
-
+ greenverde
@@ -3162,62 +3170,62 @@ Versão local é %1, versão remota é %2.É agora o turno de %1.
-
+ untap stepEtapa de Desvirar
-
+ upkeep stepEtapa de Manutenção
-
+ draw stepEtapa de Compra
-
+ first main phase1ª Fase Principal (pré-combate)
-
+ beginning of combat stepEtapa de Início de Combate
-
+ declare attackers stepEtapa de Declaração de Atacantes
-
+ declare blockers stepEtapa de Declaração de Bloqueadores
-
+ combat damage stepEtapa de Dano de Combate
-
+ end of combat stepEtapa de Fim de Combate
-
+ second main phase2ª Fase Principal (pós-combate)
-
+ ending phaseFase Final
-
+ It is now the %1.É agora a %1.
@@ -3576,7 +3584,7 @@ Versão local é %1, versão remota é %2.
-
+ Number:Número:
@@ -3601,27 +3609,27 @@ Versão local é %1, versão remota é %2.
Número de faces:
-
+ Set power/toughnessDefinir poder/resistência
-
+ Please enter the new PT:Por favor introduza o novo P/R:
-
+ Set annotationColocar nota
-
+ Please enter the new annotation:Por favor introduza a nova nota:
-
+ Set countersDefinir marcadores
@@ -3649,47 +3657,45 @@ Versão local é %1, versão remota é %2.
#%1
- local deck
- deck local
+ deck local
- deck #%1
- deck #%1
+ deck #%1
-
+ User &detailsDetalhes do &utilizador
-
+ Direct &chatConversação &directa
-
+ Add to &buddy listAdicionar à lista de &amigos
-
+ Remove from &buddy listRemover da lista de &amigos
-
+ Add to &ignore listAdicionar à lista a &ignorar
-
+ Remove from &ignore listRemover da lista a &ignorar
-
+ Kick from &gameExpulsar do &jogo
@@ -3697,27 +3703,27 @@ Versão local é %1, versão remota é %2.
QObject
-
+ MaindeckMaindeck
-
+ SideboardSideboard
-
+ Cockatrice decks (*.cod)Decks do Cockatrice (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)Decks baseados em texto simples (*.dec *.mwDeck)
-
+ All files (*.*)Todos os ficheiros (*.*)
@@ -4073,17 +4079,17 @@ Por favor introduza um nome:
Tem a certeza que deseja sair deste jogo?
-
+ KickedExpulso
-
+ You have been kicked out of the game.Você foi expulso do jogo.
-
+ Game %1: %2Jogo %1: %2
@@ -4124,27 +4130,27 @@ Por favor introduza um nome:
TabRoom
-
+ &Say:&Dizer:
-
+ Chat
-
+ &Room&Sala
-
+ &Leave room&Abandonar a sala
-
+ You are flooding the chat. Please wait a couple of seconds.Estás a inundar o chat .Por favor aguarde alguns segundos.
@@ -4266,67 +4272,67 @@ Por favor introduza um nome:
UserList
-
+ Users online: %1Utilizadores online: %1
-
+ Users in this room: %1Utilizadores nesta sala:%1
-
+ Buddies online: %1 / %2Amigos online: %1 / %2
-
+ Ignored users online: %1 / %2Utilizadores ignorados online %1 / %2
-
+ %1's gamesjogos de %1
-
+ User &detailsDetalhes do &utilizador
-
+ Direct &chatConversação &directa
-
+ Show this user's &gamesMostrar os &jogos deste utilizador
-
+ Add to &buddy listAdicionar a lista de &amigos
-
+ Remove from &buddy listRemover da lista de &amigos
-
+ Add to &ignore listAdicionar a lista a &ignorar
-
+ Remove from &ignore listRemover da lista a &ignorar
-
+ Ban from &serverBanir do &servidor
@@ -4359,183 +4365,188 @@ Introduza 0 para um banimento indefinido.
&Procurar por:
-
+ Deck &name:&Nome do deck:
-
+ &Comments:&Comentários:
-
+
+ Hash:
+
+
+
+ &Update pricesActualizar pre&ços
-
+ Ctrl+UCtrl+U
-
+ Deck editor [*]Editor de decks [*]
-
+ &New deck&Novo deck
-
+ &Load deck...&Carregar deck...
-
+ &Save deck&Guardar deck
-
+ Save deck &as...G&uardar deck como...
-
+ Load deck from cl&ipboard...Carregar dec&k da memória...
-
+ Save deck to clip&boardGuardar deck na &memória
-
+ &Print deck...&Imprimir deck...
-
+ &Close&Fechar
-
+ Ctrl+QCtrl+Q
-
+ &Edit sets...&Editar expansões...
-
+ &Deck&Deck
-
+ &Card database&Base de dados das cartas
-
+ Add card to &maindeckAdicionar carta ao &maindeck
-
+ ReturnReturn
-
+ EnterEnter
-
+ Add card to &sideboardAdicionar carta ao &sideboard
-
+ Ctrl+ReturnCtrl+Return
-
+ Ctrl+EnterCtrl+Enter
-
+ &Remove row&Remover linha
-
+ DelDel
-
+ &Increment number&Aumentar o número
-
+ ++
-
+ &Decrement number&Diminuir o número
-
+ --
-
+ Are you sure?Tem a certeza?
-
+ The decklist has been modified.
Do you want to save the changes?A lista foi modificada.
Gostaria de guardar as alterações?
-
+ Load deckCarregar deck
-
-
+
+ ErrorErro
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.O deck não pode ser guardado.
Por favor confirme se é possível escrever do directório e tente de novo.
-
+ Save deckGuardar deck
diff --git a/cockatrice/translations/cockatrice_ru.ts b/cockatrice/translations/cockatrice_ru.ts
index 1e32d4037..a3927604c 100644
--- a/cockatrice/translations/cockatrice_ru.ts
+++ b/cockatrice/translations/cockatrice_ru.ts
@@ -136,24 +136,24 @@ Enter 0 for an indefinite ban.
Введите 0 чтобы забанить пожизненно.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.Пожалуйста, назовите причину бана.
Это необходимо для модераторов и не будет прочитано забаненным игроком.
-
+ &OK&Ок
-
+ &Cancel&Отмена
-
+ Ban user from serverЗабанить игрока на этом сервере
@@ -965,17 +965,17 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckListModel
-
+ NumberНомер
-
+ CardНазвание
-
+ PriceЦена
@@ -1917,7 +1917,7 @@ Local version is %1, remote version is %2.
%1 решил сдаться.
-
+ The game has started.Игра началась.
@@ -1974,115 +1974,111 @@ Local version is %1, remote version is %2.
%1 покинул игру.
- %1 has loaded a local deck.female
- %1 загрузила колоду с диска.
+ %1 загрузила колоду с диска.
- %1 has loaded a local deck.male
- %1 загрузил колоду с диска.
+ %1 загрузил колоду с диска.
- %1 has loaded deck #%2.female
- %1 загрузила колоду #%2.
+ %1 загрузила колоду #%2.
+
+
+ %1 has loaded deck #%2.
+ male
+ %1 загрузил колоду #%2.
- %1 has loaded deck #%2.
- male
- %1 загрузил колоду #%2.
-
-
- %1 is ready to start the game.female%1 готова начать игру.
-
+ %1 is ready to start the game.male%1 готов начать игру.
-
+ %1 is not ready to start the game any more.female%1 все еще не готова.
-
+ %1 is not ready to start the game any more.male%1 все еще не готов.
-
+ %1 has conceded the game.female%1 решила сдаться.
-
+ %1 has conceded the game.male%1 решил сдаться.
-
+ %1 has restored connection to the game.female%1 вернулась к игре.
-
+ %1 has restored connection to the game.male%1 вернулся к игре.
-
+ %1 has lost connection to the game.female%1 потеряла соединение с сервером.
-
+ %1 has lost connection to the game.male%1 потерял соединение с сервером.
-
+ %1 shuffles %2.female%1 размешивает %2.
-
+ %1 shuffles %2.male%1 размешивает %2.
-
+ %1 rolls a %2 with a %3-sided die.female%1 выкинул %2 / %3.
-
+ %1 rolls a %2 with a %3-sided die.male%1 выкинул %2 / %3.
-
+ %1 draws %n card(s).female
@@ -2092,7 +2088,7 @@ Local version is %1, remote version is %2.
-
+ %1 draws %n card(s).male
@@ -2102,133 +2098,133 @@ Local version is %1, remote version is %2.
-
+ %1 undoes his last draw.%1 отменил последнее взятие.
-
+ %1 undoes his last draw (%2).%1 отменил %2 последних взятий.
-
+ from table с поля битвы
-
+ from graveyard из кладбища
-
+ from exile из изгнания
-
+ from hand из руки
-
+ the bottom card of his libraryнижнюю карту своей библиотеки
-
+ from the bottom of his library со дна своей библиотеки
-
+ the top card of his libraryверхнюю карту своей библиотеки
-
+ from the top of his library с верха своей библиотеки
-
+ from library из библиотеки
-
+ from sideboard из сайда
-
+ from the stack из стека
-
-
+
+ a cardкарту
-
+ %1 gives %2 control over %3.%1 передает %2 контроль над %3.
-
+ %1 puts %2 into play%3.%1 поместил %2 на поле битвы %3.
-
+ %1 puts %2%3 into graveyard.%1 поместил %2%3 на кладбище.
-
+ %1 exiles %2%3.%1 изгоняет %2%3.
-
+ %1 moves %2%3 to hand.%1 поместил %2%3 в руку.
-
+ %1 puts %2%3 into his library.%1 поместил %2%3 в свою библиотеку.
-
+ %1 puts %2%3 on bottom of his library.%1 поместил %2%3 на дно своей библиотеки.
-
+ %1 puts %2%3 on top of his library.%1 поместил %2%3 на верх своей библиотеки.
-
+ %1 puts %2%3 into his library at position %4.%1 поместил %2%3 в свою библиотеку %4 сверху.
-
+ %1 moves %2%3 to sideboard.%1 поместил %2%3 в сайд.
-
+ %1 plays %2%3.%1 разыгрывает %2%3.
-
+ %1 takes a mulligan to %n.female
@@ -2238,7 +2234,7 @@ Local version is %1, remote version is %2.
-
+ %1 takes a mulligan to %n.male
@@ -2248,37 +2244,37 @@ Local version is %1, remote version is %2.
-
+ %1 flips %2 face-down.female%1 перевернула %2 лицом вниз.
-
+ %1 flips %2 face-down.male%1 перевернул %2 лицом вниз.
-
+ %1 flips %2 face-up.female%1 перевернула %2 лицом вверх.
-
+ %1 flips %2 face-up.male%1 перевернул %2 лицом вверх.
-
+ %1 destroys %2.female%1 уничтожила %2.
-
+ %1 destroys %2.male%1 уничтожил %2.
@@ -2294,271 +2290,283 @@ Local version is %1, remote version is %2.
%1 присоединил %2 к %4 игрока %3.
-
+
+ %1 has loaded a deck (%2).
+ female
+ %1 загрузила колоду %2.
+
+
+
+ %1 has loaded a deck (%2).
+ male
+ %1 загрузил колоду %2.
+
+
+ %1 attaches %2 to %3's %4.p1 female, p2 female%1 присоединила %2 к %4 игрока %3.
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male%1 присоединила %2 к %4 игрока %3.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female%1 присоединил %2 к %4 игрока %3.
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male%1 присоединил %2 к %4 игрока %3.
-
+ %1 unattaches %2.female%1 отсоединила %2.
-
+ %1 unattaches %2.male%1 отсоединил %2.
-
+ %1 creates token: %2%3.female%1 создала фишку: %2%3.
-
+ %1 creates token: %2%3.male%1 создал фишку: %2%3.
-
+ %1 points from her %2 to herself.female%1 указывает с %2 на себя-любимую.
-
+ %1 points from his %2 to himself.male%1 указывает с %2 на себя.
-
+ %1 points from her %2 to %3.p1 female, p2 female%1 указывает с %2 на %3.
-
+ %1 points from her %2 to %3.p1 female, p2 male%1 указывает с %2 на %3.
-
+ %1 points from his %2 to %3.p1 male, p2 female%1 указывает с %2 на %3.
-
+ %1 points from his %2 to %3.p1 male, p2 male%1 указывает с %2 на %3.
-
+ %1 points from %2's %3 to herself.card owner female, target female%1 указывает с %3, контролируемого %2, на себя.
-
+ %1 points from %2's %3 to herself.card owner male, target female%1 указывает с %3, контролируемого %2, на себя.
-
+ %1 points from %2's %3 to himself.card owner female, target male%1 указывает с %3, контролируемого %2, на себя.
-
+ %1 points from %2's %3 to himself.card owner male, target male%1 указывает с %3, контролируемого %2, на себя.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 female%1 указывает с %3, контролируемого %2, на %4.
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 male%1 указывает с %3, контролируемого %2, на %4.
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+ %1 указывает с %3, контролируемого %2, на %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 male
+ %1 указывает с %3, контролируемого %2, на %4.
+ %1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 указывает с %3, контролируемого %2, на %4.%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+ %1 указывает с %3, контролируемого %2, на %4.
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 указывает с %3, контролируемого %2, на %4.%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
- %1 указывает с %3, контролируемого %2, на %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
- %1 указывает с %3, контролируемого %2, на %4.
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
- %1 указывает с %3, контролируемого %2, на %4.
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male%1 указывает с %3, контролируемого %2 на %4.
-
+ %1 points from her %2 to her %3.female%1 указывает с её %2 на её %3.
-
+ %1 points from his %2 to his %3.male%1 указывает с его %2 на его %3.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female%1 указывает с её %2 на %4 под контролем %3.
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male%1 указывает с её %2 на %4 под контролем %3.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female%1 указывает с его %2 на %4 под контролем %3.
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male%1 указывает с его %2 на %4 под контролем %3.
-
+ %1 points from %2's %3 to her own %4.card owner female, target female%1 указывает с %3 под контролем %2 на %4, владельцем которого она является.
-
+ %1 points from %2's %3 to her own %4.card owner male, target female%1 указывает с %3 под контролем %2 на %4, владельцем которого он является.
-
+ %1 points from %2's %3 to his own %4.card owner female, target male%1 указывает с %3 под контролем %2 на %4, владельцем которого она является.
-
+ %1 points from %2's %3 to his own %4.card owner male, target male%1 указывает с %3 под контролем %2 на %4, владельцем которого он является.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female%1 указывает с %3 контролируемого %2 на %5 под контролем %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male%1 указывает с %3 контролируемого %2 на %5 под контролем %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female%1 указывает с %3 контролируемого %2 на %5 под контролем %4.
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male%1 указывает с %3 контролируемого %2 на %5 под контролем %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female%1 указывает с %3 контролируемого %2 на %5 под контролем %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male%1 указывает с %3 контролируемого %2 на %5 под контролем %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female%1 указывает с %3 контролируемого %2 на %5 под контролем %4.
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male%1 указывает с %3 контролируемого %2 на %5 под контролем %4.
-
+ %1 places %n %2 counter(s) on %3 (now %4).female
@@ -2568,7 +2576,7 @@ Local version is %1, remote version is %2.
-
+ %1 places %n %2 counter(s) on %3 (now %4).male
@@ -2578,7 +2586,7 @@ Local version is %1, remote version is %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).female
@@ -2588,7 +2596,7 @@ Local version is %1, remote version is %2.
-
+ %1 removes %n %2 counter(s) from %3 (now %4).male
@@ -2598,265 +2606,265 @@ Local version is %1, remote version is %2.
-
+ %1 taps her permanents.female%1 повернула свои перманенты.
-
+ %1 untaps her permanents.female%1 развернула свои перманенты.
-
+ %1 taps his permanents.male%1 повернул свои перманенты.
-
+ %1 untaps his permanents.male%1 развернул свои перманенты.
-
+ %1 taps %2.female%1 повернула %2.
-
+ %1 untaps %2.female%1 развернула %2.
-
+ %1 taps %2.male%1 повернул %2.
-
+ %1 untaps %2.male%1 развернул %2.
-
+ %1 sets counter %2 to %3 (%4%5).female%1 установила жетон %2 на %3 (%4%5).
-
+ %1 sets counter %2 to %3 (%4%5).male%1 установил жетон %2 на %3 (%4%5).
+
+
+ %1 sets %2 to not untap normally.
+ female
+ %2 теперь не разворачивается как обычно (%1).
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+ %2 теперь не разворачивается как обычно (%1).
+
+
+
+ %1 sets %2 to untap normally.
+ female
+ %2 теперь разворачивается как обычно (%1).
+
- %1 sets %2 to not untap normally.
- female
- %2 теперь не разворачивается как обычно (%1).
-
-
-
- %1 sets %2 to not untap normally.
- male
- %2 теперь не разворачивается как обычно (%1).
-
-
-
- %1 sets %2 to untap normally.
- female
- %2 теперь разворачивается как обычно (%1).
-
-
- %1 sets %2 to untap normally.male%2 теперь разворачивается как обычно (%1).
-
+ %1 sets PT of %2 to %3.female%1 установила Силу/Защиту %2 %3.
-
+ %1 sets PT of %2 to %3.male%1 установил Силу/Защиту %2 %3.
-
+ %1 sets annotation of %2 to %3.female%1 пометила %2 "%3".
-
+ %1 sets annotation of %2 to %3.male%1 пометил %2 "%3".
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+ %1 смотрит верхние %2 карт библиотеки %3.
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+ %1 смотрит верхние %2 карт библиотеки %3.
+
+
+
+ %1 is looking at %2.
+ female
+ %1 просматривает %2.
+
- %1 is looking at the top %2 cards %3.
- female
- %1 смотрит верхние %2 карт библиотеки %3.
-
-
-
- %1 is looking at the top %2 cards %3.
- male
- %1 смотрит верхние %2 карт библиотеки %3.
-
-
-
- %1 is looking at %2.
- female
- %1 просматривает %2.
-
-
- %1 is looking at %2.male%1 просматривает %2.
-
+ %1 stops looking at %2.female%1 закончила просматривать %2.
-
+ %1 stops looking at %2.male%1 закончил просматривать %2.
-
+ %1 reveals %2 to %3.p1 female, p2 female%1 показывает её %2 %3.
-
+ %1 reveals %2 to %3.p1 female, p2 male%1 показывает её %2 %3.
-
+ %1 reveals %2 to %3.p1 male, p2 female%1 показывает его %2 %3.
-
+ %1 reveals %2 to %3.p1 male, p2 male%1 показывает его %2 %3.
-
+ %1 reveals %2.female%1 открыла её %2.
-
+ %1 reveals %2.male%1 открыл его %2.
-
+ %1 randomly reveals %2%3 to %4.p1 female, p2 female%1 показывает случайно выбранную%3 карту (%2) %4.
-
+ %1 randomly reveals %2%3 to %4.p1 female, p2 male%1 показывает случайно выбранную%3 карту (%2) %4.
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+ %1 показывает случайно выбранную%3 карту (%2) %4.
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 male
+ %1 показывает случайно выбранную%3 карту (%2) %4.
+
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
- %1 показывает случайно выбранную%3 карту (%2) %4.
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 male
- %1 показывает случайно выбранную%3 карту (%2) %4.
-
-
- %1 randomly reveals %2%3.female%1 показывает случайно выбранную%3 карту (%2).
-
+ %1 randomly reveals %2%3.male%1 показывает случайно выбранную%3 карту (%2).
-
+ %1 reveals %2%3 to %4.p1 female, p2 female%1 показывает%2%3 %4.
-
+ %1 reveals %2%3 to %4.p1 female, p2 male%1 показывает%2%3 %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 female%1 показывает%2%3 %4.
-
+ %1 reveals %2%3 to %4.p1 male, p2 male%1 показывает%2%3 %4.
-
+ %1 reveals %2%3.female%1 показывает%2%3.
-
+ %1 reveals %2%3.male%1 показывает%2%3.
-
+ It is now %1's turn.femaleХод очаровательной %1.
-
+ It is now %1's turn.maleХод игрока %1.
@@ -2918,67 +2926,67 @@ Local version is %1, remote version is %2.
-
+ %1 undoes her last draw.%1 отменила последнее взятие.
-
+ %1 undoes her last draw (%2).%1 отменила %2 последних взятий.
-
+ the bottom card of her libraryнижнюю карту своей библиотеки
-
+ from the bottom of her library со дна своей библиотеки
-
+ the top card of her libraryверхнюю карту своей библиотеки
-
+ from the top of her library с верха своей библиотеки
-
+ %1 puts %2 into play tapped%3.%1 положил %2 повернутым на поле битвы%3.
-
+ %1 puts %2%3 into her library.%1 поместила %2%3 в свою библиотеку.
-
+ %1 puts %2%3 on bottom of her library.%1 поместила %2%3 на дно своей библиотеки.
-
+ %1 puts %2%3 on top of her library.%1 поместила %2%3 на верх своей библиотеки.
-
+ %1 puts %2%3 into her library at position %4.%1 поместила %2%3 в свою библиотеку %4 сверху.
-
+ %1 draws his initial hand.%1 взял свою стартовую руку.
-
+ %1 draws her initial hand.%1 взяла свою стартовую руку.
@@ -2999,7 +3007,7 @@ Local version is %1, remote version is %2.
-
+ redкрасный
@@ -3008,7 +3016,7 @@ Local version is %1, remote version is %2.
-
+ yellowжелтый
@@ -3017,7 +3025,7 @@ Local version is %1, remote version is %2.
-
+ greenзеленый
@@ -3102,62 +3110,62 @@ Local version is %1, remote version is %2.
Ход игрока %1.
-
+ untap stepшаг разворота
-
+ upkeep stepшаг поддержки
-
+ draw stepшаг взятия карты
-
+ first main phaseпервая главная фаза
-
+ beginning of combat stepшаг начала битвы
-
+ declare attackers stepшаг назначения атакующих
-
+ declare blockers stepшаг назначения блокирующих
-
+ combat damage stepшаг нанесения повреждений
-
+ end of combat stepшаг завершения битвы
-
+ second main phaseвторая главная фаза
-
+ ending phaseзаключительный шаг
-
+ It is now the %1.Сейчас %1.
@@ -3516,7 +3524,7 @@ Local version is %1, remote version is %2.
-
+ Number:Количество:
@@ -3541,27 +3549,27 @@ Local version is %1, remote version is %2.
Количество граней:
-
+ Set power/toughnessУстановить Силу/Защиту
-
+ Please enter the new PT:Введите новые Силу/Защиту:
-
+ Set annotationПометка
-
+ Please enter the new annotation:Введите текст:
-
+ Set countersУстановить жетоны
@@ -3581,47 +3589,45 @@ Local version is %1, remote version is %2.
локальная
- local deck
- колода на диске
+ колода на диске
- deck #%1
- колода №%1
+ колода №%1
-
+ User &details&Данные о пользователе
-
+ Direct &chatОбратиться &лично
-
+ Add to &buddy listДобавить в &друзья
-
+ Remove from &buddy list&Удалить из друзей
-
+ Add to &ignore listДобавить в &игнор-лист
-
+ Remove from &ignore listУдалить и&з игнор-листа
-
+ Kick from &gameВ&ыкинуть из игры
@@ -3629,27 +3635,27 @@ Local version is %1, remote version is %2.
QObject
-
+ MaindeckМейн
-
+ SideboardСайд
-
+ Cockatrice decks (*.cod)Cockatrice-деклисты (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)Текстовые деклисты (*.dec *.mwDeck)
-
+ All files (*.*)Все файлы (*.*)
@@ -3979,17 +3985,17 @@ Please enter a name:
Вы уверены, что хотите уйти?
-
+ KickedВыкинут
-
+ You have been kicked out of the game.Вас выкинули из игры.
-
+ Game %1: %2Игра %1: %2
@@ -4030,27 +4036,27 @@ Please enter a name:
TabRoom
-
+ &Say:&Сказать:
-
+ ChatЧат
-
+ &Room&Комната
-
+ &Leave room&Покинуть комнату
-
+ You are flooding the chat. Please wait a couple of seconds.Кажется, Вы нафлудили. Пожалуйста, подождите пару секунд.
@@ -4165,67 +4171,67 @@ Please enter a name:
UserList
-
+ Users online: %1Пользователей онлайн: %1
-
+ Users in this room: %1Пользователей в этой комнате: %1
-
+ Buddies online: %1 / %2Друзей онлайн: %1 / %2
-
+ Ignored users online: %1 / %2Игнорируемых пользователей онлайн: %1 / %2
-
+ %1's gamesИгры %1
-
+ User &detailsДанные о &пользователе
-
+ Direct &chatОбратиться &лично
-
+ Show this user's &gamesПоказывать игры &этого пользователя
-
+ Add to &buddy listДобавить в список &друзей
-
+ Remove from &buddy list&Удалить из друзей
-
+ Add to &ignore listДобавить в &игнор-лист
-
+ Remove from &ignore listУдалить и&з игнор-листа
-
+ Ban from &serverЗа&банить на сервере
@@ -4258,183 +4264,188 @@ Enter 0 for an indefinite ban.
&Искать:
-
+ Deck &name:&Название колоды:
-
+ &Comments:Ко&мментарии:
-
+
+ Hash:
+
+
+
+ &Update prices&Обновить цены
-
+ Ctrl+UCtrl+U
-
+ Deck editor [*]Редактор колод [*]
-
+ &New deckНовая коло&да
-
+ &Load deck...&Загрузить колоду...
-
+ &Save deckСо&хранить колоду
-
+ Save deck &as...Сохранить колоду к&ак...
-
+ Load deck from cl&ipboard...Взять колоду из &буфера...
-
+ Save deck to clip&boardКопировать колоду в бу&фер
-
+ &Print deck...Пе&чать колоды...
-
+ &Close&Закрыть
-
+ Ctrl+Q
-
+ &Edit sets...Редактировать издани&я...
-
+ &DeckКо&лода
-
+ &Card databaseБаза кар&т
-
+ Add card to &maindeckДобавить ме&йном
-
+ Return
-
+ Enter
-
+ Add card to &sideboardДобавить в са&йд
-
+ Ctrl+Return
-
+ Ctrl+Enter
-
+ &Remove row&Удалить строку
-
+ Del
-
+ &Increment numberУ&величить количество
-
+ +
-
+ &Decrement numberУ&меньшить количество
-
+ -
-
+ Are you sure?Вы уверены?
-
+ The decklist has been modified.
Do you want to save the changes?Деклист был отредактирован.
Сохранить изменения?
-
+ Load deckЗагрузить колоду
-
-
+
+ ErrorОшибка
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.Колода не может быть сохранена.
Убедитесь, что директория указана верно,а затем повторите попытку.
-
+ Save deckСохранить колоду
diff --git a/cockatrice/translations/cockatrice_sk.ts b/cockatrice/translations/cockatrice_sk.ts
index deccf22f5..b67389690 100644
--- a/cockatrice/translations/cockatrice_sk.ts
+++ b/cockatrice/translations/cockatrice_sk.ts
@@ -135,23 +135,23 @@ Enter 0 for an indefinite ban.
-
+ Please enter the reason for the ban.
This is only saved for moderators and cannot be seen by the banned person.
-
+ &OK
-
+ &Cancel
-
+ Ban user from server
@@ -809,17 +809,17 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckListModel
-
+ Number
-
+ Card
-
+ Price
@@ -1477,8 +1477,6 @@ All running games will be lost.
Reason for shutdown: %1
-
-
@@ -1699,7 +1697,7 @@ Local version is %1, remote version is %2.
-
+ The game has started.
@@ -1739,1033 +1737,999 @@ Local version is %1, remote version is %2.
male
-
-
- %1 has loaded a local deck.
- female
-
-
-
-
- %1 has loaded a local deck.
- male
-
-
-
-
- %1 has loaded deck #%2.
- female
-
-
- %1 has loaded deck #%2.
- male
-
-
-
- %1 is ready to start the game.female
-
+ %1 is ready to start the game.male
-
+ %1 is not ready to start the game any more.female
-
+ %1 is not ready to start the game any more.male
-
+ %1 has conceded the game.female
-
+ %1 has conceded the game.male
+
+
+ %1 has restored connection to the game.
+ female
+
+
+
+
+ %1 has restored connection to the game.
+ male
+
+
+
+
+ %1 has lost connection to the game.
+ female
+
+
- %1 has restored connection to the game.
- female
-
-
-
-
- %1 has restored connection to the game.
- male
-
-
-
-
- %1 has lost connection to the game.
- female
-
-
-
- %1 has lost connection to the game.male
-
+ %1 shuffles %2.female
+
+
+ %1 shuffles %2.
+ male
+
+
- %1 shuffles %2.
- male
-
-
-
- %1 rolls a %2 with a %3-sided die.female
-
+ %1 rolls a %2 with a %3-sided die.male
-
+ %1 draws %n card(s).female
-
-
+
+ %1 draws %n card(s).
+ male
+
+
+
+
+
- %1 draws %n card(s).
- male
-
-
-
-
-
-
-
- %1 undoes his last draw.
-
+ %1 undoes her last draw.
-
+ %1 undoes his last draw (%2).
-
+ %1 undoes her last draw (%2).
-
+ from table
-
+ from graveyard
-
+ from exile
-
+ from hand
-
+ the bottom card of his library
-
+ the bottom card of her library
-
+ from the bottom of his library
-
+ from the bottom of her library
-
+ the top card of his library
-
+ the top card of her library
-
+ from the top of his library
-
+ from the top of her library
-
+ from library
-
+ from sideboard
-
+ from the stack
-
-
+
+ a card
-
+ %1 gives %2 control over %3.
-
+ %1 puts %2 into play tapped%3.
-
+ %1 puts %2 into play%3.
-
+ %1 puts %2%3 into graveyard.
-
+ %1 exiles %2%3.
-
+ %1 moves %2%3 to hand.
-
+ %1 puts %2%3 into his library.
-
+ %1 puts %2%3 into her library.
-
+ %1 puts %2%3 on bottom of his library.
-
+ %1 puts %2%3 on bottom of her library.
-
+ %1 puts %2%3 on top of his library.
-
+ %1 puts %2%3 on top of her library.
-
+ %1 puts %2%3 into his library at position %4.
-
+ %1 puts %2%3 into her library at position %4.
-
+ %1 moves %2%3 to sideboard.
-
+ %1 plays %2%3.
-
+ %1 takes a mulligan to %n.female
-
-
-
+ %1 takes a mulligan to %n.male
-
-
-
+ %1 flips %2 face-down.female
-
+ %1 flips %2 face-down.male
-
+ %1 flips %2 face-up.female
+
+
+ %1 flips %2 face-up.
+ male
+
+
- %1 flips %2 face-up.
- male
-
-
-
- %1 destroys %2.female
-
+ %1 destroys %2.male
-
+ %1 unattaches %2.female
-
+ %1 unattaches %2.male
-
+ %1 creates token: %2%3.female
-
+ %1 creates token: %2%3.male
-
+ %1 points from her %2 to herself.female
-
+ %1 points from his %2 to himself.male
-
+ %1 points from her %2 to %3.p1 female, p2 female
-
+ %1 points from her %2 to %3.p1 female, p2 male
-
+ %1 points from his %2 to %3.p1 male, p2 female
-
+ %1 points from his %2 to %3.p1 male, p2 male
-
+ %1 points from %2's %3 to herself.card owner female, target female
-
+ %1 points from %2's %3 to herself.card owner male, target female
-
+ %1 points from %2's %3 to himself.card owner female, target male
-
+ %1 points from %2's %3 to himself.card owner male, target male
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 female, p3 female
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 female, p3 male
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 female, p2 male, p3 female
+
+ %1 points from %2's %3 to %4.
- p1 female, p2 female, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 female, p2 female, p3 male
+ p1 female, p2 male, p3 male%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 female
+ p1 male, p2 female, p3 female%1 points from %2's %3 to %4.
- p1 female, p2 male, p3 male
+ p1 male, p2 female, p3 male
+
+
+
+
+ %1 points from %2's %3 to %4.
+ p1 male, p2 male, p3 female%1 points from %2's %3 to %4.
- p1 male, p2 female, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 female, p3 male
-
-
-
-
- %1 points from %2's %3 to %4.
- p1 male, p2 male, p3 female
-
-
-
-
- %1 points from %2's %3 to %4.p1 male, p2 male, p3 male
-
+ %1 points from her %2 to her %3.female
-
+ %1 points from his %2 to his %3.male
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male
-
+ %1 points from %2's %3 to her own %4.card owner female, target female
-
+ %1 points from %2's %3 to her own %4.card owner male, target female
-
+ %1 points from %2's %3 to his own %4.card owner female, target male
-
+ %1 points from %2's %3 to his own %4.card owner male, target male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+ female
+
+
+
+
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+ male
+
+
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
+ female
+
+
+
+
- %1 places %n %2 counter(s) on %3 (now %4).
- female
-
-
-
-
-
-
-
-
- %1 places %n %2 counter(s) on %3 (now %4).
- male
-
-
-
-
-
-
-
-
- %1 removes %n %2 counter(s) from %3 (now %4).
- female
-
-
-
-
-
-
-
- %1 removes %n %2 counter(s) from %3 (now %4).male
-
-
-
+ %1 taps her permanents.female
-
+ %1 untaps her permanents.female
-
+ %1 taps his permanents.male
-
+ %1 untaps his permanents.male
+
+
+ %1 taps %2.
+ female
+
+
+
+
+ %1 untaps %2.
+ female
+
+
+
+
+ %1 taps %2.
+ male
+
+
- %1 taps %2.
- female
-
-
-
-
- %1 untaps %2.
- female
-
-
-
-
- %1 taps %2.
- male
-
-
-
- %1 untaps %2.male
-
+ %1 sets counter %2 to %3 (%4%5).female
-
+ %1 sets counter %2 to %3 (%4%5).male
+
+
+ %1 sets %2 to not untap normally.
+ female
+
+
+
+
+ %1 sets %2 to not untap normally.
+ male
+
+
+
+
+ %1 sets %2 to untap normally.
+ female
+
+
- %1 sets %2 to not untap normally.
- female
-
-
-
-
- %1 sets %2 to not untap normally.
- male
-
-
-
-
- %1 sets %2 to untap normally.
- female
-
-
-
- %1 sets %2 to untap normally.male
-
+ %1 sets PT of %2 to %3.female
-
+ %1 sets PT of %2 to %3.male
-
+ %1 sets annotation of %2 to %3.female
-
+ %1 sets annotation of %2 to %3.male
+
+
+ %1 is looking at the top %2 cards %3.
+ female
+
+
+
+
+ %1 is looking at the top %2 cards %3.
+ male
+
+
+
+
+ %1 is looking at %2.
+ female
+
+
- %1 is looking at the top %2 cards %3.
- female
-
-
-
-
- %1 is looking at the top %2 cards %3.
- male
-
-
-
-
- %1 is looking at %2.
- female
-
-
-
- %1 is looking at %2.male
-
+ %1 stops looking at %2.female
-
+ %1 stops looking at %2.male
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 female
+
+
+
+
+ %1 reveals %2 to %3.
+ p1 female, p2 male
+
+
+
+
+ %1 reveals %2 to %3.
+ p1 male, p2 female
+
+ %1 reveals %2 to %3.
- p1 female, p2 female
-
-
-
-
- %1 reveals %2 to %3.
- p1 female, p2 male
-
-
-
-
- %1 reveals %2 to %3.
- p1 male, p2 female
-
-
-
-
- %1 reveals %2 to %3.p1 male, p2 male
-
+ %1 reveals %2.female
-
+ %1 reveals %2.male
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 female
+
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 female, p2 male
+
+
+
+
+ %1 randomly reveals %2%3 to %4.
+ p1 male, p2 female
+
+ %1 randomly reveals %2%3 to %4.
- p1 female, p2 female
-
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 female, p2 male
-
-
-
-
- %1 randomly reveals %2%3 to %4.
- p1 male, p2 female
-
-
-
-
- %1 randomly reveals %2%3 to %4.p1 male, p2 male
-
+ %1 randomly reveals %2%3.female
-
+ %1 randomly reveals %2%3.male
+
+
+ %1 reveals %2%3 to %4.
+ p1 female, p2 female
+
+
+
+
+ %1 reveals %2%3 to %4.
+ p1 female, p2 male
+
+
+
+
+ %1 reveals %2%3 to %4.
+ p1 male, p2 female
+
+ %1 reveals %2%3 to %4.
- p1 female, p2 female
-
-
-
-
- %1 reveals %2%3 to %4.
- p1 female, p2 male
-
-
-
-
- %1 reveals %2%3 to %4.
- p1 male, p2 female
-
-
-
-
- %1 reveals %2%3 to %4.p1 male, p2 male
-
+ %1 reveals %2%3.female
-
+ %1 reveals %2%3.male
-
+ It is now %1's turn.female
-
+ It is now %1's turn.male
-
+ %1 draws his initial hand.
-
+
+ %1 has loaded a deck (%2).
+ female
+
+
+
+
+ %1 has loaded a deck (%2).
+ male
+
+
+
+ %1 draws her initial hand.
+
+
+ %1 attaches %2 to %3's %4.
+ p1 female, p2 female
+
+
+
+
+ %1 attaches %2 to %3's %4.
+ p1 female, p2 male
+
+
+
+
+ %1 attaches %2 to %3's %4.
+ p1 male, p2 female
+
+ %1 attaches %2 to %3's %4.
- p1 female, p2 female
-
-
-
-
- %1 attaches %2 to %3's %4.
- p1 female, p2 male
-
-
-
-
- %1 attaches %2 to %3's %4.
- p1 male, p2 female
-
-
-
-
- %1 attaches %2 to %3's %4.p1 male, p2 male
-
+ red
-
-
-
+ yellow
-
-
-
+ green
-
-
-
+ untap step
-
+ upkeep step
-
+ draw step
-
+ first main phase
-
+ beginning of combat step
-
+ declare attackers step
-
+ declare blockers step
-
+ combat damage step
-
+ end of combat step
-
+ second main phase
-
+ ending phase
-
+ It is now the %1.
@@ -3124,7 +3088,7 @@ Local version is %1, remote version is %2.
-
+ Number:
@@ -3149,27 +3113,27 @@ Local version is %1, remote version is %2.
-
+ Set power/toughness
-
+ Please enter the new PT:
-
+ Set annotation
-
+ Please enter the new annotation:
-
+ Set counters
@@ -3177,47 +3141,37 @@ Local version is %1, remote version is %2.
PlayerListWidget
-
- local deck
-
-
-
-
- deck #%1
-
-
-
-
+ User &details
-
+ Direct &chat
-
+ Add to &buddy list
-
+ Remove from &buddy list
-
+ Add to &ignore list
-
+ Remove from &ignore list
-
+ Kick from &game
@@ -3225,27 +3179,27 @@ Local version is %1, remote version is %2.
QObject
-
+ Maindeck
-
+ Sideboard
-
+ Cockatrice decks (*.cod)
-
+ Plain text decks (*.dec *.mwDeck)
-
+ All files (*.*)
@@ -3574,17 +3528,17 @@ Please enter a name:
-
+ Kicked
-
+ You have been kicked out of the game.
-
+ Game %1: %2
@@ -3625,27 +3579,27 @@ Please enter a name:
TabRoom
-
+ &Say:
-
+ Chat
-
+ &Room
-
+ &Leave room
-
+ You are flooding the chat. Please wait a couple of seconds.
@@ -3755,67 +3709,67 @@ Please enter a name:
UserList
-
+ Users online: %1
-
+ Users in this room: %1
-
+ Buddies online: %1 / %2
-
+ Ignored users online: %1 / %2
-
+ %1's games
-
+ User &details
-
+ Direct &chat
-
+ Show this user's &games
-
+ Add to &buddy list
-
+ Remove from &buddy list
-
+ Add to &ignore list
-
+ Remove from &ignore list
-
+ Ban from &server
@@ -3838,181 +3792,186 @@ Please enter a name:
-
+ Deck &name:
-
+ &Comments:
-
+
+ Hash:
+
+
+
+ &Update prices
-
+ Ctrl+U
-
+ Deck editor [*]
-
+ &New deck
-
+ &Load deck...
-
+ &Save deck
-
+ Save deck &as...
-
+ Load deck from cl&ipboard...
-
+ Save deck to clip&board
-
+ &Print deck...
-
+ &Close
-
+ Ctrl+Q
-
+ &Edit sets...
-
+ &Deck
-
+ &Card database
-
+ Add card to &maindeck
-
+ Return
-
+ Enter
-
+ Add card to &sideboard
-
+ Ctrl+Return
-
+ Ctrl+Enter
-
+ &Remove row
-
+ Del
-
+ &Increment number
-
+ +
-
+ &Decrement number
-
+ -
-
+ Are you sure?
-
+ The decklist has been modified.
Do you want to save the changes?
-
+ Load deck
-
-
+
+ Error
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.
-
+ Save deck
diff --git a/common/decklist.cpp b/common/decklist.cpp
index 6aed8f89f..93912cdd5 100644
--- a/common/decklist.cpp
+++ b/common/decklist.cpp
@@ -3,6 +3,7 @@
#include
#include
#include
+#include
#include "decklist.h"
MoveCardToZone::MoveCardToZone(const QString &_cardName, const QString &_startZone, const QString &_targetZone)
@@ -263,6 +264,7 @@ DeckList::DeckList(DeckList *other)
newMoveList.append(new MoveCardToZone(oldMoveList[i]));
sideboardPlans.insert(spIterator.key(), new SideboardPlan(spIterator.key(), newMoveList));
}
+ updateDeckHash();
}
DeckList::~DeckList()
@@ -453,8 +455,10 @@ bool DeckList::loadFromFile(const QString &fileName, FileFormat fmt)
case PlainTextFormat: result = loadFromFile_Plain(&file); break;
case CockatriceFormat: result = loadFromFile_Native(&file); break;
}
- if (result)
+ if (result) {
+ updateDeckHash();
emit deckLoaded();
+ }
return result;
}
@@ -486,6 +490,7 @@ void DeckList::cleanList()
root->clearTree();
setName();
setComments();
+ updateDeckHash();
}
void DeckList::getCardListHelper(InnerDecklistNode *item, QSet &result) const
@@ -512,28 +517,55 @@ DecklistCardNode *DeckList::addCard(const QString &cardName, const QString &zone
if (!zoneNode)
zoneNode = new InnerDecklistNode(zoneName, root);
- return new DecklistCardNode(cardName, 1, zoneNode);
+ DecklistCardNode *node = new DecklistCardNode(cardName, 1, zoneNode);
+ updateDeckHash();
+ return node;
}
bool DeckList::deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode)
{
if (node == root)
return true;
- if (!rootNode)
+ bool updateHash = false;
+ if (!rootNode) {
rootNode = root;
+ updateHash = true;
+ }
int index = rootNode->indexOf(node);
if (index != -1) {
delete rootNode->takeAt(index);
if (!rootNode->size())
deleteNode(rootNode, rootNode->getParent());
+ if (updateHash)
+ updateDeckHash();
return true;
}
for (int i = 0; i < rootNode->size(); i++) {
InnerDecklistNode *inner = dynamic_cast(rootNode->at(i));
if (inner)
- if (deleteNode(node, inner))
+ if (deleteNode(node, inner)) {
+ if (updateHash)
+ updateDeckHash();
return true;
+ }
}
return false;
}
+
+void DeckList::updateDeckHash()
+{
+ QStringList cardList;
+ for (int i = 0; i < root->size(); i++) {
+ InnerDecklistNode *node = dynamic_cast(root->at(i));
+ for (int j = 0; j < node->size(); j++) {
+ DecklistCardNode *card = dynamic_cast(node->at(j));
+ for (int k = 0; k < card->getNumber(); ++k)
+ cardList.append((node->getName() == "side" ? "SB:" : "") + card->getName().toLower());
+ }
+ }
+ cardList.sort();
+ deckHash = QCryptographicHash::hash(cardList.join(";").toUtf8(), QCryptographicHash::Sha1).toBase64().left(10);
+
+ emit deckHashChanged();
+}
diff --git a/common/decklist.h b/common/decklist.h
index d0f2b7cf7..3e734c846 100644
--- a/common/decklist.h
+++ b/common/decklist.h
@@ -118,6 +118,7 @@ public:
private:
QString name, comments;
QString lastFileName;
+ QString deckHash;
FileFormat lastFileFormat;
QMap sideboardPlans;
InnerDecklistNode *root;
@@ -127,6 +128,7 @@ private:
void getCardListHelper(InnerDecklistNode *node, QSet &result) const;
signals:
void deckLoaded();
+ void deckHashChanged();
public slots:
void setName(const QString &_name = QString()) { name = _name; }
void setComments(const QString &_comments = QString()) { comments = _comments; }
@@ -160,6 +162,9 @@ public:
void cleanList();
bool isEmpty() const { return root->isEmpty() && name.isEmpty() && comments.isEmpty() && sideboardPlans.isEmpty(); }
QStringList getCardList() const;
+
+ QString getDeckHash() const { return deckHash; }
+ void updateDeckHash();
InnerDecklistNode *getRoot() const { return root; }
DecklistCardNode *addCard(const QString &cardName, const QString &zoneName);
diff --git a/common/protocol_datastructures.cpp b/common/protocol_datastructures.cpp
index 54e45c01f..5d3362f03 100644
--- a/common/protocol_datastructures.cpp
+++ b/common/protocol_datastructures.cpp
@@ -207,7 +207,7 @@ ServerInfo_Arrow::ServerInfo_Arrow(int _id, int _startPlayerId, const QString &_
insertItem(new SerializableItem_Color("color", _color));
}
-ServerInfo_PlayerProperties::ServerInfo_PlayerProperties(int _playerId, ServerInfo_User *_userInfo, bool _spectator, bool _conceded, bool _readyStart, int _deckId)
+ServerInfo_PlayerProperties::ServerInfo_PlayerProperties(int _playerId, ServerInfo_User *_userInfo, bool _spectator, bool _conceded, bool _readyStart, const QString &_deckHash)
: SerializableItem_Map("player_properties")
{
insertItem(new SerializableItem_Int("player_id", _playerId));
@@ -217,7 +217,7 @@ ServerInfo_PlayerProperties::ServerInfo_PlayerProperties(int _playerId, ServerIn
insertItem(new SerializableItem_Bool("spectator", _spectator));
insertItem(new SerializableItem_Bool("conceded", _conceded));
insertItem(new SerializableItem_Bool("ready_start", _readyStart));
- insertItem(new SerializableItem_Int("deck_id", _deckId));
+ insertItem(new SerializableItem_String("deck_hash", _deckHash));
}
ServerInfo_Player::ServerInfo_Player(ServerInfo_PlayerProperties *_properties, DeckList *_deck, const QList &_zoneList, const QList &_counterList, const QList &_arrowList)
diff --git a/common/protocol_datastructures.h b/common/protocol_datastructures.h
index 31e0a0591..c2ff26ef2 100644
--- a/common/protocol_datastructures.h
+++ b/common/protocol_datastructures.h
@@ -189,14 +189,14 @@ public:
class ServerInfo_PlayerProperties : public SerializableItem_Map {
public:
- ServerInfo_PlayerProperties(int _playerId = -1, ServerInfo_User *_userInfo = 0, bool _spectator = false, bool _conceded = false, bool _readyStart = false, int _deckId = -1);
+ ServerInfo_PlayerProperties(int _playerId = -1, ServerInfo_User *_userInfo = 0, bool _spectator = false, bool _conceded = false, bool _readyStart = false, const QString &_deckHash = QString());
static SerializableItem *newItem() { return new ServerInfo_PlayerProperties; }
int getPlayerId() const { return static_cast(itemMap.value("player_id"))->getData(); }
ServerInfo_User *getUserInfo() const { return static_cast(itemMap.value("user")); }
bool getSpectator() const { return static_cast(itemMap.value("spectator"))->getData(); }
bool getConceded() const { return static_cast(itemMap.value("conceded"))->getData(); }
bool getReadyStart() const { return static_cast(itemMap.value("ready_start"))->getData(); }
- int getDeckId() const { return static_cast(itemMap.value("deck_id"))->getData(); }
+ QString getDeckHash() const { return static_cast(itemMap.value("deck_hash"))->getData(); }
};
class ServerInfo_Player : public SerializableItem_Map {
diff --git a/common/protocol_items.cpp b/common/protocol_items.cpp
index db7ffc1a2..0ea3e9b5d 100644
--- a/common/protocol_items.cpp
+++ b/common/protocol_items.cpp
@@ -461,10 +461,10 @@ Context_Concede::Context_Concede()
: GameEventContext("concede")
{
}
-Context_DeckSelect::Context_DeckSelect(int _deckId)
+Context_DeckSelect::Context_DeckSelect(const QString &_deckHash)
: GameEventContext("deck_select")
{
- insertItem(new SerializableItem_Int("deck_id", _deckId));
+ insertItem(new SerializableItem_String("deck_hash", _deckHash));
}
Context_UndoDraw::Context_UndoDraw()
: GameEventContext("undo_draw")
diff --git a/common/protocol_items.dat b/common/protocol_items.dat
index 716959329..588097be2 100644
--- a/common/protocol_items.dat
+++ b/common/protocol_items.dat
@@ -75,7 +75,7 @@
5:room_say:s,player_name:s,message
6:ready_start
6:concede
-6:deck_select:i,deck_id
+6:deck_select:s,deck_hash
6:undo_draw
6:move_card
6:mulligan:i,number
diff --git a/common/protocol_items.h b/common/protocol_items.h
index 48401ee3b..cf87d2fe8 100644
--- a/common/protocol_items.h
+++ b/common/protocol_items.h
@@ -697,8 +697,8 @@ public:
class Context_DeckSelect : public GameEventContext {
Q_OBJECT
public:
- Context_DeckSelect(int _deckId = -1);
- int getDeckId() const { return static_cast(itemMap.value("deck_id"))->getData(); };
+ Context_DeckSelect(const QString &_deckHash = QString());
+ QString getDeckHash() const { return static_cast(itemMap.value("deck_hash"))->getData(); };
static SerializableItem *newItem() { return new Context_DeckSelect; }
int getItemId() const { return ItemId_Context_DeckSelect; }
};
diff --git a/common/server_player.cpp b/common/server_player.cpp
index 094704afc..fe977bb62 100644
--- a/common/server_player.cpp
+++ b/common/server_player.cpp
@@ -11,7 +11,7 @@
#include
Server_Player::Server_Player(Server_Game *_game, int _playerId, ServerInfo_User *_userInfo, bool _spectator, Server_ProtocolHandler *_handler)
- : game(_game), handler(_handler), userInfo(new ServerInfo_User(_userInfo)), deck(0), playerId(_playerId), spectator(_spectator), nextCardId(0), readyStart(false), conceded(false), deckId(-2)
+ : game(_game), handler(_handler), userInfo(new ServerInfo_User(_userInfo)), deck(0), playerId(_playerId), spectator(_spectator), nextCardId(0), readyStart(false), conceded(false)
{
}
@@ -187,16 +187,15 @@ ServerInfo_PlayerProperties *Server_Player::getProperties()
{
QMutexLocker locker(&game->gameMutex);
- return new ServerInfo_PlayerProperties(playerId, new ServerInfo_User(userInfo), spectator, conceded, readyStart, deckId);
+ return new ServerInfo_PlayerProperties(playerId, new ServerInfo_User(userInfo), spectator, conceded, readyStart, deck ? deck->getDeckHash() : QString());
}
-void Server_Player::setDeck(DeckList *_deck, int _deckId)
+void Server_Player::setDeck(DeckList *_deck)
{
QMutexLocker locker(&game->gameMutex);
delete deck;
deck = _deck;
- deckId = _deckId;
}
void Server_Player::addZone(Server_CardZone *zone)
diff --git a/common/server_player.h b/common/server_player.h
index f83a1e8a5..64f99add2 100644
--- a/common/server_player.h
+++ b/common/server_player.h
@@ -39,7 +39,6 @@ private:
int nextCardId;
bool readyStart;
bool conceded;
- int deckId;
public:
Server_Player(Server_Game *_game, int _playerId, ServerInfo_User *_userInfo, bool _spectator, Server_ProtocolHandler *_handler);
~Server_Player();
@@ -57,9 +56,8 @@ public:
bool getSpectator() const { return spectator; }
bool getConceded() const { return conceded; }
void setConceded(bool _conceded) { conceded = _conceded; }
- int getDeckId() const { return deckId; }
ServerInfo_User *getUserInfo() const { return userInfo; }
- void setDeck(DeckList *_deck, int _deckId);
+ void setDeck(DeckList *_deck);
DeckList *getDeck() const { return deck; }
Server_Game *getGame() const { return game; }
const QMap &getZones() const { return zones; }
diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp
index 046478244..44d4a4a2a 100644
--- a/common/server_protocolhandler.cpp
+++ b/common/server_protocolhandler.cpp
@@ -595,9 +595,9 @@ ResponseCode Server_ProtocolHandler::cmdDeckSelect(Command_DeckSelect *cmd, Comm
return r;
}
}
- player->setDeck(deck, cmd->getDeckId());
+ player->setDeck(deck);
- game->sendGameEvent(new Event_PlayerPropertiesChanged(player->getPlayerId(), player->getProperties()), new Context_DeckSelect(cmd->getDeckId()));
+ game->sendGameEvent(new Event_PlayerPropertiesChanged(player->getPlayerId(), player->getProperties()), new Context_DeckSelect(deck->getDeckHash()));
cont->setResponse(new Response_DeckDownload(cont->getCmdId(), RespOk, new DeckList(deck)));
return RespNothing;