Commit abc5c024 authored by Max-Wilhelm Bruker's avatar Max-Wilhelm Bruker
Browse files

translation improvement

parent 4246ab69
...@@ -132,10 +132,7 @@ void MessageLogWidget::logRollDie(Player *player, int sides, int roll) ...@@ -132,10 +132,7 @@ void MessageLogWidget::logRollDie(Player *player, int sides, int roll)
void MessageLogWidget::logDrawCards(Player *player, int number) void MessageLogWidget::logDrawCards(Player *player, int number)
{ {
if (number == 1) append(tr("%1 draws %n card(s).", "", number).arg(sanitizeHtml(player->getName())));
append(tr("%1 draws a card.").arg(sanitizeHtml(player->getName())));
else
append(tr("%1 draws %2 cards.").arg(sanitizeHtml(player->getName())).arg(number));
} }
void MessageLogWidget::logUndoDraw(Player *player, QString cardName) void MessageLogWidget::logUndoDraw(Player *player, QString cardName)
...@@ -290,14 +287,14 @@ void MessageLogWidget::logSetCardCounter(Player *player, QString cardName, int c ...@@ -290,14 +287,14 @@ void MessageLogWidget::logSetCardCounter(Player *player, QString cardName, int c
int delta = abs(oldValue - value); int delta = abs(oldValue - value);
if (value > oldValue) 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 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) { switch (counterId) {
case 0: colorStr = tr("red"); break; case 0: colorStr = tr("red", "", delta); break;
case 1: colorStr = tr("yellow"); break; case 1: colorStr = tr("yellow", "", delta); break;
case 2: colorStr = tr("green"); break; case 2: colorStr = tr("green", "", delta); break;
default: ; default: ;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -1294,203 +1294,214 @@ Local version is %1, remote version is %2.</source> ...@@ -1294,203 +1294,214 @@ Local version is %1, remote version is %2.</source>
<source>%1 rolls a %2 with a %3-sided die.</source> <source>%1 rolls a %2 with a %3-sided die.</source>
<translation></translation> <translation></translation>
</message> </message>
<message numerus="yes">
<location filename="../src/messagelogwidget.cpp" line="135"/>
<source>%1 draws %n card(s).</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="144"/> <location filename="../src/messagelogwidget.cpp" line="141"/>
<source>%1 undoes his last draw.</source> <source>%1 undoes his last draw.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="146"/> <location filename="../src/messagelogwidget.cpp" line="143"/>
<source>%1 undoes his last draw (%2).</source> <source>%1 undoes his last draw (%2).</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="156"/> <location filename="../src/messagelogwidget.cpp" line="153"/>
<source> from table</source> <source> from table</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="158"/> <location filename="../src/messagelogwidget.cpp" line="155"/>
<source> from graveyard</source> <source> from graveyard</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="160"/> <location filename="../src/messagelogwidget.cpp" line="157"/>
<source> from exile</source> <source> from exile</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="162"/> <location filename="../src/messagelogwidget.cpp" line="159"/>
<source> from hand</source> <source> from hand</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="166"/> <location filename="../src/messagelogwidget.cpp" line="163"/>
<source>the bottom card of his library</source> <source>the bottom card of his library</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="169"/> <location filename="../src/messagelogwidget.cpp" line="166"/>
<source> from the bottom of his library</source> <source> from the bottom of his library</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="172"/> <location filename="../src/messagelogwidget.cpp" line="169"/>
<source>the top card of his library</source> <source>the top card of his library</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="175"/> <location filename="../src/messagelogwidget.cpp" line="172"/>
<source> from the top of his library</source> <source> from the top of his library</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="177"/> <location filename="../src/messagelogwidget.cpp" line="174"/>
<source> from library</source> <source> from library</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="179"/> <location filename="../src/messagelogwidget.cpp" line="176"/>
<source> from sideboard</source> <source> from sideboard</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="181"/> <location filename="../src/messagelogwidget.cpp" line="178"/>
<source> from the stack</source> <source> from the stack</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="210"/> <location filename="../src/messagelogwidget.cpp" line="207"/>
<source>%1 gives %2 control over %3.</source> <source>%1 gives %2 control over %3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="216"/> <location filename="../src/messagelogwidget.cpp" line="213"/>
<source>%1 puts %2 into play%3.</source> <source>%1 puts %2 into play%3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="218"/> <location filename="../src/messagelogwidget.cpp" line="215"/>
<source>%1 puts %2%3 into graveyard.</source> <source>%1 puts %2%3 into graveyard.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="220"/> <location filename="../src/messagelogwidget.cpp" line="217"/>
<source>%1 exiles %2%3.</source> <source>%1 exiles %2%3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="222"/> <location filename="../src/messagelogwidget.cpp" line="219"/>
<source>%1 moves %2%3 to hand.</source> <source>%1 moves %2%3 to hand.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="225"/> <location filename="../src/messagelogwidget.cpp" line="222"/>
<source>%1 puts %2%3 into his library.</source> <source>%1 puts %2%3 into his library.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="227"/> <location filename="../src/messagelogwidget.cpp" line="224"/>
<source>%1 puts %2%3 on bottom of his library.</source> <source>%1 puts %2%3 on bottom of his library.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="229"/> <location filename="../src/messagelogwidget.cpp" line="226"/>
<source>%1 puts %2%3 on top of his library.</source> <source>%1 puts %2%3 on top of his library.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="231"/> <location filename="../src/messagelogwidget.cpp" line="228"/>
<source>%1 puts %2%3 into his library at position %4.</source> <source>%1 puts %2%3 into his library at position %4.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="233"/> <location filename="../src/messagelogwidget.cpp" line="230"/>
<source>%1 moves %2%3 to sideboard.</source> <source>%1 moves %2%3 to sideboard.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="235"/> <location filename="../src/messagelogwidget.cpp" line="232"/>
<source>%1 plays %2%3.</source> <source>%1 plays %2%3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="205"/> <location filename="../src/messagelogwidget.cpp" line="202"/>
<location filename="../src/messagelogwidget.cpp" line="370"/> <location filename="../src/messagelogwidget.cpp" line="367"/>
<source>a card</source> <source>a card</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="243"/> <location filename="../src/messagelogwidget.cpp" line="240"/>
<source>%1 flips %2 face-down.</source> <source>%1 flips %2 face-down.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="245"/> <location filename="../src/messagelogwidget.cpp" line="242"/>
<source>%1 flips %2 face-up.</source> <source>%1 flips %2 face-up.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="255"/> <location filename="../src/messagelogwidget.cpp" line="252"/>
<source>%1 attaches %2 to %3&apos;s %4.</source> <source>%1 attaches %2 to %3&apos;s %4.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="260"/> <location filename="../src/messagelogwidget.cpp" line="257"/>
<source>%1 unattaches %2.</source> <source>%1 unattaches %2.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="278"/> <location filename="../src/messagelogwidget.cpp" line="275"/>
<source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source> <source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source>
<translation></translation> <translation></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/messagelogwidget.cpp" line="293"/>
<source>%1 places %n counter(s) (%2) on %3 (now %4).</source> <source>%1 places %n counter(s) (%2) on %3 (now %4).</source>
<translation> <translation type="obsolete">
<numerusform>%1 places a counter (%2) on %3 (now %4).</numerusform> <numerusform>%1 places a counter (%2) on %3 (now %4).</numerusform>
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/messagelogwidget.cpp" line="295"/>
<source>%1 removes %n counter(s) (%2) from %3 (now %4).</source> <source>%1 removes %n counter(s) (%2) from %3 (now %4).</source>
<translation> <translation type="obsolete">
<numerusform>%1 removes a counter (%2) from %3 (now %4).</numerusform> <numerusform>%1 removes a counter (%2) from %3 (now %4).</numerusform>
</translation> </translation>
</message> </message>
<message> <message numerus="yes">
<location filename="../src/messagelogwidget.cpp" line="298"/> <location filename="../src/messagelogwidget.cpp" line="295"/>
<source>red</source> <source>red</source>
<translation></translation> <translation type="unfinished">
<numerusform></numerusform>
</translation>
</message> </message>
<message> <message numerus="yes">
<location filename="../src/messagelogwidget.cpp" line="299"/> <location filename="../src/messagelogwidget.cpp" line="296"/>
<source>yellow</source> <source>yellow</source>
<translation></translation> <translation type="unfinished">
<numerusform></numerusform>
</translation>
</message> </message>
<message> <message numerus="yes">
<location filename="../src/messagelogwidget.cpp" line="300"/> <location filename="../src/messagelogwidget.cpp" line="297"/>
<source>green</source> <source>green</source>
<translation></translation> <translation type="unfinished">
<numerusform></numerusform>
</translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="319"/> <location filename="../src/messagelogwidget.cpp" line="316"/>
<source>%1 sets counter %2 to %3 (%4%5).</source> <source>%1 sets counter %2 to %3 (%4%5).</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="334"/> <location filename="../src/messagelogwidget.cpp" line="331"/>
<source>%1 sets PT of %2 to %3.</source> <source>%1 sets PT of %2 to %3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="339"/> <location filename="../src/messagelogwidget.cpp" line="336"/>
<source>%1 sets annotation of %2 to %3.</source> <source>%1 sets annotation of %2 to %3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="345"/> <location filename="../src/messagelogwidget.cpp" line="342"/>
<source>%1 is looking at the top %2 cards %3.</source> <source>%1 is looking at the top %2 cards %3.</source>
<translation></translation> <translation></translation>
</message> </message>
...@@ -1545,62 +1556,66 @@ Local version is %1, remote version is %2.</source> ...@@ -1545,62 +1556,66 @@ Local version is %1, remote version is %2.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="136"/> <location filename="../src/messagelogwidget.cpp" line="247"/>
<source>%1 draws a card.</source>
<translation></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="138"/>
<source>%1 draws %2 cards.</source>
<translation></translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="250"/>
<source>%1 destroys %2.</source> <source>%1 destroys %2.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="265"/> <location filename="../src/messagelogwidget.cpp" line="262"/>
<source>%1 creates token: %2%3.</source> <source>%1 creates token: %2%3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="271"/> <location filename="../src/messagelogwidget.cpp" line="268"/>
<source>%1 points from %2&apos;s %3 to %4.</source> <source>%1 points from %2&apos;s %3 to %4.</source>
<translation></translation> <translation></translation>
</message> </message>
<message numerus="yes">
<location filename="../src/messagelogwidget.cpp" line="290"/>
<source>%1 places %n %2 counter(s) on %3 (now %4).</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../src/messagelogwidget.cpp" line="292"/>
<source>%1 removes %n %2 counter(s) from %3 (now %4).</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="314"/> <location filename="../src/messagelogwidget.cpp" line="311"/>
<source>%1 %2 %3.</source> <source>%1 %2 %3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="347"/> <location filename="../src/messagelogwidget.cpp" line="344"/>
<source>%1 is looking at %2.</source> <source>%1 is looking at %2.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="353"/> <location filename="../src/messagelogwidget.cpp" line="350"/>
<source>%1 stops looking at %2.</source> <source>%1 stops looking at %2.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="376"/> <location filename="../src/messagelogwidget.cpp" line="373"/>
<source>%1 reveals %2 to %3.</source> <source>%1 reveals %2 to %3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="378"/> <location filename="../src/messagelogwidget.cpp" line="375"/>
<source>%1 reveals %2.</source> <source>%1 reveals %2.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="413"/> <location filename="../src/messagelogwidget.cpp" line="410"/>
<source>ending phase</source> <source>ending phase</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="395"/> <location filename="../src/messagelogwidget.cpp" line="392"/>
<source>It is now %1&apos;s turn.</source> <source>It is now %1&apos;s turn.</source>
<translation></translation> <translation></translation>
</message> </message>
...@@ -1610,102 +1625,102 @@ Local version is %1, remote version is %2.</source> ...@@ -1610,102 +1625,102 @@ Local version is %1, remote version is %2.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="381"/> <location filename="../src/messagelogwidget.cpp" line="378"/>
<source>%1 randomly reveals %2%3 to %4.</source> <source>%1 randomly reveals %2%3 to %4.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="383"/> <location filename="../src/messagelogwidget.cpp" line="380"/>
<source>%1 randomly reveals %2%3.</source> <source>%1 randomly reveals %2%3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="386"/> <location filename="../src/messagelogwidget.cpp" line="383"/>
<source>%1 reveals %2%3 to %4.</source> <source>%1 reveals %2%3 to %4.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="388"/> <location filename="../src/messagelogwidget.cpp" line="385"/>
<source>%1 reveals %2%3.</source> <source>%1 reveals %2%3.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="403"/> <location filename="../src/messagelogwidget.cpp" line="400"/>
<source>untap step</source> <source>untap step</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="404"/> <location filename="../src/messagelogwidget.cpp" line="401"/>
<source>upkeep step</source> <source>upkeep step</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="405"/> <location filename="../src/messagelogwidget.cpp" line="402"/>
<source>draw step</source> <source>draw step</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="406"/> <location filename="../src/messagelogwidget.cpp" line="403"/>
<source>first main phase</source> <source>first main phase</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="407"/> <location filename="../src/messagelogwidget.cpp" line="404"/>
<source>beginning of combat step</source> <source>beginning of combat step</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="408"/> <location filename="../src/messagelogwidget.cpp" line="405"/>
<source>declare attackers step</source> <source>declare attackers step</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="409"/> <location filename="../src/messagelogwidget.cpp" line="406"/>
<source>declare blockers step</source> <source>declare blockers step</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="410"/> <location filename="../src/messagelogwidget.cpp" line="407"/>
<source>combat damage step</source> <source>combat damage step</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="411"/> <location filename="../src/messagelogwidget.cpp" line="408"/>
<source>end of combat step</source> <source>end of combat step</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="412"/> <location filename="../src/messagelogwidget.cpp" line="409"/>
<source>second main phase</source> <source>second main phase</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="415"/> <location filename="../src/messagelogwidget.cpp" line="412"/>
<source>It is now the %1.</source> <source>It is now the %1.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="314"/> <location filename="../src/messagelogwidget.cpp" line="311"/>
<source>taps</source> <source>taps</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="314"/> <location filename="../src/messagelogwidget.cpp" line="311"/>
<source>untaps</source> <source>untaps</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="326"/> <location filename="../src/messagelogwidget.cpp" line="323"/>
<source>%1 sets %2 to not untap normally.</source> <source>%1 sets %2 to not untap normally.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="328"/> <location filename="../src/messagelogwidget.cpp" line="325"/>
<source>%1 sets %2 to untap normally.</source> <source>%1 sets %2 to untap normally.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/messagelogwidget.cpp" line="311"/> <location filename="../src/messagelogwidget.cpp" line="308"/>
<source>his permanents</source> <source>his permanents</source>
<translation></translation> <translation></translation>
</message> </message>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment