diff --git a/cockatrice/cockatrice.pro b/cockatrice/cockatrice.pro index d9893b1d..be01da98 100644 --- a/cockatrice/cockatrice.pro +++ b/cockatrice/cockatrice.pro @@ -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 } diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 5ed2db25..3e9a550c 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -24,13 +24,6 @@ resources/icon_search.svg resources/icon_clearsearch.svg resources/hr.jpg - translations/cockatrice_de.qm - translations/cockatrice_en.qm - translations/cockatrice_es.qm - translations/cockatrice_pt.qm - translations/cockatrice_pt-br.qm - translations/cockatrice_fr.qm - translations/cockatrice_ja.qm resources/appicon.svg resources/add_to_sideboard.svg resources/decrement.svg @@ -44,6 +37,15 @@ resources/icon_player.svg resources/icon_spectator.svg + translations/cockatrice_de.qm + translations/cockatrice_en.qm + translations/cockatrice_es.qm + translations/cockatrice_pt.qm + translations/cockatrice_pt-br.qm + translations/cockatrice_fr.qm + translations/cockatrice_ja.qm + translations/cockatrice_ru.qm + resources/countries/at.svg resources/countries/au.svg resources/countries/be.svg diff --git a/cockatrice/src/chatview.cpp b/cockatrice/src/chatview.cpp index a23b5a6e..47724d9d 100644 --- a/cockatrice/src/chatview.cpp +++ b/cockatrice/src/chatview.cpp @@ -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()); -} \ No newline at end of file +} diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/tab_room.cpp index 9493cee0..494e2f92 100644 --- a/cockatrice/src/tab_room.cpp +++ b/cockatrice/src/tab_room.cpp @@ -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()); } diff --git a/cockatrice/src/userlist.cpp b/cockatrice/src/userlist.cpp index dbf8bf6e..353554c6 100644 --- a/cockatrice/src/userlist.cpp +++ b/cockatrice/src/userlist.cpp @@ -8,7 +8,7 @@ #include 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() diff --git a/cockatrice/src/userlist.h b/cockatrice/src/userlist.h index 86726d67..09b5d888 100644 --- a/cockatrice/src/userlist.h +++ b/cockatrice/src/userlist.h @@ -3,13 +3,13 @@ #include #include -#include +#include 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); diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts index fdb3660c..93f028ea 100644 --- a/cockatrice/translations/cockatrice_de.ts +++ b/cockatrice/translations/cockatrice_de.ts @@ -1424,20 +1424,20 @@ GameSelector - + C&reate Spiel e&rstellen - + &Join &Teilnehmen + + + - - - Error Fehler @@ -1446,42 +1446,42 @@ XXX - + Wrong password. Falsches Passwort. - + Spectators are not allowed in this game. In diesem Spiel sind keine Zuschauer zugelassen. - + The game is already full. Das Spiel ist bereits voll. - + The game does not exist any more. Dieses Spiel gibt es nicht mehr. - + Join game Spiel beitreten - + Password: Passwort: - + Games Spiele - + Show &full games &Volle Spiele anzeigen @@ -1490,7 +1490,7 @@ &Volle Spiele anzeigen - + J&oin as spectator &Zuschauen @@ -2681,7 +2681,7 @@ Oberste Karten ins &Exil schicken... - + F3 F3 @@ -2701,7 +2701,12 @@ &allen Spielern - + + Ctrl+F3 + Ctrl+F3 + + + F4 F4 @@ -2793,12 +2798,12 @@ &Hinweis setzen... - + View top cards of library Zeige die obersten Karten der Bibliothek - + Number of cards: Anzahl der Karten: @@ -2834,12 +2839,12 @@ ins &Exil schicken - + Ctrl+W Ctrl+W - + Ctrl+D Ctrl+D @@ -2849,7 +2854,7 @@ Ka&rten ziehen... - + Ctrl+E Ctrl+E @@ -2858,7 +2863,7 @@ &Mulligan nehmen... - + Ctrl+M Ctrl+M @@ -2868,7 +2873,7 @@ Mi&schen - + Ctrl+S Ctrl+S @@ -2883,7 +2888,7 @@ &Enttappe alle bleibenden Karten - + Ctrl+U Ctrl+U @@ -2917,7 +2922,7 @@ &Würfeln... - + Ctrl+I Ctrl+I @@ -2927,7 +2932,7 @@ Spiels&tein erstellen... - + Ctrl+T Ctrl+T @@ -2937,7 +2942,7 @@ &Noch einen Spielstein erstellen - + Ctrl+G Ctrl+G @@ -3040,50 +3045,50 @@ F10 - + Draw cards Karten ziehen - - - - + + + + Number: Anzahl: - + Move top cards to grave Oberste Karten in den Friedhof legen - + Move top cards to exile Oberste Karten ins Exil schicken - + Set power/toughness Kampfwerte setzen - + Please enter the new PT: Bitte die neuen Kampfwerte eingeben: - + Set annotation Hinweis setzen - + Please enter the new annotation: Bitte den Hinweis eingeben: - + Set counters Setze Zählmarken @@ -3096,12 +3101,12 @@ Neue Lebenspunkte insgesamt: - + Roll die Würfeln - + Number of sides: Anzahl der Seiten: @@ -3509,22 +3514,27 @@ Bitte geben Sie einen Namen ein: TabMessage - + Personal &talk Persönliches &Gespräch - + &Leave Ver&lassen - + %1 has left the server. %1 hat den Server verlassen. - + + %1 has joined the server. + %1 hat den Server betreten. + + + Talking to %1 Gespräch mit %1 @@ -3532,40 +3542,38 @@ Bitte geben Sie einen Namen ein: TabRoom - + &Say: &Sagen: - + Chat Unterhaltung - + &Room &Raum - + &Leave room Raum ver&lassen - %1 has joined the room. - %1 hat den Raum betreten. + %1 hat den Raum betreten. - %1 has left the room. - %1 hat den Raum verlassen. + %1 hat den Raum verlassen. TabServer - + Server Server diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts index c01abe60..220072c0 100644 --- a/cockatrice/translations/cockatrice_en.ts +++ b/cockatrice/translations/cockatrice_en.ts @@ -840,65 +840,65 @@ GameSelector - + C&reate - + &Join + + + - - - Error - + Wrong password. - + Spectators are not allowed in this game. - + The game is already full. - + The game does not exist any more. - + Join game - + Password: - + Games - + Show &full games - + J&oin as spectator @@ -1761,7 +1761,7 @@ - + F3 @@ -1776,7 +1776,7 @@ - + F4 @@ -1811,12 +1811,12 @@ - + View top cards of library - + Number of cards: @@ -1848,12 +1848,12 @@ - + Ctrl+W - + Ctrl+D @@ -1863,7 +1863,7 @@ - + Ctrl+E @@ -1873,7 +1873,7 @@ - + Ctrl+M @@ -1883,7 +1883,7 @@ - + Ctrl+S @@ -1898,7 +1898,7 @@ - + Ctrl+U @@ -1908,7 +1908,7 @@ - + Ctrl+I @@ -1918,7 +1918,7 @@ - + Ctrl+T @@ -1928,7 +1928,7 @@ - + Ctrl+G @@ -1968,60 +1968,65 @@ - + + Ctrl+F3 + + + + Draw cards - - - - + + + + Number: - + Move top cards to grave - + Move top cards to exile - + Roll die - + Number of sides: - + Set power/toughness - + Please enter the new PT: - + Set annotation - + Please enter the new annotation: - + Set counters @@ -2342,22 +2347,27 @@ Please enter a name: TabMessage - + Personal &talk - + &Leave - + %1 has left the server. - + + %1 has joined the server. + + + + Talking to %1 @@ -2365,40 +2375,30 @@ Please enter a name: TabRoom - + &Say: - + Chat - + &Room - + &Leave room - - - %1 has joined the room. - - - - - %1 has left the room. - - TabServer - + Server diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts index 94cfb287..cdcfa709 100644 --- a/cockatrice/translations/cockatrice_es.ts +++ b/cockatrice/translations/cockatrice_es.ts @@ -1047,60 +1047,60 @@ GameSelector - + C&reate C&rear - + &Join E&ntrar + + + - - - Error Error - + Wrong password. Contraseña incorrecta. - + Spectators are not allowed in this game. No se permiten espectadores en esta partida. - + The game is already full. La partida no tiene plazas libres. - + The game does not exist any more. La partida ya no existe. - + Join game Entrar en la partida - + Password: Contraseña: - + Games Partidas - + Show &full games Ver partidas &sin plazas libres @@ -1109,7 +1109,7 @@ &Ver partidas sin plazas libres - + J&oin as spectator Entrar como e&spectador @@ -1972,7 +1972,7 @@ Mover cartas de la parte s&uperior de la biblioteca al cementerio... - + F3 F3 @@ -1987,7 +1987,7 @@ Ver &Cementerio - + F4 F4 @@ -2022,12 +2022,12 @@ &Reserva - + View top cards of library Ver cartas de la parte superior de la biblioteca - + Number of cards: Número de cartas: @@ -2063,12 +2063,12 @@ Mover al &exilio - + Ctrl+W Ctrl+W - + Ctrl+D Ctrl+D @@ -2078,7 +2078,7 @@ &Robar cartas... - + Ctrl+E Ctrl+E @@ -2088,7 +2088,7 @@ Hacer &mulligan - + Ctrl+M Ctrl+M @@ -2098,7 +2098,7 @@ &Barajar - + Ctrl+S Ctrl+S @@ -2113,7 +2113,7 @@ &Enderezar todos los permanentes - + Ctrl+U Ctrl+U @@ -2123,7 +2123,7 @@ &Lanzar dado... - + Ctrl+I Ctrl+I @@ -2133,7 +2133,7 @@ Crear &Ficha... - + Ctrl+T Ctrl+T @@ -2143,7 +2143,7 @@ C&rea otra ficha - + Ctrl+G Ctrl+G @@ -2187,60 +2187,65 @@ &Todos los jugadores - + + Ctrl+F3 + + + + Draw cards Robar cartas - - - - + + + + Number: Número: - + Move top cards to grave Mover cartas superiores al cementerio - + Move top cards to exile Mover cartas superiores al exilio - + Roll die Lanzar dado - + Number of sides: Número de caras: - + Set power/toughness Establecer fuerza/resistencia - + Please enter the new PT: Por favor, introduzca la nueva F/R: - + Set annotation Escribir anotación - + Please enter the new annotation: Por favor, introduza la nueva anotación: - + Set counters Establecer contadores @@ -2600,22 +2605,27 @@ Por favor, introduzca un nombre: TabMessage - + Personal &talk &Conversación personal - + &Leave &Cerrar - + %1 has left the server. %1 ha abandonado el servidor. - + + %1 has joined the server. + + + + Talking to %1 Hablando con %1 @@ -2623,40 +2633,38 @@ Por favor, introduzca un nombre: TabRoom - + &Say: &Decir: - + Chat Chat - + &Room &Sala - + &Leave room &Dejar sala - %1 has joined the room. - %1 se ha unido a la sala. + %1 se ha unido a la sala. - %1 has left the room. - %1 ha dejado la sala. + %1 ha dejado la sala. TabServer - + Server Servidor diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts index 10c1cf1a..cf5ac60b 100644 --- a/cockatrice/translations/cockatrice_fr.ts +++ b/cockatrice/translations/cockatrice_fr.ts @@ -897,50 +897,50 @@ GameSelector + + + - - - Error Erreur - + Wrong password. Mauvais mot de passe - + Spectators are not allowed in this game. Les spectateurs ne sont pas autorisés dans cette partie - + The game is already full. Cette partie est déjà pleine. - + The game does not exist any more. La partie n'existe plus. - + Join game Rejoindre partie - + Password: Mot de passe: - + Games Parties - + Show &full games Montrer &toutes les parties @@ -950,17 +950,17 @@ &Montrer toutes les parties - + C&reate C&réer - + &Join Re&joindre - + J&oin as spectator J&oindre en tant que spectateur @@ -1987,125 +1987,130 @@ + Ctrl+F3 + + + + F3 F3 - + Ctrl+W Ctrl+W - + F4 F4 - + Ctrl+D Ctrl+D - + Ctrl+E Ctrl+E - + Ctrl+M Ctrl+M - + Ctrl+S Ctrl+S - + Ctrl+U Ctrl+U - + Ctrl+I Ctrl+I - + Ctrl+T Ctrl+T - + Ctrl+G Ctrl+G - + View top cards of library Voir les cartes du dessus de la bibliothèque - + Number of cards: Nombre de cartes: - + Draw cards Piocher des cartes - - - - + + + + Number: Nombre: - + Move top cards to grave Déplacer les cartes du dessus dans le cimetière - + Move top cards to exile Déplacer les cartes du dessus vers le exil - + Roll die Lancer le dé... - + Number of sides: Nombre de faces: - + Set power/toughness Fixer force/endurance - + Please enter the new PT: maybe better with / Entrer la nouvelle F/E - + Set annotation Mettre annotation - + Please enter the new annotation: Entrez la nouvelle annotation - + Set counters Mettre des compteurs @@ -2454,23 +2459,28 @@ Entrez un nom s'il vous plait: TabMessage - + Personal &talk need exemple &Discussion personnelle - + &Leave &Quitter - + %1 has left the server. %1 a quitté le serveur. - + + %1 has joined the server. + + + + Talking to %1 Vous parlez à %1 @@ -2478,40 +2488,38 @@ Entrez un nom s'il vous plait: TabRoom - + &Say: &Dire: - + Chat Chat - + &Room &Salon - + &Leave room &Partir du salon - %1 has joined the room. - %1 a rejoin le salon. + %1 a rejoin le salon. - %1 has left the room. - %1 a quitté le salon. + %1 a quitté le salon. TabServer - + Server Serveur diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts index a84fc2e7..edd7b78c 100644 --- a/cockatrice/translations/cockatrice_ja.ts +++ b/cockatrice/translations/cockatrice_ja.ts @@ -883,60 +883,60 @@ GameSelector - + C&reate 部屋を作る - + &Join 参加する + + + - - - Error エラー - + Wrong password. パスワードが間違っています. - + Spectators are not allowed in this game. この試合は観戦者は許可されていません. - + The game is already full. このゲームはすでに満員です. - + The game does not exist any more. このゲームはもう存在しません. - + Join game 参加 - + Password: パスワード: - + Games ゲーム - + Show &full games 全てのゲームを見る @@ -945,7 +945,7 @@ 全てのゲームを見る - + J&oin as spectator 観戦者として参加 @@ -1806,7 +1806,7 @@ カードを上から墓地へ置く... - + F3 @@ -1821,7 +1821,7 @@ 墓地を見る - + F4 @@ -1856,12 +1856,12 @@ サイドボード - + View top cards of library ライブラリーのカードを上からX枚見る - + Number of cards: カードの枚数: @@ -1893,12 +1893,12 @@ 追放領域へ移動する - + Ctrl+W - + Ctrl+D @@ -1908,7 +1908,7 @@ カードをX枚引く - + Ctrl+E @@ -1918,7 +1918,7 @@ マリガンする - + Ctrl+M @@ -1928,7 +1928,7 @@ シャッフル - + Ctrl+S @@ -1943,7 +1943,7 @@ 全てのパーマネントをアンタップする - + Ctrl+U @@ -1953,7 +1953,7 @@ X面ダイスを振る - + Ctrl+I @@ -1963,7 +1963,7 @@ トークンを作成する - + Ctrl+T @@ -1973,7 +1973,7 @@ 同じトークンを作成する - + Ctrl+G @@ -2013,60 +2013,65 @@ 全てのプレイヤー - + + Ctrl+F3 + + + + Draw cards カードを引く - - - - + + + + Number: 枚数 - + Move top cards to grave ライブラリーのトップからX枚墓地へ置く - + Move top cards to exile ライブラリーのトップからX枚追放領域へ置く - + Roll die ダイスを振る - + Number of sides: 面の数: - + Set power/toughness パワーとタフネスを設定する - + Please enter the new PT: 新しいP/Tを入力してください - + Set annotation 補足を付ける - + Please enter the new annotation: 新しい補足を付けてください - + Set counters カウンターを設定する @@ -2413,22 +2418,27 @@ Please enter a name: TabMessage - + Personal &talk 個人会話 - + &Leave 退出する - + %1 has left the server. %1はサーバーから退出しました. - + + %1 has joined the server. + + + + Talking to %1 %1と会話 @@ -2436,40 +2446,38 @@ Please enter a name: TabRoom - + &Say: 発言する - + Chat チャット - + &Room 部屋 - + &Leave room 部屋から出る - %1 has joined the room. - %1は部屋に参加しました + %1は部屋に参加しました - %1 has left the room. - %1は部屋から退出しました + %1は部屋から退出しました TabServer - + Server サーバー diff --git a/cockatrice/translations/cockatrice_pt-br.ts b/cockatrice/translations/cockatrice_pt-br.ts index c6a05fbf..6c277cf4 100644 --- a/cockatrice/translations/cockatrice_pt-br.ts +++ b/cockatrice/translations/cockatrice_pt-br.ts @@ -901,60 +901,60 @@ GameSelector - + C&reate &Criar - + &Join &Entrar + + + - - - Error Erro - + Wrong password. Senha incorreta. - + Spectators are not allowed in this game. Não são permitidos visitantes neste jogo. - + The game is already full. O jogo está cheio. - + The game does not exist any more. O jogo não existe mais. - + Join game Entrar no jogo - + Password: Senha: - + Games Jogos - + Show &full games &Mostrar os jogos cheios @@ -963,7 +963,7 @@ &Mostrar os jogos cheios - + J&oin as spectator E&ntrar como visitante @@ -1830,7 +1830,7 @@ Mover os cards do topo para o ce&mitério... - + F3 F3 @@ -1845,7 +1845,7 @@ V&er cemitério - + F4 F4 @@ -1880,12 +1880,12 @@ &Sideboard - + View top cards of library Ver os cards do topo do grimório - + Number of cards: Número de cards: @@ -1917,12 +1917,12 @@ Mover para o &exílio - + Ctrl+W Ctrl+W - + Ctrl+D Ctrl+D @@ -1932,7 +1932,7 @@ Comprar car&ds... - + Ctrl+E Ctrl+E @@ -1942,7 +1942,7 @@ Pedir mu&lligan - + Ctrl+M Ctrl+M @@ -1952,7 +1952,7 @@ &Embaralhar - + Ctrl+S Ctrl+S @@ -1967,7 +1967,7 @@ Des&virar todos as permanentes - + Ctrl+U Ctrl+U @@ -1977,7 +1977,7 @@ &Jogar dado... - + Ctrl+I Ctrl+I @@ -1987,7 +1987,7 @@ Criar fich&a... - + Ctrl+T Ctrl+T @@ -1997,7 +1997,7 @@ Criar &outra ficha - + Ctrl+G Ctrl+G @@ -2037,60 +2037,65 @@ To&dos os jogadores - + + Ctrl+F3 + + + + Draw cards Comprar cards - - - - + + + + Number: Número: - + Move top cards to grave Mover os cards do topo para o cemitério - + Move top cards to exile Mover os cards do topo para o exílio - + Roll die Jogar dado - + Number of sides: Número de lados: - + Set power/toughness Alterar poder/resistência - + Please enter the new PT: Por favor, entre com o novo P/R: - + Set annotation Alterar nota - + Please enter the new annotation: Por favor, entre com a nova nota: - + Set counters Alterar marcadores @@ -2438,22 +2443,27 @@ Por favor, entre um nome: TabMessage - + Personal &talk Chat &privado - + &Leave &Sair - + %1 has left the server. %1 saiu do servidor. - + + %1 has joined the server. + + + + Talking to %1 Falando com %1 @@ -2461,40 +2471,38 @@ Por favor, entre um nome: TabRoom - + &Say: &Falar: - + Chat Chat - + &Room &Sala - + &Leave room S&air da sala - %1 has joined the room. - %1 entrou na sala. + %1 entrou na sala. - %1 has left the room. - %1 saiu da sala. + %1 saiu da sala. TabServer - + Server Servidor diff --git a/cockatrice/translations/cockatrice_pt.ts b/cockatrice/translations/cockatrice_pt.ts index 9aeafc1b..b91ec1b4 100644 --- a/cockatrice/translations/cockatrice_pt.ts +++ b/cockatrice/translations/cockatrice_pt.ts @@ -901,50 +901,50 @@ GameSelector + + + - - - Error Erro - + Wrong password. Password incorrecta. - + Spectators are not allowed in this game. Não são permitidos espectadores neste jogo. - + The game is already full. O jogo já se encontra cheio. - + The game does not exist any more. O jogo já não existe. - + Join game Entrar no jogo - + Password: Password: - + Games Jogos - + Show &full games &Mostrar jogos cheios @@ -953,17 +953,17 @@ &Mostrar jogos cheios - + C&reate &Criar - + &Join &Entrar - + J&oin as spectator Entrar como &espectador @@ -1977,124 +1977,129 @@ + Ctrl+F3 + + + + F3 F3 - + Ctrl+W Ctrl+W - + F4 F4 - + Ctrl+D Ctrl+D - + Ctrl+E Ctrl+E - + Ctrl+M Ctrl+M - + Ctrl+S Ctrl+S - + Ctrl+U Ctrl+U - + Ctrl+I Ctrl+I - + Ctrl+T Ctrl+T - + Ctrl+G Ctrl+G - + View top cards of library Ver as cartas do topo do grimório - + Number of cards: Número de cartas: - + Draw cards Comprar cartas - - - - + + + + Number: Número: - + Move top cards to grave Mover as cartas to topo para o cemitério - + Move top cards to exile Mover as cartas to topo para o exílio - + Roll die Lançar dado - + Number of sides: Número de faces: - + Set power/toughness Definir poder/resistência - + Please enter the new PT: Por favor introduza o novo P/R: - + Set annotation Colocar nota - + Please enter the new annotation: Por favor introduza a nova nota: - + Set counters Definir marcadores @@ -2442,22 +2447,27 @@ Por favor introduza um nome: TabMessage - + Personal &talk Conversação &privada - + &Leave &Abandonar - + %1 has left the server. %1 abandonou o servidor. - + + %1 has joined the server. + + + + Talking to %1 Falar para %1 @@ -2465,40 +2475,38 @@ Por favor introduza um nome: TabRoom - + &Say: &Dizer: - + Chat - + &Room &Sala - + &Leave room &Abandonar a sala - %1 has joined the room. - %1 entrou na sala. + %1 entrou na sala. - %1 has left the room. - %1 abandonou na sala. + %1 abandonou na sala. TabServer - + Server Servidor diff --git a/cockatrice/translations/cockatrice_ru.ts b/cockatrice/translations/cockatrice_ru.ts new file mode 100644 index 00000000..278474d5 --- /dev/null +++ b/cockatrice/translations/cockatrice_ru.ts @@ -0,0 +1,2710 @@ + + + + + AbstractCounter + + + &Set counter... + + + + + Ctrl+L + + + + + F11 + + + + + F12 + + + + + Set counter + + + + + New value for counter '%1': + + + + + AppearanceSettingsPage + + + Zone background pictures + + + + + Path to hand background: + + + + + Path to stack background: + + + + + Path to table background: + + + + + Path to player info background: + + + + + Path to picture of card back: + + + + + Hand layout + + + + + Display hand horizontally (wastes space) + + + + + Table grid layout + + + + + Invert vertical coordinate + + + + + Zone view layout + + + + + Sort by name + + + + + Sort by type + + + + + + + + + Choose path + + + + + CardDatabaseModel + + + Name + + + + + Sets + + + + + Mana cost + + + + + Card type + + + + + P/T + + + + + CardInfoWidget + + + Name: + + + + + Mana cost: + + + + + Card type: + + + + + P / T: + + + + + CardItem + + + &Play + + + + + &Hide + + + + + &Tap + + + + + &Untap + + + + + Toggle &normal untapping + + + + + &Flip + + + + + &Clone + + + + + &Attach to card... + + + + + Ctrl+A + + + + + Unattac&h + + + + + Set &P/T... + + + + + &Set annotation... + + + + + red + + + + + yellow + + + + + green + + + + + &Add counter (%1) + + + + + &Remove counter (%1) + + + + + &Set counters (%1)... + + + + + &top of library + + + + + &bottom of library + + + + + &graveyard + + + + + Ctrl+Del + + + + + &exile + + + + + &Move to + + + + + CardZone + + + his hand + nominative + + + + + %1's hand + nominative + + + + + of his hand + genitive + + + + + of %1's hand + genitive + + + + + his hand + accusative + + + + + %1's hand + accusative + + + + + his library + nominative + + + + + %1's library + nominative + + + + + of his library + genitive + + + + + of %1's library + genitive + + + + + his library + accusative + + + + + %1's library + accusative + + + + + his graveyard + nominative + + + + + %1's graveyard + nominative + + + + + of his graveyard + genitive + + + + + of %1's graveyard + genitive + + + + + his graveyard + accusative + + + + + %1's graveyard + accusative + + + + + his exile + nominative + + + + + %1's exile + nominative + + + + + of his exile + genitive + + + + + of %1's exile + genitive + + + + + his exile + accusative + + + + + %1's exile + accusative + + + + + his sideboard + nominative + + + + + %1's sideboard + nominative + + + + + of his sideboard + genitive + + + + + of %1's sideboard + genitive + + + + + his sideboard + accusative + + + + + %1's sideboard + accusative + + + + + DeckListModel + + + Number + + + + + Card + + + + + DeckViewContainer + + + Load &local deck + + + + + Load d&eck from server + + + + + Ready to s&tart + + + + + Load deck + + + + + DlgCardSearch + + + Card name: + + + + + Card text: + + + + + Card type (OR): + + + + + Color (OR): + + + + + O&K + + + + + &Cancel + + + + + Card search + + + + + DlgConnect + + + &Host: + + + + + &Port: + + + + + Player &name: + + + + + P&assword: + + + + + &OK + + + + + &Cancel + + + + + Connect to server + + + + + DlgCreateGame + + + &Description: + + + + + &Password: + + + + + P&layers: + + + + + &Spectators allowed + + + + + Spectators &need a password to join + + + + + Spectators can &chat + + + + + Spectators see &everything + + + + + Spectators + + + + + &OK + + + + + &Cancel + + + + + Create game + + + + + Error + + + + + Server error. + + + + + DlgCreateToken + + + &Name: + + + + + Token + + + + + C&olor: + + + + + white + + + + + blue + + + + + black + + + + + red + + + + + green + + + + + multicolor + + + + + colorless + + + + + &P/T: + + + + + &Annotation: + + + + + &Destroy token when it leaves the table + + + + + &OK + + + + + &Cancel + + + + + Create token + + + + + DlgLoadDeckFromClipboard + + + &Refresh + + + + + &OK + + + + + &Cancel + + + + + Load deck from clipboard + + + + + Error + + + + + Invalid deck list. + + + + + DlgLoadRemoteDeck + + + O&K + + + + + &Cancel + + + + + Load deck + + + + + DlgSettings + + + + + Error + + + + + Your card database is invalid. Would you like to go back and set the correct path? + + + + + The path to your deck directory is invalid. Would you like to go back and set the correct path? + + + + + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? + + + + + Settings + + + + + General + + + + + Appearance + + + + + User interface + + + + + Messages + + + + + &Close + + + + + GameSelector + + + + + + Error + + + + + Wrong password. + + + + + Spectators are not allowed in this game. + + + + + The game is already full. + + + + + The game does not exist any more. + + + + + Join game + + + + + Password: + + + + + Games + + + + + Show &full games + + + + + C&reate + + + + + &Join + + + + + J&oin as spectator + + + + + GameView + + + Esc + + + + + GamesModel + + + yes + + + + + yes, free for spectators + + + + + no + + + + + not allowed + + + + + Description + + + + + Creator + + + + + Password + + + + + Players + + + + + Spectators + + + + + GeneralSettingsPage + + + + English + + + + + + + Choose path + + + + + Personal settings + + + + + Language: + + + + + Download card pictures on the fly + + + + + Paths + + + + + Decks directory: + + + + + Pictures directory: + + + + + Path to card database: + + + + + MainWindow + + + Number of players + + + + + Please enter the number of players. + + + + + + Player %1 + + + + + About Cockatrice + + + + + Version %1 + + + + + Authors: + + + + + Translators: + + + + + Spanish: + + + + + Portugese (Portugal): + + + + + Portugese (Brazil): + + + + + French: + + + + + Japanese: + + + + + + + + Error + + + + + Server timeout + + + + + Invalid login data. + + + + + Socket error: %1 + + + + + Protocol version mismatch. Local version: %1, remote version: %2. + + + + + Connecting to %1... + + + + + Disconnected + + + + + Logged in at %1 + + + + + &Connect... + + + + + &Disconnect + + + + + Start &local game... + + + + + &Deck editor + + + + + &Full screen + + + + + Ctrl+F + + + + + &Settings... + + + + + &Exit + + + + + &Cockatrice + + + + + &About Cockatrice + + + + + &Help + + + + + Are you sure? + + + + + There are still open games. Are you sure you want to quit? + + + + + MessageLogWidget + + + Connecting to %1... + + + + + Connected. + + + + + Disconnected from server. + + + + + Invalid password. + + + + + Protocol version mismatch. Client: %1, Server: %2 + + + + + Protocol error. + + + + + You have joined game #%1. + + + + + %1 has joined the game. + + + + + %1 has left the game. + + + + + The game has been closed. + + + + + %1 is now watching the game. + + + + + %1 is not watching the game any more. + + + + + %1 has loaded a local deck. + + + + + %1 has loaded deck #%2. + + + + + %1 is ready to start the game. + + + + + %1 is not ready to start the game any more. + + + + + %1 has conceded the game. + + + + + The game has started. + + + + + %1 shuffles his library. + + + + + %1 rolls a %2 with a %3-sided die. + + + + + %1 draws a card. + + + + + %1 draws %2 cards. + + + + + from table + + + + + from graveyard + + + + + from exile + + + + + from hand + + + + + the bottom card of his library + + + + + from the bottom of his library + + + + + the top card of his library + + + + + from the top of his library + + + + + from library + + + + + from sideboard + + + + + from the stack + + + + + + a card + + + + + %1 gives %2 control over %3. + + + + + %1 puts %2 into play%3. + + + + + %1 puts %2%3 into graveyard. + + + + + %1 exiles %2%3. + + + + + %1 moves %2%3 to hand. + + + + + %1 puts %2%3 into his library. + + + + + %1 puts %2%3 on bottom of his library. + + + + + %1 puts %2%3 on top of his library. + + + + + %1 puts %2%3 into his library at position %4. + + + + + %1 moves %2%3 to sideboard. + + + + + %1 plays %2%3. + + + + + %1 flips %2 face-down. + + + + + %1 flips %2 face-up. + + + + + %1 destroys %2. + + + + + %1 attaches %2 to %3's %4. + + + + + %1 unattaches %2. + + + + + %1 creates token: %2%3. + + + + + %1 points from %2's %3 to %4. + + + + + %1 points from %2's %3 to %4's %5. + + + + + %1 places %n counter(s) (%2) on %3 (now %4). + + + + + + + + + %1 removes %n counter(s) (%2) from %3 (now %4). + + + + + + + + + red + + + + + yellow + + + + + green + + + + + his permanents + + + + + %1 %2 %3. + + + + + taps + + + + + untaps + + + + + %1 sets counter %2 to %3 (%4%5). + + + + + %1 sets %2 to not untap normally. + + + + + %1 sets %2 to untap normally. + + + + + %1 sets PT of %2 to %3. + + + + + %1 sets annotation of %2 to %3. + + + + + %1 is looking at the top %2 cards %3. + + + + + %1 is looking at %2. + + + + + %1 stops looking at %2. + + + + + %1 reveals %2 to %3. + + + + + %1 reveals %2. + + + + + %1 randomly reveals %2%3 to %4. + + + + + %1 randomly reveals %2%3. + + + + + %1 reveals %2%3 to %4. + + + + + %1 reveals %2%3. + + + + + It is now %1's turn. + + + + + untap step + + + + + upkeep step + + + + + draw step + + + + + first main phase + + + + + beginning of combat step + + + + + declare attackers step + + + + + declare blockers step + + + + + combat damage step + + + + + end of combat step + + + + + second main phase + + + + + ending phase + + + + + It is now the %1. + + + + + MessagesSettingsPage + + + Add message + + + + + Message: + + + + + &Add + + + + + &Remove + + + + + PhasesToolbar + + + Untap step + + + + + Upkeep step + + + + + Draw step + + + + + First main phase + + + + + Beginning of combat step + + + + + Declare attackers step + + + + + Declare blockers step + + + + + Combat damage step + + + + + End of combat step + + + + + Second main phase + + + + + End of turn step + + + + + Player + + + &View graveyard + + + + + &View exile + + + + + Player "%1" + + + + + &Graveyard + + + + + &Exile + + + + + + + Move to &top of library + + + + + + + Move to &bottom of library + + + + + + Move to &graveyard + + + + + + Move to &exile + + + + + + Move to &hand + + + + + &View library + + + + + View &top cards of library... + + + + + Reveal &library to + + + + + Reveal t&op card to + + + + + &View sideboard + + + + + &Draw card + + + + + D&raw cards... + + + + + Take &mulligan + + + + + &Shuffle + + + + + Move top cards to &graveyard... + + + + + Move top cards to &exile... + + + + + Put top card on &bottom + + + + + &Hand + + + + + &Reveal to + + + + + Reveal r&andom card to + + + + + &Sideboard + + + + + &Library + + + + + &Counters + + + + + &Untap all permanents + + + + + R&oll die... + + + + + &Create token... + + + + + C&reate another token + + + + + S&ay + + + + + C&ard + + + + + &All players + + + + + Ctrl+F3 + + + + + F3 + + + + + Ctrl+W + + + + + F4 + + + + + Ctrl+D + + + + + Ctrl+E + + + + + Ctrl+M + + + + + Ctrl+S + + + + + Ctrl+U + + + + + Ctrl+I + + + + + Ctrl+T + + + + + Ctrl+G + + + + + View top cards of library + + + + + Number of cards: + + + + + Draw cards + + + + + + + + Number: + + + + + Move top cards to grave + + + + + Move top cards to exile + + + + + Roll die + + + + + Number of sides: + + + + + Set power/toughness + + + + + Please enter the new PT: + + + + + Set annotation + + + + + Please enter the new annotation: + + + + + Set counters + + + + + PlayerListWidget + + + Player name + + + + + Deck + + + + + --- + + + + + local + + + + + #%1 + + + + + QObject + + + Maindeck + + + + + Sideboard + + + + + Cockatrice decks (*.cod) + + + + + Plain text decks (*.dec *.mwDeck) + + + + + All files (*.*) + + + + + RemoteDeckList_TreeModel + + + Name + + + + + ID + + + + + Upload time + + + + + RoomSelector + + + Rooms + + + + + Joi&n + + + + + Room + + + + + Description + + + + + Players + + + + + Games + + + + + SetsModel + + + Short name + + + + + Long name + + + + + TabAdmin + + + Update server &message + + + + + Server administration functions + + + + + &Unlock functions + + + + + &Lock functions + + + + + Unlock administration functions + + + + + Do you really want to unlock the administration functions? + + + + + Administration + + + + + TabDeckStorage + + + Local file system + + + + + Server deck storage + + + + + + Open in deck editor + + + + + Upload deck + + + + + Download deck + + + + + + New folder + + + + + Delete + + + + + Enter deck name + + + + + This decklist does not have a name. +Please enter a name: + + + + + + Unnamed deck + + + + + Name of new folder: + + + + + Deck storage + + + + + TabGame + + + &Game + + + + + Next &phase + + + + + Ctrl+Space + + + + + Next &turn + + + + + Ctrl+Return + + + + + Ctrl+Enter + + + + + &Remove all local arrows + + + + + Ctrl+R + + + + + &Concede + + + + + F2 + + + + + &Leave game + + + + + &Say: + + + + + Concede + + + + + Are you sure you want to concede this game? + + + + + Leave game + + + + + Are you sure you want to leave this game? + + + + + Game %1: %2 + + + + + TabMessage + + + Personal &talk + + + + + &Leave + + + + + %1 has left the server. + + + + + %1 has joined the server. + + + + + Talking to %1 + + + + + TabRoom + + + &Say: + + + + + Chat + + + + + &Room + + + + + &Leave room + + + + + TabServer + + + Server + + + + + UserInfoBox + + + User information + + + + + Real name: + + + + + Location: + + + + + User level: + + + + + Administrator + + + + + Judge + + + + + Registered user + + + + + Unregistered user + + + + + UserInterfaceSettingsPage + + + General interface settings + + + + + &Double-click cards to play them (instead of single-click) + + + + + Animation settings + + + + + &Tap/untap animation + + + + + UserList + + + Users online: %1 + + + + + Users in this room: %1 + + + + + User &details + + + + + Direct &chat + + + + + WndDeckEditor + + + &Search... + + + + + &Clear search + + + + + &Search for: + + + + + Deck &name: + + + + + &Comments: + + + + + Deck editor [*] + + + + + &New deck + + + + + &Load deck... + + + + + &Save deck + + + + + Save deck &as... + + + + + Load deck from cl&ipboard... + + + + + Save deck to clip&board + + + + + &Print deck... + + + + + &Close + + + + + Ctrl+Q + + + + + &Edit sets... + + + + + &Deck + + + + + &Card database + + + + + Add card to &maindeck + + + + + Return + + + + + Enter + + + + + Add card to &sideboard + + + + + Ctrl+Return + + + + + Ctrl+Enter + + + + + &Remove row + + + + + Del + + + + + &Increment number + + + + + + + + + + + &Decrement number + + + + + - + + + + + Are you sure? + + + + + The decklist has been modified. +Do you want to save the changes? + + + + + Load deck + + + + + + Error + + + + + + The deck could not be saved. +Please check that the directory is writable and try again. + + + + + Save deck + + + + + WndSets + + + Edit sets + + + + + ZoneViewWidget + + + sort by name + + + + + sort by type + + + + + shuffle when closing + + + + diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index 44cf4729..99fb1bb1 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -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;