From b3812989817a3db9ea22eb6edcffa7a786c1f2a1 Mon Sep 17 00:00:00 2001 From: Antony Woods Date: Wed, 27 Aug 2014 21:25:11 +0100 Subject: [PATCH 1/3] Added 'auto connect' checkbox to connect dialog. When the main window becomes active for the first time and auto connect is set to true, it will call connectToServer at that point. --- cockatrice/src/dlg_connect.cpp | 40 +++++++++++++++++++++++++++++++- cockatrice/src/dlg_connect.h | 4 +++- cockatrice/src/settingscache.cpp | 8 +++++++ cockatrice/src/settingscache.h | 3 +++ cockatrice/src/window_main.cpp | 13 ++++++++++- cockatrice/src/window_main.h | 1 + 6 files changed, 66 insertions(+), 3 deletions(-) diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp index d1955d14..f13b2f8f 100644 --- a/cockatrice/src/dlg_connect.cpp +++ b/cockatrice/src/dlg_connect.cpp @@ -4,6 +4,8 @@ #include #include #include +#include +#include #include "dlg_connect.h" DlgConnect::DlgConnect(QWidget *parent) @@ -32,6 +34,20 @@ DlgConnect::DlgConnect(QWidget *parent) savePasswordCheckBox = new QCheckBox(tr("&Save password")); savePasswordCheckBox->setChecked(settings.value("save_password", 1).toInt()); + //autoConnectCheckBox = new QCheckBox(tr("A&uto connect at start")); + autoConnectCheckBox = new QCheckBox("A&uto connect at start"); // TODO needs tr() + if(savePasswordCheckBox->isChecked()) + { + autoConnectCheckBox->setChecked(settings.value("auto_connect", 0).toInt()); + autoConnectCheckBox->setEnabled(true); + } else { + settings.setValue("auto_connect", 0); + autoConnectCheckBox->setChecked(0); + autoConnectCheckBox->setEnabled(false); + } + + connect(savePasswordCheckBox, SIGNAL(stateChanged(int)), this, SLOT(passwordSaved(int))); + QGridLayout *grid = new QGridLayout; grid->addWidget(hostLabel, 0, 0); grid->addWidget(hostEdit, 0, 1); @@ -42,10 +58,11 @@ DlgConnect::DlgConnect(QWidget *parent) grid->addWidget(passwordLabel, 3, 0); grid->addWidget(passwordEdit, 3, 1); grid->addWidget(savePasswordCheckBox, 4, 0, 1, 2); + grid->addWidget(autoConnectCheckBox, 5, 0, 1, 2); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); connect(buttonBox, SIGNAL(accepted()), this, SLOT(actOk())); - connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); + connect(buttonBox, SIGNAL(rejected()), this, SLOT(actCancel())); QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addLayout(grid); @@ -57,6 +74,17 @@ DlgConnect::DlgConnect(QWidget *parent) setMinimumWidth(300); } +void DlgConnect::passwordSaved(int state) +{ + if(!savePasswordCheckBox->isChecked()) + { + autoConnectCheckBox->setChecked(0); + autoConnectCheckBox->setEnabled(false); + } else { + autoConnectCheckBox->setEnabled(true); + } +} + void DlgConnect::actOk() { QSettings settings; @@ -66,7 +94,17 @@ void DlgConnect::actOk() settings.setValue("playername", playernameEdit->text()); settings.setValue("password", savePasswordCheckBox->isChecked() ? passwordEdit->text() : QString()); settings.setValue("save_password", savePasswordCheckBox->isChecked() ? 1 : 0); + settings.setValue("auto_connect", autoConnectCheckBox->isChecked() ? 1 : 0); settings.endGroup(); accept(); } + +void DlgConnect::actCancel() +{ + QSettings settings; + settings.beginGroup("server"); + settings.setValue("auto_connect", autoConnectCheckBox->isChecked() ? 1 : 0); + settings.endGroup(); + reject(); +} diff --git a/cockatrice/src/dlg_connect.h b/cockatrice/src/dlg_connect.h index 87fe4ed9..6f135aa0 100644 --- a/cockatrice/src/dlg_connect.h +++ b/cockatrice/src/dlg_connect.h @@ -18,10 +18,12 @@ public: QString getPassword() const { return passwordEdit->text(); } private slots: void actOk(); + void actCancel(); + void passwordSaved(int state); private: QLabel *hostLabel, *portLabel, *playernameLabel, *passwordLabel; QLineEdit *hostEdit, *portEdit, *playernameEdit, *passwordEdit; - QCheckBox *savePasswordCheckBox; + QCheckBox *savePasswordCheckBox, *autoConnectCheckBox; }; #endif diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp index 5f504aa3..92c06041 100644 --- a/cockatrice/src/settingscache.cpp +++ b/cockatrice/src/settingscache.cpp @@ -48,6 +48,8 @@ SettingsCache::SettingsCache() priceTagSource = settings->value("deckeditor/pricetagsource", 0).toInt(); ignoreUnregisteredUsers = settings->value("chat/ignore_unregistered", false).toBool(); + + attemptAutoConnect = settings->value("server/auto_connect", 0).toInt() == 0 ? false : true; } void SettingsCache::setLang(const QString &_lang) @@ -267,6 +269,12 @@ void SettingsCache::setMainWindowGeometry(const QByteArray &_mainWindowGeometry) settings->setValue("interface/main_window_geometry", mainWindowGeometry); } +void SettingsCache::setAutoConnect(const bool &_autoConnect) +{ + attemptAutoConnect = _autoConnect; + settings->value("server/auto_connect", attemptAutoConnect ? 1 : 0); +} + void SettingsCache::copyPath(const QString &src, const QString &dst) { // test source && return if inexistent diff --git a/cockatrice/src/settingscache.h b/cockatrice/src/settingscache.h index 3b4d612d..b222a58b 100644 --- a/cockatrice/src/settingscache.h +++ b/cockatrice/src/settingscache.h @@ -57,6 +57,7 @@ private: bool ignoreUnregisteredUsers; QString picUrl; QString picUrlHq; + bool attemptAutoConnect; public: SettingsCache(); const QByteArray &getMainWindowGeometry() const { return mainWindowGeometry; } @@ -93,6 +94,7 @@ public: QString getPicUrl() const { return picUrl; } QString getPicUrlHq() const { return picUrlHq; } void copyPath(const QString &src, const QString &dst); + bool getAutoConnect() const { return attemptAutoConnect; } public slots: void setMainWindowGeometry(const QByteArray &_mainWindowGeometry); void setLang(const QString &_lang); @@ -127,6 +129,7 @@ public slots: void setIgnoreUnregisteredUsers(bool _ignoreUnregisteredUsers); void setPicUrl(const QString &_picUrl); void setPicUrlHq(const QString &_picUrlHq); + void setAutoConnect(const bool &_autoConnect); }; extern SettingsCache *settingsCache; diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index 43b0624e..51a09418 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -359,7 +359,7 @@ void MainWindow::createMenus() } MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent), localServer(0) + : QMainWindow(parent), localServer(0), bHasActivated(false) { QPixmapCache::setCacheLimit(200000); @@ -417,5 +417,16 @@ void MainWindow::changeEvent(QEvent *event) { if (event->type() == QEvent::LanguageChange) retranslateUi(); + else if(event->type() == QEvent::ActivationChange) { + if(isActiveWindow() && !bHasActivated){ + bHasActivated = true; + if(settingsCache->getAutoConnect()) { + qDebug() << "Attempting auto-connect..."; + DlgConnect dlg(this); + client->connectToServer(dlg.getHost(), dlg.getPort(), dlg.getPlayerName(), dlg.getPassword()); + } + } + } + QMainWindow::changeEvent(event); } diff --git a/cockatrice/src/window_main.h b/cockatrice/src/window_main.h index 07ad1d71..e804bbe6 100644 --- a/cockatrice/src/window_main.h +++ b/cockatrice/src/window_main.h @@ -71,6 +71,7 @@ private: QThread *clientThread; LocalServer *localServer; + bool bHasActivated; public: MainWindow(QWidget *parent = 0); ~MainWindow(); From ab83d6185a6b6e4017fc659e3b4636c3cd7910a6 Mon Sep 17 00:00:00 2001 From: Antony Woods Date: Fri, 29 Aug 2014 16:53:30 +0100 Subject: [PATCH 2/3] Used tr() function for auto-connect label. Changed formatting to adhere to coding style guidelines. 'Save Password' setting is now saved when cancelling the Connect dialog --- cockatrice/src/dlg_connect.cpp | 12 ++++++------ cockatrice/src/settingscache.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp index f13b2f8f..152d62b9 100644 --- a/cockatrice/src/dlg_connect.cpp +++ b/cockatrice/src/dlg_connect.cpp @@ -34,8 +34,7 @@ DlgConnect::DlgConnect(QWidget *parent) savePasswordCheckBox = new QCheckBox(tr("&Save password")); savePasswordCheckBox->setChecked(settings.value("save_password", 1).toInt()); - //autoConnectCheckBox = new QCheckBox(tr("A&uto connect at start")); - autoConnectCheckBox = new QCheckBox("A&uto connect at start"); // TODO needs tr() + autoConnectCheckBox = new QCheckBox(tr("A&uto connect at start")); if(savePasswordCheckBox->isChecked()) { autoConnectCheckBox->setChecked(settings.value("auto_connect", 0).toInt()); @@ -76,12 +75,11 @@ DlgConnect::DlgConnect(QWidget *parent) void DlgConnect::passwordSaved(int state) { - if(!savePasswordCheckBox->isChecked()) - { + if(savePasswordCheckBox->isChecked()) { + autoConnectCheckBox->setEnabled(true); + } else { autoConnectCheckBox->setChecked(0); autoConnectCheckBox->setEnabled(false); - } else { - autoConnectCheckBox->setEnabled(true); } } @@ -104,7 +102,9 @@ void DlgConnect::actCancel() { QSettings settings; settings.beginGroup("server"); + settings.setValue("save_password", savePasswordCheckBox->isChecked() ? 1 : 0); settings.setValue("auto_connect", autoConnectCheckBox->isChecked() ? 1 : 0); settings.endGroup(); + reject(); } diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp index 92c06041..bc30a08b 100644 --- a/cockatrice/src/settingscache.cpp +++ b/cockatrice/src/settingscache.cpp @@ -49,7 +49,7 @@ SettingsCache::SettingsCache() ignoreUnregisteredUsers = settings->value("chat/ignore_unregistered", false).toBool(); - attemptAutoConnect = settings->value("server/auto_connect", 0).toInt() == 0 ? false : true; + attemptAutoConnect = settings->value("server/auto_connect", 0).toBool(); } void SettingsCache::setLang(const QString &_lang) From f1b012c83dba205bb48a89572ec64d06967418bb Mon Sep 17 00:00:00 2001 From: Antony Woods Date: Tue, 9 Sep 2014 17:30:37 +0100 Subject: [PATCH 3/3] Adding modified translation files --- cockatrice/translations/cockatrice_cs.ts | 51 +++++++------- cockatrice/translations/cockatrice_de.ts | 75 +++++++++++---------- cockatrice/translations/cockatrice_en.ts | 19 ++++-- cockatrice/translations/cockatrice_es.ts | 75 +++++++++++---------- cockatrice/translations/cockatrice_fr.ts | 55 ++++++++------- cockatrice/translations/cockatrice_gd.ts | 25 ++++--- cockatrice/translations/cockatrice_it.ts | 75 +++++++++++---------- cockatrice/translations/cockatrice_ja.ts | 55 ++++++++------- cockatrice/translations/cockatrice_pl.ts | 27 +++++--- cockatrice/translations/cockatrice_pt-br.ts | 45 +++++++------ cockatrice/translations/cockatrice_pt.ts | 75 +++++++++++---------- cockatrice/translations/cockatrice_ru.ts | 55 ++++++++------- cockatrice/translations/cockatrice_sk.ts | 19 ++++-- cockatrice/translations/cockatrice_sv.ts | 65 +++++++++--------- cockatrice/translations/cockatrice_zh_CN.ts | 19 ++++-- 15 files changed, 405 insertions(+), 330 deletions(-) diff --git a/cockatrice/translations/cockatrice_cs.ts b/cockatrice/translations/cockatrice_cs.ts index bfd7fb3b..7d9db950 100644 --- a/cockatrice/translations/cockatrice_cs.ts +++ b/cockatrice/translations/cockatrice_cs.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -43,23 +43,23 @@ Path to hand background: - Cesta k pozadí ruky: + Cesta k pozadí ruky: Path to stack background: - Cesta k pozadí stacku: + Cesta k pozadí stacku: Path to table background: - Cesta k pozadí stolu: + Cesta k pozadí stolu: Path to player info background: - Cesta k pozadí informací o uživateli: + Cesta k pozadí informací o uživateli: Path to picture of card back: - Cesta k rubu karet: + Cesta k rubu karet: @@ -1063,7 +1063,7 @@ This is only saved for moderators and cannot be seen by the banned person.DeckEditorSettingsPage Enable &price tag feature (using data from blacklotusproject.com) - &Povolit zobrazovaní cen (použijí se data z blacklotusproject.com) + &Povolit zobrazovaní cen (použijí se data z blacklotusproject.com) @@ -1202,30 +1202,35 @@ This is only saved for moderators and cannot be seen by the banned person. DlgConnect - + &Host: &Hostitel: - + &Port: &Port: - + Player &name: Jméno &hráče: - + P&assword: H&eslo: - + &Save password + + + A&uto connect at start + + &OK &OK @@ -1235,7 +1240,7 @@ This is only saved for moderators and cannot be seen by the banned person.&Zrušit - + Connect to server Připojit k serveru @@ -1636,7 +1641,7 @@ This is only saved for moderators and cannot be seen by the banned person. Your card database is invalid. Would you like to go back and set the correct path? - Cesta k databázi je neplatná. Chcete se vrátit a nastavit správnou? + Cesta k databázi je neplatná. Chcete se vrátit a nastavit správnou? @@ -2022,7 +2027,7 @@ Would you like to change your database location setting? Path to card database: - Karetní databáze: + Karetní databáze: @@ -2141,7 +2146,7 @@ Reason for shutdown: %1 Czech: - Čeština: + Čeština: Slovak: @@ -2204,7 +2209,7 @@ Reason for shutdown: %1 Invalid login data. - Nesprávné údaje uživatele. + Nesprávné údaje uživatele. @@ -2518,12 +2523,12 @@ Lokální verze je %1, verze serveru je %2. %1 has loaded a deck (%2). female - %1 nahrál balíček %2. + %1 nahrál balíček %2. %1 has loaded a deck (%2). male - %1 nahrál balíček %2. + %1 nahrál balíček %2. @@ -4624,7 +4629,7 @@ Lokální verze je %1, verze serveru je %2. Administration - Administrace + Administrace @@ -4933,7 +4938,7 @@ Prosím vložte jméno: Deck storage - Uložiště balíčků + Uložiště balíčků @@ -5218,14 +5223,14 @@ Prosím vložte jméno: TabServer Server - Server + Server TabUserLists User lists - Seznam uživatelů + Seznam uživatelů diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts index fedd2a5a..ec90f35a 100644 --- a/cockatrice/translations/cockatrice_de.ts +++ b/cockatrice/translations/cockatrice_de.ts @@ -1,6 +1,6 @@ - + @@ -66,23 +66,23 @@ Path to hand background: - Hintergrundbild für die Hand: + Hintergrundbild für die Hand: Path to stack background: - Hintergrundbild für den Stapel: + Hintergrundbild für den Stapel: Path to table background: - Hintergrundbild für das Spielfeld: + Hintergrundbild für das Spielfeld: Path to player info background: - Hintergrundbild für den Spielerbereich: + Hintergrundbild für den Spielerbereich: Path to picture of card back: - Pfad zum Bild der Kartenrückseite: + Pfad zum Bild der Kartenrückseite: @@ -1384,7 +1384,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic DeckEditorSettingsPage Enable &price tag feature (using data from blacklotusproject.com) - Karten&preisfunktionen anschalten (benutzt Daten von blacklotusproject.com) + Karten&preisfunktionen anschalten (benutzt Daten von blacklotusproject.com) @@ -1545,30 +1545,35 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic DlgConnect - + &Host: &Server: - + &Port: &Port: - + Player &name: Spieler&name: - + P&assword: P&asswort: - + &Save password Passwort &speichern + + + A&uto connect at start + + &OK &OK @@ -1578,7 +1583,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic &Abbruch - + Connect to server Verbinde zum Server @@ -2030,7 +2035,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic Your card database is invalid. Would you like to go back and set the correct path? - Ihre Kartendatenbank ist ungültig. Möchten Sie zurückgehen und den korrekten Pfad einstellen? + Ihre Kartendatenbank ist ungültig. Möchten Sie zurückgehen und den korrekten Pfad einstellen? @@ -2684,11 +2689,11 @@ Would you like to change your database location setting? Path to card database: - Pfad zur Kartendatenbank: + Pfad zur Kartendatenbank: Path to token database: - Pfad zur Spielsteindatenbank: + Pfad zur Spielsteindatenbank: @@ -2842,7 +2847,7 @@ Grund für die Abschaltung: %1 Czech: - Tschechisch: + Tschechisch: @@ -2904,7 +2909,7 @@ Grund für die Abschaltung: %1 Invalid login data. - Ungültige Anmeldedaten. + Ungültige Anmeldedaten. @@ -3709,12 +3714,12 @@ Lokale Version ist %1, Serverversion ist %2. %1 has loaded a deck (%2). female - %1 hat ein Deck geladen (%2). + %1 hat ein Deck geladen (%2). %1 has loaded a deck (%2). male - %1 hat ein Deck geladen (%2). + %1 hat ein Deck geladen (%2). @@ -4985,7 +4990,7 @@ Lokale Version ist %1, Serverversion ist %2. Ctrl+H - Ctrl+H + Ctrl+H @@ -5652,11 +5657,11 @@ Lokale Version ist %1, Serverversion ist %2. Cockatrice decks (*.cod) - Cockatrice Decks (*.cod) + Cockatrice Decks (*.cod) Plain text decks (*.dec *.mwDeck) - Text Decks (*.dec *.mwDeck) + Text Decks (*.dec *.mwDeck) @@ -5792,11 +5797,11 @@ Lokale Version ist %1, Serverversion ist %2. &OK - &OK + &OK &Cancel - &Abbrechen + &Abbrechen @@ -5847,7 +5852,7 @@ Lokale Version ist %1, Serverversion ist %2. Administration - Wartung + Wartung @@ -5897,7 +5902,7 @@ Lokale Version ist %1, Serverversion ist %2. &Search... - &Suchen... + &Suchen... @@ -5976,11 +5981,11 @@ Lokale Version ist %1, Serverversion ist %2. Return - Return + Return Enter - Enter + Enter @@ -5989,11 +5994,11 @@ Lokale Version ist %1, Serverversion ist %2. Ctrl+Return - Ctrl+Return + Ctrl+Return Ctrl+Enter - Ctrl+Enter + Ctrl+Enter @@ -6179,7 +6184,7 @@ Bitte geben Sie einen Namen ein: Deck storage - Deckspeicherplatz + Deckspeicherplatz @@ -6456,7 +6461,7 @@ Bitte geben Sie einen Namen ein: Game replays - Replays + Replays @@ -6504,7 +6509,7 @@ Bitte geben Sie einen Namen ein: TabServer Server - Server + Server @@ -6526,7 +6531,7 @@ Bitte geben Sie einen Namen ein: TabUserLists User lists - Benutzerlisten + Benutzerlisten diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts index ea397a18..4f52e8a1 100644 --- a/cockatrice/translations/cockatrice_en.ts +++ b/cockatrice/translations/cockatrice_en.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -725,32 +725,37 @@ This is only saved for moderators and cannot be seen by the banned person. DlgConnect - + &Host: - + &Port: - + Player &name: - + P&assword: - + &Save password - + + A&uto connect at start + + + + Connect to server diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts index 3a77a6c9..a9431d75 100644 --- a/cockatrice/translations/cockatrice_es.ts +++ b/cockatrice/translations/cockatrice_es.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -43,23 +43,23 @@ Path to hand background: - Ruta a la imagen de fondo de la mano: + Ruta a la imagen de fondo de la mano: Path to stack background: - Ruta a la imagen de fondo de la pila: + Ruta a la imagen de fondo de la pila: Path to table background: - Ruta a la imagen de fondo de la mesa: + Ruta a la imagen de fondo de la mesa: Path to player info background: - Ruta a la imagen de fondo de la información del jugador: + Ruta a la imagen de fondo de la información del jugador: Path to picture of card back: - Ruta al reverso de las cartas: + Ruta al reverso de las cartas: @@ -1315,7 +1315,7 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona DeckEditorSettingsPage Enable &price tag feature (using data from blacklotusproject.com) - Activar tag de &precios (usando datos de blacklotusproject.com) + Activar tag de &precios (usando datos de blacklotusproject.com) @@ -1461,30 +1461,35 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona DlgConnect - + &Host: &Dirección: - + &Port: &Puerto: - + Player &name: &Nombre del jugador: - + P&assword: &Contraseña: - + &Save password &Guardar contraseña + + + A&uto connect at start + + &OK &Aceptar @@ -1494,7 +1499,7 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona &Cancelar - + Connect to server Conectar con el servidor @@ -1911,7 +1916,7 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona Your card database is invalid. Would you like to go back and set the correct path? - Tu base de datos de cartas es invalida. ¿Deseas volver y seleccionar la ruta correcta? + Tu base de datos de cartas es invalida. ¿Deseas volver y seleccionar la ruta correcta? @@ -2299,11 +2304,11 @@ Would you like to change your database location setting? Path to card database: - Ruta a la base de datos de las cartas: + Ruta a la base de datos de las cartas: Path to token database: - Ruta a la base de datos de fichas: + Ruta a la base de datos de fichas: @@ -2457,7 +2462,7 @@ Motivo para la desconexión: %1 Czech: - Checo: + Checo: @@ -2519,7 +2524,7 @@ Motivo para la desconexión: %1 Invalid login data. - Datos de conexión invalidos. + Datos de conexión invalidos. @@ -3107,12 +3112,12 @@ La versión local es %1, la versión remota es %2. %1 has loaded a deck (%2). female - %1 ha cargado el mazo %2. + %1 ha cargado el mazo %2. %1 has loaded a deck (%2). male - %1 ha cargado el mazo %2. + %1 ha cargado el mazo %2. @@ -4482,7 +4487,7 @@ La versión local es %1, la versión remota es %2. Ctrl+H - Ctrl+H + Ctrl+H @@ -4782,11 +4787,11 @@ La versión local es %1, la versión remota es %2. Cockatrice decks (*.cod) - Mazos de Cockatrice (*.cod) + Mazos de Cockatrice (*.cod) Plain text decks (*.dec *.mwDeck) - Archivos de texto plano (*.dec *.mwDeck) + Archivos de texto plano (*.dec *.mwDeck) @@ -4922,11 +4927,11 @@ La versión local es %1, la versión remota es %2. &OK - &Aceptar + &Aceptar &Cancel - &Cancelar + &Cancelar @@ -4973,7 +4978,7 @@ La versión local es %1, la versión remota es %2. Administration - Administración + Administración @@ -4999,7 +5004,7 @@ La versión local es %1, la versión remota es %2. TabDeckEditor &Search... - &Buscar... + &Buscar... @@ -5098,11 +5103,11 @@ La versión local es %1, la versión remota es %2. Return - Return + Return Enter - Enter + Enter @@ -5111,11 +5116,11 @@ La versión local es %1, la versión remota es %2. Ctrl+Return - Ctrl+Return + Ctrl+Return Ctrl+Enter - Ctrl+Enter + Ctrl+Enter @@ -5301,7 +5306,7 @@ Por favor, introduzca un nombre: Deck storage - Almacen de mazos + Almacen de mazos @@ -5550,7 +5555,7 @@ Por favor, introduzca un nombre: Game replays - Replays de partidas + Replays de partidas @@ -5598,14 +5603,14 @@ Por favor, introduzca un nombre: TabServer Server - Servidor + Servidor TabUserLists User lists - Lista de usuarios + Lista de usuarios diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts index 6d205092..8828b2b9 100644 --- a/cockatrice/translations/cockatrice_fr.ts +++ b/cockatrice/translations/cockatrice_fr.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -43,23 +43,23 @@ Path to hand background: - Chemin pour les images de fond de main: + Chemin pour les images de fond de main: Path to stack background: - Chemin pour les images de fond de pile: + Chemin pour les images de fond de pile: Path to table background: - Chemin pour les images d'arrière-plan: + Chemin pour les images d'arrière-plan: Path to player info background: - Chemin pour les images de fond d'affichage d'informations: + Chemin pour les images de fond d'affichage d'informations: Path to picture of card back: - Chemin pour les images de dos des cartes: + Chemin pour les images de dos des cartes: @@ -1173,7 +1173,7 @@ Cette information ne sera consultable que par les modérateurs. DeckEditorSettingsPage Enable &price tag feature (using data from blacklotusproject.com) - Activer le guide de &prix des cartes (source : blacklotusproject.com) + Activer le guide de &prix des cartes (source : blacklotusproject.com) @@ -1319,30 +1319,35 @@ Cette information ne sera consultable que par les modérateurs. DlgConnect - + &Host: &Hôte: - + &Port: &Port: - + Player &name: &Nom du joueur: - + P&assword: Mot de p&asse: - + &Save password + + + A&uto connect at start + + &OK &OK @@ -1352,7 +1357,7 @@ Cette information ne sera consultable que par les modérateurs. &Annuler - + Connect to server Connexion au serveur @@ -1757,7 +1762,7 @@ Cette information ne sera consultable que par les modérateurs. Your card database is invalid. Would you like to go back and set the correct path? - Votre base de carte est invalide. Souhaitez-vous redéfinir le chemin d'accès? + Votre base de carte est invalide. Souhaitez-vous redéfinir le chemin d'accès? @@ -2152,7 +2157,7 @@ Would you like to change your database location setting? Path to card database: - Chemin vers la base de cartes: + Chemin vers la base de cartes: @@ -2248,7 +2253,7 @@ Would you like to change your database location setting? Invalid login data. - Information de connexion érronée. + Information de connexion érronée. @@ -2331,7 +2336,7 @@ Raison de la fermeture : %1 Czech: - Tchèque : + Tchèque : Slovak: @@ -2980,12 +2985,12 @@ La version la plus récente est %1, l'ancienne version est %2. %1 has loaded a deck (%2). female - %1 a chargé le deck %2. + %1 a chargé le deck %2. %1 has loaded a deck (%2). male - %1 a chargé le deck %2. + %1 a chargé le deck %2. @@ -4769,11 +4774,11 @@ La version la plus récente est %1, l'ancienne version est %2. &OK - &OK + &OK &Cancel - &Annuler + &Annuler @@ -4820,7 +4825,7 @@ La version la plus récente est %1, l'ancienne version est %2. Administration - Administration + Administration @@ -5148,7 +5153,7 @@ Entrez un nom s'il vous plaît: Deck storage - Stockage de deck + Stockage de deck @@ -5442,14 +5447,14 @@ Entrez un nom s'il vous plaît: TabServer Server - Serveur + Serveur TabUserLists User lists - Listes de l'utilisateur + Listes de l'utilisateur diff --git a/cockatrice/translations/cockatrice_gd.ts b/cockatrice/translations/cockatrice_gd.ts index 7003d25c..e2a262e0 100644 --- a/cockatrice/translations/cockatrice_gd.ts +++ b/cockatrice/translations/cockatrice_gd.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -755,30 +755,35 @@ This is only saved for moderators and cannot be seen by the banned person. DlgConnect - + &Host: Ò&stair: - + &Port: &Port: - + Player &name: &Ainm a' chluicheadair: - + P&assword: &Facal-faire: - + &Save password + + + A&uto connect at start + + &OK &Ceart ma-thà @@ -788,7 +793,7 @@ This is only saved for moderators and cannot be seen by the banned person.&Sguir dheth - + Connect to server Dèan ceangal ris an fhrithealaiche @@ -3786,11 +3791,11 @@ Local version is %1, remote version is %2. &OK - &Ceart ma-thà + &Ceart ma-thà &Cancel - &Sguir dheth + &Sguir dheth @@ -4404,7 +4409,7 @@ Please enter a name: TabServer Server - Fhrithealaiche + Fhrithealaiche diff --git a/cockatrice/translations/cockatrice_it.ts b/cockatrice/translations/cockatrice_it.ts index 111a7096..bcaae287 100644 --- a/cockatrice/translations/cockatrice_it.ts +++ b/cockatrice/translations/cockatrice_it.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -43,23 +43,23 @@ Path to hand background: - Percorso sfondo della mano: + Percorso sfondo della mano: Path to stack background: - Percorso sfondo della pila: + Percorso sfondo della pila: Path to table background: - Percorso sfondo del tavolo: + Percorso sfondo del tavolo: Path to player info background: - Percorso sfondo info giocatore: + Percorso sfondo info giocatore: Path to picture of card back: - Percorso sfondo retro delle carte: + Percorso sfondo retro delle carte: @@ -959,7 +959,7 @@ Questo è solo visibile ai moderatori e non alla persona bannata. DeckEditorSettingsPage Enable &price tag feature (using data from blacklotusproject.com) - Abilita la &ricerca del costo (utilizzando i dati di blacklotusproject.com) + Abilita la &ricerca del costo (utilizzando i dati di blacklotusproject.com) @@ -1098,30 +1098,35 @@ Questo è solo visibile ai moderatori e non alla persona bannata. DlgConnect - + &Host: &Host: - + &Port: &Porta: - + Player &name: Nome &Giocatore: - + P&assword: P&assword: - + &Save password &Salva password + + + A&uto connect at start + + &OK &OK @@ -1131,7 +1136,7 @@ Questo è solo visibile ai moderatori e non alla persona bannata. &Annulla - + Connect to server Connetti al server @@ -1532,7 +1537,7 @@ Questo è solo visibile ai moderatori e non alla persona bannata. Your card database is invalid. Would you like to go back and set the correct path? - Il tuo database è invalido. Vuoi tornare indietro e impostare il percorso corretto? + Il tuo database è invalido. Vuoi tornare indietro e impostare il percorso corretto? @@ -1922,11 +1927,11 @@ Would you like to change your database location setting? Path to card database: - Percorso database delle carte: + Percorso database delle carte: Path to token database: - Percorso database pedine: + Percorso database pedine: @@ -2048,7 +2053,7 @@ Ragione dello spegnimento: %1 Czech: - Ceco: + Ceco: Slovak: @@ -2111,7 +2116,7 @@ Ragione dello spegnimento: %1 Invalid login data. - Dati login non validi. + Dati login non validi. @@ -2348,12 +2353,12 @@ La tua versione è la %1, la versione online è la %2. %1 has loaded a deck (%2). female - %1 ha aperto un mazzo %2. + %1 ha aperto un mazzo %2. %1 has loaded a deck (%2). male - %1 ha aperto un mazzo %2. + %1 ha aperto un mazzo %2. @@ -3792,7 +3797,7 @@ La tua versione è la %1, la versione online è la %2. Ctrl+H - Ctrl+H + Ctrl+H @@ -4134,11 +4139,11 @@ La tua versione è la %1, la versione online è la %2. Cockatrice decks (*.cod) - Mazzi Cockatrice (*.cod) + Mazzi Cockatrice (*.cod) Plain text decks (*.dec *.mwDeck) - Mazzi in formato testo (*.dec *.mwDeck) + Mazzi in formato testo (*.dec *.mwDeck) @@ -4267,11 +4272,11 @@ La tua versione è la %1, la versione online è la %2. &OK - &OK + &OK &Cancel - &Annulla + &Annulla @@ -4318,14 +4323,14 @@ La tua versione è la %1, la versione online è la %2. Administration - Amministrazione + Amministrazione TabDeckEditor &Search... - &Cerca... + &Cerca... @@ -4424,11 +4429,11 @@ La tua versione è la %1, la versione online è la %2. Return - Return + Return Enter - Invio + Invio @@ -4437,11 +4442,11 @@ La tua versione è la %1, la versione online è la %2. Ctrl+Return - Ctrl+Return + Ctrl+Return Ctrl+Enter - Ctrl+Invio + Ctrl+Invio @@ -4626,7 +4631,7 @@ Please enter a name: Deck storage - Cartella mazzi + Cartella mazzi @@ -4875,7 +4880,7 @@ Please enter a name: Game replays - Replay partite + Replay partite @@ -4915,14 +4920,14 @@ Please enter a name: TabServer Server - Server + Server TabUserLists User lists - Lista utenti + Lista utenti diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts index a3e9da12..388dfb50 100644 --- a/cockatrice/translations/cockatrice_ja.ts +++ b/cockatrice/translations/cockatrice_ja.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -43,23 +43,23 @@ Path to hand background: - 手札の背景画像へのパス: + 手札の背景画像へのパス: Path to stack background: - スタックゾーンの背景画像へのパス: + スタックゾーンの背景画像へのパス: Path to table background: - テーブルの背景画像へのパス: + テーブルの背景画像へのパス: Path to player info background: - プレイヤー画像へのパス: + プレイヤー画像へのパス: Path to picture of card back: - カード背面画像へのパス: + カード背面画像へのパス: @@ -780,7 +780,7 @@ This is only saved for moderators and cannot be seen by the banned person.DeckEditorSettingsPage Enable &price tag feature (using data from blacklotusproject.com) - 価格タグを表示可能に（blacklotusproject.comからのデータを使用） + 価格タグを表示可能に（blacklotusproject.comからのデータを使用） @@ -919,32 +919,37 @@ This is only saved for moderators and cannot be seen by the banned person. DlgConnect - + &Host: ホストIP: - + &Port: ポート: - + Player &name: プレイヤーネーム: - + P&assword: パスワード: - + &Save password - + + A&uto connect at start + + + + Connect to server サーバーに接続 @@ -1309,7 +1314,7 @@ This is only saved for moderators and cannot be seen by the banned person. Your card database is invalid. Would you like to go back and set the correct path? - あなたのカードデータベースは無効です.前に戻って正しいパスを設定してください. + あなたのカードデータベースは無効です.前に戻って正しいパスを設定してください. @@ -1697,7 +1702,7 @@ Would you like to change your database location setting? Path to card database: - カードデータベースのパス: + カードデータベースのパス: @@ -1823,7 +1828,7 @@ Reason for shutdown: %1 Czech: - チェコ語: + チェコ語: Slovak: @@ -1886,7 +1891,7 @@ Reason for shutdown: %1 Invalid login data. - 無効なログインデータです. + 無効なログインデータです. @@ -3148,12 +3153,12 @@ Local version is %1, remote version is %2. %1 has loaded a deck (%2). female - %1はデッキ%2をロードしました. + %1はデッキ%2をロードしました. %1 has loaded a deck (%2). male - %1はデッキ%2をロードしました. + %1はデッキ%2をロードしました. @@ -4039,11 +4044,11 @@ Local version is %1, remote version is %2. &OK - OK + OK &Cancel - Cancel + Cancel @@ -4090,7 +4095,7 @@ Local version is %1, remote version is %2. Administration - 管理者 + 管理者 @@ -4399,7 +4404,7 @@ Please enter a name: Deck storage - デッキストレージ + デッキストレージ @@ -4692,14 +4697,14 @@ Please enter a name: TabServer Server - サーバー + サーバー TabUserLists User lists - ユーザーリスト + ユーザーリスト diff --git a/cockatrice/translations/cockatrice_pl.ts b/cockatrice/translations/cockatrice_pl.ts index 7b5e8bed..a47a06a7 100644 --- a/cockatrice/translations/cockatrice_pl.ts +++ b/cockatrice/translations/cockatrice_pl.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -670,7 +670,7 @@ This is only saved for moderators and cannot be seen by the banned person.DeckEditorSettingsPage Enable &price tag feature (using data from blacklotusproject.com) - Włącz oznaczenia &ceny (korzystając z danych z blacklotusproject.com) + Włącz oznaczenia &ceny (korzystając z danych z blacklotusproject.com) @@ -809,32 +809,37 @@ This is only saved for moderators and cannot be seen by the banned person. DlgConnect - + &Host: - + &Port: - + Player &name: - + P&assword: - + &Save password - + + A&uto connect at start + + + + Connect to server @@ -1605,7 +1610,7 @@ Would you like to change your database location setting? Path to card database: - Ścieżka do bazy kart: + Ścieżka do bazy kart: @@ -4454,14 +4459,14 @@ Please enter a name: TabServer Server - Serwer + Serwer TabUserLists User lists - Lista użytkowników + Lista użytkowników diff --git a/cockatrice/translations/cockatrice_pt-br.ts b/cockatrice/translations/cockatrice_pt-br.ts index 44a33758..ebc3ba18 100644 --- a/cockatrice/translations/cockatrice_pt-br.ts +++ b/cockatrice/translations/cockatrice_pt-br.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -43,23 +43,23 @@ Path to hand background: - Caminho para o fundo da mão: + Caminho para o fundo da mão: Path to stack background: - Caminho para o fundo da pilha: + Caminho para o fundo da pilha: Path to table background: - Caminho para o fundo da mesa: + Caminho para o fundo da mesa: Path to player info background: - Caminho para o fundo das informações do jogador: + Caminho para o fundo das informações do jogador: Path to picture of card back: - Caminho para a imagem do verso dos cards: + Caminho para a imagem do verso dos cards: @@ -1264,30 +1264,35 @@ This is only saved for moderators and cannot be seen by the banned person. DlgConnect - + &Host: &Servidor: - + &Port: &Porta: - + Player &name: Nome do &jogador: - + P&assword: S&enha: - + &Save password + + + A&uto connect at start + + &OK &OK @@ -1297,7 +1302,7 @@ This is only saved for moderators and cannot be seen by the banned person.&Cancelar - + Connect to server Conectar ao servidor @@ -1702,7 +1707,7 @@ This is only saved for moderators and cannot be seen by the banned person. Your card database is invalid. Would you like to go back and set the correct path? - O seu banco de dados de cards é inválido. Você gostaria de voltar e corrigir o caminho? + O seu banco de dados de cards é inválido. Você gostaria de voltar e corrigir o caminho? @@ -2086,7 +2091,7 @@ Would you like to change your database location setting? Path to card database: - Caminho para o banco de dados dos cards: + Caminho para o banco de dados dos cards: @@ -2193,7 +2198,7 @@ Would you like to change your database location setting? Invalid login data. - Informações de login inválidas. + Informações de login inválidas. @@ -2882,7 +2887,7 @@ A versão local é %1 e a versão remota é %2. %1 has loaded a deck (%2). female - %1 carregou o deck %2. + %1 carregou o deck %2. %1 has loaded a deck (%2). @@ -4732,7 +4737,7 @@ A versão local é %1 e a versão remota é %2. Administration - Administração + Administração @@ -5060,7 +5065,7 @@ Por favor, entre um nome: Deck storage - Armazenamento de decks + Armazenamento de decks @@ -5353,14 +5358,14 @@ Por favor, entre um nome: TabServer Server - Servidor + Servidor TabUserLists User lists - Listas de usuários + Listas de usuários diff --git a/cockatrice/translations/cockatrice_pt.ts b/cockatrice/translations/cockatrice_pt.ts index 8364309f..e9a2c17f 100644 --- a/cockatrice/translations/cockatrice_pt.ts +++ b/cockatrice/translations/cockatrice_pt.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -43,23 +43,23 @@ Path to hand background: - Directório da imagem de fundo da mão: + Directório da imagem de fundo da mão: Path to stack background: - Directório da imagem de fundo da pilha: + Directório da imagem de fundo da pilha: Path to table background: - Directório da imagem de fundo do campo de batalha: + Directório da imagem de fundo do campo de batalha: Path to player info background: - Directório da imagem de fundo da informação de jogador: + Directório da imagem de fundo da informação de jogador: Path to picture of card back: - Directório da imagem do verso da carta: + Directório da imagem do verso da carta: @@ -1181,7 +1181,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban DeckEditorSettingsPage Enable &price tag feature (using data from blacklotusproject.com) - &Permitir função de tag de preços (utilizando informação de blacklotusproject.com) + &Permitir função de tag de preços (utilizando informação de blacklotusproject.com) @@ -1327,30 +1327,35 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban DlgConnect - + &Host: &Servidor: - + &Port: &Porta: - + Player &name: &Nome do jogador: - + P&assword: P&assword: - + &Save password &Guardar password + + + A&uto connect at start + + &OK &OK @@ -1360,7 +1365,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban &Cancelar - + Connect to server Ligar ao servidor @@ -1761,7 +1766,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban Your card database is invalid. Would you like to go back and set the correct path? - A sua base de dados é inválida. Gostaria de voltar atrás e corrigir o directório? + A sua base de dados é inválida. Gostaria de voltar atrás e corrigir o directório? @@ -2155,11 +2160,11 @@ Would you like to change your database location setting? Path to card database: - Directório da base de dados de cartas: + Directório da base de dados de cartas: Path to token database: - Directório da base de dados de fichas: + Directório da base de dados de fichas: @@ -2264,7 +2269,7 @@ Would you like to change your database location setting? Invalid login data. - Informação de login incorrecta. + Informação de login incorrecta. @@ -2339,7 +2344,7 @@ Motivo para o encerramento: %1 Czech: - Checo: + Checo: Slovak: @@ -3662,12 +3667,12 @@ Versão local é %1, versão remota é %2. %1 has loaded a deck (%2). female - %1 carregou o deck %2. + %1 carregou o deck %2. %1 has loaded a deck (%2). male - %1 carregou o deck %2. + %1 carregou o deck %2. @@ -4260,7 +4265,7 @@ Versão local é %1, versão remota é %2. Ctrl+H - Ctrl+H + Ctrl+H @@ -4622,11 +4627,11 @@ Versão local é %1, versão remota é %2. Cockatrice decks (*.cod) - Decks do Cockatrice (*.cod) + Decks do Cockatrice (*.cod) Plain text decks (*.dec *.mwDeck) - Decks baseados em texto simples (*.dec *.mwDeck) + Decks baseados em texto simples (*.dec *.mwDeck) @@ -4762,11 +4767,11 @@ Versão local é %1, versão remota é %2. &OK - &OK + &OK &Cancel - &Cancelar + &Cancelar @@ -4813,7 +4818,7 @@ Versão local é %1, versão remota é %2. Administration - Administração + Administração @@ -4839,7 +4844,7 @@ Versão local é %1, versão remota é %2. TabDeckEditor &Search... - &Procurar... + &Procurar... @@ -4938,11 +4943,11 @@ Versão local é %1, versão remota é %2. Return - Return + Return Enter - Enter + Enter @@ -4951,11 +4956,11 @@ Versão local é %1, versão remota é %2. Ctrl+Return - Ctrl+Return + Ctrl+Return Ctrl+Enter - Ctrl+Enter + Ctrl+Enter @@ -5141,7 +5146,7 @@ Por favor introduza um nome: Deck storage - Armazenamento de decks + Armazenamento de decks @@ -5390,7 +5395,7 @@ Por favor introduza um nome: Game replays - Replays de jogos + Replays de jogos @@ -5438,14 +5443,14 @@ Por favor introduza um nome: TabServer Server - Servidor + Servidor TabUserLists User lists - Lista de utilizadores + Lista de utilizadores diff --git a/cockatrice/translations/cockatrice_ru.ts b/cockatrice/translations/cockatrice_ru.ts index 9580ccd5..881b7093 100644 --- a/cockatrice/translations/cockatrice_ru.ts +++ b/cockatrice/translations/cockatrice_ru.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -43,23 +43,23 @@ Path to hand background: - Рука: + Рука: Path to stack background: - Стек: + Стек: Path to table background: - Поле битвы: + Поле битвы: Path to player info background: - Панель игрока: + Панель игрока: Path to picture of card back: - Рубашки карт: + Рубашки карт: @@ -1091,7 +1091,7 @@ This is only saved for moderators and cannot be seen by the banned person.DeckEditorSettingsPage Enable &price tag feature (using data from blacklotusproject.com) - Подписывать &цены (по данным blacklotusproject.com) + Подписывать &цены (по данным blacklotusproject.com) @@ -1230,30 +1230,35 @@ This is only saved for moderators and cannot be seen by the banned person. DlgConnect - + &Host: &Хост: - + &Port: &Порт: - + Player &name: &Ник: - + P&assword: П&ароль: - + &Save password + + + A&uto connect at start + + &OK &Ок @@ -1263,7 +1268,7 @@ This is only saved for moderators and cannot be seen by the banned person.&Отмена - + Connect to server Соединение @@ -1668,7 +1673,7 @@ This is only saved for moderators and cannot be seen by the banned person. Your card database is invalid. Would you like to go back and set the correct path? - База карт не найдена. Вернуться и задать правильный путь? + База карт не найдена. Вернуться и задать правильный путь? @@ -2058,7 +2063,7 @@ Would you like to change your database location setting? Path to card database: - Путь к базе карт: + Путь к базе карт: @@ -2179,7 +2184,7 @@ Reason for shutdown: %1 Czech: - Чешский: + Чешский: Slovak: @@ -2242,7 +2247,7 @@ Reason for shutdown: %1 Invalid login data. - Неверный логин/пароль. + Неверный логин/пароль. @@ -2852,12 +2857,12 @@ Local version is %1, remote version is %2. %1 has loaded a deck (%2). female - %1 загрузила колоду %2. + %1 загрузила колоду %2. %1 has loaded a deck (%2). male - %1 загрузил колоду %2. + %1 загрузил колоду %2. @@ -4653,11 +4658,11 @@ Local version is %1, remote version is %2. &OK - &Ок + &Ок &Cancel - &Отмена + &Отмена @@ -4704,7 +4709,7 @@ Local version is %1, remote version is %2. Administration - Администрирование + Администрирование @@ -4997,7 +5002,7 @@ Please enter a name: Deck storage - Хранилище колод + Хранилище колод @@ -5282,14 +5287,14 @@ Please enter a name: TabServer Server - Сервер + Сервер TabUserLists User lists - Панели пользователей + Панели пользователей diff --git a/cockatrice/translations/cockatrice_sk.ts b/cockatrice/translations/cockatrice_sk.ts index 7f8295f6..7539da25 100644 --- a/cockatrice/translations/cockatrice_sk.ts +++ b/cockatrice/translations/cockatrice_sk.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -725,32 +725,37 @@ This is only saved for moderators and cannot be seen by the banned person. DlgConnect - + &Host: - + &Port: - + Player &name: - + P&assword: - + &Save password - + + A&uto connect at start + + + + Connect to server diff --git a/cockatrice/translations/cockatrice_sv.ts b/cockatrice/translations/cockatrice_sv.ts index 8a402f35..62e5378e 100644 --- a/cockatrice/translations/cockatrice_sv.ts +++ b/cockatrice/translations/cockatrice_sv.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -43,23 +43,23 @@ Path to hand background: - Sökväg till handbakgrund: + Sökväg till handbakgrund: Path to stack background: - Sökväg till stapelbakgrund: + Sökväg till stapelbakgrund: Path to table background: - Sökväg till bordbakgrund: + Sökväg till bordbakgrund: Path to player info background: - Sökväg till spelarinfobakgrund: + Sökväg till spelarinfobakgrund: Path to picture of card back: - Sökväg till kortbaksidans bild: + Sökväg till kortbaksidans bild: @@ -923,7 +923,7 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. DeckEditorSettingsPage Enable &price tag feature (using data from blacklotusproject.com) - Aktivera &prislappsfunktionen (använder data från blacklotusproject.com) + Aktivera &prislappsfunktionen (använder data från blacklotusproject.com) @@ -1062,30 +1062,35 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. DlgConnect - + &Host: &Värd: - + &Port: &Port: - + Player &name: Spelar&namn: - + P&assword: &Lösenord: - + &Save password &Spara lösenord + + + A&uto connect at start + + &OK &OK @@ -1095,7 +1100,7 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. &Avbryt - + Connect to server Anslut till server @@ -1492,7 +1497,7 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. Your card database is invalid. Would you like to go back and set the correct path? - Din kortdatabas är ogiltig. Vill du gå tillbaka och ange den korrekta sökvägen? + Din kortdatabas är ogiltig. Vill du gå tillbaka och ange den korrekta sökvägen? @@ -1878,11 +1883,11 @@ Would you like to change your database location setting? Path to card database: - Sökväg till kortdatabas: + Sökväg till kortdatabas: Path to token database: - Sökväg till jetongdatabas: + Sökväg till jetongdatabas: @@ -2030,7 +2035,7 @@ Anledning till nedstängning: %1 Czech: - Tjeckiska: + Tjeckiska: @@ -2063,7 +2068,7 @@ Anledning till nedstängning: %1 Invalid login data. - Ogiltig inloggningsdata. + Ogiltig inloggningsdata. @@ -2280,12 +2285,12 @@ Lokal version är %1, avlägsen version är %2. %1 has loaded a deck (%2). female - %1 har laddat en lek (%2). + %1 har laddat en lek (%2). %1 has loaded a deck (%2). male - %1 har laddat en lek (%2). + %1 har laddat en lek (%2). @@ -4054,11 +4059,11 @@ Lokal version är %1, avlägsen version är %2. Cockatrice decks (*.cod) - Cockatricelekar (*.cod) + Cockatricelekar (*.cod) Plain text decks (*.dec *.mwDeck) - Klartextlekar (*.dec *.mwDeck) + Klartextlekar (*.dec *.mwDeck) @@ -4187,11 +4192,11 @@ Lokal version är %1, avlägsen version är %2. &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt @@ -4238,14 +4243,14 @@ Lokal version är %1, avlägsen version är %2. Administration - Administration + Administration TabDeckEditor &Search... - &Sök... + &Sök... @@ -4529,7 +4534,7 @@ Please enter a name: Deck storage - Leklagring + Leklagring @@ -4778,7 +4783,7 @@ Please enter a name: Game replays - Spelrepriser + Spelrepriser @@ -4818,14 +4823,14 @@ Please enter a name: TabServer Server - Server + Server TabUserLists User lists - Användarlistor + Användarlistor diff --git a/cockatrice/translations/cockatrice_zh_CN.ts b/cockatrice/translations/cockatrice_zh_CN.ts index 04d26fca..21ccff1a 100644 --- a/cockatrice/translations/cockatrice_zh_CN.ts +++ b/cockatrice/translations/cockatrice_zh_CN.ts @@ -1,6 +1,6 @@ - + AbstractCounter @@ -725,32 +725,37 @@ This is only saved for moderators and cannot be seen by the banned person. DlgConnect - + &Host: - + &Port: - + Player &name: - + P&assword: - + &Save password - + + A&uto connect at start + + + + Connect to server