diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp
index 492e76ce..e9b2b6dc 100644
--- a/cockatrice/src/messagelogwidget.cpp
+++ b/cockatrice/src/messagelogwidget.cpp
@@ -96,27 +96,58 @@ void MessageLogWidget::logDraw(Player *player, int number)
void MessageLogWidget::logMoveCard(Player *player, QString cardName, QString startZone, QString targetZone)
{
- append(tr("%1 moves %2 from %3 to %4").arg(sanitizeHtml(player->getName())).arg(cardName).arg(startZone).arg(targetZone));
+ if ((startZone == "table") && (targetZone == "table"))
+ return;
+ QString fromStr;
+ if (startZone == "table")
+ fromStr = tr("from table");
+ else if (startZone == "grave")
+ fromStr = tr("from graveyard");
+ else if (startZone == "rfg")
+ fromStr = tr("from exile");
+ else if (startZone == "hand")
+ fromStr = tr("from hand");
+ else if (startZone == "deck")
+ fromStr = tr("from library");
+
+ QString finalStr;
+ if (targetZone == "table")
+ finalStr = tr("%1 puts %2 into play %3");
+ else {
+ if (targetZone == "grave")
+ finalStr = tr("%1 puts %2 %3 into graveyard");
+ else if (targetZone == "rfg")
+ finalStr = tr("%1 exiles %2 %3");
+ else if (targetZone == "hand")
+ finalStr = tr("%1 moves %2 %3 to hand");
+ else if (targetZone == "deck")
+ finalStr = tr("%1 puts %2 %3 on top of his library");
+ else
+ finalStr = tr("%1 moves %2 %3 to %4");
+ }
+ append(finalStr.arg(sanitizeHtml(player->getName())).arg(QString("%1").arg(sanitizeHtml(cardName))).arg(fromStr).arg(targetZone));
}
void MessageLogWidget::logCreateToken(Player *player, QString cardName)
{
- append(tr("%1 creates token: %2").arg(sanitizeHtml(player->getName())).arg(cardName));
+ append(tr("%1 creates token: %2").arg(sanitizeHtml(player->getName())).arg(QString("%1").arg(sanitizeHtml(cardName))));
}
void MessageLogWidget::logSetCardCounters(Player *player, QString cardName, int value, int oldValue)
{
+ QString finalStr;
if (value > oldValue)
- append(tr("%1 places %2 counters on %3 (now %4)").arg(sanitizeHtml(player->getName())).arg(value - oldValue).arg(cardName).arg(value));
+ finalStr = tr("%1 places %2 counters on %3 (now %4)");
else
- append(tr("%1 removes %2 counters from %3 (now %4)").arg(sanitizeHtml(player->getName())).arg(oldValue - value).arg(cardName).arg(value));
+ finalStr = tr("%1 removes %2 counters from %3 (now %4)");
+ append(finalStr.arg(sanitizeHtml(player->getName())).arg(oldValue - value).arg(QString("%1").arg(sanitizeHtml(cardName))).arg(value));
}
void MessageLogWidget::logSetTapped(Player *player, QString cardName, bool tapped)
{
if (cardName == "-1")
cardName = tr("his permanents");
- append(tr("%1 %2 %3").arg(sanitizeHtml(player->getName())).arg(tapped ? "taps" : "untaps").arg(cardName));
+ append(tr("%1 %2 %3").arg(sanitizeHtml(player->getName())).arg(tapped ? tr("taps") : tr("untaps")).arg(QString("%1").arg(sanitizeHtml(cardName))));
}
void MessageLogWidget::logSetCounter(Player *player, QString counterName, int value, int oldValue)
@@ -126,10 +157,12 @@ void MessageLogWidget::logSetCounter(Player *player, QString counterName, int va
void MessageLogWidget::logSetDoesntUntap(Player *player, QString cardName, bool doesntUntap)
{
+ QString finalStr;
if (doesntUntap)
- append(tr("%1 sets %2 to not untap normally.").arg(sanitizeHtml(player->getName())).arg(cardName));
+ finalStr = tr("%1 sets %2 to not untap normally.");
else
- append(tr("%1 sets %2 to untap normally.").arg(sanitizeHtml(player->getName())).arg(cardName));
+ finalStr = tr("%1 sets %2 to untap normally.");
+ append(finalStr.arg(sanitizeHtml(player->getName())).arg(QString("%1").arg(sanitizeHtml(cardName))));
}
void MessageLogWidget::logDumpZone(Player *player, QString zoneName, QString zoneOwner, int numberCards)
diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts
index 8e1c299a..1869a15e 100644
--- a/cockatrice/translations/cockatrice_de.ts
+++ b/cockatrice/translations/cockatrice_de.ts
@@ -1,6 +1,29 @@
+
+
+
+ %1 sets counter "%2" to %3 (%4%5)
+ %1 setzt Zählmarke "%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.
+
+
+ %1 is looking at the top %2 cards of %3's %4
+ %1 sieht sich die obersten %2 Karten von %3's %4
+
+
+ %1 is looking at %2's %3
+ %1 sieht sich %2's %3 an
+
+
CardDatabaseModel
@@ -423,48 +446,48 @@
F10
-
+
Set life
Setze Leben
-
+
New life total:
Neues Leben insgesammt:
-
+
Roll dice
Würfeln
-
+
Number of sides:
Anzahl der Seiten:
-
+
Draw cards
Karten ziehen
-
-
+
+
Number:
Anzahl:
-
+
Create token
Token erstellen
-
+
Name:
Name:
-
+
Set counters
Setze Zählmarke
@@ -683,124 +706,192 @@
MessageLogWidget
-
+
Connecting to %1...
Verbinde zu %1...
-
+
Connected.
Verbunden.
-
+
Disconnected from server.
Verbindung zum Server trennen.
-
+
Invalid password.
Ungültiges Passwort.
-
+
You have joined the game. Player list:
- Du bist dem Spiel beigetreten. Spieler Liste:
+ Du bist dem Spiel beigetreten. Spielerliste:
-
+
%1 has joined the game
%1 ist dem Spiel beigetreten
-
+
%1 has left the game
%1 hat das Spiel verlassen
-
+
%1 is ready to start a new game.
%1 ist bereit ein neues Spiel zu starten.
-
+
Game has started.
- Spiel hat gestartet.
+ Spiel hat begonnen.
-
+
%1 shuffles his/her library
%1 mischt seine/ihre Bibliothek
-
+
%1 rolled a %2 with a %3-sided dice
%1 würfelte eine %2 mit einem %3-seitigen Würfel
-
+
%1 draws a card
%1 zieht eine Karte
-
+
%1 draws %2 cards
%1 zieht %2 Karten
-
- %1 moves %2 from %3 to %4
- %1 bewegt %2 von %3 nach %4
+
+ from table
+ vom Spielfeld
-
+
+ from graveyard
+ aus dem Friedhof
+
+
+
+ from exile
+ aus dem Exil
+
+
+
+ from hand
+ von der Hand
+
+
+
+ from library
+ von der Bibliothek
+
+
+
+ %1 puts %2 into play %3
+ %1 bringt %2 %3 ins Spiel
+
+
+
+ %1 puts %2 %3 into graveyard
+ %1 legt %2 %3 in 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 on top of his library
+ %1 legt %2 %3 auf die Bibliothek
+
+
+
+ %1 moves %2 %3 to %4
+ %1 bewegt %2 %3 nach %4
+
+
+
+ taps
+ tappt
+
+
+
+ untaps
+ enttappt
+
+
+ %1 creates token: <font color="blue">%2</font>
+ %1 erstellt Token: %2
+
+
+ %1 moves %2 from %3 to %4
+ %1 bewegt %2 von %3 nach %4
+
+
+
%1 creates token: %2
%1 erstellt Token: %2
-
+
%1 places %2 counters on %3 (now %4)
- %1 setzt %2 Zählmarken auf %3 (jetzt %4)
+ %1 legt %2 Zählmarken auf %3 (jetzt %4)
-
+
%1 removes %2 counters from %3 (now %4)
%1 entfernt %2 Zählmarken von %3 (jetzt %4)
-
+
his permanents
- seine/ihre bleibenden Karten
+ seine bleibenden Karten
-
+
%1 %2 %3
%1 %2 %3
-
+
%1 sets counter "%2" to %3 (%4%5)
- %1 setzt Zählmarke "%2" auf %3% (%4%5)
+ %1 setzt Zähler "%2" auf %3 (%4%5)
-
+
%1 sets %2 to not untap normally.
- %1 setzt %2 auf explizites enttappen.
+ %1 setzt %2 auf explizites Enttappen.
-
+
%1 sets %2 to untap normally.
- %1 setzt %2 auf normales enttappen.
+ %1 setzt %2 auf normales Enttappen.
-
+
%1 is looking at the top %2 cards of %3's %4
- %1 sieht sich die obersten %2 Karten von %3's %4
+ %1 sieht sich die obersten %2 Karten von %3s %4 an
-
+
%1 is looking at %2's %3
- %1 sieht sich %2's %3 an
+ %1 sieht sich %2s %3 an
diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts
index c0224e86..78f1ed1b 100644
--- a/cockatrice/translations/cockatrice_en.ts
+++ b/cockatrice/translations/cockatrice_en.ts
@@ -379,48 +379,48 @@
-
+
Set life
-
+
New life total:
-
+
Roll dice
-
+
Number of sides:
-
+
Draw cards
-
-
+
+
Number:
-
+
Create token
-
+
Name:
-
+
Set counters
@@ -639,125 +639,185 @@
MessageLogWidget
-
+
Connecting to %1...
-
+
Connected.
-
+
Disconnected from server.
-
+
Invalid password.
-
+
You have joined the game. Player list:
-
+
%1 has joined the game
-
+
%1 has left the game
-
+
%1 is ready to start a new game.
-
+
Game has started.
-
+
%1 shuffles his/her library
-
+
%1 rolled a %2 with a %3-sided dice
-
+
%1 draws a card
-
+
%1 draws %2 cards
-
- %1 moves %2 from %3 to %4
+
+ from table
-
- %1 creates token: %2
+
+ from graveyard
-
- %1 places %2 counters on %3 (now %4)
+
+ from exile
-
- %1 removes %2 counters from %3 (now %4)
-
-
-
-
- his permanents
+
+ from hand
- %1 %2 %3
+ from library
-
- %1 sets counter "%2" to %3 (%4%5)
+
+ %1 puts %2 into play %3
+
+
+
+
+ %1 puts %2 %3 into graveyard
+
+
+
+
+ %1 exiles %2 %3
- %1 sets %2 to not untap normally.
+ %1 moves %2 %3 to hand
+ %1 puts %2 %3 on top of his library
+
+
+
+
+ %1 moves %2 %3 to %4
+
+
+
+
+ %1 creates token: %2
+
+
+
+
+ %1 places %2 counters on %3 (now %4)
+
+
+
+
+ %1 removes %2 counters from %3 (now %4)
+
+
+
+
+ %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 is looking at the top %2 cards of %3's %4
-
+
%1 is looking at %2's %3
+
+
+ his permanents
+
+
MessagesSettingsPage