Merge recent changes from default 0.9.16
authorunc0rr
Sat, 17 Sep 2011 16:20:09 +0400
branch0.9.16
changeset 5949 7e12141c5e10
parent 5914 3a161fa1dd5a (current diff)
parent 5948 e389a60ae8ab (diff)
child 5951 dc36638a6b7c
Merge recent changes from default
--- a/CREDITS	Thu Sep 15 20:40:59 2011 +0400
+++ b/CREDITS	Sat Sep 17 16:20:09 2011 +0400
@@ -48,4 +48,16 @@
 ==========
 - Stephen Alexander <ArmagonNo1@gmail.com>
 
+==========
+= SOUNDS
+==========
+- Mine impact sound from http://www.freesound.org/people/adcbicycle/sounds/13947/
+- Hammer sound from http://www.freesound.org/people/Syna-Max/sounds/43586/
+- Sinegun firing sound remixed from
+     http://beta.freesound.org/people/aust_paul/sounds/30935/
+     http://www.freesound.org/people/Edgar/sounds/162/
+     http://www.freesound.org/people/Ionizing/sounds/22033/
+     http://www.freesound.org/people/Jovica/sounds/38317/
+
+
 ALL OTHER CONTENT IS PROPERTY OF Andrey Korotaev <unC0Rr@gmail.com> UNLESS OTHERWISE SPECIFIED
\ No newline at end of file
--- a/ChangeLog.txt	Thu Sep 15 20:40:59 2011 +0400
+++ b/ChangeLog.txt	Sat Sep 17 16:20:09 2011 +0400
@@ -1,24 +1,31 @@
 + features
 * bugfixes
 
-0.9.15 -> ???:
- + New gameplay modes/styles: Racer, The Specialists, Tumbler, Space Invasion
+0.9.15 -> 0.9.16:
+ + Stereoscopic rendering
  + Installing content (anything under Data/ - maps, sounds, and any such stuff) to user profile allows custom adding/overriding of any Data/ content
- + Sudden Death art
+ + Screen for downloadable content
+ + Allow up to 8 teams in a game
+ + New gameplay modes/styles: Racer, The Specialists, Tumbler, Space Invasion, Balanced Random Weapon
+ + New single player missions: Bamboo Thicket, That Sinking Feeling, Newton and the Tree
  + New Weapon/Utility: Land Spray Gun
  + New Utility: Time Box
  + New Game mode: Tag team
  + New Game option for map bottom border
  + New Theme: Golf
  + Many new hats
+ + Sudden Death art
  + Get away time modifier (in %)
- + Allow up to 8 teams in a game
  + Shoppa scheme by default resets ammo
  + Shots are on a tenth of a second delay instead of a 1 and a quarter second delay (fast deagle/portal fire)
  + Defective mines explode if they take enough damage
  + Rope head can attach to hogs/crates/barrels again (rope still passes through them)
  + Control of grenade bounce
  + Drill Strike bombs don't explode when leaving ground, but after a (customizable!) timer
+ + Hammer impacts mines/barrels
+ + Seduction is an Area-of-Effect attack now
+ + Significantly altered flame behavior and damage.
+ + 'Throwing' weapons into hogs (e.g. grenade) no longer does max damage.
  + Ukranian localization of Default voice. support for localized voices
  + Theme cleanup, including the new theme config file change
  + Improvements in scoring and tracking damage
@@ -26,16 +33,20 @@
  + Mudball does not end turn
  + Indicator for height of plane when using napalm
  + Land smoothing (looks less pixelated on generation and damage)
- + Improved lua script support (e.g. possibility to change hats)
+ + Improved lua script support (e.g. set per-hog ammo, place girders, spawn fake crates, switch hogs, change hats)
  + The names of the ShoppaKingTournament winners are now written on the Trophies in the ShoppaKing and TrophyRace maps!
- + Allow window resizes during game.
+ + Allow window resizes during game
+ + Improved fullscreen capabilities
+ + Additional/new sounds (mine impact, sine gun, etc)
+ + Victory/flawless victory sounds
+ * Voices don't overlap (was needed more due to faster game actions due to shortened delays)
  * Prevent portaling to impossible locations better
  * Snow accumulates more smoothly
  * Rope should be less sticky now
  * Rope shouldn't be able to get Hogs stuck on walls anymore
  * Fix for last portal shot always being yellow
  * More accurate napalm strike drop location
- * AI fixes
+ * AI fixes (heh, yeah right)
  * Fixed locales, such as korean
  * Code refactoring
  * Various bug/leak fixes
@@ -46,6 +57,7 @@
  + Improved nick sorting in lobby and rooms. (not case-sensitive, letters first, friend @ top, ignored @ bottom)
  + Display player count in lobby
  + Lobby: Player names of online players can be clicked in chat directly so that you don't have to find them in the player list
+ + Room names can be changed by the room admin without recreating the room
  * Fix invisible icons in popup menus
  * Various fixes and adjustments
 
--- a/QTfrontend/about.cpp	Thu Sep 15 20:40:59 2011 +0400
+++ b/QTfrontend/about.cpp	Sat Sep 17 16:20:09 2011 +0400
@@ -73,9 +73,9 @@
             "Frontend improvements: Martin Minarik &lt;<a href=\"mailto:ttsmj@pokec.sk\">ttsmj@pokec.sk</a>&gt;<br>"
             "Frontend improvements: Kristian Lehmann &lt;<a href=\"mailto:email@thexception.net\">email@thexception.net</a>&gt;<br>"
             "Mac OS X/iPhone port, OpenGL-ES conversion: Vittorio Giovara &lt;<a href=\"mailto:vittorio.giovara@gmail.com\">vittorio.giovara@gmail.com</a>&gt;<br>"
+            "Many engine and frontend improvements (and bugs): Richard Karolyi &lt;<a href=\"mailto:sheepluva@" "ercatec.net\">sheepluva@" "ercatec.net</a>&gt;<br>"
             "Gamepad and Lua integration: Mario Liebisch &lt;<a href=\"mailto:mario.liebisch@gmail.com\">mario.liebisch@gmail.com</a>&gt;<br>"
             "Many engine improvements and graphics: Carlos Vives &lt;<a href=\"mailto:mail@carlosvives.es\">mail@carlosvives.es</a>&gt;<br>"
-            "Few engine and frontend improvements: Richard Karolyi &lt;<a href=\"mailto:sheepluva@ercatec.net\">sheepluva@ercatec.net</a>&gt;<br>"
             "Maze maps: Henning K&uuml;hn &lt;<a href=\"mailto:prg@cooco.de\">prg@cooco.de</a>&gt;<br>"
             "Engine and frontend improvements: Henrik Rostedt &lt;<a href=\"mailto:henrik.rostedt@gmail.com\">henrik.rostedt@gmail.com</a>&gt;<br>"
             "Lua game modes and missions: John Lambert &lt;<a href=\"mailto:redgrinner@gmail.com\">redgrinner@gmail.com</a>&gt;<br>"
@@ -120,9 +120,9 @@
             "English: Andrey Korotaev &lt;<a href=\"mailto:unC0Rr@gmail.com\">unC0Rr@gmail.com</a>&gt;<br>"
             "Finnish: Nina Kuisma &lt;<a href=\"mailto:ninnnu@gmail.com\">ninnnu@gmail.com</a>&gt;<br>"
             "French: Antoine Turmel &lt;<a href=\"mailto:geekshadow@gmail.com\">geekshadow@gmail.com</a>&gt;<br>"
-            "German: Peter Hüwe &lt;<a href=\"mailto:PeterHuewe@gmx.de\">PeterHuewe@gmx.de</a>&gt;, Mario Liebisch &lt;<a href=\"mailto:mario.liebisch@gmail.com\">mario.liebisch@gmail.com</a>&gt;<br>"
-            "Greek: &lt;<a href=\"mailto:talos_kriti@yahoo.gr\">talos_kriti@yahoo.gr</a>&gt;"
-            "Italian: Luca Bonora &lt;<a href=\"mailto:bonora.luca@gmail.com\">bonora.luca@gmail.com</a>&gt;<br>"
+            "German: Peter Hüwe &lt;<a href=\"mailto:PeterHuewe@gmx.de\">PeterHuewe@gmx.de</a>&gt;, Mario Liebisch &lt;<a href=\"mailto:mario.liebisch@gmail.com\">mario.liebisch@gmail.com</a>&gt;, Richard Karolyi &lt;<a href=\"mailto:sheepluva@" "ercatec.net\">sheepluva@" "ercatec.net</a>&gt;<br>"
+            "Greek: &lt;<a href=\"mailto:talos_kriti@yahoo.gr\">talos_kriti@yahoo.gr</a>&gt;<br>"
+            "Italian: Luca Bonora &lt;<a href=\"mailto:bonora.luca@gmail.com\">bonora.luca@gmail.com</a>&gt;, Marco Bresciani<br>"
             "Japanese: ADAM Etienne &lt;<a href=\"mailto:etienne.adam@gmail.com\">etienne.adam@gmail.com</a>&gt;<br>"
             "Korean: Anthony Bellew &lt;<a href=\"mailto:webmaster@anthonybellew.com\">webmaster@anthonybellew.com</a>&gt;<br>"
             "Lithuanian: Lukas Urbonas &lt;<a href=\"mailto:lukasu08@gmail.com\">lukasu08@gmail.com</a>&gt;<br>"
--- a/QTfrontend/gamecfgwidget.cpp	Thu Sep 15 20:40:59 2011 +0400
+++ b/QTfrontend/gamecfgwidget.cpp	Sat Sep 17 16:20:09 2011 +0400
@@ -49,9 +49,7 @@
 
     QGridLayout *GBoxOptionsLayout = new QGridLayout(GBoxOptions);
 
-    QLabel *titleLabel = new QLabel(QLabel::tr("Game Options"), GBoxOptions);
-    titleLabel->setMargin(7);    // TODO: make the text larger/richer!!!!
-    GBoxOptionsLayout->addWidget(titleLabel, 0, 0, 1, 0, Qt::AlignHCenter);
+    GBoxOptions->setTitle(tr("Game Options"));
     GBoxOptionsLayout->addWidget(new QLabel(QLabel::tr("Style"), GBoxOptions), 1, 0);
 
     Scripts = new QComboBox(GBoxOptions);
--- a/QTfrontend/main.cpp	Thu Sep 15 20:40:59 2011 +0400
+++ b/QTfrontend/main.cpp	Sat Sep 17 16:20:09 2011 +0400
@@ -251,6 +251,8 @@
                 "subcontrol-origin: margin;"
                 "subcontrol-position: top left;"
                 "text-align: left;"
+                "left: 15px;"
+                "top: -4px;"
                 "}"
 
             "QCheckBox::indicator:checked{"
--- a/QTfrontend/pagegamestats.cpp	Thu Sep 15 20:40:59 2011 +0400
+++ b/QTfrontend/pagegamestats.cpp	Sat Sep 17 16:20:09 2011 +0400
@@ -43,14 +43,16 @@
     pageLayout->setSpacing(20);
     pageLayout->setColumnStretch(0, 1);
     pageLayout->setColumnStretch(1, 1);
+    pageLayout->setContentsMargins(7, 7, 7, 0);
+
+    BtnSave = addButton(":/res/Save.png", pageLayout, 3, 2, true);
+    BtnSave->setStyleSheet("QPushButton{margin: 12px 0px 12px 0px;}");
+    connect(BtnSave, SIGNAL(clicked()), this, SIGNAL(saveDemoRequested()));
 
     BtnBack = addButton(":/res/Exit.png", pageLayout, 3, 0, true);
-    BtnBack->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
-    BtnSave = addButton(":/res/Save.png", pageLayout, 3, 2, true);
-    BtnSave->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    BtnSave->setStyleSheet("QPushButton{margin: 12px 0px 12px 0px;}");
-    connect(BtnSave, SIGNAL(clicked()), this, SIGNAL(saveDemoRequested()));
+    BtnBack->setFixedHeight(BtnSave->height());
+    BtnBack->setFixedWidth(BtnBack->width()+2);
+    BtnBack->setStyleSheet("QPushButton{margin: 22px 0 9px 2px;}");
 
     QGroupBox * gb = new QGroupBox(this);
     QVBoxLayout * gbl = new QVBoxLayout;
--- a/README	Thu Sep 15 20:40:59 2011 +0400
+++ b/README	Sat Sep 17 16:20:09 2011 +0400
@@ -3,5 +3,5 @@
 Images and sounds are distributed under the terms of the GNU FDL licence.
 
 Source:
-Copyright 2004-2010 Andrey Korotaev <unC0Rr@gmail.com>
+Copyright 2004-2011 Andrey Korotaev <unC0Rr@gmail.com>
 Portions copyright 2006-2008 Igor Ulyanov aka Displacer <iulyanov@gmail.com>
--- a/gameServer/HWProtoInRoomState.hs	Thu Sep 15 20:40:59 2011 +0400
+++ b/gameServer/HWProtoInRoomState.hs	Sat Sep 17 16:20:09 2011 +0400
@@ -52,7 +52,7 @@
         clChan <- thisClientChans
         othChans <- roomOthersChans
         return $
-            if not . null . drop 5 $ teams rm then
+            if not . null . drop (maxTeams rm - 1) $ teams rm then
                 [Warning "too many teams"]
             else if canAddNumber rm <= 0 then
                 [Warning "too many hedgehogs"]
@@ -78,6 +78,10 @@
         hhsList [_] = error "Hedgehogs list with odd elements number"
         hhsList (n:h:hhs) = HedgehogInfo n h : hhsList hhs
         newTeamHHNum r = min 4 (canAddNumber r)
+        maxTeams r 
+            | roomProto r < 38 = 6
+            | otherwise = 8
+                
 
 handleCmd_inRoom ["REMOVE_TEAM", tName] = do
         (ci, _) <- ask
--- a/gameServer/HWProtoLobbyState.hs	Thu Sep 15 20:40:59 2011 +0400
+++ b/gameServer/HWProtoLobbyState.hs	Sat Sep 17 16:20:09 2011 +0400
@@ -75,11 +75,12 @@
     let maybeRI = find (\ri -> roomName == name (irnc `room` ri)) ris
     let jRI = fromJust maybeRI
     let jRoom = irnc `room` jRI
+    let sameProto = clientProto cl == roomProto jRoom
     let jRoomClients = map (client irnc) $ roomClients irnc jRI
     let nicks = map nick jRoomClients
     let chans = map sendChan (cl : jRoomClients)
     return $
-        if isNothing maybeRI then 
+        if isNothing maybeRI || not sameProto then 
             [Warning "No such rooms"]
             else if isRestrictedJoins jRoom then
             [Warning "Joining restricted"]
@@ -135,7 +136,7 @@
     cl <- thisClient
     let ri = clientRoom rnc $ fromJust ci
     let clRoom = room rnc ri
-    if isNothing ci || ri == lobbyId || clientProto cl /= roomProto clRoom then
+    if isNothing ci || ri == lobbyId then
         return []
         else
         handleCmd_lobby ["JOIN_ROOM", name clRoom]
--- a/hedgewars/GSHandlers.inc	Thu Sep 15 20:40:59 2011 +0400
+++ b/hedgewars/GSHandlers.inc	Sat Sep 17 16:20:09 2011 +0400
@@ -534,16 +534,29 @@
         PlaySound(sndMolotov);
         gX := hwRound(Gear^.X);
         gY := hwRound(Gear^.Y);
-        for i:= 0 to 2 do
+        for i:= 0 to 4 do
             begin
-            glass:= AddVisualGear(gx+random(7)-3, gy+random(5)-2, vgtEgg);
+            (*glass:= AddVisualGear(gx+random(7)-3, gy+random(5)-2, vgtEgg);
             if glass <> nil then
                 begin
                 glass^.Frame:= 2;
                 glass^.Tint:= $41B83ED0 - i * $10081000;
                 glass^.dX:= 1/(10*(random(11)-5));
                 glass^.dY:= -1/(random(4)+5);
-                end;
+                end;*)
+            glass:= AddVisualGear(gx+random(7)-3, gy+random(7)-3, vgtStraightShot);
+            if glass <> nil then 
+                with glass^ do
+                    begin
+                    Frame:= 2;
+                    Tint:= $41B83ED0 - i * $10081000;
+                    Angle:= random * 360;
+                    dx:= 0.0000001;
+                    dy:= 0;
+                    if random(2) = 0 then dx := -dx;
+                    FrameTicks:= 750;
+                    State:= ord(sprEgg)
+                    end;
             end;
         for i:= 0 to 24 do
         begin
@@ -1102,9 +1115,9 @@
 procedure doStepDEagleShot(Gear: PGear);
 begin
     PlaySound(sndGun);
-    // add 2 initial steps to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths
-    Gear^.X := Gear^.X + Gear^.dX * 2;
-    Gear^.Y := Gear^.Y + Gear^.dY * 2;
+    // add 3 initial steps to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths, and also just plain old weird angles
+    Gear^.X := Gear^.X + Gear^.dX * 3;
+    Gear^.Y := Gear^.Y + Gear^.dY * 3;
     Gear^.doStep := @doStepBulletWork
 end;
 
@@ -1138,9 +1151,9 @@
         Gear^.dX := SignAs(AngleSin(HHGear^.Angle), HHGear^.dX) * _0_5;
         Gear^.dY := -AngleCos(HHGear^.Angle) * _0_5;
         PlaySound(sndGun);
-        // add an initial step to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths
-        Gear^.X := Gear^.X + Gear^.dX;  
-        Gear^.Y := Gear^.Y + Gear^.dY;
+        // add 3 initial steps to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths, and also just weird angles
+        Gear^.X := Gear^.X + Gear^.dX * 3;  
+        Gear^.Y := Gear^.Y + Gear^.dY * 3;
         Gear^.doStep := @doStepBulletWork;
     end
     else
@@ -2800,7 +2813,11 @@
     if (GameTicks mod 2 = 0) and hasWishes then
         begin
         sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtDust, 1);
-        if sparkles <> nil then sparkles^.Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF;
+        if sparkles <> nil then 
+            begin
+            sparkles^.Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF;
+            sparkles^.Angle:= random * 360;
+            end
         end;
 
     i := 2;
@@ -2845,6 +2862,21 @@
     if Gear^.Health < Gear^.Damage then
     begin
         doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound);
+        for i:= 0 to 31 do
+            begin
+            sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot);
+            if sparkles <> nil then
+                with sparkles^ do
+                    begin
+                    Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF;
+                    Angle:= random * 360;
+                    dx:= 0.001 * (random(200));
+                    dy:= 0.001 * (random(200));
+                    if random(2) = 0 then dx := -dx;
+                    if random(2) = 0 then dy := -dy;
+                    FrameTicks:= random(400) + 250
+                    end;
+            end;
         AfterAttack;
         DeleteGear(Gear);
         DeleteGear(HHGear);
@@ -2861,11 +2893,11 @@
     AllInactive := false;
     dec(Gear^.Timer);
     if Gear^.Timer = 0 then
-    begin
+        begin
         Gear^.Pos := 1;
         PlaySound(sndKamikaze, Gear^.Hedgehog^.Team^.voicepack);
         Gear^.doStep := @doStepKamikazeWork
-    end
+        end
 end;
 
 procedure doStepKamikaze(Gear: PGear);
@@ -4145,7 +4177,11 @@
 
         // Until loops are reliably broken
         if iscake then iterator^.PortalCounter:= 33
-        else inc(iterator^.PortalCounter);
+        else
+            begin
+            inc(iterator^.PortalCounter);
+            iterator^.State:= iterator^.State and not gstHHHJump
+            end;
 
         if not isbullet and (iterator^.Kind <> gtFlake) then
             FollowGear := iterator;
@@ -5070,7 +5106,7 @@
         begin
         if (HH^.Gear <> nil) and (HH^.Gear^.State and gstInvisible = 0) then
             begin
-	        AfterAttack;
+            AfterAttack;
             if Gear = CurAmmoGear then CurAmmoGear := nil;
             HideHog(HH)
             end
@@ -5087,7 +5123,20 @@
         end
     end;
 
-if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then inc(Gear^.Power);
+if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then 
+    begin
+    inc(Gear^.Power);
+    if (Gear^.Power = 172) and (Gear^.Hedgehog^.Gear <> nil) then
+        begin
+        with Gear^.Hedgehog^.Gear^ do
+            begin
+	    State:= State or gstAnimation;
+	    Tag:= 2;
+	    Timer:= 0;
+	    Pos:= 0
+            end
+        end
+    end;
 if (Gear^.Pos = 3) and (GameTicks and $1F = 0) and (Gear^.Power > 0) then dec(Gear^.Power);
 if (Gear^.Pos = 1) and (Gear^.Power = 255) and ((GameTicks mod 2000) = 1000) then Gear^.Pos:= 2;
 if (Gear^.Pos = 3) and (Gear^.Power = 0) then
--- a/hedgewars/uAIAmmoTests.pas	Thu Sep 15 20:40:59 2011 +0400
+++ b/hedgewars/uAIAmmoTests.pas	Sat Sep 17 16:20:09 2011 +0400
@@ -105,7 +105,7 @@
             (proc: @TestHammer;      flags: 0), // amHammer
             (proc: nil;              flags: 0), // amResurrector
             (proc: nil;              flags: 0), // amDrillStrike
-            (proc: @TestSnowball;    flags: 0), // amSnowball
+            (proc: nil;              flags: 0), // amSnowball
             (proc: nil;              flags: 0), // amTardis
             (proc: nil;              flags: 0), // amStructure
             (proc: nil;              flags: 0) // amLandGun
--- a/hedgewars/uCollisions.pas	Thu Sep 15 20:40:59 2011 +0400
+++ b/hedgewars/uCollisions.pas	Sat Sep 17 16:20:09 2011 +0400
@@ -373,6 +373,9 @@
     y2 := y;
 end;
 
+if (hasBorder and ((y1 < 0) or (x1 < 0) or (x2 > LAND_WIDTH))) then
+    exit(true);
+
 for y := y1 to y2 do
     for x := x1 to x2 do
         if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0)
--- a/hedgewars/uGearsRender.pas	Thu Sep 15 20:40:59 2011 +0400
+++ b/hedgewars/uGearsRender.pas	Sat Sep 17 16:20:09 2011 +0400
@@ -328,7 +328,7 @@
         hx:= ox + 8 * sign;
         hy:= oy - 2;
         aangle:= Gear^.Angle * 180 / cMaxAngle - 90;
-        if CurAmmoGear <> nil then
+        if (CurAmmoGear <> nil) and (CurAmmoGear^.Kind <> gtTardis) then
         begin
             case CurAmmoGear^.Kind of
                 gtShotgunShot: begin
--- a/hedgewars/uSound.pas	Thu Sep 15 20:40:59 2011 +0400
+++ b/hedgewars/uSound.pas	Sat Sep 17 16:20:09 2011 +0400
@@ -290,10 +290,12 @@
 procedure AddVoice(snd: TSound; voicepack: PVoicepack);
 var i : LongInt;
 begin
-    if (not isSoundEnabled) or fastUntilLag then exit;
+    if (not isSoundEnabled) or fastUntilLag or ((LastVoice.snd = snd) and  (LastVoice.voicepack = voicepack)) then exit;
     i:= 0;
     while (i<8) and (VoiceList[i].snd <> sndNone) do inc(i);
 
+    // skip playing same sound for same hog twice
+    if (i>0) and (VoiceList[i-1].snd = snd) and (VoiceList[i-1].voicepack = voicepack) then exit;
     VoiceList[i].snd:= snd;
     VoiceList[i].voicepack:= voicepack;
 end;
--- a/hedgewars/uVisualGears.pas	Thu Sep 15 20:40:59 2011 +0400
+++ b/hedgewars/uVisualGears.pas	Sat Sep 17 16:20:09 2011 +0400
@@ -321,6 +321,7 @@
                 end;
 vgtSmoothWindBar: Tag:= hwRound(cWindSpeed * 72 / cMaxWindSpeed);
  vgtStraightShot: begin
+                Angle:= 0;
                 Scale:= 1.0;
                 dx:= 0.001 * random(45);
                 dy:= 0.001 * (random(20) + 25);
@@ -596,7 +597,7 @@
                                end;
                vgtStraightShot: begin 
                                 if Gear^.dX < 0 then i:= -1 else i:= 1;
-                                DrawTextureF(SpritesData[TSprite(Gear^.State)].Texture, Gear^.Scale, round(Gear^.X) + WorldDx, round(Gear^.Y) + WorldDy, Gear^.Frame, i, SpritesData[TSprite(Gear^.State)].Width, SpritesData[TSprite(Gear^.State)].Height);
+                                DrawRotatedTextureF(SpritesData[TSprite(Gear^.State)].Texture, Gear^.Scale, 0, 0, round(Gear^.X) + WorldDx, round(Gear^.Y) + WorldDy, Gear^.Frame, i, SpritesData[TSprite(Gear^.State)].Width, SpritesData[TSprite(Gear^.State)].Height, Gear^.Angle);
                                 end;
            end;
            if (cReducedQuality and rqAntiBoom) = 0 then
Binary file share/hedgewars/Data/Graphics/Hats/Reserved/a1ed4756b565d13aaecb1f2b1a556570alwayss.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/Reserved/e587f6146ebfbdefdc028c591643f220alwayss.png has changed
--- a/share/hedgewars/Data/Locale/de.lua	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/de.lua	Sat Sep 17 16:20:09 2011 +0400
@@ -2,12 +2,12 @@
 --      [":("] = "",
 --      ["!!!"] = "",
 --      ["..."] = "",
-    ["Accuracy Bonus!"] = "Präzisions-Bonus!",
+	["Accuracy Bonus!"] = "Präzisions-Bonus!",
 --      ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
 	["a Hedgewars mini-game"] = "ein Hedgewars Mini-Spiel", -- Space_Invasion, The_Specialists
 	["Aiming Practice"] = "Zielübung", --Bazooka, Shotgun, SniperRifle
 	["Ammo Depleted!"] = "Munition erschöpft!",
---      ["ammo extended!"] = "",
+	["ammo extended!"] = "Munition aufgestockt!",
 	["Ammo is reset at the end of your turn."] = "Munition wird am Ende des Spielzuges zurückgesetzt.",
 	["Ammo Maniac!"] = "Munitionsverrückter!",
 	["Ammo"] = "Munition",
@@ -20,17 +20,17 @@
 	["Bat your opponents through the|baskets and out of the map!"] = "Schlage deine Widersacher durch|die Körbe und aus der Karte hinaus!",
 	["Bazooka Training"] = "Bazooka-Training",
 	["Best laps per team: "] = "Beste Rundenzeiten pro Team: ",
-	["Best Team Times: "] = "Besten Team-Zeiten: ",
+	["Best Team Times: "] = "Beste Team-Zeiten: ",
 	["Bloody Rookies"] = "Blutige Anfänger", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
 	["Boom!"] = "Bumm!",
 	["BOOM!"] = "KABUMM!",
 	["Boss defeated!"] = "Boss wurde besiegt!",
 	["Boss Slayer!"] = "Boss-Töter!",
---      ["Build a track and race."] = "",
+    ["Build a track and race."] = "Konstruiere eine Strecke und mach ein Wettrennen.",
 	["CAPTURE THE FLAG"] = "EROBERE DIE FAHNE",
 	["Careless"] = "Achtlos",
 	["Change Weapon"] = "Waffenwechsel",
-	["Clumsy"] = "Ungeschickt",
+	["Clumsy"] = "Hoppla",
 	["Codename: Teamwork"] = "Code-Name: Teamwork",
 	["Complete the track as fast as you can!"] = "Durchlaufe die Strecke so schnell du kannst!",
 	["Congratulations!"] = "Gratulation!",
@@ -40,22 +40,22 @@
 	["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "VERDAMMT, REKRUT! RUNTER VON MEINEM KOPF!",
 	["DAMMIT, ROOKIE!"] = "VERDAMMT, REKRUT!",
 --      ["Dangerous Ducklings"] = "",
-	["Deadweight"] = "Leergewicht",
+	["Deadweight"] = "Gravitus",
 	["Demolition is fun!"] = "Zerstörung macht Spaß!",
 	["Depleted Kamikaze!"] = "Munitionsloses Kamikaze!",
 	["Destroy invaders to score points."] = "Zerstöre die Angreifer um Punkte zu erhalten.",
 --      ["Double Kill!"] = "",
 --      ["Drone Hunter!"] = "",
---      ["Drowner"] = "",
+	["Drowner"] = "Absäufer",
 	["Each turn you get 1-3 random weapons"] = "Du bekommst jede Runde 1-3 zufällig gewählte Waffen",
 	["Each turn you get one random weapon"] = "Du bekommst jede Runde eine zufällig gewählte Waffe.",
 	["Eliminate all enemies"] = "Vernichte alle Gegner",
 	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Eliminiere alle Ziele bevor die Zeit ausläuft.|Du hast in dieser Mission unbegrenzte Munition.", --Bazooka, Shotgun, SniperRifle
---      ["Eliminate Poison before the time runs out"] = "",
+	["Eliminate Poison before the time runs out"] = "Neutralisiere das Gift bevor die Zeit abgelaufen ist",
 	["Eliminate the Blue Team"] = "Lösche das Blaue Team aus",
---      ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
---      ["Eliminate the enemy hogs to win."] = "",
---      ["Eliminate the enemy specialists."] = "",
+	["Eliminate the enemy before the time runs out"] = "Vernichte den Feind bevor die Zeit abgelaufen ist", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+	["Eliminate the enemy hogs to win."] = "Vernichte alle gegnerischen Igel um zu gewinnen",
+	["Eliminate the enemy specialists."] = "Vernichte die gegnerischen Spezialisten",
 	["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Vernichte Einheit 3378 |  Kraftloser Widerstand muss überleben",
 --      ["Energetic Engineer"] = "",
 	["Enjoy the swim..."] = "Viel Spaß beim Schwimmen...",
@@ -71,7 +71,7 @@
 --      ["Friendly Fire!"] = "",
 	["fuel extended!"] = "Treibstoff aus!",
 	["GAME BEGUN!!!"] = "SPIEL GESTARTET!!!",
---      ["Game Modifiers: "] = "",
+	["Spielmodifikatoren: "] = "",
 	["GAME OVER!"] = "SPIEL ZU ENDE!",
 	["Game Started!"] = "Spiel Gestartet!]",
 	["Get on over there and take him out!"] = "Mach, dass du hinüber kommst und schalte ihn aus!",
@@ -88,7 +88,7 @@
 	["Hapless Hogs"] = "Glücklose Igel",
 	[" Hapless Hogs left!"] = " Glücklose Igel verbleibend!",
 	["Health crates extend your time."] = "Medipacks verlängern deine Zeit.",
---      ["Heavy"] = "",
+	["Heavy"] = "Schwierig",
 	["Hedgewars-Basketball"] = "Hedgewars-Basketball",
 	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
 	["Heh, it's not that bad."] = "Hehe, so schlimm ist es nicht.",
@@ -126,15 +126,15 @@
 --      ["Newton's Hammock"] = "",
 	["NOT ENOUGH WAYPOINTS"] = "NICHT GENUG WEGPUNKTE",
 	["Not So Friendly Match"] = "Kein-so-Freundschaftsspiel", -- Basketball, Knockball
---      ["Oh no! Just try again!"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+	["Oh no! Just try again!"] = "Oh nein! Versuch's nochmal!", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
 	["Oh no! Time's up! Just try again."] = "Oh nein! Die Zeit ist um! Versuche es nochmal.", --Bazooka, Shotgun, SniperRifle
 --      ["Operation Diver"] = "",
 	["Opposing Team: "] = "Gegnerisches Team: ",
---      ["Pathetic Hog #%d"] = "",
---      ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+	["Pathetic Hog #%d"] = "Erbärmlicher Igel #%d",
+	["Pathetic Resistance"] = "Erbärmlicher Widerstand", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
 	["Per-Hog Ammo"] = "Munition pro Igel",
 	["Place more waypoints using [ENTER]"] = "Setze mehr Wegpunkte durch Drücken von [ENTER]",
---      ["Place more waypoints using the 'Air Attack' weapon."] = "",
+	["Place more waypoints using the 'Air Attack' weapon."] = "Platziere mehr Wegpunkte durch Verwenden der 'Luftangriff'-Waffe",
 	["points"] = "Punkte", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
 	["Poison"] = "Gift",
 	["Power Remaining"] = "Verbleibende Energie",
@@ -142,7 +142,7 @@
 --      ["Press [Precise] to skip intro"] = "",
 	["Race complexity limit reached."] = "Rennkomplexitätslimit erreicht.",
 --      ["RACER"] = "",
---      [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "",
+	[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Bringe die gegnerische Flagge zu deiner Heimatbasis um zu punkten. | - Das Team das zuerst 3 Flaggen erobert gewinnt. | - Du kannst nur punkten wenn deine eigene Flagge in deiner Basis ist | - Igel lassen die Flagge fallen wenn sie sterben oder ertrinken | - Fallen gelassene Flaggen können zurückgebracht oder wieder gestohlen werden | - Igel tauchen nach ihrem Tod wieder auf",
 --      ["Round Limit:"] = "",
 	["Round Limit"] = "Rundenbegrenzung",
 --      ["Rounds Complete: "] = "",
@@ -150,7 +150,7 @@
 	["RULES OF THE GAME [Press ESC to view]"] = "SPIEL REGELN (Drücke ESC zum Anzeigen)",
 --      ["s|"] = "",
 	["Save as many hapless hogs as possible!"] = "Rette so viele glücklose Igel als möglich!",
---      ["SCORE"] = "",
+	["PUNKTESTAND"] = "",
 --      ["sec"] = "", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
 	["See ya!"] = "Mach's gut!",
 	["selected!"] = "ausgewählt!",
@@ -166,18 +166,18 @@
 	["Shotgun Team"] = "Schrotflinten-Team",
 	["Shotgun Training"] = "Schrotflinten-Training",
 	["shots remaining."] = "Schüsse übrig",
---      ["Silly"] = "",
---      ["Sinky"] = "",
+	["Silly"] = "Doofi",
+	["Sinky"] = "Blubb",
 	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s ist draußen und Team %d|erhält eine Strafe!| |Punktestand:", -- Basketball, Knockball
 	["%s is out and Team %d|scored a point!| |Score:"] = "%s ist draußen und Team %d|erhält einen Punkt!| |Punktestand:", -- Basketball, Knockball
 	["Sniper Training"] = "Scharfschützen-Training",
 	["Sniperz"] = "Heckenschützen",
---      ["Sponge"] = "",
+	["Sponge"] = "Schwamm",
 --      ["Spooky Tree"] = "",
 --      ["STATUS UPDATE"] = "", -- GaudyRacer, Space_Invasion
---      ["Switched to "] = "",
+	["Switched to "] = "Gewechselt zu ",
 --	["Team %d: "] = "",
---      ["Team Scores"] = "", -- Control, Space_Invasion
+	["Team Scores"] = "Teampunktestand", -- Control, Space_Invasion
 --      ["That Sinking Feeling"] = "",
 	["That was pointless."] = "Das war sinnlos.",
 	["The enemy is hiding out on yonder ducky!"] = "Der Feind versteckt sich auf dem Entlein dort drüben!",
@@ -192,9 +192,9 @@
 	["Time Left: "] = "Verbleibende Zeit",
 	["TIME: "] = "ZEIT: ",
 	["Toggle Shield"] = "Schild ein/aus",
---      ["Toxic Team"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
---      ["TRACK COMPLETED"] = "",
---      ["TRACK FAILED!"] = "",
+	["Toxic Team"] = "Giftige Gegner", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+	["TRACK COMPLETED"] = "STRECKENLAUF BEENDET",
+	["TRACK FAILED!"] = "STRECKENLAUF GESCHEITERT",
 --	["TrophyRace"] = "",
 --      ["T_T"] = "",
 	["Tumbling Time Extended!"] = "Purzelzeit verlängert!",
@@ -208,11 +208,11 @@
 	["Use your rope to get from start to finish as fast as you can!"] = "Nutze das Seil um von Start zu Ziel zu gelangen - so schnell du kannst!",
 	["Victory for the "] = "Sieg für ", -- CTF_Blizzard, Capture_the_Flag
 	["Waypoint placed."] = "Wegpunkt gesetzt",
---      ["Way-Points Remaining"] = "",
---      ["Weapons Reset"] = "",
+	["Way-Points Remaining"] = "Wegpunkte verbleibend",
+	["Weapons Reset"] = "Waffenzurücksetzung",
 	["Well done."] = "Gut gemacht.",
 	["Will this ever end?"] = "Wird dies je enden?",
-	["WINNING TIME: "] = "SIEGESZEIT: ",
+	["WINNING TIME: "] = "BESTZEIT: ",
 	["You'd almost swear the water was rising!"] = "Man könnte fast schwören das Wasser würde steigen!",
 	["You have SCORED!!"] = "Du hast GEPUNKTET!",
 	["You saved"] = "Gerettet: ",
--- a/share/hedgewars/Data/Locale/de.txt	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/de.txt	Sat Sep 17 16:20:09 2011 +0400
@@ -53,6 +53,9 @@
 00:50=Bohr-Luftangriff
 00:51=Schlammball
 00:52=Keine Waffe ausgewählt
+00:53=ZeitBox
+00:54=Bauwerk
+00:55=Landkanone
 
 
 01:00=Auf in die Schlacht!
@@ -72,6 +75,12 @@
 01:12=Letzte Runde bis zum Sudden Death!
 01:13=%1 Runden bis zum Sudden Death!
 01:14=Mach dich bereit, %1!
+01:15=Minimale
+01:16=Niedrige
+01:17=Normale
+01:18=Hohe
+01:19=Extreme
+01:20=%1 Sprungkraft
 
 ; Event messages
 ; Hog (%1) died
@@ -233,6 +242,12 @@
 03:47=Mach es weg!
 03:48=Stop! Hammer time!
 03:49=Tut, was man vermutet
+03:50=Maulwurfsfreund
+03:51=Am Boden gefunden
+03:52=NICHT IN VERWENDUNG
+03:53=Typ 40
+03:54=Baue etwas
+03:55=Werkzeug
 
 ; Weapon Descriptions (use | as line breaks)
 04:00=Greife deine Feinde mit einfachen Granaten an.|Der Zeitzünder steuert den Explosionszeitpunkt.|1-5: Zeitzünder einstellen|Angriff: Halten, um mit mehr Kraft zu werfen
@@ -285,6 +300,13 @@
 04:47=Verdopple den Spaß mit zwei spitzigen, schicken, klebrigen Minen.|Löse eine Kettenreaktion aus oder beschütze dich (oder beides).|Angriff: Halten, um mit mehr Kraft zu feuern (zweimal)
 04:48=Warum sind Maulwürfe verhasst? Einen|Igel in den Boden zu stampfen kann sehr lustig sein!|Ein guter Treffer des Hammers wird ein Drittel|der Lebenspunkte eines Igels abziehen und ihn|im Boden versenken.|Angriff: Aktivieren
 04:49=Hol deine Freunde zurück!|Aber pass auf, dass du keine Feinde beschwörst.|Angriff: Gedrückt halten, um Igel langsam wiederauferstehen zu lassen.|Hoch: Beschleunige Totenbeschwörung
+04:50=Verstecken sich Feinde im Untergrund?|Grabe sie aus mit dem Bohr-Luftangriff!|Der Zeitzünder bestimmt wie tief dieser graben wird.
+04:51=Wirf mit Dreck um dich!|Schmerzt ein wenig und schubst Igel weg.
+04:52=NICHT IN VERWENDUNG
+04:53=Unternimm eine Reise durch Zeit und Raum,|während du deine Kameraden alleine am Schlachtfeld zurücklässt.|Sei darauf vorbereitet jederzeit wieder zurückzukommen,|oder auf Sudden Death wenn sie alle besiegt wurden.|Disclaimer: Nicht funktionstüchtig wenn in Sudden Death,|wenn du alleine bist - oder der König.
+04:54=IN ARBEIT
+
+04:55=Versprühe einen Strahl klebriger Flocken.|Baue Brücken, begrabe Gegner, versiegle Tunnel.|Pass auf, dass du selbst nichts abbekommst!
 
 ; Game goal strings
 05:00=Spielmodifikationen
@@ -303,3 +325,10 @@
 05:13=Minenzünder: Minen explodieren sofort
 05:14=Minenzünder: Minen explodieren nach 0 - 3 Sekunden
 05:15=Prozentualer Schaden: Alle Waffen verursachen %1 % Schaden
+05:16=Lebenspunkter aller Igel wird am Ende jeder Runde zurückgesetzt
+05:17=Computergesteuerte Igel erscheinen nach dem Tod wieder
+05:18=Unbegrenzte Attacken
+05:19=Waffen werden am Ende jedes Zuges zurückgesetzt
+05:20=Igel teilen Waffen nicht untereinander
+05:21=Tag Team: Teams gleicher Farbe kommen nacheinander dran und teilen sich ihre Zugzeit.
+
--- a/share/hedgewars/Data/Locale/en.txt	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/en.txt	Sat Sep 17 16:20:09 2011 +0400
@@ -502,7 +502,7 @@
 04:48=Why should the moles get all the abuse?|Wacking a hog can be just as fun! A good|blow from this hammer will shave off one|third of a hog's health and plunge them|underground.|Attack: Activate
 04:49=Resurrect your friends!|But beware that this also resurrects your foes.|Attack: Keep attack pressed to resurrect slowly|Up: Accelerate resurrection
 04:50=Is someone hiding underground?|Dig them out with a drill strike!|Timer controls how far it will dig.
-04:51=Get in a free shot in by hurling a ball of mud.|Stings a bit, and knocks hogs back.
+04:51=Get in a free shot by hurling a ball of mud.|Stings a bit, and knocks hogs back.
 04:52=UNUSED
 04:53=Go on an adventure through time and space,|while leaving your comrades to fight on alone.|Be prepared to return at any time,|or for Sudden Death or if they are all defeated.|Disclaimer. Does not function in Sudden Death,|if you are alone, or if you are a King.
 04:54=INCOMPLETE                                                                                                                                     
--- a/share/hedgewars/Data/Locale/es.lua	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/es.lua	Sat Sep 17 16:20:09 2011 +0400
@@ -1,38 +1,38 @@
 locale = {
---      ["..."] = "",
+	["..."] = "...",
 	[":("] = ":(",
 	["!!!"] = "!!!",
---      ["Accuracy Bonus!"] = "",
---      ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
---      ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
+	["Accuracy Bonus!"] = "¡Buena puntería!",
+	["Achievement Unlocked"] = "Logro conseguido", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
+	["a Hedgewars mini-game"] = "un minijuego de Hedgewars", -- Space_Invasion, The_Specialists
 	["Aiming Practice"] = "Practica tu puntería", --Bazooka, Shotgun, SniperRifle
---      ["Ammo"] = "",
---      ["Ammo Depleted!"] = "",
---      ["ammo extended!"] = "",
---      ["Ammo is reset at the end of your turn."] = "",
---      ["Ammo Maniac!"] = "",
---      ["Available points remaining: "] = "",
---      ["[Backspace]"] = "",
---      ["Bamboo Thicket"] = "",
---      ["Barrel Eater!"] = "",
---      ["Barrel Launcher"] = "",
-	["Bat balls at your enemies and|push them into the sea!"] = "¡Batea pelotas hacia tus enemigos|y hazlos caer al agua!",
+	["Ammo"] = "Munición",
+	["Ammo Depleted!"] = "¡Munición agotada!",
+	["ammo extended!"] = "¡Munición aumentada!",
+	["Ammo is reset at the end of your turn."] = "",
+	["Ammo Maniac!"] = "¡Loco por la munición!",
+	["Available points remaining: "] = "Puntos restantes:",
+	["[Backspace]"] = "[Retroceso]",
+	["Bamboo Thicket"] = "Maraña de bambú",
+	["Barrel Eater!"] = "¡Tragabarriles!",
+	["Barrel Launcher"] = "Lanzador de barriles",
+	["Bat balls at your enemies and|push them into the sea!"] = "¡Batea pelotas contra tus enemigos|y hazlos caer al agua!",
 	["Bat your opponents through the|baskets and out of the map!"] = "¡Batea a tus enemigos fuera del campo de juego|a través de las canastas laterales!",
 	["Bazooka Training"] = "Entrenamiento con bazuca",
 	["Best laps per team: "] = "Mejores tiempos por equipo: ",
---      ["Best Team Times: "] = "",
+	["Best Team Times: "] = "Mejores tiempos del equipo: ",
 	["Bloody Rookies"] = "Reclutas", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
---      ["Boom!"] = "",
---      ["BOOM!"] = "",
---      ["Boss defeated!"] = "",
---      ["Boss Slayer!"] = "",
---      ["Build a track and race."] = "",
+	["Boom!"] = "¡Bum!",
+	["BOOM!"] = "¡BUM!",
+	["Boss defeated!"] = "¡Jefe derrotado!",
+	["Boss Slayer!"] = "¡Matajefes!",
+	["Build a track and race."] = "Dibuja un recorrido y compite.",
 	["CAPTURE THE FLAG"] = "Capturar la bandera",
---      ["Careless"] = "",
---      ["Change Weapon"] = "",
---      ["Clumsy"] = "",
+	["Careless"] = "Descuidado",
+	["Change Weapon"] = "Cambiar arma",
+	["Clumsy"] = "Patoso",
 	["Codename: Teamwork"] = "Nombre en clave: Trabajo en equipo",
---      ["Complete the track as fast as you can!"] = "",
+	["Complete the track as fast as you can!"] = "¡Completa el recorrido lo más rápido que puedas!",
 	["Congratulations!"] = "¡Felicidades!",
 	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "¡Felicidades! Has destruido todos los objectivos|dentro del tiempo establecido.", --Bazooka, Shotgun, SniperRifle
 	["Control pillars to score points."] = "Controla los pilares para anotar puntos.",
@@ -40,181 +40,180 @@
 	["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "¡MALDITA SEA, RECLUTA! ¡FUERA DE MI CABEZA!",
 	["DAMMIT, ROOKIE!"] = "¡MALDITA SEA, RECLUTA!",
 	["Dangerous Ducklings"] = "Patitos peligrosos",
---      ["Deadweight"] = "",
---      ["Demolition is fun!"] = "",
---      ["Depleted Kamikaze!"] = "",
---      ["Destroy invaders to score points."] = "",
---      ["Double Kill!"] = "",
---      ["Drone Hunter!"] = "",
---      ["Drowner"] = "",
---      ["Each turn you get 1-3 random weapons"] = "",
---      ["Each turn you get one random weapon"] = "",
+	["Deadweight"] = "Peso muerto",
+	["Demolition is fun!"] = "¡Destruir es divertido!",
+	["Depleted Kamikaze!"] = "¡No quedan más kamikazes!",
+	["Destroy invaders to score points."] = "Acaba con los invasores para conseguir puntos.",
+	["Double Kill!"] = "¡Dos por uno!",
+	["Drone Hunter!"] = "Matadrones",
+	["Drowner"] = "Ahogado",
+	["Each turn you get 1-3 random weapons"] = "Cada turno tendrás de 1 a 3 armas elegidas aleatoriamente",
+	["Each turn you get one random weapon"] = "Cada turno tendrás un arma elegida aleatoriamente",
 	["Eliminate all enemies"] = "Elimina a todos los enemigos",
 	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Destruye todos los objetivos antes de que se agote el tiempo.|La munición en esta misión es ilimitada.", --Bazooka, Shotgun, SniperRifle
 	["Eliminate Poison before the time runs out"] = "Acaba con los Tóxicos antes de que se agote el tiempo",
 	["Eliminate the Blue Team"] = "Elimina al Equipo azul",
---      ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
---      ["Eliminate the enemy hogs to win."] = "",
---      ["Eliminate the enemy specialists."] = "",
-	["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Elimina a la Unidad 3378 |- Resustencia Fútil debe sobrevivir",
---      ["Energetic Engineer"] = "",
+	["Eliminate the enemy before the time runs out"] = "Acaba con el enemigo antes de que se agote el tiempo", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+	["Eliminate the enemy hogs to win."] = "Acaba con los erizos enemigos para ganar",
+	["Eliminate the enemy specialists."] = "Acaba con los Especialistas",
+	["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Elimina a la Unidad 3378 |- Resistencia Fútil debe sobrevivir",
+	["Energetic Engineer"] = "Ingeniero Eléctrico",
 	["Enjoy the swim..."] = "Disfruta del baño...",
---      ["[Enter]"] = "",
+	["[Enter]"] = "[Intro]",
 	["Fastest lap: "] = "Vuelta rápida: ",
 	["Feeble Resistance"] = "Resistencia Fútil",
---      ["Fire"] = "",
+	["Fire"] = "Fuego",
 	["Flag captured!"] = "¡Bandera capturada!",
 	["Flag respawned!"] = "¡Bandera restablecida!",
 	["Flag returned!"] = "¡Bandera recuperada!",
---      ["Flags, and their home base will be placed where each team ends their first turn."] = "",
---      ["Flamer"] = "",
---      ["Friendly Fire!"] = "",
---      ["fuel extended!"] = "",
---      ["GAME BEGUN!!!"] = "",
---      ["Game Modifiers: "] = "",
+	["Flags, and their home base will be placed where each team ends their first turn."] = "Las banderas y las bases se colocarán donde los equipos acaben su primer turno.",
+	["Flamer"] = "Incinerador",
+	["Friendly Fire!"] = "¡Fuego amigo!",
+	["fuel extended!"] = "¡Más combustible!",
+	["GAME BEGUN!!!"] = "¡EL JUEGO HA EMPEZADO!",
+	["Game Modifiers: "] = "Modificadores: ",
 	["GAME OVER!"] = "¡FIN DEL JUEGO!",
 	["Game Started!"] = "¡El juego ha empezado!",
 	["Get on over there and take him out!"] = "¡Ves allí y elimínalo!",
---      ["Goal"] = "",
+	["Goal"] = "Objetivo",
 	["GO! GO! GO!"] = "¡VAMOS! ¡VAMOS! ¡VAMOS!",
 	["Good birdy......"] = "Buen pajarito......",
 	["Good luck out there!"] = "¡Buena suerte!",
---      ["Good so far!"] = "",
---      ["Good to go!"] = "",
---      ["GOTCHA!"] = "",
---      ["Grab Mines/Explosives"] = "",
---      ["Hahahaha!"] = "",
---      ["Haha, now THAT would be something!"] = "",
---      ["Hapless Hogs"] = "",
---      [" Hapless Hogs left!"] = "",
---      ["Health crates extend your time."] = "",
---      ["Heavy"] = "",
+	["Good so far!"] = "¡Vamos bien!",
+	["Good to go!"] = "¡Sigue!",
+	["GOTCHA!"] = "¡TE PILLÉ!",
+	["Grab Mines/Explosives"] = "Coge minas/explosivos",
+	["Hahahaha!"] = "¡Jajajaja!",
+	["Haha, now THAT would be something!"] = "¡Jajaja, eso SÍ que sería espectacular!",
+	["Hapless Hogs"] = "Pobres desgraciados",
+	[" Hapless Hogs left!"] = " pobres desgraciados restantes!",
+	["Health crates extend your time."] = "Los botiquines aumentan el tiempo disponible.",
+	["Heavy"] = "Pesado",
 	["Hedgewars-Basketball"] = "Hedgewars-Baloncesto",
 	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
---      ["Heh, it's not that bad."] = "",
---      ["Hit Combo!"] = "",
+	["Heh, it's not that bad."] = "Jeje, no es para tanto.",
+	["Hit Combo!"] = "¡Combo!",
 	["Hmmm..."] = "Mmm...",
 	["Hooray!"] = "¡Hurra!",
 	["Hunter"] = "Artillero", --Bazooka, Shotgun, SniperRifle
 	["Instructor"] = "Instructor", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings
---      ["invaders destroyed"] = "",
---      ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
---      ["Jumping is disabled"] = "",
---      ["Kamikaze Expert!"] = "",
---      ["Keep it up!"] = "",
---      ["Killing spree!"] = "",
---      ["KILLS"] = "",
---      ["Last Target!"] = "",
---      ["[Left Shift]"] = "",
+	["invaders destroyed"] = "invasores destruídos",
+	["It's a good thing SUDDEN DEATH is 99 turns away..."] = "Menos mal que aún quedan 99 turnos hasta la MUERTE SÚBITA...",
+	["Jumping is disabled"] = "No se puede saltar",
+	["Kamikaze Expert!"] = "¡Kamikaze experto!",
+	["Keep it up!"] = "¡Sigue así!",
+	["Killing spree!"] = "¡Frenesí asesino!",
+	["KILLS"] = "MUERTES",
+	["Last Target!"] = "¡Último objetivo!",
+	["[Left Shift]"] = "[Shift izquierdo]",
 	["Listen up, maggot!!"] = "¡Atento, escoria!",
---      ["Lively Lifeguard"] = "",
---      ["Mine Deployer"] = "",
---      ["Mine Eater!"] = "",
---      ["|- Mines Time:"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-	["MISSION FAILED"] = "MISIÓN FALLIDA", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
---      ["MISSION SUCCESS"] = "",
+	["Lively Lifeguard"] = "Salvavidas dicharachero",
+	["Mine Deployer"] = "Plantador de minas",
+	["Mine Eater!"] = "¡Tragaminas!",
+	["|- Mines Time:"] = "|- Retraso de las minas:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+	["MISSION FAILED"] = "MISIÓN FRACASADA", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+	["MISSION SUCCESS"] = "MISIÓN COMPLETADA",
 	["MISSION SUCCESSFUL"] = "MISIÓN COMPLETADA", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
---      ["Movement: [Up], [Down], [Left], [Right]"] = "",
---      ["Multi-shot!"] = "",
---      ["Nameless Heroes"] = "",
---      ["New Barrels Per Turn"] = "",
---      ["NEW CLAN RECORD: "] = "",
+	["Movement: [Up], [Down], [Left], [Right]"] = "Movimiento: [Arriba], [Abajo], [Izquierda], [Derecha]",
+	["Multi-shot!"] = "¡Disparo múltiple!",
+	["Nameless Heroes"] = "Héroes anónimos",
+	["New Barrels Per Turn"] = "Barriles por turno",
+	["NEW CLAN RECORD: "] = "NUEVO RÉCORD PARA EL CLAN",
 	["NEW fastest lap: "] = "NUEVA vuelta rápida: ",
---      ["New Mines Per Turn"] = "",
---      ["NEW RACE RECORD: "] = "",
---      ["Newton's Hammock"] = "",
---      ["NOT ENOUGH WAYPOINTS"] = "",
+	["New Mines Per Turn"] = "Minas por turno",
+	["NEW RACE RECORD: "] = "NUEVO RÉCORD PARA EL RECORRIDO: ",
+	["Newton's Hammock"] = "La hamaca de Newton",
+	["NOT ENOUGH WAYPOINTS"] = "NO HAY SUFICIENTES BALIZAS",
 	["Not So Friendly Match"] = "Partido no-tan-amistoso", -- Basketball, Knockball
 	["Oh no! Just try again!"] = "¡Oh, no! ¿Por qué no lo intentas de nuevo?", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
 	["Oh no! Time's up! Just try again."] = "¡Oh, no, se te acabó el tiempo! ¿Por qué no lo intentas de nuevo?", --Bazooka, Shotgun, SniperRifle
 	["Operation Diver"] = "Buzo",
 	["Opposing Team: "] = "Equipo enemigo: ",
 	["Pathetic Hog #%d"] = "Erizo patético #%d",
---      ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
---      ["Per-Hog Ammo"] = "",
---      ["Place more waypoints using [ENTER]"] = "",
---      ["Place more waypoints using the 'Air Attack' weapon."] = "",
---      ["points"] = "", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
+	["Pathetic Resistance"] = "Patética resistencia", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+	["Per-Hog Ammo"] = "Armamento individualizado",
+	["Place more waypoints using [ENTER]"] = "Coloca más balizas presionando [INTRO]",
+	["Place more waypoints using the 'Air Attack' weapon."] = "Coloca más balizas usando el 'Bombardeo aéreo'",
+	["points"] = "puntos", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
 	["Poison"] = "Veneno",
---      ["Power Remaining"] = "",
---      ["Prepare yourself"] = "",
---      ["Press [Precise] to skip intro"] = "",
---      ["Race complexity limit reached."] = "",
---      ["RACER"] = "",
+	["Power Remaining"] = "Energía restante",
+	["Prepare yourself"] = "Prepárate",
+	["Press [Precise] to skip intro"] = "Aprieta [Incrementar precisión] para saltar la intro",
+	["Race complexity limit reached."] = "Máximo de complejidad para el recorrido alcanzado.",
+	["RACER"] = "CORREDOR",
 	[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "- Vuelve a tu base con la bandera enemiga para anotar un punto | - El equipo que anote 3 puntos gana | - Sólo se puede anotar si tu propia bandera está en tu base | - Los erizos resucitan cuando mueren",
---      ["Round Limit:"] = "",
---      ["Round Limit"] = "",
---      ["Rounds Complete: "] = "",
---      ["Rounds Complete"] = "",
---      ["RULES OF THE GAME [Press ESC to view]"] = "",
+	["Round Limit:"] = "Límite de rondas:",
+	["Round Limit"] = "Límite de rondas",
+	["Rounds Complete: "] = "Rondas completadas: ",
+	["Rounds Complete"] = "Rondas completadas",
 	["RULES OF THE GAME [Press ESC to view]"] = "REGLAS DEL JUEGO (Presiona ESC para leerlas)",
---      ["s|"] = "",
---      ["Save as many hapless hogs as possible!"] = "",
---      ["SCORE"] = "",
---      ["sec"] = "", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
+	["s|"] = "s|",
+	["Save as many hapless hogs as possible!"] = "¡Salva a tantos pobres desgraciados como puedas!",
+	["SCORE"] = "PUNTUACIÓN",
+	["sec"] = "segundo", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
 	["See ya!"] = "¡Hasta otra!",
---      ["selected!"] = "",
---      ["s"] = "", -- GaudyRacer, Space_Invasion
---      ["Shield boosted! +30 power"] = "",
---      ["Shield Depleted"] = "",
---      ["Shield is fully recharged!"] = "",
---      ["Shield Master!"] = "",
---      ["Shield Miser!"] = "",
---      ["Shield OFF:"] = "",
---      ["Shield ON:"] = "",
---      ["Shield Seeker!"] = "",
+	["selected!"] = "¡Seleccionado!",
+	["s"] = "s", -- GaudyRacer, Space_Invasion
+	["Shield boosted! +30 power"] = "¡Escudo mejorado! +30 puntos",
+	["Shield Depleted"] = "Escudo descargado",
+	["Shield is fully recharged!"] = "¡Escudo completamente cargado!",
+	["Shield Master!"] = "¡Experto del escudo!",
+	["Shield Miser!"] = "¡Novato con los escudos!",
+	["Shield OFF:"] = "Escudo desactivado:",
+	["Shield ON:"] = "Escudo activado:",
+	["Shield Seeker!"] = "¡A cubierto!",
 	["Shotgun Team"] = "Escopeteros",
 	["Shotgun Training"] = "Entrenamiento con escopeta",
---      ["shots remaining."] = "",
---      ["Silly"] = "",
---      ["Sinky"] = "",
+	["shots remaining."] = "disparos restantes.",
+	["Silly"] = "Idiota",
+	["Sinky"] = "Sumergible",
 	["%s is out and Team %d|scored a penalty!| |Score:"] = "¡%s cayó y Equipo %d|anotó una falta!| |Puntuación:", -- Basketball, Knockball
 	["%s is out and Team %d|scored a point!| |Score:"] = "¡%s cayó y Equipo %d|anotó un tanto!| |Puntuación:", -- Basketball, Knockball
 	["Sniper Training"] = "Entrenamiento con rifle francotirador",
 	["Sniperz"] = "Francotiradores",
---      ["Sponge"] = "",
+	["Sponge"] = "Esponja",
 	["Spooky Tree"] = "Árbol tenebroso",
---      ["STATUS UPDATE"] = "", -- GaudyRacer, Space_Invasion
---      ["Switched to "] = "",
+	["STATUS UPDATE"] = "ACTUALIZACIÓN DE ESTADO", -- GaudyRacer, Space_Invasion
+	["Switched to "] = "Cambiar a ",
 	["Team %d: "] = "Equipo %d",
---      ["Team Scores"] = "", -- Control, Space_Invasion
---      ["That Sinking Feeling"] = "",
---      ["That was pointless."] = "",
+	["Team Scores"] = "Puntuaciones", -- Control, Space_Invasion
+	["That Sinking Feeling"] = "Esa sensación de pesadez",
+	["That was pointless."] = "Eso era innecesario.",
 	["The enemy is hiding out on yonder ducky!"] = "¡El enemigo está escondido detrás del patito del fondo!",
---      ["The flag will respawn next round."] = "",
---      ["The Nameless One"] = "",
---      ["THE SPECIALISTS"] = "",
---      ["This one's tricky."] = "",
---      ["This rain is really something..."] = "",
---      ["TIME: "] = "",
---      ["Timed Kamikaze!"] = "",
---      ["Time Extended!"] = "",
---      ["Time Extension"] = "",
---      ["Toggle Shield"] = "",
+	["The flag will respawn next round."] = "La bandera reaparecerá en el próximo turno.",
+	["The Nameless One"] = "Anónimo",
+	["THE SPECIALISTS"] = "LOS ESPECIALISTAS",
+	["This one's tricky."] = "Esto va a ser complicado.",
+	["This rain is really something..."] = "Vaya que si llueve...",
+	["TIME: "] = "TIEMPO: ",
+	["Timed Kamikaze!"] = "¡Kamikaze de precisión!",
+	["Time Extended!"] = "¡Tiempo aumentado!",
+	["Time Extension"] = "¡Bonus de tiempo!",
+	["Toggle Shield"] = "Activad/desactivar escudo",
 	["Toxic Team"] = "Tóxicos", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
---      ["TRACK COMPLETED"] = "",
---      ["TRACK FAILED!"] = "",
+	["TRACK COMPLETED"] = "¡PISTA COMPLETADA!",
+	["TRACK FAILED!"] = "¡PISTA FRACASADA!",
 	["TrophyRace"] = "TrophyRace",
 	["T_T"] = "T_T",
---      ["Tumbling Time Extended!"] = "",
---      ["Turn Time"] = "",
---      ["Unit"] = "",
+	["Tumbling Time Extended!"] = "¡Tiempo de volteretas aumentado!",
+	["Turn Time"] = "Duración del turno",
+	["Unit"] = "Unidad",
 	["Unit 3378"] = "Unidad 3378",
---      ["Unit 835"] = "",
---      ["Unlimited Attacks"] = "",
---      ["Unstoppable!"] = "",
---      ["User Challenge"] = "",
+	["Unit 835"] = "Unidad 835",
+	["Unlimited Attacks"] = "Ataques ilimitados",
+	["Unstoppable!"] = "¡Imparable!",
+	["User Challenge"] = "Reto personal",
 	["Use your rope to get from start to finish as fast as you can!"] = "¡Usa tu cuerda para llegar a la salida lo más rápido que puedas!",
-	["Victory for the "] = "La victoria es para", -- CTF_Blizzard, Capture_the_Flag
---      ["Waypoint placed."] = "",
---      ["Way-Points Remaining"] = "",
---      ["Weapons Reset"] = "",
---      ["Well done."] = "",
---      ["Will this ever end?"] = "",
---      ["WINNING TIME: "] = "",
---      ["You'd almost swear the water was rising!"] = "",
+	["Victory for the "] = "La victoria es para ", -- CTF_Blizzard, Capture_the_Flag
+	["Waypoint placed."] = "Baliza colocada.",
+	["Way-Points Remaining"] = "Balizas restantes",
+	["Weapons Reset"] = "Armamento reiniciado",
+	["Well done."] = "Bien hecho.",
+	["Will this ever end?"] = "¿Es que nunca se va a terminar?",
+	["WINNING TIME: "] = "MEJOR TIEMPO: ",
+	["You'd almost swear the water was rising!"] = "¡Pero si podría jurar que está subiendo el nivel del mar!",
 	["You have SCORED!!"] = "¡Has anotado!",
---      ["You saved"] = "",
+	["You saved"] = "¡Has salvado",
 	["You've failed. Try again."] = "Has fracasado. Inténtalo de nuevo.",
 	["You've reached the goal!| |Time: "] = "¡Has llegado a la meta!| |Tiempo: ",
 	["'Zooka Team"] = "Bazuqueros",
--- a/share/hedgewars/Data/Locale/es.txt	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/es.txt	Sat Sep 17 16:20:09 2011 +0400
@@ -52,23 +52,33 @@
 00:48=Mazo
 00:49=Resurrección
 00:50=Bombardeo perforador aéreo
-00:51=Bola de tierra
+00:51=Bola de barro
+00:52=No hay arma seleccionada
+00:53=Cabina del tiempo
+00:54=Estructura
+00:55=Pistola de barro
 
 01:00=¡Luchad!
 01:01=Empate
 01:02=¡%1 venció!
 01:03=Volumen %1%
 01:04=Pausa
-01:05=¿Realmente deseas salir (Y / Esc)?
+01:05=¿Seguro que quieres salir (Y / Esc)?
 01:06=¡Muerte súbita!
 01:07=%1 restante
 01:08=Combustible
 01:09=Sincronizando...
-01:10=Activar esta herramienta no hará que tu turno acabe.
+01:10=Usar esta herramienta no hará que acabe tu turno.
 01:11=Esta herramienta o arma todavía no está disponible.
 01:12=¡Última ronda antes de la muerte súbita!
 01:13=¡%1 rondas hasta la muerte súbita!
 01:14=¡Prepárate, %1!
+01:15=mínimo
+01:16=bajo
+01:17=normal
+01:18=alto
+01:19=extremo
+01:20=Nivel de elasticidad: %1
 
 ; Eventos
 ; El erizo (%1) ha muerto
@@ -433,6 +443,11 @@
 03:48=Pablo clavó un clavito
 03:49=Hace exactamente lo que dice
 03:50=Para los amantes de los topos
+03:51=Me la encontré por el suelo
+03:52=SIN USAR
+03:53=Tipo 40
+03:54=Construye algo
+03:55=Herramienta
 
 ; Descripciones de armamento ( líneas delimitadas con | )
 04:00=Ataca a tus enemigos usando una sencilla granada.|Explotará una vez el temporizador llegue a cero.|1-5: ajustar temporizador.|Atacar: mantener presionado para lanzar más lejos.
@@ -485,6 +500,12 @@
 04:47=¡Dos bombas lapa, doble diversión!|Útiles para planear reacciones en cadena, atrincherarte...|¡o las dos cosas!.|Atacar: mantener presionado para lanzar más lejos (dos disparos).
 04:48=¿Por qué la gente siempre la toma con los topos?|¡Golpear erizos es aún más divertido!|Un buen mazazo puede reducir en un tercio la|vida de cualquier erizo y enterrarlo completamente.|Atacar: activar.
 04:49=¡Resucita a tus aliados!|Pero ten cuidado, también resucitarás a tus enemigos.|Atacar: mantener presionado para resucitar lentamente.|Arriba: acelerar resurrección.
+04:50=¿Alguien está oculto bajo tierra?|¡Desentiérralos con un bombardeo perforador!|El temporizador controla la profundidad a alcanzar.
+04:51=¿Qué hay más barato que el barro?|Un tiro gratis gracias a la bola de barro.|Hará que el enemigo salga volando|y escuece un poco si te entra en los ojos.
+04:52=SIN USAR
+04:53=Vive una trepidante aventura a través del|espacio y el tiempo mientras tus compañeros|siguen luchando en tu lugar.|Estate preparado para volver en cualquier momento,|o al llegar la Muerte súbita si te has quedado solo.|Aviso: no funciona durante la Muerte súbita,|si estás solo o si eres el rey.
+04:54=INCOMPLETO                                                                                                                                     
+04:55=Esparce un chorro de pegajoso barro.|Construye puentes, entierra enemigos o cierra túneles.|¡Ten especial cuidado de no mancharte!
 
 ; Game goal strings
 05:00=Modos de juego
@@ -508,3 +529,4 @@
 05:18=Sin límite de ataques por turno
 05:19=El arsenal se restaura al final de cada turno
 05:20=Los erizos no comparten arsenal
+05:21=Tag Team: los equipos del mismo clan se van turnando entre ellos.|Turno compartido: los equipos del mismo clan comparten la duración del turno.
--- a/share/hedgewars/Data/Locale/hedgewars_de.ts	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_de.ts	Sat Sep 17 16:20:09 2011 +0400
@@ -5,26 +5,26 @@
     <name>AmmoSchemeModel</name>
     <message>
         <source>new</source>
-        <translation>Neu</translation>
+        <translation>neu</translation>
     </message>
     <message>
         <source>copy of</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopie von</translation>
     </message>
 </context>
 <context>
     <name>DrawMapWidget</name>
     <message>
         <source>File error</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateifehler</translation>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writing</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei &apos;%1&apos; konnte nicht für Schreibzugriff geöffnet werden.</translation>
     </message>
     <message>
         <source>Cannot read file &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei &apos;%1&apos; konnte nicht gelese werden.</translation>
     </message>
 </context>
 <context>
@@ -61,7 +61,7 @@
     </message>
     <message>
         <source>When this option is enabled selecting a game scheme will auto-select a weapon</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn diese Option aktiviert ist, wird durch Auswählen eines Spielprofils auch automatisch Waffen ausgewählt</translation>
     </message>
 </context>
 <context>
@@ -125,11 +125,11 @@
     </message>
     <message>
         <source>Demo name</source>
-        <translation type="unfinished"></translation>
+        <translation>Demo-Name</translation>
     </message>
     <message>
         <source>Demo name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Demo-Name:</translation>
     </message>
 </context>
 <context>
@@ -215,11 +215,11 @@
     </message>
     <message>
         <source>Seed</source>
-        <translation type="unfinished"></translation>
+        <translation>Seed</translation>
     </message>
     <message>
         <source>Set</source>
-        <translation type="unfinished"></translation>
+        <translation>Setzen</translation>
     </message>
 </context>
 <context>
@@ -303,14 +303,17 @@
     </message>
     <message>
         <source>Nickname</source>
-        <translation type="unfinished">Spitzname</translation>
+        <translation>Spitzname</translation>
     </message>
     <message>
         <source>Some one already uses
  your nickname %1
 on the server.
 Please pick another nickname:</source>
-        <translation type="unfinished"></translation>
+        <translation>Jemand verwendet
+deinen Spiznamen %1 
+bereits auf dem Server.
+Bitte wähle einen anderen Spitznamen:</translation>
     </message>
 </context>
 <context>
@@ -398,11 +401,11 @@
     </message>
     <message>
         <source>Drawn Maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Gezeichnete Karten</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Dateien</translation>
     </message>
 </context>
 <context>
@@ -757,31 +760,31 @@
     <message>
         <source>You can find your Hedgewars configuration files under &quot;Library/Application Support/Hedgewars&quot; in your home directory. Create backups or take the files with you, but don&apos;t edit them by hand.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Du findest die Hedgewars Konfigurationsdateien unter &quot;Library/Application Support/Hedgewars&quot; in deinem Home-Verzeichnis. Erstelle Backups oder kopiere deine Dateien, aber editiere sie besser nicht selbst.</translation>
     </message>
     <message>
         <source>You can find your Hedgewars configuration files under &quot;.hedgewars&quot; in your home directory. Create backups or take the files with you, but don&apos;t edit them by hand.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Du findest die Hedgewars Konfigurationsdateien unter &quot;.hedgewars&quot; in deinem Home-Verzeichnis. Erstelle Backups oder kopiere deine Dateien, aber editiere sie besser nicht selbst.</translation>
     </message>
     <message>
         <source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Die Windows version von Hedgewars unterstützt Xfire. Füge Hedgewars zu deiner Spieleliste hinzu damit deine Freunde dich spielen sehen können.</translation>
     </message>
     <message>
         <source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Benutze den Molotov-Cocktail oder den Flammenwerfer um Igel vorübergehend am passieren von Gelände wie z.B. Tunnels oder Platformen zu hindern.</translation>
     </message>
     <message>
         <source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Die Verwendung der Zielsuchende Biene ist ein bisschen knifflig. Ihr Wenderadius hängt von der Geschwindigkeit ab, versuche sie also nicht mit voller Stärke wegzuschießen.</translation>
     </message>
     <message>
         <source>Downloadable Content</source>
-        <translation type="unfinished"></translation>
+        <translation>Herunterladbare Inhalte</translation>
     </message>
 </context>
 <context>
@@ -810,15 +813,15 @@
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Fehler</translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>Please enter room name</source>
-        <translation type="unfinished">Bitte einen Raumnamen eingeben</translation>
+        <translation>Bitte einen Raumnamen eingeben</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished">OK</translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
@@ -864,27 +867,27 @@
     </message>
     <message>
         <source>New scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues Spielprofil</translation>
     </message>
     <message>
         <source>Edit scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Spielprofil bearbeiten</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Spielprofil löschen</translation>
     </message>
     <message>
         <source>New weapon set</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues Waffenprofil</translation>
     </message>
     <message>
         <source>Edit weapon set</source>
-        <translation type="unfinished"></translation>
+        <translation>Waffenprofil bearbeiten</translation>
     </message>
     <message>
         <source>Delete weapon set</source>
-        <translation type="unfinished"></translation>
+        <translation>Waffenprofil löschen</translation>
     </message>
 </context>
 <context>
@@ -1038,9 +1041,9 @@
     </message>
     <message numerus="yes">
         <source>%1 players online</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1 Spieler online</numerusform>
+            <numerusform>%1 Spieler online</numerusform>
         </translation>
     </message>
 </context>
@@ -1091,10 +1094,6 @@
         <translation>Die Landschaft ist nicht zerstörbar!</translation>
     </message>
     <message>
-        <source>Add an indestructable border around the terrain</source>
-        <translation type="obsolete">Einfügen eines unzerstörbaren Kartenrand</translation>
-    </message>
-    <message>
         <source>Lower gravity</source>
         <translation>Verringerte Schwerkraft</translation>
     </message>
@@ -1152,27 +1151,27 @@
     </message>
     <message>
         <source>You will not have to worry about wind anymore.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du wirst dich nicht mehr um Wind kümmern müssen.</translation>
     </message>
     <message>
         <source>Wind will affect almost everything.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wind beeinflusst fast alles.</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieren</translation>
     </message>
     <message>
         <source>Teams in each clan take successive turns sharing their turn time.</source>
-        <translation type="unfinished"></translation>
+        <translation>Teams gleicher Farbe kommen nacheinander dran und teilen sich ihre Zugzeit.</translation>
     </message>
     <message>
         <source>Add an indestructible border around the terrain</source>
-        <translation>Einfügen eines unzerstörbaren Kartenrand</translation>
+        <translation>Fügt eine unzerstörbare Randbegrenzung um das Spielfeld herum hinzu.</translation>
     </message>
     <message>
         <source>Add an indestructible border along the bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt eine unzerstörbare Randbegrenzung am unteren Kartenrand hinzu.</translation>
     </message>
 </context>
 <context>
@@ -1187,11 +1186,11 @@
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished">Neu</translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieren</translation>
     </message>
 </context>
 <context>
@@ -1269,7 +1268,7 @@
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Aktualisieren</translation>
+        <translation>Aktualisieren</translation>
     </message>
 </context>
 <context>
@@ -1379,67 +1378,67 @@
     </message>
     <message>
         <source>Disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Deaktiviert</translation>
     </message>
     <message>
         <source>Red/Cyan</source>
-        <translation type="unfinished"></translation>
+        <translation>Rot/Türkis</translation>
     </message>
     <message>
         <source>Cyan/Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Türkis/Rot</translation>
     </message>
     <message>
         <source>Red/Blue</source>
-        <translation type="unfinished"></translation>
+        <translation>Rot/Blau</translation>
     </message>
     <message>
         <source>Blue/Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Blau/Rot</translation>
     </message>
     <message>
         <source>Red/Green</source>
-        <translation type="unfinished"></translation>
+        <translation>Rot/Grün</translation>
     </message>
     <message>
         <source>Green/Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Grün/Rot</translation>
     </message>
     <message>
         <source>Side-by-side</source>
-        <translation type="unfinished"></translation>
+        <translation>Nebeneinander</translation>
     </message>
     <message>
         <source>Top-Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Übereinander</translation>
     </message>
     <message>
         <source>Wiggle</source>
-        <translation type="unfinished"></translation>
+        <translation>Wackeln</translation>
     </message>
     <message>
         <source>Red/Cyan grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Rot/Türkis Graustufen</translation>
     </message>
     <message>
         <source>Cyan/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Türkis/Rot Graustufen</translation>
     </message>
     <message>
         <source>Red/Blue grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Rot/Blau Graustufen</translation>
     </message>
     <message>
         <source>Blue/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Blau/Rot Graustufen</translation>
     </message>
     <message>
         <source>Red/Green grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Rot/Grün Graustufen</translation>
     </message>
     <message>
         <source>Green/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Grün/Rot Graustufen</translation>
     </message>
 </context>
 <context>
@@ -1494,7 +1493,7 @@
     </message>
     <message>
         <source>Schemes and Weapons</source>
-        <translation type="unfinished"></translation>
+        <translation>Spielprofile und Waffen</translation>
     </message>
 </context>
 <context>
@@ -1671,31 +1670,31 @@
     </message>
     <message>
         <source>% Rope Length</source>
-        <translation type="unfinished"></translation>
+        <translation>% Seillänge</translation>
     </message>
     <message>
         <source>Stereo rendering</source>
-        <translation type="unfinished"></translation>
+        <translation>Stereo-Rendering</translation>
     </message>
     <message>
         <source>Game Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Spieloptionen</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Stil</translation>
     </message>
     <message>
         <source>Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Spielprofil</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation>Passwort</translation>
     </message>
     <message>
         <source>% Get Away Time</source>
-        <translation type="unfinished"></translation>
+        <translation>% Rückzugszeit</translation>
     </message>
 </context>
 <context>
@@ -1768,27 +1767,27 @@
     </message>
     <message>
         <source>Teams</source>
-        <translation type="unfinished">Teams</translation>
+        <translation>Teams</translation>
     </message>
     <message>
         <source>Really delete this team?</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Team wirklich löschen?</translation>
     </message>
     <message>
         <source>Schemes</source>
-        <translation type="unfinished"></translation>
+        <translation>Spielprofil</translation>
     </message>
     <message>
         <source>Can not delete default scheme &apos;%1&apos;!</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardspielprofil &apos;%1&apos; kann nicht gelöscht werden!</translation>
     </message>
     <message>
         <source>Really delete this game scheme?</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Spielprofil wirklich löschen?</translation>
     </message>
     <message>
         <source>Can not delete default weapon set &apos;%1&apos;!</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardwaffenprofil &apos;%1&apos; kann nicht gelöscht werden!</translation>
     </message>
 </context>
 <context>
@@ -1886,7 +1885,7 @@
     </message>
     <message>
         <source>more</source>
-        <translation type="unfinished"></translation>
+        <translation>mehr</translation>
     </message>
 </context>
 <context>
@@ -1940,11 +1939,11 @@
     </message>
     <message>
         <source>new</source>
-        <translation type="unfinished">Neu</translation>
+        <translation>neu</translation>
     </message>
     <message>
         <source>copy of</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopie von</translation>
     </message>
 </context>
 <context>
@@ -2054,19 +2053,19 @@
     </message>
     <message>
         <source>Disable Wind</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Wind</translation>
     </message>
     <message>
         <source>More Wind</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehr Wind</translation>
     </message>
     <message>
         <source>Tag Team</source>
-        <translation type="unfinished"></translation>
+        <translation>Tag Team</translation>
     </message>
     <message>
         <source>Add Bottom Border</source>
-        <translation type="unfinished"></translation>
+        <translation>Untere Randbegrenzung hinzufügen</translation>
     </message>
 </context>
 <context>
--- a/share/hedgewars/Data/Locale/hedgewars_es.ts	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_es.ts	Sat Sep 17 16:20:09 2011 +0400
@@ -16,15 +16,15 @@
     <name>DrawMapWidget</name>
     <message>
         <source>File error</source>
-        <translation type="unfinished"></translation>
+        <translation>Error de fichero</translation>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writing</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede abrir el fichero &apos;%1&apos; en modo lectura</translation>
     </message>
     <message>
         <source>Cannot read file &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede leer &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
@@ -129,11 +129,11 @@
     </message>
     <message>
         <source>Demo name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de la demo</translation>
     </message>
     <message>
         <source>Demo name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de la demo:</translation>
     </message>
 </context>
 <context>
@@ -223,7 +223,7 @@
     </message>
     <message>
         <source>Set</source>
-        <translation type="unfinished">Establecer</translation>
+        <translation>Cambiar</translation>
     </message>
 </context>
 <context>
@@ -305,14 +305,17 @@
     </message>
     <message>
         <source>Nickname</source>
-        <translation type="unfinished">Nick</translation>
+        <translation>Nick</translation>
     </message>
     <message>
         <source>Some one already uses
  your nickname %1
 on the server.
 Please pick another nickname:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ya hay alguien conectado
+como %1 en estos momentos
+en el servidor.
+Por favor, introduce otro nick:</translation>
     </message>
 </context>
 <context>
@@ -365,11 +368,11 @@
     <name>PageConnecting</name>
     <message>
         <source>Connecting...</source>
-        <translation>Conectando...</translation>
+        <translation>Estableciendo conexión...</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -404,11 +407,11 @@
     </message>
     <message>
         <source>Drawn Maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Mapas dibujados a mano</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos los ficheros</translation>
     </message>
 </context>
 <context>
@@ -773,21 +776,21 @@
     <message>
         <source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>La versión de Hedgewars para Windows soporta Xfire. Recuerda agregar Hedgewars a tu lista de juegos para que tus amigos puedan saber cuándo estás jugando.</translation>
     </message>
     <message>
         <source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Puedes usar el cóctel molotov o el lanzallamas para evitar que erizos enemigos crucen túneles angostos o puentes.</translation>
     </message>
     <message>
         <source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>El abejorro puede ser complicado de usar. Su maniobrabilidad depende de su velocidad, así que intenta no lanzarlo a máxima potencia.</translation>
     </message>
     <message>
         <source>Downloadable Content</source>
-        <translation type="unfinished"></translation>
+        <translation>Contenido adicional</translation>
     </message>
 </context>
 <context>
@@ -816,15 +819,15 @@
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Error</translation>
+        <translation>Error</translation>
     </message>
     <message>
         <source>Please enter room name</source>
-        <translation type="unfinished">Por favor, introduce un nombre para la sala</translation>
+        <translation>Por favor, introduce un nombre para la sala</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished">OK</translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
@@ -1044,8 +1047,8 @@
     </message>
     <message numerus="yes">
         <source>%1 players online</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1 jugadores conectados</numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
@@ -1170,7 +1173,7 @@
     </message>
     <message>
         <source>Teams in each clan take successive turns sharing their turn time.</source>
-        <translation type="unfinished"></translation>
+        <translation>Los equipos del mismo clan alternan entre ellos compartiendo la duración de su turno.</translation>
     </message>
     <message>
         <source>Add an indestructible border around the terrain</source>
@@ -1178,7 +1181,7 @@
     </message>
     <message>
         <source>Add an indestructible border along the bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Añade un borde indestructible en la parta inferior</translation>
     </message>
 </context>
 <context>
@@ -1275,7 +1278,7 @@
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Actualizar</translation>
+        <translation>Actualizar</translation>
     </message>
 </context>
 <context>
@@ -1417,67 +1420,67 @@
     </message>
     <message>
         <source>Disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Deshabilitado</translation>
     </message>
     <message>
         <source>Red/Cyan</source>
-        <translation type="unfinished"></translation>
+        <translation>Rojo/Cian</translation>
     </message>
     <message>
         <source>Cyan/Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Cian/Rojo</translation>
     </message>
     <message>
         <source>Red/Blue</source>
-        <translation type="unfinished"></translation>
+        <translation>Rojo/Azul</translation>
     </message>
     <message>
         <source>Blue/Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Azul/Rojo</translation>
     </message>
     <message>
         <source>Red/Green</source>
-        <translation type="unfinished"></translation>
+        <translation>Rojo/Verde</translation>
     </message>
     <message>
         <source>Green/Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Verde/Rojo</translation>
     </message>
     <message>
         <source>Side-by-side</source>
-        <translation type="unfinished"></translation>
+        <translation>Izquierda-Derecha</translation>
     </message>
     <message>
         <source>Top-Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Arriba-Abajo</translation>
     </message>
     <message>
         <source>Wiggle</source>
-        <translation type="unfinished"></translation>
+        <translation>Temblor</translation>
     </message>
     <message>
         <source>Red/Cyan grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Rojo/Cian en escala de grises</translation>
     </message>
     <message>
         <source>Cyan/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Cian/Rojo en escala de grises</translation>
     </message>
     <message>
         <source>Red/Blue grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Rojo/Azul en escala de grises</translation>
     </message>
     <message>
         <source>Blue/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Azul/Rojo en escala de grises</translation>
     </message>
     <message>
         <source>Red/Green grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Rojo/Verde en escala de grises</translation>
     </message>
     <message>
         <source>Green/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Verde/Rojo en escala de grises</translation>
     </message>
 </context>
 <context>
@@ -1724,27 +1727,27 @@
     </message>
     <message>
         <source>Stereo rendering</source>
-        <translation type="unfinished"></translation>
+        <translation>Estereoscopía</translation>
     </message>
     <message>
         <source>Game Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opciones de juego</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Estilo</translation>
     </message>
     <message>
         <source>Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo de juego</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Contraseña</translation>
+        <translation>Contraseña</translation>
     </message>
     <message>
         <source>% Get Away Time</source>
-        <translation type="unfinished"></translation>
+        <translation>% duración de retirada</translation>
     </message>
 </context>
 <context>
@@ -1755,7 +1758,7 @@
     </message>
     <message>
         <source>hedgehog %1</source>
-        <translation type="unfinished"></translation>
+        <translation>erizo %1</translation>
     </message>
 </context>
 <context>
@@ -1939,7 +1942,7 @@
     </message>
     <message>
         <source>more</source>
-        <translation type="unfinished"></translation>
+        <translation>más</translation>
     </message>
 </context>
 <context>
@@ -2115,11 +2118,11 @@
     </message>
     <message>
         <source>Tag Team</source>
-        <translation type="unfinished"></translation>
+        <translation>Tag team</translation>
     </message>
     <message>
         <source>Add Bottom Border</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir borde inferior</translation>
     </message>
 </context>
 <context>
@@ -2162,39 +2165,39 @@
     </message>
     <message>
         <source>slot 1</source>
-        <translation>posición 1</translation>
+        <translation>fila 1</translation>
     </message>
     <message>
         <source>slot 2</source>
-        <translation>posición 2</translation>
+        <translation>fila 2</translation>
     </message>
     <message>
         <source>slot 3</source>
-        <translation>posición 3</translation>
+        <translation>fila 3</translation>
     </message>
     <message>
         <source>slot 4</source>
-        <translation>posición 4</translation>
+        <translation>fila 4</translation>
     </message>
     <message>
         <source>slot 5</source>
-        <translation>posición 5</translation>
+        <translation>fila 5</translation>
     </message>
     <message>
         <source>slot 6</source>
-        <translation>posición 6</translation>
+        <translation>fila 6</translation>
     </message>
     <message>
         <source>slot 7</source>
-        <translation>posición 7</translation>
+        <translation>fila 7</translation>
     </message>
     <message>
         <source>slot 8</source>
-        <translation>posición 8</translation>
+        <translation>fila 8</translation>
     </message>
     <message>
         <source>slot 9</source>
-        <translation>posición 9</translation>
+        <translation>fila 9</translation>
     </message>
     <message>
         <source>timer 1 sec</source>
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts	Sat Sep 17 16:20:09 2011 +0400
@@ -16,15 +16,15 @@
     <name>DrawMapWidget</name>
     <message>
         <source>File error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore file</translation>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writing</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile aprire il file &apos;%1&apos; in scrittura</translation>
     </message>
     <message>
         <source>Cannot read file &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile leggere il file &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
@@ -125,11 +125,11 @@
     </message>
     <message>
         <source>Demo name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome della demo</translation>
     </message>
     <message>
         <source>Demo name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome della demo:</translation>
     </message>
 </context>
 <context>
@@ -301,14 +301,17 @@
     </message>
     <message>
         <source>Nickname</source>
-        <translation type="unfinished">Nickname</translation>
+        <translation>Nickname</translation>
     </message>
     <message>
         <source>Some one already uses
  your nickname %1
 on the server.
 Please pick another nickname:</source>
-        <translation type="unfinished"></translation>
+        <translation>Qualcun altro sta usando
+ il tuo nickname %1
+sul server.
+Per favore scelto un altro nickname:</translation>
     </message>
 </context>
 <context>
@@ -365,7 +368,7 @@
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">Annulla</translation>
+        <translation>Annulla</translation>
     </message>
 </context>
 <context>
@@ -400,11 +403,11 @@
     </message>
     <message>
         <source>Drawn Maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Mappe disegnate</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Tutti i file</translation>
     </message>
 </context>
 <context>
@@ -620,7 +623,7 @@
     <message>
         <source>Connect one or more gamepads before starting the game to be able to assign their controls to your teams.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Collega uno o più gamepad prima di iniziare il gioco per poterli assegnare alle tue squadra.</translation>
     </message>
     <message>
         <source>Create an account on %1 to keep others from using your most favourite nickname while playing on the official server.</source>
@@ -715,7 +718,7 @@
     <message>
         <source>You can find your Hedgewars configuration files under &quot;My Documents\Hedgewars&quot;. Create backups or take the files with you, but don&apos;t edit them by hand.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Puoi trovare i tuoi file di configurazione Hedgewars in &quot;Documenti\Hedgewars&quot;. Crea delle copie di sicurezza o prendi i file con te, ma non modificarli a mano.</translation>
     </message>
     <message>
         <source>You&apos;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.</source>
@@ -755,11 +758,11 @@
     <message>
         <source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;Ape a Ricerca può essere difficile da usare. Il suo raggio di curvatura dipende dalla sua velocità, quindi cerca di non usarla a piena potenza.</translation>
     </message>
     <message>
         <source>Downloadable Content</source>
-        <translation type="unfinished"></translation>
+        <translation>Contenuto scaricabile</translation>
     </message>
 </context>
 <context>
@@ -788,15 +791,15 @@
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Errore</translation>
+        <translation>Errore</translation>
     </message>
     <message>
         <source>Please enter room name</source>
-        <translation type="unfinished">Inserisci il nome della stanza</translation>
+        <translation>Inserisci il nome della stanza</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished">OK</translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
@@ -1016,9 +1019,9 @@
     </message>
     <message numerus="yes">
         <source>%1 players online</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>1 giocatore online</numerusform>
+            <numerusform>%1 giocatori online</numerusform>
         </translation>
     </message>
 </context>
@@ -1142,7 +1145,7 @@
     </message>
     <message>
         <source>Teams in each clan take successive turns sharing their turn time.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le squadre di ogni clan possono avere turni consecutivi condividendo il tempo del loro turno.</translation>
     </message>
     <message>
         <source>Add an indestructible border around the terrain</source>
@@ -1150,7 +1153,7 @@
     </message>
     <message>
         <source>Add an indestructible border along the bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi un bordo indistruttibile lungo la parte inferiore</translation>
     </message>
 </context>
 <context>
@@ -1247,7 +1250,7 @@
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Aggiorna</translation>
+        <translation>Aggiorna</translation>
     </message>
 </context>
 <context>
@@ -1385,39 +1388,39 @@
     </message>
     <message>
         <source>Side-by-side</source>
-        <translation type="unfinished"></translation>
+        <translation>Lato-a-lato</translation>
     </message>
     <message>
         <source>Top-Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Dall'alto in basso</translation>
     </message>
     <message>
         <source>Wiggle</source>
-        <translation type="unfinished"></translation>
+        <translation>Movimento continuo</translation>
     </message>
     <message>
         <source>Red/Cyan grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Scala di grigio rosso/azzurro</translation>
     </message>
     <message>
         <source>Cyan/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Scala di grigio azzurro/rosso</translation>
     </message>
     <message>
         <source>Red/Blue grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Scala di grigio rosso/blu</translation>
     </message>
     <message>
         <source>Blue/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Scala di grigio blu/rosso</translation>
     </message>
     <message>
         <source>Red/Green grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Scala di grigio rosso/verde</translation>
     </message>
     <message>
         <source>Green/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Scala di grigio verde/rosso</translation>
     </message>
 </context>
 <context>
@@ -1661,23 +1664,23 @@
     </message>
     <message>
         <source>Game Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opzioni di gioco</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Style</translation>
     </message>
     <message>
         <source>Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Schema</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Password</translation>
+        <translation>Password</translation>
     </message>
     <message>
         <source>% Get Away Time</source>
-        <translation type="unfinished"></translation>
+        <translation>% tempo regalo</translation>
     </message>
 </context>
 <context>
@@ -1688,7 +1691,7 @@
     </message>
     <message>
         <source>hedgehog %1</source>
-        <translation type="unfinished"></translation>
+        <translation>riccio %1</translation>
     </message>
 </context>
 <context>
@@ -2044,11 +2047,11 @@
     </message>
     <message>
         <source>Tag Team</source>
-        <translation type="unfinished"></translation>
+        <translation>Squadre etichettate</translation>
     </message>
     <message>
         <source>Add Bottom Border</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi bordo inferiore</translation>
     </message>
 </context>
 <context>
--- a/share/hedgewars/Data/Locale/hedgewars_pl.ts	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts	Sat Sep 17 16:20:09 2011 +0400
@@ -130,11 +130,11 @@
     </message>
     <message>
         <source>Demo name</source>
-        <translation type="unfinished">Nazwa demo</translation>
+        <translation>Podaj nazwę</translation>
     </message>
     <message>
         <source>Demo name:</source>
-        <translation type="unfinished">Nazwa demo:</translation>
+        <translation>Nazwa demo:</translation>
     </message>
 </context>
 <context>
@@ -408,11 +408,11 @@
     </message>
     <message>
         <source>Drawn Maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Narysowane mapy</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Wszystkie pliki</translation>
     </message>
 </context>
 <context>
@@ -535,7 +535,7 @@
     <message>
         <source>Some weapons might do only low damage but they can be a lot more devastating in the right situation. Try to use the Desert Eagle to knock multiple hedgehogs into the water.</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Niektóre z broni zadają mało punktów obrażeń jednak użyte w odpowiednim momencie mogą pokazać pazur. Na przykład spróbuj użyć pistoletu by strącić swoich przeciwników do wody.</translation>
+        <translation>Niektóre z broni zadają mało punktów obrażeń jednak użyte w odpowiednim momencie mogą pokazać pazur. Na przykład spróbuj użyć pistoletu by strącić swoich przeciwników do wody.</translation>
     </message>
     <message>
         <source>If you&apos;re unsure what to do and don&apos;t want to waste ammo, skip one round. But don&apos;t let too much time pass as there will be Sudden Death!</source>
@@ -580,17 +580,17 @@
     <message>
         <source>From time to time there will be official tournaments. Upcoming events will be announced at http://www.hedgewars.org/ some days in advance.</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Od czasu do czasu będą organizowane mistrzostwa. Będą one ogłaszane z wyprzedzeniem na http://www.hedgewars.org/ .</translation>
+        <translation>Od czasu do czasu będą organizowane mistrzostwa. Będą one ogłaszane z wyprzedzeniem na http://www.hedgewars.org/ .</translation>
     </message>
     <message>
         <source>Hedgewars is available in many languages. If the translation in your language seems to be missing or outdated, feel free to contact us!</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Hedgewars jest dostępne w wielu językach. Jeśli brakuje tłumaczenia w twoim języku bądź jest ono niekompletne, nie bój się z nami skontaktować!</translation>
+        <translation>Hedgewars jest dostępne w wielu językach. Jeśli brakuje tłumaczenia w twoim języku bądź jest ono niekompletne, nie bój się z nami skontaktować!</translation>
     </message>
     <message>
         <source>Hedgewars can be run on lots of different operating systems including Microsoft Windows, Mac OS X and Linux.</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Hedgewars może być uruchomione na różnych systemach operacyjnych takich jak Microsoft Windows, MacOS X, FreeBSD oraz Linux.</translation>
+        <translation>Hedgewars może być uruchomione na różnych systemach operacyjnych takich jak Microsoft Windows, MacOS X, FreeBSD oraz Linux.</translation>
     </message>
     <message>
         <source>Always remember you&apos;re able to set up your own games in local and network/online play. You&apos;re not restricted to the &apos;Simple Game&apos; option.</source>
@@ -625,7 +625,7 @@
     <message>
         <source>Especially while playing online be polite and always remember there might be some minors playing with or against you as well!</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Bądź kulturalny grając przez internet. Pamiętaj o tym, że w Hedgewars mogą grać także młodsze osoby!</translation>
+        <translation>Bądź kulturalny grając przez internet. Pamiętaj o tym, że w Hedgewars mogą grać także młodsze osoby!</translation>
     </message>
     <message>
         <source>Special game modes such as &apos;Vampirism&apos; or &apos;Karma&apos; allow you to develop completely new tactics. Try them in a custom game!</source>
@@ -665,7 +665,7 @@
     <message>
         <source>Connect one or more gamepads before starting the game to be able to assign their controls to your teams.</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Jeśli podłączysz jeden lub więcej gamepadów przed włączeniem gry będziesz miał możliwość przypisania klawiszy by sterować swoimi jeżami.</translation>
+        <translation>Jeśli podłączysz jeden lub więcej gamepadów przed włączeniem gry będziesz miał możliwość przypisania klawiszy by sterować swoimi jeżami.</translation>
     </message>
     <message>
         <source>Create an account on %1 to keep others from using your most favourite nickname while playing on the official server.</source>
@@ -780,12 +780,12 @@
     <message>
         <source>You&apos;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.</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Możesz powiązać typy plików związane z Hedgewars (zapisy gier i dema) by móc je uruchamiać bezpośrednio z ulubionego menedżera plików bądź przeglądarki internetowej.</translation>
+        <translation>Możesz powiązać typy plików związane z Hedgewars (zapisy gier i dema) by móc je uruchamiać bezpośrednio z ulubionego menedżera plików bądź przeglądarki internetowej.</translation>
     </message>
     <message>
         <source>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don&apos;t touch the ground you&apos;ll reuse your rope without wasting ammo!</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Chcesz zaoszczędzić liny? Odłącz ją będąc w powietrzu, a potem wypuść ją ponownie. Dopóki nie dotkniesz ziemi, będziesz używał pojedynczego naboju!</translation>
+        <translation>Chcesz zaoszczędzić liny? Odłącz ją będąc w powietrzu, a potem wypuść ją ponownie. Dopóki nie dotkniesz ziemi, będziesz używał pojedynczego naboju!</translation>
     </message>
     <message>
         <source>You can find your Hedgewars configuration files under &quot;Library/Application Support/Hedgewars&quot; in your home directory. Create backups or take the files with you, but don&apos;t edit them by hand.</source>
@@ -800,21 +800,21 @@
     <message>
         <source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Wersja Hedgewars dla systemu Windows wspiera XFire. Upewnij się, że dodałeś Hedgewars do listy gier by Twoi znajomi mogli zobaczyć Ciebie w czasie gry.</translation>
+        <translation>Wersja Hedgewars dla systemu Windows wspiera XFire. Upewnij się, że dodałeś Hedgewars do listy gier by Twoi znajomi mogli zobaczyć Ciebie w czasie gry.</translation>
     </message>
     <message>
         <source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Użyj koktajlu Mołotowa lub Miotacza ognia by powstrzymać przeciwnika przed przedostaniem się przez tunele lub platformy.</translation>
+        <translation>Użyj koktajlu Mołotowa lub Miotacza ognia by powstrzymać przeciwnika przed przedostaniem się przez tunele lub platformy.</translation>
     </message>
     <message>
         <source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
         <comment>Tips</comment>
-        <translation type="unfinished">Pszczoła potrafi być ciężka w użyciu. Jej promień skrętu zależy od prędkości lotu, więc nie staraj się nie używać pełnej mocy podczas strzału.</translation>
+        <translation>Pszczoła potrafi być ciężka w użyciu. Jej promień skrętu zależy od prędkości lotu, więc nie staraj się nie używać pełnej mocy podczas strzału.</translation>
     </message>
     <message>
         <source>Downloadable Content</source>
-        <translation type="unfinished">Dodatki do pobrania</translation>
+        <translation>Dodatki do pobrania</translation>
     </message>
 </context>
 <context>
@@ -1208,7 +1208,7 @@
     </message>
     <message>
         <source>Add an indestructible border along the bottom</source>
-        <translation type="unfinished">Dodaje na dole niezniszczalną ramkę</translation>
+        <translation>>Dodaje niezniszczalną ramkę u dołu mapy</translation>
     </message>
 </context>
 <context>
@@ -1447,67 +1447,67 @@
     </message>
     <message>
         <source>Disabled</source>
-        <translation type="unfinished">Wyłączone</translation>
+        <translation>Wyłączone</translation>
     </message>
     <message>
         <source>Red/Cyan</source>
-        <translation type="unfinished">Czerwone/Błękitne</translation>
+        <translation>Czerwone/Błękitne</translation>
     </message>
     <message>
         <source>Cyan/Red</source>
-        <translation type="unfinished">Błękitne/Czerwone</translation>
+        <translation>Błękitne/Czerwone</translation>
     </message>
     <message>
         <source>Red/Blue</source>
-        <translation type="unfinished">Czerwone/Niebieskie</translation>
+        <translation>Czerwone/Niebieskie</translation>
     </message>
     <message>
         <source>Blue/Red</source>
-        <translation type="unfinished">Niebieskie/Czerwone</translation>
+        <translation>Niebieskie/Czerwone</translation>
     </message>
     <message>
         <source>Red/Green</source>
-        <translation type="unfinished">Czerwone/Zielone</translation>
+        <translation>Czerwone/Zielone</translation>
     </message>
     <message>
         <source>Green/Red</source>
-        <translation type="unfinished">Zielone/Czerwone</translation>
+        <translation>Zielone/Czerwone</translation>
     </message>
     <message>
         <source>Side-by-side</source>
-        <translation type="unfinished">Obok siebie</translation>
+        <translation>Obok siebie</translation>
     </message>
     <message>
         <source>Top-Bottom</source>
-        <translation type="unfinished">Góra-dół</translation>
+        <translation>Góra-dół</translation>
     </message>
     <message>
         <source>Wiggle</source>
-        <translation type="unfinished">Trzęsący się obraz</translation>
+        <translation>Trzęsący się obraz</translation>
     </message>
     <message>
         <source>Red/Cyan grayscale</source>
-        <translation type="unfinished">Czer/Błęk w odc. szar</translation>
+        <translation>Czer/Błęk w odc. szar</translation>
     </message>
     <message>
         <source>Cyan/Red grayscale</source>
-        <translation type="unfinished">Błęk/Czer w odc. szar</translation>
+        <translation>Błęk/Czer w odc. szar</translation>
     </message>
     <message>
         <source>Red/Blue grayscale</source>
-        <translation type="unfinished">Czer/Nieb w odc. szar</translation>
+        <translation>Czer/Nieb w odc. szar</translation>
     </message>
     <message>
         <source>Blue/Red grayscale</source>
-        <translation type="unfinished">Nieb/Czer w odc. szar</translation>
+        <translation>Nieb/Czer w odc. szar</translation>
     </message>
     <message>
         <source>Red/Green grayscale</source>
-        <translation type="unfinished">Czer/Ziel w odc. szar</translation>
+        <translation>Czer/Ziel w odc. szar</translation>
     </message>
     <message>
         <source>Green/Red grayscale</source>
-        <translation type="unfinished">Ziel/Czer w odc. szar</translation>
+        <translation>Ziel/Czer w odc. szar</translation>
     </message>
 </context>
 <context>
@@ -1757,27 +1757,27 @@
     </message>
     <message>
         <source>Stereo rendering</source>
-        <translation type="unfinished">Wyświetlanie w 3D</translation>
+        <translation>Wyświetlanie w 3D</translation>
     </message>
     <message>
         <source>Game Options</source>
-        <translation type="unfinished">Opcje</translation>
+        <translation>Opcje</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Tryb gry</translation>
+        <translation>Tryb gry</translation>
     </message>
     <message>
         <source>Scheme</source>
-        <translation type="unfinished">Schemat</translation>
+        <translation>Schemat</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Hasło</translation>
+        <translation>Hasło</translation>
     </message>
     <message>
         <source>% Get Away Time</source>
-        <translation type="unfinished">Czas na ucieczkę w %</translation>
+        <translation>Czas na ucieczkę w %</translation>
     </message>
 </context>
 <context>
@@ -1788,7 +1788,7 @@
     </message>
     <message>
         <source>hedgehog %1</source>
-        <translation type="unfinished"></translation>
+        <translation>jeż %1</translation>
     </message>
 </context>
 <context>
@@ -2148,11 +2148,11 @@
     </message>
     <message>
         <source>Tag Team</source>
-        <translation type="unfinished">Zespół</translation>
+        <translation>Zespół</translation>
     </message>
     <message>
         <source>Add Bottom Border</source>
-        <translation type="unfinished">Ddoaj ramkę na dole</translation>
+        <translation>Dodaj ramkę na dole</translation>
     </message>
 </context>
 <context>
--- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts	Sat Sep 17 16:20:09 2011 +0400
@@ -125,11 +125,11 @@
     </message>
     <message>
         <source>Demo name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome do demo</translation>
     </message>
     <message>
         <source>Demo name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome do demo:</translation>
     </message>
 </context>
 <context>
@@ -398,11 +398,11 @@
     </message>
     <message>
         <source>Drawn Maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Mapas Desenhados</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos os ficheiros</translation>
     </message>
 </context>
 <context>
@@ -752,7 +752,8 @@
     </message>
     <message>
         <source>Downloadable Content</source>
-        <translation type="unfinished"></translation>
+        <translation>Conteúdo Transferível
+Downloadable Content</translation>
     </message>
 </context>
 <context>
@@ -1010,8 +1011,8 @@
     <message numerus="yes">
         <source>%1 players online</source>
         <translation>
+            <numerusform>%1 jogador online</numerusform>
             <numerusform>%1 jogadores online</numerusform>
-            <numerusform>%1 jogador online</numerusform>
         </translation>
     </message>
 </context>
@@ -1030,10 +1031,6 @@
         <translation>O terreno não pode ser destruído!</translation>
     </message>
     <message>
-        <source>Add an indestructable border around the terrain</source>
-        <translation type="obsolete">Adiciona uma borda indestrutível à volta do terreno</translation>
-    </message>
-    <message>
         <source>Lower gravity</source>
         <translation>Baixa gravidade</translation>
     </message>
@@ -1139,11 +1136,11 @@
     </message>
     <message>
         <source>Add an indestructible border around the terrain</source>
-        <translation>Adiciona uma borda indestrutível à volta do terreno</translation>
+        <translation>Adiciona uma barreira indestrutível à volta do terreno</translation>
     </message>
     <message>
         <source>Add an indestructible border along the bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Adiciona uma barreira indestrutível ao longo do fundo do terreno</translation>
     </message>
 </context>
 <context>
@@ -1671,7 +1668,7 @@
     </message>
     <message>
         <source>hedgehog %1</source>
-        <translation type="unfinished"></translation>
+        <translation>ouriço %1</translation>
     </message>
 </context>
 <context>
@@ -2031,7 +2028,7 @@
     </message>
     <message>
         <source>Add Bottom Border</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar borda inferior</translation>
     </message>
 </context>
 <context>
--- a/share/hedgewars/Data/Locale/hedgewars_sv.ts	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts	Sat Sep 17 16:20:09 2011 +0400
@@ -16,15 +16,15 @@
     <name>DrawMapWidget</name>
     <message>
         <source>File error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fel på fil</translation>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writing</source>
-        <translation type="unfinished"></translation>
+        <translation>Kan inte skriva till &apos;%1&apos;</translation>
     </message>
     <message>
         <source>Cannot read file &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Kan inte läsa &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
@@ -125,11 +125,11 @@
     </message>
     <message>
         <source>Demo name</source>
-        <translation type="unfinished"></translation>
+        <translation>Demonamn</translation>
     </message>
     <message>
         <source>Demo name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Demonamn:</translation>
     </message>
 </context>
 <context>
@@ -215,7 +215,7 @@
     </message>
     <message>
         <source>Set</source>
-        <translation type="unfinished">Ange</translation>
+        <translation>Ange</translation>
     </message>
 </context>
 <context>
@@ -297,14 +297,17 @@
     </message>
     <message>
         <source>Nickname</source>
-        <translation type="unfinished">Smeknamn</translation>
+        <translation>Smeknamn</translation>
     </message>
     <message>
         <source>Some one already uses
  your nickname %1
 on the server.
 Please pick another nickname:</source>
-        <translation type="unfinished"></translation>
+        <translation>Någon använder redan
+ditt smeknamn %1
+på servern.
+Välj ett annat smeknamn:</translation>
     </message>
 </context>
 <context>
@@ -361,7 +364,7 @@
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">Avbryt</translation>
+        <translation>Avbryt</translation>
     </message>
 </context>
 <context>
@@ -396,11 +399,11 @@
     </message>
     <message>
         <source>Drawn Maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Ritade kartor</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Alla filer</translation>
     </message>
 </context>
 <context>
@@ -765,21 +768,21 @@
     <message>
         <source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Windows-versionen av Hedgewars har stöd för Xfire. Se till att lägga till Hedgewars till spellistan så att dina vänner kan se dig spela.</translation>
     </message>
     <message>
         <source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Använd molotov eller eldkastaren för att temporärt förhindra att igelkottar passerar terräng så som tunnlar eller platformar.</translation>
     </message>
     <message>
         <source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Målsökande bin kan vara kluriga att använda. Svängradien beror på hastigheten, så försök att inte använda full kraft.</translation>
     </message>
     <message>
         <source>Downloadable Content</source>
-        <translation type="unfinished"></translation>
+        <translation>Nedladdningsbart innehåll</translation>
     </message>
 </context>
 <context>
@@ -808,15 +811,15 @@
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Fel</translation>
+        <translation>Fel</translation>
     </message>
     <message>
         <source>Please enter room name</source>
-        <translation type="unfinished">Skriv in rummets namn</translation>
+        <translation>Skriv in rummets namn</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished">OK</translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
@@ -1036,8 +1039,8 @@
     </message>
     <message numerus="yes">
         <source>%1 players online</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1 spelare inne</numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
@@ -1162,7 +1165,7 @@
     </message>
     <message>
         <source>Teams in each clan take successive turns sharing their turn time.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lag inom en klan spelar efter varandra och delar på turtiden.</translation>
     </message>
     <message>
         <source>Add an indestructible border around the terrain</source>
@@ -1170,7 +1173,7 @@
     </message>
     <message>
         <source>Add an indestructible border along the bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Lägg till en oförstörbar barriär längs botten</translation>
     </message>
 </context>
 <context>
@@ -1267,7 +1270,7 @@
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Uppdatera</translation>
+        <translation>Uppdatera</translation>
     </message>
 </context>
 <context>
@@ -1409,67 +1412,67 @@
     </message>
     <message>
         <source>Disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Avaktiverad</translation>
     </message>
     <message>
         <source>Red/Cyan</source>
-        <translation type="unfinished"></translation>
+        <translation>Röd/Cyan</translation>
     </message>
     <message>
         <source>Cyan/Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Cyan/Röd</translation>
     </message>
     <message>
         <source>Red/Blue</source>
-        <translation type="unfinished"></translation>
+        <translation>Röd/Blå</translation>
     </message>
     <message>
         <source>Blue/Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Blå/Röd</translation>
     </message>
     <message>
         <source>Red/Green</source>
-        <translation type="unfinished"></translation>
+        <translation>Röd/Grön</translation>
     </message>
     <message>
         <source>Green/Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Grön/Röd</translation>
     </message>
     <message>
         <source>Side-by-side</source>
-        <translation type="unfinished"></translation>
+        <translation>Sida vid sida</translation>
     </message>
     <message>
         <source>Top-Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Uppe och nere</translation>
     </message>
     <message>
         <source>Wiggle</source>
-        <translation type="unfinished"></translation>
+        <translation>Vicka</translation>
     </message>
     <message>
         <source>Red/Cyan grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Röd/Cyan gråskala</translation>
     </message>
     <message>
         <source>Cyan/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Cyan/Röd gråskala</translation>
     </message>
     <message>
         <source>Red/Blue grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Röd/Blå gråskala</translation>
     </message>
     <message>
         <source>Blue/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Blå/Röd gråskala</translation>
     </message>
     <message>
         <source>Red/Green grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Röd/Grön gråskala</translation>
     </message>
     <message>
         <source>Green/Red grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Grön/Röd gråskala</translation>
     </message>
 </context>
 <context>
@@ -1709,27 +1712,27 @@
     </message>
     <message>
         <source>Stereo rendering</source>
-        <translation type="unfinished"></translation>
+        <translation>Stereorendering</translation>
     </message>
     <message>
         <source>Game Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Spelinställningar</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Stil</translation>
     </message>
     <message>
         <source>Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Schema</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Lösenord</translation>
+        <translation>Lösenord</translation>
     </message>
     <message>
         <source>% Get Away Time</source>
-        <translation type="unfinished"></translation>
+        <translation>% flykttid</translation>
     </message>
 </context>
 <context>
@@ -1740,7 +1743,7 @@
     </message>
     <message>
         <source>hedgehog %1</source>
-        <translation type="unfinished"></translation>
+        <translation>igelkott %1</translation>
     </message>
 </context>
 <context>
@@ -1924,7 +1927,7 @@
     </message>
     <message>
         <source>more</source>
-        <translation type="unfinished"></translation>
+        <translation>mer</translation>
     </message>
 </context>
 <context>
@@ -2100,11 +2103,11 @@
     </message>
     <message>
         <source>Tag Team</source>
-        <translation type="unfinished"></translation>
+        <translation>Maraton</translation>
     </message>
     <message>
         <source>Add Bottom Border</source>
-        <translation type="unfinished"></translation>
+        <translation>Lägg till undre barriär</translation>
     </message>
 </context>
 <context>
--- a/share/hedgewars/Data/Locale/it.lua	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/it.lua	Sat Sep 17 16:20:09 2011 +0400
@@ -2,17 +2,17 @@
 --      ["..."] = "",
 	[":("] = ":(",
 	["!!!"] = "!!!",
---      ["Accuracy Bonus!"] = "",
+--      ["Accuracy Bonus!"] = "Bonus accuratezza",
 --      ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
---      ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
+--      ["a Hedgewars mini-game"] = "Mini gioco Hedgewars", -- Space_Invasion, The_Specialists
 	["Aiming Practice"] = "Pratica la tua mira", --Bazooka, Shotgun, SniperRifle
---      ["Ammo"] = "",
---      ["Ammo Depleted!"] = "",
+--      ["Ammo"] = "Munizioni",
+--      ["Ammo Depleted!"] = "Munizioni scarse!",
 --      ["ammo extended!"] = "",
 --      ["Ammo is reset at the end of your turn."] = "",
---      ["Ammo Maniac!"] = "",
---      ["Available points remaining: "] = "",
---      ["[Backspace]"] = "",
+--      ["Ammo Maniac!"] = "Maniaco delle munizioni!",
+--      ["Available points remaining: "] = "Punti disponibili rimasti: ",
+--      ["[Backspace]"] = "[Cancella]",
 --      ["Bamboo Thicket"] = "",
 --      ["Barrel Eater!"] = "",
 --      ["Barrel Launcher"] = "",
@@ -20,10 +20,10 @@
 	["Bat your opponents through the|baskets and out of the map!"] = "Manda (colpendoli) i tuoi nemici|in acqua attraverso i canestri laterali!",
 	["Bazooka Training"] = "Addestramento con il Bazooka",
 	["Best laps per team: "] = "Tempo migliore per squadra: ",
---      ["Best Team Times: "] = "",
+--      ["Best Team Times: "] = "Tempi della squadra migliore: ",
 	["Bloody Rookies"] = "Reclute Sanguinose", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
---      ["BOOM!"] = "",
---      ["Boom!"] = "BOOM!",
+--      ["BOOM!"] = "BOOM!",
+--      ["Boom!"] = "Boom!",
 --      ["Boss defeated!"] = "",
 --      ["Boss Slayer!"] = "",
 --      ["Build a track and race."] = "",
--- a/share/hedgewars/Data/Locale/pl.lua	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/pl.lua	Sat Sep 17 16:20:09 2011 +0400
@@ -3,19 +3,19 @@
     ["!!!"] = "!!!",
     ["..."] = "...",
     ["Accuracy Bonus!"] = "Bonus za celność",
---      ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
+    ["Achievement Unlocked"] = "Zdobyłeś Osiągnięcie!", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
     ["a Hedgewars mini-game"] = "Mini gra", -- Space_Invasion, The_Specialists
     ["Aiming Practice"] = "Potrenuj celność",
     ["Ammo"] = "Amunicja",
     ["Ammo Depleted!"] = "Koniec amunicji!",
 --      ["ammo extended!"] = "",
---      ["Ammo is reset at the end of your turn."] = "",
+    ["Ammo is reset at the end of your turn."] = "Amunicja jest resetowana przy końcu tury.",
     ["Ammo Maniac!"] = "Nabojowy Maniak!",
     ["Available points remaining: "] = "Pozostały następujące punkty: ",
 --      ["[Backspace]"] = "",
 --      ["Bamboo Thicket"] = "",
---      ["Barrel Eater!"] = "",
---      ["Barrel Launcher"] = "",
+    ["Barrel Eater!"] = "Pożeracz Beczek!",
+    ["Barrel Launcher"] = "Wyrzutnia Beczek",
     ["Bat balls at your enemies and|push them into the sea!"] = "Uderzaj piłkami w swoich przeciwników|i strącaj ich do wody!",
     ["Bat your opponents through the|baskets and out of the map!"] = "Uderzaj swoich przekiwników|wyrzucając przez kosz, poza mapę!",
     ["Bazooka Training"] = "Trening bazooki",
@@ -26,10 +26,10 @@
     ["BOOM!"] = "BUM!",
     ["Boss defeated!"] = "Boss pokonany!",
     ["Boss Slayer!"] = "Pogromca bossów",
---      ["Build a track and race."] = "",
+    ["Build a track and race."] = "Zbuduj trasię i ścigaj się.",
     ["CAPTURE THE FLAG"] = "PRZECHWYĆ FLAGĘ",
     ["Careless"] = "Nieostrożny",
---      ["Change Weapon"] = "",
+    ["Change Weapon"] = "Zmień broń",
     ["Clumsy"] = "Fajtłapa",
     ["Codename: Teamwork"] = "Kryptonim: Praca zespołowa",
     ["Complete the track as fast as you can!"] = "Ukończ trasę tak szybko jak tylko potrafisz!",
@@ -41,10 +41,10 @@
     ["DAMMIT, ROOKIE!"] = "Żółtodziobie!",
     ["Dangerous Ducklings"] = "Niebezpieczne Kaczory",
 --      ["Deadweight"] = "",
---      ["Demolition is fun!"] = "",
+    ["Demolition is fun!"] = "Rozwałka jest fajna!",
 --      ["Depleted Kamikaze!"] = "",
     ["Destroy invaders to score points."] = "Zabijaj najeźdźców by zdobyć punkty.",
---      ["Double Kill!"] = "",
+    ["Double Kill!"] = "Podwójna śmierć!",
     ["Drone Hunter!"] = "Łowca dronów",
 --      ["Drowner"] = "",
     ["Each turn you get 1-3 random weapons"] = "Z każdą turą dostaniesz 1-3 bronie",
@@ -53,11 +53,11 @@
     ["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Zniszcz wszystkie cele zanim upłynie czas.|W tej misji masz nieskończoną ilość amunicji.", 
     ["Eliminate Poison before the time runs out"] = "Zabij Truciciela zanim skończy się czas",
     ["Eliminate the Blue Team"] = "Zniszcz niebieską drużynę",
---      ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
---      ["Eliminate the enemy hogs to win."] = "",
-    ["Eliminate the enemy specialists."] = "Weliminuj specjalistów wroga.",
+    ["Eliminate the enemy before the time runs out"] = "Wyeliminuj przeciwnika przed upłynięciem czasu.", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+    ["Eliminate the enemy hogs to win."] = "Wybij jeże przeciwnika by wygrać.",
+    ["Eliminate the enemy specialists."] = "Zabij specjalistów wroga.",
     ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Rozwal Jednostkę 3378 |- Twoja drużyna musi przetrwać",
---      ["Energetic Engineer"] = "",
+    ["Energetic Engineer"] = "Energetyczny Inżynier",
     ["Enjoy the swim..."] = "Popływaj trochę...",
     ["[Enter]"] = "[Enter]",
     ["Fastest lap: "] = "Najszybsze okrążenie: ",
@@ -69,7 +69,7 @@
     ["Flags, and their home base will be placed where each team ends their first turn."] = "Flagi i baza zostaną umieszzcone tam gdzie zespół zakończy swą pierwszą turę.",
 --      ["Flamer"] = "",
 --      ["Friendly Fire!"] = "",
---      ["fuel extended!"] = "",
+    ["fuel extended!"] = "zdobyto paliwo",
     ["GAME BEGUN!!!"] = "GRA ROZPOCZĘTA!!!",
     ["Game Modifiers: "] = "Modyfikatory: ",
     ["GAME OVER!"] = "KONIEC GRY!",
@@ -79,15 +79,15 @@
     ["GO! GO! GO!"] = "RUCHY! RUCHY! RUCHY!",
     ["Good birdy......"] = "Dooobry ptaszek...",
     ["Good luck out there!"] = "Powodzenia!",
---      ["Good so far!"] = "",
---      ["Good to go!"] = "",
+    ["Good so far!"] = "Jak dotąd idzie dobrze!",
+    ["Good to go!"] = "Gotowi do akcji!",
     ["GOTCHA!"] = "MAM CIĘ!",
---      ["Grab Mines/Explosives"] = "",
+    ["Grab Mines/Explosives"] = "Chwyć miny/beczki",
     ["Hahahaha!"] = "Hahahaha!",
     ["Haha, now THAT would be something!"] = "Haha, to było by COŚ",
     [" Hapless Hogs left!"] = " Nieszczęsne Jeże pozostały",
     ["Hapless Hogs"] = "Nieszczęsne Jeże",
---      ["Health crates extend your time."] = "",
+    ["Health crates extend your time."] = "Apteczki dodają czas.",
 --      ["Heavy"] = "",
     ["Hedgewars-Basketball"] = "Hedgewars-Koszykówka",
     ["Hedgewars-Knockball"] = "Hedgewars-Knockball",
@@ -101,15 +101,15 @@
     ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "Jak to dobrze, że Nagła Śmierć jest dopiero za 99 tur...",
     ["Jumping is disabled"] = "Skakanie jest niemożliwe",
 --      ["Kamikaze Expert!"] = "",
---      ["Keep it up!"] = "",
---      ["Killing spree!"] = "",
+    ["Keep it up!"] = "Tak trzymaj!",
+    ["Killing spree!"] = "Masakra!",
     ["KILLS"] = "Zabicia",
---      ["Last Target!"] = "",
+    ["Last Target!"] = "Ostatni cel!",
     ["[Left Shift]"] = "[Lewy Shift]",
     ["Listen up, maggot!!"] = "Słuchaj mnie, gnido!",
---      ["Lively Lifeguard"] = "",
+    ["Lively Lifeguard"] = "Ratownik!",
 --      ["Mine Deployer"] = "",
---      ["Mine Eater!"] = "",
+    ["Mine Eater!"] = "Pożeracz min!",
     ["|- Mines Time:"] = "|- Czas detonacji min:",
     ["MISSION FAILED"] = "MISJA ZAKOŃCZONA NIEPOWODZENIEM", 
     ["MISSION SUCCESSFUL"] = "MISJA POWIODŁA SIĘ",  
@@ -117,13 +117,13 @@
     ["Movement: [Up], [Down], [Left], [Right]"] = "Poruszanie się: [Góra], [Dół], [Lewo], [Prawo]",
     ["Multi-shot!"] = "Wielokrotny strzał",
     ["Nameless Heroes"] = "Bezimienni Bohaterowie",
---      ["New Barrels Per Turn"] = "",
+    ["New Barrels Per Turn"] = "Ilość beczek dodanych co turę",
     ["NEW CLAN RECORD: "] = "NOWY REKORD ZESPOŁU: ",
     ["NEW fastest lap: "] = "NOWE najszybsze okrążenie: ",
---      ["New Mines Per Turn"] = "",
+    ["New Mines Per Turn"] = "Ilość min dodanych co turę",
     ["NEW RACE RECORD: "] = "NOWY REKORD WYŚCIGU: ",
---      ["Newton's Hammock"] = "",
-    ["NOT ENOUGH WAYPOINTS"] = "BRAK PUNKTÓW ORIENTACYJNYCH",
+    ["Newton's Hammock"] = "Hamak Newtona",
+    ["NOT ENOUGH WAYPOINTS"] = "ZA MAŁO PUNKTÓW KONTROLNYCH",
     ["Not So Friendly Match"] = "Mecz Nie-Do-Końca Towarzyski",  
     ["Oh no! Just try again!"] = "Ojojoj! Spróbuj jeszcze raz!", 
     ["Oh no! Time's up! Just try again."] = "Ajajaj! Koniec czasu! Spróbuj jeszcze raz.",  
@@ -133,25 +133,25 @@
 --      ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
     ["Per-Hog Ammo"] = "Oddzielna amunicja dla jeży",
     ["Place more waypoints using [ENTER]"] = "Postaw więcej punktów orientacyjnych za pomocą [Entera]",
---      ["Place more waypoints using the 'Air Attack' weapon."] = "",
+    ["Place more waypoints using the 'Air Attack' weapon."] = "Postaw więcej punktów orientacyjnych używając [Nalotu]",
     ["points"] = "punkty", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
     ["Poison"] = "Truciciel",
     ["Power Remaining"] = "pkt. energii pozostało",
---      ["Prepare yourself"] = "",
+    ["Prepare yourself"] = "Przygotuj się",
     ["Press [Precise] to skip intro"] = "Naciśnij [Precyzyjne celowanie] by pominąć intro",
---      ["Race complexity limit reached."] = "",
---      ["RACER"] = "",
+    ["Race complexity limit reached."] = "Osiągnięto limit złożoności trasy.",
+    ["RACER"] = "WYŚCIG",
     [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Przynieś flagę wroga do swojej bazy by zdobyć punkt | - Pierwszy kto zrobi to 3 razy, wygrywa | - Punkt zdobywasz tylko gdy twoja flaga znajduje się w bazie | - Jeże upuszczą flagę gdy zostaną zabite bądź utopione | - Upuszczona flaga może być przywrócona lub przechwycona ponownie | - Jeże odradzają się po śmierci",
---      ["Round Limit:"] = "",
+    ["Round Limit:"] = "Ilość rund:",
     ["Round Limit"] = "Ilość rund",
---      ["Rounds Complete: "] = "",
+    ["Rounds Complete: "] = "Ukończono rund: ",
     ["Rounds Complete"] = "Koniec",
     ["RULES OF THE GAME [Press ESC to view]"] = "ZASADY GRY [Naciśnij ESC by zobaczyć]",        
     ["Save as many hapless hogs as possible!"] = "Uratuj jak najwięcej nieszczęsnych jeży",
     ["SCORE"] = "PUNKTY",
     ["sec"] = "sek",
     ["See ya!"] = "Do zobaczenia!",
---      ["selected!"] = "",
+    ["selected!"] = "wybrany!",
     ["Shield boosted! +30 power"] = "Osłona ulepszona: +30 energii",
     ["Shield Depleted"] = "Straciłeś Osłonę",
     ["Shield is fully recharged!"] = "Osłona całkowicie naładowana",
@@ -162,7 +162,7 @@
     ["Shield Seeker!"] = "Zdobywca osłon!",
     ["Shotgun Team"] = "Strzelcy",
     ["Shotgun Training"] = "Trening strzelecki",
---      ["shots remaining."] = "",
+    ["shots remaining."] = "strzałów pozostało.",
     ["Silly"] = "Głuptas",
 --      ["Sinky"] = "",
     ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s utonął i drużyna %d|dostała punkt karny!| |Punktacja:", 
@@ -187,29 +187,29 @@
 --      ["This rain is really something..."] = "",
     ["TIME: "] = "CZAS: ",
 --      ["Timed Kamikaze!"] = "",
-    ["Time Extended!"] = "Dodatkowy Czas!",
---      ["Time Extension"] = "",
+    ["Time Extended!"] = "Więcej Czasu!",
+    ["Time Extension"] = "Dodatkowy Czas!",
     ["Toggle Shield"] = "Wł/Wył Osłonę",
     ["Toxic Team"] = "Toksyczny zespół", 
     ["TRACK COMPLETED"] = "UKOŃCZONO TRASĘ",
---      ["TRACK FAILED!"] = "",
+    ["TRACK FAILED!"] = "TRASA NIEUKOŃCZONA!",
     ["TrophyRace"] = "TrophyRace",
     ["T_T"] = "T_T",
 --      ["Tumbling Time Extended!"] = "",
     ["Turn Time"] = "Długość Tury",
---      ["Unit"] = "",
+    ["Unit"] = "Jednostka",
     ["Unit 3378"] = "Jednostka 3378",
---      ["Unit 835"] = "",
+    ["Unit 835"] = "Jednostka 835",
 --      ["Unlimited Attacks"] = "",
---      ["Unstoppable!"] = "",
+    ["Unstoppable!"] = "Nie do zatrzymania!",
 --      ["User Challenge"] = "",
     ["Use your rope to get from start to finish as fast as you can!"] = "Użyj liny by jak najszybciej dotrzec od startu do mety",
     ["Victory for the "] = "Zwycięstwo przypadło",
-    ["Waypoint placed."] = "Postawiono punkt orientacyjny",
---      ["Way-Points Remaining"] = "",
+    ["Waypoint placed."] = "Postawiono punkt kontrolny",
+    ["Way-Points Remaining"] = "Pozostało punktów: ",
     ["Weapons Reset"] = "Bronie odnawiają się",
---      ["Well done."] = "",
---      ["Will this ever end?"] = "",
+    ["Well done."] = "Dobra robota",
+    ["Will this ever end?"] = "Co to się kiedyś skończy?",
     ["WINNING TIME: "] = "ZWYCIĘSKI CZAS: ",
     ["You'd almost swear the water was rising!"] = "Przysiągłbym, że woda zdaje się podnosić!",
     ["You have SCORED!!"] = "Zdobyłeś PUNKT",
--- a/share/hedgewars/Data/Locale/pt_PT.lua	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/pt_PT.lua	Sat Sep 17 16:20:09 2011 +0400
@@ -2,17 +2,17 @@
 	[":("] = ":(",
 	["!!!"] = "!!!",
 	["..."] = "...",
---      ["Accuracy Bonus!"] = "",
---      ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
+	["Accuracy Bonus!"] = "Bónus de precisão!",
+--      ["Achievement Unlocked"] = "Desbloqueado", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
 	["a Hedgewars mini-game"] = "um mini-jogo Hedgewars", -- Space_Invasion, The_Specialists
 	["Aiming Practice"] = "Pratica a tua pontaria", --Bazooka, Shotgun, SniperRifle
 --      ["Ammo Depleted!"] = "",
 --      ["ammo extended!"] = "",
 --      ["Ammo is reset at the end of your turn."] = "",
 --      ["Ammo Maniac!"] = "",
-      ["Ammo"] = "Munições",
+	["Ammo"] = "Munições",
 --      ["Available points remaining: "] = "",
---      ["[Backspace]"] = "",
+	["[Backspace]"] = "[Retrocesso (backspace)]",
 --      ["Bamboo Thicket"] = "",
 --      ["Barrel Eater!"] = "",
 --      ["Barrel Launcher"] = "",
@@ -28,15 +28,15 @@
 --      ["Boss Slayer!"] = "",
 --      ["Build a track and race."] = "",
 	["CAPTURE THE FLAG"] = "CAPTURAR A BANDEIRA",
-      ["Careless"] = "Descuidado",
---      ["Change Weapon"] = "",
+	["Careless"] = "Descuidado",
+	["Change Weapon"] = "Trocar Arma",
 --      ["Clumsy"] = "",
 --      ["Codename: Teamwork"] = "",
 	["Complete the track as fast as you can!"] = "Completa a pista o mais rápido que conseguires!",
 	["Congratulations!"] = "Parabéns!",
 	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Parabéns! Eliminaste todos os alvos|dentro do tempo limite.", --Bazooka, Shotgun, SniperRifle
 --      ["Control pillars to score points."] = "",
---      ["Cybernetic Empire"] = "",
+	["Cybernetic Empire"] = "Império Cibernético",
 --      ["DAMMIT, ROOKIE!"] = "",
 --      ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "",
 	["Dangerous Ducklings"] = "Patinhos perigosos",
@@ -54,8 +54,8 @@
 	["Eliminate Poison before the time runs out"] = "Elimina o Poison antes do tempo terminar.",
 	["Eliminate the Blue Team"] = "Elimina a equipa azul",
 --      ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
---      ["Eliminate the enemy hogs to win."] = "",
---      ["Eliminate the enemy specialists."] = "",
+--      ["Eliminate the enemy hogs to win."] = "Elimina os ouriços inimigos para ganhar.",
+--      ["Eliminate the enemy specialists."] = "Elimina os especialistas inimigos.",
 --      ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "",
 --      ["Energetic Engineer"] = "",
 	["Enjoy the swim..."] = "Aproveita o mergulho",
@@ -71,13 +71,13 @@
 --      ["Friendly Fire!"] = "",
 --      ["fuel extended!"] = "",
 --      ["GAME BEGUN!!!"] = "",
---      ["Game Modifiers: "] = "",
---      ["GAME OVER!"] = "",
+	["Game Modifiers: "] = "Modificadores de Jogo: ",
+	["GAME OVER!"] = "GAME OVER!",
 --      ["Game Started!"] = "",
-      ["Get on over there and take him out!"] = "Chega-te aqui e acaba com ele!",
+	["Get on over there and take him out!"] = "Chega-te aqui e acaba com ele!",
 --      ["Goal"] = "",
 	["GO! GO! GO!"] = "GO! GO! GO!",
-	["Good birdy......"] = "Bom passarito......",
+--  ["Good birdy......"] = "Lindo\Bom passarito......" (needs ingame confirmation),
 	["Good luck out there!"] = "Boa sorte aí fora!",
 --      ["Good so far!"] = "",
 --      ["Good to go!"] = "",
@@ -97,11 +97,11 @@
 	["Hooray!"] = "Hurra!",
 	["Hunter"] = "Comando", --Bazooka, Shotgun, SniperRifle
 	["Instructor"] = "Instrutor", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings
---      ["invaders destroyed"] = "",
+	["invaders destroyed"] = "invasores destruidos",
 --      ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
 --      ["Jumping is disabled"] = "",
 	["Kamikaze Expert!"] = "Kamikaze profissional!",
---      ["Keep it up!"] = "",
+--      ["Keep it up!"] = "Continua assim!",
 --      ["Killing spree!"] = "",
 --      ["KILLS"] = "",
 --      ["Last Target!"] = "",
@@ -126,7 +126,7 @@
 --      ["NOT ENOUGH WAYPOINTS"] = "",
 	["Not So Friendly Match"] = "Partida não muito amigável", -- Basketball, Knockball
 	["Oh no! Just try again!"] = "Oh não! Tenta novamente!", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-	["Oh no! Time's up! Just try again."] = "Oh não! Acabou o tempo! Tenta novamente.", --Bazooka, Shotgun, SniperRifle
+	["Oh no! Time's up! Just try again."] = "Oh não! Terminou o tempo! Tenta novamente.", --Bazooka, Shotgun, SniperRifle
 	["Operation Diver"] = "Operação Mergulho",
 	["Opposing Team: "] = "Equipa adversária",
 	["Pathetic Hog #%d"] = "Ouriço patético #%d",
@@ -136,8 +136,8 @@
 --      ["Place more waypoints using the 'Air Attack' weapon."] = "",
 --      ["points"] = "", -- Control, Space_Invasion
 	["Poison"] = "Poison",
---      ["Power Remaining"] = "",
---      ["Prepare yourself"] = "",
+	["Power Remaining"] = "Energia Restante",
+	["Prepare yourself"] = "Prepara-te!",
 --      ["Press [Precise] to skip intro"] = "",
 --      ["Race complexity limit reached."] = "",
 --      ["RACER"] = "",
@@ -147,14 +147,13 @@
 --      ["Rounds Complete: "] = "",
 --      ["Rounds Complete"] = "",
 	["RULES OF THE GAME [Press ESC to view]"] = "REGRAS DE JOGO [Pressiona ESC para as visualizar]",
-	["RULES OF THE GAME [Press ESC to view]"] = "REGRAS DE JOGO [Pressiona ESC para as visualizar]",
 --      ["s|"] = "",
 --      ["Save as many hapless hogs as possible!"] = "",
---      ["SCORE"] = "",
+	["SCORE"] = "RESULTADOS",
 	["sec"] = "seg", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
 	["See ya!"] = "Chau!",
---      ["selected!"] = "",
---      ["Shield boosted! +30 power"] = "",
+	["selected!"] = "seleccionado!",
+--      ["Shield boosted! +30 power"] = "Escudo melhorado! +30 energia (-unconfirmed)",
 	["Shield Depleted"] = "Escudo Esgotado",
 	["Shield is fully recharged!"] = "Escudo completamente recarregado!",
 --      ["Shield Master!"] = "",
@@ -164,7 +163,7 @@
 --      ["Shield Seeker!"] = "",
 	["Shotgun Team"] = "Caçadores",
 	["Shotgun Training"] = "Treino com Caçadeira",
---      ["shots remaining."] = "",
+--      ["shots remaining."] = "tiros restantes.",
 --      ["Silly"] = "",
 --      ["Sinky"] = "",
 	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a equipa %d|perde um ponto!| |Pontuação:", -- Basketball, Knockball
@@ -183,17 +182,17 @@
 	["The enemy is hiding out on yonder ducky!"] = "O inimigo está escondido ali a diante ao pé do patinho!",
 	["The flag will respawn next round."] = "A bandeira ira reaparecer no próximo turno.",
 --      ["The Nameless One"] = "",
---      ["THE SPECIALISTS"] = "",
+	["THE SPECIALISTS"] = "OS ESPECIALISTAS",
 --      ["This one's tricky."] = "",
 --      ["This rain is really something..."] = "",
 --      ["Timed Kamikaze!"] = "",
 --      ["Time Extended!"] = "",
 --      ["Time Extension"] = "",
-      ["TIME: "] = "TEMPO: ",
+	["TIME: "] = "TEMPO: ",
 --      ["Toggle Shield"] = "",
 --      ["Toxic Team"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
---      ["TRACK COMPLETED"] = "",
---      ["TRACK FAILED!"] = "",
+--      ["TRACK COMPLETED"] = "PISTA COMPLETA",
+--      ["TRACK FAILED!"] = "PISTA",
 	["TrophyRace"] = "TrophyRace",
 	["T_T"] = "T_T",
 --      ["Tumbling Time Extended!"] = "",
@@ -210,7 +209,7 @@
 --      ["Waypoint placed."] = "",
 --      ["Way-Points Remaining"] = "",
 --      ["Weapons Reset"] = "",
---      ["Well done."] = "",
+	["Well done."] = "Bom trabalho.",
 --      ["Will this ever end?"] = "",
 --      ["WINNING TIME: "] = "",
 --      ["You'd almost swear the water was rising!"] = "",
--- a/share/hedgewars/Data/Locale/pt_PT.txt	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/pt_PT.txt	Sat Sep 17 16:20:09 2011 +0400
@@ -53,7 +53,7 @@
 00:50=Ataque Perfurador
 00:51=Bola de Lama
 00:52=Nenhuma arma selecionada
-00:53=TARDIS
+00:53=Caixote do Tempo
 00:54=Estrutura
 00:55=Terreno-instantâneo
 
@@ -235,12 +235,12 @@
 02:02=Luta com honra
 02:02=Não desistas
 02:02=Nunca te rendas
-02:02=Rebenta-os e empilha-os
+02:02=Rebenta e empilha!
 02:02=Que comece a festa explosiva!
 02:02=Espero que estejas pronto para a rixa!
 02:02=Vai vai vai!
 02:02=Os ouriços avançam!
-02:02=Vai haver tiros e bombas e socos nas trombas!
+02:02=Vai haver tiros, bombas e socos nas trombas!
 02:02=Não temas!
 02:02=Sê corajoso e conquista
 
@@ -253,12 +253,12 @@
 ; New health crate
 02:05=Auxílio iminente!
 02:05=Médico!
-02:05=Primeiros-socorros atirados dos céus!
+02:05=Kit de primeiros-socorros, largado do céu!
 02:05=Um pacote de vida para ti
 02:05=Energia... em forma de caixa!
 02:05=O doutor chama
 02:05=Ligaduras frescas!
-02:05=Isto irá fazer-te sentir melhor
+02:05=Isto vai-te fazer sentir melhor
 02:05=Um Hi-Potion! Ups, jogo errado
 02:05=Um "agarra-me já"!
 02:05=Agarra-o
@@ -448,6 +448,7 @@
 03:52=UNUSED
 03:53=Modelo 40
 03:54=Constroi qualquer coisa
+03:55=Utilitário
 
 ; Weapon Descriptions (use | as line breaks)
 04:00=Ataca os teus inimigos usando uma simples granada.|Explodirá quando o tempo chegar a zero.|1-5: Define o temporizador da granada|Ataque: Deixa premido para lançar com mais força
@@ -500,6 +501,12 @@
 04:47=Duplica a diversão com estas duas minas autocolantes!|Utiliza-as para atacar ou defender. É contigo!|Ataque: Deixa pressionado para disparar mais longe
 04:48=Porque é que têm as toupeiras de ser sempre as vitimas?|Dar marteladas em ouriços pode ser igualmente divertido!|Uma boa martelada rapidamente remove um terço da vida|de um ouriço e ainda o enterra no solo!|Ataque: Activar
 04:49=Ressuscita os teus amigos!|Mas cuidado, esta tecnica ressuscita também os teus enimigos.|Ataque: Deixa pressionado para ressuscitar lentamente|Up: Acelerar a ressureição
+04:50=Está alguém escondido num túnel subterrâneo?|Escava-os de lá para fora com um Ataque Perfurador!|O temporizador controla quão longe os misseis irão escavar.
+04:51=Empurra um ouriço sem perder o turno|criando uma bola de lama tu mesmo!
+04:52=UNUSED
+04:53=Parte numa aventura pelo tempo e espaço,|deixando os teus colegas para se defenderem sozinhos.|Está preparado para regressar a qualquer altura,|para Morte Súbita ou se todos forem derrotados.|Atenção: Não funciona em Morte Súbita,|se estiveres sozinho, ou se fores o Rei.
+04:54=INCOMPLETO
+04:55=Aplica estas particulas de terreno em spray onde quiseres.|Constroi pontes, enterra inimigos ou fecha túneis.|Tem apenas cuidado, não o uses em ti proprio!
 
 ; Game goal strings
 05:00=Modos de Jogo
--- a/share/hedgewars/Data/Locale/sk.lua	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/sk.lua	Sat Sep 17 16:20:09 2011 +0400
@@ -1,219 +1,175 @@
 locale = {
         [":("] = ":(",
         ["!!!"] = "!!!",
---      ["..."] = "",
+        ["..."] = "...",
         ["Accuracy Bonus!"] = "Bonus za presnosť!",
---      ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
         ["a Hedgewars mini-game"] = "minihra Hedgewars", -- Space_Invasion, The_Specialists
 	["Aiming Practice"] = "Tréning presnosti", --Bazooka, Shotgun, SniperRifle
-        ["Ammo Depleted!"] = "Výzbroj vyčerpaná!",
---      ["ammo extended!"] = "",
---      ["Ammo is reset at the end of your turn."] = "",
---      ["Ammo Maniac!"] = "",
-        ["Ammo"] = "Výzbroj",
-        ["Available points remaining: "] = "Zostavajúci počet bodov: ",
---      ["[Backspace]"] = "",
---      ["Bamboo Thicket"] = "",
---      ["Barrel Eater!"] = "",
---      ["Barrel Launcher"] = "",
+        ["Ammo"] = "Munícia",
+        ["Ammo Depleted!"] = "Munícia vyčerpaná!",
+        ["Ammo Maniac!"] = "Muničný maniak!",
+        ["Available points remaining: "] = "Zostávajúci počet bodov: ",
 	["Bat balls at your enemies and|push them into the sea!"] = "Loptami triafajte vašich nepriateľov|a zhoďte ich tak do mora!",
-	["Bat your opponents through the|baskets and out of the map!"] = "Odpálkujte vašich súperov do koša|a von z mapy!",
+	["Bat your opponents through the|baskets and out of the map!"] = "Odpálkujte vašich súperov cez kôš|von z mapy!",
 	["Bazooka Training"] = "Tréning s bazukou",
 	["Best laps per team: "] = "Najrýchlejšie kolá podľa tímov: ",
-        ["Best Team Times: "] = "Najrýchlejšie tímové časy: ",
+        ["Best Team Times: "] = "Najlepšie tímové časy: ",
         ["Bloody Rookies"] = "Mizerní zelenáči", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
-        ["Boom!"] = "Bum!",
         ["BOOM!"] = "BUM!",
---      ["Boss defeated!"] = "",
---      ["Boss Slayer!"] = "",
---      ["Build a track and race."] = "",
+        ["Boom!"] = "Bum!",
+        ["Boss defeated!"] = "Vodca bol porazený!",
+        ["Boss Slayer!"] = "Vodca zabitý!",
         ["CAPTURE THE FLAG"] = "ZMOCNITE SA VLAJKY",
-        ["Careless"] = "Bezstarostný",
---      ["Change Weapon"] = "",
+        ["Careless"] = "Neopatrný",
         ["Clumsy"] = "Nešikovný",
-        ["Codename: Teamwork"] = "Kódové meno: Teamová práca",
---      ["Complete the track as fast as you can!"] = "",
+        ["Codename: Teamwork"] = "Krycie meno: Tímová práca",
+        ["Complete the track as fast as you can!"] = "Dokončite trasu tak rýchlo, ako len viete! ",
         ["Congratulations!"] = "Gratulujem!",
 	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Gratulujem! Zneškodnili ste všetky ciele|v stanovenom čase.", --Bazooka, Shotgun, SniperRifle
-        ["Control pillars to score points."] = "Ovládnite piliere, aby ste skórovali",
+        ["Control pillars to score points."] = "Obsaďte piliere, aby ste skórovali",
         ["Cybernetic Empire"] = "Kybertnetické impérium",
         ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "Do kelu s tebou, zelenáč! Okamžite mi zlez z hlavy!",
         ["DAMMIT, ROOKIE!"] = "Prekliaty zelenáč!",
         ["Dangerous Ducklings"] = "Nebezpečné kačiatka",
---      ["Deadweight"] = "",
---      ["Demolition is fun!"] = "",
---      ["Depleted Kamikaze!"] = "",
---      ["Destroy invaders to score points."] = "",
---      ["Double Kill!"] = "",
---      ["Drone Hunter!"] = "",
---      ["Drowner"] = "",
---      ["Each turn you get 1-3 random weapons"] = "",
---      ["Each turn you get one random weapon"] = "",
+        ["Deadweight"] = "Mŕtva váha",
+        ["Depleted Kamikaze!"] = "Vyčerpaný samovrah!",
+        ["Destroy invaders to score points."] = "Zničte votrelcov a získajte tak body.",
+        ["Drone Hunter!"] = "Lovec včeliakov!",
+        ["Drowner"] = "Utopenec",
+        ["Each turn you get 1-3 random weapons"] = "Každé kolo získate 1-3 náhodných zbraní",
+        ["Each turn you get one random weapon"] = "Každé kolo získate jednu náhodnú zbraň",
         ["Eliminate all enemies"] = "Zneškodnite všetkých nepriateľov",
 	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Zneškodnite všetky ciele pred vypršaním času.|Na túto misiu máte neobmedzené množstvo streliva.", --Bazooka, Shotgun, SniperRifle
         ["Eliminate Poison before the time runs out"] = "Zneškodnite Poisona pred tým, ako vyprší čas",
         ["Eliminate the Blue Team"] = "Zneškodnite modrý tím",
---      ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
---      ["Eliminate the enemy hogs to win."] = "",
---      ["Eliminate the enemy specialists."] = "",
+        ["Eliminate the enemy specialists."] = "Zneškodnite nepriateľských špecialistov.",
         ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Zneškodnite Jednotku 3378|- Slabý odpor musí prežiť",
---      ["Energetic Engineer"] = "",
         ["Enjoy the swim..."] = "Užite si plávanie...",
---      ["[Enter]"] = "",
+        ["[Enter]"] = "[Enter]",
 	["Fastest lap: "] = "Najrýchlejšie kolo: ",
         ["Feeble Resistance"] = "Slabý odpor",
---      ["Fire"] = "",
+        ["Fire"] = "Oheň",
         ["Flag captured!"] = "Získaná vlajka!",
         ["Flag respawned!"] = "Vlajka obnovená!",
         ["Flag returned!"] = "Vlajka vrátená!",
---      ["Flags, and their home base will be placed where each team ends their first turn."] = "",
---      ["Flamer"] = "",
---      ["Friendly Fire!"] = "",
---      ["fuel extended!"] = "",
---      ["GAME BEGUN!!!"] = "",
---      ["Game Modifiers: "] = "",
+        ["Flags, and their home base will be placed where each team ends their first turn."] = "Vlajky a domovské základne budú umiestnené tam, kde každý tím skončí svoj prvý ťah.",
+        ["GAME BEGUN!!!"] = "HRA ZAČALA!!!",
+        ["Game Modifiers: "] = "Modifikátory hry: ",
         ["GAME OVER!"] = "KONIEC HRY!",
         ["Game Started!"] = "Hra začala!",
-        ["Get on over there and take him out!"] = "Okamžite poď sem a dostaň ho!",
---      ["Goal"] = "",
-        ["GO! GO! GO!"] = "POĎ! POĎ! POĎ!",
+        ["Get on over there and take him out!"] = "Okamžite sa tam presuň a zneškodni ho!",
+        ["Goal"] = "Cieľ",
+        ["GO! GO! GO!"] = "POHYB! POHYB! POHYB!",
         ["Good birdy......"] = "Dobrý vtáčik......",
         ["Good luck out there!"] = "Veľa šťastia!",
---      ["Good so far!"] = "",
---      ["Good to go!"] = "",
---      ["GOTCHA!"] = "",
---      ["Grab Mines/Explosives"] = "",
---      ["Hahahaha!"] = "",
---      ["Haha, now THAT would be something!"] = "",
---      ["Hapless Hogs"] = "",
---      [" Hapless Hogs left!"] = "",
---      ["Health crates extend your time."] = "",
---      ["Heavy"] = "",
+        ["GOTCHA!"] = "A MÁM ŤA!",
+        ["Hahahaha!"] = "Hehehehe!",
+        ["Haha, now THAT would be something!"] = "Haha, tak TOTO bude niečo!",
+        ["Hapless Hogs"] = "Nešťastný ježko",
+        [" Hapless Hogs left!"] = " Nešťastný ježko odišiel!",
+        ["Heavy"] = "Ťažký",
 	["Hedgewars-Basketball"] = "Hedgewars-Basketbal",
-	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
---      ["Heh, it's not that bad."] = "",
---      ["Hit Combo!"] = "",
+	["Hedgewars-Knockball"] = "Hedgewars-Vybíjaná",
+        ["Heh, it's not that bad."] = "Heh, to nie je také zlé.",
+        ["Hit Combo!"] = "Opakovaný zásah!",
         ["Hmmm..."] = "Hmm..",
         ["Hooray!"] = "Hurá!",
 	["Hunter"] = "Lovec", --Bazooka, Shotgun, SniperRifle
         ["Instructor"] = "Inštruktor", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings
---      ["invaders destroyed"] = "",
---      ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
---      ["Jumping is disabled"] = "",
---      ["Kamikaze Expert!"] = "",
---      ["Keep it up!"] = "",
---      ["Killing spree!"] = "",
---      ["KILLS"] = "",
---      ["Last Target!"] = "",
---      ["[Left Shift]"] = "",
+        ["invaders destroyed"] = "votrelci zničení",
+        ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "Je dobré, že NÁHLA SMRŤ je tu až za 99 ťahov...",
+        ["Jumping is disabled"] = "Skákanie je vypnuté",
+        ["Kamikaze Expert!"] = "Expert na samovraždy!",
+        ["KILLS"] = "ZABITÍ:",
+        ["[Left Shift]"] = "[Ľavý Shift]",
         ["Listen up, maggot!!"] = "Počúvaj, ty biedny červ!",
---      ["Lively Lifeguard"] = "",
---      ["Mine Deployer"] = "",
---      ["Mine Eater!"] = "",
         ["|- Mines Time:"] = "|- Časovač pre míny:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
         ["MISSION FAILED"] = "MISIA NEÚSPEŠNÁ", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
---      ["MISSION SUCCESS"] = "",
+        ["MISSION SUCCESS"] = "MISIA ÚSPEŠNÁ",
         ["MISSION SUCCESSFUL"] = "MISIA ÚSPEŠNÁ", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
         ["Movement: [Up], [Down], [Left], [Right]"] = "Pohyb: [Hore], [Dole], [Vľavo], [Vpravo]",
---      ["Multi-shot!"] = "",
---      ["Nameless Heroes"] = "",
---      ["New Barrels Per Turn"] = "",
---      ["NEW CLAN RECORD: "] = "",
+        ["Multi-shot!"] = "Opakovaná rana!",
+        ["Nameless Heroes"] = "Hrdinovia bez mena",
+        ["NEW CLAN RECORD: "] = "NOVÝ KLANOVÝ REKORD: ",
 	["NEW fastest lap: "] = "NOVÉ najrýchlejšie kolo: ",
---      ["New Mines Per Turn"] = "",
---      ["NEW RACE RECORD: "] = "",
---      ["Newton's Hammock"] = "",
---      ["NOT ENOUGH WAYPOINTS"] = "",
+        ["NEW RACE RECORD: "] = "NOVÝ TRAŤOVÝ REKORD: ",
+        ["NOT ENOUGH WAYPOINTS"] = "NEDOSTATOK NAVIGAČNÝCH BODOV",
 	["Not So Friendly Match"] = "Nie tak celkom priateľský zápas", -- Basketball, Knockball
         ["Oh no! Just try again!"] = "Áále nie! Tak to skúste znovu!", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
 	["Oh no! Time's up! Just try again."] = "Áále nie! Čas vypršal! Tak to skúste znovu.", --Bazooka, Shotgun, SniperRifle
         ["Operation Diver"] = "Operácia Potápač",
-        ["Opposing Team: "] = "Nepriateľský tím",
+        ["Opposing Team: "] = "Nepriateľský tím: ",
         ["Pathetic Hog #%d"] = "Žalostný ježko #%d",
---      ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
---      ["Per-Hog Ammo"] = "",
---      ["Place more waypoints using [ENTER]"] = "",
---      ["Place more waypoints using the 'Air Attack' weapon."] = "",
+        ["Per-Hog Ammo"] = "Samostatná munícia pre ježkov",
+        ["Place more waypoints using [ENTER]"] = "Umiesnite viac bodov pomocou [ENTER]u",
         ["points"] = "body", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
         ["Poison"] = "Poison",
---      ["Power Remaining"] = "",
---      ["Prepare yourself"] = "",
---      ["Press [Precise] to skip intro"] = "",
---      ["Race complexity limit reached."] = "",
---      ["RACER"] = "",
-        [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Skórujete prinesením nepriateľskej vlajky do vašej základne | -  Prvý tím, ktorý dosiahne 3 body, vyhráva | - Skórujete len vtedy, keď je máte svoju vlajku v základni | - Spadnuté vlajky môžu byť vrátené na základňu alebo sa ich môže zmocniť súpere | - Ježkovia po smrti ožiujú",
---      ["Round Limit:"] = "",
---      ["Round Limit"] = "",
---      ["Rounds Complete: "] = "",
---      ["Rounds Complete"] = "",
+        ["Power Remaining"] = "Zostáva energie",
+        ["Press [Precise] to skip intro"] = "Stlačte [Presnejšie mierenie] pre preskočenie intra",
+        ["Race complexity limit reached."] = "Dosiahnutý limit zložitosti pretekov.",
+        [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Skórujete prinesením nepriateľskej vlajky do vašej základne | -  Prvý tím, ktorý dosiahne 3 body, vyhráva | - Skórujete len vtedy, keď je máte svoju vlajku v základni | - Spadnuté vlajky môžu byť vrátené na základňu alebo sa ich môže zmocniť súper | - Ježkovia po smrti ožijú",
+        ["Round Limit"] = "Limit kôl",
+        ["Rounds Complete"] = "Dokončených kôl",
         ["RULES OF THE GAME [Press ESC to view]"] = "PRAVIDLÁ HRY [Stlačte Esc pre ich zobrazenie]",
---      ["s|"] = "",
---      ["Save as many hapless hogs as possible!"] = "",
---      ["SCORE"] = "",
+        ["s|"] = "s|",
+        ["Save as many hapless hogs as possible!"] = "Zachráňte toľko nešťastných ježkov, koľko len môžete!",
+        ["SCORE"] = "SKÓRE",
         ["sec"] = "sek", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
         ["See ya!"] = "Tak zatiaľ!",
---      ["selected!"] = "",
---      ["s"] = "", -- GaudyRacer, Space_Invasion
---      ["Shield boosted! +30 power"] = "",
---      ["Shield Depleted"] = "",
---      ["Shield is fully recharged!"] = "",
---      ["Shield Master!"] = "",
---      ["Shield Miser!"] = "",
---      ["Shield OFF:"] = "",
---      ["Shield ON:"] = "",
---      ["Shield Seeker!"] = "",
-	["Shotgun Team"] = "Shotgun tím",
+        ["s"] = "s", -- GaudyRacer, Space_Invasion
+        ["Shield boosted! +30 power"] = "Štít posilnený! Energia +30",
+        ["Shield Depleted"] = "Štít vyčerpaný",
+        ["Shield is fully recharged!"] = "Štít je plne nabitý!",
+        ["Shield Master!"] = "Štítový odborník",
+        ["Shield Miser!"] = "Štítový žgrloš",
+        ["Shield OFF:"] = "Štít VYPNUTÝ:",
+        ["Shield ON:"] = "Štít ZAPNUTÝ:",
+        ["Shield Seeker!"] = "Hľadač štítov!",
+	["Shotgun Team"] = "Tím s brokovnicou",
 	["Shotgun Training"] = "Tréning s brokovnicou",
---      ["shots remaining."] = "",
---      ["Silly"] = "",
---      ["Sinky"] = "",
+        ["Shots Left: "] = "Zostáva striel: ", -- GaudyRacer, Tumbler
+        ["Silly"] = "Hlúpy",
+        ["Sinky"] = "Prepadnutý",
 	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s je mimo hru a tím %d|dostal trestný bod!| |Skóre:", -- Basketball, Knockball
 	["%s is out and Team %d|scored a point!| |Score:"] = "%s je mimo hru a tím %d|získal bod!| |Skóre:", -- Basketball, Knockball
 	["Sniper Training"] = "Tréning pre ostreľovačov",
 	["Sniperz"] = "Ostreľovači",
---      ["Sponge"] = "",
+        ["Sponge"] = "Špongia",
         ["Spooky Tree"] = "Strašidelný strom",
---      ["STATUS UPDATE"] = "", -- GaudyRacer, Space_Invasion
---      ["Switched to "] = "",
+        ["STATUS UPDATE"] = "AKTUALIZÁCIA STAVU", -- GaudyRacer, Space_Invasion
+        ["Switched to "] = "Prepnutý na ",
 	["Team %d: "] = "Tím %d: ",
---      ["Team Scores"] = "", -- Control, Space_Invasion
---      ["That Sinking Feeling"] = "",
+        ["Team Scores"] = "Tímové skóre", -- Control, Space_Invasion
+        ["That Sinking Feeling"] = "Potopené pocity",
         ["That was pointless."] = "To bolo zbytočné.",
         ["The enemy is hiding out on yonder ducky!"] = "Nepriateľ sa schováva na tamtej kačičke!",
         ["The flag will respawn next round."] = "V ďalšom kole sa obnoví vlajka.",
---      ["The Nameless One"] = "",
---      ["THE SPECIALISTS"] = "",
---      ["This one's tricky."] = "",
---      ["This rain is really something..."] = "",
+        ["The Nameless One"] = "Bez mena",
+        ["THE SPECIALISTS"] = "ŠPECIALISTI",
+        ["This rain is really something..."] = "Ten dážď naozaj stojí za to...",
         ["TIME: "] = "ČAS: ",
---      ["Timed Kamikaze!"] = "",
---      ["Time Extended!"] = "",
---      ["Time Extension"] = "",
---      ["Toggle Shield"] = "",
-        ["Toxic Team"] = "Toxic tím", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
---      ["TRACK COMPLETED"] = "",
---      ["TRACK FAILED!"] = "",
+        ["Timed Kamikaze!"] = "Časovaná samovražda!",
+        ["Time Extended!"] = "Predĺžený čas!",
+        ["Time Left: "] = "Zostávajúci čas: ",
+        ["Toggle Shield"] = "Prepnúť štít",
+        ["Toxic Team"] = "Jedovatý tím", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+        ["TRACK COMPLETED"] = "TRASA KOMPLETNÁ",
+        ["Track Time: "] = "Čas na trati: ",
 	["TrophyRace"] = "Preteky o trofej",
         ["T_T"] = "T_T",
---      ["Tumbling Time Extended!"] = "",
         ["Turn Time"] = "Čas na ťah",
---      ["Unit"] = "",
         ["Unit 3378"] = "Jednotka 3378",
---      ["Unit 835"] = "",
         ["Unlimited Attacks"] = "Neobmedzené útoky",
---      ["Unstoppable!"] = "",
---      ["User Challenge"] = "",
+        ["User Challenge"] = "Výzva",
 	["Use your rope to get from start to finish as fast as you can!"] = "Použite lano na presun zo štartovnej pozície do cieľa tak rýchlo, ako to len viete!",
+        ["v.06"] = "v.06",
         ["Victory for the "] = "Víťazstvo pre", -- CTF_Blizzard, Capture_the_Flag
---      ["Waypoint placed."] = "",
---      ["Way-Points Remaining"] = "",
---      ["Weapons Reset"] = "",
---      ["Well done."] = "",
---      ["Will this ever end?"] = "",
---      ["WINNING TIME: "] = "",
---      ["You'd almost swear the water was rising!"] = "",
+        ["Waypoint placed."] = "Navigačný bod umiestnený.",
+        ["Weapons Reset"] = "Zbrane obnovené",
+        ["WINNING TIME: "] = "VÍŤAZNÝ ČAS: ",
+        ["You'd almost swear the water was rising!"] = "Prisahali by ste, že voda stúpala!",
         ["You have SCORED!!"] = "SKÓROVALI ste!!",
---      ["You saved"] = "",
+        ["You saved"] = "Uložili ste",
         ["You've failed. Try again."] = "Neuspeli ste. Skúste to znova.",
 	["You've reached the goal!| |Time: "] = "Dosiahli ste cieľ!| |Čas: ",
 	["'Zooka Team"] = "Bazuka tím",
--- a/share/hedgewars/Data/Locale/sk.txt	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/sk.txt	Sat Sep 17 16:20:09 2011 +0400
@@ -258,7 +258,7 @@
 03:43=Zahrať Beathovenovu smrteľnú sonátu
 03:44=Spotrebujte do: 1923
 03:45=Sila vedy
-03:46=Hot Hot Hot!
+03:46=Páli, páli, páli!
 03:47=Prilepte ich niekam šikovne!
 03:48=A je tu Hammer-time!
 03:49=Je dobrý na to, na čo si myslíte
@@ -267,6 +267,7 @@
 03:52=NEPOUŽÍVANÉ
 03:53=Typ 40
 03:54=Postavte niečo
+03:55=Pomôcka
 
 ; Popis zbraní (ako oddeľovač riadkov použite |)
 04:00=Zaútočte na vašich nepriateľov obyčajným granátom.|Vybuchne vtedy, keď vyprší časomiera.|1‐5: Nastavenie časovača granátu|Útok: Držanie tlačidla zvyšuje silu hodu|
@@ -319,6 +320,12 @@
 04:47=Dvojnásobná radosť s dvoma ostnatými,|prikrádajúcimi sa, lepkavými mínami. Pripravte|reťazovú reakciu alebo sa ochráňte (alebo oboje|naraz!)|Útok: Podržte dlhšie pre vyššiu silu výstrelu|(dvakrát)|
 04:48=Prečo si vylievať svoj hnev len na krtkoch?|Búchanie po ježkoch vie byť rovnako zábavné! Dobrá|rana týmto kladivom vezme ježkovi tretinu jeho|zdravia a zarazí ho do zeme.|Útok: Aktivovanie|
 04:49=Oživte vašich priateľov!|Ale pozor, že táto zbraň oživí aj vašich nepriateľov.|Útok: Pre pomalé oživovanie držte útok stlačený|Hore: Urýchlenie oživovania
+04:50=Skrýva sa pred vami nepriateľ pod zemou? Vykopte|ho pomocou raketovej vŕtačky!|Časovač nastavuje počet sekúnd|do detonácie.
+04:51=Nemíňajte muníciu - hod blatom je zdarma.|Trošku štípe a dokáže ježka zhodiť.
+04:52=NEPOUŽITÉ
+04:53=Vyberte sa na cestu časom a priestorom|a nechajte vašich priateľov bojovať bez vás.|Buďte pripravený vrátiť sa kedykoľvek,|buď pri Náhlej smrti alebo keď sú všetci porazení.|Poznámka: Nefunguje počas Náhlej smrti,|ak ste sám alebo ak ste kráľom.
+04:54=NEKOMPLETNÉ
+04:55=Rozprášte prúd lepkavej hliny.|Postavte mosty, pochovajte nepriateľov,|zapečaťte tunely. Buďte|však opatrný a nezašpinte sa|od nej aj vy.
 
 
 ; Reťazce pre ciele hry
--- a/share/hedgewars/Data/Locale/sv.txt	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Locale/sv.txt	Sat Sep 17 16:20:09 2011 +0400
@@ -50,6 +50,12 @@
 00:47=Fästande mina
 00:48=Hammare
 00:49=Återuppliva
+00:50=Borrangrepp
+00:51=Jordboll
+00:52=Inget vapen valt
+00:53=Tidslåda
+00:54=Struktur
+00:55=Markspruta
 
 01:00=Nu kör vi!
 01:01=Oavgjort
@@ -66,6 +72,12 @@
 01:12=Sista rundan till sudden death!
 01:13=%1 rundor till sudden death!
 01:14=Gör dig redo, %1!
+01:15=Märkbar
+01:16=Låg
+01:17=Normal
+01:18=Hög
+01:19=Extrem
+01:20=%1 studs
 
 ; Event messages
 ; Hog (%1) died
@@ -461,6 +473,12 @@
 03:47=Fäst de här på ett användbart ställe!
 03:48=Dags att banka järnet!
 03:49=Gör det du tror
+03:50=Siktar mot stjärnorna
+03:51=Upphittad på marken
+03:52=UNUSED
+03:53=Typ 40
+03:54=Bygg något
+03:55=Verktyg
 
 ; Weapon Descriptions (use | as line breaks)
 04:00=Attackera fienden med en enkel granat.|Exploderar när tiden når noll.|1-5: Ställ in granatens tid|Attack: Håll ner för att kasta med mer kraft
@@ -513,6 +531,12 @@
 04:47=Det är dubbelt så roligt med två farliga, fantastiska,|fästande minor. Skapa en kedjereaktion eller försvara|dig själv (eller både och!)|Attack: Håll ner för att skjuta med mer kraft (två gånger)
 04:48=Varför ska mullvadarna få all misshandel? Att|drämma till en igelkott kan vara minst lika roligt!|Ett rejält slag med den här hammaren kan skala|av en tredjedel av en igelkotts hälsa och slå ner|dem i marken.|Attack: Aktivera
 04:49=Återuppliva dina vänner!|Men tänk på att du också återupplivar dina fiender.|Attack: Håll inne för att återuppliva långsamt|Upp: Accelerera återupplivning
+04:50=Gömmer sig någon under marken?|Gräv fram dem med ett borrangrepp!|1-5: Ställ in hur långt raketerna borrar.
+04:51=Få till en gratisträff genom att kasta en boll med|jord. Känns lite gran, och knuffar tillbaka|igelkottar.
+04:52=UNUSED
+04:53=Åk på ett äventyr genom tid och rymd, medan dina|kamrater blir kvar själva att slåss. Var beredd|att komma tillbaka när som helst, eller till|Sudden Death eller om de andra blir besegrade.|Varning. Fungerar inte under Sudden Death, om du|är ensam, eller om du är en kung.
+04:54=INCOMPLETE                                                                                                                                     
+04:55=Spruta en ström av fästande jord.|Bygg broar, gräv ner fienden, stäng igen tunnlar.|Var försiktig så att du inte får något på dig!
 
 ; Game goal strings
 05:00=Spellägen
@@ -536,3 +560,4 @@
 05:18=Obegränsade attacker
 05:19=Vapen nollställs när turen är över
 05:20=Igelkottar delar inte på vapnen
+05:21=Maraton: Lag i en klan tar på vart andra följande turer|Delad tid: Lag inom en klan delar på turtiden
--- a/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua	Thu Sep 15 20:40:59 2011 +0400
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua	Sat Sep 17 16:20:09 2011 +0400
@@ -496,6 +496,9 @@
 		if TestRectForObstacle(x-20, y-20, x+20, y+20, true) then
 			AddCaption(loc("Please place the way-point in the open, within the map boundaries."))
 			PlaySound(sndDenied)
+		elseif (y > WaterLine-50) then
+			AddCaption(loc("Please place the way-point further from the waterline."))
+			PlaySound(sndDenied)
 		else
 			PlaceWayPoint(x, y)
 			if wpCount == wpLimit then