# HG changeset patch # User unc0rr # Date 1369637550 -14400 # Node ID 79ca70a295ac7d4d34ace6e415279bfb2ac41a1a # Parent 45ebf126a5c275242490f47ed35d0141e2813360# Parent 413a43592e356aeae90d375217925c5dee3f3ecf Merge diff -r 413a43592e35 -r 79ca70a295ac ChangeLog.txt --- a/ChangeLog.txt Sun May 26 08:18:15 2013 -0400 +++ b/ChangeLog.txt Mon May 27 10:52:30 2013 +0400 @@ -2,7 +2,7 @@ * bugfixes 0.9.18 -> 0.9.19: - + New Freezer weapon - freezes terrain, water, hedgehogs + + New Freezer weapon - freezes terrain, water, hedgehogs, mines, cases, explosives + Saucer can aim weapons and fire underwater + Main graphical user interface overhaul + Up and down keys navigate in chat history @@ -13,17 +13,26 @@ + Downloadable content can now be stored in packages for easy uninstall + Lua scripts can load a sidecar overlay package of game resources + Math improvements for better performance/reliability - + Smarter AI - now uses drill rocket accurately and is aware of barrels and dud mines. + + Smarter AI - now uses drill rocket accurately and is aware of barrels and dud mines. More aggressive in infinite attack, lua can tell to target specific hogs, such as in Mutant + New fort, Steel Tower + New theme, Fruit + New hats - some national ones, Portal, harlequin, more animals... + + New maps based on StarBound. SB_Bones, SB_Crystal, SB_Grassy, SB_Grove, SB_Haunty, SB_Oaks, SB_Shrooms, SB_Tentacles + Translation updates - Turkish, French, German, Japanese, Portuguese, Italian, Russian - Campaign french should work correctly now + Theme object masks + + Easier weapon selection in shoppa. F1 will select from F5 if there are no weps in F1-F4 + + Cleaver radius shrunk to improve usability on horizontal throws + + Map hog limit is now just a suggestion, not enforced + + Static map theme is now just the default, can be changed + + Themeable static maps (provide a mask.png without a map.png) + * You can now move out of the way when throwing a sticky mine or cleaver straight up * Rope sliding should behave more like pre-0.9.18 again * Forbid kicking on 1v1 matches * Desync fixes * Fixed fort mode * Making very large maps now works properly with targetted weapons + * ParseCommand should be safe to use in Lua now, at any time + * Fixes to many weapons. Mudball, blowtorch, explosives, cluster bomb spread, portal. 0.9.17 -> 0.9.18: diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/campaign.cpp --- a/QTfrontend/campaign.cpp Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/campaign.cpp Mon May 27 10:52:30 2013 +0400 @@ -16,43 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "campaign.h" + +#include "hwconsts.h" + #include -#include "campaign.h" -#include "gameuiconfig.h" -#include "hwconsts.h" -#include "gamecfgwidget.h" -#include "bgwidget.h" -#include "mouseoverfilter.h" -#include "tcpBase.h" - -#include "DataManager.h" - -extern QString campaign, campaignTeam; QStringList getCampMissionList(QString & campaign) { diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/campaign.h --- a/QTfrontend/campaign.h Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/campaign.h Mon May 27 10:52:30 2013 +0400 @@ -19,21 +19,8 @@ #ifndef CAMPAIGN_H #define CAMPAIGN_H -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "netserver.h" -#include "game.h" -#include "ui_hwform.h" -#include "SDLInteraction.h" -#include "bgwidget.h" +#include +#include QStringList getCampMissionList(QString & campaign); unsigned int getCampProgress(QString & teamName, QString & campName); diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/gameuiconfig.cpp --- a/QTfrontend/gameuiconfig.cpp Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/gameuiconfig.cpp Mon May 27 10:52:30 2013 +0400 @@ -112,7 +112,7 @@ Form->ui.pageOptions->CBFrontendMusic->setChecked(value("frontend/music", true).toBool()); Form->ui.pageOptions->SLVolume->setValue(value("audio/volume", 100).toUInt()); - QString netNick = value("net/nick", "").toString(); + QString netNick = value("net/nick", tr("Guest")+QString("%1").arg(rand())).toString(); Form->ui.pageOptions->editNetNick->setText(netNick); bool savePwd = value("net/savepassword",true).toBool(); Form->ui.pageOptions->CBSavePassword->setChecked(savePwd); @@ -521,14 +521,28 @@ setValue("net/passwordhash", QString()); setValue("net/passwordlength", 0); setValue("net/savepassword", false); //changes the savepassword value to false in order to not let the user save an empty password in PAGE_SETUP - reloadValues(); //reloads the values of PAGE_SETUP + Form->ui.pageOptions->editNetPassword->setEnabled(false); + Form->ui.pageOptions->editNetPassword->setText(""); } void GameUIConfig::setPasswordHash(const QString & passwordhash) { setValue("net/passwordhash", passwordhash); - setValue("net/passwordlength", passwordhash.size()/4); - setNetPasswordLength(passwordhash.size()/4); //the hash.size() is divided by 4 let PAGE_SETUP use a reasonable number of stars to display the PW + if (passwordhash!=NULL && passwordhash.size() > 0) + { + // WTF - the whole point of "password length" was to have the dots match what they typed. This is totally pointless, and all hashes are the same length for a given hash so might as well hardcode it. + // setValue("net/passwordlength", passwordhash.size()/4); + setValue("net/passwordlength", 8); + + // More WTF + //setNetPasswordLength(passwordhash.size()/4); //the hash.size() is divided by 4 let PAGE_SETUP use a reasonable number of stars to display the PW + setNetPasswordLength(8); + } + else + { + setValue("net/passwordlength", 0); + setNetPasswordLength(0); + } } QString GameUIConfig::passwordHash() diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/hwform.cpp Mon May 27 10:52:30 2013 +0400 @@ -319,8 +319,6 @@ connect(ui.pageMain->BtnNetLocal, SIGNAL(clicked()), this, SLOT(GoToNet())); connect(ui.pageMain->BtnNetOfficial, SIGNAL(clicked()), this, SLOT(NetConnectOfficialServer())); - connect(ui.pageConnecting, SIGNAL(cancelConnection()), this, SLOT(GoBack())); - connect(ui.pageVideos, SIGNAL(goBack()), config, SLOT(SaveVideosOptions())); ammoSchemeModel = new AmmoSchemeModel(this, cfgdir->absolutePath() + "/schemes.ini"); diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/main.cpp --- a/QTfrontend/main.cpp Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/main.cpp Mon May 27 10:52:30 2013 +0400 @@ -268,8 +268,13 @@ QString cc = settings.value("misc/locale", QString()).toString(); if (cc.isEmpty()) - cc = HWApplication::keyboardInputLocale().name(); - // QLocale::system().name() returns only "C"... + { + cc = QLocale::system().name(); + + // Fallback to current input locale if "C" locale is returned + if(cc == "C") + cc = HWApplication::keyboardInputLocale().name(); + } // load locale file into translator if (!Translator.load(QString("physfs://Locale/hedgewars_%1").arg(cc))) diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/res/xml/tips.xml --- a/QTfrontend/res/xml/tips.xml Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/res/xml/tips.xml Mon May 27 10:52:30 2013 +0400 @@ -46,6 +46,7 @@ Like Hedgewars? Become a fan on Facebook or follow us on Twitter Feel free to draw your own graves, hats, flags or even maps and themes! But note that you'll have to share them somewhere to use them online. Keep your video card drivers up to date to avoid issues playing the game. + Heads or tails? Type '/rnd' in lobby and you'll find out. Also '/rnd rock paper scissors' works! You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.

The version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing. diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/ui/page/pagegamestats.cpp --- a/QTfrontend/ui/page/pagegamestats.cpp Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/ui/page/pagegamestats.cpp Mon May 27 10:52:30 2013 +0400 @@ -101,11 +101,22 @@ QLayout * PageGameStats::footerLayoutDefinition() { QHBoxLayout * bottomLayout = new QHBoxLayout(); + + mainNote = new QLabel(this); + mainNote->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + mainNote->setWordWrap(true); + + bottomLayout->addWidget(mainNote, 0); + bottomLayout->setStretch(0,1); - btnRestart = addButton(":/res/Start.png", bottomLayout, 0, true); - btnSave = addButton(":/res/Save.png", bottomLayout, 0, true); + btnRestart = addButton(":/res/Start.png", bottomLayout, 1, true); + btnRestart->setWhatsThis(tr("Play again")); + btnRestart->setFixedWidth(58); + btnRestart->setFixedHeight(81); + btnRestart->setStyleSheet("QPushButton{margin-top:24px}"); + btnSave = addButton(":/res/Save.png", bottomLayout, 2, true); + btnSave->setWhatsThis(tr("Save")); btnSave->setStyleSheet("QPushButton{margin: 24px 0 0 0;}"); - bottomLayout->setAlignment(btnSave, Qt::AlignRight | Qt::AlignBottom); return bottomLayout; } diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/ui/page/pagegamestats.h --- a/QTfrontend/ui/page/pagegamestats.h Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/ui/page/pagegamestats.h Mon May 27 10:52:30 2013 +0400 @@ -45,6 +45,7 @@ QPushButton *btnSave; QPushButton *btnRestart; + QLabel *mainNote; QLabel *labelGameStats; QLabel *labelGameWin; QLabel *labelGameRank; diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/ui/page/pageoptions.cpp --- a/QTfrontend/ui/page/pageoptions.cpp Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/ui/page/pageoptions.cpp Mon May 27 10:52:30 2013 +0400 @@ -587,11 +587,12 @@ CBLanguage = new QComboBox(groupMisc); groupMisc->layout()->addWidget(CBLanguage, 0, 1); QStringList locs = DataManager::instance().entryList("Locale", QDir::Files, QStringList("hedgewars_*.qm")); - CBLanguage->addItem(QComboBox::tr("(System default)"), QString("")); + CBLanguage->addItem(QComboBox::tr("(System default)"), QString()); for(int i = 0; i < locs.count(); i++) { - QLocale loc(locs[i].replace(QRegExp("hedgewars_(.*)\\.qm"), "\\1")); - CBLanguage->addItem(QLocale::languageToString(loc.language()) + " (" + QLocale::countryToString(loc.country()) + ")", loc.name()); + QString lname = locs[i].replace(QRegExp("hedgewars_(.*)\\.qm"), "\\1"); + QLocale loc(lname); + CBLanguage->addItem(QLocale::languageToString(loc.language()) + " (" + QLocale::countryToString(loc.country()) + ")", lname); } QLabel *restartNoticeLabel = new QLabel(groupMisc); diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/ui/page/pageroomslist.cpp --- a/QTfrontend/ui/page/pageroomslist.cpp Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/ui/page/pageroomslist.cpp Mon May 27 10:52:30 2013 +0400 @@ -28,6 +28,7 @@ #include #include #include +#include #include @@ -107,7 +108,18 @@ topLayout->setRowStretch(1, 0); topLayout->setColumnStretch(3, 1); + // Rooms list and chat with splitter + m_splitter = new QSplitter(); + m_splitter->setChildrenCollapsible(false); + pageLayout->addWidget(m_splitter, 100); + // Room list + QWidget * roomsListWidget = new QWidget(this); + m_splitter->setOrientation(Qt::Vertical); + m_splitter->addWidget(roomsListWidget); + + QVBoxLayout * roomsLayout = new QVBoxLayout(roomsListWidget); + roomsLayout->setMargin(0); roomsList = new RoomTableView(this); roomsList->setSelectionBehavior(QAbstractItemView::SelectRows); @@ -118,7 +130,7 @@ roomsList->setSelectionMode(QAbstractItemView::SingleSelection); roomsList->setStyleSheet("QTableView { border-top-left-radius: 0px; }"); roomsList->setFocusPolicy(Qt::NoFocus); - pageLayout->addWidget(roomsList, 200); + roomsLayout->addWidget(roomsList, 200); // Room filters container @@ -126,9 +138,9 @@ filtersContainer->setMaximumWidth(800); filtersContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - pageLayout->addSpacing(7); - pageLayout->addWidget(filtersContainer, 0, Qt::AlignHCenter); - pageLayout->addSpacing(7); + roomsLayout->addSpacing(7); + roomsLayout->addWidget(filtersContainer, 0, Qt::AlignHCenter); + roomsLayout->addSpacing(7); QHBoxLayout * filterLayout = new QHBoxLayout(filtersContainer); filterLayout->setSpacing(0); @@ -194,7 +206,7 @@ // Lobby chat chatWidget = new HWChatWidget(this, false); - pageLayout->addWidget(chatWidget, 350); + m_splitter->addWidget(chatWidget); CBRules->addItem(QComboBox::tr("Any")); @@ -251,6 +263,8 @@ void PageRoomsList::roomSelectionChanged(const QModelIndex & current, const QModelIndex & previous) { + Q_UNUSED(previous); + BtnJoin->setEnabled(current.isValid()); } @@ -732,14 +746,24 @@ bool PageRoomsList::restoreHeaderState() { - if (!m_gameSettings->contains("frontend/roomslist_header")) - return false; - return roomsList->horizontalHeader()->restoreState(QByteArray::fromBase64( - (m_gameSettings->value("frontend/roomslist_header").toByteArray()))); + if (m_gameSettings->contains("frontend/roomslist_splitter")) + { + m_splitter->restoreState(QByteArray::fromBase64( + (m_gameSettings->value("frontend/roomslist_splitter").toByteArray()))); + } + + if (m_gameSettings->contains("frontend/roomslist_header")) + { + return roomsList->horizontalHeader()->restoreState(QByteArray::fromBase64( + (m_gameSettings->value("frontend/roomslist_header").toByteArray()))); + } else return false; } void PageRoomsList::saveHeaderState() { m_gameSettings->setValue("frontend/roomslist_header", QString(roomsList->horizontalHeader()->saveState().toBase64())); + + m_gameSettings->setValue("frontend/roomslist_splitter", + QString(m_splitter->saveState().toBase64())); } diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/ui/page/pageroomslist.h --- a/QTfrontend/ui/page/pageroomslist.h Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/ui/page/pageroomslist.h Mon May 27 10:52:30 2013 +0400 @@ -27,6 +27,7 @@ class QTableView; class RoomsListModel; class QSortFilterProxyModel; +class QSplitter; class RoomTableView : public QTableView { @@ -101,6 +102,7 @@ QSortFilterProxyModel * weaponsFilteredModel; QAction * showGamesInLobby; QAction * showGamesInProgress; + QSplitter * m_splitter; AmmoSchemeModel * ammoSchemeModel; diff -r 413a43592e35 -r 79ca70a295ac QTfrontend/ui/widget/feedbackdialog.cpp --- a/QTfrontend/ui/widget/feedbackdialog.cpp Sun May 26 08:18:15 2013 -0400 +++ b/QTfrontend/ui/widget/feedbackdialog.cpp Mon May 27 10:52:30 2013 +0400 @@ -286,7 +286,7 @@ delete process; #endif -#if defined(__i386__) || defined(__x86_64__) +#if (!defined(Q_WS_MACX) && defined(__i386__)) || defined(__x86_64__) // cpu info quint32 registers[4]; quint32 i; diff -r 413a43592e35 -r 79ca70a295ac gameServer/Actions.hs --- a/gameServer/Actions.hs Sun May 26 08:18:15 2013 -0400 +++ b/gameServer/Actions.hs Mon May 27 10:52:30 2013 +0400 @@ -20,6 +20,7 @@ import Control.Exception import System.Process import Network.Socket +import System.Random ----------------------------- #if defined(OFFICIAL_SERVER) import OfficialServer.GameReplayStore @@ -381,7 +382,7 @@ if p < 38 then processAction $ ByeClient $ loc "Nickname is already in use" else - processAction $ NoticeMessage NickAlreadyInUse + mapM_ processAction [NoticeMessage NickAlreadyInUse, ModifyClient $ \c -> c{nick = B.empty}] else do db <- gets (dbQueries . serverInfo) @@ -615,6 +616,12 @@ processAction $ Warning versionsStats +processAction (Random chans items) = do + let i = if null items then ["heads", "tails"] else items + n <- io $ randomRIO (0, length i - 1) + processAction $ AnswerClients chans ["CHAT", "[random]", i !! n] + + #if defined(OFFICIAL_SERVER) processAction SaveReplay = do ri <- clientRoomA diff -r 413a43592e35 -r 79ca70a295ac gameServer/CoreTypes.hs --- a/gameServer/CoreTypes.hs Sun May 26 08:18:15 2013 -0400 +++ b/gameServer/CoreTypes.hs Mon May 27 10:52:30 2013 +0400 @@ -75,6 +75,7 @@ | CheckRecord | CheckFailed B.ByteString | CheckSuccess [B.ByteString] + | Random [ClientChan] [B.ByteString] type ClientChan = Chan [B.ByteString] diff -r 413a43592e35 -r 79ca70a295ac gameServer/HWProtoCore.hs --- a/gameServer/HWProtoCore.hs Sun May 26 08:18:15 2013 -0400 +++ b/gameServer/HWProtoCore.hs Mon May 27 10:52:30 2013 +0400 @@ -43,12 +43,14 @@ where h ["DELEGATE", n] = handleCmd ["DELEGATE", n] h ["STATS"] = handleCmd ["STATS"] - h ["PART", msg] = handleCmd ["PART", msg] - h ["QUIT", msg] = handleCmd ["QUIT", msg] - h ["GLOBAL", msg] = do + h ("PART":m:ms) = handleCmd ["PART", B.unwords $ m:ms] + h ("QUIT":m:ms) = handleCmd ["QUIT", B.unwords $ m:ms] + h ("RND":rs) = handleCmd ("RND":rs) + h ("GLOBAL":m:ms) = do + cl <- thisClient rnc <- liftM snd ask let chans = map (sendChan . client rnc) $ allClients rnc - return [AnswerClients chans ["CHAT", "[global notice]", msg]] + return [AnswerClients chans ["CHAT", "[global notice]", B.unwords $ m:ms] | isAdministrator cl] h c = return [Warning . B.concat . L.intersperse " " $ "Unknown cmd" : c] handleCmd cmd = do diff -r 413a43592e35 -r 79ca70a295ac gameServer/HWProtoInRoomState.hs --- a/gameServer/HWProtoInRoomState.hs Sun May 26 08:18:15 2013 -0400 +++ b/gameServer/HWProtoInRoomState.hs Mon May 27 10:52:30 2013 +0400 @@ -348,6 +348,10 @@ else return [] +handleCmd_inRoom ("RND":rs) = do + n <- clientNick + s <- roomClientsChans + return [AnswerClients s ["CHAT", n, B.unwords $ "/rnd" : rs], Random s rs] handleCmd_inRoom ["LIST"] = return [] -- for old clients (<= 0.9.17) diff -r 413a43592e35 -r 79ca70a295ac gameServer/HWProtoLobbyState.hs --- a/gameServer/HWProtoLobbyState.hs Sun May 26 08:18:15 2013 -0400 +++ b/gameServer/HWProtoLobbyState.hs Mon May 27 10:52:30 2013 +0400 @@ -144,6 +144,11 @@ else liftM ((:) (AnswerClients [clChan] ["JOINING", roomName])) $ handleCmd_lobby ["JOIN_ROOM", roomName] + +handleCmd_lobby ("RND":rs) = do + c <- liftM sendChan thisClient + return [Random [c] rs] + --------------------------- -- Administrator's stuff -- diff -r 413a43592e35 -r 79ca70a295ac hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/GSHandlers.inc Mon May 27 10:52:30 2013 +0400 @@ -1424,6 +1424,7 @@ var vg: PVisualGear; dxdy: hwFloat; begin + if Gear^.Health = 0 then dxdy:= hwAbs(Gear^.dX)+hwAbs(Gear^.dY); if (Gear^.State and gstMoving) <> 0 then begin DeleteCI(Gear); @@ -1441,7 +1442,6 @@ doStepFallingGear(Gear); if (Gear^.Health = 0) then begin - dxdy:= hwAbs(Gear^.dX)+hwAbs(Gear^.dY); if (dxdy > _0_4) and (Gear^.State and gstCollision <> 0) then inc(Gear^.Damage, hwRound(dxdy * _50)); @@ -1586,6 +1586,7 @@ if (Gear^.dY.QWordValue = 0) and (Gear^.dY.QWordValue = 0) and (TestCollisionYwithGear(Gear, 1) = 0) then SetLittle(Gear^.dY); Gear^.State := Gear^.State or gstAnimation; + if Gear^.Health < cBarrelHealth then Gear^.State:= Gear^.State and not gstFrozen; if ((Gear^.dX.QWordValue <> 0) or (Gear^.dY.QWordValue <> 0)) then @@ -1671,6 +1672,7 @@ Gear^.Message := Gear^.Message and (not (gmLJump or gmHJump)); exit end; + if (k = gtExplosives) and (Gear^.Health < cBarrelHealth) then Gear^.State:= Gear^.State and not gstFrozen; if ((k <> gtExplosives) and (Gear^.Damage > 0)) or ((k = gtExplosives) and (Gear^.Health<=0)) then begin @@ -5109,17 +5111,6 @@ LastDamage:= nil; X:= Hedgehog^.Gear^.X; Y:= Hedgehog^.Gear^.Y; - //unfreeze all semifrozen hogs - make this generic hog cleanup -(* - iter := GearsList; - while iter <> nil do - begin - if (iter^.Kind = gtHedgehog) and - (iter^.Hedgehog^.Effects[heFrozen] and $FF = 0) then - iter^.Hedgehog^.Effects[heFrozen]:= 0; - iter:= iter^.NextGear - end -*) end; end; @@ -5134,7 +5125,7 @@ const iceRadius = 32; const iceHeight = 40; var - HHGear: PGear; + HHGear, iter: PGear; landRect: TSDL_Rect; ndX, ndY: hwFloat; i, j, t, gX, gY: LongInt; @@ -5172,7 +5163,7 @@ if Target.X <> NoPointX then begin - CheckCollisionWithLand(Gear); + CheckCollision(Gear); if (State and gstCollision) <> 0 then begin if Timer = iceWaitCollision then @@ -5204,6 +5195,48 @@ landRect.w := min(2*iceRadius, LAND_WIDTH - landRect.x - 1); landRect.h := min(2*iceRadius, LAND_HEIGHT - landRect.y - 1); UpdateLandTexture(landRect.x, landRect.w, landRect.y, landRect.h, true); + + // Freeze nearby mines/explosives/cases too + iter := GearsList; + while iter <> nil do + begin + if (iter^.State and gstFrozen = 0) and + ((iter^.Kind = gtExplosives) or (iter^.Kind = gtCase) or (iter^.Kind = gtMine)) and + (abs(iter^.X.Round-target.x)+abs(iter^.Y.Round-target.y)+2<2*iceRadius) and (Distance(iter^.X-int2hwFloat(target.x),iter^.Y-int2hwFloat(target.y)) nil then + begin + i:= random(100) + 155; + vg^.Tint:= i shl 24 or i shl 16 or $FF shl 8 or Longword(random(200) + 55); + vg^.Angle:= random(360); + vg^.dx:= 0.001 * random(80); + vg^.dy:= 0.001 * random(80) + end + end; + iter^.State:= iter^.State or gstFrozen; + if iter^.Kind = gtMine then // dud mine block + begin + vg:= AddVisualGear(hwRound(iter^.X) - 4 + Random(8), hwRound(iter^.Y) - 4 - Random(4), vgtSmoke); + if vg <> nil then + vg^.Scale:= 0.5; + PlaySound(sndVaporize); + iter^.Health := 0; + iter^.Damage := 0; + iter^.State := iter^.State and (not gstAttacking) + end + else if iter^.Kind = gtCase then + begin + DeleteCI(iter); + AddGearCI(iter) + end + else // gtExplosives + iter^.Health:= iter^.Health + cBarrelHealth + end; + iter:= iter^.NextGear + end; // FillRoundInLandWithIce(Target.X, Target.Y, iceRadius); SetAllHHToActive; diff -r 413a43592e35 -r 79ca70a295ac hedgewars/hwengine.pas --- a/hedgewars/hwengine.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/hwengine.pas Mon May 27 10:52:30 2013 +0400 @@ -93,13 +93,7 @@ ScriptCall('onGameStart'); GameState:= gsGame; end; - gsConfirm, gsGame: - begin - if not cOnlyStats then DrawWorld(Lag); - DoGameTick(Lag); - if not cOnlyStats then ProcessVisualGears(Lag); - end; - gsChat: + gsConfirm, gsGame, gsChat: begin if not cOnlyStats then DrawWorld(Lag); DoGameTick(Lag); @@ -168,10 +162,10 @@ // sdl on iphone supports only ashii keyboards and the unicode field is deprecated in sdl 1.3 KeyPressChat(SDL_GetKeyFromScancode(event.key.keysym.sym), event.key.keysym.sym); //TODO correct for keymodifiers end - else - ProcessKey(event.key); + else + if GameState >= gsGame then ProcessKey(event.key); SDL_KEYUP: - if GameState <> gsChat then + if (GameState <> gsChat) and (GameState >= gsGame) then ProcessKey(event.key); SDL_WINDOWEVENT: @@ -213,19 +207,19 @@ if GameState = gsChat then KeyPressChat(event.key.keysym.unicode, event.key.keysym.sym) else - ProcessKey(event.key); + if GameState >= gsGame then ProcessKey(event.key); SDL_KEYUP: - if GameState <> gsChat then + if (GameState <> gsChat) and (GameState >= gsGame) then ProcessKey(event.key); SDL_MOUSEBUTTONDOWN: if GameState = gsConfirm then ParseCommand('quit', true) else - ProcessMouse(event.button, true); + if (GameState >= gsGame) then ProcessMouse(event.button, true); SDL_MOUSEBUTTONUP: - ProcessMouse(event.button, false); + if (GameState >= gsGame) then ProcessMouse(event.button, false); SDL_ACTIVEEVENT: if (event.active.state and SDL_APPINPUTFOCUS) <> 0 then diff -r 413a43592e35 -r 79ca70a295ac hedgewars/uAI.pas --- a/hedgewars/uAI.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/uAI.pas Mon May 27 10:52:30 2013 +0400 @@ -129,7 +129,7 @@ Score:= AmmoTests[a].proc(Me, Targets.ar[i], BotLevel, ap); {$HINTS ON} if Actions.Score + Score > BestActions.Score then - if (BestActions.Score < 0) or (Actions.Score + Score > BestActions.Score + Byte(BotLevel) * 2048) then + if (BestActions.Score < 0) or (Actions.Score + Score > BestActions.Score + Byte(BotLevel - 1) * 2048) then begin BestActions:= Actions; inc(BestActions.Score, Score); diff -r 413a43592e35 -r 79ca70a295ac hedgewars/uAIAmmoTests.pas --- a/hedgewars/uAIAmmoTests.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/uAIAmmoTests.pas Mon May 27 10:52:30 2013 +0400 @@ -171,7 +171,7 @@ if Level = 1 then value:= RateExplosion(Me, EX, EY, 101, afTrackFall or afErasesLand) else value:= RateExplosion(Me, EX, EY, 101); - if (value = 0) and (Targ.Kind = gtHedgehog) then + if (value = 0) and (Targ.Kind = gtHedgehog) and (Targ.Score > 0) then value:= 1024 - Metric(Targ.Point.X, Targ.Point.Y, EX, EY) div 64; if valueResult <= value then begin @@ -608,7 +608,7 @@ begin Score:= RateExplosion(Me, EX, EY, 91); if (Score = 0) then - if (dY > 0.15) then + if (dY > 0.15) and (Targ.Kind = gtHedgehog) and (Targ.Score > 0) then Score:= - abs(Targ.Point.Y - EY) div 32 else Score:= BadTurn @@ -618,7 +618,7 @@ else Score:= BadTurn; - if BadTurn < Score then + if Score > 0 then begin ap.Angle:= DxDy2AttackAnglef(Vx, Vy) + AIrndSign(random(Level)); ap.Power:= 1; @@ -662,7 +662,7 @@ y:= y + vY * 8; valueResult:= RateShotgun(Me, vX, vY, rx, ry); - if (valueResult = 0) and (Targ.Kind = gtHedgehog) then + if (valueResult = 0) and (Targ.Kind = gtHedgehog) and (Targ.Score > 0) then valueResult:= 1024 - Metric(Targ.Point.X, Targ.Point.Y, rx, ry) div 64 else dec(valueResult, Level * 4000); diff -r 413a43592e35 -r 79ca70a295ac hedgewars/uAmmos.pas --- a/hedgewars/uAmmos.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/uAmmos.pas Mon May 27 10:52:30 2013 +0400 @@ -278,9 +278,7 @@ PackAmmo(Ammo, Ammoz[AmmoType].Slot); //SwitchNotHeldAmmo(Hedgehog); if CurAmmoType = amKnife then LoadHedgehogHat(Hedgehog, Hedgehog.Hat); - if CurAmmoGear <> nil then - SetWeapon(CurAmmoGear^.AmmoType) - else CurAmmoType:= amNothing; + CurAmmoType:= amNothing end end end; diff -r 413a43592e35 -r 79ca70a295ac hedgewars/uCollisions.pas --- a/hedgewars/uCollisions.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/uCollisions.pas Mon May 27 10:52:30 2013 +0400 @@ -83,7 +83,7 @@ X:= hwRound(Gear^.X); Y:= hwRound(Gear^.Y); Radius:= Gear^.Radius; - ChangeRoundInLand(X, Y, Radius - 1, true, (Gear = CurrentHedgehog^.Gear) or (Gear^.Kind = gtCase)); + ChangeRoundInLand(X, Y, Radius - 1, true, (Gear = CurrentHedgehog^.Gear) or ((Gear^.Kind = gtCase) and (Gear^.State and gstFrozen <> 0))); cGear:= Gear end; Gear^.CollisionIndex:= Count; @@ -104,7 +104,7 @@ if Gear^.CollisionIndex >= 0 then begin with cinfos[Gear^.CollisionIndex] do - ChangeRoundInLand(X, Y, Radius - 1, false, (Gear = CurrentHedgehog^.Gear) or (Gear^.Kind = gtCase)); + ChangeRoundInLand(X, Y, Radius - 1, false, (Gear = CurrentHedgehog^.Gear) or ((Gear^.Kind = gtCase) and (Gear^.State and gstFrozen <> 0))); cinfos[Gear^.CollisionIndex]:= cinfos[Pred(Count)]; cinfos[Gear^.CollisionIndex].cGear^.CollisionIndex:= Gear^.CollisionIndex; Gear^.CollisionIndex:= -1; diff -r 413a43592e35 -r 79ca70a295ac hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/uConsts.pas Mon May 27 10:52:30 2013 +0400 @@ -212,7 +212,8 @@ gstLoser = $00080000; gstHHGone = $00100000; gstInvisible = $00200000; - gstSubmersible = $00400000; + gstSubmersible = $00400000; + gstFrozen = $00800000; // gear messages gmLeft = $00000001; diff -r 413a43592e35 -r 79ca70a295ac hedgewars/uGearsHedgehog.pas --- a/hedgewars/uGearsHedgehog.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/uGearsHedgehog.pas Mon May 27 10:52:30 2013 +0400 @@ -1079,7 +1079,7 @@ HHGear^.Message:= HHGear^.Message or gmAttack; // check for case with ammo t:= CheckGearNear(HHGear, gtCase, 36, 36); - if t <> nil then + if (t <> nil) and (t^.State and gstFrozen = 0) then PickUp(HHGear, t) end; diff -r 413a43592e35 -r 79ca70a295ac hedgewars/uGearsRender.pas --- a/hedgewars/uGearsRender.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/uGearsRender.pas Mon May 27 10:52:30 2013 +0400 @@ -979,6 +979,8 @@ aAngle: real; startX, endX, startY, endY: LongInt; begin + if Gear^.State and gstFrozen <> 0 then Tint($A0, $A0, $FF, $FF); + //if Gear^.State and gstFrozen <> 0 then Tint(IceColor or $FF); if Gear^.Target.X <> NoPointX then if Gear^.AmmoType = amBee then DrawSpriteRotatedF(sprTargetBee, Gear^.Target.X + WorldDx, Gear^.Target.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360) @@ -1038,11 +1040,13 @@ gtPickHammer: DrawSprite(sprPHammer, x - 16, y - 50 + LongInt(((GameTicks shr 5) and 1) * 2), 0); gtRope: DrawRope(Gear); - gtMine: if (((Gear^.State and gstAttacking) = 0)or((Gear^.Timer and $3FF) < 420)) and (Gear^.Health <> 0) then + gtMine: begin + if (((Gear^.State and gstAttacking) = 0)or((Gear^.Timer and $3FF) < 420)) and (Gear^.Health <> 0) then DrawSpriteRotated(sprMineOff, x, y, 0, Gear^.DirAngle) - else if Gear^.Health <> 0 then - DrawSpriteRotated(sprMineOn, x, y, 0, Gear^.DirAngle) - else DrawSpriteRotated(sprMineDead, x, y, 0, Gear^.DirAngle); + else if Gear^.Health <> 0 then + DrawSpriteRotated(sprMineOn, x, y, 0, Gear^.DirAngle) + else DrawSpriteRotated(sprMineDead, x, y, 0, Gear^.DirAngle); + end; gtSMine: if (((Gear^.State and gstAttacking) = 0)or((Gear^.Timer and $3FF) < 420)) and (Gear^.Health <> 0) then DrawSpriteRotated(sprSMineOff, x, y, 0, Gear^.DirAngle) @@ -1056,26 +1060,38 @@ begin if ((Gear^.Pos and posCaseAmmo) <> 0) then begin - i:= (GameTicks shr 6) mod 64; - if i > 18 then - i:= 0; - DrawSprite(sprCase, x - 24, y - 24, i); + if Gear^.State and gstFrozen <> 0 then + DrawSprite(sprCase, x - 24, y - 28, 0) + else + begin + i:= (GameTicks shr 6) mod 64; + if i > 18 then i:= 0; + DrawSprite(sprCase, x - 24, y - 24, i) + end end else if ((Gear^.Pos and posCaseHealth) <> 0) then begin - i:= ((GameTicks shr 6) + 38) mod 64; - if i > 13 then - i:= 0; - DrawSprite(sprFAid, x - 24, y - 24, i); + if Gear^.State and gstFrozen <> 0 then + DrawSprite(sprFAid, x - 24, y - 28, 0) + else + begin + i:= ((GameTicks shr 6) + 38) mod 64; + if i > 13 then i:= 0; + DrawSprite(sprFAid, x - 24, y - 24, i) + end end else if ((Gear^.Pos and posCaseUtility) <> 0) then begin - i:= (GameTicks shr 6) mod 70; - if i > 23 then - i:= 0; - i:= i mod 12; - DrawSprite(sprUtility, x - 24, y - 24, i); - end; + if Gear^.State and gstFrozen <> 0 then + DrawSprite(sprUtility, x - 24, y - 28, 0) + else + begin + i:= (GameTicks shr 6) mod 70; + if i > 23 then i:= 0; + i:= i mod 12; + DrawSprite(sprUtility, x - 24, y - 24, i) + end + end end; if Gear^.Timer < 1833 then begin @@ -1096,7 +1112,7 @@ else if Gear^.State and gsttmpFlag = 0 then DrawSpriteRotatedF(sprExplosivesRoll, x, y + 4, 0, 0, Gear^.DirAngle) else - DrawSpriteRotatedF(sprExplosivesRoll, x, y + 4, 1, 0, Gear^.DirAngle); + DrawSpriteRotatedF(sprExplosivesRoll, x, y + 4, 1, 0, Gear^.DirAngle) end; gtDynamite: DrawSprite(sprDynamite, x - 16, y - 25, Gear^.Tag and 1, Gear^.Tag shr 1); gtClusterBomb: DrawSpriteRotated(sprClusterBomb, x, y, 0, Gear^.DirAngle); @@ -1285,6 +1301,7 @@ end; if Gear^.RenderTimer and (Gear^.Tex <> nil) then DrawTextureCentered(x + 8, y + 8, Gear^.Tex); + if Gear^.State and gstFrozen <> 0 then Tint($FF, $FF, $FF, $FF) end; end. diff -r 413a43592e35 -r 79ca70a295ac hedgewars/uLandGenMaze.pas --- a/hedgewars/uLandGenMaze.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/uLandGenMaze.pas Mon May 27 10:52:30 2013 +0400 @@ -1,3 +1,5 @@ +{$INCLUDE "options.inc"} + unit uLandGenMaze; interface diff -r 413a43592e35 -r 79ca70a295ac hedgewars/uVariables.pas --- a/hedgewars/uVariables.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/uVariables.pas Mon May 27 10:52:30 2013 +0400 @@ -2176,7 +2176,7 @@ AmmoType: amLandGun; AttackVoice: sndNone; Bounciness: 1000); - Slot: 2; + Slot: 6; TimeAfterTurn: 0; minAngle: 0; maxAngle: 0; @@ -2201,7 +2201,7 @@ AmmoType: amIceGun; AttackVoice: sndNone; Bounciness: 1000); - Slot: 9; + Slot: 2; TimeAfterTurn: 0; minAngle: 0; maxAngle: 0; diff -r 413a43592e35 -r 79ca70a295ac hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Sun May 26 08:18:15 2013 -0400 +++ b/hedgewars/uWorld.pas Mon May 27 10:52:30 2013 +0400 @@ -1320,7 +1320,7 @@ // draw health bars right border inc(r.x, cTeamHealthWidth + 2); r.w:= 3; - DrawTextureFromRect(TeamHealthBarWidth + 16, cScreenHeight + DrawHealthY + smallScreenOffset, @r, HealthTex); + DrawTextureFromRect(TeamHealthBarWidth + 15, cScreenHeight + DrawHealthY + smallScreenOffset, @r, HealthTex); if not highlight and (not hasGone) then for i:= 0 to cMaxHHIndex do @@ -1357,7 +1357,7 @@ // draw health bar r.w:= TeamHealthBarWidth + 1; r.h:= HealthTex^.h - 4; - DrawTextureFromRect(16, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, HealthTex); + DrawTextureFromRect(15, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, HealthTex); if not hasGone and (TeamHealth > 1) then begin Tint(Clan^.Color shl 8 or $FF); diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Graphics/AmmoMenu/Ammos.png Binary file share/hedgewars/Data/Graphics/AmmoMenu/Ammos.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Graphics/AmmoMenu/Ammos_bw.png Binary file share/hedgewars/Data/Graphics/AmmoMenu/Ammos_bw.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_ar.ts --- a/share/hedgewars/Data/Locale/hedgewars_ar.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -255,6 +255,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -354,6 +366,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -473,10 +489,6 @@ - Theme: - - - Load drawn map @@ -492,6 +504,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -536,7 +552,7 @@ %1 *** %2 has joined - %1 *** %2 انضم + %1 *** %2 انضم %1 *** %2 has left (%3) @@ -730,6 +746,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -871,6 +898,14 @@ + + Play again + + + + Save + + PageInGame @@ -1958,6 +1993,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3059,119 +3098,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_bg.ts --- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -254,6 +254,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -353,6 +365,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -472,10 +488,6 @@ - Theme: - - - Load drawn map Зареждане на начертана карта @@ -491,6 +503,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -535,7 +551,7 @@ %1 *** %2 has joined - %1 *** %2 се присъедини + %1 *** %2 се присъедини %1 *** %2 has left (%3) @@ -729,6 +745,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -870,6 +897,14 @@ + + Play again + + + + Save + Запазване + PageInGame @@ -1973,6 +2008,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3075,119 +3114,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_cs.ts --- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -260,6 +260,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -359,6 +371,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -478,10 +494,6 @@ - Theme: - - - Load drawn map Nahrát nakreslenou mapu @@ -497,6 +509,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -541,7 +557,7 @@ %1 *** %2 has joined - %1 *** %2 se připojil + %1 *** %2 se připojil %1 *** %2 has left (%3) @@ -735,6 +751,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -882,6 +909,14 @@ %1 byl vystrašený a přeskočil tah %2 krát. + + Play again + + + + Save + Uložit + PageInGame @@ -1987,6 +2022,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3090,119 +3129,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_da.ts --- a/share/hedgewars/Data/Locale/hedgewars_da.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_da.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): + Send us feedback! - Your email address is optional, but we may want to contact you. + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -258,6 +258,18 @@ Failed to save StyleSheet to %1 Mislykkedes at gemme typografiark til %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -357,6 +369,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -476,10 +492,6 @@ - Theme: - - - Load drawn map Indlæs tegnet bane @@ -495,6 +507,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -539,7 +555,7 @@ %1 *** %2 has joined - %1 *** %2 har tilsluttet sig + %1 *** %2 har tilsluttet sig %1 *** %2 has left (%3) @@ -733,6 +749,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -874,6 +901,14 @@ %1 blev bange og sprang over sin tur %2 gange. + + Play again + + + + Save + Gem + PageInGame @@ -1981,6 +2016,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3083,119 +3122,4 @@ DPad - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_de.ts --- a/share/hedgewars/Data/Locale/hedgewars_de.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): + Send us feedback! - Your email address is optional, but we may want to contact you. + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -261,6 +261,18 @@ Failed to save StyleSheet to %1 Style-Sheet konnte nich nach %1 gesichert werden + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -360,6 +372,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -479,10 +495,6 @@ - Theme: - - - Load drawn map Gezeichnete Karte laden @@ -498,6 +510,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -542,7 +558,7 @@ %1 *** %2 has joined - %1 *** %2 ist beigetreten + %1 *** %2 ist beigetreten %1 *** %2 has left (%3) @@ -736,6 +752,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -877,6 +904,14 @@ %1 hatte Angst und übersprang %2 Runden. + + Play again + + + + Save + Sichern + PageInGame @@ -1986,6 +2021,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3116,119 +3155,4 @@ Steuerkreuz - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_el.ts --- a/share/hedgewars/Data/Locale/hedgewars_el.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_el.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -254,6 +254,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -355,6 +367,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -474,10 +490,6 @@ - Theme: - - - Load drawn map @@ -493,6 +505,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -537,7 +553,7 @@ %1 *** %2 has joined - %1 *** %2 εισήλθε + %1 *** %2 εισήλθε %1 *** %2 has left (%3) @@ -731,6 +747,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Eraser @@ -872,6 +899,14 @@ Ο %1 φοβήθηκε και παραχώρησε τη σειρά του %2 φορές. + + Play again + + + + Save + + PageInGame @@ -1975,6 +2010,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3077,119 +3116,4 @@ DPad - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_en.ts --- a/share/hedgewars/Data/Locale/hedgewars_en.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -254,6 +254,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -353,6 +365,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -472,10 +488,6 @@ - Theme: - - - Load drawn map @@ -491,6 +503,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -535,7 +551,7 @@ %1 *** %2 has joined - %1 *** %2 has joined + %1 *** %2 has joined %1 *** %2 has left (%3) @@ -729,6 +745,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -870,6 +897,14 @@ %1 was scared and skipped turn %2 times. + + Play again + + + + Save + + PageInGame @@ -1957,6 +1992,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3059,119 +3098,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_es.ts --- a/share/hedgewars/Data/Locale/hedgewars_es.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): + Send us feedback! - Your email address is optional, but we may want to contact you. + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -258,6 +258,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -357,6 +369,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -476,10 +492,6 @@ - Theme: - - - Load drawn map Cargar mapa @@ -495,6 +507,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -539,7 +555,7 @@ %1 *** %2 has joined - %1 *** %2 ha entrado + %1 *** %2 ha entrado %1 *** %2 has left (%3) @@ -733,6 +749,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -874,6 +901,14 @@ %1 tenía demasiado miedo y pasó %2 turnos. + + Play again + + + + Save + Guardar + PageInGame @@ -1977,6 +2012,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3079,119 +3118,4 @@ DPad - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_fi.ts --- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -254,6 +254,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -353,6 +365,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -472,10 +488,6 @@ - Theme: - - - Load drawn map @@ -491,6 +503,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -535,7 +551,7 @@ %1 *** %2 has joined - %1 *** %2 liittyi + %1 *** %2 liittyi %1 *** %2 has left @@ -729,6 +745,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -870,6 +897,14 @@ + + Play again + + + + Save + + PageInGame @@ -1973,6 +2008,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3075,119 +3114,4 @@ Hiiri: Vasen nappi - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_fr.ts --- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Mon May 27 10:52:30 2013 +0400 @@ -100,7 +100,7 @@ Please give us feedback! - Nous avons besoin de votre avis! + Nous avons besoin de votre avis! We are always happy about suggestions, ideas, or bug reports. @@ -108,11 +108,23 @@ If you found a bug, you can see if it's already known here (english): - Si vous trouvez un bug, vous pouvez vérifier si il est déjà connu ici (anglais): + Si vous trouvez un bug, vous pouvez vérifier si il est déjà connu ici (anglais): Your email address is optional, but we may want to contact you. - Votre adresse email est optionelle, mais il est possible que nous essayons de vous contacter. + Votre adresse email est optionelle, mais il est possible que nous essayons de vous contacter. + + + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. + @@ -227,11 +239,11 @@ %1 has been removed from your friends list - %1 a été retiré de votre liste d'amis + %1 a été retiré de votre liste d'amis %1 has been added to your friends list - %1 a été ajouté à votre liste d'amis + %1 a été ajouté à votre liste d'amis Stylesheet imported from %1 @@ -239,7 +251,7 @@ Enter %1 if you want to use the current StyleSheet in future, enter %2 to reset! - Entrez %1 si vous voulez utiliser cette Feuille de style (Stylesheet) à l'avenir, entrez %2 pour rétablir l'ancienne apparence! + Entrez %1 si vous voulez utiliser cette Feuille de style (Stylesheet) à l'avenir, entrez %2 pour rétablir l'ancienne apparence! Couldn't read %1 @@ -255,14 +267,26 @@ Failed to save StyleSheet to %1 - Impossible d'enregistrer la feuille de style (Stylesheet) dans %1 + Impossible d'enregistrer la feuille de style (Stylesheet) dans %1 + + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + HWForm Cannot save record to file %1 - Impossible de sauvegarder l'enregistrement dans le fichier %1 + Impossible de sauvegarder l'enregistrement dans le fichier %1 DefaultTeam @@ -301,7 +325,7 @@ Someone already uses your nickname %1 on the server. Please pick another nickname: - Quelqu'un utilise déjà le pseudo %1 sur le serveur + Quelqu'un utilise déjà le pseudo %1 sur le serveur Veuillez choisir un autre pseudo: @@ -318,9 +342,9 @@ If this nick isn't yours, please register your own nick at www.hedgewars.org Password: - Ce pseudo est enregistré, vous n'avez spécifié aucun mot de passe. + Ce pseudo est enregistré, vous n'avez spécifié aucun mot de passe. -Si ce pseudo n'est pas le votre, veuillez enregistrer votre propre pseudo sur www.hedgewars.org +Si ce pseudo n'est pas le votre, veuillez enregistrer votre propre pseudo sur www.hedgewars.org Mot de passe: @@ -328,9 +352,9 @@ Your nickname is not registered. To prevent someone else from using it, please register it at www.hedgewars.org - Votre pseudo n'est pas enregistré. -Pour éviter que d'autre joueurs l'utilisent, -veuillez l'enregistrer sur www.hedgewars.org + Votre pseudo n'est pas enregistré. +Pour éviter que d'autre joueurs l'utilisent, +veuillez l'enregistrer sur www.hedgewars.org @@ -338,7 +362,7 @@ Your password wasn't saved either. -Votre mot de passe non plus n'a pas été sauvegardé. +Votre mot de passe non plus n'a pas été sauvegardé. Hedgewars - Empty nickname @@ -358,7 +382,7 @@ Hedgewars - Connection error - Hedgewars - Erreur de connexion + Hedgewars - Erreur de connexion You reconnected too fast. @@ -366,6 +390,10 @@ Vous vous êtes reconnecté trop rapidement. Attendez quelques secondes et réessayez. + + This page requires an internet connection. + + HWGame @@ -486,7 +514,7 @@ Theme: - Theme: + Theme: Load drawn map @@ -504,6 +532,10 @@ Large tunnels Grands tunnels + + Theme: %1 + + HWNetServersModel @@ -548,7 +580,7 @@ %1 *** %2 has joined - %1 *** %2 vient d'arriver + %1 *** %2 vient d'arriver %1 *** %2 has left (%3) @@ -560,7 +592,7 @@ User quit - S'est déconnecté + S'est déconnecté Remote host has closed connection @@ -568,7 +600,7 @@ The server is too old. Disconnecting now. - La version du serveur n'est pas à jour. Déconnexion. + La version du serveur n'est pas à jour. Déconnexion. @@ -583,7 +615,7 @@ If you don't have an account on www.hedgewars.org, just enter your nickname. Pour vous connecter sur le serveur, veuillez entrer vos identifiants. -Si vous n'avez pas de compte sur www.hedgewars.org, +Si vous n'avez pas de compte sur www.hedgewars.org, entrez juste votre pseudo. @@ -744,6 +776,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -790,7 +833,7 @@ Select an action to choose a custom key bind for this team - Choisissez une action afin d'y attribuer une touche pour cette équipe + Choisissez une action afin d'y attribuer une touche pour cette équipe Use my default @@ -885,6 +928,14 @@ + + Play again + + + + Save + Enregistrer + PageInGame @@ -897,7 +948,7 @@ PageInfo Open the snapshot folder - Ouvrir le dossier de captures d'écran + Ouvrir le dossier de captures d'écran @@ -1088,7 +1139,7 @@ Select an action to change what key controls it - Choisissez une action afin d'y attribuer une touche + Choisissez une action afin d'y attribuer une touche Reset to default @@ -1148,7 +1199,7 @@ Frontend audio - Son de l'interface + Son de l'interface Account @@ -1172,7 +1223,7 @@ Video recording options - Option d'enregistrement vidéo + Option d'enregistrement vidéo @@ -1194,7 +1245,7 @@ Join - Rejoindre + Rejoindre Admin features @@ -1249,7 +1300,7 @@ Open server administration page - Ouvre la page d'administration du serveur + Ouvre la page d'administration du serveur @@ -1398,11 +1449,11 @@ PageSinglePlayer Play a quick game against the computer with random settings - Jouer une partie rapide contre l'ordinateur avec des règles aléatoires + Jouer une partie rapide contre l'ordinateur avec des règles aléatoires Play a hotseat game against your friends, or AI teams - Jouer une partie sur cet ordinateur contre vos amis ou l'IA + Jouer une partie sur cet ordinateur contre vos amis ou l'IA Campaign Mode @@ -1528,7 +1579,7 @@ Restrict Unregistered Players Join - Bloquer l'acces au joueurs non-enregistrés + Bloquer l'acces au joueurs non-enregistrés Show games in lobby @@ -1607,11 +1658,11 @@ Frontend sound effects - Effet sonores de l'interface + Effet sonores de l'interface Frontend music - Musique de l'interface + Musique de l'interface @@ -1638,11 +1689,11 @@ In lobby - En attente + En attente In progress - En cours + En cours Disabled @@ -1952,7 +2003,7 @@ This development build is 'work in progress' and may not be compatible with other versions of the game, while some features might be broken or incomplete! - Cette version est "en cours de développement" il est possible qu'elle ne soit pas compatible avec les autres versions du jeu, des parties peuvent ne pas fonctionner ou être incompletes! + Cette version est "en cours de développement" il est possible qu'elle ne soit pas compatible avec les autres versions du jeu, des parties peuvent ne pas fonctionner ou être incompletes! Fullscreen @@ -1990,6 +2041,10 @@ This program is distributed under the %1 Ce programme est distribué par %1 + + This setting will be effective at next restart. + + QLineEdit @@ -2034,7 +2089,7 @@ Error while authenticating at google.com: - Erreur lors de l'authentification à google.com: + Erreur lors de l'authentification à google.com: @@ -2044,7 +2099,7 @@ Error while sending metadata to youtube.com: - Erreur lors de l'envoi des metadata à youtube.com: + Erreur lors de l'envoi des metadata à youtube.com: @@ -2053,11 +2108,11 @@ Do you really want to delete the team '%1'? - Voulez-vous vraiment supprimer l'équipe "%1" + Voulez-vous vraiment supprimer l'équipe "%1" Cannot delete default scheme '%1'! - Impossible de retirer la règle par défaut "%1" + Impossible de retirer la règle par défaut "%1" Please select a record from the list @@ -2077,7 +2132,7 @@ All file associations have been set - Les associations d'extensions de fichiers ont été effectuées + Les associations d'extensions de fichiers ont été effectuées Cannot create directory %1 @@ -2101,11 +2156,11 @@ Please enter room name - Veuillez saisir le nom d'une room + Veuillez saisir le nom d'une room Record Play - Error - Jouer l'enregistrement - Erreur + Jouer l'enregistrement - Erreur Please select record from the list @@ -2147,7 +2202,7 @@ Do you really want to delete the game scheme '%1'? - Etes-vous sûr de vouloir supprimer cette règle : "%1" ? + Etes-vous sûr de vouloir supprimer cette règle : "%1" ? Videos - Are you sure? @@ -2155,7 +2210,7 @@ Do you really want to delete the video '%1'? - Etes-vous sûr de vouloir supprimer cette vidéo : "%1" ? + Etes-vous sûr de vouloir supprimer cette vidéo : "%1" ? Do you really want to remove %1 file(s)? @@ -2166,7 +2221,7 @@ Do you really want to cancel uploading %1? - Voulez-vous arreter l'importation de %1? + Voulez-vous arreter l'importation de %1? File error @@ -2174,7 +2229,7 @@ Cannot open '%1' for writing - Impossible d'écrire le fichier %1 + Impossible d'écrire le fichier %1 Cannot open '%1' for reading @@ -2182,7 +2237,7 @@ Cannot use the ammo '%1'! - Impossible d'utiliser cette arme : "%1" + Impossible d'utiliser cette arme : "%1" Weapons - Warning @@ -2190,11 +2245,11 @@ Cannot overwrite default weapon set '%1'! - Impossible de remplacer le set d'arme "%1" + Impossible de remplacer le set d'arme "%1" Cannot delete default weapon set '%1'! - Impossible de supprimer le set d'arme par défaut "%1" + Impossible de supprimer le set d'arme par défaut "%1" Weapons - Are you sure? @@ -2202,7 +2257,7 @@ Do you really want to delete the weapon set '%1'? - Etes-vous sûr de vouloir supprimer le set d'arme "%1"? + Etes-vous sûr de vouloir supprimer le set d'arme "%1"? Hedgewars - Nick not registered @@ -2303,7 +2358,7 @@ More info - Plus d'info + Plus d'info Set default options @@ -2323,7 +2378,7 @@ Cancel uploading - Annuler l'importation + Annuler l'importation Restore default coding parameters @@ -3099,116 +3154,112 @@ server - No checker rights - - - Authentication failed - Echec d'authentification + Echec d'authentification 60 seconds cooldown after kick - Bannis pour 60 sec après un kick + Bannis pour 60 sec après un kick kicked - Exclus (kick) + Exclus (kick) Ping timeout - Met trop de temps à répondre + Met trop de temps à répondre bye - Aurevoir + Aurevoir Empty config entry - Configuration vide + Configuration vide Not room master - Vous n'êtes pas le propriétaire de la room + Vous n'êtes pas le propriétaire de la room Corrupted hedgehogs info - Info hérisson corrompus + Info hérisson corrompus too many teams - trop d'équipes + trop d'équipes too many hedgehogs - trop de hérissons + trop de hérissons There's already a team with same name in the list - Il y a déja une équipe avec le même nom dans la liste + Il y a déja une équipe avec le même nom dans la liste round in progress - La partie est en cour + La partie est en cour restricted - Ajout interdis + Ajout interdis REMOVE_TEAM: no such team - REMOVE_TEAM: aucune équipe de ce nom + REMOVE_TEAM: aucune équipe de ce nom Not team owner! - Vous n'êtes pas le propriétaire de cette équipe! + Vous n'êtes pas le propriétaire de cette équipe! Less than two clans! - Il faut 2 clans minimum! + Il faut 2 clans minimum! Room with such name already exists - Ce nom de room existe déjà + Ce nom de room existe déjà Illegal room name - Nom de room invalide + Nom de room invalide No such room - Cette room n'existe pas + Cette room n'existe pas Joining restricted - Accès interdis + Accès interdis Registered users only - Accès réservé aux utilisateurs enregistré + Accès réservé aux utilisateurs enregistré You are banned in this room - Vous avez été bannis de cette room + Vous avez été bannis de cette room Nickname already chosen - Pseudo déjà choisis + Pseudo déjà choisis Illegal nickname - Pseudo invalide + Pseudo invalide Protocol already known - Protocole déjà connu + Protocole déjà connu Bad number - Mauvais numéro + Mauvais numéro Nickname is already in use - Ce pseudo est actuellement utilisé sur le serveur + Ce pseudo est actuellement utilisé sur le serveur diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_gl.ts --- a/share/hedgewars/Data/Locale/hedgewars_gl.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_gl.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -254,6 +254,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -353,6 +365,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -472,10 +488,6 @@ - Theme: - - - Load drawn map @@ -491,6 +503,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -535,7 +551,7 @@ %1 *** %2 has joined - %1 *** %2 uniuse + %1 *** %2 uniuse %1 *** %2 has left (%3) @@ -729,6 +745,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Eraser @@ -870,6 +897,14 @@ + + Play again + + + + Save + + PageInGame @@ -1961,6 +1996,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3062,119 +3101,4 @@ Mando - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_hu.ts --- a/share/hedgewars/Data/Locale/hedgewars_hu.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -248,6 +248,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -347,6 +359,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -466,10 +482,6 @@ - Theme: - - - Load drawn map @@ -485,6 +497,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -529,7 +545,7 @@ %1 *** %2 has joined - %1 *** %2 csatlakozott + %1 *** %2 csatlakozott %1 *** %2 has left (%3) @@ -723,6 +739,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -858,6 +885,14 @@ + + Play again + + + + Save + + PageInGame @@ -1947,6 +1982,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3047,119 +3086,4 @@ DPad - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_it.ts --- a/share/hedgewars/Data/Locale/hedgewars_it.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Mon May 27 10:52:30 2013 +0400 @@ -100,7 +100,7 @@ Please give us feedback! - Per favore, inviaci un commento! + Per favore, inviaci un commento! We are always happy about suggestions, ideas, or bug reports. @@ -108,11 +108,23 @@ If you found a bug, you can see if it's already known here (english): - Se torvi u nbaco, puoi vedere se è già conosciuto qui (in inglese): + Se torvi u nbaco, puoi vedere se è già conosciuto qui (in inglese): Your email address is optional, but we may want to contact you. - Il tuo indirizzo di posta elettronica è opzionale, ma potremmo volerti contattare. + Il tuo indirizzo di posta elettronica è opzionale, ma potremmo volerti contattare. + + + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. + @@ -261,6 +273,18 @@ Failed to save StyleSheet to %1 Impossibile salvare la StyleSheet in %1! Errore interno! + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -370,6 +394,10 @@ Ti sei ricollegato troppo velocemente. Per favore aspetta qualche secondo e prova di nuovo. + + This page requires an internet connection. + + HWGame @@ -490,7 +518,7 @@ Theme: - Tema: + Tema: Load drawn map @@ -508,6 +536,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -552,7 +584,7 @@ %1 *** %2 has joined - %1 *** %2 è entrato + %1 *** %2 è entrato %1 *** %2 has left (%3) @@ -749,6 +781,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -890,6 +933,14 @@ %1 aveva paura e ha passato il turno %2 volte. + + Play again + + + + Save + Salva + PageInGame @@ -2001,6 +2052,10 @@ This program is distributed under the %1 Questo programma è distribuito secondo i termini di %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3139,115 +3194,111 @@ server Not room master - Non proprietario della stanza + Non proprietario della stanza Corrupted hedgehogs info - Informazioni ricci corrotte + Informazioni ricci corrotte too many teams - troppe squadre + troppe squadre too many hedgehogs - troppi ricci + troppi ricci There's already a team with same name in the list - C'è già una quadra collo stesso nome in lista + C'è già una quadra collo stesso nome in lista round in progress - turno in corso + turno in corso restricted - proibito + proibito REMOVE_TEAM: no such team - CANCELLA_SQUADRA: squadra non presente + CANCELLA_SQUADRA: squadra non presente Not team owner! - Non proprietario della squadra! + Non proprietario della squadra! Less than two clans! - Meno di due clan! + Meno di due clan! Room with such name already exists - Esiste già una stanza con questo nome + Esiste già una stanza con questo nome Nickname already chosen - Nome già scelto + Nome già scelto Illegal nickname - Nome non valido + Nome non valido Protocol already known - Protocollo già conosciuto + Protocollo già conosciuto Bad number - Numero non valido + Numero non valido Nickname is already in use - Nome già in uso + Nome già in uso Authentication failed - Autenticazione fallita + Autenticazione fallita 60 seconds cooldown after kick - 60 secondi di raffreddamento prima dell'espulsione + 60 secondi di raffreddamento prima dell'espulsione kicked - espulso + espulso Ping timeout - Scadenza ping + Scadenza ping bye - ciao + ciao Illegal room name - Nome stanza non valido + Nome stanza non valido No such room - Stanza non esistente + Stanza non esistente Joining restricted - Ingresso riservato + Ingresso riservato Registered users only - Solo utenti registrati + Solo utenti registrati You are banned in this room - Sei stato espulso dalla stanza + Sei stato espulso dalla stanza Empty config entry - Configurazione vuota - - - No checker rights - + Configurazione vuota diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_ja.ts --- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -248,6 +248,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -347,6 +359,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -466,10 +482,6 @@ - Theme: - - - Load drawn map @@ -485,6 +497,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -529,7 +545,7 @@ %1 *** %2 has joined - %1 *** %2 さんは参加 + %1 *** %2 さんは参加 %1 *** %2 has left (%3) @@ -723,6 +739,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -858,6 +885,14 @@ + + Play again + + + + Save + セーブ + PageInGame @@ -1943,6 +1978,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3043,119 +3082,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_ko.ts --- a/share/hedgewars/Data/Locale/hedgewars_ko.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ko.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -248,6 +248,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -347,6 +359,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -466,10 +482,6 @@ - Theme: - - - Load drawn map @@ -485,6 +497,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -528,10 +544,6 @@ - %1 *** %2 has joined - - - %1 *** %2 has left (%3) @@ -723,6 +735,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -858,6 +881,14 @@ + + Play again + + + + Save + + PageInGame @@ -1919,6 +1950,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3011,119 +3046,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_lt.ts --- a/share/hedgewars/Data/Locale/hedgewars_lt.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_lt.ts Mon May 27 10:52:30 2013 +0400 @@ -97,7 +97,7 @@ DataManager - + Use Default @@ -105,37 +105,37 @@ FeedbackDialog - - Please give us feedback! - - - - + We are always happy about suggestions, ideas, or bug reports. - - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. - - - - + Send us feedback! + + + + + If you found a bug, you can see if it's already been reported here: + + + + + Your email address is optional, but necessary if you want us to get back at you. + + + + View - + Cancel - + Send Feedback @@ -267,52 +267,67 @@ HWChatWidget - + + %1 has joined + + + + + %1 has left + + + + + %1 has left (%2) + + + + %1 has been removed from your ignore list - + %1 has been added to your ignore list - + %1 has been removed from your friends list - + %1 has been added to your friends list - + Stylesheet imported from %1 - + Enter %1 if you want to use the current StyleSheet in future, enter %2 to reset! - + Couldn't read %1 - + StyleSheet discarded - + StyleSheet saved to %1 - + Failed to save StyleSheet to %1 @@ -325,23 +340,23 @@ - + Game aborted - + Nickname - - + + No nickname supplied. - + Someone already uses your nickname %1 on the server. Please pick another nickname: @@ -352,12 +367,12 @@ - + Hedgewars - Nick registered - + This nick is registered, and you haven't specified a password. If this nick isn't yours, please register your own nick at www.hedgewars.org @@ -366,90 +381,95 @@ - + Your nickname is not registered. To prevent someone else from using it, please register it at www.hedgewars.org - + Your password wasn't saved either. - - + + Hedgewars - Empty nickname - + Hedgewars - Wrong password - + You entered a wrong password. - + Try Again - + Hedgewars - Connection error - + You reconnected too fast. Please wait a few seconds and try again. - - + + Cannot save record to file %1 - + Hedgewars Demo File File Types - + Hedgewars Save File File Types - + Demo name - + Demo name: + + + This page requires an internet connection. + + HWGame - + en.txt lt.txt - + Cannot open demofile %1 @@ -457,158 +477,158 @@ HWMapContainer - + Map type: - - Image map - - - - Mission map + Image map - Hand-drawn + Mission map - Randomly generated + Hand-drawn + Randomly generated + + + + Random maze - + Random - + Map preview: - + Load map drawing - + Edit map drawing - - All - - - - - Small - - - - - Medium - - - - Large + All - Cavern + Small + Medium + + + + + Large + + + + + Cavern + + + + Wacky - - Large tunnels - - - - - Small islands - - - - - Medium islands - - - + Large tunnels + + + + + Small islands + + + + + Medium islands + + + + Large islands - + Map size: - + Maze style: - + Mission: - + Map: - - - Theme: - - - - + + + Theme: %1 + + + + Load drawn map - + Drawn Maps - + All files - + Small tunnels - + Medium tunnels - + Seed @@ -659,40 +679,33 @@ - + Room destroyed - + You got kicked - - + + %1 *** %2 has joined the room - - %1 *** %2 has joined - - - - - + %1 *** %2 has left - - + %1 *** %2 has left (%3) - + Quit reason: @@ -902,6 +915,19 @@ + PageDataDownload + + + Loading, please wait. + + + + + This page requires an internet connection. + + + + PageDrawMap @@ -1022,12 +1048,22 @@ - + + Play again + + + + + Save + + + + The best shot award was won by %1 with %2 pts. - + The best killer is %1 with %2 kills in a turn. @@ -1036,7 +1072,7 @@ - + A total of %1 hedgehog(s) were killed during this round. @@ -1045,7 +1081,7 @@ - + (%1 kill) @@ -1054,7 +1090,7 @@ - + %1 thought it's good to shoot his own hedgehogs with %2 pts. @@ -1063,7 +1099,7 @@ - + %1 killed %2 of his own hedgehogs. @@ -1072,7 +1108,7 @@ - + %1 was scared and skipped turn %2 times. @@ -1173,12 +1209,12 @@ PageMultiplayer - + Edit game preferences - + Start @@ -1338,97 +1374,97 @@ - + Frontend - + Custom colors - + Reset to default colors - + Game audio - + Frontend audio - + Account - + Proxy settings - - Proxy host - - - - - Proxy port - - - - Proxy login + Proxy host + Proxy port + + + + + Proxy login + + + + Proxy password - - No proxy - - - - - System proxy settings - - - - Socks5 proxy + No proxy + System proxy settings + + + + + Socks5 proxy + + + + HTTP proxy - + Miscellaneous - + Updates - + Check for updates - + Video recording options @@ -1449,52 +1485,52 @@ PageRoomsList - + Search for a room: - + Create room - + Join room - + Room state - + Rules: - + Weapons: - + Clear filters - + Admin features - + Open server administration page - + %1 players online @@ -1808,23 +1844,23 @@ - + Ignore - + Add friend - + Unignore - + Remove friend @@ -1844,12 +1880,12 @@ - + Show games in lobby - + Show games in-progress @@ -1857,75 +1893,75 @@ QCheckBox - + Show ammo menu tooltips - + Alternative damage show - + Visual effects - - + + Sound - + In-game sound effects - - + + Music - + In-game music - + Frontend sound effects - + Frontend music - + Append date and time to record file name - + Check for updates at startup - + Fullscreen - + Show FPS - + Save password @@ -1940,12 +1976,12 @@ - + Record audio - + Use game resolution @@ -1968,88 +2004,88 @@ - + (System default) - - Disabled - - - - - Red/Cyan - - - - Cyan/Red + Disabled - Red/Blue + Red/Cyan - Blue/Red + Cyan/Red - Red/Green + Red/Blue + Blue/Red + + + + + Red/Green + + + + Green/Red + + Side-by-side + + + + + Top-Bottom + + + + + Red/Cyan grayscale + + + + + Cyan/Red grayscale + + + + + Red/Blue grayscale + + + + + Blue/Red grayscale + + + - Side-by-side + Red/Green grayscale - Top-Bottom - - - - - Red/Cyan grayscale - - - - - Cyan/Red grayscale - - - - - Red/Blue grayscale - - - - - Blue/Red grayscale - - - - - Red/Green grayscale - - - - Green/Red grayscale - - + + Any @@ -2087,7 +2123,7 @@ - + Playing teams @@ -2185,22 +2221,27 @@ - + Locale - + Nickname - + + This setting will be effective at next restart. + + + + Resolution - + Quality @@ -2220,17 +2261,17 @@ - + Stereo rendering - + Initial sound volume - + FPS limit @@ -2352,52 +2393,52 @@ - + Your Email - + Summary - + Send system information - + Description - + Type the security code: - + Format - + Audio codec - + Video codec - + Framerate - + Bitrate (Kbps) @@ -2405,7 +2446,7 @@ QLineEdit - + unnamed @@ -2416,7 +2457,7 @@ - + anonymous @@ -2447,82 +2488,82 @@ - + Cannot delete default scheme '%1'! - + Please select a record from the list - + Hedgewars - Nick not registered - + Unable to start server - + Connection to server is lost - + Not all players are ready - + Are you sure you want to start this game? Not all players are ready. - + Hedgewars - Error - + System Information Preview - - + + Failed to generate captcha - + Failed to download captcha - + Please fill out all fields. Email is optional. - - + + Hedgewars - Success - + All file associations have been set - + File association failed. @@ -2600,22 +2641,22 @@ - + Room Name - Error - + Please select room from the list - + Room Name - Are you sure? - + The game you are trying to join has started. Do you still want to join the room? @@ -2664,7 +2705,7 @@ - + File error @@ -2675,7 +2716,7 @@ - + Cannot open '%1' for reading @@ -2791,7 +2832,7 @@ - + Associate file extensions @@ -2824,12 +2865,12 @@ - + Set default options - + Restore default coding parameters @@ -3027,7 +3068,7 @@ TeamSelWidget - + At least two teams are required to play! @@ -3426,7 +3467,7 @@ - + Keyboard @@ -3786,147 +3827,4 @@ - - server - - - No checker rights - - - - - Authentication failed - - - - - 60 seconds cooldown after kick - - - - - kicked - - - - - Ping timeout - - - - - bye - - - - - Empty config entry - - - - - Not room master - - - - - Corrupted hedgehogs info - - - - - too many teams - - - - - too many hedgehogs - - - - - There's already a team with same name in the list - - - - - round in progress - - - - - restricted - - - - - REMOVE_TEAM: no such team - - - - - Not team owner! - - - - - Less than two clans! - - - - - Room with such name already exists - - - - - Illegal room name - - - - - No such room - - - - - Joining restricted - - - - - Registered users only - - - - - You are banned in this room - - - - - Nickname already chosen - - - - - Illegal nickname - - - - - Protocol already known - - - - - Bad number - - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_ms.ts --- a/share/hedgewars/Data/Locale/hedgewars_ms.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ms.ts Mon May 27 10:52:30 2013 +0400 @@ -97,7 +97,7 @@ DataManager - + Use Default @@ -105,37 +105,37 @@ FeedbackDialog - - Please give us feedback! - - - - + We are always happy about suggestions, ideas, or bug reports. - - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. - - - - + Send us feedback! + + + + + If you found a bug, you can see if it's already been reported here: + + + + + Your email address is optional, but necessary if you want us to get back at you. + + + + View - + Cancel - + Send Feedback @@ -255,52 +255,67 @@ HWChatWidget - + + %1 has joined + + + + + %1 has left + + + + + %1 has left (%2) + + + + %1 has been removed from your ignore list - + %1 has been added to your ignore list - + %1 has been removed from your friends list - + %1 has been added to your friends list - + Stylesheet imported from %1 - + Enter %1 if you want to use the current StyleSheet in future, enter %2 to reset! - + Couldn't read %1 - + StyleSheet discarded - + StyleSheet saved to %1 - + Failed to save StyleSheet to %1 @@ -318,17 +333,17 @@ - + Game aborted - + Hedgewars - Nick registered - + This nick is registered, and you haven't specified a password. If this nick isn't yours, please register your own nick at www.hedgewars.org @@ -337,107 +352,112 @@ - + Your nickname is not registered. To prevent someone else from using it, please register it at www.hedgewars.org - + Your password wasn't saved either. - + Nickname - + Someone already uses your nickname %1 on the server. Please pick another nickname: - - + + No nickname supplied. - - + + Hedgewars - Empty nickname - + Hedgewars - Wrong password - + You entered a wrong password. - + Try Again - + Hedgewars - Connection error - + You reconnected too fast. Please wait a few seconds and try again. - - + + Cannot save record to file %1 - + Hedgewars Demo File File Types - + Hedgewars Save File File Types - + Demo name - + Demo name: + + + This page requires an internet connection. + + HWGame - + en.txt ms.txt - + Cannot open demofile %1 @@ -445,158 +465,158 @@ HWMapContainer - + Map type: - - Image map - - - - Mission map + Image map - Hand-drawn + Mission map - Randomly generated + Hand-drawn + Randomly generated + + + + Random maze - + Random - + Map preview: - + Load map drawing - + Edit map drawing - - All - - - - - Small - - - - - Medium - - - - Large + All - Cavern + Small + Medium + + + + + Large + + + + + Cavern + + + + Wacky - - Large tunnels - - - - - Small islands - - - - - Medium islands - - - + Large tunnels + + + + + Small islands + + + + + Medium islands + + + + Large islands - + Map size: - + Maze style: - + Mission: - + Map: - - - Theme: - - - - + + + Theme: %1 + + + + Load drawn map - + Drawn Maps - + All files - + Small tunnels - + Medium tunnels - + Seed @@ -622,7 +642,7 @@ HWNewNet - + Quit reason: @@ -652,35 +672,28 @@ - + You got kicked - - %1 *** %2 has joined - - - - - + %1 *** %2 has left - - + %1 *** %2 has left (%3) - - + + %1 *** %2 has joined the room - + Room destroyed @@ -890,6 +903,19 @@ + PageDataDownload + + + Loading, please wait. + + + + + This page requires an internet connection. + + + + PageDrawMap @@ -1010,47 +1036,57 @@ - + + Play again + + + + + Save + + + + The best shot award was won by %1 with %2 pts. - + The best killer is %1 with %2 kills in a turn. - + A total of %1 hedgehog(s) were killed during this round. - + (%1 kill) - + %1 thought it's good to shoot his own hedgehogs with %2 pts. - + %1 killed %2 of his own hedgehogs. - + %1 was scared and skipped turn %2 times. @@ -1149,12 +1185,12 @@ PageMultiplayer - + Edit game preferences - + Start @@ -1314,97 +1350,97 @@ - + Frontend - + Custom colors - + Reset to default colors - + Game audio - + Frontend audio - + Account - + Proxy settings - - Proxy host - - - - - Proxy port - - - - Proxy login + Proxy host + Proxy port + + + + + Proxy login + + + + Proxy password - - No proxy - - - - - System proxy settings - - - - Socks5 proxy + No proxy + System proxy settings + + + + + Socks5 proxy + + + + HTTP proxy - + Miscellaneous - + Updates - + Check for updates - + Video recording options @@ -1425,52 +1461,52 @@ PageRoomsList - + Search for a room: - + Create room - + Join room - + Room state - + Rules: - + Weapons: - + Clear filters - + Admin features - + Open server administration page - + %1 players online @@ -1795,33 +1831,33 @@ - + Ignore - + Add friend - + Unignore - + Remove friend - + Show games in lobby - + Show games in-progress @@ -1830,7 +1866,7 @@ QCheckBox - + Save password @@ -1845,79 +1881,79 @@ - + Check for updates at startup - + Fullscreen - + Alternative damage show - + Show FPS - + Show ammo menu tooltips - + Visual effects - - + + Sound - + In-game sound effects - - + + Music - + In-game music - + Frontend sound effects - + Frontend music - + Append date and time to record file name - + Record audio - + Use game resolution @@ -1940,88 +1976,88 @@ - + (System default) - - Disabled - - - - - Red/Cyan - - - - Cyan/Red + Disabled - Red/Blue + Red/Cyan - Blue/Red + Cyan/Red - Red/Green + Red/Blue + Blue/Red + + + + + Red/Green + + + + Green/Red + + Side-by-side + + + + + Top-Bottom + + + + + Red/Cyan grayscale + + + + + Cyan/Red grayscale + + + + + Red/Blue grayscale + + + + + Blue/Red grayscale + + + - Side-by-side + Red/Green grayscale - Top-Bottom - - - - - Red/Cyan grayscale - - - - - Cyan/Red grayscale - - - - - Red/Blue grayscale - - - - - Blue/Red grayscale - - - - - Red/Green grayscale - - - - Green/Red grayscale - - + + Any @@ -2069,7 +2105,7 @@ - + Playing teams @@ -2149,27 +2185,27 @@ - + Your Email - + Summary - + Send system information - + Description - + Type the security code: @@ -2199,22 +2235,27 @@ - + Locale - + Nickname - + + This setting will be effective at next restart. + + + + Resolution - + Quality @@ -2234,17 +2275,17 @@ - + Stereo rendering - + Initial sound volume - + FPS limit @@ -2329,27 +2370,27 @@ - + Format - + Audio codec - + Video codec - + Framerate - + Bitrate (Kbps) @@ -2377,7 +2418,7 @@ QLineEdit - + unnamed @@ -2388,7 +2429,7 @@ - + anonymous @@ -2419,82 +2460,82 @@ - + Cannot delete default scheme '%1'! - + Please select a record from the list - + Hedgewars - Nick not registered - + Unable to start server - + Connection to server is lost - + Not all players are ready - + Are you sure you want to start this game? Not all players are ready. - + Hedgewars - Error - + System Information Preview - - + + Failed to generate captcha - + Failed to download captcha - + Please fill out all fields. Email is optional. - - + + Hedgewars - Success - + All file associations have been set - + File association failed. @@ -2562,22 +2603,22 @@ - + Room Name - Error - + Please select room from the list - + Room Name - Are you sure? - + The game you are trying to join has started. Do you still want to join the room? @@ -2624,7 +2665,7 @@ - + File error @@ -2635,7 +2676,7 @@ - + Cannot open '%1' for reading @@ -2766,7 +2807,7 @@ - + Associate file extensions @@ -2794,12 +2835,12 @@ - + Set default options - + Restore default coding parameters @@ -2997,7 +3038,7 @@ TeamSelWidget - + At least two teams are required to play! @@ -3714,7 +3755,7 @@ - + Keyboard @@ -3756,147 +3797,4 @@ - - server - - - No checker rights - - - - - Authentication failed - - - - - 60 seconds cooldown after kick - - - - - kicked - - - - - Ping timeout - - - - - bye - - - - - Empty config entry - - - - - Not room master - - - - - Corrupted hedgehogs info - - - - - too many teams - - - - - too many hedgehogs - - - - - There's already a team with same name in the list - - - - - round in progress - - - - - restricted - - - - - REMOVE_TEAM: no such team - - - - - Not team owner! - - - - - Less than two clans! - - - - - Room with such name already exists - - - - - Illegal room name - - - - - No such room - - - - - Joining restricted - - - - - Registered users only - - - - - You are banned in this room - - - - - Nickname already chosen - - - - - Illegal nickname - - - - - Protocol already known - - - - - Bad number - - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_nl.ts --- a/share/hedgewars/Data/Locale/hedgewars_nl.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_nl.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -254,6 +254,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -353,6 +365,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -472,10 +488,6 @@ - Theme: - - - Load drawn map @@ -491,6 +503,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -534,10 +550,6 @@ - %1 *** %2 has joined - - - %1 *** %2 has left (%3) @@ -729,6 +741,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -870,6 +893,14 @@ + + Play again + + + + Save + + PageInGame @@ -1933,6 +1964,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3026,119 +3061,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_pl.ts --- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): + Send us feedback! - Your email address is optional, but we may want to contact you. + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -267,6 +267,18 @@ Failed to save StyleSheet to %1 Nie można było zapisać arkusza stylów jako %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -367,6 +379,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -486,10 +502,6 @@ - Theme: - - - Load drawn map Załaduj mapę @@ -505,6 +517,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -549,7 +565,7 @@ %1 *** %2 has joined - %1 *** %2 dołączył + %1 *** %2 dołączył %1 *** %2 has left (%3) @@ -743,6 +759,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -890,6 +917,14 @@ %1 trząsł portkami i opuścił turę %2 razy. + + Play again + + + + Save + Zapisz + PageInGame @@ -2001,6 +2036,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3130,119 +3169,4 @@ DPad - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_pt_BR.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -254,6 +254,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -353,6 +365,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -473,10 +489,6 @@ - Theme: - - - Load drawn map Carregar mapa @@ -492,6 +504,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -536,7 +552,7 @@ %1 *** %2 has joined - %1 *** %2 entrou + %1 *** %2 entrou %1 *** %2 has left (%3) @@ -730,6 +746,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -871,6 +898,14 @@ %1 estava assustado e passou o turno %2 vezes.. + + Play again + + + + Save + Salvar + PageInGame @@ -1974,6 +2009,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3082,119 +3121,4 @@ DPad - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_pt_PT.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ Enviar Feedback - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): + Send us feedback! - Your email address is optional, but we may want to contact you. + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -261,6 +261,18 @@ Failed to save StyleSheet to %1 Não foi possível gravar o StyleSheet em %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -370,6 +382,10 @@ Tentás-te voltar ao servidor num espaço de tempo demasiado curto. Por favor, aguarda alguns segundos e tenta novamente. + + This page requires an internet connection. + + HWGame @@ -494,7 +510,7 @@ Theme: - Tema: + Tema: Load drawn map @@ -508,6 +524,10 @@ All files Todos os ficheiros + + Theme: %1 + + HWNetServersModel @@ -552,7 +572,7 @@ %1 *** %2 has joined - %1 *** %2 entrou + %1 *** %2 entrou %1 *** %2 has left (%3) @@ -747,6 +767,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -888,6 +919,14 @@ %1 estava tão amedrontado que passou %2 turnos. + + Play again + + + + Save + Gravar + PageInGame @@ -1955,6 +1994,10 @@ This program is distributed under the %1 Este programa é distribuído sob a %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3094,115 +3137,115 @@ server Not room master - Não és o anfitrião da sala + Não és o anfitrião da sala Corrupted hedgehogs info - Informação dos ouriços corrompida + Informação dos ouriços corrompida too many teams - demasiadas equipas + demasiadas equipas too many hedgehogs - demasiados ouriços + demasiados ouriços There's already a team with same name in the list - Já existe uma equipa com o mesmo nome na lista + Já existe uma equipa com o mesmo nome na lista round in progress - partida em progresso + partida em progresso restricted - limitada + limitada REMOVE_TEAM: no such team - REMOVE_TEAM: equipa inexistente + REMOVE_TEAM: equipa inexistente Not team owner! - A equipa não te pertence! + A equipa não te pertence! Less than two clans! - Menos de 2 clãs! + Menos de 2 clãs! Room with such name already exists - Já existe uma sala com esse nome + Já existe uma sala com esse nome Nickname already chosen - Utilizador já em uso + Utilizador já em uso Illegal nickname - Nome de utilizador ilegal + Nome de utilizador ilegal Protocol already known - Protocolo já conhecido + Protocolo já conhecido Bad number - Número inválido + Número inválido Nickname is already in use - Nome de utilizador já em uso + Nome de utilizador já em uso No checker rights - Não possui permissões para verificar + Não possui permissões para verificar Authentication failed - A autenticação falhou + A autenticação falhou 60 seconds cooldown after kick - É necessário aguardar 60 segundos após uma expulsão + É necessário aguardar 60 segundos após uma expulsão kicked - expulso + expulso Ping timeout - Ping timeout + Ping timeout bye - tchau (bye) + tchau (bye) Illegal room name - Nome da sala ilegal + Nome da sala ilegal No such room - Sala inexistente + Sala inexistente Joining restricted - Entrada restrita + Entrada restrita Registered users only - Apenas utilizadores registados + Apenas utilizadores registados You are banned in this room - Estás banido desta sala + Estás banido desta sala Empty config entry - Campo vazio na configuração + Campo vazio na configuração diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_ro.ts --- a/share/hedgewars/Data/Locale/hedgewars_ro.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ro.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -260,6 +260,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -359,6 +371,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -478,10 +494,6 @@ - Theme: - - - Load drawn map @@ -497,6 +509,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -541,7 +557,7 @@ %1 *** %2 has joined - %1 *** %2 has joined + %1 *** %2 has joined %1 *** %2 has left (%3) @@ -735,6 +751,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -882,6 +909,14 @@ + + Play again + + + + Save + + PageInGame @@ -1971,6 +2006,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3074,119 +3113,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_ru.ts --- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Mon May 27 10:52:30 2013 +0400 @@ -5,7 +5,7 @@ About Unknown Compiler - + Неизвестный компилятор @@ -30,31 +30,31 @@ BanDialog IP - IP + IP Nick - + Псевдоним IP/Nick - + IP/Псевдоним Reason - + Причина Duration - + Длительность Ok - + ОК Cancel - Отмена + Отмена you know why @@ -62,57 +62,57 @@ Warning - + Предупреждение Please, specify %1 - + Пожалуйста, укажите %1 nickname - + псевдоним permanent - + постоянный DataManager Use Default - + Использовать значение по умолчанию FeedbackDialog View - + Вид Cancel - Отмена + Отмена Send Feedback - - - - Please give us feedback! - + Отослать отзыв We are always happy about suggestions, ideas, or bug reports. - - - - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. - + Мы всегда рады новым предложениям, идям или сообщениям об ошибках. + + + Send us feedback! + Пришлите нам отзыв! + + + If you found a bug, you can see if it's already been reported here: + Если вы нашли ошибку, можете проверить, не было ли уже сообщения о ней здесь: + + + Your email address is optional, but necessary if you want us to get back at you. + Адрес e-mail необязателен, но необходим, если вы хотите получить ответ. @@ -146,73 +146,76 @@ Game scheme will auto-select a weapon - + Схема игры определяет набор оружия Map - Карта + Карта Game options - + Настройки игры HWApplication %1 minutes - - - - + + %1 минута + %1 минуты + %1 минут %1 hour - - - - + + %1 час + %1 часа + %1 часов %1 hours - - - - + + %1 час + %1 часа + %1 часов %1 day - - - - + + %1 день + %1 дня + %1 дней %1 days - - - - + + %1 день + %1 дня + %1 дней Scheme '%1' not supported - + Схема "%1" не поддерживается Cannot create directory %1 - Не могу создать папку %1 + Не могу создать папку %1 Failed to open data directory: %1 Please check your installation! - + Не могу открыть папку: +%1 + +Пожалуйста, проверьте установку приложения! @@ -264,6 +267,18 @@ Failed to save StyleSheet to %1 Ошибка при сохранении стиля в %1 + + %1 has joined + %1 вошёл + + + %1 has left + %1 вышел + + + %1 has left (%2) + %1 вышел (%2) + HWForm @@ -313,7 +328,7 @@ %1's Team - + Команда %1 Hedgewars - Nick registered @@ -362,6 +377,11 @@ You reconnected too fast. Please wait a few seconds and try again. + Вы переподключились слишком быстро. +Пожалуйста, попробуйте снова через несколько секунд. + + + This page requires an internet connection. @@ -416,91 +436,91 @@ Map type: - + Тип карты: Image map - + Изображение Mission map - + Миссия Hand-drawn - Рисованная карта + Рисованная карта Randomly generated - + Случайно сгенерированная Random maze - + Случайный лабиринт Random - Случайно + Случайно Map preview: - + Предпросмотр карты: Load map drawing - + Загрузить рисованную карту Edit map drawing - + Редактировать рисованную карту Small islands - + Маленькие острова Medium islands - + Средние острова Large islands - + Большие острова Map size: - + Размер карты: Maze style: - + Стиль лабиринта: Mission: - + Миссия: Map: - - - - Theme: - + Карта: Load drawn map - Загрузить рисованную карту + Загрузить рисованную карту Drawn Maps - Рисованные карты + Рисованные карты All files - Все файлы + Все файлы Large tunnels - + Большие туннели + + + Theme: %1 + Тема: %1 @@ -546,7 +566,7 @@ %1 *** %2 has joined - %1 *** %2 вошёл + %1 *** %2 вошёл %1 *** %2 has left (%3) @@ -584,11 +604,11 @@ Nickname: - + Псевдоним: Password: - + Пароль: @@ -606,22 +626,22 @@ HatButton Change hat (%1) - + Сменить шляпу (%1) HatPrompt Cancel - Отмена + Отмена Use selected hat - + Использовать выбранную шляпу Search for a hat: - + Поиск по шляпам: @@ -635,7 +655,7 @@ KeyBinder Category - + Категория @@ -643,30 +663,30 @@ Duration: %1m %2s - Длительность: %1мин %2сек + Длительность: %1мин %2сек Video: %1x%2, - Видео: %1x%2, + Видео: %1x%2, %1 fps, - %1 кадров/сек, + %1 кадров/сек, Audio: - Аудио: + Аудио: unknown - + неизвестно MapModel No description available. - + Описание отсутствует. @@ -701,35 +721,35 @@ General - Основные настройки + Основные настройки Bans - + Баны IP/Nick - + IP/Псевдоним Expiration - + Окончание Reason - + Причина Refresh - + Обновить Add - + Добавить Remove - + Удалить @@ -740,6 +760,17 @@ + PageDataDownload + + Loading, please wait. + Идёт загрузка пожалуйста, подождите. + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -790,35 +821,35 @@ Use my default - + Использовать мои настройки по умолчанию Reset all binds - + Сбросить все привязки Custom Controls - + Настройка управления Hat - Шляпа + Шляпа Name - Название + Название This hedgehog's name - + Имя этого ежа Randomize this hedgehog's name - + Выбрать случайное имя для этого ежа Random Team - Случайная команда + Случайная команда @@ -887,6 +918,14 @@ %1 испугался и пропустил %2 ходов. + + Play again + + + + Save + Сохранить + PageInGame @@ -942,23 +981,23 @@ Play a game across a local area network - + Играть по локальной сети Play a game on an official server - + Играть на официальном сервере Feedback - + Отзыв Play local network game - + Играть по локальной сети Play official network game - + Играть на официальном сервере @@ -969,7 +1008,7 @@ Edit game preferences - Редактировать настройки игры + Редактировать настройки игры @@ -980,19 +1019,19 @@ Edit game preferences - Редактировать настройки игры + Редактировать настройки игры Start - Старт + Старт Update - Обновить + Обновить Room controls - + Управление комнатой @@ -1094,47 +1133,47 @@ Reset to default - + Сбросить на значения по умолчанию Reset all binds - + Сбросить все привязки Game - + Игра Graphics - + Графика Audio - + Звук Controls - + Управление Video Recording - + Запись видео Network - + Сеть Teams - Команды + Команды Schemes - + Схемы Weapons - Оружие + Оружие Frontend @@ -1142,7 +1181,7 @@ Custom colors - Свои цвета + Свои цвета Game audio @@ -1158,23 +1197,23 @@ Proxy settings - Настройки прокси + Настройки прокси Miscellaneous - Разное + Разное Updates - + Обновления Check for updates - + Проверить обновления Video recording options - Настройки видео + Настройки видео @@ -1232,27 +1271,27 @@ Search for a room: - + Искать комнату: Create room - + Создать комнату Join room - + Войти в комнату Room state - + Состояние комнаты Clear filters - + Очистить фильтры Open server administration page - + Открыть страницу администрирования сервера @@ -1476,12 +1515,12 @@ Date: %1 - + Дата: %1 Size: %1 - + Размер: %1 @@ -1532,7 +1571,7 @@ Restrict Unregistered Players Join - + Запретить вход незарегистрированным игрокам Show games in lobby @@ -1540,7 +1579,7 @@ Show games in-progress - + Показать текущие игры @@ -1591,11 +1630,11 @@ Visual effects - + Визуальные эффекты Sound - + Звук In-game sound effects @@ -1603,7 +1642,7 @@ Music - + Музыка In-game music @@ -1964,15 +2003,15 @@ Fullscreen - Полный экран + Полный экран Fullscreen Resolution - + Разрешение в полноэкранном режиме Windowed Resolution - + Разрешение в оконном режиме Your Email @@ -1998,6 +2037,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -2241,12 +2284,13 @@ Not all players are ready - + Не все игроки готовы Are you sure you want to start this game? Not all players are ready. - + Вы действительно хотите запустить игру? +Не все игроки готовы. @@ -2376,15 +2420,15 @@ RoomNamePrompt Enter a name for your room. - + Введите название для вашей комнаты. Cancel - Отмена + Отмена Create room - + Создать комнату @@ -2438,19 +2482,19 @@ SeedPrompt The map seed is the basis for all random values generated by the game. - + Зерно карты - это основа для всех псведослучайных значений, используемых в игре. Cancel - Отмена + Отмена Set seed - + Установить зерно Close - + Закрыть @@ -2496,29 +2540,29 @@ TeamSelWidget At least two teams are required to play! - + Для игры нужны как минимум две команды! TeamShowWidget %1's team - + Команда %1 ThemePrompt Cancel - Отмена + Отмена Search for a theme: - + Искать тему: Use selected theme - + Использовать выбранную тему @@ -2689,26 +2733,26 @@ hedgehog info - + информация о еже binds (categories) Movement - + Передвижение Weapons - Оружие + Оружие Camera - + Камера Miscellaneous - Разное + Разное @@ -2779,7 +2823,7 @@ Hedgehog movement - + Движение ежа @@ -3101,119 +3145,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_sk.ts --- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): + Send us feedback! - Your email address is optional, but we may want to contact you. + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -267,6 +267,18 @@ Failed to save StyleSheet to %1 Nepodarilo sa uložiť súbor so štýlom do %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -366,6 +378,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -485,10 +501,6 @@ - Theme: - - - Load drawn map Načítať nakreslenú mapu @@ -504,6 +516,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -548,7 +564,7 @@ %1 *** %2 has joined - %1 *** %2 sa pridal + %1 *** %2 sa pridal %1 *** %2 has left (%3) @@ -742,6 +758,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -889,6 +916,14 @@ %1 sa zľakol a preskočil ťah %2krát. + + Play again + + + + Save + Uložiť + PageInGame @@ -1998,6 +2033,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3127,119 +3166,4 @@ Pravý joystick (Doľava) - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_sv.ts --- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): + Send us feedback! - Your email address is optional, but we may want to contact you. + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -258,6 +258,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -357,6 +369,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -476,10 +492,6 @@ - Theme: - - - Load drawn map Läs in ritad karta @@ -495,6 +507,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -539,7 +555,7 @@ %1 *** %2 has joined - %1 *** %2 har gått med + %1 *** %2 har gått med %1 *** %2 has left (%3) @@ -733,6 +749,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -874,6 +901,14 @@ %1 var rädd och hoppade över turer %2 gånger. + + Play again + + + + Save + Spara + PageInGame @@ -1977,6 +2012,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3079,119 +3118,4 @@ Styrkors - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_tr_TR.ts --- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -248,6 +248,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -347,6 +359,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -466,10 +482,6 @@ - Theme: - - - Load drawn map @@ -485,6 +497,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -528,10 +544,6 @@ - %1 *** %2 has joined - - - %1 *** %2 has left @@ -723,6 +735,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -858,6 +881,14 @@ + + Play again + + + + Save + + PageInGame @@ -1939,6 +1970,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3039,119 +3074,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_uk.ts --- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -264,6 +264,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -363,6 +375,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -482,10 +498,6 @@ - Theme: - - - Load drawn map Завантажити намальовану мапу @@ -501,6 +513,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -545,7 +561,7 @@ %1 *** %2 has joined - %1 *** %2 приєднався + %1 *** %2 приєднався %1 *** %2 has left (%3) @@ -739,6 +755,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -886,6 +913,14 @@ + + Play again + + + + Save + Зберегти + PageInGame @@ -1991,6 +2026,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3094,119 +3133,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_zh_CN.ts --- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Mon May 27 10:52:30 2013 +0400 @@ -97,7 +97,7 @@ DataManager - + Use Default @@ -105,37 +105,37 @@ FeedbackDialog - - Please give us feedback! - - - - + We are always happy about suggestions, ideas, or bug reports. - - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. - - - - + Send us feedback! + + + + + If you found a bug, you can see if it's already been reported here: + + + + + Your email address is optional, but necessary if you want us to get back at you. + + + + View - + Cancel 取消 - + Send Feedback @@ -255,52 +255,67 @@ HWChatWidget - + + %1 has joined + + + + + %1 has left + + + + + %1 has left (%2) + + + + %1 has been removed from your ignore list - + %1 has been added to your ignore list - + %1 has been removed from your friends list - + %1 has been added to your friends list - + Stylesheet imported from %1 - + Enter %1 if you want to use the current StyleSheet in future, enter %2 to reset! - + Couldn't read %1 - + StyleSheet discarded - + StyleSheet saved to %1 - + Failed to save StyleSheet to %1 @@ -318,17 +333,17 @@ - + Game aborted - + Hedgewars - Nick registered - + This nick is registered, and you haven't specified a password. If this nick isn't yours, please register your own nick at www.hedgewars.org @@ -337,93 +352,98 @@ - + Your nickname is not registered. To prevent someone else from using it, please register it at www.hedgewars.org - + Your password wasn't saved either. - + Nickname - + Someone already uses your nickname %1 on the server. Please pick another nickname: - - + + No nickname supplied. - - + + Hedgewars - Empty nickname - + Hedgewars - Wrong password - + You entered a wrong password. - + Try Again - + Hedgewars - Connection error - + You reconnected too fast. Please wait a few seconds and try again. - + Hedgewars Demo File File Types - + Hedgewars Save File File Types - + Demo name - + Demo name: - - + + This page requires an internet connection. + + + + + Cannot save record to file %1 无法录入文件 %1 @@ -431,13 +451,13 @@ HWGame - + en.txt zh_CN.txt - + Cannot open demofile %1 DEMO %1 打不开 @@ -445,158 +465,158 @@ HWMapContainer - + Small tunnels - + Medium tunnels - + Seed - + Map type: - - Image map - - - - Mission map + Image map - Hand-drawn + Mission map - Randomly generated + Hand-drawn + Randomly generated + + + + Random maze - + Random - + Map preview: - + Load map drawing - + Edit map drawing - - All - 全部 - - - - Small - 小型 - - - - Medium - 中型 - - - Large - 大型 + All + 全部 - Cavern - 洞穴 + Small + 小型 + Medium + 中型 + + + + Large + 大型 + + + + Cavern + 洞穴 + + + Wacky 曲折 - - Large tunnels - - - - - Small islands - - - - - Medium islands - - - + Large tunnels + + + + + Small islands + + + + + Medium islands + + + + Large islands - + Map size: - + Maze style: - + Mission: - + Map: - - - Theme: - - - - + + + Theme: %1 + + + + Load drawn map - + Drawn Maps - + All files @@ -647,40 +667,33 @@ - - %1 *** %2 has joined - - - - - + %1 *** %2 has left - - + %1 *** %2 has left (%3) - - + + %1 *** %2 has joined the room - + Quit reason: 退出原因： - + Room destroyed 房间损坏 - + You got kicked 被踢出 @@ -890,6 +903,19 @@ + PageDataDownload + + + Loading, please wait. + + + + + This page requires an internet connection. + + + + PageDrawMap @@ -1010,47 +1036,57 @@ - + + Play again + + + + + Save + 保存 + + + The best shot award was won by %1 with %2 pts. - + The best killer is %1 with %2 kills in a turn. - + A total of %1 hedgehog(s) were killed during this round. - + (%1 kill) - + %1 thought it's good to shoot his own hedgehogs with %2 pts. - + %1 killed %2 of his own hedgehogs. - + %1 was scared and skipped turn %2 times. @@ -1149,12 +1185,12 @@ PageMultiplayer - + Edit game preferences - + Start 开始 @@ -1318,97 +1354,97 @@ - + Frontend - + Custom colors - + Reset to default colors - + Game audio - + Frontend audio - + Account - + Proxy settings - - Proxy host - - - - - Proxy port - - - - Proxy login + Proxy host + Proxy port + + + + + Proxy login + + + + Proxy password - - No proxy - - - - - System proxy settings - - - - Socks5 proxy + No proxy + System proxy settings + + + + + Socks5 proxy + + + + HTTP proxy - + Miscellaneous - + Updates - + Check for updates - + Video recording options @@ -1429,42 +1465,42 @@ PageRoomsList - + Search for a room: - + Create room - + Join room - + Room state - + Rules: - + Weapons: - + Clear filters - + Open server administration page @@ -1477,14 +1513,14 @@ 加入 - + %1 players online - + Admin features 管理员功能 @@ -1811,33 +1847,33 @@ - + Ignore - + Add friend - + Unignore - + Remove friend - + Show games in lobby - + Show games in-progress @@ -1845,75 +1881,75 @@ QCheckBox - + Fullscreen 游戏全屏幕 - + Show FPS 显示帧率 (FPS) - + Alternative damage show 另一种伤害显示方式 - + Visual effects - - + + Sound - + In-game sound effects - - + + Music - + In-game music - + Frontend sound effects - + Frontend music - + Check for updates at startup - + Show ammo menu tooltips - + Append date and time to record file name 记录名称中包含具体时间日期 - + Save password @@ -1928,12 +1964,12 @@ - + Record audio - + Use game resolution @@ -1956,88 +1992,88 @@ Lv 级别 - + (System default) - - Disabled - - - - - Red/Cyan - - - - Cyan/Red + Disabled - Red/Blue + Red/Cyan - Blue/Red + Cyan/Red - Red/Green + Red/Blue + Blue/Red + + + + + Red/Green + + + + Green/Red + + Side-by-side + + + + + Top-Bottom + + + + + Red/Cyan grayscale + + + + + Cyan/Red grayscale + + + + + Red/Blue grayscale + + + + + Blue/Red grayscale + + + - Side-by-side + Red/Green grayscale - Top-Bottom - - - - - Red/Cyan grayscale - - - - - Cyan/Red grayscale - - - - - Red/Blue grayscale - - - - - Blue/Red grayscale - - - - - Red/Green grayscale - - - - Green/Red grayscale - - + + Any @@ -2060,7 +2096,7 @@ 城堡模式 - + Playing teams 玩家队伍 @@ -2093,22 +2129,27 @@ QLabel - + Locale - + Nickname - + + This setting will be effective at next restart. + + + + Resolution 分辨率 - + Quality @@ -2128,12 +2169,12 @@ - + Stereo rendering - + FPS limit FPS 上限 @@ -2177,7 +2218,7 @@ 版本 - + Initial sound volume 初始音量 @@ -2324,27 +2365,27 @@ - + Your Email - + Summary - + Send system information - + Description - + Type the security code: @@ -2359,27 +2400,27 @@ - + Format - + Audio codec - + Video codec - + Framerate - + Bitrate (Kbps) @@ -2397,7 +2438,7 @@ QLineEdit - + unnamed 无名 @@ -2408,7 +2449,7 @@ - + anonymous @@ -2449,82 +2490,82 @@ - + Cannot delete default scheme '%1'! - + Please select a record from the list - + Hedgewars - Nick not registered - + Unable to start server - + Connection to server is lost 服务器连接丢失 - + Not all players are ready - + Are you sure you want to start this game? Not all players are ready. - + Hedgewars - Error - + System Information Preview - - + + Failed to generate captcha - + Failed to download captcha - + Please fill out all fields. Email is optional. - - + + Hedgewars - Success - + All file associations have been set - + File association failed. @@ -2592,22 +2633,22 @@ - + Room Name - Error - + Please select room from the list - + Room Name - Are you sure? - + The game you are trying to join has started. Do you still want to join the room? @@ -2654,7 +2695,7 @@ - + File error @@ -2665,7 +2706,7 @@ - + Cannot open '%1' for reading @@ -2809,17 +2850,17 @@ - + Associate file extensions - + Set default options - + Restore default coding parameters @@ -3017,7 +3058,7 @@ TeamSelWidget - + At least two teams are required to play! @@ -3734,7 +3775,7 @@ - + Keyboard @@ -3776,147 +3817,4 @@ - - server - - - No checker rights - - - - - Authentication failed - - - - - 60 seconds cooldown after kick - - - - - kicked - - - - - Ping timeout - - - - - bye - - - - - Empty config entry - - - - - Not room master - - - - - Corrupted hedgehogs info - - - - - too many teams - - - - - too many hedgehogs - - - - - There's already a team with same name in the list - - - - - round in progress - - - - - restricted - - - - - REMOVE_TEAM: no such team - - - - - Not team owner! - - - - - Less than two clans! - - - - - Room with such name already exists - - - - - Illegal room name - - - - - No such room - - - - - Joining restricted - - - - - Registered users only - - - - - You are banned in this room - - - - - Nickname already chosen - - - - - Illegal nickname - - - - - Protocol already known - - - - - Bad number - - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/hedgewars_zh_TW.ts --- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Mon May 27 10:52:30 2013 +0400 @@ -99,19 +99,19 @@ - Please give us feedback! - - - We are always happy about suggestions, ideas, or bug reports. - If you found a bug, you can see if it's already known here (english): - - - - Your email address is optional, but we may want to contact you. + Send us feedback! + + + + If you found a bug, you can see if it's already been reported here: + + + + Your email address is optional, but necessary if you want us to get back at you. @@ -248,6 +248,18 @@ Failed to save StyleSheet to %1 + + %1 has joined + + + + %1 has left + + + + %1 has left (%2) + + HWForm @@ -347,6 +359,10 @@ Please wait a few seconds and try again. + + This page requires an internet connection. + + HWGame @@ -466,10 +482,6 @@ - Theme: - - - Load drawn map @@ -485,6 +497,10 @@ Large tunnels + + Theme: %1 + + HWNetServersModel @@ -529,7 +545,7 @@ %1 *** %2 has joined - %1***%2已經進入 + %1***%2已經進入 %1 *** %2 has left (%3) @@ -723,6 +739,17 @@ + PageDataDownload + + Loading, please wait. + + + + This page requires an internet connection. + + + + PageDrawMap Undo @@ -858,6 +885,14 @@ + + Play again + + + + Save + + PageInGame @@ -1947,6 +1982,10 @@ This program is distributed under the %1 + + This setting will be effective at next restart. + + QLineEdit @@ -3047,119 +3086,4 @@ - - server - - No checker rights - - - - Authentication failed - - - - 60 seconds cooldown after kick - - - - kicked - - - - Ping timeout - - - - bye - - - - Empty config entry - - - - Not room master - - - - Corrupted hedgehogs info - - - - too many teams - - - - too many hedgehogs - - - - There's already a team with same name in the list - - - - round in progress - - - - restricted - - - - REMOVE_TEAM: no such team - - - - Not team owner! - - - - Less than two clans! - - - - Room with such name already exists - - - - Illegal room name - - - - No such room - - - - Joining restricted - - - - Registered users only - - - - You are banned in this room - - - - Nickname already chosen - - - - Illegal nickname - - - - Protocol already known - - - - Bad number - - - - Nickname is already in use - - - diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Locale/it.txt --- a/share/hedgewars/Data/Locale/it.txt Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Locale/it.txt Mon May 27 10:52:30 2013 +0400 @@ -56,7 +56,7 @@ 00:53=Macchina Spazio-Temporale ; 00:54=Attrezzi da Costruzione 00:54=Terreno Spray -00:55=Congelatore +00:55=Raggio Congelatore 00:56=Mannarino 01:00=Combattiamo! @@ -453,7 +453,7 @@ 03:53=TARDIS Modello 40 ;03:54=(Arma in sviluppo) 03:54=Utilità di costruzione -03:55=(Arma in sviluppo) +03:55=Arma di ibernazione di massa 03:56=Ecco il grande chef! ; Weapon Descriptions (use | as line breaks) @@ -513,7 +513,7 @@ 04:53=Parti per un'avventura unica attraverso spazio e tempo,|lasciando i tuoi compagni da soli a combattere.|Preparati a ritornare in qualsiasi momento,|o per il Sudden Death o se sei l'ultimo sopravvissuto.|Attenzione! Non è utilizzabile durante il Sudden Death,|se sei rimasto da solo, o se sei il Re.|Attacco: Inzia la tua avventura nello spazio-tempo! ;04:54=DESCRIZIONE NON DISPONIBILE (arma ancora in sviluppo) 04:54=Con questo terreno spray non ti mancherà mai la terra |sotto ai piedi. Utilissimo per costruire ponti, |seppellire nemici e sigillare tunnel.|Ma fai attenzione a non usarlo a tuo svantaggio!|Attacco: Attiva|Su/Giù: Continua a mirare|Sinistra/Destra: Modifica la potenza di fuoriuscita del terreno -04:55=DESCRIZIONE NON DISPONIBILE +04:55=L'era glaciale non è mai stata così imminente!|Con questo potente raggio potrai congelare i ricci nemici,|rendere il terreno scivoloso e salvarti dalle cadute|in acqua trasformando il mare in una distesa di ghiaccio!|Attacco: Attiva|Su/Giù: Continua a mirare 04:56=Lancia due mannarini da cucina verso i tuoi nemici, se |lanciati con potenza possono rappresentare una... tagliente sorpresa!|Ricorda che rimarranno sul terreno dopo averli lanciati!|Attacco: Tieni premuto per lanciare con più forza ; Game goal strings diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/CMakeLists.txt --- a/share/hedgewars/Data/Maps/CMakeLists.txt Sun May 26 08:18:15 2013 -0400 +++ b/share/hedgewars/Data/Maps/CMakeLists.txt Mon May 27 10:52:30 2013 +0400 @@ -33,6 +33,14 @@ portal Ropes Ruler + SB_Bones + SB_Crystal + SB_Grassy + SB_Grove + SB_Haunty + SB_Oaks + SB_Shrooms + SB_Tentacles Sheep ShoppaKing Sticks diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Bones/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Bones/CMakeLists.txt Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,5 @@ +install(FILES + map.png + map.cfg + preview.png + DESTINATION ${SHAREPATH}Data/Maps/SB_Bones) diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Bones/map.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Bones/map.cfg Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,2 @@ +Desert +48 diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Bones/map.png Binary file share/hedgewars/Data/Maps/SB_Bones/map.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Bones/preview.png Binary file share/hedgewars/Data/Maps/SB_Bones/preview.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Crystal/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Crystal/CMakeLists.txt Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,6 @@ +install(FILES + map.png + mask.png + map.cfg + preview.png + DESTINATION ${SHAREPATH}Data/Maps/SB_Crystal) diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Crystal/map.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Crystal/map.cfg Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,2 @@ +Cave +32 diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Crystal/map.png Binary file share/hedgewars/Data/Maps/SB_Crystal/map.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Crystal/mask.png Binary file share/hedgewars/Data/Maps/SB_Crystal/mask.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Crystal/preview.png Binary file share/hedgewars/Data/Maps/SB_Crystal/preview.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Grassy/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Grassy/CMakeLists.txt Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,6 @@ +install(FILES + map.png + mask.png + map.cfg + preview.png + DESTINATION ${SHAREPATH}Data/Maps/SB_Grassy) diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Grassy/map.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Grassy/map.cfg Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,2 @@ +Castle +40 diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Grassy/map.png Binary file share/hedgewars/Data/Maps/SB_Grassy/map.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Grassy/mask.png Binary file share/hedgewars/Data/Maps/SB_Grassy/mask.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Grassy/preview.png Binary file share/hedgewars/Data/Maps/SB_Grassy/preview.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Grove/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Grove/CMakeLists.txt Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,6 @@ +install(FILES + map.png + mask.png + map.cfg + preview.png + DESTINATION ${SHAREPATH}Data/Maps/SB_Grove) diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Grove/map.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Grove/map.cfg Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,2 @@ +Nature +48 diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Grove/map.png Binary file share/hedgewars/Data/Maps/SB_Grove/map.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Grove/mask.png Binary file share/hedgewars/Data/Maps/SB_Grove/mask.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Grove/preview.png Binary file share/hedgewars/Data/Maps/SB_Grove/preview.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Haunty/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Haunty/CMakeLists.txt Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,6 @@ +install(FILES + map.png + mask.png + map.cfg + preview.png + DESTINATION ${SHAREPATH}Data/Maps/SB_Haunty) diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Haunty/map.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Haunty/map.cfg Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,2 @@ +Halloween +24 diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Haunty/map.png Binary file share/hedgewars/Data/Maps/SB_Haunty/map.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Haunty/mask.png Binary file share/hedgewars/Data/Maps/SB_Haunty/mask.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Haunty/preview.png Binary file share/hedgewars/Data/Maps/SB_Haunty/preview.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Oaks/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Oaks/CMakeLists.txt Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,6 @@ +install(FILES + map.png + mask.png + map.cfg + preview.png + DESTINATION ${SHAREPATH}Data/Maps/SB_Oaks) diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Oaks/map.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Oaks/map.cfg Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,2 @@ +Nature +48 diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Oaks/map.png Binary file share/hedgewars/Data/Maps/SB_Oaks/map.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Oaks/mask.png Binary file share/hedgewars/Data/Maps/SB_Oaks/mask.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Oaks/preview.png Binary file share/hedgewars/Data/Maps/SB_Oaks/preview.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Shrooms/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Shrooms/CMakeLists.txt Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,6 @@ +install(FILES + map.png + mask.png + map.cfg + preview.png + DESTINATION ${SHAREPATH}Data/Maps/SB_Shrooms) diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Shrooms/map.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Shrooms/map.cfg Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,2 @@ +Nature +48 diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Shrooms/map.png Binary file share/hedgewars/Data/Maps/SB_Shrooms/map.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Shrooms/mask.png Binary file share/hedgewars/Data/Maps/SB_Shrooms/mask.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Shrooms/preview.png Binary file share/hedgewars/Data/Maps/SB_Shrooms/preview.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Tentacles/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Tentacles/CMakeLists.txt Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,6 @@ +install(FILES + map.png + mask.png + map.cfg + preview.png + DESTINATION ${SHAREPATH}Data/Maps/SB_Tentacles) diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Tentacles/map.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Maps/SB_Tentacles/map.cfg Mon May 27 10:52:30 2013 +0400 @@ -0,0 +1,2 @@ +Hell +40 diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Tentacles/map.png Binary file share/hedgewars/Data/Maps/SB_Tentacles/map.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Tentacles/mask.png Binary file share/hedgewars/Data/Maps/SB_Tentacles/mask.png has changed diff -r 413a43592e35 -r 79ca70a295ac share/hedgewars/Data/Maps/SB_Tentacles/preview.png Binary file share/hedgewars/Data/Maps/SB_Tentacles/preview.png has changed diff -r 413a43592e35 -r 79ca70a295ac tools/CMakeLists.txt --- a/tools/CMakeLists.txt Sun May 26 08:18:15 2013 -0400 +++ b/tools/CMakeLists.txt Mon May 27 10:52:30 2013 +0400 @@ -33,6 +33,7 @@ if(NOT NOPNG) #get the neme of the library (harmelss if it is static) string(REGEX REPLACE ".*/(.*)$" "\\1" PNG_LIBNAME "${PNG_LIBRARY}") + string(REGEX REPLACE ".*/(.*)$" "\\1" ZLIB_LIBNAME "${ZLIB_LIBRARY}") endif() set(frameworks_dir ${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}) diff -r 413a43592e35 -r 79ca70a295ac tools/CreateMacBundle.cmake.in --- a/tools/CreateMacBundle.cmake.in Sun May 26 08:18:15 2013 -0400 +++ b/tools/CreateMacBundle.cmake.in Mon May 27 10:52:30 2013 +0400 @@ -16,6 +16,7 @@ #same here, for libpng and hwengine, let's assume the version pulled by macdeployqt is the same #(yes libpng is pulled by macdeployqt even when NOVIDEOREC is active) execute_process(COMMAND install_name_tool -change ${PNG_LIBRARY} @executable_path/../Frameworks/${PNG_LIBNAME} ${engine_full_path}) + execute_process(COMMAND install_name_tool -change ${ZLIB_LIBRARY} @executable_path/../Frameworks/${ZLIB_LIBNAME} ${engine_full_path}) endif() if(doBundle EQUAL 1)