diff --git a/cockatrice/cockatrice.desktop b/cockatrice/cockatrice.desktop index 668911c6..092d84ef 100644 --- a/cockatrice/cockatrice.desktop +++ b/cockatrice/cockatrice.desktop @@ -1,3 +1,4 @@ +#!/usr/bin/env xdg-open [Desktop Entry] Version=1.0 Type=Application diff --git a/cockatrice/src/abstractcarditem.cpp b/cockatrice/src/abstractcarditem.cpp index 20e7c8e9..e264f867 100644 --- a/cockatrice/src/abstractcarditem.cpp +++ b/cockatrice/src/abstractcarditem.cpp @@ -82,9 +82,8 @@ void AbstractCardItem::transformPainter(QPainter *painter, const QSizeF &transla painter->setFont(f); } -void AbstractCardItem::paintPicture(QPainter *painter, int angle) +void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedSize, int angle) { - QSizeF translatedSize = getTranslatedSize(painter); QRectF totalBoundingRect = painter->combinedTransform().mapRect(boundingRect()); qreal scaleFactor = translatedSize.width() / boundingRect().width(); @@ -143,15 +142,20 @@ void AbstractCardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * { painter->save(); - paintPicture(painter, tapAngle); + QSizeF translatedSize = getTranslatedSize(painter); + paintPicture(painter, translatedSize, tapAngle); + painter->save(); + painter->setRenderHint(QPainter::Antialiasing, false); + transformPainter(painter, translatedSize, tapAngle); if (isSelected()) { painter->setPen(Qt::red); - painter->drawRect(QRectF(0.5, 0.5, CARD_WIDTH - 1, CARD_HEIGHT - 1)); + painter->drawRect(QRectF(0.5, 0.5, translatedSize.width() - 1, translatedSize.height() - 1)); } else if (isHovered) { painter->setPen(Qt::yellow); - painter->drawRect(QRectF(0.5, 0.5, CARD_WIDTH - 1, CARD_HEIGHT - 1)); + painter->drawRect(QRectF(0.5, 0.5, translatedSize.width() - 1, translatedSize.height() - 1)); } + painter->restore(); painter->restore(); } diff --git a/cockatrice/src/abstractcarditem.h b/cockatrice/src/abstractcarditem.h index e11bdf85..2060537d 100644 --- a/cockatrice/src/abstractcarditem.h +++ b/cockatrice/src/abstractcarditem.h @@ -37,7 +37,8 @@ public: AbstractCardItem(const QString &_name = QString(), Player *_owner = 0, QGraphicsItem *parent = 0); ~AbstractCardItem(); QRectF boundingRect() const; - void paintPicture(QPainter *painter, int angle); + QSizeF getTranslatedSize(QPainter *painter) const; + void paintPicture(QPainter *painter, const QSizeF &translatedSize, int angle); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); CardInfo *getInfo() const { return info; } QString getName() const { return name; } @@ -52,7 +53,6 @@ public: void processHoverEvent(); void deleteCardInfoPopup() { emit deleteCardInfoPopup(name); } protected: - QSizeF getTranslatedSize(QPainter *painter) const; void transformPainter(QPainter *painter, const QSizeF &translatedSize, int angle); void mousePressEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); diff --git a/cockatrice/src/carddragitem.cpp b/cockatrice/src/carddragitem.cpp index 56d6c2c6..cfc016f3 100644 --- a/cockatrice/src/carddragitem.cpp +++ b/cockatrice/src/carddragitem.cpp @@ -2,7 +2,7 @@ #include "cardzone.h" #include "tablezone.h" #include "zoneviewzone.h" -#include +#include "gamescene.h" #include #include #include @@ -22,7 +22,7 @@ void CardDragItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti void CardDragItem::updatePosition(const QPointF &cursorScenePos) { - QList colliding = scene()->items(cursorScenePos); + QList colliding = scene()->items(cursorScenePos, Qt::IntersectsItemBoundingRect, Qt::DescendingOrder, static_cast(scene())->getViewTransform()); CardZone *cardZone = 0; ZoneViewZone *zoneViewZone = 0; diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp index afc15e8c..ae4c2950 100644 --- a/cockatrice/src/carditem.cpp +++ b/cockatrice/src/carditem.cpp @@ -394,8 +394,10 @@ CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPoin { deleteDragItem(); dragItem = new CardDragItem(this, _id, _pos, faceDown); + dragItem->setVisible(false); scene()->addItem(dragItem); dragItem->updatePosition(_scenePos); + dragItem->setVisible(true); return dragItem; } diff --git a/cockatrice/src/gamescene.cpp b/cockatrice/src/gamescene.cpp index 8a8dd17c..fefa37cc 100644 --- a/cockatrice/src/gamescene.cpp +++ b/cockatrice/src/gamescene.cpp @@ -9,6 +9,7 @@ #include #include #include +#include GameScene::GameScene(PhasesToolbar *_phasesToolbar, QObject *parent) : QGraphicsScene(parent), phasesToolbar(_phasesToolbar) @@ -25,8 +26,8 @@ GameScene::~GameScene() void GameScene::retranslateUi() { - for (int i = 0; i < views.size(); ++i) - views[i]->retranslateUi(); + for (int i = 0; i < zoneViews.size(); ++i) + zoneViews[i]->retranslateUi(); } void GameScene::addPlayer(Player *player) @@ -111,47 +112,52 @@ void GameScene::rearrange() void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numberCards) { - for (int i = 0; i < views.size(); i++) { - ZoneViewZone *temp = views[i]->getZone(); + for (int i = 0; i < zoneViews.size(); i++) { + ZoneViewZone *temp = zoneViews[i]->getZone(); if ((temp->getName() == zoneName) && (temp->getPlayer() == player)) { // view is already open - views[i]->close(); + zoneViews[i]->close(); if (temp->getNumberCards() == numberCards) return; } } ZoneViewWidget *item = new ZoneViewWidget(player, player->getZones().value(zoneName), numberCards, false); - views.append(item); + zoneViews.append(item); connect(item, SIGNAL(closePressed(ZoneViewWidget *)), this, SLOT(removeZoneView(ZoneViewWidget *))); addItem(item); - item->setPos(100, 100); + item->setPos(50, 50); } void GameScene::addRevealedZoneView(Player *player, CardZone *zone, const QList &cardList) { ZoneViewWidget *item = new ZoneViewWidget(player, zone, -2, true, cardList); - views.append(item); + zoneViews.append(item); connect(item, SIGNAL(closePressed(ZoneViewWidget *)), this, SLOT(removeZoneView(ZoneViewWidget *))); addItem(item); - item->setPos(100, 100); + item->setPos(50, 50); } void GameScene::removeZoneView(ZoneViewWidget *item) { - views.removeAt(views.indexOf(item)); + zoneViews.removeAt(zoneViews.indexOf(item)); removeItem(item); } void GameScene::clearViews() { - for (int i = 0; i < views.size(); ++i) - views[i]->close(); + for (int i = 0; i < zoneViews.size(); ++i) + zoneViews[i]->close(); } void GameScene::closeMostRecentZoneView() { - if (!views.isEmpty()) - views.last()->close(); + if (!zoneViews.isEmpty()) + zoneViews.last()->close(); +} + +QTransform GameScene::getViewTransform() const +{ + return views().at(0)->transform(); } void GameScene::processViewSizeChange(const QSize &newSize) @@ -191,7 +197,7 @@ void GameScene::processViewSizeChange(const QSize &newSize) void GameScene::updateHover(const QPointF &scenePos) { - QList itemList = items(scenePos); + QList itemList = items(scenePos, Qt::IntersectsItemBoundingRect, Qt::DescendingOrder, getViewTransform()); // Search for the topmost zone and ignore all cards not belonging to that zone. CardZone *zone = 0; diff --git a/cockatrice/src/gamescene.h b/cockatrice/src/gamescene.h index 7b93a35f..8389a3b6 100644 --- a/cockatrice/src/gamescene.h +++ b/cockatrice/src/gamescene.h @@ -23,7 +23,7 @@ private: PhasesToolbar *phasesToolbar; QList players; QList > playersByColumn; - QList views; + QList zoneViews; QSize viewSize; QPointer hoveredCard; QBasicTimer *animationTimer; @@ -34,6 +34,7 @@ public: ~GameScene(); void retranslateUi(); void processViewSizeChange(const QSize &newSize); + QTransform getViewTransform() const; void startRubberBand(const QPointF &selectionOrigin); void resizeRubberBand(const QPointF &cursorPoint); diff --git a/cockatrice/src/pilezone.cpp b/cockatrice/src/pilezone.cpp index a513e657..4f0c2fe2 100644 --- a/cockatrice/src/pilezone.cpp +++ b/cockatrice/src/pilezone.cpp @@ -25,7 +25,7 @@ QRectF PileZone::boundingRect() const void PileZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) { if (!cards.isEmpty()) - cards.at(0)->paintPicture(painter, 90); + cards.at(0)->paintPicture(painter, cards.at(0)->getTranslatedSize(painter), 90); painter->drawRect(QRectF(0.5, 0.5, CARD_WIDTH - 1, CARD_HEIGHT - 1)); diff --git a/cockatrice/src/window_deckeditor.cpp b/cockatrice/src/window_deckeditor.cpp index acb3bf54..0355a62e 100644 --- a/cockatrice/src/window_deckeditor.cpp +++ b/cockatrice/src/window_deckeditor.cpp @@ -268,6 +268,9 @@ void WndDeckEditor::updateCardInfoRight(const QModelIndex ¤t, const QModel void WndDeckEditor::updateSearch(const QString &search) { databaseDisplayModel->setCardNameBeginning(search); + QModelIndexList sel = databaseView->selectionModel()->selectedRows(); + if (sel.isEmpty() && databaseDisplayModel->rowCount()) + databaseView->selectionModel()->setCurrentIndex(databaseDisplayModel->index(0, 0), QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); } bool WndDeckEditor::confirmClose() diff --git a/cockatrice/src/zoneviewwidget.cpp b/cockatrice/src/zoneviewwidget.cpp index 2f124fed..812b1439 100644 --- a/cockatrice/src/zoneviewwidget.cpp +++ b/cockatrice/src/zoneviewwidget.cpp @@ -1,6 +1,11 @@ #include #include +#include #include +#include +#include +#include +#include #include "zoneviewwidget.h" #include "carditem.h" #include "zoneviewzone.h" @@ -8,19 +13,70 @@ #include "gamescene.h" #include "protocol_items.h" #include "settingscache.h" +#include "gamescene.h" + +TitleLabel::TitleLabel() + : QGraphicsWidget(), text(" ") +{ + setAcceptHoverEvents(true); +} + +void TitleLabel::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) +{ + QBrush windowBrush = palette().window(); + windowBrush.setColor(windowBrush.color().darker(150)); + painter->fillRect(boundingRect(), windowBrush); + painter->drawText(boundingRect(), Qt::AlignLeft | Qt::AlignVCenter, text); +} + +QSizeF TitleLabel::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const +{ + QFont f; + QFontMetrics fm(f); + if (which == Qt::MaximumSize) + return QSizeF(constraint.width(), fm.size(Qt::TextSingleLine, text).height() + 10); + else + return fm.size(Qt::TextSingleLine, text); +} + +void TitleLabel::mousePressEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) { + buttonDownPos = static_cast(scene())->getViewTransform().inverted().map(event->pos()); + event->accept(); + } else + event->ignore(); +} + +void TitleLabel::mouseMoveEvent(QGraphicsSceneMouseEvent *event) +{ + emit mouseMoved(event->scenePos() - buttonDownPos); +} ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards, bool _revealZone, const QList &cardList) - : QGraphicsWidget(0, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint | Qt::WindowTitleHint/* | Qt::WindowCloseButtonHint*/), player(_player) + : QGraphicsWidget(0, Qt::Tool | Qt::FramelessWindowHint), player(_player) { + setAcceptHoverEvents(true); setAttribute(Qt::WA_DeleteOnClose); setZValue(2000000006); + setFlag(ItemIgnoresTransformations); + setAutoFillBackground(true); - QFont font; - font.setPixelSize(10); - setFont(font); - + QGraphicsLinearLayout *hbox = new QGraphicsLinearLayout(Qt::Horizontal); + titleLabel = new TitleLabel; + connect(titleLabel, SIGNAL(mouseMoved(QPointF)), this, SLOT(moveWidget(QPointF))); + closeButton = new QPushButton("X"); + connect(closeButton, SIGNAL(clicked()), this, SLOT(close())); + closeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + QGraphicsProxyWidget *closeButtonProxy = new QGraphicsProxyWidget; + closeButtonProxy->setWidget(closeButton); + + hbox->addItem(titleLabel); + hbox->addItem(closeButtonProxy); QGraphicsLinearLayout *vbox = new QGraphicsLinearLayout(Qt::Vertical); + vbox->addItem(hbox); + if (numberCards < 0) { sortByNameCheckBox = new QCheckBox; QGraphicsProxyWidget *sortByNameProxy = new QGraphicsProxyWidget; @@ -67,7 +123,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberC void ZoneViewWidget::retranslateUi() { - setWindowTitle(zone->getTranslatedName(false, CaseNominative)); + titleLabel->setText(zone->getTranslatedName(false, CaseNominative)); if (sortByNameCheckBox) sortByNameCheckBox->setText(tr("sort by name")); if (sortByTypeCheckBox) @@ -76,6 +132,11 @@ void ZoneViewWidget::retranslateUi() shuffleCheckBox->setText(tr("shuffle when closing")); } +void ZoneViewWidget::moveWidget(QPointF scenePos) +{ + setPos(scenePos); +} + void ZoneViewWidget::resizeToZoneContents() { QRectF zoneRect = zone->getOptimumRect(); diff --git a/cockatrice/src/zoneviewwidget.h b/cockatrice/src/zoneviewwidget.h index afa63eb3..42d44c27 100644 --- a/cockatrice/src/zoneviewwidget.h +++ b/cockatrice/src/zoneviewwidget.h @@ -1,10 +1,10 @@ #ifndef ZONEVIEWWIDGET_H #define ZONEVIEWWIDGET_H -#include -#include #include +class QLabel; +class QPushButton; class CardZone; class ZoneViewZone; class Player; @@ -13,12 +13,32 @@ class QScrollBar; class QCheckBox; class GameScene; class ServerInfo_Card; +class QGraphicsSceneMouseEvent; + +class TitleLabel : public QGraphicsWidget { + Q_OBJECT +private: + QString text; + QPointF buttonDownPos; +public: + TitleLabel(); + void paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/); + void setText(const QString &_text) { text = _text; update(); } +signals: + void mouseMoved(QPointF scenePos); +protected: + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event); + void mousePressEvent(QGraphicsSceneMouseEvent *event); +}; class ZoneViewWidget : public QGraphicsWidget { Q_OBJECT private: ZoneViewZone *zone; + TitleLabel *titleLabel; + QPushButton *closeButton; QScrollBar *scrollBar; QCheckBox *sortByNameCheckBox, *sortByTypeCheckBox, *shuffleCheckBox; @@ -29,6 +49,7 @@ signals: private slots: void resizeToZoneContents(); void zoneDeleted(); + void moveWidget(QPointF scenePos); public: ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards = 0, bool _revealZone = false, const QList &cardList = QList()); ZoneViewZone *getZone() const { return zone; } diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts index cd581e18..a6e2423e 100644 --- a/cockatrice/translations/cockatrice_de.ts +++ b/cockatrice/translations/cockatrice_de.ts @@ -5095,7 +5095,7 @@ Bitte geben Sie einen Namen ein: &Concede - + &Aufgeben diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts index cee81068..5ce7a0f5 100644 --- a/cockatrice/translations/cockatrice_es.ts +++ b/cockatrice/translations/cockatrice_es.ts @@ -94,7 +94,7 @@ Minimum player count for multi-column layout: - + Número minimo de jugadores para usar la rejilla multicolumna: Economical layout @@ -140,29 +140,30 @@ Please enter the duration of the ban (in minutes). Enter 0 for an indefinite ban. - Por favor, introduce la duración del ban (en minutos) + Por favor, introduce la duración del ban (en minutos) Indica 0 para un ban indefinido. Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. - + Por favor, introduce el motivo del ban +Se almacenará unicamente para moderadores y no podrá ser visto por la persona baneada. &OK - &Aceptar + &Aceptar &Cancel - &Cancelar + &Cancelar Ban user from server - + Banear usuario del servidor @@ -198,22 +199,22 @@ This is only saved for moderators and cannot be seen by the banned person. Hide card info - + Ocultar información de la carta Show card only - + Mostrar sólo la carta Show text only - + Mostrar sólo texto Show full info - + Mostrar información completa @@ -300,7 +301,7 @@ This is only saved for moderators and cannot be seen by the banned person. &Draw arrow... - + &Dibujar flecha... @@ -609,361 +610,361 @@ This is only saved for moderators and cannot be seen by the banned person. her hand nominative, female owner - + su mano %1's hand nominative, female owner - + mano de %1 his hand nominative, male owner - su mano + su mano %1's hand nominative, male owner - + mano de %1 of her hand genitive, female owner - + de su mano of %1's hand genitive, female owner - + de la mano de %1 of his hand genitive, male owner - de su mano + de su mano of %1's hand genitive, male owner - + de la mano de %1 her hand accusative, female owner - + su mano %1's hand accusative, female owner - + mano de %1 his hand accusative, male owner - su mano + su mano %1's hand accusative, male owner - + mano de %1 her library nominative, female owner - + su biblioteca %1's library nominative, female owner - + biblioteca de %1 his library nominative, male owner - su biblioteca + su biblioteca %1's library nominative, male owner - + biblioteca de %1 of her library genitive, female owner - + de su biblioteca of %1's library genitive, female owner - + de la biblioteca de %1 of his library genitive, male owner - de su biblioteca + de su biblioteca of %1's library genitive, male owner - + de la biblioteca de %1 her library accusative, female owner - + su biblioteca %1's library accusative, female owner - + biblioteca de %1 his library accusative, male owner - su biblioteca + su biblioteca %1's library accusative, male owner - + biblioteca de %1 her graveyard nominative, female owner - + su cementerio %1's graveyard nominative, female owner - + cementerio de %1 his graveyard nominative, male owner - su cementerio + su cementerio %1's graveyard nominative, male owner - + cementerio de %1 of her graveyard genitive, female owner - + de su cementerio of %1's graveyard genitive, female owner - + del cementerio de %1 of his graveyard genitive, male owner - de su cementerio + de su cementerio of %1's graveyard genitive, male owner - + del cementerio de %1 her graveyard accusative, female owner - + su cementerio %1's graveyard accusative, female owner - + cementerio de %1 his graveyard accusative, male owner - su cementerio + su cementerio %1's graveyard accusative, male owner - + cementerio de %1 her exile nominative, female owner - + su exilio %1's exile nominative, female owner - el exilio de %1 + el exilio de %1 his exile nominative, male owner - su exilio + su exilio %1's exile nominative, male owner - el exilio de %1 + el exilio de %1 of her exile genitive, female owner - + de su exilio of %1's exile genitive, female owner - del exilio de %1 + del exilio de %1 of his exile genitive, male owner - de su exilio + de su exilio of %1's exile genitive, male owner - del exilio de %1 + del exilio de %1 her exile accusative, female owner - + su exilio %1's exile accusative, female owner - el exilio de %1 + el exilio de %1 his exile accusative, male owner - su exilio + su exilio %1's exile accusative, male owner - el exilio de %1 + el exilio de %1 her sideboard nominative, female owner - + su reserva %1's sideboard nominative, female owner - la reserva de %1 + la reserva de %1 his sideboard nominative, male owner - su reserva + su reserva %1's sideboard nominative, male owner - la reserva de %1 + la reserva de %1 of her sideboard genitive, female owner - + de su reserva of %1's sideboard genitive, female owner - + de la reserva de %1 of his sideboard genitive, male owner - de su reserva + de su reserva of %1's sideboard genitive, male owner - + de la reserva de %1 her sideboard accusative, female owner - + su reserva %1's sideboard accusative, female owner - la reserva de %1 + la reserva de %1 his sideboard accusative, male owner - su reserva + su reserva %1's sideboard accusative, male owner - la reserva de %1 + la reserva de %1 his graveyard @@ -1141,12 +1142,12 @@ This is only saved for moderators and cannot be seen by the banned person. Enable &price tag feature (using data from blacklotusproject.com) - + Activar tag de &precios (usando datos de blacklotusproject.com) General - General + General @@ -1164,7 +1165,7 @@ This is only saved for moderators and cannot be seen by the banned person. Price - + Precio @@ -1554,7 +1555,7 @@ This is only saved for moderators and cannot be seen by the banned person. Deck editor - + Editor de mazos @@ -1594,7 +1595,7 @@ This is only saved for moderators and cannot be seen by the banned person. Please join the appropriate room first. - + Por favor, entre en la sala adecuada primero. @@ -1654,7 +1655,7 @@ This is only saved for moderators and cannot be seen by the banned person. Show &running games - + Mostrar partidas en &curso &Show full games @@ -1719,7 +1720,7 @@ This is only saved for moderators and cannot be seen by the banned person. Room - Sala + Sala @@ -1813,7 +1814,7 @@ This is only saved for moderators and cannot be seen by the banned person. Scheduled server shutdown. - + Desconexión programada del servidor. @@ -1835,16 +1836,20 @@ Motivo: %1 Scheduled server shutdown - + Desconexión programada del servidor The server is going to be restarted in %n minute(s). All running games will be lost. Reason for shutdown: %1 - - - + + El servidor será reiniciado en %n minuto. +Todos los juegos en curso se cerraran. +Motivo para la desconexión: %1 + El servidor será reiniciado en %n minutos. +Todos los juegos en curso se cerraran. +Motivo para la desconexión: %1 @@ -1916,12 +1921,12 @@ Reason for shutdown: %1 Czech: - + Checo: Slovak: - + Eslovaco: @@ -2106,151 +2111,151 @@ La versión local es %1, la versión remota es %2. You have joined game #%1. female - Te has unido a la partida #%1. + Te has unido a la partida #%1. You have joined game #%1. male - Te has unido a la partida #%1. + Te has unido a la partida #%1. %1 has joined the game. female - %1 se ha unido a la partida. + %1 se ha unido a la partida. %1 has joined the game. male - %1 se ha unido a la partida. + %1 se ha unido a la partida. %1 has left the game. female - %1 ha dejado la partida. + %1 ha dejado la partida. %1 has left the game. male - %1 ha dejado la partida. + %1 ha dejado la partida. %1 has loaded a local deck. female - %1 ha cargado un mazo local. + %1 ha cargado un mazo local. %1 has loaded a local deck. male - %1 ha cargado un mazo local. + %1 ha cargado un mazo local. %1 has loaded deck #%2. female - %1 ha cargado el mazo #%2. + %1 ha cargado el mazo #%2. %1 has loaded deck #%2. male - %1 ha cargado el mazo #%2. + %1 ha cargado el mazo #%2. %1 is ready to start the game. female - %1 está preparado para empezar la partida. + %1 está preparado para empezar la partida. %1 is ready to start the game. male - %1 está preparado para empezar la partida. + %1 está preparado para empezar la partida. %1 is not ready to start the game any more. female - %1 ya no está listo para empezar el juego. + %1 ya no está listo para empezar el juego. %1 is not ready to start the game any more. male - %1 ya no está listo para empezar el juego. + %1 ya no está listo para empezar el juego. %1 has conceded the game. female - %1 ha concedido la partida. + %1 ha concedido la partida. %1 has conceded the game. male - %1 ha concedido la partida. + %1 ha concedido la partida. %1 has restored connection to the game. female - + %1 ha recuperado la conexión a la partida. %1 has restored connection to the game. male - + %1 ha recuperado la conexión a la partida. %1 has lost connection to the game. female - + %1 ha perdido la conexión a la partida. %1 has lost connection to the game. male - + %1 ha perdido la conexión a la partida. %1 shuffles %2. female - + %1 baraja %2. %1 shuffles %2. male - + %1 baraja %2. %1 rolls a %2 with a %3-sided die. female - %1 sacó un %2 con un dado de %3 caras. + %1 sacó un %2 con un dado de %3 caras. %1 rolls a %2 with a %3-sided die. male - %1 sacó un %2 con un dado de %3 caras. + %1 sacó un %2 con un dado de %3 caras. %1 draws %n card(s). female - + %1 roba %n carta. %1 roba %n cartas. @@ -2259,7 +2264,7 @@ La versión local es %1, la versión remota es %2. %1 draws %n card(s). male - + %1 roba %n carta. %1 roba %n cartas. @@ -2272,7 +2277,7 @@ La versión local es %1, la versión remota es %2. %1 undoes her last draw. - + %1 deshace su último robo. @@ -2282,7 +2287,7 @@ La versión local es %1, la versión remota es %2. %1 undoes her last draw (%2). - + %1 deshace su último robo (%2). @@ -2307,42 +2312,42 @@ La versión local es %1, la versión remota es %2. the bottom card of his library - el fondo de la biblioteca + la carta de la parte inferior de su biblioteca the bottom card of her library - + la carta de la parte inferior de su biblioteca from the bottom of his library - del fondo de la biblioteca + de la parte inferior de su biblioteca from the bottom of her library - + de la parte inferior de su biblioteca the top card of his library - la parte superior de la biblioteca + la parte superior de su biblioteca the top card of her library - + la carta superior de su biblioteca from the top of his library - de la parte superior de la biblioteca + de la parte superior de su biblioteca from the top of her library - + de la parte superior de su biblioteca @@ -2392,12 +2397,12 @@ La versión local es %1, la versión remota es %2. %1 puts %2%3 into his library. - %1 pone %2%3 en la biblioteca. + %1 pone %2%3 en su biblioteca. %1 puts %2%3 into her library. - + %1 pone %2%3 en su biblioteca. @@ -2407,7 +2412,7 @@ La versión local es %1, la versión remota es %2. %1 puts %2%3 on bottom of her library. - + %1 pone %2%3 en la parte inferior de su biblioteca. @@ -2417,7 +2422,7 @@ La versión local es %1, la versión remota es %2. %1 puts %2%3 on top of her library. - + %1 pone %2%3 en la parte superior de su biblioteca. @@ -2427,7 +2432,7 @@ La versión local es %1, la versión remota es %2. %1 puts %2%3 into her library at position %4. - + %1 pone %2%3 en su biblioteca en la posición %4. @@ -2443,55 +2448,55 @@ La versión local es %1, la versión remota es %2. %1 takes a mulligan to %n. female - - - + + %1 hace mulligan a %n. + %1 hace mulligan a %n. %1 takes a mulligan to %n. male - - - + + %1 hace mulligan a %n. + %1 hace mulligan a %n. %1 flips %2 face-down. female - %1 voltea %2 boca abajo. + %1 voltea %2 boca abajo. %1 flips %2 face-down. male - %1 voltea %2 boca abajo. + %1 voltea %2 boca abajo. %1 flips %2 face-up. female - %1 voltea %2 boca arriba. + %1 voltea %2 boca arriba. %1 flips %2 face-up. male - %1 voltea %2 boca arriba. + %1 voltea %2 boca arriba. %1 destroys %2. female - %1 destruye %2. + %1 destruye %2. %1 destroys %2. male - %1 destruye %2. + %1 destruye %2. %1 attaches %2 to %3's %4. @@ -2507,271 +2512,271 @@ La versión local es %1, la versión remota es %2. %1 attaches %2 to %3's %4. p1 female, p2 female - %1 anexa %2 a el %4 de %3. + %1 anexa %2 a el %4 de %3. %1 attaches %2 to %3's %4. p1 female, p2 male - %1 anexa %2 a el %4 de %3. + %1 anexa %2 a el %4 de %3. %1 attaches %2 to %3's %4. p1 male, p2 female - %1 anexa %2 a el %4 de %3. + %1 anexa %2 a el %4 de %3. %1 attaches %2 to %3's %4. p1 male, p2 male - %1 anexa %2 a el %4 de %3. + %1 anexa %2 a el %4 de %3. %1 unattaches %2. female - %1 desanexa %2. + %1 desanexa %2. %1 unattaches %2. male - %1 desanexa %2. + %1 desanexa %2. %1 creates token: %2%3. female - %1 crea una ficha: %2%3. + %1 crea una ficha: %2%3. %1 creates token: %2%3. male - %1 crea una ficha: %2%3. + %1 crea una ficha: %2%3. %1 points from her %2 to herself. female - + %1 apunta desde su %2 a si misma. %1 points from his %2 to himself. male - + %1 apunta desde su %2 a si mismo. %1 points from her %2 to %3. p1 female, p2 female - + %1 apunta desde su %2 a %3. %1 points from her %2 to %3. p1 female, p2 male - + %1 apunta desde su %2 a %3. %1 points from his %2 to %3. p1 male, p2 female - + %1 apunta desde su %2 a %3. %1 points from his %2 to %3. p1 male, p2 male - + %1 apunta desde su %2 a %3. %1 points from %2's %3 to herself. card owner female, target female - + %1 apunta desde el %3 de %2 a ella misma. %1 points from %2's %3 to herself. card owner male, target female - + %1 apunta desde el %3 de %2 a ella misma. %1 points from %2's %3 to himself. card owner female, target male - + %1 apunta desde el %3 de %2 a él mismo. %1 points from %2's %3 to himself. card owner male, target male - + %1 apunta desde el %3 de %2 a él mismo. %1 points from %2's %3 to %4. p1 female, p2 female, p3 female - %1 apunta desde el %3 de %2 a %4. + %1 apunta desde el %3 de %2 a %4. %1 points from %2's %3 to %4. p1 female, p2 female, p3 male - %1 apunta desde el %3 de %2 a %4. + %1 apunta desde el %3 de %2 a %4. %1 points from %2's %3 to %4. p1 female, p2 male, p3 female - %1 apunta desde el %3 de %2 a %4. + %1 apunta desde el %3 de %2 a %4. %1 points from %2's %3 to %4. p1 female, p2 male, p3 male - %1 apunta desde el %3 de %2 a %4. + %1 apunta desde el %3 de %2 a %4. %1 points from %2's %3 to %4. p1 male, p2 female, p3 female - %1 apunta desde el %3 de %2 a %4. + %1 apunta desde el %3 de %2 a %4. %1 points from %2's %3 to %4. p1 male, p2 female, p3 male - %1 apunta desde el %3 de %2 a %4. + %1 apunta desde el %3 de %2 a %4. %1 points from %2's %3 to %4. p1 male, p2 male, p3 female - %1 apunta desde el %3 de %2 a %4. + %1 apunta desde el %3 de %2 a %4. %1 points from %2's %3 to %4. p1 male, p2 male, p3 male - %1 apunta desde el %3 de %2 a %4. + %1 apunta desde el %3 de %2 a %4. %1 points from her %2 to her %3. female - + %1 apunta desde su %2 a su %3. %1 points from his %2 to his %3. male - + %1 apunta desde su %2 a su %3. %1 points from her %2 to %3's %4. p1 female, p2 female - + %1 apunta desde su %2 al %4 de %3. %1 points from her %2 to %3's %4. p1 female, p2 male - + %1 apunta desde su %2 al %4 de %3. %1 points from his %2 to %3's %4. p1 male, p2 female - + %1 apunta desde su %2 al %4 de %3. %1 points from his %2 to %3's %4. p1 male, p2 male - + %1 apunta desde su %2 al %4 de %3. %1 points from %2's %3 to her own %4. card owner female, target female - + %1 apunta desde el %3 de %2 a su propio %4. %1 points from %2's %3 to her own %4. card owner male, target female - + %1 apunta desde el %3 de %2 a su propio %4. %1 points from %2's %3 to his own %4. card owner female, target male - + %1 apunta desde el %3 de %2 a su propio %4. %1 points from %2's %3 to his own %4. card owner male, target male - + %1 apunta desde el %3 de %2 a su propio %4. %1 points from %2's %3 to %4's %5. p1 female, p2 female, p3 female - %1 apunta desde el %3 de %2 al %5 de %4. + %1 apunta desde el %3 de %2 al %5 de %4. %1 points from %2's %3 to %4's %5. p1 female, p2 female, p3 male - %1 apunta desde el %3 de %2 al %5 de %4. + %1 apunta desde el %3 de %2 al %5 de %4. %1 points from %2's %3 to %4's %5. p1 female, p2 male, p3 female - %1 apunta desde el %3 de %2 al %5 de %4. + %1 apunta desde el %3 de %2 al %5 de %4. %1 points from %2's %3 to %4's %5. p1 female, p2 male, p3 male - %1 apunta desde el %3 de %2 al %5 de %4. + %1 apunta desde el %3 de %2 al %5 de %4. %1 points from %2's %3 to %4's %5. p1 male, p2 female, p3 female - %1 apunta desde el %3 de %2 al %5 de %4. + %1 apunta desde el %3 de %2 al %5 de %4. %1 points from %2's %3 to %4's %5. p1 male, p2 female, p3 male - %1 apunta desde el %3 de %2 al %5 de %4. + %1 apunta desde el %3 de %2 al %5 de %4. %1 points from %2's %3 to %4's %5. p1 male, p2 male, p3 female - %1 apunta desde el %3 de %2 al %5 de %4. + %1 apunta desde el %3 de %2 al %5 de %4. %1 points from %2's %3 to %4's %5. p1 male, p2 male, p3 male - %1 apunta desde el %3 de %2 al %5 de %4. + %1 apunta desde el %3 de %2 al %5 de %4. %1 places %n %2 counter(s) on %3 (now %4). female - + %1 pone %n %2 contador en %3 (ahora %4). %1 pone %n %2 contadores en %3 (ahora %4). @@ -2780,7 +2785,7 @@ La versión local es %1, la versión remota es %2. %1 places %n %2 counter(s) on %3 (now %4). male - + %1 pone %n %2 contador en %3 (ahora %4). %1 pone %n %2 contadores en %3 (ahora %4). @@ -2789,7 +2794,7 @@ La versión local es %1, la versión remota es %2. %1 removes %n %2 counter(s) from %3 (now %4). female - + %1 remueve %n %2 contador en %3 (ahora %4). %1 remueve %n %2 contadores en %3 (ahora %4). @@ -2798,7 +2803,7 @@ La versión local es %1, la versión remota es %2. %1 removes %n %2 counter(s) from %3 (now %4). male - + %1 remueve %n %2 contador en %3 (ahora %4). %1 remueve %n %2 contadores en %3 (ahora %4). @@ -2807,265 +2812,265 @@ La versión local es %1, la versión remota es %2. %1 taps her permanents. female - + %1 gira sus permanentes. %1 untaps her permanents. female - + %1 endereza sus permanentes. %1 taps his permanents. male - + %1 gira sus permanentes. %1 untaps his permanents. male - + %1 endereza sus permanentes. %1 taps %2. female - + %1 gira %2. %1 untaps %2. female - + %1 endereza %2. %1 taps %2. male - + %1 gira %2. %1 untaps %2. male - + %1 endereza %2. %1 sets counter %2 to %3 (%4%5). female - %1 establece los contadores de %2 a %3 (%4%5). + %1 establece los contadores de %2 a %3 (%4%5). %1 sets counter %2 to %3 (%4%5). male - %1 establece los contadores de %2 a %3 (%4%5). + %1 establece los contadores de %2 a %3 (%4%5). %1 sets %2 to not untap normally. female - %1 establece que %2 no se endereze normalmente. + %1 establece que %2 no se endereze normalmente. %1 sets %2 to not untap normally. male - %1 establece que %2 no se endereze normalmente. + %1 establece que %2 no se endereze normalmente. %1 sets %2 to untap normally. female - %1 establece que %2 se endereze normalmente. + %1 establece que %2 se endereze normalmente. %1 sets %2 to untap normally. male - %1 establece que %2 se endereze normalmente. + %1 establece que %2 se endereze normalmente. %1 sets PT of %2 to %3. female - %1 establece F/R de %2 a %3. + %1 establece la F/R de %2 a %3. %1 sets PT of %2 to %3. male - %1 establece F/R de %2 a %3. + %1 establece la F/R de %2 a %3. %1 sets annotation of %2 to %3. female - %1 establece la anotación de %2 a %3. + %1 establece la anotación de %2 a %3. %1 sets annotation of %2 to %3. male - %1 establece la anotación de %2 a %3. + %1 establece la anotación de %2 a %3. %1 is looking at the top %2 cards %3. female - %1 esta mirando las primeras %2 cartas de %3. + %1 esta mirando las primeras %2 cartas de %3. %1 is looking at the top %2 cards %3. male - %1 esta mirando las primeras %2 cartas de %3. + %1 esta mirando las primeras %2 cartas de %3. %1 is looking at %2. female - %1 está mirando: %2. + %1 está mirando a %2. %1 is looking at %2. male - %1 está mirando: %2. + %1 está mirando a %2. %1 stops looking at %2. female - %1 termina de mirar: %2. + %1 termina de mirar a %2. %1 stops looking at %2. male - %1 termina de mirar: %2. + %1 termina de mirar a %2. %1 reveals %2 to %3. p1 female, p2 female - %1 revela %2 a %3. + %1 revela %2 a %3. %1 reveals %2 to %3. p1 female, p2 male - %1 revela %2 a %3. + %1 revela %2 a %3. %1 reveals %2 to %3. p1 male, p2 female - %1 revela %2 a %3. + %1 revela %2 a %3. %1 reveals %2 to %3. p1 male, p2 male - %1 revela %2 a %3. + %1 revela %2 a %3. %1 reveals %2. female - %1 revela %2. + %1 revela %2. %1 reveals %2. male - %1 revela %2. + %1 revela %2. %1 randomly reveals %2%3 to %4. p1 female, p2 female - %1 revela aleatoriamente %2%3 a %4. + %1 revela aleatoriamente %2%3 a %4. %1 randomly reveals %2%3 to %4. p1 female, p2 male - %1 revela aleatoriamente %2%3 a %4. + %1 revela aleatoriamente %2%3 a %4. %1 randomly reveals %2%3 to %4. p1 male, p2 female - %1 revela aleatoriamente %2%3 a %4. + %1 revela aleatoriamente %2%3 a %4. %1 randomly reveals %2%3 to %4. p1 male, p2 male - %1 revela aleatoriamente %2%3 a %4. + %1 revela aleatoriamente %2%3 a %4. %1 randomly reveals %2%3. female - %1 revela aleatoriamente %2%3. + %1 revela aleatoriamente %2%3. %1 randomly reveals %2%3. male - %1 revela aleatoriamente %2%3. + %1 revela aleatoriamente %2%3. %1 reveals %2%3 to %4. p1 female, p2 female - %1 revela %2%3 a %4. + %1 revela %2%3 a %4. %1 reveals %2%3 to %4. p1 female, p2 male - %1 revela %2%3 a %4. + %1 revela %2%3 a %4. %1 reveals %2%3 to %4. p1 male, p2 female - %1 revela %2%3 a %4. + %1 revela %2%3 a %4. %1 reveals %2%3 to %4. p1 male, p2 male - %1 revela %2%3 a %4. + %1 revela %2%3 a %4. %1 reveals %2%3. female - %1 revela %2%3. + %1 revela %2%3. %1 reveals %2%3. male - %1 revela %2%3. + %1 revela %2%3. It is now %1's turn. female - Es el turno de %1. + Es el turno de %1. It is now %1's turn. male - Es el turno de %1. + Es el turno de %1. @@ -3258,12 +3263,12 @@ La versión local es %1, la versión remota es %2. %1 draws his initial hand. - + %1 roba su mano inicial. %1 draws her initial hand. - + %1 roba su mano inicial. %1 randomly reveals %2%3 to %4. @@ -3949,27 +3954,27 @@ La versión local es %1, la versión remota es %2. &Reason for shutdown: - + &Motivo para la desconexión: &Time until shutdown (minutes): - + &Tiempo hasta la desconexión (minutos): &OK - &Aceptar + &Aceptar &Cancel - &Cancelar + &Cancelar Shut down server - + Apagar servidor @@ -3982,7 +3987,7 @@ La versión local es %1, la versión remota es %2. &Shut down server - + &Apagar servidor @@ -4197,7 +4202,7 @@ Por favor, introduzca un nombre: Ctrl+Q - Ctrl+Q + Ctrl+Q @@ -4340,7 +4345,7 @@ Por favor, introduzca un nombre: Gender: - + Género: @@ -4360,7 +4365,7 @@ Por favor, introduzca un nombre: Moderator - + Moderador Judge @@ -4402,17 +4407,17 @@ Por favor, introduzca un nombre: Enable &sounds - + Activar &sonidos Path to sounds directory: - + Ruta al directorio de sonidos: Choose path - Elija ruta + Elija ruta @@ -4440,7 +4445,7 @@ Por favor, introduzca un nombre: %1's games - + Partidas de %1 @@ -4455,7 +4460,7 @@ Por favor, introduzca un nombre: Show this user's &games - + Mostrar &partidas de este usuario @@ -4538,12 +4543,12 @@ Indica 0 para un ban indefinido. &Update prices - + &Actualizar precios Ctrl+U - Ctrl+U + Ctrl+U diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts index 5470b772..46bc1a6b 100644 --- a/cockatrice/translations/cockatrice_ja.ts +++ b/cockatrice/translations/cockatrice_ja.ts @@ -104,7 +104,7 @@ Minimum player count for multi-column layout: - + @@ -137,28 +137,28 @@ Please enter the duration of the ban (in minutes). Enter 0 for an indefinite ban. - バンする期間を入力してください（分単位）.0でバンを解除します. + バンする期間を入力してください（分単位）.0でバンを解除します. Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. - + Banの理由を入れてください.これはモデレーターによって保存されBanされた人間には見えません. &OK - + OK &Cancel - + Cancel Ban user from server - + サーバーからBanされたユーザーです @@ -194,22 +194,22 @@ This is only saved for moderators and cannot be seen by the banned person. Hide card info - + カードインフォを隠す Show card only - + カードのみ表示 Show text only - + テキストのみ表示 Show full info - + 全て表示 @@ -297,7 +297,8 @@ This is only saved for moderators and cannot be seen by the banned person. &Draw arrow... - + テストしていないので要修正 + 矢印を指定 @@ -446,361 +447,361 @@ This is only saved for moderators and cannot be seen by the banned person. her hand nominative, female owner - + %1's hand nominative, female owner - + his hand nominative, male owner - + %1's hand nominative, male owner - + of her hand genitive, female owner - + of %1's hand genitive, female owner - + of his hand genitive, male owner - + of %1's hand genitive, male owner - + her hand accusative, female owner - + %1's hand accusative, female owner - + his hand accusative, male owner - + %1's hand accusative, male owner - + her library nominative, female owner - + %1's library nominative, female owner - + his library nominative, male owner - + %1's library nominative, male owner - + of her library genitive, female owner - + of %1's library genitive, female owner - + of his library genitive, male owner - + of %1's library genitive, male owner - + her library accusative, female owner - + %1's library accusative, female owner - + his library accusative, male owner - + %1's library accusative, male owner - + her graveyard nominative, female owner - + %1's graveyard nominative, female owner - + his graveyard nominative, male owner - + %1's graveyard nominative, male owner - + of her graveyard genitive, female owner - + of %1's graveyard genitive, female owner - + of his graveyard genitive, male owner - + of %1's graveyard genitive, male owner - + her graveyard accusative, female owner - + %1's graveyard accusative, female owner - + his graveyard accusative, male owner - + %1's graveyard accusative, male owner - + her exile nominative, female owner - + %1's exile nominative, female owner - + his exile nominative, male owner - + %1's exile nominative, male owner - + of her exile genitive, female owner - + of %1's exile genitive, female owner - + of his exile genitive, male owner - + of %1's exile genitive, male owner - + her exile accusative, female owner - + %1's exile accusative, female owner - + his exile accusative, male owner - + %1's exile accusative, male owner - + her sideboard nominative, female owner - + %1's sideboard nominative, female owner - + his sideboard nominative, male owner - + %1's sideboard nominative, male owner - + of her sideboard genitive, female owner - + of %1's sideboard genitive, female owner - + of his sideboard genitive, male owner - + of %1's sideboard genitive, male owner - + her sideboard accusative, female owner - + %1's sideboard accusative, female owner - + his sideboard accusative, male owner - + %1's sideboard accusative, male owner - + @@ -846,12 +847,12 @@ This is only saved for moderators and cannot be seen by the banned person. Enable &price tag feature (using data from blacklotusproject.com) - + 価格タグを表示可能に（blacklotusproject.comからのデータを使用） General - 全般 + 全般 @@ -869,7 +870,7 @@ This is only saved for moderators and cannot be seen by the banned person. Price - + 価格 @@ -1240,7 +1241,7 @@ This is only saved for moderators and cannot be seen by the banned person. Deck editor - + デッキエディター @@ -1280,7 +1281,7 @@ This is only saved for moderators and cannot be seen by the banned person. Please join the appropriate room first. - + 適切な部屋に参加してください. @@ -1340,7 +1341,7 @@ This is only saved for moderators and cannot be seen by the banned person. Show &running games - + 進行中のゲームを見る &Show full games @@ -1405,7 +1406,7 @@ This is only saved for moderators and cannot be seen by the banned person. Room - 部屋 + 部屋 @@ -1500,7 +1501,7 @@ This is only saved for moderators and cannot be seen by the banned person. Scheduled server shutdown. - + サーバーシャットダウン予定時間. @@ -1522,15 +1523,17 @@ Reason: %1 Scheduled server shutdown - + サーバーシャットダウン予定時間 The server is going to be restarted in %n minute(s). All running games will be lost. Reason for shutdown: %1 - - + + このサーバーは%n分で再起動します. +全ての進行中のゲームは失われます. +シャットダウンの理由: %1 @@ -1602,12 +1605,12 @@ Reason for shutdown: %1 Czech: - + チェコ語: Slovak: - + スロバキア語: @@ -1757,181 +1760,182 @@ Local version is %1, remote version is %2. You have joined game #%1. female - + あなたはゲーム#%1に参加しました. You have joined game #%1. male - + あなたはゲーム#%1に参加しました. %1 has joined the game. female - + %1がゲームに参加しました. %1 has joined the game. male - + %1がゲームに参加しました. %1 has left the game. female - + %1はゲームから抜けました. %1 has left the game. male - + %1はゲームから抜けました. %1 has loaded a local deck. female - + %1はローカルデッキをロードしました. %1 has loaded a local deck. male - + %1はローカルデッキをロードしました. %1 has loaded deck #%2. female - + %1はデッキ#%2をロードしました. %1 has loaded deck #%2. male - + %1はデッキ#%2をロードしました. %1 is ready to start the game. female - + %1はゲーム開始の準備が出来ました. %1 is ready to start the game. male - + %1はゲーム開始の準備が出来ました. %1 is not ready to start the game any more. female - + %1はゲーム開始の準備がまだ出来ていません. %1 is not ready to start the game any more. male - + %1はゲーム開始の準備がまだ出来ていません. %1 has conceded the game. female - + %1が投了しました. %1 has conceded the game. male - + %1が投了しました. %1 has restored connection to the game. female - + %1がこのゲームに再接続しました. %1 has restored connection to the game. male - + %1がこのゲームに再接続しました. %1 has lost connection to the game. female - + %1はこのゲームから切断されました. %1 has lost connection to the game. male - + %1はこのゲームから切断されました. %1 shuffles %2. female - + %1は%2をシャッフルします. %1 shuffles %2. male - + %1は%2をシャッフルします. %1 rolls a %2 with a %3-sided die. female - + ちょっと怪しいです　要チェック + %1は%3面ダイスを使用して%2を割り振ります. %1 rolls a %2 with a %3-sided die. male - + %1は%3面ダイスを使用して%2を割り振ります. %1 draws %n card(s). female - - + + %1は%n枚カードを引きます. %1 draws %n card(s). male - - + + %1は%n枚カードを引きます. %1 undoes his last draw. - + %1は最後のドローを取り消しました. %1 undoes her last draw. - + %1は最後のドローを取り消しました. %1 undoes his last draw (%2). - + %1は最後のドローを取り消しました(%2). %1 undoes her last draw (%2). - + %1は最後のドローを取り消しました(%2). @@ -1961,7 +1965,7 @@ Local version is %1, remote version is %2. the bottom card of her library - + @@ -1971,7 +1975,7 @@ Local version is %1, remote version is %2. from the bottom of her library - + @@ -1981,7 +1985,7 @@ Local version is %1, remote version is %2. the top card of her library - + @@ -1991,7 +1995,7 @@ Local version is %1, remote version is %2. from the top of her library - + @@ -2046,7 +2050,7 @@ Local version is %1, remote version is %2. %1 puts %2%3 into her library. - + @@ -2056,7 +2060,7 @@ Local version is %1, remote version is %2. %1 puts %2%3 on bottom of her library. - + @@ -2066,7 +2070,7 @@ Local version is %1, remote version is %2. %1 puts %2%3 on top of her library. - + @@ -2076,7 +2080,7 @@ Local version is %1, remote version is %2. %1 puts %2%3 into her library at position %4. - + @@ -2092,299 +2096,299 @@ Local version is %1, remote version is %2. %1 takes a mulligan to %n. female - - + + %1は%n枚にマリガンしました. %1 takes a mulligan to %n. male - - + + %1は%n枚にマリガンしました. %1 flips %2 face-down. female - + %1は%2を裏返しにしました. %1 flips %2 face-down. male - + %1は%2を裏返しにしました. %1 flips %2 face-up. female - + %1は%2を表返しにしました. %1 flips %2 face-up. male - + %1は%2を表返しにしました. %1 destroys %2. female - + %1は%2を破壊しました. %1 destroys %2. male - + %1は%2を破壊しました. %1 unattaches %2. female - + %1は%2を外しました. %1 unattaches %2. male - + %1は%2を外しました. %1 creates token: %2%3. female - + %1はトークン:%2%3を作りました. %1 creates token: %2%3. male - + %1はトークン:%2%3を作りました. %1 points from her %2 to herself. female - + %1 points from his %2 to himself. male - + %1 points from her %2 to %3. p1 female, p2 female - + %1 points from her %2 to %3. p1 female, p2 male - + %1 points from his %2 to %3. p1 male, p2 female - + %1 points from his %2 to %3. p1 male, p2 male - + %1 points from %2's %3 to herself. card owner female, target female - + %1 points from %2's %3 to herself. card owner male, target female - + %1 points from %2's %3 to himself. card owner female, target male - + %1 points from %2's %3 to himself. card owner male, target male - + %1 points from %2's %3 to %4. p1 female, p2 female, p3 female - + %1 points from %2's %3 to %4. p1 female, p2 female, p3 male - + %1 points from %2's %3 to %4. p1 female, p2 male, p3 female - + %1 points from %2's %3 to %4. p1 female, p2 male, p3 male - + %1 points from %2's %3 to %4. p1 male, p2 female, p3 female - + %1 points from %2's %3 to %4. p1 male, p2 female, p3 male - + %1 points from %2's %3 to %4. p1 male, p2 male, p3 female - + %1 points from %2's %3 to %4. p1 male, p2 male, p3 male - + %1 points from her %2 to her %3. female - + %1 points from his %2 to his %3. male - + %1 points from her %2 to %3's %4. p1 female, p2 female - + %1 points from her %2 to %3's %4. p1 female, p2 male - + %1 points from his %2 to %3's %4. p1 male, p2 female - + %1 points from his %2 to %3's %4. p1 male, p2 male - + %1 points from %2's %3 to her own %4. card owner female, target female - + %1 points from %2's %3 to her own %4. card owner male, target female - + %1 points from %2's %3 to his own %4. card owner female, target male - + %1 points from %2's %3 to his own %4. card owner male, target male - + %1 points from %2's %3 to %4's %5. p1 female, p2 female, p3 female - + %1 points from %2's %3 to %4's %5. p1 female, p2 female, p3 male - + %1 points from %2's %3 to %4's %5. p1 female, p2 male, p3 female - + %1 points from %2's %3 to %4's %5. p1 female, p2 male, p3 male - + %1 points from %2's %3 to %4's %5. p1 male, p2 female, p3 female - + %1 points from %2's %3 to %4's %5. p1 male, p2 female, p3 male - + %1 points from %2's %3 to %4's %5. p1 male, p2 male, p3 female - + %1 points from %2's %3 to %4's %5. p1 male, p2 male, p3 male - + %1 places %n %2 counter(s) on %3 (now %4). female - + @@ -2392,7 +2396,7 @@ Local version is %1, remote version is %2. %1 places %n %2 counter(s) on %3 (now %4). male - + @@ -2400,7 +2404,7 @@ Local version is %1, remote version is %2. %1 removes %n %2 counter(s) from %3 (now %4). female - + @@ -2408,7 +2412,7 @@ Local version is %1, remote version is %2. %1 removes %n %2 counter(s) from %3 (now %4). male - + @@ -2416,265 +2420,265 @@ Local version is %1, remote version is %2. %1 taps her permanents. female - + %1 untaps her permanents. female - + %1 taps his permanents. male - + %1 untaps his permanents. male - + %1 taps %2. female - + %1 untaps %2. female - + %1 taps %2. male - + %1 untaps %2. male - + %1 sets counter %2 to %3 (%4%5). female - + %1 sets counter %2 to %3 (%4%5). male - + %1 sets %2 to not untap normally. female - + %1 sets %2 to not untap normally. male - + %1 sets %2 to untap normally. female - + %1 sets %2 to untap normally. male - + %1 sets PT of %2 to %3. female - + %1 sets PT of %2 to %3. male - + %1 sets annotation of %2 to %3. female - + %1 sets annotation of %2 to %3. male - + %1 is looking at the top %2 cards %3. female - + %1 is looking at the top %2 cards %3. male - + %1 is looking at %2. female - + %1 is looking at %2. male - + %1 stops looking at %2. female - + %1 stops looking at %2. male - + %1 reveals %2 to %3. p1 female, p2 female - + %1 reveals %2 to %3. p1 female, p2 male - + %1 reveals %2 to %3. p1 male, p2 female - + %1 reveals %2 to %3. p1 male, p2 male - + %1 reveals %2. female - + %1 reveals %2. male - + %1 randomly reveals %2%3 to %4. p1 female, p2 female - + %1 randomly reveals %2%3 to %4. p1 female, p2 male - + %1 randomly reveals %2%3 to %4. p1 male, p2 female - + %1 randomly reveals %2%3 to %4. p1 male, p2 male - + %1 randomly reveals %2%3. female - + %1 randomly reveals %2%3. male - + %1 reveals %2%3 to %4. p1 female, p2 female - + %1 reveals %2%3 to %4. p1 female, p2 male - + %1 reveals %2%3 to %4. p1 male, p2 female - + %1 reveals %2%3 to %4. p1 male, p2 male - + %1 reveals %2%3. female - + %1 reveals %2%3. male - + It is now %1's turn. female - + It is now %1's turn. male - + @@ -2723,12 +2727,12 @@ Local version is %1, remote version is %2. %1 draws his initial hand. - + %1 draws her initial hand. - + @@ -2744,25 +2748,25 @@ Local version is %1, remote version is %2. %1 attaches %2 to %3's %4. p1 female, p2 female - + %1 attaches %2 to %3's %4. p1 female, p2 male - + %1 attaches %2 to %3's %4. p1 male, p2 female - + %1 attaches %2 to %3's %4. p1 male, p2 male - + @@ -3383,27 +3387,27 @@ Local version is %1, remote version is %2. &Reason for shutdown: - + シャットダウンの理由: &Time until shutdown (minutes): - + シャットダウンまでの時間（分）: &OK - + OK &Cancel - + Cancel Shut down server - + サーバーシャットダウン @@ -3416,7 +3420,7 @@ Local version is %1, remote version is %2. &Shut down server - + サーバーシャットダウン @@ -3630,7 +3634,7 @@ Please enter a name: Ctrl+Q - + @@ -3773,7 +3777,7 @@ Please enter a name: Gender: - + 性別: @@ -3793,7 +3797,7 @@ Please enter a name: Moderator - + モデレーター Judge @@ -3835,17 +3839,17 @@ Please enter a name: Enable &sounds - + サウンドを許可 Path to sounds directory: - + サウンドディレクトリへのパス: Choose path - + パスを選ぶ @@ -3873,7 +3877,7 @@ Please enter a name: %1's games - + %1のゲーム @@ -3888,7 +3892,7 @@ Please enter a name: Show this user's &games - + このユーザーのゲームを表示する @@ -3970,12 +3974,12 @@ Enter 0 for an indefinite ban. &Update prices - + 価格を更新する Ctrl+U - + diff --git a/cockatrice/translations/cockatrice_ru.ts b/cockatrice/translations/cockatrice_ru.ts index a32a425d..32f6f899 100644 --- a/cockatrice/translations/cockatrice_ru.ts +++ b/cockatrice/translations/cockatrice_ru.ts @@ -94,12 +94,12 @@ Invert vertical coordinate - Инвертировать вертикальные координату + Инвертировать вертикальные координаты Minimum player count for multi-column layout: - + Минимальное количество игроков для столбчатого расположения: @@ -132,29 +132,30 @@ Please enter the duration of the ban (in minutes). Enter 0 for an indefinite ban. - Введите продолжительность бана (в минутах). + Введите продолжительность бана (в минутах). Введите 0 чтобы забанить пожизненно. Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. - + Пожалуйста, назовите причину бана. +Это необходимо для модераторов и не будет прочитано забаненным игроком. &OK - &Ок + &Ок &Cancel - &Отмена + &Отмена Ban user from server - + Забанить игрока на этом сервере @@ -190,22 +191,22 @@ This is only saved for moderators and cannot be seen by the banned person. Hide card info - + Скрыть информацию о карте Show card only - + Показывать только карту Show text only - + Показывать только текст Show full info - + Показывать полную информацию @@ -292,7 +293,7 @@ This is only saved for moderators and cannot be seen by the banned person. &Draw arrow... - + &Нарисовать стрелку... @@ -501,361 +502,361 @@ This is only saved for moderators and cannot be seen by the banned person. her hand nominative, female owner - + её рука %1's hand nominative, female owner - + рука %1-го игрока his hand nominative, male owner - + его рука %1's hand nominative, male owner - + рука %1-го игрока of her hand genitive, female owner - + её руки of %1's hand genitive, female owner - руки %1-го игрока + руки %1-го игрока of his hand genitive, male owner - его руки + его руки of %1's hand genitive, male owner - руки %1-го игрока + руки %1-го игрока her hand accusative, female owner - + её руку %1's hand accusative, female owner - + руку %1-го игрока his hand accusative, male owner - + его руку %1's hand accusative, male owner - + руку %1-го игрока her library nominative, female owner - + её библиотека %1's library nominative, female owner - + библиотека %1-го игрока his library nominative, male owner - + его библиотека %1's library nominative, male owner - + библиотека %1-го игрока of her library genitive, female owner - + её библиотеки of %1's library genitive, female owner - библиотеки %1-го игрока + библиотеки %1-го игрока of his library genitive, male owner - его библиотеки + его библиотеки of %1's library genitive, male owner - библиотеки %1-го игрока + библиотеки %1-го игрока her library accusative, female owner - + её библиотеку %1's library accusative, female owner - + библиотеку %1-го игрока his library accusative, male owner - + его библиотеку %1's library accusative, male owner - + библиотеку %1-го игрока her graveyard nominative, female owner - + её кладбище %1's graveyard nominative, female owner - кладбище %1-го игрока + кладбище %1-го игрока his graveyard nominative, male owner - его кладбище + его кладбище %1's graveyard nominative, male owner - кладбище %1-го игрока + кладбище %1-го игрока of her graveyard genitive, female owner - + её кладбища of %1's graveyard genitive, female owner - кладбища %1-го игрока + кладбища %1-го игрока of his graveyard genitive, male owner - его кладбища + его кладбища of %1's graveyard genitive, male owner - кладбища %1-го игрока + кладбища %1-го игрока her graveyard accusative, female owner - + её кладбище %1's graveyard accusative, female owner - кладбище %1-го игрока + кладбище %1-го игрока his graveyard accusative, male owner - его кладбище + его кладбище %1's graveyard accusative, male owner - кладбище %1-го игрока + кладбище %1-го игрока her exile nominative, female owner - + её изгнание %1's exile nominative, female owner - изгнание %1-го игрока + изгнание %1-го игрока his exile nominative, male owner - его изгнание + его изгнание %1's exile nominative, male owner - изгнание %1-го игрока + изгнание %1-го игрока of her exile genitive, female owner - + её изгнания of %1's exile genitive, female owner - изгнания %1-го игрока + изгнания %1-го игрока of his exile genitive, male owner - его изгнания + его изгнания of %1's exile genitive, male owner - изгнания %1-го игрока + изгнания %1-го игрока her exile accusative, female owner - + её изгнание %1's exile accusative, female owner - изгнание %1-го игрока + изгнание %1-го игрока his exile accusative, male owner - его изгнание + его изгнание %1's exile accusative, male owner - изгнание %1-го игрока + изгнание %1-го игрока her sideboard nominative, female owner - + её сайд %1's sideboard nominative, female owner - сайд %1-го игрока + сайд %1-го игрока his sideboard nominative, male owner - его сайд + его сайд %1's sideboard nominative, male owner - сайд %1-го игрока + сайд %1-го игрока of her sideboard genitive, female owner - + её сайда of %1's sideboard genitive, female owner - сайда %1-го игрока + сайда %1-го игрока of his sideboard genitive, male owner - его сайда + его сайда of %1's sideboard genitive, male owner - сайда %1-го игрока + сайда %1-го игрока her sideboard accusative, female owner - + её сайд %1's sideboard accusative, female owner - сайд %1-го игрока + сайд %1-го игрока his sideboard accusative, male owner - его сайд + его сайд %1's sideboard accusative, male owner - сайд %1-го игрока + сайд %1-го игрока his graveyard @@ -953,12 +954,12 @@ This is only saved for moderators and cannot be seen by the banned person. Enable &price tag feature (using data from blacklotusproject.com) - + Подписывать &цены (по данным blacklotusproject.com) General - Основные + Основные @@ -976,7 +977,7 @@ This is only saved for moderators and cannot be seen by the banned person. Price - + Цена @@ -1347,7 +1348,7 @@ This is only saved for moderators and cannot be seen by the banned person. Deck editor - + Редактор колод @@ -1377,7 +1378,7 @@ This is only saved for moderators and cannot be seen by the banned person. Please join the appropriate room first. - + Пожалуйста, сперва войдите в соответствующую комнату. @@ -1437,7 +1438,7 @@ This is only saved for moderators and cannot be seen by the banned person. Show &running games - + Показывать &текущие @@ -1498,7 +1499,7 @@ This is only saved for moderators and cannot be seen by the banned person. Room - Комната + Комната @@ -1602,7 +1603,7 @@ This is only saved for moderators and cannot be seen by the banned person. Scheduled server shutdown. - + Плановый перерыв в работе сервера. @@ -1624,15 +1625,17 @@ Reason: %1 Scheduled server shutdown - + Плановый перерыв в работе сервера The server is going to be restarted in %n minute(s). All running games will be lost. Reason for shutdown: %1 - - + + Сервер будет перезагружен через %n минут(ы). +Все незавершенные игры будут потеряны. +Причина перезагрузки: %1 @@ -1706,12 +1709,12 @@ Reason for shutdown: %1 Czech: - + Чешский: Slovak: - + Словацкий: @@ -1938,161 +1941,161 @@ Local version is %1, remote version is %2. You have joined game #%1. female - Вы присоединились к игре #%1. + Вы присоединились к игре #%1. You have joined game #%1. male - Вы присоединились к игре #%1. + Вы присоединились к игре #%1. %1 has joined the game. female - %1 присоединился к игре. + %1 присоединилась к игре. %1 has joined the game. male - %1 присоединился к игре. + %1 присоединился к игре. %1 has left the game. female - %1 покиул игру. + %1 покинула игру. %1 has left the game. male - %1 покиул игру. + %1 покинул игру. %1 has loaded a local deck. female - %1 загрузил колоду с диска. + %1 загрузила колоду с диска. %1 has loaded a local deck. male - %1 загрузил колоду с диска. + %1 загрузил колоду с диска. %1 has loaded deck #%2. female - %1 загрузил колоду #%2. + %1 загрузила колоду #%2. %1 has loaded deck #%2. male - %1 загрузил колоду #%2. + %1 загрузил колоду #%2. %1 is ready to start the game. female - %1 готов начать игру. + %1 готова начать игру. %1 is ready to start the game. male - %1 готов начать игру. + %1 готов начать игру. %1 is not ready to start the game any more. female - %1 все еще не готов. + %1 все еще не готова. %1 is not ready to start the game any more. male - %1 все еще не готов. + %1 все еще не готов. %1 has conceded the game. female - %1 решил сдаться. + %1 решила сдаться. %1 has conceded the game. male - %1 решил сдаться. + %1 решил сдаться. %1 has restored connection to the game. female - + %1 вернулась к игре. %1 has restored connection to the game. male - + %1 вернулся к игре. %1 has lost connection to the game. female - + %1 потеряла соединение с сервером. %1 has lost connection to the game. male - + %1 потерял соединение с сервером. %1 shuffles %2. female - + %1 размешивает %2. %1 shuffles %2. male - + %1 размешивает %2. %1 rolls a %2 with a %3-sided die. female - %1 выкинул %2 / %3. + %1 выкинул %2 / %3. %1 rolls a %2 with a %3-sided die. male - %1 выкинул %2 / %3. + %1 выкинул %2 / %3. %1 draws %n card(s). female - - %1 взял %n карту. - %1 взял %n карты. - %1 взял %n карт(ы). + + %1 взяла %n карту. + %1 взяла %n карты. + %1 взяла %n карт(ы). %1 draws %n card(s). male - + %1 взял %n карту. %1 взял %n карты. %1 взял %n карт(ы). @@ -2228,57 +2231,57 @@ Local version is %1, remote version is %2. %1 takes a mulligan to %n. female - - - - + + %1 взяла страховку до %n. + %1 взяла страховку до %n. + %1 взяла страховку до %n. %1 takes a mulligan to %n. male - - - - + + %1 взял страховку до %n. + %1 взял страховку до %n. + %1 взял страховку до %n. %1 flips %2 face-down. female - %1 перевернул %2 лицом вниз. + %1 перевернула %2 лицом вниз. %1 flips %2 face-down. male - %1 перевернул %2 лицом вниз. + %1 перевернул %2 лицом вниз. %1 flips %2 face-up. female - %1 перевернул %2 лицом вверх. + %1 перевернула %2 лицом вверх. %1 flips %2 face-up. male - %1 перевернул %2 лицом вверх. + %1 перевернул %2 лицом вверх. %1 destroys %2. female - %1 уничтожил %2. + %1 уничтожила %2. %1 destroys %2. male - %1 уничтожил %2. + %1 уничтожил %2. %1 attaches %2 to %3's %4. @@ -2294,281 +2297,281 @@ Local version is %1, remote version is %2. %1 attaches %2 to %3's %4. p1 female, p2 female - %1 присоединил %2 к %4 игрока %3. + %1 присоединила %2 к %4 игрока %3. %1 attaches %2 to %3's %4. p1 female, p2 male - %1 присоединил %2 к %4 игрока %3. + %1 присоединила %2 к %4 игрока %3. %1 attaches %2 to %3's %4. p1 male, p2 female - %1 присоединил %2 к %4 игрока %3. + %1 присоединил %2 к %4 игрока %3. %1 attaches %2 to %3's %4. p1 male, p2 male - %1 присоединил %2 к %4 игрока %3. + %1 присоединил %2 к %4 игрока %3. %1 unattaches %2. female - %1 отсоединил %2. + %1 отсоединила %2. %1 unattaches %2. male - %1 отсоединил %2. + %1 отсоединил %2. %1 creates token: %2%3. female - %1 создал фишку: %2%3. + %1 создала фишку: %2%3. %1 creates token: %2%3. male - %1 создал фишку: %2%3. + %1 создал фишку: %2%3. %1 points from her %2 to herself. female - + %1 указывает с %2 на себя-любимую. %1 points from his %2 to himself. male - + %1 указывает с %2 на себя. %1 points from her %2 to %3. p1 female, p2 female - + %1 указывает с %2 на %3. %1 points from her %2 to %3. p1 female, p2 male - + %1 указывает с %2 на %3. %1 points from his %2 to %3. p1 male, p2 female - + %1 указывает с %2 на %3. %1 points from his %2 to %3. p1 male, p2 male - + %1 указывает с %2 на %3. %1 points from %2's %3 to herself. card owner female, target female - + %1 указывает с %3, контролируемого %2, на себя. %1 points from %2's %3 to herself. card owner male, target female - + %1 указывает с %3, контролируемого %2, на себя. %1 points from %2's %3 to himself. card owner female, target male - + %1 указывает с %3, контролируемого %2, на себя. %1 points from %2's %3 to himself. card owner male, target male - + %1 указывает с %3, контролируемого %2, на себя. %1 points from %2's %3 to %4. p1 female, p2 female, p3 female - %1 указывает с %3 контролируемого %2 на %4. + %1 указывает с %3, контролируемого %2, на %4. %1 points from %2's %3 to %4. p1 female, p2 female, p3 male - %1 указывает с %3 контролируемого %2 на %4. + %1 указывает с %3, контролируемого %2, на %4. %1 points from %2's %3 to %4. p1 female, p2 male, p3 female - %1 указывает с %3 контролируемого %2 на %4. + %1 указывает с %3, контролируемого %2, на %4. %1 points from %2's %3 to %4. p1 female, p2 male, p3 male - %1 указывает с %3 контролируемого %2 на %4. + %1 указывает с %3, контролируемого %2, на %4. %1 points from %2's %3 to %4. p1 male, p2 female, p3 female - %1 указывает с %3 контролируемого %2 на %4. + %1 указывает с %3, контролируемого %2, на %4. %1 points from %2's %3 to %4. p1 male, p2 female, p3 male - %1 указывает с %3 контролируемого %2 на %4. + %1 указывает с %3, контролируемого %2, на %4. %1 points from %2's %3 to %4. p1 male, p2 male, p3 female - %1 указывает с %3 контролируемого %2 на %4. + %1 указывает с %3, контролируемого %2, на %4. %1 points from %2's %3 to %4. p1 male, p2 male, p3 male - %1 указывает с %3 контролируемого %2 на %4. + %1 указывает с %3, контролируемого %2 на %4. %1 points from her %2 to her %3. female - + %1 указывает с её %2 на её %3. %1 points from his %2 to his %3. male - + %1 указывает с его %2 на его %3. %1 points from her %2 to %3's %4. p1 female, p2 female - + %1 указывает с её %2 на %4 под контролем %3. %1 points from her %2 to %3's %4. p1 female, p2 male - + %1 указывает с её %2 на %4 под контролем %3. %1 points from his %2 to %3's %4. p1 male, p2 female - + %1 указывает с его %2 на %4 под контролем %3. %1 points from his %2 to %3's %4. p1 male, p2 male - + %1 указывает с его %2 на %4 под контролем %3. %1 points from %2's %3 to her own %4. card owner female, target female - + %1 указывает с %3 под контролем %2 на %4, владельцем которого она является. %1 points from %2's %3 to her own %4. card owner male, target female - + %1 указывает с %3 под контролем %2 на %4, владельцем которого он является. %1 points from %2's %3 to his own %4. card owner female, target male - + %1 указывает с %3 под контролем %2 на %4, владельцем которого она является. %1 points from %2's %3 to his own %4. card owner male, target male - + %1 указывает с %3 под контролем %2 на %4, владельцем которого он является. %1 points from %2's %3 to %4's %5. p1 female, p2 female, p3 female - %1 указывает с %3 контролируемого %2 на %5 контролируемого %4. + %1 указывает с %3 контролируемого %2 на %5 под контролем %4. %1 points from %2's %3 to %4's %5. p1 female, p2 female, p3 male - %1 указывает с %3 контролируемого %2 на %5 контролируемого %4. + %1 указывает с %3 контролируемого %2 на %5 под контролем %4. %1 points from %2's %3 to %4's %5. p1 female, p2 male, p3 female - %1 указывает с %3 контролируемого %2 на %5 контролируемого %4. + %1 указывает с %3 контролируемого %2 на %5 под контролем %4. %1 points from %2's %3 to %4's %5. p1 female, p2 male, p3 male - %1 указывает с %3 контролируемого %2 на %5 контролируемого %4. + %1 указывает с %3 контролируемого %2 на %5 под контролем %4. %1 points from %2's %3 to %4's %5. p1 male, p2 female, p3 female - %1 указывает с %3 контролируемого %2 на %5 контролируемого %4. + %1 указывает с %3 контролируемого %2 на %5 под контролем %4. %1 points from %2's %3 to %4's %5. p1 male, p2 female, p3 male - %1 указывает с %3 контролируемого %2 на %5 контролируемого %4. + %1 указывает с %3 контролируемого %2 на %5 под контролем %4. %1 points from %2's %3 to %4's %5. p1 male, p2 male, p3 female - %1 указывает с %3 контролируемого %2 на %5 контролируемого %4. + %1 указывает с %3 контролируемого %2 на %5 под контролем %4. %1 points from %2's %3 to %4's %5. p1 male, p2 male, p3 male - %1 указывает с %3 контролируемого %2 на %5 контролируемого %4. + %1 указывает с %3 контролируемого %2 на %5 под контролем %4. %1 places %n %2 counter(s) on %3 (now %4). female - - %1 поместил %n %2 жетон на %3 (теперь %4). - %1 поместил %n %2 жетона на %3 (теперь %4). - %1 поместил %n %2 жетонов на %3 (теперь %4). + + %1 поместила %n %2 жетон на %3 (теперь %4). + %1 поместила %n %2 жетона на %3 (теперь %4). + %1 поместила %n %2 жетонов на %3 (теперь %4). %1 places %n %2 counter(s) on %3 (now %4). male - + %1 поместил %n %2 жетон на %3 (теперь %4). %1 поместил %n %2 жетона на %3 (теперь %4). %1 поместил %n %2 жетонов на %3 (теперь %4). @@ -2578,17 +2581,17 @@ Local version is %1, remote version is %2. %1 removes %n %2 counter(s) from %3 (now %4). female - - %1 снял %n %2 жетон с %3 (теперь %4). - %1 снял %n %2 жетона с %3 (теперь %4). - %1 снял %n %2 жетонов с %3 (теперь %4). + + %1 сняла %n %2 жетон с %3 (теперь %4). + %1 сняла %n %2 жетона с %3 (теперь %4). + %1 сняла %n %2 жетонов с %3 (теперь %4). %1 removes %n %2 counter(s) from %3 (now %4). male - + %1 снял %n %2 жетон с %3 (теперь %4). %1 снял %n %2 жетона с %3 (теперь %4). %1 снял %n %2 жетонов с %3 (теперь %4). @@ -2598,265 +2601,265 @@ Local version is %1, remote version is %2. %1 taps her permanents. female - + %1 повернула свои перманенты. %1 untaps her permanents. female - + %1 развернула свои перманенты. %1 taps his permanents. male - + %1 повернул свои перманенты. %1 untaps his permanents. male - + %1 развернул свои перманенты. %1 taps %2. female - + %1 повернула %2. %1 untaps %2. female - + %1 развернула %2. %1 taps %2. male - + %1 повернул %2. %1 untaps %2. male - + %1 развернул %2. %1 sets counter %2 to %3 (%4%5). female - %1 установил жетон %2 на %3 (%4%5). + %1 установила жетон %2 на %3 (%4%5). %1 sets counter %2 to %3 (%4%5). male - %1 установил жетон %2 на %3 (%4%5). + %1 установил жетон %2 на %3 (%4%5). %1 sets %2 to not untap normally. female - %2 теперь не разворачивается как обычно (%1). + %2 теперь не разворачивается как обычно (%1). %1 sets %2 to not untap normally. male - %2 теперь не разворачивается как обычно (%1). + %2 теперь не разворачивается как обычно (%1). %1 sets %2 to untap normally. female - %2 теперь разворачивается как обычно (%1). + %2 теперь разворачивается как обычно (%1). %1 sets %2 to untap normally. male - %2 теперь разворачивается как обычно (%1). + %2 теперь разворачивается как обычно (%1). %1 sets PT of %2 to %3. female - %1 установил Силу/Защиту %2 %3. + %1 установила Силу/Защиту %2 %3. %1 sets PT of %2 to %3. male - %1 установил Силу/Защиту %2 %3. + %1 установил Силу/Защиту %2 %3. %1 sets annotation of %2 to %3. female - %1 сделал пометку на %2 "%3". + %1 пометила %2 "%3". %1 sets annotation of %2 to %3. male - %1 сделал пометку на %2 "%3". + %1 пометил %2 "%3". %1 is looking at the top %2 cards %3. female - %1 смотрит верхние %2 карт библиотеки %3. + %1 смотрит верхние %2 карт библиотеки %3. %1 is looking at the top %2 cards %3. male - %1 смотрит верхние %2 карт библиотеки %3. + %1 смотрит верхние %2 карт библиотеки %3. %1 is looking at %2. female - %1 просматривает %2. + %1 просматривает %2. %1 is looking at %2. male - %1 просматривает %2. + %1 просматривает %2. %1 stops looking at %2. female - %1 закончил просматривать %2. + %1 закончила просматривать %2. %1 stops looking at %2. male - %1 закончил просматривать %2. + %1 закончил просматривать %2. %1 reveals %2 to %3. p1 female, p2 female - %1 показывает его %2 %3. + %1 показывает её %2 %3. %1 reveals %2 to %3. p1 female, p2 male - %1 показывает его %2 %3. + %1 показывает её %2 %3. %1 reveals %2 to %3. p1 male, p2 female - %1 показывает его %2 %3. + %1 показывает его %2 %3. %1 reveals %2 to %3. p1 male, p2 male - %1 показывает его %2 %3. + %1 показывает его %2 %3. %1 reveals %2. female - %1 открыл его %2. + %1 открыла её %2. %1 reveals %2. male - %1 открыл его %2. + %1 открыл его %2. %1 randomly reveals %2%3 to %4. p1 female, p2 female - %1 показывает случайно выбранную%3 карту (%2) %4. + %1 показывает случайно выбранную%3 карту (%2) %4. %1 randomly reveals %2%3 to %4. p1 female, p2 male - %1 показывает случайно выбранную%3 карту (%2) %4. + %1 показывает случайно выбранную%3 карту (%2) %4. %1 randomly reveals %2%3 to %4. p1 male, p2 female - %1 показывает случайно выбранную%3 карту (%2) %4. + %1 показывает случайно выбранную%3 карту (%2) %4. %1 randomly reveals %2%3 to %4. p1 male, p2 male - %1 показывает случайно выбранную%3 карту (%2) %4. + %1 показывает случайно выбранную%3 карту (%2) %4. %1 randomly reveals %2%3. female - %1 открывает случайно выбранную%3 карту (%2). + %1 показывает случайно выбранную%3 карту (%2). %1 randomly reveals %2%3. male - %1 открывает случайно выбранную%3 карту (%2). + %1 показывает случайно выбранную%3 карту (%2). %1 reveals %2%3 to %4. p1 female, p2 female - %1 показывает%2%3 %4. + %1 показывает%2%3 %4. %1 reveals %2%3 to %4. p1 female, p2 male - %1 показывает%2%3 %4. + %1 показывает%2%3 %4. %1 reveals %2%3 to %4. p1 male, p2 female - %1 показывает%2%3 %4. + %1 показывает%2%3 %4. %1 reveals %2%3 to %4. p1 male, p2 male - %1 показывает%2%3 %4. + %1 показывает%2%3 %4. %1 reveals %2%3. female - %1 открывает%2%3. + %1 показывает%2%3. %1 reveals %2%3. male - %1 открывает%2%3. + %1 показывает%2%3. It is now %1's turn. female - Ход игрока %1. + Ход очаровательной %1. It is now %1's turn. male - Ход игрока %1. + Ход игрока %1. %1 flips %2 face-down. @@ -2917,32 +2920,32 @@ Local version is %1, remote version is %2. %1 undoes her last draw. - + %1 отменила последнее взятие. %1 undoes her last draw (%2). - + %1 отменила %2 последних взятий. the bottom card of her library - + нижнюю карту своей библиотеки from the bottom of her library - + со дна своей библиотеки the top card of her library - + верхнюю карту своей библиотеки from the top of her library - + с верха своей библиотеки @@ -2952,32 +2955,32 @@ Local version is %1, remote version is %2. %1 puts %2%3 into her library. - + %1 поместила %2%3 в свою библиотеку. %1 puts %2%3 on bottom of her library. - + %1 поместила %2%3 на дно своей библиотеки. %1 puts %2%3 on top of her library. - + %1 поместила %2%3 на верх своей библиотеки. %1 puts %2%3 into her library at position %4. - + %1 поместила %2%3 в свою библиотеку %4 сверху. %1 draws his initial hand. - + %1 взял свою стартовую руку. %1 draws her initial hand. - + %1 взяла свою стартовую руку. %1 places %n %2 counter(s) on %3 (now %4). @@ -3720,27 +3723,27 @@ Local version is %1, remote version is %2. &Reason for shutdown: - + &Причина отключения: &Time until shutdown (minutes): - + &Время до отключения (в минутах): &OK - &Ок + &Ок &Cancel - &Отмена + &Отмена Shut down server - + Отключение сервера @@ -3753,7 +3756,7 @@ Local version is %1, remote version is %2. &Shut down server - + &Отключение сервера @@ -3934,7 +3937,7 @@ Please enter a name: &Concede - Сда&юсь! + &Сдаться... @@ -3949,7 +3952,7 @@ Please enter a name: Ctrl+Q - + Ctrl+Q @@ -3964,7 +3967,7 @@ Please enter a name: Are you sure you want to concede this game? - Испугался? + Вы точно хотите сдаться? @@ -4007,7 +4010,7 @@ Please enter a name: This user is ignoring you. - Этот пользователь добавил вас в игнор-лист. + Этот пользователь добавил вас в игнор. @@ -4084,7 +4087,7 @@ Please enter a name: Gender: - + Пол: @@ -4104,7 +4107,7 @@ Please enter a name: Moderator - + Модератор Judge @@ -4146,17 +4149,18 @@ Please enter a name: Enable &sounds - + Yaaaaahoooo! All I needed for full happiness :) + Вкючить &звуки Path to sounds directory: - + Путь к папке со звуками: Choose path - + Укажите путь @@ -4184,7 +4188,7 @@ Please enter a name: %1's games - + Игры %1 @@ -4199,7 +4203,7 @@ Please enter a name: Show this user's &games - + Показывать игры &этого пользователя @@ -4267,12 +4271,12 @@ Enter 0 for an indefinite ban. &Update prices - + &Обновить цены Ctrl+U - + Ctrl+U diff --git a/nsis/cockatrice.nsi b/nsis/cockatrice.nsi index 8c4c31a6..aa24cadf 100644 --- a/nsis/cockatrice.nsi +++ b/nsis/cockatrice.nsi @@ -41,6 +41,7 @@ Section "Application" SecApplication File data\QtSvg4.dll File data\QtXml4.dll File data\QtMultimedia4.dll + File data\QtScript4.dll SetOutPath "$INSTDIR\zonebg" File /r ..\zonebg\*.*