diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp
index bb68276e..d14f5dfc 100644
--- a/cockatrice/src/messagelogwidget.cpp
+++ b/cockatrice/src/messagelogwidget.cpp
@@ -132,10 +132,7 @@ void MessageLogWidget::logRollDie(Player *player, int sides, int roll)
void MessageLogWidget::logDrawCards(Player *player, int number)
{
- if (number == 1)
- append(tr("%1 draws a card.").arg(sanitizeHtml(player->getName())));
- else
- append(tr("%1 draws %2 cards.").arg(sanitizeHtml(player->getName())).arg(number));
+ append(tr("%1 draws %n card(s).", "", number).arg(sanitizeHtml(player->getName())));
}
void MessageLogWidget::logUndoDraw(Player *player, QString cardName)
@@ -290,14 +287,14 @@ void MessageLogWidget::logSetCardCounter(Player *player, QString cardName, int c
int delta = abs(oldValue - value);
if (value > oldValue)
- finalStr = tr("%1 places %n counter(s) (%2) on %3 (now %4).", "", delta);
+ finalStr = tr("%1 places %n %2 counter(s) on %3 (now %4).", "", delta);
else
- finalStr = tr("%1 removes %n counter(s) (%2) from %3 (now %4).", "", delta);
+ finalStr = tr("%1 removes %n %2 counter(s) from %3 (now %4).", "", delta);
switch (counterId) {
- case 0: colorStr = tr("red"); break;
- case 1: colorStr = tr("yellow"); break;
- case 2: colorStr = tr("green"); break;
+ case 0: colorStr = tr("red", "", delta); break;
+ case 1: colorStr = tr("yellow", "", delta); break;
+ case 2: colorStr = tr("green", "", delta); break;
default: ;
}
diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts
index 2a208e2a..059ccaaa 100644
--- a/cockatrice/translations/cockatrice_de.ts
+++ b/cockatrice/translations/cockatrice_de.ts
@@ -1901,8 +1901,8 @@ Lokale Version ist %1, Serverversion ist %2.
%1 zieht %2 Karten
-
-
+
+ a cardeine Karte
@@ -2051,187 +2051,209 @@ Lokale Version ist %1, Serverversion ist %2.
%1 würfelt eine %2 mit einem %3-seitigen Würfel.
- %1 draws a card.
- %1 zieht eine Karte.
+ %1 zieht eine Karte.
- %1 draws %2 cards.
- %1 zieht %2 Karten.
+ %1 zieht %2 Karten.
+
+
+
+ %1 draws %n card(s).
+
+ %1 zieht eine Karte.
+ %1 zieht %n Karten.
+
-
+ %1 undoes his 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).
-
+ 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
-
+ from the bottom of his library, die unterste Karte seiner Bibliothek,
-
+ the top card of his librarydie oberste Karte seiner Bibliothek
-
+ from the top of his library, die oberste Karte seiner 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%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 on bottom of his library.%1 legt %2%3 unter seine Bibliothek.
-
+ %1 puts %2%3 on top of his 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 moves %2%3 to sideboard.%1 legt %2%3 in sein Sideboard.
-
+ %1 plays %2%3.%1 spielt %2%3 aus.
-
+ %1 flips %2 face-down.%1 wendet %2 auf die Rückseite.
-
+ %1 flips %2 face-up.%1 wendet %2 auf die Vorderseite.
-
+ %1 destroys %2.%1 zerstört %2.
-
+ %1 attaches %2 to %3's %4.%1 legt %2 an %3s %4 an.
-
+ %1 unattaches %2.%1 löst %2 ab.
-
+ %1 creates token: %2%3.%1 erstellt Token: %2%3.
-
+ %1 points from %2's %3 to %4.%1 zeigt von %2s %3 auf %4.
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+
+ %1 legt eine %2 Marke auf %3 (jetzt %4).
+ %1 legt %n %2 Marken auf %3 (jetzt %4).
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
+
+ %1 entfernt eine %2 Marke von %3 (jetzt %4).
+ %1 entfernt %n %2 Marken von %3 (jetzt %4).
+
+
-
+ %1 randomly reveals %2%3 to %4.%1 zeigt %4 zufällig %2%3 vor.
-
+ %1 randomly reveals %2%3.%1 zeigt zufällig %2%3 offen vor.
-
+ %1 reveals %2%3 to %4.%1 zeigt %4 %2%3 vor.
-
+ %1 reveals %2%3.%1 zeigt %2%3 offen vor.
@@ -2240,58 +2262,65 @@ Lokale Version ist %1, Serverversion ist %2.
%1 erstellt einen Spielstein: %2 (%3).
-
+ %1 points from %2's %3 to %4's %5.%1 zeigt von %2s %3 auf %4s %5.
- %1 places %n counter(s) (%2) on %3 (now %4).
-
+ %1 legt eine Marke (%2) auf %3 (jetzt %4).%1 legt %n Marken (%2) auf %3 (jetzt %4).
- %1 removes %n counter(s) (%2) from %3 (now %4).
-
+ %1 entfernt eine Marke (%2) von %3 (jetzt %4).%1 entfernt %n Marken (%2) von %3 (jetzt %4).
-
-
+
+ red
- rot
+
+ rote
+ rote
+
-
-
+
+ yellow
- gelb
+
+ gelbe
+ gelbe
+
-
-
+
+ green
- grün
+
+ grüne
+ grüne
+
-
+ %1 sets counter %2 to %3 (%4%5).%1 setzt Zähler %2 auf %3 (%4%5).
-
+ %1 sets PT of %2 to %3.%1 setzt Kampfwerte von %2 auf %3.
-
+ %1 sets annotation of %2 to %3.%1 versieht %2 mit dem Hinweis %3.
-
+ %1 is looking at the top %2 cards %3.%1 sieht sich die obersten %2 Karten %3 an.
@@ -2388,7 +2417,7 @@ Lokale Version ist %1, Serverversion ist %2.
%1 entfernt %2 Zählmarken von %3 (jetzt %4).
-
+ %1 %2 %3.%1 %2 %3.
@@ -2401,22 +2430,22 @@ Lokale Version ist %1, Serverversion ist %2.
%1 sieht sich die obersten %2 Karten %3 an.
-
+ %1 is looking at %2.%1 sieht sich %2 an.
-
+ %1 stops looking at %2.%1 sieht sich %2 nicht mehr an.
-
+ %1 reveals %2 to %3.%1 zeigt %3 %2.
-
+ %1 reveals %2.%1 zeigt %2 offen vor.
@@ -2437,7 +2466,7 @@ Lokale Version ist %1, Serverversion ist %2.
%1 zeigt %2 aus %3 offen vor.
-
+ ending phasedie Zugendphase
@@ -2466,57 +2495,57 @@ Lokale Version ist %1, Serverversion ist %2.
%1 sieht sich %2s %3 nicht mehr an
-
+ It is now %1's turn.%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
@@ -2525,7 +2554,7 @@ Lokale Version ist %1, Serverversion ist %2.
das Ende-des-Zuges-Segment
-
+ It is now the %1.Es ist nun %1.
@@ -2534,12 +2563,12 @@ Lokale Version ist %1, Serverversion ist %2.
%1 bewegt %2 %3 nach %4
-
+ tapstappt
-
+ untapsenttappt
@@ -2564,7 +2593,7 @@ Lokale Version ist %1, Serverversion ist %2.
%1 entfernt %2 Zählmarken von %3 (jetzt %4)
-
+ his permanentsseine bleibenden Karten
@@ -2577,12 +2606,12 @@ Lokale Version ist %1, Serverversion ist %2.
%1 setzt Zähler "%2" auf %3 (%4%5)
-
+ %1 sets %2 to not untap normally.%1 setzt %2 auf explizites Enttappen.
-
+ %1 sets %2 to untap normally.%1 setzt %2 auf normales Enttappen.
diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts
index 1e4ed498..511e0130 100644
--- a/cockatrice/translations/cockatrice_en.ts
+++ b/cockatrice/translations/cockatrice_en.ts
@@ -1247,205 +1247,217 @@ Local version is %1, remote version is %2.
%1 rolls a %2 with a %3-sided die.
+
+
+ %1 draws %n card(s).
+
+ %1 draws a card.
+ %1 draws %n cards.
+
+
-
+ %1 undoes his last draw.
-
+ %1 undoes his last draw (%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
-
+ %1 gives %2 control over %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 on bottom of his library.
-
+ %1 puts %2%3 on top of his library.
-
+ %1 puts %2%3 into his library at position %4.
-
+ %1 moves %2%3 to sideboard.
-
+ %1 plays %2%3.
-
-
+
+ a card
-
+ %1 flips %2 face-down.
-
+ %1 flips %2 face-up.
-
+ %1 attaches %2 to %3's %4.
-
+ %1 unattaches %2.
-
+ %1 points from %2's %3 to %4's %5.
- %1 places %n counter(s) (%2) on %3 (now %4).
-
+ %1 places a counter (%2) on %3 (now %4).%1 places %n counters (%2) on %3 (now %4).
- %1 removes %n counter(s) (%2) from %3 (now %4).
-
+ %1 removes a counter (%2) from %3 (now %4).%1 removes %n counters (%2) from %3 (now %4).
-
-
+
+ red
-
+
+
+
-
-
+
+ yellow
-
+
+
+
-
-
+
+ green
-
+
+
+
-
+ %1 sets counter %2 to %3 (%4%5).
-
+ %1 sets PT of %2 to %3.
-
+ %1 sets annotation of %2 to %3.
-
+ %1 is looking at the top %2 cards %3.
@@ -1500,62 +1512,68 @@ Local version is %1, remote version is %2.
-
- %1 draws a card.
-
-
-
-
- %1 draws %2 cards.
-
-
-
-
+ %1 destroys %2.
-
+ %1 creates token: %2%3.
-
+ %1 points from %2's %3 to %4.
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+
+ %1 places a %2 counter on %3 (now %4).
+ %1 places %n %2 counters on %3 (now %4).
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
+
+ %1 removes a %2 counter from %3 (now %4).
+ %1 removes %n %2 counters from %3 (now %4).
+
+
-
+ %1 %2 %3.
-
+ %1 is looking at %2.
-
+ %1 stops looking at %2.
-
+ %1 reveals %2 to %3.
-
+ %1 reveals %2.
-
+ ending phase
-
+ It is now %1's turn.
@@ -1565,102 +1583,102 @@ Local version is %1, remote version is %2.
-
+ %1 randomly reveals %2%3 to %4.
-
+ %1 randomly reveals %2%3.
-
+ %1 reveals %2%3 to %4.
-
+ %1 reveals %2%3.
-
+ 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
-
+ It is now the %1.
-
+ taps
-
+ untaps
-
+ %1 sets %2 to not untap normally.
-
+ %1 sets %2 to untap normally.
-
+ his permanents
diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts
index 510f3605..ce0d5d7f 100644
--- a/cockatrice/translations/cockatrice_es.ts
+++ b/cockatrice/translations/cockatrice_es.ts
@@ -1462,205 +1462,220 @@ Local version is %1, remote version is %2.
%1 rolls a %2 with a %3-sided die.%1 sacó un %2 con un dado de %3 caras.
+
+
+ %1 draws %n card(s).
+
+
+
+
+
-
+ %1 undoes his last draw.
-
+ %1 undoes his last draw (%2).
-
+ from table de la mesa
-
+ from graveyard del cementerio
-
+ from exile del exilio
-
+ from hand de la mano
-
+ the bottom card of his libraryel fondo de la biblioteca
-
+ from the bottom of his library del fondo de la biblioteca
-
+ the top card of his libraryla parte superior de la biblioteca
-
+ from the top of his library de la parte superior de la 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%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 la 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 top of his 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 moves %2%3 to sideboard.%1 mueve %2%3 a la reserva.
-
+ %1 plays %2%3.%1 juega %2%3.
-
-
+
+ a carduna carta
-
+ %1 flips %2 face-down.%1 voltea %2 boca abajo.
-
+ %1 flips %2 face-up.%1 voltea %2 boca arriba.
-
+ %1 attaches %2 to %3's %4.%1 anexa %2 a el %4 de %3.
-
+ %1 unattaches %2.%1 desanexa %2.
-
+ %1 points from %2's %3 to %4's %5.%1 apunta desde el %3 de %2 al %5 de %4.
- %1 places %n counter(s) (%2) on %3 (now %4).
-
+ %1 pone un contador (%2) en %3 (ahora %4).%1 pone %n contadores (%2) en %3 (ahora %4).
- %1 removes %n counter(s) (%2) from %3 (now %4).
-
+ %1 remueve un contador (%2) de %3 (ahora %4).%1 remueve %n contadores (%2) de %3 (ahora %4).
-
-
+
+ red
- rojo
+
+ rojo
+
+
-
-
+
+ yellow
- amarillo
+
+ amarillo
+
+
-
-
+
+ green
- verde
+
+ verde
+
+
-
+ %1 sets counter %2 to %3 (%4%5).%1 establece los contadores de %2 a %3 (%4%5).
-
+ %1 sets PT of %2 to %3.%1 establece F/R de %2 a %3.
-
+ %1 sets annotation of %2 to %3.%1 establece la anotación de %2 a %3.
-
+ %1 is looking at the top %2 cards %3.%1 esta mirando las primeras %2 cartas de %3.
@@ -1715,62 +1730,76 @@ Local version is %1, remote version is %2.
%1 ha concedido la partida.
- %1 draws a card.
- %1 roba una carta.
+ %1 roba una carta.
- %1 draws %2 cards.
- %1 roba %2 cartas.
+ %1 roba %2 cartas.
-
+ %1 destroys %2.%1 destruye %2.
-
+ %1 creates token: %2%3.%1 crea una ficha: %2%3.
-
+ %1 points from %2's %3 to %4.%1 apunta desde el %3 de %2 a %4.
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+
+
+
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
+
+
+
+
+
-
+ %1 %2 %3.%1 %2 %3.
-
+ %1 is looking at %2.%1 está mirando: %2.
-
+ %1 stops looking at %2.%1 termina de mirar: %2.
-
+ %1 reveals %2 to %3.%1 revela %2 a %3.
-
+ %1 reveals %2.%1 revela %2.
-
+ ending phasefase de fin de turno
-
+ It is now %1's turn.Es el turno de %1.
@@ -1780,102 +1809,102 @@ Local version is %1, remote version is %2.
%1 baraja su biblioteca.
-
+ %1 randomly reveals %2%3 to %4.%1 revela aleatoriamente %2%3 a %4.
-
+ %1 randomly reveals %2%3.%1 revela aleatoriamente %2%3.
-
+ %1 reveals %2%3 to %4.%1 revela %2%3 a %4.
-
+ %1 reveals %2%3.%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.
-
+ tapsgira
-
+ untapsendereza
-
+ %1 sets %2 to not untap normally.%1 establece que %2 no se endereze normalmente.
-
+ %1 sets %2 to untap normally.%1 establece que %2 se endereze normalmente.
-
+ his permanentssus permanentes
diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts
index 94a73f4c..f96c48f9 100644
--- a/cockatrice/translations/cockatrice_fr.ts
+++ b/cockatrice/translations/cockatrice_fr.ts
@@ -1376,377 +1376,406 @@ Local version is %1, remote version is %2.
%1 lance un %2 avec %3 faces.
- %1 draws a card.
- %1 pioche une carte.
+ %1 pioche une carte.
- %1 draws %2 cards.
- %1 pioche %2 cartes.
+ %1 pioche %2 cartes.
-
+ from tablede la table
-
+ from graveyarddepuis le cimetière
-
+ from exiledepuis la zone d'éxil
-
+ from handdepuis la main
-
+ the bottom card of his libraryla carte du dessous de sa bibliothèque
-
+ from the bottom of his librarydepuis le dessous de sa bibliothèque
-
+ the top card of his libraryle carte du dessus de sa bibliothèque
-
+ from the top of his librarydu dessus de sa bibliothèque
-
+ from libraryde la bibliothèque
-
+ from sideboardde la réserve
-
+ from the stackde la pile
-
+ %1 puts %2 into play%3.what is %3? plz exemple%1 met %2 en jeu %3.
-
+ %1 puts %2%3 into graveyard.%1 met %2%3 dans le cimetière.
-
+ %1 exiles %2%3.%1 exile %2%3.
-
+ %1 moves %2%3 to hand.%1 déplace %2%3 dans sa main.
-
+ %1 puts %2%3 into his 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 top of his 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 %4.
-
+ %1 moves %2%3 to sideboard.%1 déplace %2%3 vers la réserve.
-
+ %1 plays %2%3.%1 joue %2%3.
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+
+
+
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
+
+
+
+
+
-
-
+
+ a cardune carte
+
+
+ %1 draws %n card(s).
+
+
+
+
+
-
+ %1 undoes his last draw.
-
+ %1 undoes his last draw (%2).
-
+ %1 gives %2 control over %3.%1 donne le contrôle de %2 à%3.
-
+ %1 flips %2 face-down.%1 retourne %2 face cachée.
-
+ %1 flips %2 face-up.%1 retourne %2 face visible.
-
+ %1 destroys %2.%1 détruit %2.
-
+ %1 attaches %2 to %3's %4.need exemple%1 attache %2 à %4 de %3.
-
+ %1 unattaches %2.%1 détache %2.
-
+ %1 creates token: %2%3.%1 crée un jeton %2%3.
-
+ %1 points from %2's %3 to %4.need exemple%1 désigne le %3 de %2 à %4.
-
+ %1 points from %2's %3 to %4's %5.need exemple%1 désigne %3 de %2 à %5 de %4.
- %1 places %n counter(s) (%2) on %3 (now %4).need exemple
-
+ %1 place %n compteur(s) (%2) sur %3 (maintenant %4).
- %1 removes %n counter(s) (%2) from %3 (now %4).need exemple
-
+ %1 retire %n compteur (%2) depuis %3 (maintenant %4).%1 retire %n compteurs (%2) depuis %3 (maintenant %4).
-
-
+
+ red
- rouge
+
+ rouge
+
+
-
-
+
+ yellow
- jaune
+
+ jaune
+
+
-
-
+
+ green
- vert
+
+ vert
+
+
-
+ his permanentsses permanents
-
+ %1 %2 %3.wtf ?%1 %2 %3.
-
+ tapsengage
-
+ untapsdégage
-
+ %1 sets counter %2 to %3 (%4%5).need exemple%1 met les compteurs %2 à %3 (%4%5).
-
+ %1 sets %2 to not untap normally.need exemple%1 met %2 pour ne pas se dégager normalement.
-
+ %1 sets %2 to untap normally.%1 met %2 pour ne se dégager normalement.
-
+ %1 sets PT of %2 to %3.exemple plz%1 met la F/E de %2 à %3.
-
+ %1 sets annotation of %2 to %3.%1 met l'annotation de %2 à %3.
-
+ %1 is looking at the top %2 cards %3.exemple plz%1 regarde les %2 cartes du dessus de%3.
-
+ %1 is looking at %2.exemple plz%1 regarde %2.
-
+ %1 stops looking at %2.need exemple to be sure%1 arrète de regarder à %2
-
+ %1 reveals %2 to %3.%1 révèle %2 à %3.
-
+ %1 reveals %2.%1 révèle %2.
-
+ %1 randomly reveals %2%3 to %4.%1 révèle aléatoirement %2%3 à %4.
-
+ %1 randomly reveals %2%3.%1 révèle aléatoirement %2%3.
-
+ %1 reveals %2%3 to %4.%1 révèle %2%3 à %4.
-
+ %1 reveals %2%3.%1 révèle %2%3
-
+ It is now %1's turn.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 attaquants
-
+ combat damage stepétape de répartition des blessures
-
+ end of combat stepétape de fin de combat
-
+ second main phaseseconde phase principale
-
+ ending phasephase de fin
-
+ It is now the %1.need exempleC'est maintenant %1.
diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts
index de7037e5..46266311 100644
--- a/cockatrice/translations/cockatrice_ja.ts
+++ b/cockatrice/translations/cockatrice_ja.ts
@@ -1294,203 +1294,214 @@ Local version is %1, remote version is %2.
%1 rolls a %2 with a %3-sided die.
+
+
+ %1 draws %n card(s).
+
+
+
+
-
+ %1 undoes his last draw.
-
+ %1 undoes his last draw (%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
-
+ %1 gives %2 control over %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 on bottom of his library.
-
+ %1 puts %2%3 on top of his library.
-
+ %1 puts %2%3 into his library at position %4.
-
+ %1 moves %2%3 to sideboard.
-
+ %1 plays %2%3.
-
-
+
+ a card
-
+ %1 flips %2 face-down.
-
+ %1 flips %2 face-up.
-
+ %1 attaches %2 to %3's %4.
-
+ %1 unattaches %2.
-
+ %1 points from %2's %3 to %4's %5.
- %1 places %n counter(s) (%2) on %3 (now %4).
-
+ %1 places a counter (%2) on %3 (now %4).
- %1 removes %n counter(s) (%2) from %3 (now %4).
-
+ %1 removes a counter (%2) from %3 (now %4).
-
-
+
+ red
-
+
+ 赤
+
-
-
+
+ yellow
-
+
+ 黄
+
-
-
+
+ green
-
+
+ 緑
+
-
+ %1 sets counter %2 to %3 (%4%5).
-
+ %1 sets PT of %2 to %3.
-
+ %1 sets annotation of %2 to %3.
-
+ %1 is looking at the top %2 cards %3.
@@ -1545,62 +1556,66 @@ Local version is %1, remote version is %2.
-
- %1 draws a card.
-
-
-
-
- %1 draws %2 cards.
-
-
-
-
+ %1 destroys %2.
-
+ %1 creates token: %2%3.
-
+ %1 points from %2's %3 to %4.
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+
+
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
+
+
+
+
-
+ %1 %2 %3.
-
+ %1 is looking at %2.
-
+ %1 stops looking at %2.
-
+ %1 reveals %2 to %3.
-
+ %1 reveals %2.
-
+ ending phase
-
+ It is now %1's turn.
@@ -1610,102 +1625,102 @@ Local version is %1, remote version is %2.
-
+ %1 randomly reveals %2%3 to %4.
-
+ %1 randomly reveals %2%3.
-
+ %1 reveals %2%3 to %4.
-
+ %1 reveals %2%3.
-
+ 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
-
+ It is now the %1.
-
+ taps
-
+ untaps
-
+ %1 sets %2 to not untap normally.
-
+ %1 sets %2 to untap normally.
-
+ his permanents
diff --git a/cockatrice/translations/cockatrice_pt-br.ts b/cockatrice/translations/cockatrice_pt-br.ts
index 01ceec6c..185e8bcf 100644
--- a/cockatrice/translations/cockatrice_pt-br.ts
+++ b/cockatrice/translations/cockatrice_pt-br.ts
@@ -1320,205 +1320,220 @@ Local version is %1, remote version is %2.
%1 rolls a %2 with a %3-sided die.%1 tirou um %2 com um dado de %3 lados.
+
+
+ %1 draws %n card(s).
+
+
+
+
+
-
+ %1 undoes his last draw.
-
+ %1 undoes his 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
-
+ from the bottom of his library vindo do fundo do seu grimório
-
+ the top card of his libraryo card do topo do seu grimório
-
+ from the top of his library vindo do topo do seu grimório
-
+ 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%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 on bottom of his library.%1 põe %2 no fundo do seu grimório%3.
-
+ %1 puts %2%3 on top of his library.%1 põe %2 no topo do seu grimório%3.
-
+ %1 puts %2%3 into his library at position %4.%1 põe %2 no seu grimório na posição %4%3.
-
+ %1 moves %2%3 to sideboard.%1 move %2 para o sideboard%3.
-
+ %1 plays %2%3.%1 põe %2 na pilha%3.
-
-
+
+ a cardum card
-
+ %1 flips %2 face-down.%1 vira %2 para baixo.
-
+ %1 flips %2 face-up.%1 vira %2 para cima.
-
+ %1 attaches %2 to %3's %4.%1 anexa %2 a %4 de %3.
-
+ %1 unattaches %2.%1 desanexa %2.
-
+ %1 points from %2's %3 to %4's %5.%1 aponta para %5 de %4 com %3 de %2.
- %1 places %n counter(s) (%2) on %3 (now %4).
-
+ %1 põe %n marcador(es) (%2) em %3 (agora com %4).%1 põe %n marcador(es) (%2) em %3 (agora com %4).
- %1 removes %n counter(s) (%2) from %3 (now %4).
-
+ %1 tira %n marcador(es) (%2) em %3 (agora com %4).%1 tira %n marcador(es) (%2) em %3 (agora com %4).
-
-
+
+ red
- vermelho
+
+ vermelho
+
+
-
-
+
+ yellow
- amarelo
+
+ amarelo
+
+
-
-
+
+ green
- verde
+
+ verde
+
+
-
+ %1 sets counter %2 to %3 (%4%5).%1 altera o marcador %2 para %3 (%4%5).
-
+ %1 sets PT of %2 to %3.%1 altera o P/R de %2 para %3.
-
+ %1 sets annotation of %2 to %3.%1 altera a nota de %2 para%3.
-
+ %1 is looking at the top %2 cards %3.%1 está olhando para os %2 cards do topo %3.
@@ -1573,62 +1588,76 @@ Local version is %1, remote version is %2.
%1 concedeu o jogo.
- %1 draws a card.
- %1 compra um card.
+ %1 compra um card.
- %1 draws %2 cards.
- %1 compra %2 cards.
+ %1 compra %2 cards.
-
+ %1 destroys %2.%1 destrói %2.
-
+ %1 creates token: %2%3.%1 cria a ficha: %2%3.
-
+ %1 points from %2's %3 to %4.%1 aponta para %4 com %3 de %2 .
+
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+
+
+
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
+
+
+
+
+
-
+ %1 %2 %3.%1 %2 %3.
-
+ %1 is looking at %2.%1 está olhando para %2.
-
+ %1 stops looking at %2.%1 para de olhar para %2.
-
+ %1 reveals %2 to %3.%1 revela %2 para %3.
-
+ %1 reveals %2.%1 revela %2.
-
+ ending phasefase final
-
+ It is now %1's turn.Agora é o turno de %1.
@@ -1638,102 +1667,102 @@ Local version is %1, remote version is %2.
%1 embaralha o seu grimório.
-
+ %1 randomly reveals %2%3 to %4.%1 revela aleatoriamente %2%3. para %4.
-
+ %1 randomly reveals %2%3.%1 revela aleatoriamente %2%3.
-
+ %1 reveals %2%3 to %4.%1 revela %2%3 para %4.
-
+ %1 reveals %2%3.%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.
-
+ tapsvira
-
+ untapsdesvira
-
+ %1 sets %2 to not untap normally.%1 define que %2 não desvira normalmente.
-
+ %1 sets %2 to untap normally.%1 define que %2 desvira normalmente.
-
+ his permanentsas suas permanentes
diff --git a/cockatrice/translations/cockatrice_pt.ts b/cockatrice/translations/cockatrice_pt.ts
index 8ee716c4..bae17145 100644
--- a/cockatrice/translations/cockatrice_pt.ts
+++ b/cockatrice/translations/cockatrice_pt.ts
@@ -1380,364 +1380,393 @@ Local version is %1, remote version is %2.
%1 obteve %2 com um dado de %3 faces.
- %1 draws a card.
- %1 compra uma carta.
+ %1 compra uma carta.
- %1 draws %2 cards.
- %1 compra %2 cartas.
+ %1 compra %2 cartas.
-
+ 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
-
+ from the bottom of his library do fundo do seu grimório
-
+ the top card of his librarya carta do topo do seu grimório
-
+ from the top of his 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%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 on bottom of his library.%1 coloca %2%3 no topo 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 into his 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 places %n %2 counter(s) on %3 (now %4).
+
+
+
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
+
+
+
+
+
-
-
+
+ a carduma carta
+
+
+ %1 draws %n card(s).
+
+
+
+
+
-
+ %1 undoes his last draw.
-
+ %1 undoes his last draw (%2).
-
+ %1 gives %2 control over %3.%1 dá controlo sobre %3 a %2.
-
+ %1 flips %2 face-down.%1 volta a face de %2 para baixo.
-
+ %1 flips %2 face-up.%1 volta a face de %2 para cima.
-
+ %1 destroys %2.%1 destroí %2.
-
+ %1 attaches %2 to %3's %4.%1 anexa %2 a %4 de %3.
-
+ %1 unattaches %2.%1 desanexa %2.
-
+ %1 creates token: %2%3.%1 cria ficha: %2%3.
-
+ %1 points from %2's %3 to %4.%1 aponta de %3 de %2 para %4.
-
+ %1 points from %2's %3 to %4's %5.%1 aponta de %3 de %2 para %5 de %4.
- %1 places %n counter(s) (%2) on %3 (now %4).
-
+ %1 coloca %n marcador (%2)de %3 (agora com %4).%1 coloca %n marcador (%2)de %3 (agora com %4).
- %1 removes %n counter(s) (%2) from %3 (now %4).
-
+ %1 remove %n marcador (%2)de %3 (agora com %4).%1 remove %n marcadores (%2)de %3 (agora com %4).
-
-
+
+ red
- vermelho
+
+ vermelho
+
+
-
-
+
+ yellow
- amarelo
+
+ amarelo
+
+
-
-
+
+ green
- verde
+
+ verde
+
+
-
+ his permanentsas suas permanentes
-
+ %1 %2 %3.%1 %2 %3.
-
+ tapsvira
-
+ untapsdesvira
-
+ %1 sets counter %2 to %3 (%4%5).%1 altera o número de marcadores %2 para %3(%4%5).
-
+ %1 sets %2 to not untap normally.%1 define %2 para não desvirar normalmente.
-
+ %1 sets %2 to untap normally.%1 define %2 para desvirar normalmente.
-
+ %1 sets PT of %2 to %3.%1 define o P/R de %2 como %3.
-
+ %1 sets annotation of %2 to %3.%1 coloca uma nota de %2 em%3.
-
+ %1 is looking at the top %2 cards %3.%1 está a olhar para as %2 cartas do topo %3.
-
+ %1 is looking at %2.%1 está a olhar para %2.
-
+ %1 stops looking at %2.%1 para de olhar para %2.
-
+ %1 reveals %2 to %3.%1 revela %2 a %3.
-
+ %1 reveals %2.%1 revela %2.
-
+ %1 randomly reveals %2%3 to %4.%1 revela aleatoreamente %2%3. a %4.
-
+ %1 randomly reveals %2%3.%1 revela aleatoreamente %2%3.
-
+ %1 reveals %2%3 to %4.%1 revela %2%3 a %4.
-
+ %1 reveals %2%3.%1 revela %2%3.
-
+ It is now %1's turn.É 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.
diff --git a/cockatrice/translations/cockatrice_ru.ts b/cockatrice/translations/cockatrice_ru.ts
index a47b354a..1263f0fb 100644
--- a/cockatrice/translations/cockatrice_ru.ts
+++ b/cockatrice/translations/cockatrice_ru.ts
@@ -1302,185 +1302,193 @@ Local version is %1, remote version is %2.
%1 rolls a %2 with a %3-sided die.
-
-
- %1 draws a card.
-
+
+
+ %1 draws %n card(s).
+
+
+
+
+
-
- %1 draws %2 cards.
-
-
-
-
+ %1 undoes his last draw.
-
+ %1 undoes his last draw (%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 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 on bottom of his library.
-
+ %1 puts %2%3 on top of his library.
-
+ %1 puts %2%3 into his library at position %4.
-
+ %1 moves %2%3 to sideboard.
-
+ %1 plays %2%3.
-
+ %1 flips %2 face-down.
-
+ %1 flips %2 face-up.
-
+ %1 destroys %2.
-
+ %1 attaches %2 to %3's %4.
-
+ %1 unattaches %2.
-
+ %1 creates token: %2%3.
-
+ %1 points from %2's %3 to %4.
-
+ %1 points from %2's %3 to %4's %5.
-
- %1 places %n counter(s) (%2) on %3 (now %4).
+
+ %1 places %n %2 counter(s) on %3 (now %4).
+
+
+
+
+
+
+
+
+ %1 removes %n %2 counter(s) from %3 (now %4).
@@ -1489,7 +1497,25 @@ Local version is %1, remote version is %2.
- %1 removes %n counter(s) (%2) from %3 (now %4).
+ red
+
+
+
+
+
+
+
+
+ yellow
+
+
+
+
+
+
+
+
+ green
@@ -1497,172 +1523,157 @@ Local version is %1, remote version is %2.
-
- red
-
-
-
-
- yellow
-
-
-
-
- green
-
-
-
-
+ his permanents
-
+ %1 %2 %3.
-
+ taps
-
+ untaps
-
+ %1 sets counter %2 to %3 (%4%5).
-
+ %1 sets %2 to not untap normally.
-
+ %1 sets %2 to untap normally.
-
+ %1 sets PT of %2 to %3.
-
+ %1 sets annotation of %2 to %3.
-
+ %1 is looking at the top %2 cards %3.
-
+ %1 is looking at %2.
-
+ %1 stops looking at %2.
-
+ %1 reveals %2 to %3.
-
+ %1 reveals %2.
-
+ %1 randomly reveals %2%3 to %4.
-
+ %1 randomly reveals %2%3.
-
+ %1 reveals %2%3 to %4.
-
+ %1 reveals %2%3.
-
+ It is now %1's turn.
-
+ 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.