diff --git a/pokerth.pro b/pokerth.pro index 27ba6c70..e68e05e4 100755 --- a/pokerth.pro +++ b/pokerth.pro @@ -267,7 +267,7 @@ win32{ } unix{ - LIBS += -lboost_thread -lcrypto -lSDL_mixer + LIBS += -lboost_thread-mt_static -lcrypto -lSDL_mixer ## My release static libs #LIBS += -lboost_thread-mt_static -lcrypto -lSDL_mixer -lmikmod -lSDL # -lmikmod -lSDL -laa -lgpm -lncurses diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index 7b4da05b..8a3b736f 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -45,11 +45,13 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0) { int i; + myQtToolsInterface = new QtToolsWrapper; + for (i=0; igetDefaultLanguage())); configList.push_back(ConfigInfo("ShowLeftToolBox", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowRightToolBox", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowStatusbarMessages", CONFIG_TYPE_INT, "1")); @@ -221,13 +224,14 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0) ConfigFile::~ConfigFile() { + delete myQtToolsInterface; + myQtToolsInterface = 0; + } void ConfigFile::fillBuffer() { - QtToolsInterface *myQtToolsInterface = new QtToolsWrapper; - size_t i; string tempString(""); @@ -251,9 +255,6 @@ void ConfigFile::fillBuffer() { // cout << configBufferList[i].name << " " << configBufferList[i].defaultValue << endl; } } - - delete myQtToolsInterface; - myQtToolsInterface = 0; } void ConfigFile::writeBuffer() { @@ -286,8 +287,6 @@ void ConfigFile::writeBuffer() { void ConfigFile::updateConfig(ConfigState myConfigState) { size_t i; - - QtToolsInterface *myQtToolsInterface = new QtToolsWrapper; if(myConfigState == NONEXISTING) { @@ -368,10 +367,6 @@ void ConfigFile::updateConfig(ConfigState myConfigState) { } - - delete myQtToolsInterface; - myQtToolsInterface = 0; - } string ConfigFile::readConfigString(string varName) diff --git a/src/config/configfile.h b/src/config/configfile.h index 808f2952..04031f5c 100644 --- a/src/config/configfile.h +++ b/src/config/configfile.h @@ -29,6 +29,7 @@ enum ConfigState { NONEXISTING, OLD }; enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING }; +class QtToolsInterface; class ConfigFile{ public: @@ -72,6 +73,7 @@ private: std::string claNoWriteAccess; ConfigState myConfigState; + QtToolsInterface *myQtToolsInterface; }; #endif diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp index 13e816a3..a1eaa0f6 100644 --- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp +++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp @@ -286,4 +286,4 @@ void joinNetworkGameDialogImpl::checkIp() { //remove whitespaces QString tmp = lineEdit_ipAddress->text(); lineEdit_ipAddress->setText(tmp.remove(" ")); -} \ No newline at end of file +} diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 9a78949e..7558808e 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -57,7 +57,7 @@ using namespace std; mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) - : QMainWindow(parent), myConfig(c), gameSpeed(0), myActionIsBet(0), myActionIsRaise(0), debugMode(0), breakAfterActualHand(FALSE) + : QMainWindow(parent), myConfig(c), gameSpeed(0), myActionIsBet(0), myActionIsRaise(0), debugMode(1), breakAfterActualHand(FALSE) { int i; diff --git a/src/gui/qt/qttools/qthelper/qthelper.cpp b/src/gui/qt/qttools/qthelper/qthelper.cpp index 3c8273ca..cf534744 100644 --- a/src/gui/qt/qttools/qthelper/qthelper.cpp +++ b/src/gui/qt/qttools/qthelper/qthelper.cpp @@ -28,3 +28,4 @@ std::string QtHelper::stringToUtf8(const std::string &myString) { return myUtf8String; } +std::string QtHelper::getDefaultLanguage() { return QLocale::system().name().toStdString(); } \ No newline at end of file diff --git a/src/gui/qt/qttools/qthelper/qthelper.h b/src/gui/qt/qttools/qthelper/qthelper.h index 49ba2cb5..644fbe0a 100644 --- a/src/gui/qt/qttools/qthelper/qthelper.h +++ b/src/gui/qt/qttools/qthelper/qthelper.h @@ -23,6 +23,7 @@ public: ~QtHelper(); std::string stringToUtf8(const std::string &); + std::string getDefaultLanguage(); }; diff --git a/src/gui/qt/qttools/qttoolswrapper.cpp b/src/gui/qt/qttools/qttoolswrapper.cpp index 67ca529b..e33f9fd0 100644 --- a/src/gui/qt/qttools/qttoolswrapper.cpp +++ b/src/gui/qt/qttools/qttoolswrapper.cpp @@ -37,4 +37,4 @@ QtToolsWrapper::~QtToolsWrapper() } std::string QtToolsWrapper::stringToUtf8(const std::string &myString) { return myQtHelper->stringToUtf8(myString); } - +std::string QtToolsWrapper::getDefaultLanguage() { return myQtHelper->getDefaultLanguage(); } diff --git a/src/gui/qt/qttools/qttoolswrapper.h b/src/gui/qt/qttools/qttoolswrapper.h index 892a216a..55cc143c 100644 --- a/src/gui/qt/qttools/qttoolswrapper.h +++ b/src/gui/qt/qttools/qttoolswrapper.h @@ -35,6 +35,7 @@ public: ~QtToolsWrapper(); std::string stringToUtf8(const std::string &myString); + std::string getDefaultLanguage(); private: diff --git a/src/gui/qt/resources/translations/pokerth_es.qm b/src/gui/qt/resources/translations/pokerth_es.qm index a186cd6b..c8c11ac7 100644 Binary files a/src/gui/qt/resources/translations/pokerth_es.qm and b/src/gui/qt/resources/translations/pokerth_es.qm differ diff --git a/src/gui/qt/resources/translations/pokerth_ru.qm b/src/gui/qt/resources/translations/pokerth_ru.qm index 91cde6ea..1aedec7b 100644 Binary files a/src/gui/qt/resources/translations/pokerth_ru.qm and b/src/gui/qt/resources/translations/pokerth_ru.qm differ diff --git a/src/gui/qt/sound/sdlplayer.cpp b/src/gui/qt/sound/sdlplayer.cpp index f3aa15e2..7850741d 100644 --- a/src/gui/qt/sound/sdlplayer.cpp +++ b/src/gui/qt/sound/sdlplayer.cpp @@ -60,17 +60,17 @@ void SDLPlayer::playSound(string audioString, int playerID) { switch (playerID) { - case 0: { position = 180; distance = 30; } + case 0: { position = 180; distance = 10; } break; - case 1: { position = 281; distance = 40; } + case 1: { position = 281; distance = 30; } break; - case 2: { position = 315; distance = 80; } + case 2: { position = 315; distance = 90; } break; - case 3: { position = 338; distance = 100; } + case 3: { position = 338; distance = 130; } break; - case 4: { position = 23; distance = 100; } + case 4: { position = 23; distance = 130; } break; - case 5: { position = 45; distance = 80; } + case 5: { position = 45; distance = 90; } break; case 6: { position = 79; distance = 30; } break; diff --git a/src/gui/qttoolsinterface.h b/src/gui/qttoolsinterface.h index 53d359f0..c98101bd 100644 --- a/src/gui/qttoolsinterface.h +++ b/src/gui/qttoolsinterface.h @@ -28,6 +28,7 @@ public: //qthelper.cpp virtual std::string stringToUtf8(const std::string &) =0; + virtual std::string getDefaultLanguage() =0; }; diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 580fe889..8f918194 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -82,14 +82,12 @@ int main( int argc, char **argv ) #endif Q_INIT_RESOURCE(resources); - QString locale = QLocale::system().name(); - QTranslator qtTranslator; - qtTranslator.load(QString(":/translations/resources/translations/qt_") + locale); + qtTranslator.load(QString(":/translations/resources/translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language"))); a.installTranslator(&qtTranslator); QTranslator translator; - translator.load(QString(":/translations/resources/translations/pokerth_") + locale); + translator.load(QString(":/translations/resources/translations/pokerth_") + QString::fromStdString(myConfig->readConfigString("Language"))); a.installTranslator(&translator); diff --git a/ts/pokerth_de.ts b/ts/pokerth_de.ts index fa29d0f9..b418b2e6 100644 --- a/ts/pokerth_de.ts +++ b/ts/pokerth_de.ts @@ -473,7 +473,19 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">© 2006-2007, FHammer &amp; FThauer</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">PokerTH 0.5</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Engine für die popupuläre "Texas Holdem" Poker Variante</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Einzelspielermodus mit bis zu 6 Computer-Gegnern</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Mehrspielermodus im Netzwerk</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Programmiert in C++ / QT4</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">© 2006-2007, FHammer &amp; FThauer</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> @@ -487,7 +499,12 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;your translator name&gt; - &lt;your language&gt;</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> &lt;if you like your mail address&gt;</p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Mirko Albrecht - deutsch</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Felix Hammer - deutsch</p> +</body></html> @@ -505,7 +522,20 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">doc_dos</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for self recorded chip sounds</p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://commons.wikimedia.org/wiki/Main_Page"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"> - <span style=" font-weight:400;">für diverses Bildmaterial von bekannten Persönlichkeiten</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Viktoria, Benedikt, Erhard, Felix, Florian, Linus, Lothar, Mark</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - für ihre Avatare</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://kde-look.org/"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">http://kde-look.org/</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - für diverse GPL lizensierte Sounds</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">doc_dos</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - für selbst aufgenommene Chip Sounds</p></body></html> @@ -523,7 +553,7 @@ p, li { white-space: pre-wrap; } Name: - + Name: @@ -599,7 +629,7 @@ p, li { white-space: pre-wrap; } Game Speed for computer opponents: - Spielgeschwindigkeit für Computergegner: + Spielgeschwindigkeit für Computergegner: @@ -776,7 +806,7 @@ p, li { white-space: pre-wrap; } Speed: - Geschwindigkeit: + Tempo: @@ -796,7 +826,7 @@ p, li { white-space: pre-wrap; } Ctrl+N - Ctrl+N + Ctrl+N @@ -836,7 +866,7 @@ p, li { white-space: pre-wrap; } Hands - Runden + Blätter @@ -1361,7 +1391,7 @@ p, li { white-space: pre-wrap; } Write log after every: - Schreibe Logdateien nach jedem: + Schreibe Logdateien nach jedem/jeder: @@ -1419,7 +1449,10 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: Best avatar quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=50, height=50.</span></p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Hinweis: Die beste Avatar Qualität erhalten Sie mit Seitenverhältnissen wie: </span><span style=" font-weight:600; font-style:italic;">Breite = 50, Höhe = 50.</span></p></body></html> @@ -1449,17 +1482,17 @@ p, li { white-space: pre-wrap; } Timeout for player action (sec): - Zeit für Spieleraktion (Sek.): + Zeit für Spieleraktion (Sek.): Opponent 6: - Gegner 7: {6:?} + Gegner 6: action (high frequent disc access) - + Aktion diff --git a/ts/pokerth_es.ts b/ts/pokerth_es.ts index f65e3852..44af192a 100644 --- a/ts/pokerth_es.ts +++ b/ts/pokerth_es.ts @@ -1,5 +1,6 @@ + aboutPokerth @@ -883,7 +884,11 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;your translator name&gt; - &lt;your language&gt;</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> &lt;if you like your mail address&gt;</p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Miguel Revilla - Castellano</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> yo@miguelrevilla.com</p></body></html> @@ -901,7 +906,20 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">doc_dos</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for self recorded chip sounds</p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://commons.wikimedia.org/wiki/Main_Page"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"> - <span style=" font-weight:400;">por los populares recursos de imágenes de avatares</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Viktoria, Benedikt, Erhard, Felix, Florian, Linus, Lothar, Mark</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - por las imágenes de avatares</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://kde-look.org/"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">http://kde-look.org/</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - por diferentes sonidos con licencia GPL</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">doc_dos</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - por la grabación de los sonidos de las fichas</p></body></html> @@ -919,7 +937,7 @@ p, li { white-space: pre-wrap; } Name: - + Nombre: diff --git a/ts/pokerth_ru.ts b/ts/pokerth_ru.ts index 47cf918d..16cd5c23 100644 --- a/ts/pokerth_ru.ts +++ b/ts/pokerth_ru.ts @@ -32,10 +32,10 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">PokerTH 0.5</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Движок для популярного поrера "Texas Holdem"</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Движок покера Texas Holdem c открытым кодом</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Режим одиночной игры с 6 компьютерными оппонентами</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Режим сетевой мультиплейерной игры</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Написано на C++ / QT4</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Написан на C++ / QT4</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">© 2006-2007, FHammer &amp; FThauer</span></p> @@ -488,7 +488,11 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;your translator name&gt; - &lt;your language&gt;</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> &lt;if you like your mail address&gt;</p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;Arseny Krasutsky&gt; - &lt;Russian&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> &lt;dtiger at mail.ru&gt;</p></body></html> @@ -506,7 +510,20 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">doc_dos</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for self recorded chip sounds</p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://commons.wikimedia.org/wiki/Main_Page"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"> - <span style=" font-weight:400;">за различные ресурсы с картинками для аватар</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Viktoria, Benedikt, Erhard, Felix, Florian, Linus, Lothar, Mark</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - за картинки аватар</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://kde-look.org/"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">http://kde-look.org/</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - за разразличные наборы звуков под лицензией GPL</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">doc_dos</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - за записанные звуки фишек</p></body></html> @@ -524,7 +541,7 @@ p, li { white-space: pre-wrap; } Name: - + Имя: @@ -580,7 +597,7 @@ p, li { white-space: pre-wrap; } Hands before raise small blind: - Количество раздач для повышения малой ставки: + Количество партий для повышения малой ставки: @@ -600,7 +617,7 @@ p, li { white-space: pre-wrap; } Game Speed for computer opponents: - Скорость игры компьютерных оппонентов: + Скорость игры компьютерных оппонентов: @@ -775,7 +792,7 @@ p, li { white-space: pre-wrap; } PokerTH 0.5 - The Open-Source Texas Holdem Engine - PokerTH 0.5 - Движок c открытым кодом для игры Texas Holdem + PokerTH 0.5 - Движок Texas Holdem c открытым кодом @@ -790,7 +807,7 @@ p, li { white-space: pre-wrap; } Hands - Розыгрыши + Партии @@ -815,7 +832,7 @@ p, li { white-space: pre-wrap; } View - Просмотр + Вид @@ -1097,7 +1114,7 @@ Please choose a different name. Hands before raise small blind: - Количество розыгрышей для повышения малой ставки: + Количество партий для повышения малой ставки: @@ -1105,7 +1122,7 @@ Please choose a different name. Please select an avatar - Выберите аватару + Пожалуйста, выберите аватару @@ -1194,7 +1211,7 @@ p, li { white-space: pre-wrap; } Show fade-out animation for non-winning cards - Показывать постепенное исчезновение изображения для невыигрышных карт + Показывать постепенное исчезновение невыигрышных карт @@ -1234,7 +1251,7 @@ p, li { white-space: pre-wrap; } Hands before raise small blind: - Количество розыгрышей для повышения малой ставки: + Количество партий для повышения малой ставки: @@ -1355,7 +1372,7 @@ p, li { white-space: pre-wrap; } Computer Engine - Движок оппонента-компьютера + Компьютерные противники @@ -1405,12 +1422,12 @@ p, li { white-space: pre-wrap; } Store log files for - Сохранять логи для + Сохранять логи Day(s) - Дней + дней @@ -1420,7 +1437,7 @@ p, li { white-space: pre-wrap; } Write log after every: - Записывать лог после каждых: + Записывать лог после каждого: @@ -1455,37 +1472,37 @@ p, li { white-space: pre-wrap; } Sound Volume: - + Уровень звука: 10 - 10 + 10 Opponent 6: - Оппонент 1: {6:?} + Оппонент 6: Timeout for player action (sec): - Тайм-аут для хода игрока (сек): + Тайм-аут для хода игрока (сек): action (high frequent disc access) - + действия (много обращений к диску) hand (medium disc access) - + партии (средняя частота обращений к диску) game (low disc access) - + игры (малое количество обращения к диску)