aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chat view performance regression fixed; minor user list fix; added russian translation stub

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-01-27 16:24:55 +01:00
parent 7200b5be0e
commit c203d51f43
15 changed files with 3175 additions and 414 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/cockatrice.pro
View file

@ -174,7 +174,8 @@ TRANSLATIONS += \
translations/cockatrice_pt.ts \
translations/cockatrice_pt-br.ts \
translations/cockatrice_fr.ts \
translations/cockatrice_ja.ts
translations/cockatrice_ja.ts \
translations/cockatrice_ru.ts
win32 {
RC_FILE = cockatrice.rc
}

16
cockatrice/cockatrice.qrc
View file

@ -24,13 +24,6 @@
<file>resources/icon_search.svg</file>
<file>resources/icon_clearsearch.svg</file>
<file>resources/hr.jpg</file>
<file>translations/cockatrice_de.qm</file>
<file>translations/cockatrice_en.qm</file>
<file>translations/cockatrice_es.qm</file>
<file>translations/cockatrice_pt.qm</file>
<file>translations/cockatrice_pt-br.qm</file>
<file>translations/cockatrice_fr.qm</file>
<file>translations/cockatrice_ja.qm</file>
<file>resources/appicon.svg</file>
<file>resources/add_to_sideboard.svg</file>
<file>resources/decrement.svg</file>
@ -44,6 +37,15 @@
<file>resources/icon_player.svg</file>
<file>resources/icon_spectator.svg</file>
<file>translations/cockatrice_de.qm</file>
<file>translations/cockatrice_en.qm</file>
<file>translations/cockatrice_es.qm</file>
<file>translations/cockatrice_pt.qm</file>
<file>translations/cockatrice_pt-br.qm</file>
<file>translations/cockatrice_fr.qm</file>
<file>translations/cockatrice_ja.qm</file>
<file>translations/cockatrice_ru.qm</file>
<file>resources/countries/at.svg</file>
<file>resources/countries/au.svg</file>
<file>resources/countries/be.svg</file>

34
cockatrice/src/chatview.cpp
View file

@ -8,35 +8,37 @@ ChatView::ChatView(const QString &_ownName, QWidget *parent)
: QTextEdit(parent), ownName(_ownName)
{
setTextInteractionFlags(Qt::TextSelectableByMouse);
QTextTableFormat format;
format.setBorderStyle(QTextFrameFormat::BorderStyle_None);
table = textCursor().insertTable(1, 3, format);
}
void ChatView::appendMessage(const QString &sender, const QString &message)
{
QTextCursor cellCursor = table->cellAt(table->rows() - 1, 0).lastCursorPosition();
cellCursor.insertText(QDateTime::currentDateTime().toString("[hh:mm]"));
QTextTableCell senderCell = table->cellAt(table->rows() - 1, 1);
QTextCursor cursor(document()->lastBlock());
cursor.movePosition(QTextCursor::End);
QTextBlockFormat blockFormat;
blockFormat.setBottomMargin(3);
cursor.insertBlock(blockFormat);
QTextCharFormat timeFormat;
timeFormat.setForeground(Qt::black);
cursor.setCharFormat(timeFormat);
cursor.insertText(QDateTime::currentDateTime().toString("[hh:mm] "));
QTextCharFormat senderFormat;
if (sender == ownName) {
senderFormat.setFontWeight(QFont::Bold);
senderFormat.setForeground(Qt::red);
} else
senderFormat.setForeground(Qt::blue);
senderCell.setFormat(senderFormat);
cellCursor = senderCell.lastCursorPosition();
cellCursor.insertText(sender);
QTextTableCell messageCell = table->cellAt(table->rows() - 1, 2);
cursor.setCharFormat(senderFormat);
cursor.insertText(sender + " ");
QTextCharFormat messageFormat;
if (sender.isEmpty())
messageFormat.setForeground(Qt::darkGreen);
messageCell.setFormat(messageFormat);
cellCursor = messageCell.lastCursorPosition();
cellCursor.insertText(message);
cursor.setCharFormat(messageFormat);
cursor.insertText(message);
table->appendRows(1);
verticalScrollBar()->setValue(verticalScrollBar()->maximum());
}
}

2
cockatrice/src/tab_room.cpp
View file

@ -226,14 +226,12 @@ void TabRoom::processListGamesEvent(Event_ListGames *event)
void TabRoom::processJoinRoomEvent(Event_JoinRoom *event)
{
chatView->appendMessage(QString(), tr("%1 has joined the room.").arg(event->getUserInfo()->getName()));
userList->processUserInfo(event->getUserInfo());
userList->sortItems();
}
void TabRoom::processLeaveRoomEvent(Event_LeaveRoom *event)
{
chatView->appendMessage(QString(), tr("%1 has left the room.").arg(event->getPlayerName()));
userList->deleteUser(event->getPlayerName());
}

4
cockatrice/src/userlist.cpp
View file

@ -8,7 +8,7 @@
#include <QMenu>
UserListItemDelegate::UserListItemDelegate(QObject *const parent)
: QItemDelegate(parent)
: QStyledItemDelegate(parent)
{
}
@ -21,7 +21,7 @@ bool UserListItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
return true;
}
}
return QItemDelegate::editorEvent(event, model, option, index);
return QStyledItemDelegate::editorEvent(event, model, option, index);
}
UserListTWI::UserListTWI()

4
cockatrice/src/userlist.h
View file

@ -3,13 +3,13 @@
#include <QGroupBox>
#include <QTreeWidgetItem>
#include <QItemDelegate>
#include <QStyledItemDelegate>
class QTreeWidget;
class ServerInfo_User;
class AbstractClient;
class UserListItemDelegate : public QItemDelegate {
class UserListItemDelegate : public QStyledItemDelegate {
public:
UserListItemDelegate(QObject *const parent);
bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index);

116
cockatrice/translations/cockatrice_de.ts
View file

@ -1424,20 +1424,20 @@
<context>
<name>GameSelector</name>
<message>
<location filename="../src/tab_room.cpp" line="115"/>
<location filename="../src/tab_room.cpp" line="112"/>
<source>C&amp;reate</source>
<translation>Spiel e&amp;rstellen</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="116"/>
<location filename="../src/tab_room.cpp" line="113"/>
<source>&amp;Join</source>
<translation>&amp;Teilnehmen</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="75"/>
<location filename="../src/tab_room.cpp" line="76"/>
<location filename="../src/tab_room.cpp" line="77"/>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="81"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
@ -1446,42 +1446,42 @@
<translation type="obsolete">XXX</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="75"/>
<source>Wrong password.</source>
<translation>Falsches Passwort.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="76"/>
<source>Spectators are not allowed in this game.</source>
<translation>In diesem Spiel sind keine Zuschauer zugelassen.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="77"/>
<source>The game is already full.</source>
<translation>Das Spiel ist bereits voll.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="81"/>
<location filename="../src/tab_room.cpp" line="78"/>
<source>The game does not exist any more.</source>
<translation>Dieses Spiel gibt es nicht mehr.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Join game</source>
<translation>Spiel beitreten</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Password:</source>
<translation>Passwort:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="113"/>
<location filename="../src/tab_room.cpp" line="110"/>
<source>Games</source>
<translation>Spiele</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="114"/>
<location filename="../src/tab_room.cpp" line="111"/>
<source>Show &amp;full games</source>
<translation>&amp;Volle Spiele anzeigen</translation>
</message>
@ -1490,7 +1490,7 @@
<translation type="obsolete">&amp;Volle Spiele anzeigen</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="117"/>
<location filename="../src/tab_room.cpp" line="114"/>
<source>J&amp;oin as spectator</source>
<translation>&amp;Zuschauen</translation>
</message>
@ -2681,7 +2681,7 @@
<translation>Oberste Karten ins &amp;Exil schicken...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="450"/>
<location filename="../src/player.cpp" line="451"/>
<source>F3</source>
<translation>F3</translation>
</message>
@ -2701,7 +2701,12 @@
<translation>&amp;allen Spielern</translation>
</message>
<message>
<location filename="../src/player.cpp" line="452"/>
<location filename="../src/player.cpp" line="450"/>
<source>Ctrl+F3</source>
<translation>Ctrl+F3</translation>
</message>
<message>
<location filename="../src/player.cpp" line="453"/>
<source>F4</source>
<translation>F4</translation>
</message>
@ -2793,12 +2798,12 @@
<translation type="obsolete">&amp;Hinweis setzen...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>View top cards of library</source>
<translation>Zeige die obersten Karten der Bibliothek</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>Number of cards:</source>
<translation>Anzahl der Karten:</translation>
</message>
@ -2834,12 +2839,12 @@
<translation>ins &amp;Exil schicken</translation>
</message>
<message>
<location filename="../src/player.cpp" line="451"/>
<location filename="../src/player.cpp" line="452"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
<location filename="../src/player.cpp" line="453"/>
<location filename="../src/player.cpp" line="454"/>
<source>Ctrl+D</source>
<translation>Ctrl+D</translation>
</message>
@ -2849,7 +2854,7 @@
<translation>Ka&amp;rten ziehen...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="454"/>
<location filename="../src/player.cpp" line="455"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
@ -2858,7 +2863,7 @@
<translation type="obsolete">&amp;Mulligan nehmen...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="455"/>
<location filename="../src/player.cpp" line="456"/>
<source>Ctrl+M</source>
<translation>Ctrl+M</translation>
</message>
@ -2868,7 +2873,7 @@
<translation>Mi&amp;schen</translation>
</message>
<message>
<location filename="../src/player.cpp" line="456"/>
<location filename="../src/player.cpp" line="457"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
@ -2883,7 +2888,7 @@
<translation>&amp;Enttappe alle bleibenden Karten</translation>
</message>
<message>
<location filename="../src/player.cpp" line="457"/>
<location filename="../src/player.cpp" line="458"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
@ -2917,7 +2922,7 @@
<translation>&amp;Würfeln...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="458"/>
<location filename="../src/player.cpp" line="459"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
@ -2927,7 +2932,7 @@
<translation>Spiels&amp;tein erstellen...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="459"/>
<location filename="../src/player.cpp" line="460"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
@ -2937,7 +2942,7 @@
<translation>&amp;Noch einen Spielstein erstellen</translation>
</message>
<message>
<location filename="../src/player.cpp" line="460"/>
<location filename="../src/player.cpp" line="461"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
@ -3040,50 +3045,50 @@
<translation type="obsolete">F10</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="553"/>
<source>Draw cards</source>
<translation>Karten ziehen</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="553"/>
<location filename="../src/player.cpp" line="560"/>
<location filename="../src/player.cpp" line="576"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Number:</source>
<translation>Anzahl:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="560"/>
<source>Move top cards to grave</source>
<translation>Oberste Karten in den Friedhof legen</translation>
</message>
<message>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="576"/>
<source>Move top cards to exile</source>
<translation>Oberste Karten ins Exil schicken</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Set power/toughness</source>
<translation>Kampfwerte setzen</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Please enter the new PT:</source>
<translation>Bitte die neuen Kampfwerte eingeben:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Set annotation</source>
<translation>Hinweis setzen</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Please enter the new annotation:</source>
<translation>Bitte den Hinweis eingeben:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Set counters</source>
<translation>Setze Zählmarken</translation>
</message>
@ -3096,12 +3101,12 @@
<translation type="obsolete">Neue Lebenspunkte insgesamt:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Roll die</source>
<translation>Würfeln</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Number of sides:</source>
<translation>Anzahl der Seiten:</translation>
</message>
@ -3509,22 +3514,27 @@ Bitte geben Sie einen Namen ein:</translation>
<context>
<name>TabMessage</name>
<message>
<location filename="../src/tab_message.cpp" line="40"/>
<location filename="../src/tab_message.cpp" line="39"/>
<source>Personal &amp;talk</source>
<translation>Persönliches &amp;Gespräch</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="41"/>
<location filename="../src/tab_message.cpp" line="40"/>
<source>&amp;Leave</source>
<translation>Ver&amp;lassen</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="75"/>
<location filename="../src/tab_message.cpp" line="65"/>
<source>%1 has left the server.</source>
<translation>%1 hat den Server verlassen.</translation>
</message>
<message>
<location filename="../src/tab_message.h" line="35"/>
<location filename="../src/tab_message.cpp" line="71"/>
<source>%1 has joined the server.</source>
<translation>%1 hat den Server betreten.</translation>
</message>
<message>
<location filename="../src/tab_message.h" line="32"/>
<source>Talking to %1</source>
<translation>Gespräch mit %1</translation>
</message>
@ -3532,40 +3542,38 @@ Bitte geben Sie einen Namen ein:</translation>
<context>
<name>TabRoom</name>
<message>
<location filename="../src/tab_room.cpp" line="219"/>
<location filename="../src/tab_room.cpp" line="180"/>
<source>&amp;Say:</source>
<translation>&amp;Sagen:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="220"/>
<location filename="../src/tab_room.cpp" line="181"/>
<source>Chat</source>
<translation>Unterhaltung</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="221"/>
<location filename="../src/tab_room.cpp" line="182"/>
<source>&amp;Room</source>
<translation>&amp;Raum</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="222"/>
<location filename="../src/tab_room.cpp" line="183"/>
<source>&amp;Leave room</source>
<translation>Raum ver&amp;lassen</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="268"/>
<source>%1 has joined the room.</source>
<translation>%1 hat den Raum betreten.</translation>
<translation type="obsolete">%1 hat den Raum betreten.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="274"/>
<source>%1 has left the room.</source>
<translation>%1 hat den Raum verlassen.</translation>
<translation type="obsolete">%1 hat den Raum verlassen.</translation>
</message>
</context>
<context>
<name>TabServer</name>
<message>
<location filename="../src/tab_server.h" line="63"/>
<location filename="../src/tab_server.h" line="64"/>
<source>Server</source>
<translation>Server</translation>
</message>

120
cockatrice/translations/cockatrice_en.ts
View file

@ -840,65 +840,65 @@
<context>
<name>GameSelector</name>
<message>
<location filename="../src/tab_room.cpp" line="115"/>
<location filename="../src/tab_room.cpp" line="112"/>
<source>C&amp;reate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="116"/>
<location filename="../src/tab_room.cpp" line="113"/>
<source>&amp;Join</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="75"/>
<location filename="../src/tab_room.cpp" line="76"/>
<location filename="../src/tab_room.cpp" line="77"/>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="81"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="75"/>
<source>Wrong password.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="76"/>
<source>Spectators are not allowed in this game.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="77"/>
<source>The game is already full.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="81"/>
<location filename="../src/tab_room.cpp" line="78"/>
<source>The game does not exist any more.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Join game</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="113"/>
<location filename="../src/tab_room.cpp" line="110"/>
<source>Games</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="114"/>
<location filename="../src/tab_room.cpp" line="111"/>
<source>Show &amp;full games</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="117"/>
<location filename="../src/tab_room.cpp" line="114"/>
<source>J&amp;oin as spectator</source>
<translation type="unfinished"></translation>
</message>
@ -1761,7 +1761,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="450"/>
<location filename="../src/player.cpp" line="451"/>
<source>F3</source>
<translation type="unfinished"></translation>
</message>
@ -1776,7 +1776,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="452"/>
<location filename="../src/player.cpp" line="453"/>
<source>F4</source>
<translation type="unfinished"></translation>
</message>
@ -1811,12 +1811,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>View top cards of library</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>Number of cards:</source>
<translation type="unfinished"></translation>
</message>
@ -1848,12 +1848,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="451"/>
<location filename="../src/player.cpp" line="452"/>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="453"/>
<location filename="../src/player.cpp" line="454"/>
<source>Ctrl+D</source>
<translation type="unfinished"></translation>
</message>
@ -1863,7 +1863,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="454"/>
<location filename="../src/player.cpp" line="455"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
@ -1873,7 +1873,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="455"/>
<location filename="../src/player.cpp" line="456"/>
<source>Ctrl+M</source>
<translation type="unfinished"></translation>
</message>
@ -1883,7 +1883,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="456"/>
<location filename="../src/player.cpp" line="457"/>
<source>Ctrl+S</source>
<translation type="unfinished"></translation>
</message>
@ -1898,7 +1898,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="457"/>
<location filename="../src/player.cpp" line="458"/>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
@ -1908,7 +1908,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="458"/>
<location filename="../src/player.cpp" line="459"/>
<source>Ctrl+I</source>
<translation type="unfinished"></translation>
</message>
@ -1918,7 +1918,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="459"/>
<location filename="../src/player.cpp" line="460"/>
<source>Ctrl+T</source>
<translation type="unfinished"></translation>
</message>
@ -1928,7 +1928,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="460"/>
<location filename="../src/player.cpp" line="461"/>
<source>Ctrl+G</source>
<translation type="unfinished"></translation>
</message>
@ -1968,60 +1968,65 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="450"/>
<source>Ctrl+F3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="553"/>
<source>Draw cards</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="553"/>
<location filename="../src/player.cpp" line="560"/>
<location filename="../src/player.cpp" line="576"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Number:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="560"/>
<source>Move top cards to grave</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="576"/>
<source>Move top cards to exile</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Roll die</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Number of sides:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Set power/toughness</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Please enter the new PT:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Set annotation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Please enter the new annotation:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Set counters</source>
<translation type="unfinished"></translation>
</message>
@ -2342,22 +2347,27 @@ Please enter a name:</source>
<context>
<name>TabMessage</name>
<message>
<location filename="../src/tab_message.cpp" line="40"/>
<location filename="../src/tab_message.cpp" line="39"/>
<source>Personal &amp;talk</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="41"/>
<location filename="../src/tab_message.cpp" line="40"/>
<source>&amp;Leave</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="75"/>
<location filename="../src/tab_message.cpp" line="65"/>
<source>%1 has left the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_message.h" line="35"/>
<location filename="../src/tab_message.cpp" line="71"/>
<source>%1 has joined the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_message.h" line="32"/>
<source>Talking to %1</source>
<translation type="unfinished"></translation>
</message>
@ -2365,40 +2375,30 @@ Please enter a name:</source>
<context>
<name>TabRoom</name>
<message>
<location filename="../src/tab_room.cpp" line="219"/>
<location filename="../src/tab_room.cpp" line="180"/>
<source>&amp;Say:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="220"/>
<location filename="../src/tab_room.cpp" line="181"/>
<source>Chat</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="221"/>
<location filename="../src/tab_room.cpp" line="182"/>
<source>&amp;Room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="222"/>
<location filename="../src/tab_room.cpp" line="183"/>
<source>&amp;Leave room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="268"/>
<source>%1 has joined the room.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="274"/>
<source>%1 has left the room.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TabServer</name>
<message>
<location filename="../src/tab_server.h" line="63"/>
<location filename="../src/tab_server.h" line="64"/>
<source>Server</source>
<translation type="unfinished"></translation>
</message>

116
cockatrice/translations/cockatrice_es.ts
View file

@ -1047,60 +1047,60 @@
<context>
<name>GameSelector</name>
<message>
<location filename="../src/tab_room.cpp" line="115"/>
<location filename="../src/tab_room.cpp" line="112"/>
<source>C&amp;reate</source>
<translation>C&amp;rear</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="116"/>
<location filename="../src/tab_room.cpp" line="113"/>
<source>&amp;Join</source>
<translation>E&amp;ntrar</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="75"/>
<location filename="../src/tab_room.cpp" line="76"/>
<location filename="../src/tab_room.cpp" line="77"/>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="81"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="75"/>
<source>Wrong password.</source>
<translation>Contraseña incorrecta.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="76"/>
<source>Spectators are not allowed in this game.</source>
<translation>No se permiten espectadores en esta partida.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="77"/>
<source>The game is already full.</source>
<translation>La partida no tiene plazas libres.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="81"/>
<location filename="../src/tab_room.cpp" line="78"/>
<source>The game does not exist any more.</source>
<translation>La partida ya no existe.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Join game</source>
<translation>Entrar en la partida</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Password:</source>
<translation>Contraseña:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="113"/>
<location filename="../src/tab_room.cpp" line="110"/>
<source>Games</source>
<translation>Partidas</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="114"/>
<location filename="../src/tab_room.cpp" line="111"/>
<source>Show &amp;full games</source>
<translation>Ver partidas &amp;sin plazas libres</translation>
</message>
@ -1109,7 +1109,7 @@
<translation type="obsolete">&amp;Ver partidas sin plazas libres</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="117"/>
<location filename="../src/tab_room.cpp" line="114"/>
<source>J&amp;oin as spectator</source>
<translation>Entrar como e&amp;spectador</translation>
</message>
@ -1972,7 +1972,7 @@
<translation>Mover cartas de la parte s&amp;uperior de la biblioteca al cementerio...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="450"/>
<location filename="../src/player.cpp" line="451"/>
<source>F3</source>
<translation>F3</translation>
</message>
@ -1987,7 +1987,7 @@
<translation>Ver &amp;Cementerio</translation>
</message>
<message>
<location filename="../src/player.cpp" line="452"/>
<location filename="../src/player.cpp" line="453"/>
<source>F4</source>
<translation>F4</translation>
</message>
@ -2022,12 +2022,12 @@
<translation>&amp;Reserva</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>View top cards of library</source>
<translation>Ver cartas de la parte superior de la biblioteca</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>Number of cards:</source>
<translation>Número de cartas:</translation>
</message>
@ -2063,12 +2063,12 @@
<translation>Mover al &amp;exilio</translation>
</message>
<message>
<location filename="../src/player.cpp" line="451"/>
<location filename="../src/player.cpp" line="452"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
<location filename="../src/player.cpp" line="453"/>
<location filename="../src/player.cpp" line="454"/>
<source>Ctrl+D</source>
<translation>Ctrl+D</translation>
</message>
@ -2078,7 +2078,7 @@
<translation>&amp;Robar cartas...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="454"/>
<location filename="../src/player.cpp" line="455"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
@ -2088,7 +2088,7 @@
<translation>Hacer &amp;mulligan</translation>
</message>
<message>
<location filename="../src/player.cpp" line="455"/>
<location filename="../src/player.cpp" line="456"/>
<source>Ctrl+M</source>
<translation>Ctrl+M</translation>
</message>
@ -2098,7 +2098,7 @@
<translation>&amp;Barajar</translation>
</message>
<message>
<location filename="../src/player.cpp" line="456"/>
<location filename="../src/player.cpp" line="457"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
@ -2113,7 +2113,7 @@
<translation>&amp;Enderezar todos los permanentes</translation>
</message>
<message>
<location filename="../src/player.cpp" line="457"/>
<location filename="../src/player.cpp" line="458"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
@ -2123,7 +2123,7 @@
<translation>&amp;Lanzar dado...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="458"/>
<location filename="../src/player.cpp" line="459"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
@ -2133,7 +2133,7 @@
<translation>Crear &amp;Ficha...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="459"/>
<location filename="../src/player.cpp" line="460"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
@ -2143,7 +2143,7 @@
<translation>C&amp;rea otra ficha</translation>
</message>
<message>
<location filename="../src/player.cpp" line="460"/>
<location filename="../src/player.cpp" line="461"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
@ -2187,60 +2187,65 @@
<translation>&amp;Todos los jugadores</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="450"/>
<source>Ctrl+F3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="553"/>
<source>Draw cards</source>
<translation>Robar cartas</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="553"/>
<location filename="../src/player.cpp" line="560"/>
<location filename="../src/player.cpp" line="576"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Number:</source>
<translation>Número:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="560"/>
<source>Move top cards to grave</source>
<translation>Mover cartas superiores al cementerio</translation>
</message>
<message>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="576"/>
<source>Move top cards to exile</source>
<translation>Mover cartas superiores al exilio</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Roll die</source>
<translation>Lanzar dado</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Number of sides:</source>
<translation>Número de caras:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Set power/toughness</source>
<translation>Establecer fuerza/resistencia</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Please enter the new PT:</source>
<translation>Por favor, introduzca la nueva F/R:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Set annotation</source>
<translation>Escribir anotación</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Please enter the new annotation:</source>
<translation>Por favor, introduza la nueva anotación:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Set counters</source>
<translation>Establecer contadores</translation>
</message>
@ -2600,22 +2605,27 @@ Por favor, introduzca un nombre:</translation>
<context>
<name>TabMessage</name>
<message>
<location filename="../src/tab_message.cpp" line="40"/>
<location filename="../src/tab_message.cpp" line="39"/>
<source>Personal &amp;talk</source>
<translation>&amp;Conversación personal</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="41"/>
<location filename="../src/tab_message.cpp" line="40"/>
<source>&amp;Leave</source>
<translation>&amp;Cerrar</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="75"/>
<location filename="../src/tab_message.cpp" line="65"/>
<source>%1 has left the server.</source>
<translation>%1 ha abandonado el servidor.</translation>
</message>
<message>
<location filename="../src/tab_message.h" line="35"/>
<location filename="../src/tab_message.cpp" line="71"/>
<source>%1 has joined the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_message.h" line="32"/>
<source>Talking to %1</source>
<translation>Hablando con %1</translation>
</message>
@ -2623,40 +2633,38 @@ Por favor, introduzca un nombre:</translation>
<context>
<name>TabRoom</name>
<message>
<location filename="../src/tab_room.cpp" line="219"/>
<location filename="../src/tab_room.cpp" line="180"/>
<source>&amp;Say:</source>
<translation>&amp;Decir:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="220"/>
<location filename="../src/tab_room.cpp" line="181"/>
<source>Chat</source>
<translation>Chat</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="221"/>
<location filename="../src/tab_room.cpp" line="182"/>
<source>&amp;Room</source>
<translation>&amp;Sala</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="222"/>
<location filename="../src/tab_room.cpp" line="183"/>
<source>&amp;Leave room</source>
<translation>&amp;Dejar sala</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="268"/>
<source>%1 has joined the room.</source>
<translation>%1 se ha unido a la sala.</translation>
<translation type="obsolete">%1 se ha unido a la sala.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="274"/>
<source>%1 has left the room.</source>
<translation>%1 ha dejado la sala.</translation>
<translation type="obsolete">%1 ha dejado la sala.</translation>
</message>
</context>
<context>
<name>TabServer</name>
<message>
<location filename="../src/tab_server.h" line="63"/>
<location filename="../src/tab_server.h" line="64"/>
<source>Server</source>
<translation>Servidor</translation>
</message>

114
cockatrice/translations/cockatrice_fr.ts
View file

@ -897,50 +897,50 @@
<context>
<name>GameSelector</name>
<message>
<location filename="../src/tab_room.cpp" line="75"/>
<location filename="../src/tab_room.cpp" line="76"/>
<location filename="../src/tab_room.cpp" line="77"/>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="81"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="75"/>
<source>Wrong password.</source>
<translation>Mauvais mot de passe</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="76"/>
<source>Spectators are not allowed in this game.</source>
<translation>Les spectateurs ne sont pas autorisés dans cette partie</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="77"/>
<source>The game is already full.</source>
<translation>Cette partie est déjà pleine.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="81"/>
<location filename="../src/tab_room.cpp" line="78"/>
<source>The game does not exist any more.</source>
<translation>La partie n&apos;existe plus.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Join game</source>
<translation>Rejoindre partie</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Password:</source>
<translation>Mot de passe:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="113"/>
<location filename="../src/tab_room.cpp" line="110"/>
<source>Games</source>
<translation>Parties</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="114"/>
<location filename="../src/tab_room.cpp" line="111"/>
<source>Show &amp;full games</source>
<translation>Montrer &amp;toutes les parties</translation>
</message>
@ -950,17 +950,17 @@
<translation type="obsolete">&amp;Montrer toutes les parties</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="115"/>
<location filename="../src/tab_room.cpp" line="112"/>
<source>C&amp;reate</source>
<translation>C&amp;réer</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="116"/>
<location filename="../src/tab_room.cpp" line="113"/>
<source>&amp;Join</source>
<translation>Re&amp;joindre</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="117"/>
<location filename="../src/tab_room.cpp" line="114"/>
<source>J&amp;oin as spectator</source>
<translation>J&amp;oindre en tant que spectateur</translation>
</message>
@ -1987,125 +1987,130 @@
</message>
<message>
<location filename="../src/player.cpp" line="450"/>
<source>Ctrl+F3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="451"/>
<source>F3</source>
<translation>F3</translation>
</message>
<message>
<location filename="../src/player.cpp" line="451"/>
<location filename="../src/player.cpp" line="452"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
<location filename="../src/player.cpp" line="452"/>
<location filename="../src/player.cpp" line="453"/>
<source>F4</source>
<translation>F4</translation>
</message>
<message>
<location filename="../src/player.cpp" line="453"/>
<location filename="../src/player.cpp" line="454"/>
<source>Ctrl+D</source>
<translation>Ctrl+D</translation>
</message>
<message>
<location filename="../src/player.cpp" line="454"/>
<location filename="../src/player.cpp" line="455"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
<location filename="../src/player.cpp" line="455"/>
<location filename="../src/player.cpp" line="456"/>
<source>Ctrl+M</source>
<translation>Ctrl+M</translation>
</message>
<message>
<location filename="../src/player.cpp" line="456"/>
<location filename="../src/player.cpp" line="457"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
<location filename="../src/player.cpp" line="457"/>
<location filename="../src/player.cpp" line="458"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
<message>
<location filename="../src/player.cpp" line="458"/>
<location filename="../src/player.cpp" line="459"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
<location filename="../src/player.cpp" line="459"/>
<location filename="../src/player.cpp" line="460"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
<location filename="../src/player.cpp" line="460"/>
<location filename="../src/player.cpp" line="461"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>View top cards of library</source>
<translation>Voir les cartes du dessus de la bibliothèque</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>Number of cards:</source>
<translation>Nombre de cartes:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="553"/>
<source>Draw cards</source>
<translation>Piocher des cartes</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="553"/>
<location filename="../src/player.cpp" line="560"/>
<location filename="../src/player.cpp" line="576"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Number:</source>
<translation>Nombre:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="560"/>
<source>Move top cards to grave</source>
<translation>Déplacer les cartes du dessus dans le cimetière</translation>
</message>
<message>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="576"/>
<source>Move top cards to exile</source>
<translation>Déplacer les cartes du dessus vers le exil</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Roll die</source>
<translation>Lancer le dé...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Number of sides:</source>
<translation>Nombre de faces:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Set power/toughness</source>
<translation>Fixer force/endurance</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Please enter the new PT:</source>
<translatorcomment>maybe better with /</translatorcomment>
<translation>Entrer la nouvelle F/E</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Set annotation</source>
<translation>Mettre annotation</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Please enter the new annotation:</source>
<translation>Entrez la nouvelle annotation</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Set counters</source>
<translation>Mettre des compteurs</translation>
</message>
@ -2454,23 +2459,28 @@ Entrez un nom s&apos;il vous plait:</translation>
<context>
<name>TabMessage</name>
<message>
<location filename="../src/tab_message.cpp" line="40"/>
<location filename="../src/tab_message.cpp" line="39"/>
<source>Personal &amp;talk</source>
<translatorcomment>need exemple</translatorcomment>
<translation>&amp;Discussion personnelle</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="41"/>
<location filename="../src/tab_message.cpp" line="40"/>
<source>&amp;Leave</source>
<translation>&amp;Quitter</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="75"/>
<location filename="../src/tab_message.cpp" line="65"/>
<source>%1 has left the server.</source>
<translation>%1 a quitté le serveur.</translation>
</message>
<message>
<location filename="../src/tab_message.h" line="35"/>
<location filename="../src/tab_message.cpp" line="71"/>
<source>%1 has joined the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_message.h" line="32"/>
<source>Talking to %1</source>
<translation>Vous parlez à %1</translation>
</message>
@ -2478,40 +2488,38 @@ Entrez un nom s&apos;il vous plait:</translation>
<context>
<name>TabRoom</name>
<message>
<location filename="../src/tab_room.cpp" line="219"/>
<location filename="../src/tab_room.cpp" line="180"/>
<source>&amp;Say:</source>
<translation>&amp;Dire:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="220"/>
<location filename="../src/tab_room.cpp" line="181"/>
<source>Chat</source>
<translation>Chat</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="221"/>
<location filename="../src/tab_room.cpp" line="182"/>
<source>&amp;Room</source>
<translation>&amp;Salon</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="222"/>
<location filename="../src/tab_room.cpp" line="183"/>
<source>&amp;Leave room</source>
<translation>&amp;Partir du salon</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="268"/>
<source>%1 has joined the room.</source>
<translation>%1 a rejoin le salon.</translation>
<translation type="obsolete">%1 a rejoin le salon.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="274"/>
<source>%1 has left the room.</source>
<translation>%1 a quitté le salon.</translation>
<translation type="obsolete">%1 a quitté le salon.</translation>
</message>
</context>
<context>
<name>TabServer</name>
<message>
<location filename="../src/tab_server.h" line="63"/>
<location filename="../src/tab_server.h" line="64"/>
<source>Server</source>
<translation>Serveur</translation>
</message>

116
cockatrice/translations/cockatrice_ja.ts
View file

@ -883,60 +883,60 @@
<context>
<name>GameSelector</name>
<message>
<location filename="../src/tab_room.cpp" line="115"/>
<location filename="../src/tab_room.cpp" line="112"/>
<source>C&amp;reate</source>
<translation>部屋を作る</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="116"/>
<location filename="../src/tab_room.cpp" line="113"/>
<source>&amp;Join</source>
<translation>参加する</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="75"/>
<location filename="../src/tab_room.cpp" line="76"/>
<location filename="../src/tab_room.cpp" line="77"/>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="81"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="75"/>
<source>Wrong password.</source>
<translation>パスワードが間違っています.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="76"/>
<source>Spectators are not allowed in this game.</source>
<translation>この試合は観戦者は許可されていません.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="77"/>
<source>The game is already full.</source>
<translation>このゲームはすでに満員です.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="81"/>
<location filename="../src/tab_room.cpp" line="78"/>
<source>The game does not exist any more.</source>
<translation>このゲームはもう存在しません.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Join game</source>
<translation>参加</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Password:</source>
<translation>パスワード:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="113"/>
<location filename="../src/tab_room.cpp" line="110"/>
<source>Games</source>
<translation>ゲーム</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="114"/>
<location filename="../src/tab_room.cpp" line="111"/>
<source>Show &amp;full games</source>
<translation>全てのゲームを見る</translation>
</message>
@ -945,7 +945,7 @@
<translation type="obsolete">全てのゲームを見る</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="117"/>
<location filename="../src/tab_room.cpp" line="114"/>
<source>J&amp;oin as spectator</source>
<translation>観戦者として参加</translation>
</message>
@ -1806,7 +1806,7 @@
<translation>カードを上から墓地へ置く...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="450"/>
<location filename="../src/player.cpp" line="451"/>
<source>F3</source>
<translation></translation>
</message>
@ -1821,7 +1821,7 @@
<translation>墓地を見る</translation>
</message>
<message>
<location filename="../src/player.cpp" line="452"/>
<location filename="../src/player.cpp" line="453"/>
<source>F4</source>
<translation></translation>
</message>
@ -1856,12 +1856,12 @@
<translation>サイドボード</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>View top cards of library</source>
<translation>ライブラリーのカードを上からX枚見る</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>Number of cards:</source>
<translation>カードの枚数:</translation>
</message>
@ -1893,12 +1893,12 @@
<translation>追放領域へ移動する</translation>
</message>
<message>
<location filename="../src/player.cpp" line="451"/>
<location filename="../src/player.cpp" line="452"/>
<source>Ctrl+W</source>
<translation></translation>
</message>
<message>
<location filename="../src/player.cpp" line="453"/>
<location filename="../src/player.cpp" line="454"/>
<source>Ctrl+D</source>
<translation></translation>
</message>
@ -1908,7 +1908,7 @@
<translation>カードをX枚引く</translation>
</message>
<message>
<location filename="../src/player.cpp" line="454"/>
<location filename="../src/player.cpp" line="455"/>
<source>Ctrl+E</source>
<translation></translation>
</message>
@ -1918,7 +1918,7 @@
<translation>マリガンする</translation>
</message>
<message>
<location filename="../src/player.cpp" line="455"/>
<location filename="../src/player.cpp" line="456"/>
<source>Ctrl+M</source>
<translation></translation>
</message>
@ -1928,7 +1928,7 @@
<translation>シャッフル</translation>
</message>
<message>
<location filename="../src/player.cpp" line="456"/>
<location filename="../src/player.cpp" line="457"/>
<source>Ctrl+S</source>
<translation></translation>
</message>
@ -1943,7 +1943,7 @@
<translation>全てのパーマネントをアンタップする</translation>
</message>
<message>
<location filename="../src/player.cpp" line="457"/>
<location filename="../src/player.cpp" line="458"/>
<source>Ctrl+U</source>
<translation></translation>
</message>
@ -1953,7 +1953,7 @@
<translation>X面ダイスを振る</translation>
</message>
<message>
<location filename="../src/player.cpp" line="458"/>
<location filename="../src/player.cpp" line="459"/>
<source>Ctrl+I</source>
<translation></translation>
</message>
@ -1963,7 +1963,7 @@
<translation>トークンを作成する</translation>
</message>
<message>
<location filename="../src/player.cpp" line="459"/>
<location filename="../src/player.cpp" line="460"/>
<source>Ctrl+T</source>
<translation></translation>
</message>
@ -1973,7 +1973,7 @@
<translation>同じトークンを作成する</translation>
</message>
<message>
<location filename="../src/player.cpp" line="460"/>
<location filename="../src/player.cpp" line="461"/>
<source>Ctrl+G</source>
<translation></translation>
</message>
@ -2013,60 +2013,65 @@
<translation>全てのプレイヤー</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="450"/>
<source>Ctrl+F3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="553"/>
<source>Draw cards</source>
<translation>カードを引く</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="553"/>
<location filename="../src/player.cpp" line="560"/>
<location filename="../src/player.cpp" line="576"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Number:</source>
<translation>枚数</translation>
</message>
<message>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="560"/>
<source>Move top cards to grave</source>
<translation>ライブラリーのトップからX枚墓地へ置く</translation>
</message>
<message>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="576"/>
<source>Move top cards to exile</source>
<translation>ライブラリーのトップからX枚追放領域へ置く</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Roll die</source>
<translation>ダイスを振る</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Number of sides:</source>
<translation>面の数:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Set power/toughness</source>
<translation>パワーとタフネスを設定する</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Please enter the new PT:</source>
<translation>新しいP/Tを入力してください</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Set annotation</source>
<translation>補足を付ける</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Please enter the new annotation:</source>
<translation>新しい補足を付けてください</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Set counters</source>
<translation>カウンターを設定する</translation>
</message>
@ -2413,22 +2418,27 @@ Please enter a name:</source>
<context>
<name>TabMessage</name>
<message>
<location filename="../src/tab_message.cpp" line="40"/>
<location filename="../src/tab_message.cpp" line="39"/>
<source>Personal &amp;talk</source>
<translation>個人会話</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="41"/>
<location filename="../src/tab_message.cpp" line="40"/>
<source>&amp;Leave</source>
<translation>退出する</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="75"/>
<location filename="../src/tab_message.cpp" line="65"/>
<source>%1 has left the server.</source>
<translation>%1はサーバーから退出しました.</translation>
</message>
<message>
<location filename="../src/tab_message.h" line="35"/>
<location filename="../src/tab_message.cpp" line="71"/>
<source>%1 has joined the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_message.h" line="32"/>
<source>Talking to %1</source>
<translation>%1と会話</translation>
</message>
@ -2436,40 +2446,38 @@ Please enter a name:</source>
<context>
<name>TabRoom</name>
<message>
<location filename="../src/tab_room.cpp" line="219"/>
<location filename="../src/tab_room.cpp" line="180"/>
<source>&amp;Say:</source>
<translation>発言する</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="220"/>
<location filename="../src/tab_room.cpp" line="181"/>
<source>Chat</source>
<translation>チャット</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="221"/>
<location filename="../src/tab_room.cpp" line="182"/>
<source>&amp;Room</source>
<translation>部屋</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="222"/>
<location filename="../src/tab_room.cpp" line="183"/>
<source>&amp;Leave room</source>
<translation>部屋から出る</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="268"/>
<source>%1 has joined the room.</source>
<translation>%1は部屋に参加しました</translation>
<translation type="obsolete">%1は部屋に参加しました</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="274"/>
<source>%1 has left the room.</source>
<translation>%1は部屋から退出しました</translation>
<translation type="obsolete">%1は部屋から退出しました</translation>
</message>
</context>
<context>
<name>TabServer</name>
<message>
<location filename="../src/tab_server.h" line="63"/>
<location filename="../src/tab_server.h" line="64"/>
<source>Server</source>
<translation>サーバー</translation>
</message>

116
cockatrice/translations/cockatrice_pt-br.ts
View file

@ -901,60 +901,60 @@
<context>
<name>GameSelector</name>
<message>
<location filename="../src/tab_room.cpp" line="115"/>
<location filename="../src/tab_room.cpp" line="112"/>
<source>C&amp;reate</source>
<translation>&amp;Criar</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="116"/>
<location filename="../src/tab_room.cpp" line="113"/>
<source>&amp;Join</source>
<translation>&amp;Entrar</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="75"/>
<location filename="../src/tab_room.cpp" line="76"/>
<location filename="../src/tab_room.cpp" line="77"/>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="81"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="75"/>
<source>Wrong password.</source>
<translation>Senha incorreta.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="76"/>
<source>Spectators are not allowed in this game.</source>
<translation>Não são permitidos visitantes neste jogo.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="77"/>
<source>The game is already full.</source>
<translation>O jogo está cheio.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="81"/>
<location filename="../src/tab_room.cpp" line="78"/>
<source>The game does not exist any more.</source>
<translation>O jogo não existe mais.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Join game</source>
<translation>Entrar no jogo</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Password:</source>
<translation>Senha:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="113"/>
<location filename="../src/tab_room.cpp" line="110"/>
<source>Games</source>
<translation>Jogos</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="114"/>
<location filename="../src/tab_room.cpp" line="111"/>
<source>Show &amp;full games</source>
<translation>&amp;Mostrar os jogos cheios</translation>
</message>
@ -963,7 +963,7 @@
<translation type="obsolete">&amp;Mostrar os jogos cheios</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="117"/>
<location filename="../src/tab_room.cpp" line="114"/>
<source>J&amp;oin as spectator</source>
<translation>E&amp;ntrar como visitante</translation>
</message>
@ -1830,7 +1830,7 @@
<translation>Mover os cards do topo para o ce&amp;mitério...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="450"/>
<location filename="../src/player.cpp" line="451"/>
<source>F3</source>
<translation>F3</translation>
</message>
@ -1845,7 +1845,7 @@
<translation>V&amp;er cemitério</translation>
</message>
<message>
<location filename="../src/player.cpp" line="452"/>
<location filename="../src/player.cpp" line="453"/>
<source>F4</source>
<translation>F4</translation>
</message>
@ -1880,12 +1880,12 @@
<translation>&amp;Sideboard</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>View top cards of library</source>
<translation>Ver os cards do topo do grimório</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>Number of cards:</source>
<translation>Número de cards:</translation>
</message>
@ -1917,12 +1917,12 @@
<translation>Mover para o &amp;exílio</translation>
</message>
<message>
<location filename="../src/player.cpp" line="451"/>
<location filename="../src/player.cpp" line="452"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
<location filename="../src/player.cpp" line="453"/>
<location filename="../src/player.cpp" line="454"/>
<source>Ctrl+D</source>
<translation>Ctrl+D</translation>
</message>
@ -1932,7 +1932,7 @@
<translation>Comprar car&amp;ds...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="454"/>
<location filename="../src/player.cpp" line="455"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
@ -1942,7 +1942,7 @@
<translation>Pedir mu&amp;lligan</translation>
</message>
<message>
<location filename="../src/player.cpp" line="455"/>
<location filename="../src/player.cpp" line="456"/>
<source>Ctrl+M</source>
<translation>Ctrl+M</translation>
</message>
@ -1952,7 +1952,7 @@
<translation>&amp;Embaralhar</translation>
</message>
<message>
<location filename="../src/player.cpp" line="456"/>
<location filename="../src/player.cpp" line="457"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
@ -1967,7 +1967,7 @@
<translation>Des&amp;virar todos as permanentes</translation>
</message>
<message>
<location filename="../src/player.cpp" line="457"/>
<location filename="../src/player.cpp" line="458"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
@ -1977,7 +1977,7 @@
<translation>&amp;Jogar dado...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="458"/>
<location filename="../src/player.cpp" line="459"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
@ -1987,7 +1987,7 @@
<translation>Criar fich&amp;a...</translation>
</message>
<message>
<location filename="../src/player.cpp" line="459"/>
<location filename="../src/player.cpp" line="460"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
@ -1997,7 +1997,7 @@
<translation>Criar &amp;outra ficha</translation>
</message>
<message>
<location filename="../src/player.cpp" line="460"/>
<location filename="../src/player.cpp" line="461"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
@ -2037,60 +2037,65 @@
<translation>To&amp;dos os jogadores</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="450"/>
<source>Ctrl+F3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="553"/>
<source>Draw cards</source>
<translation>Comprar cards</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="553"/>
<location filename="../src/player.cpp" line="560"/>
<location filename="../src/player.cpp" line="576"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Number:</source>
<translation>Número:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="560"/>
<source>Move top cards to grave</source>
<translation>Mover os cards do topo para o cemitério</translation>
</message>
<message>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="576"/>
<source>Move top cards to exile</source>
<translation>Mover os cards do topo para o exílio</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Roll die</source>
<translation>Jogar dado</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Number of sides:</source>
<translation>Número de lados:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Set power/toughness</source>
<translation>Alterar poder/resistência</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Please enter the new PT:</source>
<translation>Por favor, entre com o novo P/R:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Set annotation</source>
<translation>Alterar nota</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Please enter the new annotation:</source>
<translation>Por favor, entre com a nova nota:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Set counters</source>
<translation>Alterar marcadores</translation>
</message>
@ -2438,22 +2443,27 @@ Por favor, entre um nome:</translation>
<context>
<name>TabMessage</name>
<message>
<location filename="../src/tab_message.cpp" line="40"/>
<location filename="../src/tab_message.cpp" line="39"/>
<source>Personal &amp;talk</source>
<translation>Chat &amp;privado</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="41"/>
<location filename="../src/tab_message.cpp" line="40"/>
<source>&amp;Leave</source>
<translation>&amp;Sair</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="75"/>
<location filename="../src/tab_message.cpp" line="65"/>
<source>%1 has left the server.</source>
<translation>%1 saiu do servidor.</translation>
</message>
<message>
<location filename="../src/tab_message.h" line="35"/>
<location filename="../src/tab_message.cpp" line="71"/>
<source>%1 has joined the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_message.h" line="32"/>
<source>Talking to %1</source>
<translation>Falando com %1</translation>
</message>
@ -2461,40 +2471,38 @@ Por favor, entre um nome:</translation>
<context>
<name>TabRoom</name>
<message>
<location filename="../src/tab_room.cpp" line="219"/>
<location filename="../src/tab_room.cpp" line="180"/>
<source>&amp;Say:</source>
<translation>&amp;Falar:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="220"/>
<location filename="../src/tab_room.cpp" line="181"/>
<source>Chat</source>
<translation>Chat</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="221"/>
<location filename="../src/tab_room.cpp" line="182"/>
<source>&amp;Room</source>
<translation>&amp;Sala</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="222"/>
<location filename="../src/tab_room.cpp" line="183"/>
<source>&amp;Leave room</source>
<translation>S&amp;air da sala</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="268"/>
<source>%1 has joined the room.</source>
<translation>%1 entrou na sala.</translation>
<translation type="obsolete">%1 entrou na sala.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="274"/>
<source>%1 has left the room.</source>
<translation>%1 saiu da sala.</translation>
<translation type="obsolete">%1 saiu da sala.</translation>
</message>
</context>
<context>
<name>TabServer</name>
<message>
<location filename="../src/tab_server.h" line="63"/>
<location filename="../src/tab_server.h" line="64"/>
<source>Server</source>
<translation>Servidor</translation>
</message>

114
cockatrice/translations/cockatrice_pt.ts
View file

@ -901,50 +901,50 @@
<context>
<name>GameSelector</name>
<message>
<location filename="../src/tab_room.cpp" line="75"/>
<location filename="../src/tab_room.cpp" line="76"/>
<location filename="../src/tab_room.cpp" line="77"/>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="81"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="78"/>
<location filename="../src/tab_room.cpp" line="75"/>
<source>Wrong password.</source>
<translation>Password incorrecta.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="79"/>
<location filename="../src/tab_room.cpp" line="76"/>
<source>Spectators are not allowed in this game.</source>
<translation>Não são permitidos espectadores neste jogo.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="80"/>
<location filename="../src/tab_room.cpp" line="77"/>
<source>The game is already full.</source>
<translation>O jogo já se encontra cheio.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="81"/>
<location filename="../src/tab_room.cpp" line="78"/>
<source>The game does not exist any more.</source>
<translation>O jogo já não existe.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Join game</source>
<translation>Entrar no jogo</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="97"/>
<location filename="../src/tab_room.cpp" line="94"/>
<source>Password:</source>
<translation>Password:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="113"/>
<location filename="../src/tab_room.cpp" line="110"/>
<source>Games</source>
<translation>Jogos</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="114"/>
<location filename="../src/tab_room.cpp" line="111"/>
<source>Show &amp;full games</source>
<translation>&amp;Mostrar jogos cheios</translation>
</message>
@ -953,17 +953,17 @@
<translation type="obsolete">&amp;Mostrar jogos cheios</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="115"/>
<location filename="../src/tab_room.cpp" line="112"/>
<source>C&amp;reate</source>
<translation>&amp;Criar</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="116"/>
<location filename="../src/tab_room.cpp" line="113"/>
<source>&amp;Join</source>
<translation>&amp;Entrar</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="117"/>
<location filename="../src/tab_room.cpp" line="114"/>
<source>J&amp;oin as spectator</source>
<translation>Entrar como &amp;espectador</translation>
</message>
@ -1977,124 +1977,129 @@
</message>
<message>
<location filename="../src/player.cpp" line="450"/>
<source>Ctrl+F3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/player.cpp" line="451"/>
<source>F3</source>
<translation>F3</translation>
</message>
<message>
<location filename="../src/player.cpp" line="451"/>
<location filename="../src/player.cpp" line="452"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
<location filename="../src/player.cpp" line="452"/>
<location filename="../src/player.cpp" line="453"/>
<source>F4</source>
<translation>F4</translation>
</message>
<message>
<location filename="../src/player.cpp" line="453"/>
<location filename="../src/player.cpp" line="454"/>
<source>Ctrl+D</source>
<translation>Ctrl+D</translation>
</message>
<message>
<location filename="../src/player.cpp" line="454"/>
<location filename="../src/player.cpp" line="455"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
<location filename="../src/player.cpp" line="455"/>
<location filename="../src/player.cpp" line="456"/>
<source>Ctrl+M</source>
<translation>Ctrl+M</translation>
</message>
<message>
<location filename="../src/player.cpp" line="456"/>
<location filename="../src/player.cpp" line="457"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
<location filename="../src/player.cpp" line="457"/>
<location filename="../src/player.cpp" line="458"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
<message>
<location filename="../src/player.cpp" line="458"/>
<location filename="../src/player.cpp" line="459"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
<location filename="../src/player.cpp" line="459"/>
<location filename="../src/player.cpp" line="460"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
<location filename="../src/player.cpp" line="460"/>
<location filename="../src/player.cpp" line="461"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>View top cards of library</source>
<translation>Ver as cartas do topo do grimório</translation>
</message>
<message>
<location filename="../src/player.cpp" line="512"/>
<location filename="../src/player.cpp" line="514"/>
<source>Number of cards:</source>
<translation>Número de cartas:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="553"/>
<source>Draw cards</source>
<translation>Comprar cartas</translation>
</message>
<message>
<location filename="../src/player.cpp" line="551"/>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="553"/>
<location filename="../src/player.cpp" line="560"/>
<location filename="../src/player.cpp" line="576"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Number:</source>
<translation>Número:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="558"/>
<location filename="../src/player.cpp" line="560"/>
<source>Move top cards to grave</source>
<translation>Mover as cartas to topo para o cemitério</translation>
</message>
<message>
<location filename="../src/player.cpp" line="574"/>
<location filename="../src/player.cpp" line="576"/>
<source>Move top cards to exile</source>
<translation>Mover as cartas to topo para o exílio</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Roll die</source>
<translation>Lançar dado</translation>
</message>
<message>
<location filename="../src/player.cpp" line="601"/>
<location filename="../src/player.cpp" line="603"/>
<source>Number of sides:</source>
<translation>Número de faces:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Set power/toughness</source>
<translation>Definir poder/resistência</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1340"/>
<location filename="../src/player.cpp" line="1347"/>
<source>Please enter the new PT:</source>
<translation>Por favor introduza o novo P/R:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Set annotation</source>
<translation>Colocar nota</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1366"/>
<location filename="../src/player.cpp" line="1373"/>
<source>Please enter the new annotation:</source>
<translation>Por favor introduza a nova nota:</translation>
</message>
<message>
<location filename="../src/player.cpp" line="1420"/>
<location filename="../src/player.cpp" line="1427"/>
<source>Set counters</source>
<translation>Definir marcadores</translation>
</message>
@ -2442,22 +2447,27 @@ Por favor introduza um nome:</translation>
<context>
<name>TabMessage</name>
<message>
<location filename="../src/tab_message.cpp" line="40"/>
<location filename="../src/tab_message.cpp" line="39"/>
<source>Personal &amp;talk</source>
<translation>Conversação &amp;privada</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="41"/>
<location filename="../src/tab_message.cpp" line="40"/>
<source>&amp;Leave</source>
<translation>&amp;Abandonar</translation>
</message>
<message>
<location filename="../src/tab_message.cpp" line="75"/>
<location filename="../src/tab_message.cpp" line="65"/>
<source>%1 has left the server.</source>
<translation>%1 abandonou o servidor.</translation>
</message>
<message>
<location filename="../src/tab_message.h" line="35"/>
<location filename="../src/tab_message.cpp" line="71"/>
<source>%1 has joined the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/tab_message.h" line="32"/>
<source>Talking to %1</source>
<translation>Falar para %1</translation>
</message>
@ -2465,40 +2475,38 @@ Por favor introduza um nome:</translation>
<context>
<name>TabRoom</name>
<message>
<location filename="../src/tab_room.cpp" line="219"/>
<location filename="../src/tab_room.cpp" line="180"/>
<source>&amp;Say:</source>
<translation>&amp;Dizer:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="220"/>
<location filename="../src/tab_room.cpp" line="181"/>
<source>Chat</source>
<translation></translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="221"/>
<location filename="../src/tab_room.cpp" line="182"/>
<source>&amp;Room</source>
<translation>&amp;Sala</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="222"/>
<location filename="../src/tab_room.cpp" line="183"/>
<source>&amp;Leave room</source>
<translation>&amp;Abandonar a sala</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="268"/>
<source>%1 has joined the room.</source>
<translation>%1 entrou na sala.</translation>
<translation type="obsolete">%1 entrou na sala.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="274"/>
<source>%1 has left the room.</source>
<translation>%1 abandonou na sala.</translation>
<translation type="obsolete">%1 abandonou na sala.</translation>
</message>
</context>
<context>
<name>TabServer</name>
<message>
<location filename="../src/tab_server.h" line="63"/>
<location filename="../src/tab_server.h" line="64"/>
<source>Server</source>
<translation>Servidor</translation>
</message>

2710
cockatrice/translations/cockatrice_ru.ts Normal file
View file

File diff suppressed because it is too large Load diff

4
servatrice/src/serversocketinterface.cpp
View file

@ -85,7 +85,7 @@ void ServerSocketInterface::readClient()
void ServerSocketInterface::catchSocketError(QAbstractSocket::SocketError socketError)
{
qDebug(QString("socket error: %1").arg(socketError).toLatin1());
qDebug() << "Socket error:" << socketError;
deleteLater();
}
@ -327,7 +327,7 @@ ResponseCode ServerSocketInterface::cmdDeckDownload(Command_DeckDownload *cmd, C
// ADMIN FUNCTIONS.
// Permission is checked by the calling function.
ResponseCode ServerSocketInterface::cmdUpdateServerMessage(Command_UpdateServerMessage *cmd, CommandContainer *cont)
ResponseCode ServerSocketInterface::cmdUpdateServerMessage(Command_UpdateServerMessage * /*cmd*/, CommandContainer * /*cont*/)
{
servatrice->updateLoginMessage();
return RespOk;