merge…
authorTobias Neumann <mail@tobias-neumann.eu>
Sat, 30 Oct 2010 20:04:38 +0200
changeset 4022 6042256178a8
parent 4021 014325c23705 (diff)
parent 3993 a53a9f748bb8 (current diff)
child 4023 8de77872ef21
merge…
--- a/.hgtags	Sat Oct 23 17:26:22 2010 +0200
+++ b/.hgtags	Sat Oct 30 20:04:38 2010 +0200
@@ -22,4 +22,3 @@
 0000000000000000000000000000000000000000 Hedgewars-iOS-1.0.1
 3620607258cdc1213dce20cb6ad7872f6b8085e0 Hedgewars-iOS-1.0.1
 adffb668f06e265b45d1e4aedc283e6f4e5ba7e8 Hedgewars-iOS-1.1
-82e4a5ef18f7f9516bfe2162995928fe16fe8d71 list
--- a/QTfrontend/ammoSchemeModel.cpp	Sat Oct 23 17:26:22 2010 +0200
+++ b/QTfrontend/ammoSchemeModel.cpp	Sat Oct 30 20:04:38 2010 +0200
@@ -39,7 +39,7 @@
         << QVariant(false)         // king           13
         << QVariant(false)         // place hog      14
         << QVariant(false)         // shared ammo    15
-        << QVariant(false)         //disable girders 16
+        << QVariant(false)         // disable girders 16
         << QVariant(false)         // disable land objects 17
         << QVariant(false)         // AI survival    18
         << QVariant(false)         // inf. attack    19
@@ -50,8 +50,8 @@
         << QVariant(100)           // init health    24
         << QVariant(15)            // sudden death   25
         << QVariant(5)             // case prob      26
-        << QVariant(3)             //  mines time    27
-        << QVariant(4)             //  landadds      28
+        << QVariant(3)             // mines time     27
+        << QVariant(4)             // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(2)             // explosives     30
         ;
@@ -101,7 +101,7 @@
         << "suddendeath"      // 25
         << "caseprobability"  // 26
         << "minestime"        // 27
-        << "landadds"         // 28
+        << "minesnum"         // 28
         << "minedudpct"       // 29
         << "explosives"       // 30
         ;
@@ -124,7 +124,7 @@
         << QVariant(false)         // king           13
         << QVariant(false)         // place hog      14
         << QVariant(true)          // shared ammo    15
-        << QVariant(false)         //disable girders 16
+        << QVariant(false)         // disable girders 16
         << QVariant(false)         // disable land objects 17
         << QVariant(false)         // AI survival    18
         << QVariant(false)         // inf. attack    19
@@ -135,8 +135,8 @@
         << QVariant(100)           // init health    24
         << QVariant(15)            // sudden death   25
         << QVariant(0)             // case prob      26
-        << QVariant(3)             //  mines time    27
-        << QVariant(4)             //  landadds      28
+        << QVariant(3)             // mines time     27
+        << QVariant(4)             // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(2)             // explosives     30
         ;
@@ -159,7 +159,7 @@
         << QVariant(false)         // king           13
         << QVariant(false)         // place hog      14
         << QVariant(true)          // shared ammo    15
-        << QVariant(true)          //disable girders 16
+        << QVariant(true)          // disable girders 16
         << QVariant(false)         // disable land objects 17
         << QVariant(false)         // AI survival    18
         << QVariant(false)         // inf. attack    19
@@ -170,8 +170,8 @@
         << QVariant(100)           // init health    24
         << QVariant(50)            // sudden death   25
         << QVariant(1)             // case prob      26
-        << QVariant(3)             //  mines time    27
-        << QVariant(4)             //  landadds      28
+        << QVariant(3)             // mines time     27
+        << QVariant(4)             // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(0)             // explosives     30
         ;
@@ -194,7 +194,7 @@
         << QVariant(false)         // king           13
         << QVariant(false)         // place hog      14
         << QVariant(true)          // shared ammo    15
-        << QVariant(true)          //disable girders 16
+        << QVariant(true)          // disable girders 16
         << QVariant(false)         // disable land objects 17
         << QVariant(false)         // AI survival    18
         << QVariant(false)         // inf. attack    19
@@ -205,8 +205,8 @@
         << QVariant(100)           // init health    24
         << QVariant(15)            // sudden death   25
         << QVariant(0)             // case prob      26
-        << QVariant(3)             //  mines time    27
-        << QVariant(4)             //  landadds      28
+        << QVariant(3)             // mines time     27
+        << QVariant(4)             // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(0)             // explosives     30
         ;
@@ -229,7 +229,7 @@
         << QVariant(false)         // king           13
         << QVariant(false)         // place hog      14
         << QVariant(true)          // shared ammo    15
-        << QVariant(true)          //disable girders 16
+        << QVariant(true)          // disable girders 16
         << QVariant(false)         // disable land objects 17
         << QVariant(false)         // AI survival    18
         << QVariant(false)         // inf. attack    19
@@ -240,8 +240,8 @@
         << QVariant(50)            // init health    24
         << QVariant(15)            // sudden death   25
         << QVariant(0)             // case prob      26
-        << QVariant(0)             //  mines time    27
-        << QVariant(80)            //  landadds      28
+        << QVariant(0)             // mines time     27
+        << QVariant(80)            // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(0)             // explosives     30
         ;
@@ -264,7 +264,7 @@
         << QVariant(false)         // king           13
         << QVariant(false)         // place hog      14
         << QVariant(true)          // shared ammo    15
-        << QVariant(false)         //disable girders 16
+        << QVariant(false)         // disable girders 16
         << QVariant(false)         // disable land objects 17
         << QVariant(false)         // AI survival    18
         << QVariant(false)         // inf. attack    19
@@ -276,7 +276,7 @@
         << QVariant(15)            // sudden death   25
         << QVariant(0)             // case prob      26
         << QVariant(0)             // mines time     27
-        << QVariant(0)             // landadds       28
+        << QVariant(0)             // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(80)            // explosives     30
         ;
@@ -299,7 +299,7 @@
         << QVariant(false)         // king           13
         << QVariant(false)         // place hog      14
         << QVariant(true)          // shared ammo    15
-        << QVariant(true)          //disable girders 16
+        << QVariant(true)          // disable girders 16
         << QVariant(true)          // disable land objects 17
         << QVariant(false)         // AI survival    18
         << QVariant(false)         // inf. attack    19
@@ -311,7 +311,7 @@
         << QVariant(15)            // sudden death   25
         << QVariant(5)             // case prob      26
         << QVariant(3)             // mines time     27
-        << QVariant(10)            // landadds       28
+        << QVariant(10)            // mines number   28
         << QVariant(10)            // mine dud pct   29
         << QVariant(10)            // explosives     30
         ;
--- a/QTfrontend/gamecfgwidget.cpp	Sat Oct 23 17:26:22 2010 +0200
+++ b/QTfrontend/gamecfgwidget.cpp	Sat Oct 30 20:04:38 2010 +0200
@@ -101,47 +101,47 @@
     quint32 result = 0;
 
     if (schemeData(1).toBool())
-        result |= 0x01;
+        result |= 0x00001000;       // fort
     if (schemeData(2).toBool())
-        result |= 0x10;
+        result |= 0x00000010;       // divide teams
     if (schemeData(3).toBool())
-        result |= 0x04;
+        result |= 0x00000004;       // solid land
     if (schemeData(4).toBool())
-        result |= 0x08;
+        result |= 0x00000008;       // border
     if (schemeData(5).toBool())
-        result |= 0x20;
+        result |= 0x00000020;       // low gravity
     if (schemeData(6).toBool())
-        result |= 0x40;
+        result |= 0x00000040;       // laser sight
     if (schemeData(7).toBool())
-        result |= 0x80;
+        result |= 0x00000080;       // invulnerable
     if (schemeData(8).toBool())
-        result |= 0x100;
+        result |= 0x00000100;       // mines
     if (schemeData(9).toBool())
-        result |= 0x200;
+        result |= 0x00000200;       // vampirism
     if (schemeData(10).toBool())
-        result |= 0x400;
+        result |= 0x00000400;       // karma
     if (schemeData(11).toBool())
-        result |= 0x800;
+        result |= 0x00000800;       // artillery
     if (schemeData(12).toBool())
-        result |= 0x2000;
+        result |= 0x00002000;       // random
     if (schemeData(13).toBool())
-        result |= 0x4000;
+        result |= 0x00004000;       // king
     if (schemeData(14).toBool())
-        result |= 0x8000;
+        result |= 0x00008000;       // place hogs
     if (schemeData(15).toBool())
-        result |= 0x10000;
+        result |= 0x00010000;       // shared ammo
     if (schemeData(16).toBool())
-        result |= 0x20000;
+        result |= 0x00020000;       // disable girders
     if (schemeData(17).toBool())
-        result |= 0x80000;
+        result |= 0x00040000;       // disable land obj
     if (schemeData(18).toBool())
-        result |= 0x100000;
+        result |= 0x00080000;       // ai survival
     if (schemeData(19).toBool())
-        result |= 0x200000;
+        result |= 0x00100000;       // infinite attacks
     if (schemeData(20).toBool())
-        result |= 0x400000;
+        result |= 0x00200000;       // reset weaps
     if (schemeData(21).toBool())
-        result |= 0x800000;
+        result |= 0x00400000;       // per hog ammo
 
     return result;
 }
@@ -159,7 +159,7 @@
     sl.append(QString("e$damagepct %1").arg(schemeData(22).toInt()));
     sl.append(QString("e$turntime %1").arg(schemeData(23).toInt() * 1000));
     sl.append(QString("e$minestime %1").arg(schemeData(27).toInt() * 1000));
-    sl.append(QString("e$landadds %1").arg(schemeData(28).toInt()));
+    sl.append(QString("e$minesnum %1").arg(schemeData(28).toInt()));
     sl.append(QString("e$sd_turns %1").arg(schemeData(25).toInt()));
     sl.append(QString("e$casefreq %1").arg(schemeData(26).toInt()));
     sl.append(QString("e$minedudpct %1").arg(schemeData(29).toInt()));
--- a/QTfrontend/pages.cpp	Sat Oct 23 17:26:22 2010 +0200
+++ b/QTfrontend/pages.cpp	Sat Oct 30 20:04:38 2010 +0200
@@ -1529,35 +1529,35 @@
 
     TBW_placehog = new ToggleButtonWidget(gbGameModes, ":/res/btnPlaceHog.png");
     TBW_placehog->setToolTip("<b>" + ToggleButtonWidget::tr("Place Hedgehogs") + "</b>:<br />" + tr("Take turns placing your hedgehogs before the start of play."));
-    glGMLayout->addWidget(TBW_placehog,2,2,1,1);
+    glGMLayout->addWidget(TBW_placehog,2,3,1,1);
 
     TBW_sharedammo = new ToggleButtonWidget(gbGameModes, ":/res/btnSharedAmmo.png");
     TBW_sharedammo->setToolTip("<b>" + ToggleButtonWidget::tr("Clan Shares Ammo") + "</b>:<br />" + tr("Ammo is shared between all teams that share a colour."));
-    glGMLayout->addWidget(TBW_sharedammo,2,3,1,1);
+    glGMLayout->addWidget(TBW_sharedammo,2,4,1,1);
 
     TBW_disablegirders = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableGirders.png");
     TBW_disablegirders->setToolTip("<b>" + ToggleButtonWidget::tr("Disable Girders") + "</b>:<br />" + tr("Disable girders when generating random maps."));
-    glGMLayout->addWidget(TBW_disablegirders,2,4,1,1);
+    glGMLayout->addWidget(TBW_disablegirders,3,0,1,1);
 
     TBW_disablelandobjects = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableLandObjects.png");
     TBW_disablelandobjects->setToolTip("<b>" + ToggleButtonWidget::tr("Disable Land Objects") + "</b>:<br />" + tr("Disable land objects when generating random maps."));
-    glGMLayout->addWidget(TBW_disablelandobjects,3,0,1,1);
+    glGMLayout->addWidget(TBW_disablelandobjects,3,1,1,1);
 
     TBW_aisurvival = new ToggleButtonWidget(gbGameModes, ":/res/btnAISurvival.png");
     TBW_aisurvival->setToolTip("<b>" + ToggleButtonWidget::tr("AI Survival Mode") + "</b>:<br />" + tr("AI respawns on death."));
-    glGMLayout->addWidget(TBW_aisurvival,3,1,1,1);
+    glGMLayout->addWidget(TBW_aisurvival,3,2,1,1);
 
     TBW_infattack = new ToggleButtonWidget(gbGameModes, ":/res/btnInfAttack.png");
     TBW_infattack->setToolTip("<b>" + ToggleButtonWidget::tr("Unlimited Attacks") + "</b>:<br />" + tr("Attacking does not end your turn."));
-    glGMLayout->addWidget(TBW_infattack,3,2,1,1);
+    glGMLayout->addWidget(TBW_infattack,3,3,1,1);
 
     TBW_resetweps = new ToggleButtonWidget(gbGameModes, ":/res/btnResetWeps.png");
     TBW_resetweps->setToolTip("<b>" + ToggleButtonWidget::tr("Reset Weapons") + "</b>:<br />" + tr("Weapons are reset to starting values each turn."));
-    glGMLayout->addWidget(TBW_resetweps,3,3,1,1);
+    glGMLayout->addWidget(TBW_resetweps,3,4,1,1);
 
     TBW_perhogammo = new ToggleButtonWidget(gbGameModes, ":/res/btnPerHogAmmo.png");
     TBW_perhogammo->setToolTip("<b>" + ToggleButtonWidget::tr("Per Hedgehog Ammo") + "</b>:<br />" + tr("Each hedgehog has its own ammo. It does not share with the team."));
-    glGMLayout->addWidget(TBW_perhogammo,3,4,1,1);
+    glGMLayout->addWidget(TBW_perhogammo,4,0,1,1);
 
     // Right
     QLabel * l;
@@ -1645,7 +1645,7 @@
     l->setPixmap(QPixmap(":/res/iconTime.png")); // TODO: icon
     glBSLayout->addWidget(l,5,1,1,1);
     SB_MinesTime = new QSpinBox(gbBasicSettings);
-    SB_MinesTime->setRange(-1, 3);
+    SB_MinesTime->setRange(-1, 5);
     SB_MinesTime->setValue(3);
     SB_MinesTime->setSingleStep(1);
     SB_MinesTime->setSpecialValueText(tr("Random"));
--- a/QTfrontend/teamselhelper.cpp	Sat Oct 23 17:26:22 2010 +0200
+++ b/QTfrontend/teamselhelper.cpp	Sat Oct 30 20:04:38 2010 +0200
@@ -75,6 +75,7 @@
 
         phhoger = new CHedgehogerWidget(QImage(":/res/hh25x25.png"), this);
         connect(phhoger, SIGNAL(hedgehogsNumChanged()), this, SLOT(hhNumChanged()));
+        phhoger->setHHNum(team.numHedgehogs);
         mainLayout.addWidget(phhoger);
     } else {
     }
--- a/hedgewars/GSHandlers.inc	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/GSHandlers.inc	Sat Oct 30 20:04:38 2010 +0200
@@ -3051,7 +3051,7 @@
     Gear^.X := HHGear^.X;
     Gear^.Y := HHGear^.Y;
     // For some reason I need to reapply followgear here, something else grabs it otherwise.
-    if not bShowAmmoMenu then FollowGear := HHGear;
+    if not bShowAmmoMenu and not CurrentTeam^.ExtDriven then FollowGear := HHGear;
 
     if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);
 
@@ -4094,32 +4094,36 @@
 begin
     AllInactive := false;
     hh := PHedgehog(Gear^.Hedgehog);
-    RenderHealth(hh^);
     DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy -
             cHHRadius - 14 - hh^.HealthTagTex^.h, hh^.HealthTagTex);
-    DrawCircle(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Radius, 1.5, 0, 0, $FF,
-            $FF);
+    (*DrawCircle(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Radius, 1.5, 0, 0, $FF,
+            $FF);*)
 
     doStepHedgehogMoving(hh^.Gear);
 
-    if ((Gear^.Message and gmUp) <> 0) then begin
+    if ((Gear^.Message and gmUp) <> 0) then 
+        begin
         if (GameTicks and $F) <> 0 then exit;
-    end else begin
-        if (GameTicks and $1FF) <> 0 then exit;
-    end;
+        end 
+    else if (GameTicks and $1FF) <> 0 then exit;
+
 
     graves := GearsNear(hh^.Gear, gtGrave, Gear^.Radius);
 
-    if Length(graves) = 0 then begin
+    if Length(graves) = 0 then 
+        begin
         StopSound(Gear^.SoundChannel);
         Gear^.Timer := 250;
         Gear^.doStep := @doStepIdle;
         exit;
-    end;
+        end;
 
     if ((Gear^.Message and gmAttack) <> 0) and (hh^.Gear^.Health > 0) then begin
         i := getRandom(Length(graves));
         dec(hh^.Gear^.Health);
+        if (hh^.Gear^.Health = 0) and (hh^.Gear^.Damage = 0) then
+            hh^.Gear^.Damage:= 1;
+        RenderHealth(hh^);
         inc(graves[i]^.Health);
 {-for i:= 0 to High(graves) do begin
             if hh^.Gear^.Health > 0 then begin
@@ -4129,7 +4133,7 @@
         end; -}
     end else begin
         // now really resurrect the hogs with the hp saved in the graves
-        for i:= 0 to High(graves) do begin
+        for i:= 0 to High(graves) do
             if graves[i]^.Health > 0 then begin
                 resgear := AddGear(hwRound(graves[i]^.X), hwRound(graves[i]^.Y),
                         gtHedgehog, gstWait, _0, _0, 0);
@@ -4139,12 +4143,16 @@
                 DeleteGear(graves[i]);
                 RenderHealth(PHedgehog(resgear^.Hedgehog)^);
                 RecountTeamHealth(Phedgehog(resgear^.Hedgehog)^.Team);
+                FreeTexture(PHedgehog(resgear^.Hedgehog)^.HatTex);
+                PHedgehog(resgear^.Hedgehog)^.HatTex := Surface2Tex(
+                    LoadImage(Pathz[ptHats] + '/Reserved/Zombie', ifNone),
+                    True);
             end;
-        end;
         StopSound(Gear^.SoundChannel);
         Gear^.Timer := 250;
         Gear^.doStep := @doStepIdle;
     end;
+    //if hh^.Gear^.Health = 0 then doStepHedgehogFree(hh^.Gear);
 end;
 
 procedure doStepResurrector(Gear: PGear);
--- a/hedgewars/GearDrawing.inc	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/GearDrawing.inc	Sat Oct 30 20:04:38 2010 +0200
@@ -281,7 +281,10 @@
                 DrawRotated(sprHandResurrector, hwRound(Gear^.X) + WorldDx,
                         hwRound(Gear^.Y) + WorldDy, 0, 0); 
                 defaultPos := false;
-            end;
+                Tint($33, $33, $FF, max($00, floor($C0 * abs(1 - (GameTicks mod 6000) / 3000))));
+                DrawTexture(sx - 108, sy - 108, SpritesData[sprVampiric].Texture, 4.5);
+                Tint($FF, $FF, $FF, $FF);
+                end;
             gtKamikaze: begin
                 if CurAmmoGear^.Pos = 0 then
                     DrawHedgehog(sx, sy,
@@ -674,7 +677,7 @@
    (CurrentHedgehog^.Gear <> nil) and
    (CurrentHedgehog^.Gear = Gear) then
     begin
-    Tint($FF, $FF, $FF, max($40, floor($FF * abs(1 - (RealTicks mod 1500) / 750))));
+    Tint($FF, 0, 0, max($40, floor($FF * abs(1 - (RealTicks mod 1500) / 750))));
     DrawSprite(sprVampiric, sx - 24, sy - 24, 0);
     end;
     Tint($FF, $FF, $FF, $FF)
@@ -683,122 +686,134 @@
 procedure DrawGears;
 var Gear, HHGear: PGear;
     i: Longword;
-    startX, endX, startY, endY: LongInt;
+    x, y, startX, endX, startY, endY: LongInt;
 begin
 Gear:= GearsList;
 while Gear<>nil do
     begin
+    x:= hwRound(Gear^.X) + WorldDx;
+    y:= hwRound(Gear^.Y) + WorldDy;
     case Gear^.Kind of
-       gtAmmo_Bomb: DrawRotated(sprBomb, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
-       gtGasBomb: DrawRotated(sprCheese, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
-       gtMolotov: DrawRotated(sprMolotov, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
+       gtAmmo_Bomb: DrawRotated(sprBomb, x, y, 0, Gear^.DirAngle);
+       gtGasBomb: DrawRotated(sprCheese, x, y, 0, Gear^.DirAngle);
+       gtMolotov: DrawRotated(sprMolotov, x, y, 0, Gear^.DirAngle);
 
        gtRCPlane: begin
                   if (Gear^.Tag = -1) then
-                     DrawRotated(sprPlane, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, -1,  DxDy2Angle(Gear^.dX, Gear^.dY) + 90)
+                     DrawRotated(sprPlane, x, y, -1,  DxDy2Angle(Gear^.dX, Gear^.dY) + 90)
                   else
-                     DrawRotated(sprPlane, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy,0,DxDy2Angle(Gear^.dY, Gear^.dX));
+                     DrawRotated(sprPlane, x, y,0,DxDy2Angle(Gear^.dY, Gear^.dX));
                   if ((TrainingFlags and tfRCPlane) <> 0) and (TrainingTargetGear <> nil) and ((Gear^.State and gstDrowning) = 0) then
-                     DrawRotatedf(sprFinger, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, GameTicks div 32 mod 16, 0, DxDy2Angle(Gear^.X - TrainingTargetGear^.X, TrainingTargetGear^.Y - Gear^.Y));
+                     DrawRotatedf(sprFinger, x, y, GameTicks div 32 mod 16, 0, DxDy2Angle(Gear^.X - TrainingTargetGear^.X, TrainingTargetGear^.Y - Gear^.Y));
                   end;
-       gtBall: DrawRotatedf(sprBalls, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tag,0, Gear^.DirAngle);
+       gtBall: DrawRotatedf(sprBalls, x, y, Gear^.Tag,0, Gear^.DirAngle);
 
        gtPortal: if ((Gear^.Tag and 1) = 0) // still moving?
                  or (Gear^.IntersectGear = nil) or (Gear^.IntersectGear^.IntersectGear <> Gear) // not linked&backlinked?
                  or ((Gear^.IntersectGear^.Tag and 1) = 0) then // linked portal still moving?
-                      DrawRotatedf(sprPortal, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tag, hwSign(Gear^.dX), Gear^.DirAngle)
-                 else DrawRotatedf(sprPortal, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 4 + Gear^.Tag div 2, hwSign(Gear^.dX), Gear^.DirAngle);
+                      DrawRotatedf(sprPortal, x, y, Gear^.Tag, hwSign(Gear^.dX), Gear^.DirAngle)
+                 else DrawRotatedf(sprPortal, x, y, 4 + Gear^.Tag div 2, hwSign(Gear^.dX), Gear^.DirAngle);
 
-       gtDrill: DrawRotated(sprDrill, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
+       gtDrill: DrawRotated(sprDrill, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
 
         gtHedgehog: DrawHH(Gear);
 
-    gtAmmo_Grenade: DrawRotated(sprGrenade, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
-
-           gtGrave: DrawTextureF(PHedgehog(Gear^.Hedgehog)^.Team^.GraveTex, 1, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, (GameTicks shr 7+Gear^.uid) and 7, 1, 32, 32);
+    gtAmmo_Grenade: DrawRotated(sprGrenade, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
 
-             gtBee: DrawRotatedF(sprBee, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, (GameTicks shr 5) mod 2, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
+           gtGrave: begin 
+                    DrawTextureF(PHedgehog(Gear^.Hedgehog)^.Team^.GraveTex, 1, x, y, (GameTicks shr 7+Gear^.uid) and 7, 1, 32, 32);
+                    if Gear^.Health > 0 then
+                        begin
+                        //Tint($33, $33, $FF, max($40, floor($FF * abs(1 - (GameTicks mod (6000 div Gear^.Health)) / 750))));
+                        Tint($33, $33, $FF, max($40, floor($FF * abs(1 - (GameTicks mod 1500) / (750 + Gear^.Health)))));
+                        //Tint($FF, $FF, $FF, max($40, floor($FF * abs(1 - (RealTicks mod 1500) / 750))));
+                        DrawSprite(sprVampiric, x - 24, y - 24, 0);
+                        Tint($FF, $FF, $FF, $FF)
+                        end
+                    end;
 
-      gtPickHammer: DrawSprite(sprPHammer, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 50 + LongInt(((GameTicks shr 5) and 1) * 2) + WorldDy, 0);
+             gtBee: DrawRotatedF(sprBee, x, y, (GameTicks shr 5) mod 2, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
+
+      gtPickHammer: DrawSprite(sprPHammer, x - 16, y - 50 + LongInt(((GameTicks shr 5) and 1) * 2), 0);
             gtRope: DrawRope(Gear);
             gtMine: if (((Gear^.State and gstAttacking) = 0)or((Gear^.Timer and $3FF) < 420)) and (Gear^.Health <> 0) then
-                           DrawRotated(sprMineOff, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle)
-                       else if Gear^.Health <> 0 then DrawRotated(sprMineOn, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle)
-                       else DrawRotated(sprMineDead, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
+                           DrawRotated(sprMineOff, x, y, 0, Gear^.DirAngle)
+                       else if Gear^.Health <> 0 then DrawRotated(sprMineOn, x, y, 0, Gear^.DirAngle)
+                       else DrawRotated(sprMineDead, x, y, 0, Gear^.DirAngle);
            gtSMine: if (((Gear^.State and gstAttacking) = 0)or((Gear^.Timer and $3FF) < 420)) and (Gear^.Health <> 0) then
-                           DrawRotated(sprSMineOff, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle)
-                       else if Gear^.Health <> 0 then DrawRotated(sprSMineOn, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle)
-                       else DrawRotated(sprMineDead, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
+                           DrawRotated(sprSMineOff, x, y, 0, Gear^.DirAngle)
+                       else if Gear^.Health <> 0 then DrawRotated(sprSMineOn, x, y, 0, Gear^.DirAngle)
+                       else DrawRotated(sprMineDead, x, y, 0, Gear^.DirAngle);
             gtCase: case Gear^.Pos of
                          posCaseAmmo  : begin
                                         i:= (GameTicks shr 6) mod 64;
                                         if i > 18 then i:= 0;
-                                        DrawSprite(sprCase, hwRound(Gear^.X) - 24 + WorldDx, hwRound(Gear^.Y) - 24 + WorldDy, i);
+                                        DrawSprite(sprCase, x - 24, y - 24, i);
                                         end;
                          posCaseHealth: begin
                                         i:= ((GameTicks shr 6) + 38) mod 64;
                                         if i > 13 then i:= 0;
-                                        DrawSprite(sprFAid, hwRound(Gear^.X) - 24 + WorldDx, hwRound(Gear^.Y) - 24 + WorldDy, i);
+                                        DrawSprite(sprFAid, x - 24, y - 24, i);
                                         end;
                          posCaseUtility: begin
                                         i:= (GameTicks shr 6) mod 70;
                                         if i > 23 then i:= 0;
                                         i:= i mod 12;
-                                        DrawSprite(sprUtility, hwRound(Gear^.X) - 24 + WorldDx, hwRound(Gear^.Y) - 24 + WorldDy, i);
+                                        DrawSprite(sprUtility, x - 24, y - 24, i);
                                         end;
                          end;
       gtExplosives: begin
                     if ((Gear^.State and gstDrowning) <> 0) then
-                        DrawSprite(sprExplosivesRoll, hwRound(Gear^.X) - 24 + WorldDx, hwRound(Gear^.Y) - 24 + WorldDy, 0)
+                        DrawSprite(sprExplosivesRoll, x - 24, y - 24, 0)
                     else if Gear^.State and gstAnimation = 0 then
                         begin
                         i:= (GameTicks shr 6 + Gear^.uid*3) mod 64;
                         if i > 18 then i:= 0;
-                        DrawSprite(sprExplosives, hwRound(Gear^.X) - 24 + WorldDx, hwRound(Gear^.Y) - 24 + WorldDy, i)
+                        DrawSprite(sprExplosives, x - 24, y - 24, i)
                         end
                     else if Gear^.State and gsttmpFlag = 0 then
-                        DrawRotatedF(sprExplosivesRoll, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) +4 + WorldDy, 0, 0, Gear^.DirAngle)
+                        DrawRotatedF(sprExplosivesRoll, x, y + 4, 0, 0, Gear^.DirAngle)
                     else
-                        DrawRotatedF(sprExplosivesRoll, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) +4 + WorldDy, 1, 0, Gear^.DirAngle);
+                        DrawRotatedF(sprExplosivesRoll, x, y + 4, 1, 0, Gear^.DirAngle);
                     end;
-        gtDynamite: DrawSprite2(sprDynamite, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 25 + WorldDy, Gear^.Tag and 1, Gear^.Tag shr 1);
-     gtClusterBomb: DrawRotated(sprClusterBomb, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
-         gtCluster: DrawSprite(sprClusterParticle, hwRound(Gear^.X) - 8 + WorldDx, hwRound(Gear^.Y) - 8 + WorldDy, 0);
-           gtFlame: DrawTextureF(SpritesData[sprFlame].Texture, 2 / (Gear^.Tag mod 3 + 2), hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, (GameTicks shr 7 + LongWord(Gear^.Tag)) mod 8, 1, 16, 16);
+        gtDynamite: DrawSprite2(sprDynamite, x - 16, y - 25, Gear^.Tag and 1, Gear^.Tag shr 1);
+     gtClusterBomb: DrawRotated(sprClusterBomb, x, y, 0, Gear^.DirAngle);
+         gtCluster: DrawSprite(sprClusterParticle, x - 8, y - 8, 0);
+           gtFlame: DrawTextureF(SpritesData[sprFlame].Texture, 2 / (Gear^.Tag mod 3 + 2), x, y, (GameTicks shr 7 + LongWord(Gear^.Tag)) mod 8, 1, 16, 16);
        gtParachute: begin
-                    DrawSprite(sprParachute, hwRound(Gear^.X) - 24 + WorldDx, hwRound(Gear^.Y) - 48 + WorldDy, 0);
-                    DrawAltWeapon(Gear, hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy)
+                    DrawSprite(sprParachute, x - 24, y - 48, 0);
+                    DrawAltWeapon(Gear, x + 1, y - 3)
                     end;
-       gtAirAttack: if Gear^.Tag > 0 then DrawSprite(sprAirplane, hwRound(Gear^.X) - SpritesData[sprAirplane].Width div 2 + WorldDx, hwRound(Gear^.Y) - SpritesData[sprAirplane].Height div 2 + WorldDy, 0)
-                                     else DrawSprite(sprAirplane, hwRound(Gear^.X) - SpritesData[sprAirplane].Width div 2 + WorldDx, hwRound(Gear^.Y) - SpritesData[sprAirplane].Height div 2 + WorldDy, 1);
-         gtAirBomb: DrawRotated(sprAirBomb, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
+       gtAirAttack: if Gear^.Tag > 0 then DrawSprite(sprAirplane, x - SpritesData[sprAirplane].Width div 2, y - SpritesData[sprAirplane].Height div 2, 0)
+                                     else DrawSprite(sprAirplane, x - SpritesData[sprAirplane].Width div 2, y - SpritesData[sprAirplane].Height div 2, 1);
+         gtAirBomb: DrawRotated(sprAirBomb, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
         gtTeleport: begin
                     HHGear:= PHedgehog(Gear^.Hedgehog)^.Gear;
-                    if not PHedgehog(Gear^.Hedgehog)^.Unplaced then DrawRotatedF(sprTeleport, hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy, Gear^.Pos, hwSign(Gear^.dX), 0);
+                    if not PHedgehog(Gear^.Hedgehog)^.Unplaced then DrawRotatedF(sprTeleport, x + 1, y - 3, Gear^.Pos, hwSign(Gear^.dX), 0);
                     DrawRotatedF(sprTeleport, hwRound(HHGear^.X) + 1 + WorldDx, hwRound(HHGear^.Y) - 3 + WorldDy, 11 - Gear^.Pos, hwSign(HHGear^.dX), 0);
                     end;
-        gtSwitcher: DrawSprite(sprSwitch, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 56 + WorldDy, (GameTicks shr 6) mod 12);
+        gtSwitcher: DrawSprite(sprSwitch, x - 16, y - 56, (GameTicks shr 6) mod 12);
           gtTarget: begin
                     Tint($FF, $FF, $FF, floor($FF * Gear^.Timer / 1000));
-                    DrawSprite(sprTarget, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, 0);
+                    DrawSprite(sprTarget, x - 16, y - 16, 0);
                     Tint($FF, $FF, $FF, $FF);
                     end;
-          gtMortar: DrawRotated(sprMortar, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
+          gtMortar: DrawRotated(sprMortar, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
           gtCake: if Gear^.Pos = 6 then
-                     DrawRotatedf(sprCakeWalk, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, (GameTicks div 40) mod 6, hwSign(Gear^.dX), Gear^.DirAngle * hwSign(Gear^.dX) + 90)
+                     DrawRotatedf(sprCakeWalk, x, y, (GameTicks div 40) mod 6, hwSign(Gear^.dX), Gear^.DirAngle * hwSign(Gear^.dX) + 90)
                   else
-                     DrawRotatedf(sprCakeDown, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 5 - Gear^.Pos, hwSign(Gear^.dX), Gear^.DirAngle * hwSign(Gear^.dX) + 90);
-       gtSeduction: if Gear^.Pos >= 14 then DrawSprite(sprSeduction, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, 0);
-      gtWatermelon: DrawRotatedf(sprWatermelon, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, 0, Gear^.DirAngle);
-      gtMelonPiece: DrawRotatedf(sprWatermelon, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 1, 0, Gear^.DirAngle);
-     gtHellishBomb: DrawRotated(sprHellishBomb, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
+                     DrawRotatedf(sprCakeDown, x, y, 5 - Gear^.Pos, hwSign(Gear^.dX), Gear^.DirAngle * hwSign(Gear^.dX) + 90);
+       gtSeduction: if Gear^.Pos >= 14 then DrawSprite(sprSeduction, x - 16, y - 16, 0);
+      gtWatermelon: DrawRotatedf(sprWatermelon, x, y, 0, 0, Gear^.DirAngle);
+      gtMelonPiece: DrawRotatedf(sprWatermelon, x, y, 1, 0, Gear^.DirAngle);
+     gtHellishBomb: DrawRotated(sprHellishBomb, x, y, 0, Gear^.DirAngle);
            gtBirdy: begin
                     if Gear^.State and gstAnimation = gstAnimation then
                         begin
                         if Gear^.State and gstTmpFlag = 0 then // Appearing
                             begin
-                            endX:= hwRound(Gear^.X);
-                            endY:= hwRound(Gear^.Y);
+                            endX:= x - WorldDx;
+                            endY:= y - WorldDy;
                             if Gear^.Tag < 0 then
                                 startX:= max(LAND_WIDTH + 1024, endX + 2048)
                             else
@@ -808,8 +823,8 @@
                             end
                         else // Disappearing
                             begin
-                            startX:= hwRound(Gear^.X);
-                            startY:= hwRound(Gear^.Y);
+                            startX:= x - WorldDx;
+                            startY:= y - WorldDy;
                             if Gear^.Tag > 0 then
                                 endX:= max(LAND_WIDTH + 1024, startX + 2048)
                             else
@@ -819,18 +834,18 @@
                             end;
                         end
                     else
-                        DrawTextureF(SpritesData[sprBirdy].Texture, 1, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, ((Gear^.Pos shr 6) or (RealTicks shr 8)) mod 2, Gear^.Tag, 75, 75);
+                        DrawTextureF(SpritesData[sprBirdy].Texture, 1, x, y, ((Gear^.Pos shr 6) or (RealTicks shr 8)) mod 2, Gear^.Tag, 75, 75);
                     end;
-             gtEgg: DrawRotatedTextureF(SpritesData[sprEgg].Texture, 1, 0, 0, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, 1, 16, 16, Gear^.DirAngle);
+             gtEgg: DrawRotatedTextureF(SpritesData[sprEgg].Texture, 1, 0, 0, x, y, 0, 1, 16, 16, Gear^.DirAngle);
            gtPiano: begin
                     if (Gear^.State and gstDrowning) = 0 then
                         begin
                         Tint($FF, $FF, $FF, $10);
                         for i:= 8 downto 1 do
-                            DrawRotatedTextureF(SpritesData[sprPiano].Texture, 1, 0, 0, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy - hwRound(Gear^.dY * 4 * i), 0, 1, 128, 128, 0);
+                            DrawRotatedTextureF(SpritesData[sprPiano].Texture, 1, 0, 0, x, y - hwRound(Gear^.dY * 4 * i), 0, 1, 128, 128, 0);
                         Tint($FF, $FF, $FF, $FF)
                         end;
-                    DrawRotatedTextureF(SpritesData[sprPiano].Texture, 1, 0, 0, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, 1, 128, 128, 0);
+                    DrawRotatedTextureF(SpritesData[sprPiano].Texture, 1, 0, 0, x, y, 0, 1, 128, 128, 0);
                     end;
      gtPoisonCloud: begin
                     if Gear^.Timer < 1020 then
@@ -839,11 +854,11 @@
                         Tint($C0, $C0, $00, (5000 - Gear^.Timer) div 8)
                     else
                         Tint($C0, $C0, $00, $C0);
-                    DrawRotatedTextureF(SpritesData[sprSmokeWhite].texture, 3, 0, 0, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, 1, 22, 22, (RealTicks shr 36 + Gear^.UID * 100) mod 360);
+                    DrawRotatedTextureF(SpritesData[sprSmokeWhite].texture, 3, 0, 0, x, y, 0, 1, 22, 22, (RealTicks shr 36 + Gear^.UID * 100) mod 360);
                     Tint($FF, $FF, $FF, $FF)
                     end;
          end;
-      if Gear^.RenderTimer and (Gear^.Tex <> nil) then DrawCentered(hwRound(Gear^.X) + 8 + WorldDx, hwRound(Gear^.Y) + 8 + WorldDy, Gear^.Tex);
+      if Gear^.RenderTimer and (Gear^.Tex <> nil) then DrawCentered(x + 8, y + 8, Gear^.Tex);
       Gear:= Gear^.NextGear
       end;
 end;
--- a/hedgewars/HHHandlers.inc	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/HHHandlers.inc	Sat Oct 30 20:04:38 2010 +0200
@@ -54,7 +54,7 @@
     while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> CurAmmoType) do inc(ammoidx);
 
     if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or
-       ((MultiShootAttacks > 0) and (CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) = 0)) or
+       ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) = 0)) or
        ((Gear^.State and gstHHDriven) = 0) then exit;
 
     if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) <> 0) and (MultiShootAttacks > 0) then OnUsedAmmo(PHedgehog(Gear^.Hedgehog)^);
@@ -879,6 +879,7 @@
 
         if not PHedgehog(Gear^.Hedgehog)^.Team^.hasGone then
             begin
+            PHedgehog(Gear^.Hedgehog)^.Effects[hePoisoned] := false;
             if PHedgehog(Gear^.Hedgehog)^.Effects[heResurrectable] then begin
                 ResurrectHedgehog(Gear);
             end else begin
--- a/hedgewars/VGSHandlers.inc	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/VGSHandlers.inc	Sat Oct 30 20:04:38 2010 +0200
@@ -77,7 +77,7 @@
 var s: Longword;
     t: float;
 begin
-Gear^.X:= Gear^.X + (cWindSpeedf * 200 + Gear^.dX) * Steps;
+Gear^.X:= Gear^.X + (cWindSpeedf * 750 * Gear^.dX) * Steps;
 
 // up-and-down-bounce magic
 s := (GameTicks + Gear^.Timer) mod 4096;
@@ -516,12 +516,16 @@
 inc(Gear^.Timer, Steps );
 if Gear^.Timer > 64 then
     begin
+    if Gear^.State = 0 then
+      begin
+      DeleteVisualGear(Gear);
+      exit;
+      end;
     dec(Gear^.State, Gear^.Timer div 65);
     Gear^.Timer:= Gear^.Timer mod 65;
     end;
 Gear^.dX:= Gear^.dX + cWindSpeedf * Steps;
 Gear^.X:= Gear^.X + Gear^.dX;
-if Gear^.State = 0 then DeleteVisualGear(Gear);
 end;
 
 ////////////////////////////////////////////////////////////////////////////////
--- a/hedgewars/uConsole.pas	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/uConsole.pas	Sat Oct 30 20:04:38 2010 +0200
@@ -237,7 +237,7 @@
     RegisterVariable('sd_turns', vtLongInt, @cSuddenDTurns  , false);
     RegisterVariable('damagepct',vtLongInt, @cDamagePercent , false);
     RegisterVariable('minedudpct',vtLongInt,@cMineDudPercent, false);
-    RegisterVariable('landadds', vtLongInt, @cLandAdditions , false);
+    RegisterVariable('minesnum', vtLongInt, @cLandMines     , false);
     RegisterVariable('explosives',vtLongInt,@cExplosives    , false);
     RegisterVariable('gmflags' , vtLongInt, @GameFlags      , false);
     RegisterVariable('trflags' , vtLongInt, @TrainingFlags  , false);
--- a/hedgewars/uConsts.pas	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/uConsts.pas	Sat Oct 30 20:04:38 2010 +0200
@@ -319,8 +319,6 @@
 {$ENDIF}
 
     cSendEmptyPacketTime = 1000;
-
-    // from uTriggers
     trigTurns = $80000001;
 
     // Training Flags
@@ -332,30 +330,29 @@
     tfTargetRespawn = $00000010;
 
     gfAny                = $FFFFFFFF;
-    gfForts              = $00000001;
-    gfMultiWeapon        = $00000002;
+    gfOneClanMode        = $00000001;           // used in trainings
+    gfMultiWeapon        = $00000002;           // used in trainings
     gfSolidLand          = $00000004;
     gfBorder             = $00000008;
     gfDivideTeams        = $00000010;
     gfLowGravity         = $00000020;
     gfLaserSight         = $00000040;
     gfInvulnerable       = $00000080;
-    gfMines              = $00000100;
+
     gfVampiric           = $00000200;
     gfKarma              = $00000400;
     gfArtillery          = $00000800;
-    gfOneClanMode        = $00001000;
+    gfForts              = $00001000;
     gfRandomOrder        = $00002000;
     gfKing               = $00004000;
     gfPlaceHog           = $00008000;
     gfSharedAmmo         = $00010000;
     gfDisableGirders     = $00020000;
-    gfExplosives         = $00040000;
-    gfDisableLandObjects = $00080000;
-    gfAISurvival         = $00100000;
-    gfInfAttack          = $00200000;
-    gfResetWeps          = $00400000;
-    gfPerHogAmmo         = $00800000;
+    gfDisableLandObjects = $00040000;
+    gfAISurvival         = $00080000;
+    gfInfAttack          = $00100000;
+    gfResetWeps          = $00200000;
+    gfPerHogAmmo         = $00400000;
     // NOTE: When adding new game flags, ask yourself
     // if a "game start notice" would be useful. If so,
     // add one in uWorld.pas - look for "AddGoal".
--- a/hedgewars/uGears.pas	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/uGears.pas	Sat Oct 30 20:04:38 2010 +0200
@@ -1201,19 +1201,17 @@
 if ((GameFlags and gfForts) = 0) then
     begin
     // TODO: exclude each other or allow both, mines and explosives, on same map?
-    if ((GameFlags and gfMines) <> 0) then
-        for i:= 0 to Pred(cLandAdditions) do
-            begin
-            Gear:= AddGear(0, 0, gtMine, 0, _0, _0, 0);
-            FindPlace(Gear, false, 0, LAND_WIDTH);
-            end;
-//  No game flag for this for now
-//  if ((GameFlags and gfExplosives) <> 0) then
-        for i:= 0 to Pred(cExplosives) do
-            begin
-            Gear:= AddGear(0, 0, gtExplosives, 0, _0, _0, 0);
-            FindPlace(Gear, false, 0, LAND_WIDTH);
-            end;
+    for i:= 0 to Pred(cLandMines) do
+        begin
+        Gear:= AddGear(0, 0, gtMine, 0, _0, _0, 0);
+        FindPlace(Gear, false, 0, LAND_WIDTH);
+        end;
+    // No game flag for this for now
+    for i:= 0 to Pred(cExplosives) do
+        begin
+        Gear:= AddGear(0, 0, gtExplosives, 0, _0, _0, 0);
+        FindPlace(Gear, false, 0, LAND_WIDTH);
+        end;
     end;
 
 if (GameFlags and gfLowGravity) <> 0 then
@@ -1309,7 +1307,7 @@
                                 if not Gear^.Invulnerable then
                                     Gear^.State:= (Gear^.State or gstMoving) and (not gstWinner);
                                 Gear^.Active:= true;
-                                FollowGear:= Gear
+                                if Gear^.Kind <> gtFlame then FollowGear:= Gear
                                 end;
                             if ((Mask and EXPLPoisoned) <> 0) and (Gear^.Kind = gtHedgehog) then
                                 PHedgehog(Gear^.Hedgehog)^.Effects[hePoisoned] := true;
--- a/hedgewars/uMisc.pas	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/uMisc.pas	Sat Oct 30 20:04:38 2010 +0200
@@ -106,7 +106,7 @@
     cScreenSpace          : LongInt;
 
     cCaseFactor     : Longword;
-    cLandAdditions  : Longword;
+    cLandMines      : Longword;
     cExplosives     : Longword;
 
     cSeed           : shortstring;
@@ -752,7 +752,7 @@
     cDamagePercent      := 100;
     cMineDudPercent     := 0;
     cTemplateFilter     := 0;
-    cMapGen             := 0;//MAPGEN_REGULAR
+    cMapGen             := 0;   // MAPGEN_REGULAR
     cMazeSize           := 0;
     cHedgehogTurnTime   := 45000;
     cMinesTime          := 3000;
@@ -765,7 +765,7 @@
     RealTicks       := 0;
     AttackBar       := 0; // 0 - none, 1 - just bar at the right-down corner, 2 - like in WWP
     cCaseFactor     := 5;  {0..9}
-    cLandAdditions  := 4;
+    cLandMines      := 4;
     cExplosives     := 2;
 
     GameState       := Low(TGameState);
--- a/hedgewars/uScript.pas	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/uScript.pas	Sat Oct 30 20:04:38 2010 +0200
@@ -830,7 +830,7 @@
 ScriptSetString('Seed', cSeed);
 ScriptSetInteger('TurnTime', cHedgehogTurnTime);
 ScriptSetInteger('CaseFreq', cCaseFactor);
-ScriptSetInteger('LandAdds', cLandAdditions);
+ScriptSetInteger('MinesNum', cLandMines);
 ScriptSetInteger('Explosives', cExplosives);
 ScriptSetInteger('Delay', cInactDelay);
 ScriptSetInteger('Ready', cReadyDelay);
@@ -851,7 +851,7 @@
 ParseCommand('$gmflags ' + ScriptGetString('GameFlags'), true);
 ParseCommand('$turntime ' + ScriptGetString('TurnTime'), true);
 ParseCommand('$casefreq ' + ScriptGetString('CaseFreq'), true);
-ParseCommand('$landadds ' + ScriptGetString('LandAdds'), true);
+ParseCommand('$minesnum ' + ScriptGetString('MinesNum'), true);
 ParseCommand('$explosives ' + ScriptGetString('Explosives'), true);
 ParseCommand('$delay ' + ScriptGetString('Delay'), true);
 ParseCommand('$ready ' + ScriptGetString('Ready'), true);
@@ -1039,7 +1039,6 @@
 ScriptSetInteger('gfLowGravity', gfLowGravity);
 ScriptSetInteger('gfLaserSight', gfLaserSight);
 ScriptSetInteger('gfInvulnerable', gfInvulnerable);
-ScriptSetInteger('gfMines', gfMines);
 ScriptSetInteger('gfVampiric', gfVampiric);
 ScriptSetInteger('gfKarma', gfKarma);
 ScriptSetInteger('gfArtillery', gfArtillery);
@@ -1049,7 +1048,6 @@
 ScriptSetInteger('gfPlaceHog', gfPlaceHog);
 ScriptSetInteger('gfSharedAmmo', gfSharedAmmo);
 ScriptSetInteger('gfDisableGirders', gfDisableGirders);
-ScriptSetInteger('gfExplosives', gfExplosives);
 
 ScriptSetInteger('gmLeft', gmLeft);
 ScriptSetInteger('gmRight', gmRight);
--- a/hedgewars/uTeams.pas	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/uTeams.pas	Sat Oct 30 20:04:38 2010 +0200
@@ -101,6 +101,7 @@
     LocalClan: LongInt;  // last non-bot, non-extdriven clan
     LocalAmmo: LongInt;  // last non-bot, non-extdriven clan's first team's ammo index
     CurMinAngle, CurMaxAngle: Longword;
+    GameOver: boolean;
 
 procedure initModule;
 procedure freeModule;
@@ -139,31 +140,35 @@
 
 TurnTimeLeft:= 0;
 ReadyTimeLeft:= 0;
-if AliveCount = 0 then
-    begin // draw
-    AddCaption(trmsg[sidDraw], cWhiteColor, capgrpGameState);
-    SendStat(siGameResult, trmsg[sidDraw]);
-    AddGear(0, 0, gtATFinishGame, 0, _0, _0, 3000)
-    end else // win
-    with AliveClan^ do
-        begin
-        if TeamsNumber = 1 then
-            s:= Format(shortstring(trmsg[sidWinner]), Teams[0]^.TeamName)  // team wins
-        else
-            s:= Format(shortstring(trmsg[sidWinner]), Teams[0]^.TeamName); // clan wins
+if not GameOver then
+    begin
+    if AliveCount = 0 then
+        begin // draw
+        AddCaption(trmsg[sidDraw], cWhiteColor, capgrpGameState);
+        SendStat(siGameResult, trmsg[sidDraw]);
+        AddGear(0, 0, gtATFinishGame, 0, _0, _0, 3000)
+        end else // win
+        with AliveClan^ do
+            begin
+            if TeamsNumber = 1 then
+                s:= Format(shortstring(trmsg[sidWinner]), Teams[0]^.TeamName)  // team wins
+            else
+                s:= Format(shortstring(trmsg[sidWinner]), Teams[0]^.TeamName); // clan wins
 
-        for j:= 0 to Pred(TeamsNumber) do
-            with Teams[j]^ do
-                for i:= 0 to cMaxHHIndex do
-                    with Hedgehogs[i] do
-                        if (Gear <> nil) then
-                            Gear^.State:= gstWinner;
+            for j:= 0 to Pred(TeamsNumber) do
+                with Teams[j]^ do
+                    for i:= 0 to cMaxHHIndex do
+                        with Hedgehogs[i] do
+                            if (Gear <> nil) then
+                                Gear^.State:= gstWinner;
 
-        AddCaption(s, cWhiteColor, capgrpGameState);
-        SendStat(siGameResult, s);
-        AddGear(0, 0, gtATFinishGame, 0, _0, _0, 3000)
-        end;
-SendStats
+            AddCaption(s, cWhiteColor, capgrpGameState);
+            SendStat(siGameResult, s);
+            AddGear(0, 0, gtATFinishGame, 0, _0, _0, 3000)
+            end;
+    SendStats;
+    end;
+GameOver:= true
 end;
 
 procedure SwitchHedgehog;
@@ -270,6 +275,11 @@
 ResetKbd;
 
 cWindSpeed:= rndSign(GetRandom * 2 * cMaxWindSpeed);
+// cWindSpeedf:= cWindSpeed.QWordValue / _1.QWordValue throws Internal error 200502052 on fpc 2.5.1
+// see http://mantis.freepascal.org/view.php?id=17714
+cWindSpeedf:= SignAs(cWindSpeed,cWindSpeed).QWordValue / SignAs(_1,_1).QWordValue;
+if cWindSpeed.isNegative then
+    CWindSpeedf := -cWindSpeedf;
 g:= AddGear(0, 0, gtATSmoothWindCh, 0, _0, _0, 1);
 g^.Tag:= hwRound(cWindSpeed * 72 / cMaxWindSpeed);
 {$IFDEF DEBUGFILE}AddFileLog('Wind = '+FloatToStr(cWindSpeed));{$ENDIF}
@@ -492,6 +502,7 @@
     ClansCount:= 0;
     LocalClan:= -1;
     LocalAmmo:= -1;
+    GameOver:= false
 end;
 
 procedure freeModule;
--- a/hedgewars/uVisualGears.pas	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/uVisualGears.pas	Sat Oct 30 20:04:38 2010 +0200
@@ -172,8 +172,7 @@
                 end;
     vgtCloud: begin
                 Frame:= random(4);
-                dx:= 0.000005 * random(10000);
-                if random(2) = 0 then dx := -dx;
+                dx:= 0.5 + 0.1 * random(5); // how much the cloud will be affected by wind
                 timer:= random(4096);
                 end;
     vgtExplPart,
--- a/hedgewars/uWorld.pas	Sat Oct 23 17:26:22 2010 +0200
+++ b/hedgewars/uWorld.pas	Sat Oct 30 20:04:38 2010 +0200
@@ -147,11 +147,11 @@
 if cMinesTime <> 3000 then
     begin
     if cMinesTime = 0 then
-        g:= AddGoal(g, gfMines, gidNoMineTimer)
+        g:= AddGoal(g, gfAny, gidNoMineTimer)
     else if cMinesTime < 0 then
-        g:= AddGoal(g, gfMines, gidRandomMineTimer)
+        g:= AddGoal(g, gfAny, gidRandomMineTimer)
     else
-        g:= AddGoal(g, gfMines, gidMineTimer, cMinesTime div 1000);
+        g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime div 1000);
     end;
 
 // if the string has been set, show it for (default timeframe) seconds
--- a/project_files/HedgewarsMobile/Classes/AboutViewController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -33,7 +33,7 @@
     self.tableView.backgroundView = nil;
     self.tableView.allowsSelection = NO;
 
-    NSString *strPath = [NSString stringWithFormat:@"%@/Settings/credits.plist",[[NSBundle mainBundle] resourcePath]];
+    NSString *strPath = [NSString stringWithFormat:@"%@/credits.plist",IFRONTEND_DIRECTORY()];
     NSArray *array = [[NSArray alloc] initWithContentsOfFile:strPath];
     self.people = array;
     [array release];
--- a/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -297,6 +297,8 @@
         startingPoint = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view];
     }
     */
+    if (IS_IPAD() == NO)
+        [self disappear];
 }
 
 -(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
--- a/project_files/HedgewarsMobile/Classes/CGPointUtils.h	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/CGPointUtils.h	Sat Oct 30 20:04:38 2010 +0200
@@ -12,9 +12,8 @@
 #define degreesToRadians(x) ( M_PI * x / 180.0)
 #define radiansToDegrees(x) (180.0 * x / M_PI )
 
-// 40 is not a good value for iphone but works for ipad
 #define HWX(x) (int)(x-screen.size.height/2)/HW_zoomFactor()
-#define HWY(x) (int)(screen.size.width-x)/HW_zoomFactor() + 40*HW_zoomLevel()/HW_zoomFactor()
+#define HWY(x) (int)(screen.size.width-x)/HW_zoomFactor() + (IS_IPAD()?40:17.5)*HW_zoomLevel()/HW_zoomFactor()
 
 #define HWXZ(x) (int)(x-screen.size.height/2)
 #define HWYZ(x) (int)(screen.size.width-x)
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.h	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.h	Sat Oct 30 20:04:38 2010 +0200
@@ -34,8 +34,8 @@
 #define GRAPHICS_DIRECTORY()    [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/"]
 #define HATS_DIRECTORY()        [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"]
 #define GRAVES_DIRECTORY()      [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Graves/"]
-#define BOTLEVELS_DIRECTORY()   [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hedgehog/botlevels"]
-#define BTN_DIRECTORY()         [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Btn"]
+#define BOTLEVELS_DIRECTORY()   [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hedgehog/botlevels/"]
+#define BTN_DIRECTORY()         [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Btn/"]
 #define FLAGS_DIRECTORY()       [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Flags/"]
 #define FORTS_DIRECTORY()       [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Forts/"]
 #define VOICES_DIRECTORY()      [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Sounds/voices/"]
@@ -43,6 +43,7 @@
 #define MAPS_DIRECTORY()        [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Maps/"]
 #define MISSIONS_DIRECTORY()    [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Missions/Maps/"]
 #define LOCALE_DIRECTORY()      [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Locale/"]
+#define IFRONTEND_DIRECTORY()   [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/iFrontend/"]
 
 #define MSG_MEMCLEAN()          DLog(@"has cleaned up some memory");
 #define MSG_DIDUNLOAD()         DLog(@"unloaded");
@@ -53,6 +54,7 @@
 #define UICOLOR_HW_ALPHABLUE    [UIColor colorWithRed:(CGFloat)0x0F/255 green:0 blue:(CGFloat)0x42/255 alpha:0.58f]
 
 #define IS_DUALHEAD()           ([[UIScreen screens] count] > 1)
+#define IS_IPAD()               (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
 
 #define DEFAULT_NETGAME_PORT    46631
 
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.m	Sat Oct 30 20:04:38 2010 +0200
@@ -228,7 +228,7 @@
 }
 
 BOOL inline isApplePhone () {
-    return (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone);
+    return (IS_IPAD() == NO);
 }
 
 NSString *modelType () {
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -40,7 +40,7 @@
 -(IBAction) buttonPressed:(id) sender {
     // works even if it's not actually a button
     UIButton *theButton;
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+    if (IS_IPAD())
         theButton = [[(NSNotification *)sender userInfo] objectForKey:@"sender"];
     else
         theButton = (UIButton *)sender;
@@ -224,7 +224,7 @@
 
         // present an alert to the user, with an image on the ipad (too big for the iphone)
         NSString *msg = NSLocalizedString(@"Something went wrong with your configuration. Please try again.",@"");
-        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+        if (IS_IPAD())
             msg = [msg stringByAppendingString:@"\n\n\n\n\n\n\n\n"];    // this makes space for the image
 
         UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Whoops"
@@ -233,7 +233,7 @@
                                               cancelButtonTitle:@"Ok"
                                               otherButtonTitles:nil];
 
-        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        if (IS_IPAD()) {
             UIImageView *deniedImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"denied.png"]];
             deniedImg.frame = CGRectMake(25, 80, 240, 160);
             [alert addSubview:deniedImg];
@@ -285,7 +285,7 @@
     CGRect screen = [[UIScreen mainScreen] bounds];
     self.view.frame = CGRectMake(0, 0, screen.size.height, screen.size.width);
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+    if (IS_IPAD()) {
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(buttonPressed:)
                                                      name:@"buttonPressed"
@@ -346,7 +346,7 @@
 }
 
 -(void) viewWillAppear:(BOOL)animated {
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+    if (IS_IPAD())
         [NSThread detachNewThreadSelector:@selector(loadNiceHogs) toTarget:self withObject:nil];
 
     [self.mapConfigViewController viewWillAppear:animated];
--- a/project_files/HedgewarsMobile/Classes/GameSetup.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.m	Sat Oct 30 20:04:38 2010 +0200
@@ -165,58 +165,26 @@
     [schemePath release];
     NSArray *basicArray = [schemeDictionary objectForKey:@"basic"];
     NSArray *gamemodArray = [schemeDictionary objectForKey:@"gamemod"];
+    int i = 0;
     int result = 0;
-    int i = 0;
+    int mask = 0x00000004;
 
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000001;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000010;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000004;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000008;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000020;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000040;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000080;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000100;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000200;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000400;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00000800;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00002000;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00004000;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00008000;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00010000;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00020000;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00080000;
-    if ([[gamemodArray objectAtIndex:i++] boolValue])
-        result |= 0x00100000;  
-
-    DLog(@"Sent %d flags",i);
+    // pack the gameflags in a single var and send it
+    for (NSNumber *value in gamemodArray) {
+        if ([value boolValue] == YES)
+            result |= mask;
+        mask <<= 1;
+    }
     NSString *flags = [[NSString alloc] initWithFormat:@"e$gmflags %d",result];
     [self sendToEngine:flags];
     [flags release];
 
-    i = 0;
     NSString *dmgMod = [[NSString alloc] initWithFormat:@"e$damagepct %d",[[basicArray objectAtIndex:i++] intValue]];
     [self sendToEngine:dmgMod];
     [dmgMod release];
 
     // support for endless games
-    int tentativeTurntime = [[basicArray objectAtIndex:i++] intValue];
+    NSInteger tentativeTurntime = [[basicArray objectAtIndex:i++] intValue];
     if (tentativeTurntime == 100)
         tentativeTurntime = 9999;
     NSString *turnTime = [[NSString alloc] initWithFormat:@"e$turntime %d",tentativeTurntime * 1000];
@@ -237,7 +205,7 @@
     [self sendToEngine:minesTime];
     [minesTime release];
 
-    NSString *minesNumber = [[NSString alloc] initWithFormat:@"e$landadds %d",[[basicArray objectAtIndex:i++] intValue]];
+    NSString *minesNumber = [[NSString alloc] initWithFormat:@"e$minesnum %d",[[basicArray objectAtIndex:i++] intValue]];
     [self sendToEngine:minesNumber];
     [minesNumber release];
 
@@ -249,7 +217,7 @@
     [self sendToEngine:explosives];
     [explosives release];
 
-    DLog(@"Sent %d modes",i);
+    DLog(@"Sent %d flags and %d modes", [gamemodArray count], i);
     [schemeDictionary release];
     return result;
 }
@@ -367,15 +335,17 @@
                 // scheme (returns initial health)
                 NSInteger health = [self provideScheme:[self.gameConfig objectForKey:@"scheme"]];
 
+                // send an ammostore for each team
                 NSArray *teamsConfig = [self.gameConfig objectForKey:@"teams_list"];
+                [self provideAmmoData:[self.gameConfig objectForKey:@"weapon"] forPlayingTeams:[teamsConfig count]];
+
+                // finally add hogs
                 for (NSDictionary *teamData in teamsConfig) {
                     [self provideTeamData:[teamData objectForKey:@"team"]
                                   forHogs:[[teamData objectForKey:@"number"] intValue]
                                withHealth:health
                                   ofColor:[teamData objectForKey:@"color"]];
                 }
-
-                [self provideAmmoData:[self.gameConfig objectForKey:@"weapon"] forPlayingTeams:[teamsConfig count]];
                 break;
             case '?':
                 DLog(@"Ping? Pong!");
@@ -478,7 +448,7 @@
                 tmpQuality = 0x00000002;                    // rqBlurryLand
             else                                                            // = everything else
                 tmpQuality = 0;                             // full quality
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)             // = disable tooltips on phone
+    if (IS_IPAD() == NO)             // = disable tooltips on phone
         tmpQuality = tmpQuality | 0x00000400;
 
     // prevents using an empty nickname
--- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -127,7 +127,7 @@
     }
     cell.textLabel.text = [menuList objectAtIndex:[indexPath row]];
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+    if (IS_IPAD())
         cell.textLabel.textAlignment = UITextAlignmentCenter;
 
     return cell;
@@ -150,7 +150,7 @@
             break;
         case 2:
             // expand the view (and table) so that the actionsheet can be selected on the iPhone
-            if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+            if (IS_IPAD() == NO) {
                 CGRect screen = [[UIScreen mainScreen] bounds];
                 [self.tableView deselectRowAtIndexPath:indexPath animated:NO];
                 [UIView beginAnimations:@"table width more" context:NULL];
@@ -185,7 +185,7 @@
 #pragma mark -
 #pragma mark actionSheet methods
 -(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex {
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone){
+    if (IS_IPAD()){
         CGRect screen = [[UIScreen mainScreen] bounds];
         [UIView beginAnimations:@"table width less" context:NULL];
         [UIView setAnimationDuration:0.2];
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -158,7 +158,7 @@
     switch (button.tag) {
         case 0:
             if (nil == self.gameConfigViewController) {
-                if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+                if (IS_IPAD())
                     xib = nil;
                 else
                     xib = @"GameConfigViewController";
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -126,7 +126,7 @@
     if (cell == nil)
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+    if (IS_IPAD())
         cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
 
     if (self.dataSourceArray == nil)
@@ -135,6 +135,8 @@
 
     NSString *labelString = [source objectAtIndex:row];
     cell.textLabel.text = labelString;
+    cell.textLabel.adjustsFontSizeToFitWidth = YES;
+    cell.textLabel.minimumFontSize = 7;
 
     if (isRandomness()) {
         UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@/icon.png",THEMES_DIRECTORY(),labelString]];
@@ -350,7 +352,7 @@
     self.missionCommand = mission;
 
     // nice animation for updating the table when appropriate (on iphone)
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+    if (IS_IPAD())
         if (((oldPage == 0 || oldPage == 2) && (newPage == 1 || newPage == 3)) ||
             ((oldPage == 1 || oldPage == 3) && (newPage == 0 || newPage == 2)) ||
             ((oldPage == 1 && newPage == 3) || (oldPage == 3 || newPage == 1))) {
@@ -421,7 +423,7 @@
     self.staticMapCommand = @"";
     self.missionCommand = @"";
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+    if (IS_IPAD()) {
         [self.tableView setBackgroundView:nil];
         self.view.backgroundColor = [UIColor clearColor];
         self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
--- a/project_files/HedgewarsMobile/Classes/MasterViewController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MasterViewController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -52,7 +52,7 @@
     [array release];
 
     // targetControllers tells whether we're on the right or left side of the splitview -- on iphone we only use the right side
-    if (targetController == nil && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+    if (targetController == nil && IS_IPAD()) {
         if (nil == generalSettingsViewController)
             generalSettingsViewController = [[GeneralSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
         generalSettingsViewController.navigationItem.hidesBackButton = YES;
--- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -252,7 +252,7 @@
         self.helpPage = nil;
     if (self.amvc.view.superview == nil)
         self.amvc = nil;
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+    if (IS_IPAD())
         if (((UIPopoverController *)self.popoverController).contentViewController.view.superview == nil)
             self.popoverController = nil;
     
@@ -444,7 +444,7 @@
     CGRect screen = [[UIScreen mainScreen] bounds];
     isPopoverVisible = YES;
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+    if (IS_IPAD()) {
         if (self.popupMenu == nil)
             self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain];
         if (self.popoverController == nil) {
@@ -474,7 +474,7 @@
         if (HW_isPaused())
             HW_pause();
 
-        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        if (IS_IPAD()) {
             [(InGameMenuViewController *)[[self popoverController] contentViewController] removeChat];
             [self.popoverController dismissPopoverAnimated:YES];
         } else {
--- a/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m	Sat Oct 30 20:04:38 2010 +0200
@@ -173,7 +173,7 @@
 
     self.uiwindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+    if (IS_IPAD())
         self.mainViewController = [[MainMenuViewController alloc] initWithNibName:@"MainMenuViewController-iPad" bundle:nil];
     else
         self.mainViewController = [[MainMenuViewController alloc] initWithNibName:@"MainMenuViewController-iPhone" bundle:nil];
--- a/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -85,7 +85,7 @@
 
 -(IBAction) clearAll:(id) sender {
     NSString *titleStr, *cancelStr, *confirmStr;
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+    if (IS_IPAD()) {
         titleStr = nil;
         cancelStr = nil;
         confirmStr = NSLocalizedString(@"Tap to confirm",@"");
--- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -39,88 +39,17 @@
 #pragma mark View lifecycle
 -(void) viewDidLoad {
     [super viewDidLoad];
+    NSString *path = nil;
 
     // title, description, image name (+btn)
-    NSArray *mods = [[NSArray alloc] initWithObjects:
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Fort Mode",@""),@"title",
-                      NSLocalizedString(@"Defend your fort and destroy the opponents (two team colours max)",@""),@"description",
-                      @"Forts",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Divide Team",@""),@"title",
-                      NSLocalizedString(@"Teams will start on opposite sides of the terrain (two team colours max)",@""),@"description",
-                      @"TeamsDivide",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Solid Land",@""),@"title",
-                      NSLocalizedString(@"Land can not be destroyed",@""),@"description",
-                      @"Solid",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Add Border",@""),@"title",
-                      NSLocalizedString(@"Add an indestructable border around the terrain",@""),@"description",
-                      @"Border",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Low Gravity",@""),@"title",
-                      NSLocalizedString(@"Lower gravity",@""),@"description",
-                      @"LowGravity",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Laser Sight",@""),@"title",
-                      NSLocalizedString(@"Assisted aiming with laser sight",@""),@"description",
-                      @"LaserSight",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Invulnerable",@""),@"title",
-                      NSLocalizedString(@"All hogs have a personal forcefield",@""),@"description",
-                      @"Invulnerable",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Add Mines",@""),@"title",
-                      NSLocalizedString(@"Enable random mines",@""),@"description",
-                      @"Mines",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Vampirism Mode",@""),@"title",
-                      NSLocalizedString(@"Gain 80% of the damage you do back in health",@""),@"description",
-                      @"Vampiric",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Karma Mode",@""),@"title",
-                      NSLocalizedString(@"Share your opponents pain, share their damage",@""),@"description",
-                      @"Karma",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Artillery Mode",@""),@"title",
-                      NSLocalizedString(@"Your hogs are unable to move, test your aim",@""),@"description",
-                      @"Artillery",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Random Order",@""),@"title",
-                      NSLocalizedString(@"Order of play is random instead of in room order",@""),@"description",
-                      @"RandomOrder",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"King Mode",@""),@"title",
-                      NSLocalizedString(@"Play with a King. If he dies, your side loses",@""),@"description",
-                      @"King",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys: NSLocalizedString(@"Place Hedgehogs",@""),@"title",
-                      NSLocalizedString(@"Take turns placing your hedgehogs pre-game",@""),@"description",
-                      @"PlaceHog",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Clan Shares Ammo",@""),@"title",
-                      NSLocalizedString(@"Ammo is shared between all clan teams",@""),@"description",
-                      @"SharedAmmo",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Disable Girders",@""),@"title",
-                      NSLocalizedString(@"Disable girders when generating random maps",@""),@"description",
-                      @"DisableGirders",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Disable Land Objects",@""),@"title",
-                      NSLocalizedString(@"Disable land objects when generating maps",@""),@"description",
-                      @"DisableLandObjects",@"image",nil],
-                     [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"AI Survival Mode",@""),@"title",
-                      NSLocalizedString(@"AI-controlled hogs respawn on death",@""),@"description",
-                      @"AISurvival",@"image",nil],
-                     nil];
+    path = [NSString stringWithFormat:@"%@/gameFlags_en.plist",IFRONTEND_DIRECTORY()];
+    NSArray *mods = [[NSArray alloc] initWithContentsOfFile:path];
     self.gameModifierArray = mods;
     [mods release];
 
     // title, image name (+icon), default value, max value, min value
-    NSArray *basicSettings = [[NSArray alloc] initWithObjects:
-                              [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Damage Modifier",@""),@"title",@"Damage",@"image",
-                               [NSNumber numberWithInt:100],@"default",[NSNumber numberWithInt:10],@"min",[NSNumber numberWithInt:300],@"max",nil],
-                              [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Turn Time",@""),@"title",@"Time",@"image",
-                               [NSNumber numberWithInt:45],@"default",[NSNumber numberWithInt:1],@"min",[NSNumber numberWithInt:100],@"max",nil],
-                              [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Initial Health",@""),@"title",@"Health",@"image",
-                               [NSNumber numberWithInt:100],@"default",[NSNumber numberWithInt:50],@"min",[NSNumber numberWithInt:200],@"max",nil],
-                              [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Sudden Death Timeout",@""),@"title",@"SuddenDeath",@"image",
-                               [NSNumber numberWithInt:15],@"default",[NSNumber numberWithInt:0],@"min",[NSNumber numberWithInt:50],@"max",nil],
-                              [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Crate Drops",@""),@"title",@"Box",@"image",
-                               [NSNumber numberWithInt:5],@"default",[NSNumber numberWithInt:0],@"min",[NSNumber numberWithInt:9],@"max",nil],
-                              [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Mines Time",@""),@"title",@"Time",@"image",
-                               [NSNumber numberWithInt:3],@"default",[NSNumber numberWithInt:0],@"min",[NSNumber numberWithInt:3],@"max",nil],
-                              [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Mines Number",@""),@"title",@"Mine",@"image",
-                               [NSNumber numberWithInt:4],@"default",[NSNumber numberWithInt:1],@"min",[NSNumber numberWithInt:80],@"max",nil],
-                              [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Dud Mines Probability",@""),@"title",@"Dud",@"image",
-                               [NSNumber numberWithInt:0],@"default",[NSNumber numberWithInt:0],@"min",[NSNumber numberWithInt:100],@"max",nil],
-                              [NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Explosives",@""),@"title",@"Damage",@"image",
-                               [NSNumber numberWithInt:2],@"default",[NSNumber numberWithInt:0],@"min",[NSNumber numberWithInt:40],@"max",nil],
-                              nil];
+    path = [NSString stringWithFormat:@"%@/basicFlags_en.plist",IFRONTEND_DIRECTORY()];
+    NSArray *basicSettings = [[NSArray alloc] initWithContentsOfFile:path];
     self.basicSettingList = basicSettings;
     [basicSettings release];
 
@@ -177,10 +106,10 @@
             return 2;
             break;
         case 1:
-            return [self.basicSettingList count];
+            return [[self.schemeDictionary objectForKey:@"basic"] count];
             break;
         case 2:
-            return [self.gameModifierArray count];
+            return [[self.schemeDictionary objectForKey:@"gamemod"] count];
         default:
             break;
     }
@@ -228,7 +157,7 @@
                                                reuseIdentifier:CellIdentifier1] autorelease];
 
                 int offset = 0;
-                if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+                if (IS_IPAD())
                     offset = 50;
 
                 UISlider *slider = [[UISlider alloc] initWithFrame:CGRectMake(offset+260, 12, offset+150, 23)];
@@ -259,16 +188,21 @@
                 if ([oneView isMemberOfClass:[UISlider class]]) {
                     cellSlider = (UISlider *)oneView;
                     break;
-                }
+                } 
             }
             cellSlider.tag = SLIDER_TAG + row;
             cellSlider.value = [[[self.schemeDictionary objectForKey:@"basic"] objectAtIndex:row] floatValue];
 
             // forced to use this weird format otherwise the label disappears when size of the text is bigger than the original
             NSString *prestring = [NSString stringWithFormat:@"%d",(NSInteger) cellSlider.value];
+
             // turntime 100 means unlimited time turns (set in GameSetup)
             if (row == 1 && (NSInteger) cellSlider.value == 100)
                 prestring = @"∞";
+            else
+                // mines less than 0 means random
+                if (row == 5 && (NSInteger) cellSlider.value == -1)
+                    prestring = NSLocalizedString(@"Rnd",@"Short for 'Random'");
             
             while ([prestring length] <= 4)
                 prestring = [NSString stringWithFormat:@" %@",prestring];
@@ -282,21 +216,24 @@
                 cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle
                                                reuseIdentifier:CellIdentifier2] autorelease];
                 UISwitch *onOff = [[UISwitch alloc] init];
-                onOff.tag = SWITCH_TAG+row;
                 [onOff addTarget:self action:@selector(toggleSwitch:) forControlEvents:UIControlEventValueChanged];
                 cell.accessoryView = onOff;
                 [onOff release];
             }
 
+            UISwitch *switcher = (UISwitch *)cell.accessoryView;
+            switcher.tag = SWITCH_TAG + row;
+            [switcher setOn:[[[self.schemeDictionary objectForKey:@"gamemod"] objectAtIndex:row] boolValue] animated:NO];
+            
             UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/btn%@.png",BTN_DIRECTORY(),[[self.gameModifierArray objectAtIndex:row] objectForKey:@"image"]]];
             cell.imageView.image = image;
             [image release];
             [cell.imageView.layer setCornerRadius:7.0f];
-            [cell.imageView.layer setBorderWidth:1];
             [cell.imageView.layer setMasksToBounds:YES];
             cell.textLabel.text = [[self.gameModifierArray objectAtIndex:row] objectForKey:@"title"];
             cell.detailTextLabel.text = [[self.gameModifierArray objectAtIndex:row] objectForKey:@"description"];
-            [(UISwitch *)cell.accessoryView setOn:[[[self.schemeDictionary objectForKey:@"gamemod"] objectAtIndex:row] boolValue] animated:NO];
+            cell.detailTextLabel.adjustsFontSizeToFitWidth = YES;
+            cell.detailTextLabel.minimumFontSize = 6;
 
             cell.selectionStyle = UITableViewCellSelectionStyleNone;
         }
@@ -323,7 +260,10 @@
     if ([indexPath row] == 1 && [indexPath section] == 1 && (NSInteger) theSlider.value == 100)
         label.text = @"∞";
     else
-        label.text = [NSString stringWithFormat:@"%d",(NSInteger) theSlider.value];
+        if ([indexPath row] == 5 && [indexPath section] == 1 && (NSInteger) theSlider.value == -1)
+            label.text = NSLocalizedString(@"Rnd",@"Short for 'Random'");
+        else
+            label.text = [NSString stringWithFormat:@"%d",(NSInteger) theSlider.value];
     // save changes in the main array
     NSMutableArray *array = [self.schemeDictionary objectForKey:@"basic"];
     [array replaceObjectAtIndex:theSlider.tag-SLIDER_TAG withObject:[NSNumber numberWithInt:(NSInteger) theSlider.value]];
--- a/project_files/HedgewarsMobile/Classes/SplitViewRootController.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SplitViewRootController.m	Sat Oct 30 20:04:38 2010 +0200
@@ -51,7 +51,7 @@
     }
     UINavigationController *rightNavController = [[UINavigationController alloc] initWithRootViewController:self.activeController];
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+    if (IS_IPAD()) {
         MasterViewController *leftController = [[MasterViewController alloc] initWithStyle:UITableViewStylePlain];
         leftController.targetController = self.activeController;
         UINavigationController *leftNavController = [[UINavigationController alloc] initWithRootViewController:leftController];
--- a/project_files/HedgewarsMobile/Classes/WeaponCellView.m	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/WeaponCellView.m	Sat Oct 30 20:04:38 2010 +0200
@@ -133,7 +133,7 @@
     CGFloat shiftSliders = contentRect.origin.x;
     CGFloat shiftLabel = 0;
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+    if (IS_IPAD()) {
         shiftSliders += 65;
         shiftLabel += 165;
     } else
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj	Sat Oct 30 20:04:38 2010 +0200
@@ -141,6 +141,14 @@
 		619C5BA2124FA59000D041AE /* MapPreviewButtonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 619C5BA1124FA59000D041AE /* MapPreviewButtonView.m */; };
 		61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A117FE1168322700359010 /* CoreGraphics.framework */; settings = {ATTRIBUTES = (Required, ); }; };
 		61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; };
+		61A670BE12747D8900B06CE7 /* borderBottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E911DF58550068B24D /* borderBottom.png */; };
+		61A670BF12747D9100B06CE7 /* borderTop.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903EA11DF58550068B24D /* borderTop.png */; };
+		61A670C012747D9B00B06CE7 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83D11E2BCE200A88903 /* Default.png */; };
+		61A670C112747DB900B06CE7 /* MainMenuViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */; };
+		61A670C212747DBD00B06CE7 /* MapConfigViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */; };
+		61A670FA12747E0000B06CE7 /* playButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903EC11DF58550068B24D /* playButton.png */; };
+		61A670FB12747E0D00B06CE7 /* title_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 619C09E911E8B8D600F1DF16 /* title_small.png */; };
+		61A6710612747E4000B06CE7 /* backgroundCenter.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E511DF58550068B24D /* backgroundCenter.png */; };
 		61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; };
 		61C079E411F35A300072BF46 /* EditableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C079E311F35A300072BF46 /* EditableCellView.m */; };
 		61DE8F221257EB1100B80214 /* AmmoMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61DE8F211257EB1100B80214 /* AmmoMenuViewController.m */; };
@@ -1499,7 +1507,14 @@
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Hedgewars" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
 			projectReferences = (
@@ -2126,6 +2141,14 @@
 				6147DAD31253DCDE0010357E /* savesButton.png in Resources */,
 				610D5FB21270E2660033333A /* Icon-Small@2x.png in Resources */,
 				610D5FB31270E26C0033333A /* Icon@2x.png in Resources */,
+				61A670BE12747D8900B06CE7 /* borderBottom.png in Resources */,
+				61A670BF12747D9100B06CE7 /* borderTop.png in Resources */,
+				61A670C012747D9B00B06CE7 /* Default.png in Resources */,
+				61A670C112747DB900B06CE7 /* MainMenuViewController-iPhone.xib in Resources */,
+				61A670C212747DBD00B06CE7 /* MapConfigViewController-iPhone.xib in Resources */,
+				61A670FA12747E0000B06CE7 /* playButton.png in Resources */,
+				61A670FB12747E0D00B06CE7 /* title_small.png in Resources */,
+				61A6710612747E4000B06CE7 /* backgroundCenter.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2323,7 +2346,8 @@
 		61022D7C12305A2800B08935 /* DistributionAppStore */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				APPLY_RULES_IN_COPY_FILES = YES;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Vittorio Giovara";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Vittorio Giovara";
 				FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B  -Sgix -Sc";
@@ -2350,7 +2374,7 @@
 					"\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer/\"",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-lz",
 					"-Wl,-no_order_inits",
@@ -2358,10 +2382,10 @@
 				PREBINDING = NO;
 				PROVISIONING_PROFILE = "450C4020-346A-4F44-8DDE-E71300796C94";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "450C4020-346A-4F44-8DDE-E71300796C94";
-				SDKROOT = iphoneos4.0;
-				TARGETED_DEVICE_FAMILY = 2;
+				SDKROOT = iphoneos4.1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
-				VALID_ARCHS = "armv7 armv6";
+				VALID_ARCHS = "armv6 armv7";
 			};
 			name = DistributionAppStore;
 		};
@@ -2415,7 +2439,8 @@
 		6137064B117B1CB3004EE44A /* DistributionAdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				APPLY_RULES_IN_COPY_FILES = YES;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CODE_SIGN_ENTITLEMENTS = "Entitlements-Distribution.plist";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
@@ -2443,7 +2468,7 @@
 					"\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer/\"",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-lz",
 					"-Wl,-no_order_inits",
@@ -2451,10 +2476,10 @@
 				PREBINDING = NO;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos4.0;
-				TARGETED_DEVICE_FAMILY = 2;
+				SDKROOT = iphoneos4.1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
-				VALID_ARCHS = "armv7 armv6";
+				VALID_ARCHS = "armv6 armv7";
 			};
 			name = DistributionAdHoc;
 		};
@@ -2506,7 +2531,8 @@
 		6164429D11B5CDE500B9A6F3 /* Valgrind */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				APPLY_RULES_IN_COPY_FILES = YES;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CODE_SIGN_IDENTITY = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2537,16 +2563,16 @@
 					"\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer/\"",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-lz",
 					"-Wl,-no_order_inits",
 				);
 				PREBINDING = NO;
-				SDKROOT = iphoneos4.0;
-				TARGETED_DEVICE_FAMILY = 2;
+				SDKROOT = iphoneos4.1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = NO;
-				VALID_ARCHS = "armv7 armv6";
+				VALID_ARCHS = "armv6 armv7";
 			};
 			name = Valgrind;
 		};
@@ -2641,7 +2667,8 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				APPLY_RULES_IN_COPY_FILES = YES;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CODE_SIGN_IDENTITY = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2658,7 +2685,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
 				GCC_STRICT_ALIASING = YES;
 				GCC_THUMB_SUPPORT = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
@@ -2669,23 +2696,24 @@
 					"\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer/\"",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-lz",
 					"-Wl,-no_order_inits",
 				);
 				PREBINDING = NO;
-				SDKROOT = iphoneos4.0;
-				TARGETED_DEVICE_FAMILY = 2;
+				SDKROOT = iphoneos4.1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = NO;
-				VALID_ARCHS = "armv7 armv6";
+				VALID_ARCHS = "armv6 armv7";
 			};
 			name = Debug;
 		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				APPLY_RULES_IN_COPY_FILES = YES;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B  -Sgix -Sc";
@@ -2712,7 +2740,7 @@
 					"\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer/\"",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-lz",
 					"-Wl,-no_order_inits",
@@ -2720,10 +2748,10 @@
 				PREBINDING = NO;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos4.0;
-				TARGETED_DEVICE_FAMILY = 2;
+				SDKROOT = iphoneos4.1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = NO;
-				VALID_ARCHS = "armv7 armv6";
+				VALID_ARCHS = "armv6 armv7";
 			};
 			name = Release;
 		};
--- a/project_files/HedgewarsMobile/Info.plist	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Info.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -28,7 +28,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>1.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib	Sat Oct 30 20:04:38 2010 +0200
@@ -3,12 +3,12 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1024</int>
 		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
+		<string key="IBDocument.InterfaceBuilderVersion">804</string>
 		<string key="IBDocument.AppKitVersion">1038.29</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">117</string>
+			<string key="NS.object.0">123</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -62,7 +62,7 @@
 					<object class="IBUIImageView" id="171108356">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">293</int>
-						<string key="NSFrame">{{118, 25}, {240, 52}}</string>
+						<string key="NSFrame">{{120, 44}, {240, 52}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -74,10 +74,40 @@
 							<string key="NSResourceName">title_small.png</string>
 						</object>
 					</object>
+					<object class="IBUIImageView" id="936485487">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">266</int>
+						<string key="NSFrame">{{0, 297}, {480, 23}}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+						<int key="IBUIContentMode">4</int>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<object class="NSCustomResource" key="IBUIImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">borderBottom.png</string>
+						</object>
+					</object>
+					<object class="IBUIImageView" id="821240857">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrameSize">{480, 17}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+						<int key="IBUIContentMode">4</int>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<object class="NSCustomResource" key="IBUIImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">borderTop.png</string>
+						</object>
+					</object>
 					<object class="IBUIButton" id="124270424">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">289</int>
-						<string key="NSFrame">{{186, 102}, {220, 52}}</string>
+						<string key="NSFrame">{{130, 178}, {220, 52}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@@ -110,64 +140,10 @@
 							<string key="NSResourceName">playButton.png</string>
 						</object>
 					</object>
-					<object class="IBUIButton" id="745970938">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">265</int>
-						<string key="NSFrame">{{72, 222}, {220, 52}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MCAwIDAgMAA</bytes>
-						</object>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<int key="IBUITag">3</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIFont" ref="917635782"/>
-						<reference key="IBUIHighlightedTitleColor" ref="918890028"/>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="112471976"/>
-						<object class="NSCustomResource" key="IBUINormalImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">networkButton.png</string>
-						</object>
-					</object>
-					<object class="IBUIButton" id="836337039">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">260</int>
-						<string key="NSFrame">{{118, 163}, {220, 52}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MCAwIDAgMAA</bytes>
-						</object>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<int key="IBUITag">3</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIFont" ref="917635782"/>
-						<reference key="IBUIHighlightedTitleColor" ref="918890028"/>
-						<object class="NSColor" key="IBUINormalTitleColor" id="111038951">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MAA</bytes>
-						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="111038951"/>
-						<object class="NSCustomResource" key="IBUINormalImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">storeButton.png</string>
-						</object>
-					</object>
 					<object class="IBUIButton" id="753723574">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">269</int>
-						<string key="NSFrame">{{401, 237}, {59, 52}}</string>
+						<string key="NSFrame">{{401, 247}, {59, 52}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -187,42 +163,36 @@
 							<string key="NSResourceName">settingsButton.png</string>
 						</object>
 					</object>
-					<object class="IBUIImageView" id="821240857">
+					<object class="IBUIButton" id="705508539">
 						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrameSize">{480, 17}</string>
+						<int key="NSvFlags">269</int>
+						<string key="NSFrame">{{20, 247}, {59, 52}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<int key="IBUIContentMode">4</int>
-						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<int key="IBUITag">4</int>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<object class="NSCustomResource" key="IBUIImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">borderTop.png</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<reference key="IBUIFont" ref="917635782"/>
+						<reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 						</object>
-					</object>
-					<object class="IBUIImageView" id="936485487">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">266</int>
-						<string key="NSFrame">{{0, 297}, {480, 23}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<int key="IBUIContentMode">4</int>
-						<bool key="IBUIUserInteractionEnabled">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<object class="NSCustomResource" key="IBUIImage">
+						<reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+						<object class="NSCustomResource" key="IBUINormalImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">borderBottom.png</string>
+							<string key="NSResourceName">savesButton.png</string>
 						</object>
 					</object>
 					<object class="IBUIButton" id="818907840">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 270}, {18, 19}}</string>
+						<string key="NSFrame">{{231, 111}, {18, 19}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
+						<float key="IBUIAlpha">0.5</float>
 						<int key="IBUITag">3</int>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
@@ -273,24 +243,6 @@
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">switchViews:</string>
-						<reference key="source" ref="836337039"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">38</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">switchViews:</string>
-						<reference key="source" ref="745970938"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">switchViews:</string>
 						<reference key="source" ref="124270424"/>
 						<reference key="destination" ref="372490531"/>
 						<int key="IBEventType">7</int>
@@ -306,6 +258,15 @@
 					</object>
 					<int key="connectionID">42</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">switchViews:</string>
+						<reference key="source" ref="705508539"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">44</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -322,14 +283,13 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="249993817"/>
-							<reference ref="821240857"/>
-							<reference ref="936485487"/>
-							<reference ref="818907840"/>
 							<reference ref="171108356"/>
 							<reference ref="753723574"/>
+							<reference ref="705508539"/>
 							<reference ref="124270424"/>
-							<reference ref="745970938"/>
-							<reference ref="836337039"/>
+							<reference ref="818907840"/>
+							<reference ref="936485487"/>
+							<reference ref="821240857"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -365,16 +325,6 @@
 						<reference key="parent" ref="191373211"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">25</int>
-						<reference key="object" ref="745970938"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">26</int>
-						<reference key="object" ref="836337039"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">28</int>
 						<reference key="object" ref="753723574"/>
 						<reference key="parent" ref="191373211"/>
@@ -389,6 +339,11 @@
 						<reference key="object" ref="818907840"/>
 						<reference key="parent" ref="191373211"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">43</int>
+						<reference key="object" ref="705508539"/>
+						<reference key="parent" ref="191373211"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -401,29 +356,53 @@
 					<string>1.IBPluginDependency</string>
 					<string>22.IBPluginDependency</string>
 					<string>23.IBPluginDependency</string>
+					<string>23.IBViewBoundsToFrameTransform</string>
 					<string>24.IBPluginDependency</string>
-					<string>25.IBPluginDependency</string>
-					<string>26.IBPluginDependency</string>
+					<string>24.IBViewBoundsToFrameTransform</string>
 					<string>28.IBPluginDependency</string>
+					<string>28.IBViewBoundsToFrameTransform</string>
 					<string>35.IBPluginDependency</string>
+					<string>35.IBViewBoundsToFrameTransform</string>
 					<string>36.IBPluginDependency</string>
+					<string>36.IBViewBoundsToFrameTransform</string>
 					<string>41.IBPluginDependency</string>
+					<string>41.IBViewBoundsToFrameTransform</string>
+					<string>43.IBPluginDependency</string>
+					<string>43.IBViewBoundsToFrameTransform</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>MainMenuViewController</string>
 					<string>UIResponder</string>
-					<string>{{432, 461}, {480, 320}}</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>{{478, 779}, {480, 320}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABC7AAAwpYAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDAgAAw1gAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AUPIgABDdwAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<object class="NSAffineTransform"/>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AQAAAABDlIAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDZwAAwwcAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDywAAw5cAAA</bytes>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -442,7 +421,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">42</int>
+			<int key="maxID">44</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -461,17 +440,6 @@
 							<string key="candidateClassName">id</string>
 						</object>
 					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">versionLabel</string>
-						<string key="NS.object.0">UILabel</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">versionLabel</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">versionLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">Classes/MainMenuViewController.h</string>
@@ -610,14 +578,6 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">UILabel</string>
-					<string key="superclassName">UIView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
 					<string key="className">UIResponder</string>
 					<string key="superclassName">NSObject</string>
 					<reference key="sourceIdentifier" ref="238583711"/>
@@ -711,10 +671,9 @@
 				<string>backgroundCenter.png</string>
 				<string>borderBottom.png</string>
 				<string>borderTop.png</string>
-				<string>networkButton.png</string>
 				<string>playButton.png</string>
+				<string>savesButton.png</string>
 				<string>settingsButton.png</string>
-				<string>storeButton.png</string>
 				<string>title_small.png</string>
 			</object>
 			<object class="NSMutableArray" key="dict.values">
@@ -722,13 +681,12 @@
 				<string>{480, 278}</string>
 				<string>{480, 21}</string>
 				<string>{480, 21}</string>
-				<string>{217, 51}</string>
 				<string>{216, 51}</string>
 				<string>{61, 59}</string>
-				<string>{216, 51}</string>
+				<string>{61, 59}</string>
 				<string>{262, 84}</string>
 			</object>
 		</object>
-		<string key="IBCocoaTouchPluginVersion">117</string>
+		<string key="IBCocoaTouchPluginVersion">123</string>
 	</data>
 </archive>
--- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib	Sat Oct 30 20:04:38 2010 +0200
@@ -3,12 +3,12 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1024</int>
 		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
+		<string key="IBDocument.InterfaceBuilderVersion">804</string>
 		<string key="IBDocument.AppKitVersion">1038.29</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">117</string>
+			<string key="NS.object.0">123</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -45,13 +45,13 @@
 					<object class="IBUISegmentedControl" id="88728219">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 166}, {256, 30}}</string>
+						<string key="NSFrame">{{13, 166}, {256, 30}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBSegmentControlStyle">2</int>
 						<int key="IBNumberOfSegments">4</int>
-						<int key="IBSelectedSegmentIndex">0</int>
+						<int key="IBSelectedSegmentIndex">1</int>
 						<object class="NSArray" key="IBSegmentTitles">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>Random</string>
@@ -91,7 +91,7 @@
 					<object class="IBUISlider" id="938256702">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{121, 240}, {149, 23}}</string>
+						<string key="NSFrame">{{98, 240}, {149, 23}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -103,7 +103,7 @@
 					<object class="IBUIButton" id="326163764">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 20}, {256, 128}}</string>
+						<string key="NSFrame">{{13, 20}, {256, 128}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -130,7 +130,7 @@
 					<object class="IBUILabel" id="634417433">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{54, 234}, {42, 21}}</string>
+						<string key="NSFrame">{{28, 234}, {42, 21}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -150,7 +150,7 @@
 					<object class="IBUILabel" id="743202682">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{123, 203}, {145, 29}}</string>
+						<string key="NSFrame">{{100, 203}, {145, 29}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -172,7 +172,7 @@
 					<object class="IBUITableView" id="565214171">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">274</int>
-						<string key="NSFrame">{{295, 0}, {185, 276}}</string>
+						<string key="NSFrame">{{284, 0}, {196, 276}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="IBUIBackgroundColor" ref="437070330"/>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -495,7 +495,6 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>delegate</string>
 							<string>maxLabel</string>
 							<string>previewButton</string>
 							<string>segmentedControl</string>
@@ -505,7 +504,6 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
 							<string>UILabel</string>
 							<string>MapPreviewButtonView</string>
 							<string>UISegmentedControl</string>
@@ -518,7 +516,6 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>delegate</string>
 							<string>maxLabel</string>
 							<string>previewButton</string>
 							<string>segmentedControl</string>
@@ -529,10 +526,6 @@
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBToOneOutletInfo">
-								<string key="name">delegate</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
 								<string key="name">maxLabel</string>
 								<string key="candidateClassName">UILabel</string>
 							</object>
@@ -833,6 +826,6 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">117</string>
+		<string key="IBCocoaTouchPluginVersion">123</string>
 	</data>
 </archive>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -23,10 +23,13 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
 		<true/>
 		<false/>
 		<false/>
-		<false/>
 		<true/>
 		<false/>
 		<false/>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Basketball.plist	Sat Oct 23 17:26:22 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>30</integer>
-		<integer>100</integer>
-		<integer>15</integer>
-		<integer>0</integer>
-		<integer>3</integer>
-		<integer>4</integer>
-		<integer>0</integer>
-		<integer>0</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<true/>
-		<true/>
-		<true/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<true/>
-		<true/>
-		<true/>
-		<false/>
-	</array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -22,8 +22,8 @@
 		<false/>
 		<false/>
 		<false/>
+		<true/>
 		<false/>
-		<true/>
 		<false/>
 		<false/>
 		<false/>
@@ -34,6 +34,9 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
+		<false/>
+		<false/>
 	</array>
 </dict>
 </plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -22,8 +22,8 @@
 		<false/>
 		<false/>
 		<false/>
+		<true/>
 		<false/>
-		<true/>
 		<false/>
 		<false/>
 		<false/>
@@ -32,7 +32,10 @@
 		<false/>
 		<true/>
 		<true/>
-		<true/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
 		<false/>
 	</array>
 </dict>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -34,6 +34,9 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
+		<false/>
+		<false/>
 	</array>
 </dict>
 </plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -17,7 +17,6 @@
 	<key>gamemod</key>
 	<array>
 		<false/>
-		<false/>
 		<true/>
 		<true/>
 		<false/>
@@ -27,12 +26,16 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
 		<true/>
 		<false/>
 		<false/>
 		<true/>
 		<true/>
-		<true/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
 		<false/>
 	</array>
 </dict>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -22,11 +22,14 @@
 		<false/>
 		<false/>
 		<false/>
+		<true/>
+		<false/>
+		<false/>
+		<false/>
 		<false/>
 		<true/>
 		<false/>
 		<false/>
-		<false/>
 		<true/>
 		<false/>
 		<false/>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -18,7 +18,6 @@
 	<array>
 		<false/>
 		<false/>
-		<false/>
 		<true/>
 		<false/>
 		<false/>
@@ -27,6 +26,7 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
 		<true/>
 		<false/>
 		<false/>
@@ -34,6 +34,9 @@
 		<true/>
 		<true/>
 		<false/>
+		<false/>
+		<false/>
+		<false/>
 	</array>
 </dict>
 </plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/credits.plist	Sat Oct 23 17:26:22 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<array>
-	<array>
-		<string>Andrey &quot;UnC0Rr&quot; Korotaev</string>
-		<string>Igor &quot;Displacer&quot; Ulyanov</string>
-		<string>Derek &quot;Nemo&quot; Pomery</string>
-		<string>Martin &quot;Affect&quot; Boze</string>
-		<string>David &quot;Krawek&quot; Cuadrado</string>
-		<string>Martin &quot;Ttsmj&quot; Minarik</string>
-		<string>Kristian &quot;TheXception&quot; Lehmann</string>
-		<string>Vittorio &quot;Koda&quot; Giovara</string>
-		<string>Mario &quot;Smaxx&quot; Liebisch</string>
-		<string>Carlos &quot;Palewolf&quot; Vives</string>
-		<string>Richard &quot;Sheepluva&quot; Korlyi</string>
-		<string>Henning &quot;Prg&quot; Kühn</string>
-	</array>
-	<array>
-		<string>Tiyuri</string>
-		<string>Joshua Frese</string>
-		<string>Stanko Tadić</string>
-		<string>Julien Koesten</string>
-		<string>Joshua O&apos;Sullivan</string>
-		<string>Nils Luck</string>
-		<string>Trey Perry</string>
-	</array>
-	<array>
-		<string>Stephen &quot;Armagon&quot; Alexander</string>
-		<string>Finn &quot;Tiyuri&quot; Brice</string>
-		<string>Jonatan Nilsson</string>
-		<string>Daniel Martin</string>
-	</array>
-	<array>
-		<string>Romulo Fernandes Machado</string>
-		<string>Svetoslav Stefanov</string>
-		<string>Petr Řezáček</string>
-		<string>Jie Luo</string>
-		<string>Andrey Korotaev</string>
-		<string>Nina Kuisma</string>
-		<string>Antoine Turmel</string>
-		<string>Peter Hüwe, Mario Liebisch</string>
-		<string>Luca Bonora</string>
-		<string>Adam Etienne</string>
-		<string>Maciej Mroziński, Wojciech Latkowski, Maciej Górny</string>
-		<string>Fábio Canário</string>
-		<string>Andrey Korotaev</string>
-		<string>Jose Riha</string>
-		<string>Carlos Vives</string>
-		<string>Niklas Grahn</string>
-		<string>Eugene V. Lyubimkin</string>
-	</array>
-	<array>
-		<string>Aleksey Andreev</string>
-		<string>Aleksander Rudalev</string>
-		<string>Natasha Stafeeva</string>
-		<string>Adam Higerd</string>
-	</array>
-	<array>
-		<string>Engine, frontend, net server author</string>
-		<string>Desktop frontend improvements</string>
-		<string>Many engine and frontend improvements</string>
-		<string>Drillrocket, Ballgun, RC Plane weapons</string>
-		<string>Mine number and time game settings</string>
-		<string>Desktop frontend improvements</string>
-		<string>Desktop frontend improvements</string>
-		<string>Mac OS X and iPhone version</string>
-		<string>Gamepad support, OpenGL wizard</string>
-		<string>Many engine improvements and graphics</string>
-		<string>Many engine and server improvements</string>
-		<string>Maze maps</string>
-	</array>
-	<array>
-		<string></string>
-		<string></string>
-		<string></string>
-		<string></string>
-		<string></string>
-		<string></string>
-		<string>Some hats</string>
-	</array>
-	<array>
-		<string>Hedgehogs voice</string>
-		<string></string>
-		<string></string>
-		<string></string>
-	</array>
-	<array>
-		<string>Brazilian Portuguese</string>
-		<string>Bulgarian</string>
-		<string>Czech</string>
-		<string>Chinese</string>
-		<string>English</string>
-		<string>Finnish</string>
-		<string>French</string>
-		<string>German</string>
-		<string>Italian</string>
-		<string>Japanese</string>
-		<string>Polish</string>
-		<string>Portuguese</string>
-		<string>Russian</string>
-		<string>Slovak</string>
-		<string>Spanish</string>
-		<string>Swedish</string>
-		<string>Ukrainian</string>
-	</array>
-	<array>
-		<string></string>
-		<string></string>
-		<string></string>
-		<string></string>
-	</array>
-</array>
-</plist>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>default</key>
+		<integer>100</integer>
+		<key>image</key>
+		<string>Damage</string>
+		<key>max</key>
+		<integer>300</integer>
+		<key>min</key>
+		<integer>10</integer>
+		<key>title</key>
+		<string>Damage Modifier</string>
+	</dict>
+	<dict>
+		<key>default</key>
+		<integer>45</integer>
+		<key>image</key>
+		<string>Time</string>
+		<key>max</key>
+		<integer>100</integer>
+		<key>min</key>
+		<integer>1</integer>
+		<key>title</key>
+		<string>Turn Time</string>
+	</dict>
+	<dict>
+		<key>default</key>
+		<integer>100</integer>
+		<key>image</key>
+		<string>Health</string>
+		<key>max</key>
+		<integer>200</integer>
+		<key>min</key>
+		<integer>50</integer>
+		<key>title</key>
+		<string>Initial Health</string>
+	</dict>
+	<dict>
+		<key>default</key>
+		<integer>15</integer>
+		<key>image</key>
+		<string>SuddenDeath</string>
+		<key>max</key>
+		<integer>50</integer>
+		<key>min</key>
+		<integer>0</integer>
+		<key>title</key>
+		<string>Sudden Death Timeout</string>
+	</dict>
+	<dict>
+		<key>default</key>
+		<integer>5</integer>
+		<key>image</key>
+		<string>Box</string>
+		<key>max</key>
+		<integer>9</integer>
+		<key>min</key>
+		<integer>0</integer>
+		<key>title</key>
+		<string>Crate Drops</string>
+	</dict>
+	<dict>
+		<key>default</key>
+		<integer>3</integer>
+		<key>image</key>
+		<string>Time</string>
+		<key>max</key>
+		<integer>5</integer>
+		<key>min</key>
+		<integer>-1</integer>
+		<key>title</key>
+		<string>Mines Time</string>
+	</dict>
+	<dict>
+		<key>default</key>
+		<integer>4</integer>
+		<key>image</key>
+		<string>Mine</string>
+		<key>max</key>
+		<integer>80</integer>
+		<key>min</key>
+		<integer>0</integer>
+		<key>title</key>
+		<string>Mines Number</string>
+	</dict>
+	<dict>
+		<key>default</key>
+		<integer>0</integer>
+		<key>image</key>
+		<string>Dud</string>
+		<key>max</key>
+		<integer>100</integer>
+		<key>min</key>
+		<integer>0</integer>
+		<key>title</key>
+		<string>Dud Mines Probability</string>
+	</dict>
+	<dict>
+		<key>default</key>
+		<integer>2</integer>
+		<key>image</key>
+		<string>Damage</string>
+		<key>max</key>
+		<integer>40</integer>
+		<key>min</key>
+		<integer>0</integer>
+		<key>title</key>
+		<string>Explosives</string>
+	</dict>
+</array>
+</plist>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/credits.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<array>
+		<string>Andrey &quot;UnC0Rr&quot; Korotaev</string>
+		<string>Igor &quot;Displacer&quot; Ulyanov</string>
+		<string>Derek &quot;Nemo&quot; Pomery</string>
+		<string>Martin &quot;Affect&quot; Boze</string>
+		<string>David &quot;Krawek&quot; Cuadrado</string>
+		<string>Martin &quot;Ttsmj&quot; Minarik</string>
+		<string>Kristian &quot;TheXception&quot; Lehmann</string>
+		<string>Vittorio &quot;Koda&quot; Giovara</string>
+		<string>Mario &quot;Smaxx&quot; Liebisch</string>
+		<string>Carlos &quot;Palewolf&quot; Vives</string>
+		<string>Richard &quot;Sheepluva&quot; Korlyi</string>
+		<string>Henning &quot;Prg&quot; Kühn</string>
+	</array>
+	<array>
+		<string>Tiyuri</string>
+		<string>Joshua Frese</string>
+		<string>Stanko Tadić</string>
+		<string>Julien Koesten</string>
+		<string>Joshua O&apos;Sullivan</string>
+		<string>Nils Luck</string>
+		<string>Trey Perry</string>
+	</array>
+	<array>
+		<string>Stephen &quot;Armagon&quot; Alexander</string>
+		<string>Finn &quot;Tiyuri&quot; Brice</string>
+		<string>Jonatan Nilsson</string>
+		<string>Daniel Martin</string>
+	</array>
+	<array>
+		<string>Romulo Fernandes Machado</string>
+		<string>Svetoslav Stefanov</string>
+		<string>Petr Řezáček</string>
+		<string>Jie Luo</string>
+		<string>Andrey Korotaev</string>
+		<string>Nina Kuisma</string>
+		<string>Antoine Turmel</string>
+		<string>Peter Hüwe, Mario Liebisch</string>
+		<string>Luca Bonora</string>
+		<string>Adam Etienne</string>
+		<string>Maciej Mroziński, Wojciech Latkowski, Maciej Górny</string>
+		<string>Fábio Canário</string>
+		<string>Andrey Korotaev</string>
+		<string>Jose Riha</string>
+		<string>Carlos Vives</string>
+		<string>Niklas Grahn</string>
+		<string>Eugene V. Lyubimkin</string>
+	</array>
+	<array>
+		<string>Aleksey Andreev</string>
+		<string>Aleksander Rudalev</string>
+		<string>Natasha Stafeeva</string>
+		<string>Adam Higerd</string>
+	</array>
+	<array>
+		<string>Engine, frontend, net server author</string>
+		<string>Desktop frontend improvements</string>
+		<string>Many engine and frontend improvements</string>
+		<string>Drillrocket, Ballgun, RC Plane weapons</string>
+		<string>Mine number and time game settings</string>
+		<string>Desktop frontend improvements</string>
+		<string>Desktop frontend improvements</string>
+		<string>Mac OS X and iPhone version</string>
+		<string>Gamepad support, OpenGL wizard</string>
+		<string>Many engine improvements and graphics</string>
+		<string>Many engine and server improvements</string>
+		<string>Maze maps</string>
+	</array>
+	<array>
+		<string></string>
+		<string></string>
+		<string></string>
+		<string></string>
+		<string></string>
+		<string></string>
+		<string>Some hats</string>
+	</array>
+	<array>
+		<string>Hedgehogs voice</string>
+		<string></string>
+		<string></string>
+		<string></string>
+	</array>
+	<array>
+		<string>Brazilian Portuguese</string>
+		<string>Bulgarian</string>
+		<string>Czech</string>
+		<string>Chinese</string>
+		<string>English</string>
+		<string>Finnish</string>
+		<string>French</string>
+		<string>German</string>
+		<string>Italian</string>
+		<string>Japanese</string>
+		<string>Polish</string>
+		<string>Portuguese</string>
+		<string>Russian</string>
+		<string>Slovak</string>
+		<string>Spanish</string>
+		<string>Swedish</string>
+		<string>Ukrainian</string>
+	</array>
+	<array>
+		<string></string>
+		<string></string>
+		<string></string>
+		<string></string>
+	</array>
+</array>
+</plist>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/gameFlags_en.plist	Sat Oct 30 20:04:38 2010 +0200
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>description</key>
+		<string>Land can not be destroyed</string>
+		<key>image</key>
+		<string>Solid</string>
+		<key>title</key>
+		<string>Solid Land</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Add an indestructable border around the terrain</string>
+		<key>image</key>
+		<string>Border</string>
+		<key>title</key>
+		<string>Add Border</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Teams will start on opposite sides of the terrain (two teams only)</string>
+		<key>image</key>
+		<string>TeamsDivide</string>
+		<key>title</key>
+		<string>Divide Team</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Lower gravity</string>
+		<key>image</key>
+		<string>LowGravity</string>
+		<key>title</key>
+		<string>Low Gravity</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Assisted aiming with laser sight</string>
+		<key>image</key>
+		<string>LaserSight</string>
+		<key>title</key>
+		<string>Laser Sight</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>All hogs have a personal forcefield</string>
+		<key>image</key>
+		<string>Invulnerable</string>
+		<key>title</key>
+		<string>Invulnerable</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Enable random mines</string>
+		<key>image</key>
+		<string>Mines</string>
+		<key>title</key>
+		<string>Add Mines</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Gain 80% of the damage you do back in health</string>
+		<key>image</key>
+		<string>Vampiric</string>
+		<key>title</key>
+		<string>Vampirism Mode</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Share your opponents pain, share their damage</string>
+		<key>image</key>
+		<string>Karma</string>
+		<key>title</key>
+		<string>Karma Mode</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Your hogs are unable to move, test your aim</string>
+		<key>image</key>
+		<string>Artillery</string>
+		<key>title</key>
+		<string>Artillery Mode</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Defend your fort and destroy the opponents (two teams only)</string>
+		<key>image</key>
+		<string>Forts</string>
+		<key>title</key>
+		<string>Fort Mode</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Order of play is random instead of in room order</string>
+		<key>image</key>
+		<string>RandomOrder</string>
+		<key>title</key>
+		<string>Random Order</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Play with a King. If he dies, your side loses</string>
+		<key>image</key>
+		<string>King</string>
+		<key>title</key>
+		<string>King Mode</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Take turns placing your hedgehogs pre-game</string>
+		<key>image</key>
+		<string>PlaceHog</string>
+		<key>title</key>
+		<string>Place Hedgehogs</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Ammo is shared between all clan teams</string>
+		<key>image</key>
+		<string>SharedAmmo</string>
+		<key>title</key>
+		<string>Clan Shares Ammo</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Disable girders when generating random maps</string>
+		<key>image</key>
+		<string>DisableGirders</string>
+		<key>title</key>
+		<string>Disable Girders</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Disable land objects when generating maps</string>
+		<key>image</key>
+		<string>DisableLandObjects</string>
+		<key>title</key>
+		<string>Disable Land Objects</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>AI-controlled hogs respawn on death</string>
+		<key>image</key>
+		<string>AISurvival</string>
+		<key>title</key>
+		<string>AI Survival Mode</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Attacking does not end your turn</string>
+		<key>image</key>
+		<string>InfAttack</string>
+		<key>title</key>
+		<string>Unlimited Attacks</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Weapons are reset to starting values each turn</string>
+		<key>image</key>
+		<string>ResetWeps</string>
+		<key>title</key>
+		<string>Reset Weapons</string>
+	</dict>
+	<dict>
+		<key>description</key>
+		<string>Each hedgehog has its own ammo.</string>
+		<key>image</key>
+		<string>PerHogAmmo</string>
+		<key>title</key>
+		<string>Per Hedgehog Ammo</string>
+	</dict>
+</array>
+</plist>
--- a/project_files/hedgewars.pro	Sat Oct 23 17:26:22 2010 +0200
+++ b/project_files/hedgewars.pro	Sat Oct 30 20:04:38 2010 +0200
@@ -62,9 +62,10 @@
 	SOURCES += ../QTfrontend/xfire.cpp
 }
 
+TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ar.ts 
 TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_bg.ts 	 
+TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_cs.ts 	 
 TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_de.ts 	 
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_cs.ts 	 
 TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_en.ts 	 
 TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_es.ts 	 
 TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_fi.ts 	 
Binary file share/hedgewars/Data/Graphics/Hats/Reserved/Zombie.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/Vampiric.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Locale/ar.txt	Sat Oct 30 20:04:38 2010 +0200
@@ -0,0 +1,469 @@
+; Arabic locale
+
+00:00=رمانة‫
+00:01=عنقودية‫
+00:02=صاروخ‫
+00:03=صاروخ موجه‫
+00:04=بندقية
+00:05=مطرقة
+00:06=ترك
+00:07=حبل
+00:08=لغم
+00:09=مسدس حربي
+00:10=ديناميت
+00:11=مضرب بيسبول
+00:12=لكمة
+00:13=ثانية
+00:14=برشوت
+00:15=هجوم جوي
+00:16=هجوم الغام
+00:17=شعلة
+00:18=بناء
+00:19=نقل
+00:20=تبديل
+00:21=هاون
+00:22=سوط
+00:23=انتحار
+00:24=كيك
+00:25=اغواء
+00:26=ركية
+00:27=قنبلة جحيم
+00:28=صاروخ حفر
+00:29=مسدس كرات
+00:30=حارق
+00:31=طيارة مسيطرة عن بعد
+00:32=جاذبية قليلة
+00:33=تاثير مضاعف
+00:34=غير قابل للاضرار
+00:35=وقت اضافي
+00:36=منظار ليزر
+00:37=مصاص دماء
+00:38=قناص
+00:39=صحن طائر
+00:40=زجاجة حارقة
+00:41=طير
+
+01:00=لنتحارب
+01:01=تعادل
+01:02=%1 يفوز
+01:03=جزء %1%
+01:04=توقف
+01:05=خروج (Y/Esc)?
+01:06=موت مفاجئ
+01:07=%1 متبقي
+01:08=طاقة
+01:09=تحديث...
+01:10=استعمال هذه لن ينهي دورك
+01:11=This weapon or utility is not yet available!
+
+; Event messages
+; Hog (%1) died
+02:00=%1 has kicked the bucket!
+02:00=%1 has seen the light!
+02:00=%1 never saw that coming!
+02:00=%1 waves goodbye!
+02:00=%1 has gone to a better place!
+02:00=%1 meets his maker!
+02:00=%1 can hang on no longer!
+02:00=%1 has done his duty!
+02:00=%1 makes the ultimate sacrifice!
+02:00=%1 departs this mortal coil!
+02:00=%1 makes like a tree and leaves!
+02:00=%1 has timed out!
+02:00=%1 says peace out!
+02:00=%1 will be fondly remembered!
+02:00=%1 has an aneurysm!
+02:00=%1 leaves behind a wife and child
+02:00=%1 has launched his last bazooka
+02:00=%1 has tossed his last grenade
+02:00=%1 has baked his last cake
+02:00=%1 has swung on his last rope
+02:00=%1 has called his last airstrike
+02:00=%1 has pumped his last shotgun
+02:00=%1 has thrown his last melon
+02:00=%1 has drawn his last deagle
+02:00=%1 took one shot too many
+02:00=%1 could really have used a health crate
+02:00=%1 has gone to play a better game
+02:00=%1 has ragequit life
+02:00=%1 fails
+02:00=Poor poor %1...
+02:00=%1 prefers wormux
+02:00=%1 has been blocking shots with his face
+02:00=%1 is a hero amongst me...err..hogs
+02:00=%1 finds his place in Valhalla
+02:00=%1 has left the building
+02:00=%1 goes the way of the dinosaurs
+02:00=%1 brings hedgehogs one step closer to extinction
+02:00=%1 brings a tear to my eye
+02:00=%1 is an ex-hog
+02:00=%1 is pushing up the daisies
+02:00=%1 has ceased to be
+02:00=Say goodbye to %1
+02:00=No hope left for %1
+02:00=%1 faces the final curtain
+02:00=Smoke 'em if you got 'em, %1
+02:00=%1 suffers a Spontaneous Massive Existence Failure
+02:00=%1 has passed on
+02:00=%1 is stone dead
+02:00=%1 is no more
+02:00=%1 has expired
+02:00=Bereft of life, %1 rests in peace
+02:00=%1 joins the choir invisible
+02:00=Farewell %1, we hardly knew ye!
+02:00=%1 had a low tolerance for being shot
+02:00=%1 could have used an extra life
+02:00=Is there a doctor in the house?
+
+; Hog (%1) drowned
+02:01=%1 plays submarine!
+02:01=%1 mimics the Titanic!
+02:01=%1 swims like a stone!
+02:01=%1 floats like a brick!
+02:01=%1 checks out the deep end
+02:01=%1 goes glug glug glug
+02:01=%1 goes splash
+02:01=%1 forgot his armbands
+02:01=%1 really should have taken swimming lessons
+02:01=%1 left his surfboard at home
+02:01=%1 is washed up
+02:01=%1 is one soggy hog
+02:01=%1 forgot to bring his life jacket
+02:01=%1 goes splish splash splish
+02:01=%1 is sleeping with the fishes
+02:01=%1 thinks the water physics suck in this game
+02:01=%1 looks thirsty
+02:01=the sea claims %1
+02:01=%1 is lost at sea
+02:01=%1 should have brought his scuba gear
+02:01=%1 gets a burial at sea
+02:01=%1 has that sinking feeling
+02:01=%1 is practicing his backstroke
+02:01=%1 goes in search of the Titanic
+02:01=%1 is not Jesus
+02:01=%1 is finding Nemo
+02:01=%1 springs a leak
+02:01=You've gotta wonder how many hogs are down there
+02:01=%1 makes the ocean slightly higher
+02:01=%1 didn't enlist in the Navy
+02:01=%1 is doing his impersonation of a dead fish
+02:01=At least you didn't go down the toilet, %1
+02:01=Sonic couldn't swim and neither can %1
+02:01=%1 wants to play Ecco the dolphin
+02:01=%1 has gone to visit Aquaria
+02:01=%1 has found the lost city of Atlantis
+02:01=%1 aims for the lead role in Bioshock 3
+02:01=Your doggy paddle could use a little work, %1
+02:01=%1 should have brought a jet ski
+02:01=%1 doesn't like watersports
+02:01=%1 is forever blowing bubbles
+02:01=%1 is short of a raft
+02:01=%1 thinks salt water is good for the skin
+02:01=%1 gets salt water in his wounds
+02:01=%1 has walked the plank
+02:01=%1 has a bath
+02:01=%1 is wet wet wet
+02:01=%1 gets his quills wet
+02:01=It's Davy Jones' locker for %1
+
+; Round starts
+02:02=Let's fight!
+02:02=Armed and ready!
+02:02=Let's get ready to rumble!
+02:02=Let's get it on!
+02:02=Let's get this party started
+02:02=Last hog standing wins
+02:02=Let's go!
+02:02=Let's rock!
+02:02=Let's jam!
+02:02=It's beginning...
+02:02=This is the start of something big
+02:02=Welcome to Hedgewars
+02:02=Welcome to the front lines
+02:02=Crush your enemies!
+02:02=May the best hog win
+02:02=Victory or death
+02:02=To the victor goes the spoils
+02:02=Losing is not an option
+02:02=Cry havoc! Let loose the hogs of war!
+02:02=Hedgewars, brought to you by Hedgewars.org
+02:02=GL HF
+02:02=Just count yourself lucky you're not up against Tiyuri
+02:02=Just count yourself lucky you're not up against unC0Rr
+02:02=Just count yourself lucky you're not up against Nemo
+02:02=Just count yourself lucky you're not up against Smaxx
+02:02=Just count yourself lucky you're not up against Jessor
+02:02=Give it your all!
+02:02=The losers do the cleaning up!
+02:02=Let the fight of the millenium begin
+02:02=Let the fight of the century begin
+02:02=Let the fight of the decade begin
+02:02=Let the fight of the year begin
+02:02=Let the fight of the month begin
+02:02=Let the fight of the week begin
+02:02=Let the fight of the day begin
+02:02=Let the fight of the hour begin
+02:02=Do your best!
+02:02=Destroy the enemy!
+02:02=Good luck
+02:02=Have fun
+02:02=Fight the good fight
+02:02=Fight dirty
+02:02=Fight with honour
+02:02=Don't give up
+02:02=Never surrender
+02:02=Rock 'em and sock 'em!
+02:02=Let the fragfest begin!
+02:02=I hope you're ready for a tussle!
+02:02=Go Go Go!
+02:02=Hedgehogs advance!
+02:02=Bring it to them!
+02:02=Have no fear!
+02:02=Be brave and conquer
+
+; Round ends (win; unused atm)
+02:03=...
+
+; Round ends (draw; unused atm)
+02:04=...
+
+; New health crate
+02:05=Incoming aid!
+02:05=Medic!
+02:05=First aid from the skies!
+02:05=A health pack for you
+02:05=Good health.. in box form!
+02:05=The doctor calls
+02:05=Fresh band-aids!
+02:05=This will make you feel better
+02:05=A Hi-Potion! Whoops wrong game
+02:05=A pick-me-up!
+02:05=Grab it
+02:05=A healthy snack
+02:05=A remedy to pain
+02:05=Correct Dosage: as many as you can find!
+02:05=Urgent delivery
+02:05=Supplies!
+
+; New ammo crate
+02:06=More weapons!
+02:06=Reinforcements!
+02:06=Lock and load!
+02:06=I wonder what weapon is in there?
+02:06=Supplies!
+02:06=What could be inside?
+02:06=Christmas comes early in Hedgewars
+02:06=A present!
+02:06=Special delivery!
+02:06=It was a nightmare getting this through customs
+02:06=Destructive toys from the heavens
+02:06=Warning! Contents Volatile
+02:06=Pick it up or blow it up, choice is yours
+02:06=Goodies!
+02:06=Mmmmm Ammo
+02:06=A box of destructive power
+02:06=Airmail!
+02:06=Whatever's in that box, it ain't pizza
+02:06=Get it!
+02:06=Weapon drop incoming
+02:06=Don't let the enemy grab that!
+02:06=Shiny new toys!
+02:06=A mysterious box!
+
+; New utility crate
+02:07=Tooltime!
+02:07=This could come in handy...
+02:07=Utilities!
+02:07=Utilise this box
+02:07=Watch out below
+02:07=More utilities!
+02:07=Tools for you!
+02:07=This should be good!
+02:07=Use this wisely
+02:07=Ooo this box is heavy
+02:07=You might need this
+
+; Hog (%1) skips his turn
+02:08=%1 is sooo boring...
+02:08=%1 couldn't be bothered
+02:08=%1 is one lazy hog
+02:08=%1 is thoughtless
+02:08=%1 gave up
+02:08=You snooze you lose, %1
+02:08=%1 shamelessly skips
+02:08=%1 is really lazy
+02:08=%1 needs a little more motivation
+02:08=%1 is a pacifist
+02:08=%1 has a breather
+02:08=%1 has a rest
+02:08=%1 chills out
+02:08=%1 has no faith in his own abilities
+02:08=%1 decides to do nothing at all
+02:08=%1 lets the enemy destroy itself
+02:08=%1 would be terrible at parties
+02:08=%1 hides out
+02:08=%1 has decided to pass on this opportunity
+02:08=%1 decides the best thing he can do is...nothing
+02:08=%1 is a big wuss
+02:08=Buck Buck Buck, %1 is a chicken
+02:08=%1 is looking a little yellow
+02:08=%1 is a coward!
+02:08=%1 is waiting for sudden death
+02:08=%1 is not the fighting type
+02:08=%1 is reconsidering his purpose in life
+02:08=%1 was never much of a good shot anyway
+02:08=%1 didn't want to join the army in the first place
+02:08=Stop wasting our time, %1
+02:08=I'm dissapointed in you, %1
+02:08=Come on, you can do better than that %1
+02:08=%1's will has broken
+02:08=%1 apparently has better things to do
+02:08=%1 is scared stiff
+02:08=%1 has fallen asleep
+
+; Hog (%1) hurts himself only
+02:09=%1 should practice aiming!
+02:09=%1 seems to hate himself
+02:09=%1 is standing on the wrong side!
+02:09=%1 makes like an emo
+02:09=%1 was holding his weapon the wrong way around
+02:09=%1 is a little sadistic
+02:09=%1 is a masochist
+02:09=%1 has no instinct of self-preservation
+02:09=%1 messed up
+02:09=%1 screwed up
+02:09=That was a poor shot, %1
+02:09=%1 is a little too careless with dangerous weapons
+02:09=%1 should consider a change of career
+02:09=Worst. Shot. Ever!
+02:09=No no no %1, you shoot at the ENEMY!
+02:09=%1 should only be destroying the enemy
+02:09=%1 moves one step closer to suicide
+02:09=%1 aids the enemy
+02:09=That was stupid %1
+02:09=%1 lives by the mantra of "no pain, no gain"
+02:09=%1 is confused
+02:09=%1 hurt itself in its confusion
+02:09=%1 has a knack for embarrassing himself
+02:09=%1 is a klutz!
+02:09=%1 is clumsy
+02:09=%1 shows the enemy what he's capable of
+02:09=%1 can't be expected to be perfect all the time
+02:09=Don't worry %1, pobody's nerfect
+02:09=%1 totally did that on purpose
+02:09=I won't tell anyone if you don't, %1
+02:09=How embarrassing!
+02:09=I'm sure nobody saw that %1
+02:09=%1 needs to review his field manual
+02:09=%1's weapon clearly malfunctioned
+
+; Hog shot an home run (using the bat and another hog)
+02:10=Home Run!
+02:10=A bird, a plane, ...
+02:10=That one is out!
+
+; Weapon Categories
+03:00=Timed Grenade
+03:01=Timed Grenade
+03:02=Ballistic Weapon
+03:03=Guided Weapon
+03:04=Gun (multiple shots)
+03:05=Digging Tool
+03:06=Action
+03:07=Transport Utility
+03:08=Proximity Bomb
+03:09=Gun (multiple shots)
+03:10=BOOM!
+03:11=Bonk!
+03:12=Martial Arts
+03:13=UNUSED
+03:14=Transport Utility
+03:15=Airborne Attack
+03:16=Airborne Attack
+03:17=Digging Tool
+03:18=Utility
+03:19=Transport Utility
+03:20=Action
+03:21=Ballistic Weapon
+03:22=Call me Indiana!
+03:23=(Really) Martial Arts
+03:24=The cake is NOT a lie!
+03:25=Costume Kit
+03:26=Juicy Grenade
+03:27=Fiery Grenade
+03:28=Ballistic Weapon
+03:29=Ballistic Weapon
+03:30=Airborne Attack
+03:31=Remote Controlled Bomb
+03:32=Temporary Effect
+03:33=Temporary Effect
+03:34=Temporary Effect
+03:35=Temporary Effect
+03:36=Temporary Effect
+03:37=Temporary Effect
+03:38=Gun (multiple shots)
+03:39=Transport Utility
+03:40=Incinerating Grenade
+03:41=Huge fan of Squawks
+
+; Weapon Descriptions (use | as line breaks)
+04:00=Attack your enemies using a simple grenade.|It will explode once its timer reaches zero.|1-5: Set grenade's timer|Attack: Hold to throw with more power
+04:01=Attack your enemies using a cluster bomb.|It will split into smaller bombs once its timer|reaches zero.|1-5: Set grenade's timer|Attack: Hold to throw with more power
+04:02=Attack your enemies using a ballistic projectile|that might be influenced by wind.|Attack: Hold to shoot with more power
+04:03=Launch an explosive bee that will lock on|the selected target. Don't shoot with full power|to improve its precision.|Cursor: Pick target|Attack: Hold to shoot with more power
+04:04=Attack your enemy using a shotgun with two shots.|Thanks to its spread you don't need direct hits|to harm your opponents.|Attack: Shoot (multiple times)
+04:05=Move underground! Use the pickhammer to drill|a hole into the ground and reach other areas.|Attack: Start or stop digging
+04:06=Bored? No way to attack? Save your ammo?|No problem! Just skip your turn, coward!|Attack: Skip your turn without fighting
+04:07=Bridge huge distances using timed shots with the|rope. Use your momentum to slide into other hogs|or drop grenades and other weapons on them.|Attack: Shoot or release the rope|Long Jump: Drop grenades or similar weapons
+04:08=Keep your enemies away by dropping a mine in|narrow passages or right below their feet. Be|sure to retreat before you trigger it yourself!|Attack: Drop mine next to your feet
+04:09=Not sure about your aiming? Use the Desert|Eagle to attack using up to four shots.|Attack: Shoot (multiple times)
+04:10=Brute force is always an option. Drop this classic|explosive next to your enemies and retreat.|Attack: Drop dynamite next to your feet
+04:11=Get rid of enemy hogs by batting them over|the map borders or into water. Or how about|knocking some mines to your friends?|Attack: Bat everything in front of you
+04:12=Get close and personal to unleash the power of|this almost deadly martial arts technique.|Attack: Perform the Fire Punch
+04:13=UNUSED
+04:14=Fear of heights? Better grab a parachute.|It will unfold once|you fall too far and|save your hog from taking fall damage.|Attack: Unfold the parachute|Long Jump: Drop grenades or similar weapons
+04:15=Call in an airplane to attack your enemies|using a bombing run.|Left/Right: Determine attack direction|Cursor: Select target region
+04:16=Call in an airplane to drop several mines|in the target area.|Left/Right: Determine attack direction|Cursor: Select target region
+04:17=Need shelter? Use the blow torch to dig|a tunnel into solid ground granting you|cover.|Attack: Start or stop digging
+04:18=Need additional protection or want to pass|unpassable ground? Place some girders as you|like.|Left/Right: Select girder to place|Cursor: Place girder in a valid position
+04:19=Used at the right moment teleportation can|be more powerful than almost all weapons as|it allows you to save hogs from dangerous|situations within seconds.|Cursor: Select target region
+04:20=Allows you to play the current turn with|a different hog.|Attack: Enable switching hogs
+04:21=Shoot a grenade-like projectile that will|release multiple bombs upon impact.|Attack: Shoot at full power
+04:22=Not just for Indiana Jones! The whip is a|useful weapon in many situations. Especially|when you'd like to shove someone off a cliff.|Attack: Strike everything in front of you
+04:23=If you have nothing to lose, this might be|quite handy. Sacrifice your hog by launching|him into a specific direction hurting everything|on his way and exploding at the end.|Attack: Launch the devastating and deadly attack
+04:24=Happy Birthday! Launch this cake, let it walk right|next to your enemies and let them have an explosive|party. The cake is able to pass almost all terrain|but he might detonate earlier this way.|Attack: Start the cake or let it stop and explode
+04:25=Use this disguise kit to get your enemies to jump|towards your hog (and into some gap or hole).|Attack: Use the kit and try to seduce another hog
+04:26=Throw this juicy watermelon at your enemies. Once|the timer expires, it will split into several|explosive pieces.|1-5: Set watermelon's timer|Attack: Hold to shoot with more power
+04:27=Let hellfire rain onto your opponents by using|this fiendish explosive. Don't get too close to|the explosion as smaller fires might last longer.|Attack: Hold to shoot with more power
+04:28=Short time after launching this rocket, it will|start drilling through solid ground and explode|once its fuse is triggered or it resurfaces again.|Attack: Hold to shoot with more power
+04:29=This is nothing for small kids! The ball gun fires|tons of small colored balls filled with explosives.|Attack: Shoot at full power|Up/Down: Continue aiming
+04:30=Call in an airplane to launch a powerful napalm|strike. With proper aiming this attack can eradicate|huge parts of landscape including unlucky hogs|sitting there.|Left/Right: Determine attack direction|Cursor: Select target region
+04:31=The RC plane is the ideal weapon to collect crates or|attack far away hogs. Either steer it into enemies or|drop some bombs first.|Attack: Launch the plane or drop bombs|Long Jump: Let the valkyries ride into battle|Up/Down: Steer the plane
+04:32=Low gravity is more effective than any diet! Jump|higher and over greater distances or let your enemies|fly even further.|Attack: Activate
+04:33=Sometimes you just need that little extra boost to|deal some more damage.|Attack: Activate
+04:34=Can't touch me!|Attack: Activate
+04:35=Sometimes time's running too fast. Grab some extra|seconds to finish your attack.|Attack: Activate
+04:36=Well, sometimes you're just too bad in aiming. Get|some assistance using modern day technology.|Attack: Activate
+04:37=Don't fear the daylight. It will just last one turn|but will enable you to absorb the damage you do to|other hogs.|Attack: Activate
+04:38=The sniper rifle can be the most devastating weapon|in your whole arsenal, however it's very ineffective|at close quarters. The damage dealt increases with|the distance to its target.|Attack: Shoot (twice)
+04:39=Fly to other parts of the map using the flying|saucer. This hard to master utility is able to|take you to almost any position on the battlefield.|Attack: Activate|Up/Left/Right: Apply force in one direction|Long Jump: Drop grenades or similar weapons
+04:40=Set some ground on fire using this bottle filled|with (soon to be) burning liquid.|Attack: Hold to shoot with more power
+04:41=The evidence nature might even top the flying|saucer. Birdy can carry your hog around and|drop eggs on your enemies!|Attack: Activate and drop eggs|Up/Left/Right: Flap in one direction
+
+; Game goal strings
+05:00=Game Modes
+05:01=The following rules apply
+05:02=Forts: Defend your fortress; vanquish your enemies!
+05:03=Low Gravity: Watch your step
+05:04=Invulnerability: Hogs are (almost) invulnerable
+05:05=Vampirism: Hogs will be healed for the damage dealt
+05:06=Karma: Hogs will be damaged for the damage dealt
+05:07=Protect the King: Don't let your king die!|Place the King: Pick a protected starting point for your King
+05:08=Place Hedgehogs: Place your hogs before the game starts
+05:09=Artillery: Hogs can't walk to change position
+05:10=Indestructible Terrain: Most weapons won't destroy terrain
+05:11=Shared Ammo: All teams of the same color share their ammunition
+05:12=Mine Timers: Mines will detonate after %1 second(s)
+05:13=Mine Timers: Mines will detonate instantly
+05:14=Mine Timers: Mines will detonate after 0 - 3 seconds
+05:15=Damage Modifier: All weapons will do %1% damage
--- a/share/hedgewars/Data/Locale/es.txt	Sat Oct 23 17:26:22 2010 +0200
+++ b/share/hedgewars/Data/Locale/es.txt	Sat Oct 30 20:04:38 2010 +0200
@@ -1,5 +1,5 @@
 ; Spanish locale
-; Revision 3205
+; Revision 3987
 
 00:00=Granada
 00:01=Granada de frag.
@@ -43,6 +43,14 @@
 00:39=Platillo volante
 00:40=Cóctel molotov
 00:41=Birdy
+00:42=Dispositivo portátil de portales
+00:43=Piano
+00:44=Limbuger añejo
+00:45=Rifle sinusoidal (beta)
+00:46=Lanzallamas
+00:47=Bomba lapa
+00:48=Mazo
+00:49=Resurrección (beta)
 
 01:00=¡Luchad!
 01:01=Empate
@@ -56,6 +64,9 @@
 01:09=Sincronizando...
 01:10=Activar esta herramienta no hará que tu turno acabe.
 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!
 
 ; Eventos
 ; El erizo (%1) ha muerto
@@ -361,6 +372,13 @@
 02:10=Es un pájaro, es un avión...
 02:10=¡Eliminado!
 
+; El erizo (%1) abandona (el equipo ha salido de la partida)
+02:11=¡%1 tiene que irse a mimir!
+02:11=¡%1 tiene que irse a la cama!
+02:11=Parece que %1 está demasiado ocupado para seguir jugando
+02:11=¡Teletranspórtame, Scotty!
+02:11=%1 tiene que irse
+
 ; Categorías de armamento
 03:00=Arma arrojadiza
 03:01=Arma arrojadiza
@@ -404,6 +422,14 @@
 03:39=Herramienta de transporte
 03:40=Bomba incendiaria
 03:41=Amigo chillón
+03:42=Creo que voy a tomar una nota...
+03:43=E interpretando el Cascanueces tenemos a...
+03:44=Consumir preferentemente antes de 1923
+03:45=¡El poder de la ciencia!
+03:46=¡Caliente caliente caliente!
+03:47=¡Pégalo en un buen sitio!
+03:48=Pablo clavó un clavito
+03:49=Hace exactamente lo que dice
 
 ; 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.
@@ -411,12 +437,12 @@
 04:02=Ataca a tus enemigos usando un proyectil balístico.|¡Atención al viento, modificará su trayectoria!|Atacar: mantener presionado para lanzar más lejos.
 04:03=Lanza un abejorro explosivo que buscará el objetivo marcado.|No dispares a máxima potencia para mejorar su precisión.|Ratón: seleccionar objetivo.|Atacar: mantener presionado para lanzar más lejos.
 04:04=Ataca a tus enemigos usando una escopeta de dos cañones.|Las balas se dispersan, así que no necesitarás|un tiro directo para herir a tus oponentes.|Atacar: abrir fuego (dos tiros).
-04:05=¡Ve bajo tierra! Usa el martillo neumático para excavar|un pozo en el suelo y alcanzar otras áreas.|Atacar: empezar o terminar de cavar.
+04:05=¡Entiérrate! Usa el martillo neumático para excavar|un pozo en el suelo y alcanzar otras áreas.|Atacar: empezar o terminar de cavar.
 04:06=¿Aburrido? ¿Sin posibilidad de atacar? ¿Racionas tu munición?|¡No hay problema! ¡Adelante, pasa esta turno, gallina!|Atacar: pasa este turno sin hacer nada.
 04:07=Cubre grandes distancias usando hábilmente la cuerda.|Gana inercia para empujar a otros erizos|o deja caer granadas u otras armas sobre ellos.|Atacar: lanza o suelta la cuerda.|Salto: deja caer el arma seleccionada.
 04:08=Mantén alejados a tus enemigos desplegando minas|en pasadizos estrechos o justo bajo sus pies.|¡Asegúrate de alejarte rápidamente para no activarla tú mismo!|Atacar: deposita una mina ante ti.
 04:09=¿No confías en tu puntería? Con la desert eagle|tienes 4 disparos para conseguir alcanzar a tu enemigo.|Atacar: abrir fuego (hasta 4 veces).
-04:10=La fuerza bruta siempre es una opción. Lanza este clásico|explosivo cerca de tus enemigos y huye.|Atacar: deposita la dinamita ante ti.
+04:10=La fuerza bruta siempre es una opción. Coloca este clásico|explosivo cerca de tus enemigos y huye.|Atacar: deposita la dinamita ante ti.
 04:11=¡Manda a tus enemigos lejos de ti de un buen batazo!|Acaba con ellos lanzándolos fuera del mapa o al agua.|¿O qué tal lanzarles algunas minas?|Atacar: batear cualquier cosa delante de ti.
 04:12=Enfréntate cara a cara con tus enemigos|y libera el poder de tus puños sobre ellos.|Útil para lanzarlos fuera del mapa o al agua.|Atacar: ejecutar el puño de fuego.
 04:13=SIN USAR
@@ -429,7 +455,7 @@
 04:20=Te permite jugar este turno con otro de tus erizos.|Atacar: activar.|Tabulador: cambiar entre erizos una vez activada.
 04:21=Lanza un proyectil que se fragmentará al impactar, enviando|una lluvia explosiva sobre tus enemigos.|Atacar: lanzar a máxima potencia.
 04:22=¡Siéntete como Indiana Jones! El látigo es un arma muy útil|en ciertas situaciones, especialmente para deshacerte de|erizos enemigos enviándolos fuera del mapa o al agua.|Atacar: golpear cualquier cosa delante de ti.
-04:23=Si no tienes nada que perder, esto puede serte útil.|Sacrifica a tu erizo lanzándolo como un cohete que despejará|cualquier cosa que encuentre en su camino, explotando al final.|Atacar: manda a tu erizo a la perdición.
+04:23=Si no tienes nada que perder, esto puede serte útil.|Sacrifica a tu erizo lanzándolo como un cohete que despejará|cualquier cosa que encuentre en su camino, detonando al final.|Atacar: manda a tu erizo a la perdición.
 04:24=¡Feliz cumpleaños! Esta tarta bípeda caminará|hasta tus enemigos para darles una fiesta sorpresa explosiva.|La tarta es capaz de atravesar casi cualquier tipo de terreno,|pero evita que se quede atascada.|Atacar: enviar la tarta de camino o hacerla detonar.
 04:25=Utiliza este disfraz para seducir a tus enemigos,|haciéndoles perder la cabeza y saltar como locos hacia ti|(y de paso hacia el agua o una mina).|Atacar: disfrazarte y lanzar un beso a tus enemigos.
 04:26=Lanza esta jugosa sandía a tus enemigos.|Una vez el temporizador llegue a cero se fragmentará|en rodajas deliciosamente explosivas sobre tus enemigos.|Atacar: mantener presionado para lanzar más lejos.
@@ -440,14 +466,22 @@
 04:31=El avión teledirigido es el arma ideal para recoger cajas|o atacar enemigos lejanos.|Cargado con 3 bombas, el avión explotará|si choca contra algo.|Atacar: lanzar el avión o dejar caer las bombas.|Cursores: controlar el avión.
 04:32=¡Mucho mejor que cualquier dieta! Salta más alto y más lejos|o haz que tus enemigos vuelen incluso más lejos.|Atacar: activar.
 04:33=A veces uno necesita una pequeña ayuda para acabar con sus enemigos.|Atacar: activar.
-04:34=¡Na, na, no me tocas!|Atacar: activar.
+04:34=¡Na, na, na, no me tocas!|Atacar: activar.
 04:35=A veces el reloj corre demasiado deprisa. Consigue un poco|de tiempo extra para finalizar tu ataque.|Atacar: activar.
 04:36=Vaya, parece que tu puntería apesta. Por suerte para ti|la tecnología moderna está de tu lado.|Atacar: activar.
 04:37=No le temas a la luz del día. Sólo durará un turno, pero|te permitirá absorber la fuerza vital de tus enemigos|cuando les ataques.|Atacar: activar.
 04:38=El rifle de francotirador puede ser el arma más destructiva|de todo tu arsenal, pero es muy inefectiva en distancias cortas.|El daño infligido es proporcional a la distancia respecto del objetivo.|Atacar: abrir fuego (un disparo).
 04:39=Vuela hasta otras partes del mapa usando un platillo volante.|Puede ser complicado de controlar, pero conseguirás llegar|a sitios que nunca hubieras imaginado accesibles.|Atacar: activar.|Cursores: acelerar en esa dirección (un golpe cada vez).
 04:40=Alza un muro de fuego usando esta botella|llena de (en breve, ardiendo) líquido inflamable.|Atacar: mantener presionado para lanzar más lejos.
-04:41=¡Demostrando que lo natural puede ser mejor|que lo artificial, Birdy puede no sólo|transportar tu erizo como el platillo volante,|sino también lanzar huevos envenenados a tus enemigos!|Atacar: activar y lanzar huevos.|Cursores: aletear en esa dirección.
+04:41=¡Demostrando que lo natural puede ser mejor|que lo artificial, Birdy puede no sólo|transportar tu erizo como el platillo volante,|sino también lanzar huevos envenenados a tus enemigos!|Atacar: activar/lanzar huevos.|Cursores: aletear en esa dirección.
+04:42=El dispositivo portátil de portales es capaz de|transportar instantáneamente minas, armas o ¡incluso erizos!|Úsalo adecuadamente y tu campaña será un... |¡ÉXITO ALUCINANTE!|Atacar: disparar un portal.|Cambiar: alternar el color a disparar.
+04:43=¡Haz un debut explosivo en el mundo del espectáculo!|Lanza un piano desde lo más alto del firmamento, pero ten cuidado...|¡alguien debe tocarlo, y eso puede costarte la vida!|Ratón: seleccionar objetivo.|F1-F9: tocar el piano.
+04:44=¡No es simplemente queso, es un arma biológica!|No causará mucho daño al detonar, pero ten por seguro|que cualquiera que se acerque demasiado|a su oloroso rastro quedará gravemente intoxicado.|1-5: ajustar temporizador.|Atacar: mantener presionado para lanzar más lejos.
+04:45=Al fin una utilidad para todas esas clases de física.|Dispara una devastadora onda sinusoidal que mandará|a tus enemigos al infierno matemático.|Ten cuidado, el retroceso de este arma es considerable.|Atacar: disparar.
+04:46=Envuelve a tus enemigos en siseante fuego líquido.|¡Se derretirán de placer!|Atacar: activar.|Arriba/abajo: modificar trayectoria.|Izquierda/derecha: modificar potencia de fuego.
+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.
 
 ; Game goal strings
 05:00=Modos de juego
--- a/share/hedgewars/Data/Locale/fi.txt	Sat Oct 23 17:26:22 2010 +0200
+++ b/share/hedgewars/Data/Locale/fi.txt	Sat Oct 30 20:04:38 2010 +0200
@@ -3,7 +3,7 @@
 00:00=Kranaatti
 00:01=Sirpalekranaatti
 00:02=Sinko
-00:03=UFO
+00:03=Mehiläinen
 00:04=Haulikko
 00:05=Pora
 00:06=Hyppää yli
@@ -41,6 +41,15 @@
 00:38=Tarkkuuskivääri
 00:39=Lentävä lautanen
 00:40=Polttopullo
+00:41=Lintu
+00:42=Siirrettävä portaalilaite
+00:43=Piano-isku
+00:44=Vanha Limburger-juusto
+00:45=Sini-aaltopyssy
+00:46=Liekinheitin
+00:47=Tarttuva pommi
+00:48=Vasara
+00:49=Henkiinherättäjä
 
 01:00=Taistelu alkakoon!
 01:01=Tasapeli
@@ -54,6 +63,10 @@
 01:09=Synkronoidaan...
 01:10=Tämän apuvälineen käyttäminen ei päätä vuoroasi!
 01:11=Tämä ase tai apuväline ei ole vielä käytettävissä!
+01:12=Viimeinen kierros ennen äkkikuolemaa!
+01:13=%1 kierrosta jäljellä äkkikuolemaan!
+01:14=Valmistaudu, %1!
+
 
 ; Event messages
 ; Hog (%1) died
@@ -69,7 +82,7 @@
 02:00=%1 poistuu kuolevaisten keskuudesta!
 02:00=%1:ltä loppui aika!
 02:00=%1 toivottaa päivän jatkot!
-02:00=%1:stä muistellaan hartaasti!
+02:00=%1:a muistellaan hartaasti!
 02:00=%1:llä on valtimonpullistuma!
 02:00=%1 jättää jälkeensä puolisonsa ja lapsensa
 02:00=%1 on laukaissut viimeisen sinkonsa
@@ -102,13 +115,14 @@
 02:00=Viimeinen esirippu laskeutuu %1:en ylle
 02:00=%1 kärsii Spontaanista Massiivisesta Olemassaolokohtauksesta
 02:00=%1 on kuollut kuin kivi
-02:00=%1 ei ole enää
+02:00=%1 lakkasi olemasta
 02:00=%1:n eräpäivä on mennyt
 02:00=%1 liittyy näkymättömään kuoroon
 02:00=Voi hyvin, %1, emme koskaan oppineet tuntemaan sinua!
 02:00=%1 ei kestänyt ammutuksi joutumista
 02:00=%1 olisi tarvinnut ylimääräistä elämää
 02:00=Onko lääkäriä lähellä?
+02:00=%1 heitti lusikan nurkkaan.
 
 ; Hog (%1) drowned
 02:01=%1 leikkii sukellusvenettä!
@@ -167,6 +181,7 @@
 02:02=Nyt se alkaa...
 02:02=Tästä alkaa jotain isoa
 02:02=Tervetuloa Hedgewarsiin
+02:02=Tervetuloa siilisotaan
 02:02=Tervetuloa eturiveihin
 02:02=Murskatkaa vihollisenne!
 02:02=Paras siili voittakoon
@@ -189,7 +204,7 @@
 02:02=Päivän taistelu alkakoon
 02:02=Tunnin taistelu alkakoon
 02:02=Tehkää parhaanne!
-02:02=Tuhotkaa vihollisensa!
+02:02=Tuhotkaa vihollisenne!
 02:02=Hyvää onnea!
 02:02=Pitäkää hauskaa
 02:02=Taistelkaa hyvä taistelu
@@ -197,12 +212,12 @@
 02:02=Taistelkaa kunniasta
 02:02=Älkää antako periksi
 02:02=Älkää luovuttako
-02:02=Murhanäyttely alkakoon!
+02:02=Murhanäytelmä alkakoon!
 02:02=Toivottavasti olette valmiina tappeluun!
 02:02=Go Go Go!
 02:02=Siilit, eteenpäin!
-02:02=Älkää pelatko!
-02:02=Olkaa urheita ja valloittakaa
+02:02=Älkää pelätko!
+02:02=Olkaa urheita ja voittakaa
 
 ; Round ends (win; unused atm)
 02:03=...
@@ -219,7 +234,7 @@
 02:05=Tohtori soittaa
 02:05=Tuoreita siteitä!
 02:05=Tämä saa sinut tuntemaan itsesi terveemmäksi
-02:05=Hi-Potion! Eiku väärä päeli
+02:05=Hi-Potion! Eiku väärä peli
 02:05=Hae se!
 02:05=Terveellinen välipala
 02:05=Helpotus kipuun
@@ -385,12 +400,22 @@
 03:38=Ase (useita laukauksia)
 03:39=Kuljetusväline
 03:40=Polttava kranaatti
+03:41=Kääkkyvä kaveri
+03:42=I'm making a note here...
+; the misspelled "Beethoven" is intentional (-> to beat)
+03:43=Soittaa Beathovenin tappavan soneetin
+03:44=Parasta ennen: 1923
+03:45=Tieteen voima
+03:46=Kuuma kuuma kuuma!
+03:47=Kiinnitä nämä hyödylliseen paikkaan!
+03:48=Vasarointiaika.
+03:49=Tekee sitä mitä luulet sen tekevän.
 
 ; Weapon Descriptions (use | as line breaks)
 04:00=Hyökkää yksinkertaisella kranaatilla.|Se räjähtää kun ajastimesta loppuu aika.|1-5: Säädä kranaatin ajastin|Hyökkää: Pidä pohjassa lisätäksesi heittovoimaa
 04:01=Hyökkää sirpalepommilla.|Se jakaantuu pienemmiksi pommeiksi ajan|loppuessa ajastimesta|1-5: Säädä kranaatin ajastin|Hyökkää: Pidä pohjassa lisätäksesi heittovoimaa
 04:02=Hyökkää ballistisella ammuksella|johon tuuli saattaa vaikuttaa|Hyökkää: Pidä pohjassa lisätäksesi voimaa
-04:03=Laukaise ohjattu pommi joka lukittuu|valittuun kohteeseen. Älä ammu täydellä voimalla|lisätäksesi tarkkuutta|Kursori: Valitse kohde|Hyökkää: Pidä pohjassa lisätäksesi voimaa
+04:03=Laukaise ohjattu mehiläinen joka lukittuu|valittuun kohteeseen. Älä ammu täydellä voimalla|lisätäksesi tarkkuutta|Kursori: Valitse kohde|Hyökkää: Pidä pohjassa lisätäksesi voimaa
 04:04=Ammu vihollisiasi kahdesti laukeavalla haulikolla.|Kiitos leviämisen sinun ei tarvitse tähdätä suoraan|vahingoittaeksi vihollisiasi.|Hyökkää: Ammu (useita kertoja)                   
 04:05=Siirry maan alle! Käytä maaporaa porataksesi|reiän maahan päästäksesi muille alueille.|Hyökkää: Aloita ja lopeta kaivaminen
 04:06=Tylsää? Ei mitään tapaa hyökätä? Säästät ammuksiasi?|Ei hätää! Jätä vuoro väliin, pelkuri!|Hyökkää: Jätä vuorosi väliin ilman tappelua
@@ -428,6 +453,15 @@
 04:38=Tarkkuuskivääri on tuhoisin ase arsenaalissasi,|mutta tehoton lähietäisyydellä.|Tehty vahinko lisääntyy etäisyyden mukaan|Hyökkää: Ammu (kahdesti)
 04:39=Lennä kartan muihin osiin lentävällä lautasella|Tämä vaikeasti omaksuttava apuväline vie sinut melkein minne tahansa|Hyökkää: Aktivoi|Ylös/Vasen/Oikea: Liiku tiettyyn suuntaan
 04:40=Sytytä maa tuleen tällä pullolla (kohta) palavaa nestettä|Hyökkää: Pidä pohjassa lisätäksesi voimaa
+04:41=Todiste siitä että luonto on lentävää lautastakin|parempi. Lintu voi kuljettaa siiliä ympäriinsä ja|pudottaa munia vihollisten päälle|Hyökkää: Aktivoi ja pudota munia|Ylös/Vasen/Oikea: Räpytä yhteen suuntaan
+04:42=Tämä siirrettävä portaalilaite pystyy välittömästi|siirtämään sinut, vihollisesi tai ammuksesi|kahden paikan välillä.|Käytä sitä viisaasti ja kampanjasi tulee olemaan...|HUGE SUCCESS!|Hyökkää: Ammu portaali|Vaihto: Vaihda portaalien välillä
+04:43=Tee musikaalisesta debyytistäsi räjähtävä menestys!|Pudota piano taivaista, mutta varo...|Jonkun täytyy soittaa sitä, ja se voi maksaa elämäsi!|Kursori: Valitse kohdealue|F1-F9: Soita pianoa
+04:44=Tämä ei ole vain juustoa, vaan biologista sodankäyntiä!|Se ei tuota suurta vahinkoa kerralla|mutta ajastimen saavuttaessa nollan se taatusti|myrkyttää kaikki epäonniset jotka haistaa sen!|1-5: Aseta ajastin|Hyökkää: Pidä pohjassa heittääksesi isommalla voimalla
+04:45=Istuminen kaikilla niillä fysiikan tunneilla|kannatti viimein, laukaise tuhoisa|sini-aalto vihollisiasi päin.|Varo, tämä ase potkaisee aika kovaa.|Hyökkää: Ammu
+04:46=Peitä vastustajasi sähisevällä liekehtivällä nesteellä.|Sydäntä lämmittävää!|Hyökkää: Aktivoi|Ylös/Alas: Jatka tähtäystä|Vasen/Oikea: Muuta sylkyvoimaa.
+04:47=Kaksinkertaista hauskuus kahdella piikikkäällä,|petollisella, tarttuvalla miinalla.|Viritä ketjureaktio tai puolusta itseäsi (tai molempia!)|Hyökkää: Pidä pohjassa ampuaksesi kovemmalla voimalla (kahdesti)
+04:48=Miksi vain myyrät saa kaiken pahoinpitelyn?|Siilien hakkaaminen voi olla ihan yhtä kivaa!|Sopiva isku tällä vasaralla iskee pois kolmanneksen|siilin terveydestä ja lyö ne maan alle.|Hyökkää: Aktivoi
+04:49=Herätä ystäväsi henkiin!|Mutta varo, tämä herättää myös vihollisesi henkiin.|Hyökkää: Pidä hyökkäysnappia pohjassa herättääksesi henkiin hitaasti.|Ylös: Kiihdytä henkiin herätystä
 
 ; Game goal strings
 05:00=Pelimoodit
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts	Sat Oct 30 20:04:38 2010 +0200
@@ -0,0 +1,1796 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr">
+<context>
+    <name>AmmoSchemeModel</name>
+    <message>
+        <source>new</source>
+        <translation>جديد</translation>
+    </message>
+</context>
+<context>
+    <name>FreqSpinBox</name>
+    <message>
+        <source>Never</source>
+        <translation>ابدا</translation>
+    </message>
+    <message>
+        <source>Every %1 turn</source>
+        <translation type="unfinished">كل %1 دور
+        </translation>
+    </message>
+</context>
+<context>
+    <name>GameCFGWidget</name>
+    <message>
+        <source>Edit weapons</source>
+        <translation>تغيير سلاح</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <source>Illegal ammo scheme</source>
+        <translation>نظام اسلحة غير صحيح</translation>
+    </message>
+    <message>
+        <source>Edit schemes</source>
+        <translation>Edit schemes</translation>
+    </message>
+</context>
+<context>
+    <name>HWChatWidget</name>
+    <message>
+        <source>%1 *** %2 has been removed from your ignore list</source>
+        <translation>%1 *** %2 تم حذفة من قائمة الترك</translation>
+    </message>
+    <message>
+        <source>%1 *** %2 has been added to your ignore list</source>
+        <translation>%1 *** %2 تم اضافته الى قائمة النرك</translation>
+    </message>
+    <message>
+        <source>%1 *** %2 has been removed from your friends list</source>
+        <translation>%1 *** %2 تم حذقه الى قائمة الاصدقاء</translation>
+    </message>
+    <message>
+        <source>%1 *** %2 has been added to your friends list</source>
+        <translation>%1 *** %2 تم حذفة من قائمة الاصدقاء</translation>
+    </message>
+</context>
+<context>
+    <name>HWForm</name>
+    <message>
+        <source>new</source>
+        <translation>جديد</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>خطا</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Unable to start the server</source>
+        <translation>لم اتمكن من بدا الخادم</translation>
+    </message>
+    <message>
+        <source>Cannot save record to file %1</source>
+        <translation>لم اتمكن من حقظ الملف %1</translation>
+    </message>
+    <message>
+        <source>Please select record from the list above</source>
+        <translation>اختار من القائمة</translation>
+    </message>
+</context>
+<context>
+    <name>HWGame</name>
+    <message>
+        <source>en.txt</source>
+        <translation type="unfinished">ar.txt</translation>
+    </message>
+    <message>
+        <source>Cannot open demofile %1</source>
+        <translation>لم اتمكن من حفظ ملف اللعب %1</translation>
+    </message>
+</context>
+<context>
+    <name>HWMapContainer</name>
+    <message>
+        <source>Map</source>
+        <translation>خارطة</translation>
+    </message>
+    <message>
+        <source>Themes</source>
+        <translation>نمط</translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation>فلنر</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>كل</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>صغير</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>متوسط</translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation>كبير</translation>
+    </message>
+    <message>
+        <source>Cavern</source>
+        <translation>كهف</translation>
+    </message>
+    <message>
+        <source>Wacky</source>
+        <translation>تعبان</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">نوع</translation>
+    </message>
+    <message>
+        <source>Small tunnels</source>
+        <translation type="unfinished">انقاق صغيرة</translation>
+    </message>
+    <message>
+        <source>Medium tunnels</source>
+        <translation type="unfinished">انفاق متوسطة</translation>
+    </message>
+    <message>
+        <source>Large tunnels</source>
+        <translation type="unfinished">انفاق كبيرة</translation>
+    </message>
+    <message>
+        <source>Small floating islands</source>
+        <translation type="unfinished">جزر طائفة صغيرة</translation>
+    </message>
+    <message>
+        <source>Medium floating islands</source>
+        <translation type="unfinished">جزر طائفة متوسطة</translation>
+    </message>
+    <message>
+        <source>Large floating islands</source>
+        <translation type="unfinished">جزر طائفة كبيرة</translation>
+    </message>
+</context>
+<context>
+    <name>HWNetServersModel</name>
+    <message>
+        <source>Title</source>
+        <translation>عنوان</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+</context>
+<context>
+    <name>HWNewNet</name>
+    <message>
+        <source>The host was not found. Please check the host name and port settings.</source>
+        <translation type="unfinished">الحاسوب لم يوجد. تأكد من الاعدادات</translation>
+    </message>
+    <message>
+        <source>Connection refused</source>
+        <translation>الاتصال رفض</translation>
+    </message>
+    <message>
+        <source>Room destroyed</source>
+        <translation>الغرفة اغلقت</translation>
+    </message>
+    <message>
+        <source>Quit reason: </source>
+        <translation type="unfinished">سبب الخروج</translation>
+    </message>
+    <message>
+        <source>You got kicked</source>
+        <translation>تم طردك</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>كلمة السر</translation>
+    </message>
+    <message>
+        <source>Your nickname %1 is
+registered on Hedgewars.org
+Please provide your password
+or pick another nickname:</source>
+        <translation type="unfinished">اسمك %1
+سجلت على Hedgewars.org
+اعطي كلمة السر
+او اختر اسم ثاني</translation>
+    </message>
+    <message>
+        <source>%1 *** %2 has joined the room</source>
+        <translation>%1 *** %2 انضم للغرفة</translation>
+    </message>
+    <message>
+        <source>%1 *** %2 has joined</source>
+        <translation>%1 *** %2 انضم</translation>
+    </message>
+    <message>
+        <source>%1 *** %2 has left (%3)</source>
+        <translation>%1 *** %2 خرج (%3)</translation>
+    </message>
+    <message>
+        <source>%1 *** %2 has left</source>
+        <translation>%1 *** %2 خرج</translation>
+    </message>
+</context>
+<context>
+    <name>KB</name>
+    <message>
+        <source>SDL_ttf returned error while rendering text, most propably it is related to the bug in freetype2. It&apos;s recommended to update your freetype lib.</source>
+        <translation>SDL_ttf returned error while rendering text, most propably it is related to the bug in freetype2. It&apos;s recommended to update your freetype lib.</translation>
+    </message>
+</context>
+<context>
+    <name>PageAdmin</name>
+    <message>
+        <source>Server message:</source>
+        <translation type="obsolete">Server message:</translation>
+    </message>
+    <message>
+        <source>Set message</source>
+        <translation type="obsolete">Set message</translation>
+    </message>
+    <message>
+        <source>Clear Accounts Cache</source>
+        <translation>Clear Accounts Cache</translation>
+    </message>
+    <message>
+        <source>Fetch data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server message for latest version:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server message for previous versions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Latest version protocol number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MOTD preview:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageConnecting</name>
+    <message>
+        <source>Connecting...</source>
+        <translation type="unfinished">جاري الاتصال</translation>
+    </message>
+</context>
+<context>
+    <name>PageEditTeam</name>
+    <message>
+        <source>General</source>
+        <translation>عام</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>متقدم</translation>
+    </message>
+</context>
+<context>
+    <name>PageGameStats</name>
+    <message>
+        <source>&lt;p&gt;The best shot award was won by &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; pts.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;افضل ضربة كانت من قبل &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; pts.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The best killer is &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; kills in a turn.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;افضل لاعب هو &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; kills in a turn.&lt;/p&gt;
+        </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;A total of &lt;b&gt;%1&lt;/b&gt; hedgehog(s) were killed during this round.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;المجموع&lt;b&gt;%1&lt;/b&gt; من اللاعبين قضوا في اللعبة.&lt;/p&gt;
+        </translation>
+    </message>
+</context>
+<context>
+    <name>PageMain</name>
+    <message>
+        <source>Local Game (Play a game on a single computer)</source>
+        <translation>لعبة محلية</translation>
+    </message>
+    <message>
+        <source>Network Game (Play a game across a network)</source>
+        <translation>لعبة شبكية (عن طريق شبكة اتصال)</translation>
+    </message>
+</context>
+<context>
+    <name>PageMultiplayer</name>
+    <message>
+        <source>Start</source>
+        <translation>ابدا</translation>
+    </message>
+</context>
+<context>
+    <name>PageNet</name>
+    <message>
+        <source>Error</source>
+        <translation>خطا</translation>
+    </message>
+    <message>
+        <source>Please select server from the list above</source>
+        <translation>اختار من القائمة</translation>
+    </message>
+</context>
+<context>
+    <name>PageNetGame</name>
+    <message>
+        <source>Control</source>
+        <translation>تحكم</translation>
+    </message>
+</context>
+<context>
+    <name>PageNetType</name>
+    <message>
+        <source>LAN game</source>
+        <translation>لعبة شبكية</translation>
+    </message>
+    <message>
+        <source>Official server</source>
+        <translation>الخادم الرسمي</translation>
+    </message>
+</context>
+<context>
+    <name>PageOptions</name>
+    <message>
+        <source>New team</source>
+        <translation>فريق جديد</translation>
+    </message>
+    <message>
+        <source>Edit team</source>
+        <translation>تغيير فريق</translation>
+    </message>
+    <message>
+        <source>Delete team</source>
+        <translation>حذف فريق</translation>
+    </message>
+    <message>
+        <source>New weapon scheme</source>
+        <translation>طريقة اسلحة جديدة</translation>
+    </message>
+    <message>
+        <source>Edit weapon scheme</source>
+        <translation>تغيير طريقة الاسلحة</translation>
+    </message>
+    <message>
+        <source>Delete weapon scheme</source>
+        <translation>حذف طريقة الاسلحة</translation>
+    </message>
+</context>
+<context>
+    <name>PagePlayDemo</name>
+    <message>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Rename dialog</source>
+        <translation>تغيير الشباك</translation>
+    </message>
+    <message>
+        <source>Enter new file name:</source>
+        <translation type="unfinished">ادخل اسم الملف</translation>
+    </message>
+    <message>
+        <source>Cannot rename to</source>
+        <translation>لا استطيع التغيير الى</translation>
+    </message>
+    <message>
+        <source>Cannot delete file</source>
+        <translation>لا استطيع حذف الملف</translation>
+    </message>
+    <message>
+        <source>Please select record from the list</source>
+        <translation>اختر المقطع من القائمة</translation>
+    </message>
+</context>
+<context>
+    <name>PageRoomsList</name>
+    <message>
+        <source>Create</source>
+        <translation>اصنع</translation>
+    </message>
+    <message>
+        <source>Join</source>
+        <translation>انضم</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>تحديث</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Admin features</source>
+        <translation>الادارة</translation>
+    </message>
+    <message>
+        <source>Room Name:</source>
+        <translation type="unfinished">رقم الغرقة</translation>
+    </message>
+    <message>
+        <source>This game is in lobby.
+You may join and start playing once the game starts.</source>
+        <translation>هذه غرقة اللعب
+يمكنك الانضمام و بدء اللعب عند الاتضمام الى غرفة
+You may join and start playing once the game starts.</translation>
+    </message>
+    <message>
+        <source>This game is in progress.
+You may join and spectate now but you&apos;ll have to wait for the game to end to start playing.</source>
+        <translation type="unfinished">اللعبة قيد اللعب
+يمكنك الانضمام و المشاهدة</translation>
+    </message>
+    <message>
+        <source>%1 is the host. He may adjust settings and start the game.</source>
+        <translation type="unfinished">%1هو المضيف الذي يبدا و يغيير اعدادات اللعبة</translation>
+    </message>
+    <message>
+        <source>Random Map</source>
+        <translation>خارطة عشوائية</translation>
+    </message>
+    <message>
+        <source>Games may be played on precreated or randomized maps.</source>
+        <translation type="unfinished">اللعبة يمكن ان تكون على خارطة عشوائية او يدوية</translation>
+    </message>
+    <message>
+        <source>The Game Scheme defines general options and preferences like Round Time, Sudden Death or Vampirism.</source>
+        <translation type="unfinished">طراز اللعية يحدد الخيارات مثل وقت الجولة، الموت المفاجئ و مصاص الدماء</translation>
+    </message>
+    <message>
+        <source>The Weapon Scheme defines available weapons and their ammunition count.</source>
+        <translation type="unfinished">طراز الاسلحة يحدد المتوفرة منها و عددها</translation>
+    </message>
+    <message>
+        <source>There are %1 clients connected to this room.</source>
+        <translation type="unfinished">يوجد %1 مرتبطون بالغرقة
+        </translation>
+    </message>
+    <message>
+        <source>There are %1 teams participating in this room.</source>
+        <translation type="unfinished">يوجد %1 فريق في الغرفة
+        </translation>
+    </message>
+    <message>
+        <source>Please enter room name</source>
+        <translation>ادخل رقم الغرقة</translation>
+    </message>
+    <message>
+        <source>Please select room from the list</source>
+        <translation>اختر الغرقة من القائمة</translation>
+    </message>
+    <message>
+        <source>Random Maze</source>
+        <translation type="unfinished">متاهة عشوائية</translation>
+    </message>
+</context>
+<context>
+    <name>PageScheme</name>
+    <message>
+        <source>Defend your fort and destroy the opponents, two team colours max!</source>
+        <translation type="unfinished">دافع عن القلعة و دمر الاعداء. فريقان الحد الاقصى</translation>
+    </message>
+    <message>
+        <source>Teams will start on opposite sides of the terrain, two team colours max!</source>
+        <translation type="unfinished">الفرق تبدا في مكانين متقابلين. فريقان الحد الاقصى</translation>
+    </message>
+    <message>
+        <source>Land can not be destroyed!</source>
+        <translation type="unfinished">الارض لا يمكن ان تدمر</translation>
+    </message>
+    <message>
+        <source>Add an indestructable border around the terrain</source>
+        <translation>اضف اطار لا يمكن تدميره</translation>
+    </message>
+    <message>
+        <source>Lower gravity</source>
+        <translation>جاذبية قليلة</translation>
+    </message>
+    <message>
+        <source>Assisted aiming with laser sight</source>
+        <translation>منظار ليزري</translation>
+    </message>
+    <message>
+        <source>All hogs have a personal forcefield</source>
+        <translation>كل اللاعبين لهم حقل قوى</translation>
+    </message>
+    <message>
+        <source>Enable random mines</source>
+        <translation>فعل الالغام العشوائية</translation>
+    </message>
+    <message>
+        <source>Gain 80% of the damage you do back in health</source>
+        <translation>احصل على 80% من التدمير في صحتك</translation>
+    </message>
+    <message>
+        <source>Share your opponents pain, share their damage</source>
+        <translation>شارك في صحة عدوك</translation>
+    </message>
+    <message>
+        <source>Your hogs are unable to move, put your artillery skills to the test</source>
+        <translation>الاعبين لا يمكنهم التحرك</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation>عشوائي</translation>
+    </message>
+    <message>
+        <source>Seconds</source>
+        <translation>ثواني</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>جديد</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>حذف</translation>
+    </message>
+    <message>
+        <source>Order of play is random instead of in room order.</source>
+        <translation type="unfinished">تسلسل اللعب عشواي</translation>
+    </message>
+    <message>
+        <source>Play with a King. If he dies, your side dies.</source>
+        <translation type="unfinished">اذا مات الملك، خسر الفريق</translation>
+    </message>
+    <message>
+        <source>Take turns placing your hedgehogs before the start of play.</source>
+        <translation type="unfinished">ضع لاعبين بالادوار قبل اللعب</translation>
+    </message>
+    <message>
+        <source>Ammo is shared between all teams that share a colour.</source>
+        <translation type="unfinished">العتاد مشترك</translation>
+    </message>
+    <message>
+        <source>Disable girders when generating random maps.</source>
+        <translation type="unfinished">ابطال البناء</translation>
+    </message>
+    <message>
+        <source>Disable land objects when generating random maps.</source>
+        <translation type="unfinished">ابطال الاجسام الساقطة</translation>
+    </message>
+</context>
+<context>
+    <name>PageSelectWeapon</name>
+    <message>
+        <source>Default</source>
+        <translation>التلقائي</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>حذف</translation>
+    </message>
+</context>
+<context>
+    <name>PageSinglePlayer</name>
+    <message>
+        <source>Simple Game (a quick game against the computer, settings are chosen for you)</source>
+        <translation>لعية بسيطة ضد الحاسوب</translation>
+    </message>
+    <message>
+        <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source>
+        <translation>لعبة متعددة</translation>
+    </message>
+    <message>
+        <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source>
+        <translation>نمط التدريب، تحت التطوير</translation>
+    </message>
+    <message>
+        <source>Demos (Watch recorded demos)</source>
+        <translation>عرض</translation>
+    </message>
+    <message>
+        <source>Load (Load a previously saved game)</source>
+        <translation>تحميل</translation>
+    </message>
+</context>
+<context>
+    <name>QAction</name>
+    <message>
+        <source>Kick</source>
+        <translation>ارفس</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>معلومات</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>ابدا</translation>
+    </message>
+    <message>
+        <source>Restrict Joins</source>
+        <translation>امنع الانضمام</translation>
+    </message>
+    <message>
+        <source>Restrict Team Additions</source>
+        <translation>امنع اضافات الفرق</translation>
+    </message>
+    <message>
+        <source>Ban</source>
+        <translation>امنع</translation>
+    </message>
+    <message>
+        <source>Follow</source>
+        <translation>اتبع</translation>
+    </message>
+    <message>
+        <source>Ignore</source>
+        <translation>اهمل</translation>
+    </message>
+    <message>
+        <source>Add friend</source>
+        <translation>اضف صديق</translation>
+    </message>
+    <message>
+        <source>Unignore</source>
+        <translation>حذف الاهمال</translation>
+    </message>
+    <message>
+        <source>Remove friend</source>
+        <translation>امحي صديق</translation>
+    </message>
+</context>
+<context>
+    <name>QCheckBox</name>
+    <message>
+        <source>Check for updates at startup</source>
+        <translation>تحرى عن التحديثات</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished">ملء الشاشة</translation>
+    </message>
+    <message>
+        <source>Frontend fullscreen</source>
+        <translation>شاشة القائمة ملء العرض</translation>
+    </message>
+    <message>
+        <source>Enable sound</source>
+        <translation>فعل الصوت</translation>
+    </message>
+    <message>
+        <source>Enable music</source>
+        <translation>فعل الموسيقى</translation>
+    </message>
+    <message>
+        <source>Show FPS</source>
+        <translation>اضهر عدد الاطارات في الثانية</translation>
+    </message>
+    <message>
+        <source>Alternative damage show</source>
+        <translation>عرض الدمار</translation>
+    </message>
+    <message>
+        <source>Append date and time to record file name</source>
+        <translation>اضف التاريخ و اليوم الى الملف</translation>
+    </message>
+    <message>
+        <source>Reduced quality</source>
+        <translation type="unfinished">قلل الجودة</translation>
+    </message>
+    <message>
+        <source>Show ammo menu tooltips</source>
+        <translation>اضهر قوائم للعتاد</translation>
+    </message>
+    <message>
+        <source>Enable frontend sounds</source>
+        <translation>فعل اصوات شاشة المقدمة</translation>
+    </message>
+    <message>
+        <source>Enable frontend music</source>
+        <translation>فعل موسيقى شاشة المقدمة</translation>
+    </message>
+    <message>
+        <source>Frontend effects</source>
+        <translation>تأثيرات المقدمة</translation>
+    </message>
+</context>
+<context>
+    <name>QComboBox</name>
+    <message>
+        <source>generated map...</source>
+        <translation type="unfinished">ولد خارطة</translation>
+    </message>
+    <message>
+        <source>Human</source>
+        <translation>انسان</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation type="unfinished">مرحلة</translation>
+    </message>
+    <message>
+        <source>(System default)</source>
+        <translation>نمط النظام</translation>
+    </message>
+    <message>
+        <source>Mission</source>
+        <translation>مهمة</translation>
+    </message>
+    <message>
+        <source>generated maze...</source>
+        <translation type="unfinished">ولد متاهة</translation>
+    </message>
+</context>
+<context>
+    <name>QGroupBox</name>
+    <message>
+        <source>Team Members</source>
+        <translation>اعضاء الفريق</translation>
+    </message>
+    <message>
+        <source>Fort</source>
+        <translation>حصن</translation>
+    </message>
+    <message>
+        <source>Key binds</source>
+        <translation>ربط المفاتيج</translation>
+    </message>
+    <message>
+        <source>Teams</source>
+        <translation>فرق</translation>
+    </message>
+    <message>
+        <source>Weapons</source>
+        <translation>اسلحة</translation>
+    </message>
+    <message>
+        <source>Audio/Graphic options</source>
+        <translation>قوائم الصوتيات و المرئيات</translation>
+    </message>
+    <message>
+        <source>Net game</source>
+        <translation>لعبة شبكية</translation>
+    </message>
+    <message>
+        <source>Playing teams</source>
+        <translation>فرق اللعب</translation>
+    </message>
+    <message>
+        <source>Game Modifiers</source>
+        <translation>مغيرات اللعبة</translation>
+    </message>
+    <message>
+        <source>Basic Settings</source>
+        <translation>اعدادات الاساسية</translation>
+    </message>
+    <message>
+        <source>Team Settings</source>
+        <translation>اعدادات الفريق</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>متنوعة</translation>
+    </message>
+</context>
+<context>
+    <name>QLabel</name>
+    <message>
+        <source>Mines Time</source>
+        <translation>وقت اللغم</translation>
+    </message>
+    <message>
+        <source>Mines</source>
+        <translation>الغام</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>نسخة</translation>
+    </message>
+    <message>
+        <source>This program is distributed under the GNU General Public License</source>
+        <translation>This program is distributed under the GNU General Public License</translation>
+    </message>
+    <message>
+        <source>Developers:</source>
+        <translation type="unfinished">المطورون</translation>
+    </message>
+    <message>
+        <source>Art:</source>
+        <translation type="unfinished">قنون</translation>
+    </message>
+    <message>
+        <source>Sounds:</source>
+        <translation type="unfinished">الاصوات</translation>
+    </message>
+    <message>
+        <source>Translations:</source>
+        <translation type="unfinished">المترجمون</translation>
+    </message>
+    <message>
+        <source>Special thanks:</source>
+        <translation type="unfinished">شكر خاص</translation>
+    </message>
+    <message>
+        <source>Weapons</source>
+        <translation>اسلحة</translation>
+    </message>
+    <message>
+        <source>Host:</source>
+        <translation>Host:</translation>
+    </message>
+    <message>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <source>Net nick</source>
+        <translation>اسم اللاعب</translation>
+    </message>
+    <message>
+        <source>Resolution</source>
+        <translation>الوضوح</translation>
+    </message>
+    <message>
+        <source>FPS limit</source>
+        <translation>حد الاقصى لعدد الاطر في الثانية</translation>
+    </message>
+    <message>
+        <source>Server name:</source>
+        <translation type="unfinished">اسم الخادم</translation>
+    </message>
+    <message>
+        <source>Server port:</source>
+        <translation>Server port:</translation>
+    </message>
+    <message>
+        <source>Initial sound volume</source>
+        <translation>ارتقاع الصوت</translation>
+    </message>
+    <message>
+        <source>Damage Modifier</source>
+        <translation>مغير الدمار</translation>
+    </message>
+    <message>
+        <source>Turn Time</source>
+        <translation>وقت الجولة</translation>
+    </message>
+    <message>
+        <source>Initial Health</source>
+        <translation>الصحة الاولية</translation>
+    </message>
+    <message>
+        <source>Sudden Death Timeout</source>
+        <translation>وقت الموت المفاجئ</translation>
+    </message>
+    <message>
+        <source>Scheme Name:</source>
+        <translation type="unfinished">اسم النمط:</translation>
+    </message>
+    <message>
+        <source>Crate Drops</source>
+        <translation>المساعدات</translation>
+    </message>
+    <message>
+        <source>Game scheme</source>
+        <translation>نمط اللعبة</translation>
+    </message>
+    <message>
+        <source>% Dud Mines</source>
+        <translation>% الغام</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>اسم</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>نوع</translation>
+    </message>
+    <message>
+        <source>Grave</source>
+        <translation>تابوت</translation>
+    </message>
+    <message>
+        <source>Flag</source>
+        <translation>علم</translation>
+    </message>
+    <message>
+        <source>Voice</source>
+        <translation>صوت</translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation>محلي</translation>
+    </message>
+    <message>
+        <source>Restart game to apply</source>
+        <translation>اعد تشغيل اللعبة لتفعيل التغيير</translation>
+    </message>
+    <message>
+        <source>Explosives</source>
+        <translation>متفجرات</translation>
+    </message>
+    <message>
+        <source>This SVN build is &apos;work in progress&apos; and may not be compatible with other versions of the game.
+Some features might be broken or incomplete. Use at your own risk!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QLineEdit</name>
+    <message>
+        <source>unnamed</source>
+        <translation>غير مسمى</translation>
+    </message>
+</context>
+<context>
+    <name>QMainWindow</name>
+    <message>
+        <source>Hedgewars %1</source>
+        <translation>Hedgewars %1</translation>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Network</source>
+        <translation>شبكة</translation>
+    </message>
+    <message>
+        <source>Connection to server is lost</source>
+        <translation>ضاع الاتصال للخادم</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <source>Failed to open data directory:
+%1
+Please check your installation</source>
+        <translation>Failed to open data directory:
+ %1
+Please check your installation</translation>
+    </message>
+    <message>
+        <source>Weapons</source>
+        <translation>اسلحة</translation>
+    </message>
+    <message>
+        <source>Can not edit default weapon set</source>
+        <translation>Can not edit default weapon set</translation>
+    </message>
+    <message>
+        <source>Can not delete default weapon set</source>
+        <translation>Can not delete default weapon set</translation>
+    </message>
+    <message>
+        <source>Really delete this weapon set?</source>
+        <translation type="unfinished">هل تريد حذف قائمة الاسلحة</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <source>Cannot create directory %1</source>
+        <translation>Cannot create directory %1</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation>اسم اللاعب</translation>
+    </message>
+    <message>
+        <source>Please enter your nickname</source>
+        <translation>ادحل اسم اللاعب</translation>
+    </message>
+</context>
+<context>
+    <name>QPushButton</name>
+    <message>
+        <source>default</source>
+        <translation>التلقائي</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>الغاء</translation>
+    </message>
+    <message>
+        <source>Start server</source>
+        <translation>تشغيل الخادم</translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation>اتصل</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished">تحديث</translation>
+    </message>
+    <message>
+        <source>Specify</source>
+        <translation>تحديد</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>ابدا</translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished">ابدا</translation>
+    </message>
+    <message>
+        <source>Play demo</source>
+        <translation>ابدا العرض</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>تغيير الاسم</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>حذف</translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation>تحميل</translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation>تنصيب</translation>
+    </message>
+    <message>
+        <source>Ready</source>
+        <translation>ابدا</translation>
+    </message>
+    <message>
+        <source>Random Team</source>
+        <translation>فريق عشوائي</translation>
+    </message>
+</context>
+<context>
+    <name>QTableWidget</name>
+    <message>
+        <source>Room Name</source>
+        <translation>اسم الغرقة</translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation>C</translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation>T</translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation>المالك</translation>
+    </message>
+    <message>
+        <source>Map</source>
+        <translation>خارطة</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>قوانين</translation>
+    </message>
+    <message>
+        <source>Weapons</source>
+        <translation>اسلحة</translation>
+    </message>
+</context>
+<context>
+    <name>SelWeaponWidget</name>
+    <message>
+        <source>Weapon set</source>
+        <translation>نمط الاسلحة</translation>
+    </message>
+    <message>
+        <source>Probabilities</source>
+        <translation>احتماليات</translation>
+    </message>
+    <message>
+        <source>Ammo in boxes</source>
+        <translation>العتاد في الصناديق</translation>
+    </message>
+    <message>
+        <source>Delays</source>
+        <translation>التأخير</translation>
+    </message>
+</context>
+<context>
+    <name>TCPBase</name>
+    <message>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <source>Unable to start the server: %1.</source>
+        <translation>Unable to start the server: %1.</translation>
+    </message>
+    <message>
+        <source>Unable to run engine: %1 (</source>
+        <translation>Unable to run engine: %1 (</translation>
+    </message>
+</context>
+<context>
+    <name>ToggleButtonWidget</name>
+    <message>
+        <source>Vampirism</source>
+        <translation>مصاص دماء</translation>
+    </message>
+    <message>
+        <source>Karma</source>
+        <translation>كارما</translation>
+    </message>
+    <message>
+        <source>Artillery</source>
+        <translation>مدفعية</translation>
+    </message>
+    <message>
+        <source>Fort Mode</source>
+        <translation type="unfinished">طريقة الحصن</translation>
+    </message>
+    <message>
+        <source>Divide Teams</source>
+        <translation>قسم الفرق</translation>
+    </message>
+    <message>
+        <source>Solid Land</source>
+        <translation>ارض صلبة</translation>
+    </message>
+    <message>
+        <source>Add Border</source>
+        <translation>اضف اطار</translation>
+    </message>
+    <message>
+        <source>Low Gravity</source>
+        <translation>جاذبية قليلة</translation>
+    </message>
+    <message>
+        <source>Laser Sight</source>
+        <translation>منظار ليزري</translation>
+    </message>
+    <message>
+        <source>Invulnerable</source>
+        <translation>غير قابل للتدمير</translation>
+    </message>
+    <message>
+        <source>Add Mines</source>
+        <translation>اضف الغام</translation>
+    </message>
+    <message>
+        <source>Random Order</source>
+        <translation>توزيع عشوائي</translation>
+    </message>
+    <message>
+        <source>King</source>
+        <translation>ملك</translation>
+    </message>
+    <message>
+        <source>Place Hedgehogs</source>
+        <translation>ضع الاعبين</translation>
+    </message>
+    <message>
+        <source>Clan Shares Ammo</source>
+        <translation>الفريق يتشارك بالعتاد</translation>
+    </message>
+    <message>
+        <source>Disable Girders</source>
+        <translation>ابطال البناء</translation>
+    </message>
+    <message>
+        <source>Disable Land Objects</source>
+        <translation type="unfinished">ابطال الاجسام الارضية</translation>
+    </message>
+</context>
+<context>
+    <name>binds</name>
+    <message>
+        <source>up</source>
+        <translation>up</translation>
+    </message>
+    <message>
+        <source>left</source>
+        <translation>left</translation>
+    </message>
+    <message>
+        <source>right</source>
+        <translation>right</translation>
+    </message>
+    <message>
+        <source>down</source>
+        <translation>down</translation>
+    </message>
+    <message>
+        <source>attack</source>
+        <translation>attack</translation>
+    </message>
+    <message>
+        <source>precise aim</source>
+        <translation>precise aim</translation>
+    </message>
+    <message>
+        <source>put</source>
+        <translation>put</translation>
+    </message>
+    <message>
+        <source>switch</source>
+        <translation>switch</translation>
+    </message>
+    <message>
+        <source>find hedgehog</source>
+        <translation>find hedgehog</translation>
+    </message>
+    <message>
+        <source>ammo menu</source>
+        <translation>ammo menu</translation>
+    </message>
+    <message>
+        <source>slot 1</source>
+        <translation>slot 1</translation>
+    </message>
+    <message>
+        <source>slot 2</source>
+        <translation>slot 2</translation>
+    </message>
+    <message>
+        <source>slot 3</source>
+        <translation>slot 3</translation>
+    </message>
+    <message>
+        <source>slot 4</source>
+        <translation>slot 4</translation>
+    </message>
+    <message>
+        <source>slot 5</source>
+        <translation>slot 5</translation>
+    </message>
+    <message>
+        <source>slot 6</source>
+        <translation>slot 6</translation>
+    </message>
+    <message>
+        <source>slot 7</source>
+        <translation>slot 7</translation>
+    </message>
+    <message>
+        <source>slot 8</source>
+        <translation>slot 8</translation>
+    </message>
+    <message>
+        <source>slot 9</source>
+        <translation>slot 9</translation>
+    </message>
+    <message>
+        <source>timer 1 sec</source>
+        <translation>timer 1 sec</translation>
+    </message>
+    <message>
+        <source>timer 2 sec</source>
+        <translation>timer 2 sec</translation>
+    </message>
+    <message>
+        <source>timer 3 sec</source>
+        <translation>timer 3 sec</translation>
+    </message>
+    <message>
+        <source>timer 4 sec</source>
+        <translation>timer 4 sec</translation>
+    </message>
+    <message>
+        <source>timer 5 sec</source>
+        <translation>timer 5 sec</translation>
+    </message>
+    <message>
+        <source>chat</source>
+        <translation>chat</translation>
+    </message>
+    <message>
+        <source>chat history</source>
+        <translation>chat history</translation>
+    </message>
+    <message>
+        <source>pause</source>
+        <translation>pause</translation>
+    </message>
+    <message>
+        <source>confirmation</source>
+        <translation>confirmation</translation>
+    </message>
+    <message>
+        <source>volume down</source>
+        <translation>volume down</translation>
+    </message>
+    <message>
+        <source>volume up</source>
+        <translation>volume up</translation>
+    </message>
+    <message>
+        <source>change mode</source>
+        <translation>change mode</translation>
+    </message>
+    <message>
+        <source>capture</source>
+        <translation>capture</translation>
+    </message>
+    <message>
+        <source>hedgehogs
+info</source>
+        <translation>hedgehogs
+info</translation>
+    </message>
+    <message>
+        <source>quit</source>
+        <translation>quit</translation>
+    </message>
+    <message>
+        <source>zoom in</source>
+        <translation>zoom in</translation>
+    </message>
+    <message>
+        <source>zoom out</source>
+        <translation>zoom out</translation>
+    </message>
+    <message>
+        <source>reset zoom</source>
+        <translation>reset zoom</translation>
+    </message>
+    <message>
+        <source>long jump</source>
+        <translation>long jump</translation>
+    </message>
+    <message>
+        <source>high jump</source>
+        <translation>high jump</translation>
+    </message>
+</context>
+<context>
+    <name>binds (categories)</name>
+    <message>
+        <source>Basic controls</source>
+        <translation>الاسلحة الاولية</translation>
+    </message>
+    <message>
+        <source>Weapon controls</source>
+        <translation>السيطرة على الاسلحة</translation>
+    </message>
+    <message>
+        <source>Camera and cursor controls</source>
+        <translation type="unfinished">السيطرة على الكامرة و المؤشر</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>اخرى</translation>
+    </message>
+</context>
+<context>
+    <name>binds (descriptions)</name>
+    <message>
+        <source>Move your hogs and aim:</source>
+        <translation type="unfinished">تحريك اللاعب و التصويب</translation>
+    </message>
+    <message>
+        <source>Traverse gaps and obstacles by jumping:</source>
+        <translation type="unfinished">قفز فوق الحواجز</translation>
+    </message>
+    <message>
+        <source>Fire your selected weapon or trigger an utility item:</source>
+        <translation type="unfinished">اطلاق السلاح</translation>
+    </message>
+    <message>
+        <source>Pick a weapon or a target location under the cursor:</source>
+        <translation type="unfinished">أخذ السلاح تحت المؤشر</translation>
+    </message>
+    <message>
+        <source>Switch your currently active hog (if possible):</source>
+        <translation type="unfinished">تغيير اختيار اللاعب الحالي</translation>
+    </message>
+    <message>
+        <source>Pick a weapon or utility item:</source>
+        <translation type="unfinished">اختر السلاح</translation>
+    </message>
+    <message>
+        <source>Set the timer on bombs and timed weapons:</source>
+        <translation type="unfinished">وقت الانفجار</translation>
+    </message>
+    <message>
+        <source>Move the camera to the active hog:</source>
+        <translation type="unfinished">الكامرة على اللاعب</translation>
+    </message>
+    <message>
+        <source>Move the cursor or camera without using the mouse:</source>
+        <translation type="unfinished">تحريك الكامرة او اللاعب بلا المؤشر</translation>
+    </message>
+    <message>
+        <source>Modify the camera&apos;s zoom level:</source>
+        <translation type="unfinished">تغيير مدى التقريب البصري</translation>
+    </message>
+    <message>
+        <source>Talk to your team or all participants:</source>
+        <translation type="unfinished">ارسال رسالة لاعضاء الفريق</translation>
+    </message>
+    <message>
+        <source>Pause, continue or leave your game:</source>
+        <translation type="unfinished">توقيف اللعبة، الاستمرار او الغائها</translation>
+    </message>
+    <message>
+        <source>Modify the game&apos;s volume while playing:</source>
+        <translation type="unfinished">تغيير ارتقاع الصوت اثناء اللعبة</translation>
+    </message>
+    <message>
+        <source>Toggle fullscreen mode:</source>
+        <translation type="unfinished">تبديل ملئ الشاشة</translation>
+    </message>
+    <message>
+        <source>Take a screenshot:</source>
+        <translation type="unfinished">خد صورة</translation>
+    </message>
+    <message>
+        <source>Toggle labels above hedgehogs:</source>
+        <translation type="unfinished">تغيير العناوبن فوق اللاعبين</translation>
+    </message>
+</context>
+<context>
+    <name>binds (keys)</name>
+    <message>
+        <source>Axis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Up)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Down)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Left)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Right)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Delete</translation>
+    </message>
+    <message>
+        <source>Mouse: Left button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse: Middle button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse: Right button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse: Wheel up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse: Wheel down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Return</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad 6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad 7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad 9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad .</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad *</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Numpad +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Equals</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Caps lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scroll lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right ctrl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left ctrl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right meta</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left meta</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LB button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RB button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left stick</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right stick</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left stick (Right)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left stick (Left)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left stick (Down)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left stick (Up)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right stick (Down)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right stick (Up)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right stick (Right)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right stick (Left)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DPad</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
--- a/share/hedgewars/Data/Locale/hedgewars_es.ts	Sat Oct 23 17:26:22 2010 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_es.ts	Sat Oct 30 20:04:38 2010 +0200
@@ -76,7 +76,7 @@
     </message>
     <message>
         <source>Cannot save record to file %1</source>
-        <translation>No se pudo guardar entrada en el fichero %1</translation>
+        <translation>No se pudo almacenar una entrada en el fichero %1</translation>
     </message>
     <message>
         <source>new</source>
@@ -88,7 +88,17 @@
     </message>
     <message>
         <source>DefaultTeam</source>
-        <translation type="unfinished"></translation>
+        <translation>Equipo predeterminado</translation>
+    </message>
+    <message>
+        <source>Hedgewars Demo File</source>
+        <comment>File Types</comment>
+        <translation>Fichero de demo de Hedgewars</translation>
+    </message>
+    <message>
+        <source>Hedgewars Save File</source>
+        <comment>File Types</comment>
+        <translation>Partida guardada de Hedgewars</translation>
     </message>
 </context>
 <context>
@@ -138,7 +148,7 @@
     </message>
     <message>
         <source>Wacky</source>
-        <translation>Loco</translation>
+        <translation>Lunático</translation>
     </message>
     <message>
         <source>Tunnel size</source>
@@ -245,7 +255,10 @@
 registered on Hedgewars.org
 Please provide your password below
 or pick another nickname in game config:</source>
-        <translation type="unfinished"></translation>
+        <translation>El nick %1 ya está registrado 
+en Hedgewars.org. Por favor,
+introduce ahora tu clave de acceso
+o elige otro nick en las preferencias del juego:</translation>
     </message>
 </context>
 <context>
@@ -334,53 +347,53 @@
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalles</translation>
     </message>
     <message>
         <source>Health graph</source>
-        <translation type="unfinished"></translation>
+        <translation>Gráfica de puntos de vida</translation>
     </message>
     <message>
         <source>Ranking</source>
-        <translation type="unfinished"></translation>
+        <translation>Clasificación</translation>
     </message>
     <message>
         <source>The best shot award was won by &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; pts.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;El premio al mejor disparo es para &lt;b&gt;%1&lt;/b&gt;, con &lt;b&gt;%2&lt;/b&gt; pts.&lt;/p&gt;</translation>
     </message>
     <message numerus="yes">
         <source>The best killer is &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; kills in a turn.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>&lt;p&gt;El mejor guerrero es &lt;b&gt;%1&lt;/b&gt;, con &lt;b&gt;%2&lt;/b&gt; muerte en un solo turno.&lt;/p&gt;</numerusform>
+            <numerusform>&lt;p&gt;El mejor guerrero es &lt;b&gt;%1&lt;/b&gt;, con &lt;b&gt;%2&lt;/b&gt; muertes en un solo turno.&lt;/p&gt;</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>A total of &lt;b&gt;%1&lt;/b&gt; hedgehog(s) were killed during this round.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>&lt;p&gt;Un total de &lt;b&gt;%1&lt;/b&gt; erizo murió esta ronda.&lt;/p&gt;</numerusform>
+            <numerusform>&lt;p&gt;Un total de &lt;b&gt;%1&lt;/b&gt; erizos murieron esta ronda.&lt;/p&gt;</numerusform>
         </translation>
     </message>
     <message>
         <source>(%1 kill)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1 baja)</translation>
     </message>
     <message>
         <source>(%1 kills)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1 bajas)</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; thought it&apos;s good to shoot his own hedgehogs with &lt;b&gt;%2&lt;/b&gt; pts.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; prefiere disparar a sus miembros, con un total de &lt;b&gt;%2&lt;/b&gt; pts.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; killed &lt;b&gt;%2&lt;/b&gt; of his own hedgehogs.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; acabó con &lt;b&gt;%2&lt;/b&gt; de sus propios miembros.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; was scared and skipped turn &lt;b&gt;%2&lt;/b&gt; times.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; tenía demasiado miedo y pasó &lt;b&gt;%2&lt;/b&gt; turnos.</translation>
     </message>
 </context>
 <context>
@@ -396,237 +409,242 @@
     <message>
         <source>Simply pick the same color as a friend to play together as a team. Each of you will still control his or her own hedgehogs but they&apos;ll win or lose together.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Elige el mismo color que tus amigos para hacer una alianza con ellos. Cada uno de vosotros controlará sus propios erizos, pero la victoria o derrota será compartida por vuestra facción.</translation>
     </message>
     <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"></translation>
+        <translation>Puede que algunas armas hagan poco daño, pero pueden ser realmente devastadoras si son usadas en el momento correcto. Prueba a usar la Desert eagle para empujar erizos enemigos al agua, por ejemplo.</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>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Si no tienes claro qué vas a hacer y prefieres no desperdiciar munición puedes pasar un turno. ¡Pero ten cuidado, si dejas pasar muchos turnos puede que empiece la muerte súbita!</translation>
     </message>
     <message>
         <source>Want to save ropse? 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"></translation>
+        <translation>¿Andas escaso de cuerdas? Suelta la cuerda mientras estés en el aire y vuelve a dispararla de nuevo. ¡Mientras no toques el suelo seguirás usando la misma cuerda sin desperdiciar munición adicional!</translation>
     </message>
     <message>
         <source>If you&apos;d like to keep others from using your preferred nickname on the official server, register an account at http://www.hedgewars.org/.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Si prefieres que nadie más use tu nick en el servidor oficial puedes registrarlo en http://www.hedgewars.org</translation>
     </message>
     <message>
         <source>You&apos;re bored of default gameplay? Try one of the missions - they&apos;ll offer different gameplay depending on the one you picked.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>¿Estás cansado del modo de juego de siempre? Prueba alguna de las misiones, encontrarás en ellas nuevos tipos de juego dependiendo de la que elijas.</translation>
     </message>
     <message>
         <source>By default the game will always record the last game played as a demo. Select &apos;Local Game&apos; and pick the &apos;Demos&apos; button on the lower right corner to play or manage them.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>El juego intentará guardar la última partida como una demo de forma predeterminada. Más tarde puedes ir a &quot;Juego local&quot; y visitar la sección de &quot;Demos&quot; en la esquina inferior derecha para reproducirlas o gestionarlas.</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. If you&apos;ve got problems, ask on our forums but please don&apos;t expect 24/7 support!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars es un juego gratuito de código abierto que hemos creado en nuestro tiempo libre. Si tienes algún problema estaremos encantados de ayudarte en nuestros foros o canal de IRC, pero no esperes que estemos allí las 24 horas del día.</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. If you like it, help us with a small donation or contribute your own work!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars es un juego gratuito de código abierto que hemos creado en nuestro tiempo libre. Si te gusta podrías considerar el ayudarnos con una pequeña donación o contribuyendo tu propio código, gráficos o audios.</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. Share it with your family and friends as you like!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars es un juego gratuito de código abierto que hemos creado en nuestro tiempo libre. ¡Compártelo con tu família y amigos tanto como quieras!</translation>
     </message>
     <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"></translation>
+        <translation>De cuando en cuando celebramos torneos oficiales. Puedes mantenerte al día sobre los próximos eventos en 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"></translation>
+        <translation>Hedgewars está disponible en varios idiomas. Si no encuentras traducción a tu idioma o piensas que la actual es de baja calidad o está desactualizada estaremos encantados de aceptar tu colaboración para mejorarla.</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"></translation>
+        <translation>Hedgewars es un juego multiplataforma que puede ser ejecutado en diversos sistemas operativos, incluyendo Windows, Mac OS X y 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>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Recuerda: puedes crear tus propias partidas multijugador tanto en local como por red, no estás limitado a jugar contra la máquina.</translation>
     </message>
     <message>
         <source>While playing you should give yourself a short break at least once an hour.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tu salud es lo primero. Recuerda descansar unos minutos al menos una vez por cada hora de juego.</translation>
     </message>
     <message>
         <source>If your graphics card isn&apos;t able to provide hardware accelerated OpenGL, try to enable the low quality mode to improve performance.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Si tu tarjeta gráfica no soporta aceleración gráfica mediante OpenGL prueba a habilitar el modo de baja calidad gráfica en la pantalla de opciones, puede que mejore el rendimiento del juego.</translation>
     </message>
     <message>
         <source>We&apos;re open to suggestions and constructive feedback. If you don&apos;t like something or got a great idea, let us know!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Siempre estamos abiertos a sugerencias y opiniones constructivas. Si hay algo que no te guste o tienes grandes ideas que te gustaría ver en el juego, háznoslo saber.</translation>
     </message>
     <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"></translation>
+        <translation>Si juegas a través de internet recuerda mantener tus buenos modales y siempre ten en cuenta que puede que estés jugando con o contra menores de edad.</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>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Los modos de juego especiales como &quot;vampirismo&quot; o &quot;karma&quot; te permiten desarrollar tácticas de juego completamente nuevas. ¡Pruébalos en tu próxima partida!</translation>
     </message>
     <message>
         <source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgwars to its game list so your friends can see you playing.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>La versión para Windows de Hedgewars soporta Xfire. Recuerda añadie Hedgewars a tu lista de juegos favoritos para que tus amigos sepan cuándo estás jugando.</translation>
     </message>
     <message>
         <source>You should never install Hedgewars on computers you don&apos;t own (school, university, work, etc.). Please ask the responsible person instead!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nunca instales Hedgewars en ordenadores que no te pertenezcan tales como los de tu escuela, universidad o trabajo sin perdir permiso primero a las personas responsables de los mismos.</translation>
     </message>
     <message>
         <source>Hedgewars can be perfect for short games during breaks. Just ensure you don&apos;t add too many hedgehogs or use an huge map. Reducing time and health might help as well.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars es realmente genial para jugar partidas rápidas durante pausas o descansos; sólo recuerda no añadir muchos erizos y no usar mapas excesivamente grandes para que la partida no se alargue demasiado. Reducir la duración de los turnos o la vida inicial también puede ayudar.</translation>
     </message>
     <message>
         <source>No hedgehogs were harmed in making this game.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ningún erizo fue lastimado durante la creación de este juego.</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. If someone sold you the game, you should try get a refund!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars es un juego gratuito de código abierto que hemos creado en nuestro tiempo libre. Si alguien te vendió el juego deberías pedirle que te devuelva tu dinero.</translation>
     </message>
     <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>Conecta tus mandos al ordenador antes de iniciar el juego para poder asignar correctamente los controles de a equipo.</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>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Crea una cuenta con tu nick en %1 para evitar que otras personas puedan usarlo en el servidor oficial.</translation>
     </message>
     <message>
         <source>If your graphics card isn&apos;t able to provide hardware accelerated OpenGL, try to update the associated drivers.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Si tu tarjeta gráfica no es capaz de usar aceleración gráfica mediante OpenGL prueba a instalar drivers más actualizados.</translation>
     </message>
     <message>
         <source>There are three different jumps available. Tap [high jump] twice to do a very high/backwards jump.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hay tres tipos de salto en el juego. Presiona [salto alto] dos veces para realizar un salto muy alto, vertical y ligeramente hacia atrás.</translation>
     </message>
     <message>
         <source>Afraid of falling off a cliff? Hold down [precise] to turn [left] or [right] without actually moving.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>¿Te da miedo caerte por una cornisa? Mantén presionado [aumentar precisión] para voltearte a [izquierda] o [derecha] sin moverte del sitio.</translation>
     </message>
     <message>
         <source>Some weapons require special strategies or just lots of training, so don&apos;t give up on a particular tool if you miss an enemy once.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Algunas armas pueden requerir estrategias especiales o mucho entrenamiento antes de ser usadas correctamente. No tires la a toalla con alguna de ellas sólo porque has fallado el tiro la primera vez.</translation>
     </message>
     <message>
         <source>Most weapons won&apos;t work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>La mayoría de armas se desactivarán al tocar el agua. El abejorro y la tarta son algunas de las excepciones a la regla.</translation>
     </message>
     <message>
         <source>The Old Limbuger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>La explosión del limbuger añejo es relativamente pequeña, pero produce una nube de gas venenoso que será arrastrada por el viento, siendo capaz de intoxicar a varios erizos a la vez.</translation>
     </message>
     <message>
         <source>The Piano Strike is the most damaging air strike. You&apos;ll lose the hedgehog performing it, so there&apos;s a huge downside as well.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>El piano es el ataque aéreo más destructivo del juego, aunque perderás el erizo que lo lance, así que úsalo con cuidado.</translation>
     </message>
     <message>
         <source>The Homing Bee can be tricky to use. It&apos;s turn radius depends on it&apos;s 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>Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations ... or water.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Las bombas lapa son perfectas para crear reacciones en cadena y mandar a tus enemigos al agua... o la Luna.</translation>
     </message>
     <message>
         <source>The Hammer is most effective when used on bridges or girders. Hit hogs will just break through the ground.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>El mazo es mucho más efectivo si lo usas sobre vigas o puentes. Los erizos golpeados simplemente caerán por el agujero como Alicia por la madriguera.</translation>
     </message>
     <message>
         <source>If you&apos;re stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Si estás atrapado tras un erizo enemigo puedes usar el mazo para abrirte paso sin resultar dañado por una explosión.</translation>
     </message>
     <message>
         <source>The Cake&apos;s maximum walking distance depends on the ground it has to pass. Use [attack] to detonate it early.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>El alcance de la tarta depende de lo escarpado del terreno que tenga que atravesar, aunque puedes pulsar [atacar] para detonarla antes de que el contador llegue a cero.</translation>
     </message>
     <message>
         <source>The Flame Thrower is a weapon but it can be used for tunnel digging as well.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>El lanzallamas es un arma, pero puede usarse para excavar túneles en caso de necesidad.</translation>
     </message>
     <message>
         <source>Use the Incinerating Grenade 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 para evitar que erizos enemigos crucen túneles angostos o puentes.</translation>
     </message>
     <message>
         <source>Want to know who&apos;s behind the game? Click on the Hedgewars logo in the main menu to see the credits.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>¿Quieres saber quiénes son los desarrolladores del juego? Pulsa el logo del juego en la pantalla principal para ver los créditos.</translation>
     </message>
     <message>
         <source>Like Hedgewars? Become a fan on %1 or join our group at %2. You could follow us on %3 as well!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>¿Te gusta Hedgewars? Puedes hacerte fan en %1 o unirte a nuestro grupo en %2. ¡Y también puedes seguirnos en %3!</translation>
     </message>
     <message>
         <source>Feel free to draw your own graves, hats, flags or even maps and themes! But note that you&apos;ll have to share them somewhere to use them online.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>¡Puedes dibujar tus propias tumbas, sombreros, banderas o incluso mapas y temas! Sólo ten en cuenta que el juego no es capaz de enviar archivos todavía, así que tendrás que enviar tú mismo los archivos a tus amigos para poder jugar en red con ellos.</translation>
     </message>
     <message>
         <source>Really want to wear a specific hat? Donate to us and receive an exclusive hat of your choice!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>¿Te gustaría poder usar un sombrero especial, sólo para ti? Haz una donación y dinos qué sombrero quieres, lo dibujaremos para ti.</translation>
     </message>
     <message>
         <source>Keep your video card drivers up to date to avoid issues playing the game.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mantén los drivers de tu tarjeta gráfica actualizados para evitar posibles problemas con este y otros juegos.</translation>
     </message>
     <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>Puedes encontrar los archivos de configuración del juego en la carpeta &quot;Mis Documentos\Hedgewars&quot;. Haz copias de seguridad de los mismos o cópialos a otro ordenador si lo deseas, pero no intentes editarlos a mano para evitar posibles pérdidas de datos.</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>Puedes encontrar los archivos de configuración del juego en la carpeta ~/.hedgewars. Haz copias de seguridad de los mismos o cópialos a otro ordenador si lo deseas, pero no intentes editarlos a mano para evitar posibles pérdidas de datos.</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>
+        <comment>Tips</comment>
+        <translation>Puedes asociar los tipos de archivo relacionados, partidas guardadas y demos, con Hedgewars para lanzarlos directamente desde tu gestor de archivos o navegador favoritos.</translation>
     </message>
 </context>
 <context>
@@ -693,7 +711,7 @@
     </message>
     <message>
         <source>You can&apos;t edit teams from team selection. Go back to main menu to add, edit or delete teams.</source>
-        <translation type="unfinished"></translation>
+        <translation>No es posible editar equipos desde la pantalla de elección de equipo. Vuelve al menú principal para añadir, editar o borrar equipos.</translation>
     </message>
 </context>
 <context>
@@ -817,32 +835,33 @@
     </message>
     <message>
         <source>State:</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado:</translation>
     </message>
     <message>
         <source>Rules:</source>
-        <translation type="unfinished"></translation>
+        <translation>Reglas:</translation>
     </message>
     <message>
         <source>Weapons:</source>
-        <translation type="unfinished"></translation>
+        <translation>Armas:</translation>
     </message>
     <message>
         <source>Search:</source>
-        <translation type="unfinished"></translation>
+        <translation>Búsqueda:</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished">Supr</translation>
+        <translation>Limpiar</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Aviso</translation>
     </message>
     <message>
         <source>The game you are trying to join has started.
 Do you still want to join the room?</source>
-        <translation type="unfinished"></translation>
+        <translation>La partida a la que intentas unirte ya ha empezado.
+¿Realmente deseas entrar en la sala?</translation>
     </message>
 </context>
 <context>
@@ -929,11 +948,23 @@
     </message>
     <message>
         <source>Disable land objects when generating random maps.</source>
-        <translation>Deshabilita los objetos en el terreno en los mapas generados aleatoriamente.</translation>
+        <translation>Deshabilita los objetos en los mapas generados aleatoriamente.</translation>
     </message>
     <message>
         <source>AI respawns on death.</source>
-        <translation type="unfinished"></translation>
+        <translation>La computadora resucita al morir.</translation>
+    </message>
+    <message>
+        <source>Attacking does not end your turn.</source>
+        <translation>Atacar no terminará tu turno.</translation>
+    </message>
+    <message>
+        <source>Weapons are reset to starting values each turn.</source>
+        <translation>La munición será reiniciada al comienzo de cada turno.</translation>
+    </message>
+    <message>
+        <source>Each hedgehog has its own ammo. It does not share with the team.</source>
+        <translation>Cada erizo tiene su propia munición y no la comparte con el resto del equipo.</translation>
     </message>
 </context>
 <context>
@@ -971,7 +1002,7 @@
     </message>
     <message>
         <source>Campaign Mode (...). IN DEVELOPMENT</source>
-        <translation type="unfinished"></translation>
+        <translation>Campaña (...) EN DESARROLLO</translation>
     </message>
 </context>
 <context>
@@ -1104,51 +1135,51 @@
     </message>
     <message>
         <source>Community</source>
-        <translation type="unfinished"></translation>
+        <translation>Comunidad</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>Cualquiera</translation>
     </message>
     <message>
         <source>In lobby</source>
-        <translation type="unfinished"></translation>
+        <translation>En espera</translation>
     </message>
     <message>
         <source>In progress</source>
-        <translation type="unfinished"></translation>
+        <translation>En progreso</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Predeterminado</translation>
+        <translation>Predeterminado</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo pro</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation type="unfinished"></translation>
+        <translation>Shoppa</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation type="unfinished"></translation>
+        <translation>Baloncesto</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation type="unfinished"></translation>
+        <translation>Campo de minas</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
+        <translation>Bodega infernal</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
+        <translation>Erizos subterráneos</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation>Lunático</translation>
     </message>
 </context>
 <context>
@@ -1349,15 +1380,17 @@
     </message>
     <message>
         <source>Tip: </source>
-        <translation type="unfinished"></translation>
+        <translation>Consejo:</translation>
     </message>
     <message>
         <source>This development build is &apos;work in progress&apos; and may not be compatible with other versions of the game. Some features might be broken or incomplete. Use at your own risk!</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta es una versión experimental del juego y puede no ser compatible con otras versiones del mismo,
+así como carecer de algunas funcionalidades o simplemente funcionar mal. 
+¡Úsalo bajo tu propia responsabilidad!</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation type="unfinished"></translation>
+        <translation>Calidad</translation>
     </message>
 </context>
 <context>
@@ -1410,11 +1443,15 @@
     </message>
     <message>
         <source>Really delete this weapon set?</source>
-        <translation>¿Realmente desea borrar este set de armas?</translation>
+        <translation>¿Realmente quieres borrar este set de armas?</translation>
     </message>
     <message>
         <source>Can not overwrite default weapon set &apos;%1&apos;!</source>
-        <translation type="unfinished"></translation>
+        <translation>¡No se puede sobreescribir el set de armas por defecto &apos;%1&apos;!</translation>
+    </message>
+    <message>
+        <source>All file associations have been set.</source>
+        <translation>Se reestablecieron todas las asociaciones de tipo de archivo.</translation>
     </message>
 </context>
 <context>
@@ -1506,6 +1543,10 @@
         <source>Random Team</source>
         <translation>Equipo aleatorio</translation>
     </message>
+    <message>
+        <source>Associate file extensions</source>
+        <translation>Asociar tipos de archivo.</translation>
+    </message>
 </context>
 <context>
     <name>QTableWidget</name>
@@ -1644,7 +1685,19 @@
     </message>
     <message>
         <source>AI Survival Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Supervivencia contra la computadora</translation>
+    </message>
+    <message>
+        <source>Unlimited Attacks</source>
+        <translation>Ataques ilimitados</translation>
+    </message>
+    <message>
+        <source>Reset Weapons</source>
+        <translation>Reiniciar munición</translation>
+    </message>
+    <message>
+        <source>Per Hedgehog Ammo</source>
+        <translation>Munición individualizada</translation>
     </message>
 </context>
 <context>
@@ -1809,7 +1862,7 @@
     </message>
     <message>
         <source>slot 10</source>
-        <translation type="unfinished">posición 10</translation>
+        <translation>posición 10</translation>
     </message>
 </context>
 <context>
--- a/share/hedgewars/Data/Locale/hedgewars_fi.ts	Sat Oct 23 17:26:22 2010 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts	Sat Oct 30 20:04:38 2010 +0200
@@ -88,7 +88,7 @@
     </message>
     <message>
         <source>DefaultTeam</source>
-        <translation type="unfinished"></translation>
+        <translation>OletusJoukkue</translation>
     </message>
 </context>
 <context>
@@ -142,31 +142,31 @@
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished">Tyyppi</translation>
+        <translation>Tyyppi</translation>
     </message>
     <message>
         <source>Small tunnels</source>
-        <translation type="unfinished"></translation>
+        <translation>Pieniä tunneleita</translation>
     </message>
     <message>
         <source>Medium tunnels</source>
-        <translation type="unfinished"></translation>
+        <translation>Keskikokoisia tunneleita</translation>
     </message>
     <message>
         <source>Large tunnels</source>
-        <translation type="unfinished"></translation>
+        <translation>Laajoja tunneleita</translation>
     </message>
     <message>
         <source>Small floating islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Pieniä kelluvia saaria</translation>
     </message>
     <message>
         <source>Medium floating islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Keskikokoisia kelluvia saaria</translation>
     </message>
     <message>
         <source>Large floating islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Suuria kelluvia saaria</translation>
     </message>
 </context>
 <context>
@@ -241,7 +241,10 @@
 registered on Hedgewars.org
 Please provide your password below
 or pick another nickname in game config:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nimimerkkisi %1 on
+rekisteröity Hedgewars.org-sivustolla
+Ole hyvä ja syötä salasanasi
+tai aseta eri nimimerkki asetuksissa:</translation>
     </message>
 </context>
 <context>
@@ -267,27 +270,27 @@
     </message>
     <message>
         <source>Fetch data</source>
-        <translation type="unfinished"></translation>
+        <translation>Nouda tiedot</translation>
     </message>
     <message>
         <source>Server message for latest version:</source>
-        <translation type="unfinished"></translation>
+        <translation>Palvelimen viesti viimeisimmälle versiolle:</translation>
     </message>
     <message>
         <source>Server message for previous versions:</source>
-        <translation type="unfinished"></translation>
+        <translation>Palvelimen viesti edellisille versioille:</translation>
     </message>
     <message>
         <source>Latest version protocol number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Viimeisin versioprotokollan numero:</translation>
     </message>
     <message>
         <source>MOTD preview:</source>
-        <translation type="unfinished"></translation>
+        <translation>Päivän viestin esikatselu:</translation>
     </message>
     <message>
         <source>Set data</source>
-        <translation type="unfinished"></translation>
+        <translation>Aseta tiedot</translation>
     </message>
 </context>
 <context>
@@ -330,53 +333,53 @@
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Yksityiskohdat</translation>
     </message>
     <message>
         <source>Health graph</source>
-        <translation type="unfinished"></translation>
+        <translation>Terveys-kuvaaja</translation>
     </message>
     <message>
         <source>Ranking</source>
-        <translation type="unfinished"></translation>
+        <translation>Ranking</translation>
     </message>
     <message>
         <source>The best shot award was won by &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; pts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Paras laukaus-mitalin voitti &lt;b&gt;%1&lt;/b&gt; &lt;b&gt;%2&lt;/b&gt; vahinkopisteellä.</translation>
     </message>
     <message numerus="yes">
         <source>The best killer is &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; kills in a turn.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Paras tappaja on &lt;b&gt;%1&lt;/b&gt; &lt;b&gt;%2&lt;/b&gt; tapolla</numerusform>
+            <numerusform>Paras tappaja on &lt;b&gt;%1&lt;/b&gt; &lt;b&gt;%2&lt;/b&gt; tapolla</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>A total of &lt;b&gt;%1&lt;/b&gt; hedgehog(s) were killed during this round.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Yhteensä &lt;b&gt;%1&lt;/b&gt; siili tapettiin tämän erän aikana.</numerusform>
+            <numerusform>Yhteensä &lt;b&gt;%1&lt;/b&gt; siiltä tapettiin tämän erän aikana.</numerusform>
         </translation>
     </message>
     <message>
         <source>(%1 kill)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1 tappo)</translation>
     </message>
     <message>
         <source>(%1 kills)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1 tappoa)</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; thought it&apos;s good to shoot his own hedgehogs with &lt;b&gt;%2&lt;/b&gt; pts.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; ajatteli että omia siilejä on hyvä vahingoittaa &lt;b&gt;%2&lt;/b&gt; vahinkopisteellä.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; killed &lt;b&gt;%2&lt;/b&gt; of his own hedgehogs.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; tappoi &lt;b&gt;%2&lt;/b&gt; omaa siiltä.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; was scared and skipped turn &lt;b&gt;%2&lt;/b&gt; times.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; pelkäsi ja jätti vuoronsa väliin &lt;b&gt;%2&lt;/b&gt; kertaa.</translation>
     </message>
 </context>
 <context>
@@ -392,237 +395,237 @@
     <message>
         <source>Simply pick the same color as a friend to play together as a team. Each of you will still control his or her own hedgehogs but they&apos;ll win or lose together.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Valitse sama väri kaverisi kanssa pelataksesi samassa joukkueessa. Kumpikin ohjaa omia siilejään, mutta voitatte ja häviätte yhdessä.</translation>
     </message>
     <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"></translation>
+        <translation>Jotkut aseet tekevät vain vähän vahinkoa, mutta voivat olla tuhoisampia oikeassa tilanteessa. Kokeile ampua useampi siili veteen Desert Eaglella.</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>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jos et tiedä mitä tehdä etkä halua tuhlata ammuksia, jätä vuoro väliin. Mutta älä anna ajan kulua liikaa koska Äkkikuolema koittaa ennemmin tai myöhemmin!</translation>
     </message>
     <message>
         <source>Want to save ropse? 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"></translation>
+        <translation>Haluatko säästää köysiä? Päästä köysi irti ilmassa ja ammu uudelleen. Niin pitkään kun et osu maahan, pääse käyttämään köyden uudelleen kuluttamatta ammuksia!</translation>
     </message>
     <message>
         <source>If you&apos;d like to keep others from using your preferred nickname on the official server, register an account at http://www.hedgewars.org/.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jos haluat estää muita käyttämästä nimimerkkiäsi virallisella palvelimella, rekisteröi tunnus osoitteessa http://www.hedgewars.org/.</translation>
     </message>
     <message>
         <source>You&apos;re bored of default gameplay? Try one of the missions - they&apos;ll offer different gameplay depending on the one you picked.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Kyllästyttääkö normaali peli? Kokeila tehtäviä - Ne tarjoaa erilaisia pelitapoja riippuen valinnasta.</translation>
     </message>
     <message>
         <source>By default the game will always record the last game played as a demo. Select &apos;Local Game&apos; and pick the &apos;Demos&apos; button on the lower right corner to play or manage them.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Oletuksena viimeisin peli nauhoitetaan demoksi. Valitse &apos;Demot&apos; vasemmasta alakulmasta katsoaksesi ja hallitaksesi niitä.</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. If you&apos;ve got problems, ask on our forums but please don&apos;t expect 24/7 support!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars on avointa lähdekoodia ja ilmainen ohjelma jota me luomme vapaa-aikanamme. Jos sinulla on ongelmia, kysy keskustelualueilta apua, mutta älä odota 24/7-tukea!</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. If you like it, help us with a small donation or contribute your own work!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars on avointa lähdekoodia ja ilmainen ohjelma jota me luomme vapaa-aikanamme. Jos pidät siitä, voit auttaa meitä pienellä lahjoituksella tai omaa työllä!</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. Share it with your family and friends as you like!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars on avointa lähdekoodia ja ilmainen ohjelma jota me luomme vapaa-aikanamme. Jaa sitä perheesi ja ystäviesi kesken miten haluat!</translation>
     </message>
     <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"></translation>
+        <translation>Toisinaan järjestetään virallisia turnauksia. Tulevista tapahtumista tiedotetaan osoitteessa http://www.hedgewars.org/ muutama päivä etukäteen.</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"></translation>
+        <translation>Hedgewars on saatavilla monilla kielillä. Jos oman kielinen käännös puuttuu tai on vanhentunut, ota yhteyttä!</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"></translation>
+        <translation>Hedgewars toimii useilla eri käyttöjärjestelmillä, kuten Microsoft Windowsissa, Mac OS X:ssä ja Linuxissa.</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>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Muista että voit aina luoda oman pelisi paikallisesti ja verkkopelissä. Et ole rajoitettu yksinkertaiseen peliin.</translation>
     </message>
     <message>
         <source>While playing you should give yourself a short break at least once an hour.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pelatessa sinun pitäisi pitää lyhyt tauko vähintään kerran tunnissa.</translation>
     </message>
     <message>
         <source>If your graphics card isn&apos;t able to provide hardware accelerated OpenGL, try to enable the low quality mode to improve performance.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jos näytönohjaimesi ei tarjoa laitteistokiihdytettä OpenGL:ää, kokeile heikennetyn laadun tilaa parantaaksesi suorituskykyä.</translation>
     </message>
     <message>
         <source>We&apos;re open to suggestions and constructive feedback. If you don&apos;t like something or got a great idea, let us know!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Me olemme avoimia ehdotuksille ja rakentavalle palautteelle. Jos et pidä jostain tai sinulla on loistava idea, kerro meille!</translation>
     </message>
     <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"></translation>
+        <translation>Erityisesti verkossa pelattaessa ole kohtelias ja muista että alaikäisiä saattaa myös olla pelaamassa.</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>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Erityispelimoodit kuten &apos;Vampyrismi&apos; ja &apos;Karma&apos; mahdollistavat kokonaan uusien taktiikoiden kehittämisen. Kokeile niitä muokatussa pelissä!</translation>
     </message>
     <message>
         <source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgwars to its game list so your friends can see you playing.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Windows-versio Hedgewarsista tukee Xfireä. Lisää Hedgewars sen pelilistaan niin kaverisi näkee kun pelaat.</translation>
     </message>
     <message>
         <source>You should never install Hedgewars on computers you don&apos;t own (school, university, work, etc.). Please ask the responsible person instead!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Sinun ei ikinä tulisi asentaa Hedgewarsia tietokoneille joita et omista (koulu, yliopisto, työpaikka jne.). Ole hvä ja pyydä vastuuhenkilöä tekemään se!</translation>
     </message>
     <message>
         <source>Hedgewars can be perfect for short games during breaks. Just ensure you don&apos;t add too many hedgehogs or use an huge map. Reducing time and health might help as well.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars voi olla täydellinen peli tauoille. Mutta varmista ettet lisää liian montaa siiltä ta käytä liian suurta karttaa. Ajan ja terveyden vähentäminen voi myös auttaa.</translation>
     </message>
     <message>
         <source>No hedgehogs were harmed in making this game.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Yhtään siiliä ei vahingoitettu tämän pelin tekemisen aikana.</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. If someone sold you the game, you should try get a refund!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars on avointa lähdekoodia ja ilmainen ohjelma jota me luomme vapaa-aikanamme. Jos joku myi sinulle tämän pelin, koita saada rahasi takaisin!</translation>
     </message>
     <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>Yhdistä yksi tai useampi peliohjain ennen pelin käynnistämistä liittääksesi niiden kontrollit omaan joukkueeseesi.</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>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Luo käyttäjätili osoitteessa %1 estääksesi muita käyttämästä suosikkinimimerkkiäsi pelatessasi virallisella palvelimella.</translation>
     </message>
     <message>
         <source>If your graphics card isn&apos;t able to provide hardware accelerated OpenGL, try to update the associated drivers.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jos näytönohjaimesi ei tue laitteistokiihdytettyä OpenGL:ää, kokeile päivittää ajurit.</translation>
     </message>
     <message>
         <source>There are three different jumps available. Tap [high jump] twice to do a very high/backwards jump.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hyppyjä on saatavilla kolmea erilaista. Napauta [korkea hyppy]-nappai kahdesti tehdäksesi todella korkean/taaksepäin hypyn.</translation>
     </message>
     <message>
         <source>Afraid of falling off a cliff? Hold down [precise] to turn [left] or [right] without actually moving.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pelkäätkö että putoat kielekkeeltä? Pidä [tarkkuus]-näppäintä pohjassa kääntyäksesi [vasemmalle] ja [oikealle] liikkumatta.</translation>
     </message>
     <message>
         <source>Some weapons require special strategies or just lots of training, so don&apos;t give up on a particular tool if you miss an enemy once.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jotkut aseet vaativat erityisstrategiaa tai todella paljon harjoittelua, joten älä anna periksi vaikka et kerran osuisikaan.</translation>
     </message>
     <message>
         <source>Most weapons won&apos;t work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>The Old Limbuger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Vanha Limburger-juusto aiheuttaa vain pienen räjähdyksen, mutta tuulen vaikuttama hajupilvi voi myrkyttää suuren määrän siiliä kerralla.</translation>
     </message>
     <message>
         <source>The Piano Strike is the most damaging air strike. You&apos;ll lose the hedgehog performing it, so there&apos;s a huge downside as well.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pianoisku on vahingollisin ilmaisku. Menetät siilen joka sen esittää, joten sillä on myös suuri huono puoli.</translation>
     </message>
     <message>
         <source>The Homing Bee can be tricky to use. It&apos;s turn radius depends on it&apos;s velocity, so try to not use full power.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mehiläinen voi olla hankala käyttää. Sen säde riippuu nopeudesta, joten älä käytä sitä täydellä voimalla</translation>
     </message>
     <message>
         <source>Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations ... or water.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tarttuvat miinat ovat täydellinen työkalu luomaan pieniä ketjureaktioita jotka vie vihollissiilit kauheisiin tilanteisiin...tai veteen.</translation>
     </message>
     <message>
         <source>The Hammer is most effective when used on bridges or girders. Hit hogs will just break through the ground.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Vasara on tehokkaimmillaan silloilla ja palkeilla. Lyödyt siilit iskeytyvät maan läpi.</translation>
     </message>
     <message>
         <source>If you&apos;re stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jos olet jumissa vihollissiilin takana, käytä vasaraa vapauttaaksesi itsesi ilman että vahingoidut räjädyksen voimasta.</translation>
     </message>
     <message>
         <source>The Cake&apos;s maximum walking distance depends on the ground it has to pass. Use [attack] to detonate it early.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Kakun pisin mahdollinen kulkumatka riippuu maastosta. Käytä [hyökkäystä] räjäyttääksesi sen aikaisemmin.</translation>
     </message>
     <message>
         <source>The Flame Thrower is a weapon but it can be used for tunnel digging as well.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Liekinheitin on ase mutta sitä voi käyttää myös tunneleiden kaivamiseen.</translation>
     </message>
     <message>
         <source>Use the Incinerating Grenade to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Käytä palavaa kranaattia estämään siilia kulkemasta esimerkiksi tunneleihin ja tasoille.</translation>
     </message>
     <message>
         <source>Want to know who&apos;s behind the game? Click on the Hedgewars logo in the main menu to see the credits.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Haluatko tietää ketkä ovat pelin takana? Klikkaa Hedgewars-logoa päävalikossa nähdäksesi tekijäluettelon.</translation>
     </message>
     <message>
         <source>Like Hedgewars? Become a fan on %1 or join our group at %2. You could follow us on %3 as well!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pidätkö Hedgewarsista? Liity faniksi osoitteessa %1 tai liity meidän ryhmään osoitteessa %2. Voit myös seurata meitä osoitteessa %3!</translation>
     </message>
     <message>
         <source>Feel free to draw your own graves, hats, flags or even maps and themes! But note that you&apos;ll have to share them somewhere to use them online.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Piirrä vapaasti omia hautoja, hattuja, lippuja ja jopa karttoja ja teemoja! Mutta huomaa että sinun pitää jakaa ne jossain käyttääksesi niitä verkossa.</translation>
     </message>
     <message>
         <source>Really want to wear a specific hat? Donate to us and receive an exclusive hat of your choice!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Haluatko todella pitää tiettyä hattua? Lahjoita meille niin saat yksinoikeudella vapaavalintaisen hatun!</translation>
     </message>
     <message>
         <source>Keep your video card drivers up to date to avoid issues playing the game.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pidä näytönohjaimesi ajurit ajantasall välttääksesi ongelmat pelin pelaamisessa.</translation>
     </message>
     <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>Löydät Hedgewars-asetustiedostot hakemistosta &quot;Omat tiedostot\Hedgewars&quot;. Ota varmuuskopio tai ota ne mukaasi, mutta älä muokkaa niitä käsin.</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>Löydät Hedgewars-asetustiedostot &quot;Hedgewars&quot;-hakemistosta kotihakemistossasi. Ota varmuuskopio tai ota ne mukaasi, mutta älä muokkaa niitä käsin.</translation>
     </message>
 </context>
 <context>
@@ -673,23 +676,23 @@
     </message>
     <message>
         <source>Delete team</source>
-        <translation type="unfinished"></translation>
+        <translation>Poista joukkue</translation>
     </message>
     <message>
         <source>New weapon scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Uusi ase</translation>
     </message>
     <message>
         <source>Edit weapon scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Muokkaa asesuunnitelmaa</translation>
     </message>
     <message>
         <source>Delete weapon scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Poista asesuunnitelma</translation>
     </message>
     <message>
         <source>You can&apos;t edit teams from team selection. Go back to main menu to add, edit or delete teams.</source>
-        <translation type="unfinished"></translation>
+        <translation>Et voi muokata joukkueita joukkuevalinnassa. Mene takaisin päävalikkoon lisätäksesi, muokataksesi tai poistaaksesi joukkueita.</translation>
     </message>
 </context>
 <context>
@@ -809,36 +812,37 @@
     </message>
     <message>
         <source>Random Maze</source>
-        <translation type="unfinished"></translation>
+        <translation>Satunnainen sokkelo</translation>
     </message>
     <message>
         <source>State:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tila:</translation>
     </message>
     <message>
         <source>Rules:</source>
-        <translation type="unfinished"></translation>
+        <translation>Säännöt:</translation>
     </message>
     <message>
         <source>Weapons:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aseet:</translation>
     </message>
     <message>
         <source>Search:</source>
-        <translation type="unfinished"></translation>
+        <translation>Haku:</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished">Tyhjennä</translation>
+        <translation>Tyhjennä</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Varoitus</translation>
     </message>
     <message>
         <source>The game you are trying to join has started.
 Do you still want to join the room?</source>
-        <translation type="unfinished"></translation>
+        <translation>Peli johon yrität liittyä on jo alkanut.
+Haluatko silti liittyä huoneeseen?</translation>
     </message>
 </context>
 <context>
@@ -925,11 +929,11 @@
     </message>
     <message>
         <source>Disable land objects when generating random maps.</source>
-        <translation type="unfinished"></translation>
+        <translation>Poista maaobjektit satunnaisten karttojen luonnissa.</translation>
     </message>
     <message>
         <source>AI respawns on death.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekoäly syntyy uudelleen kuollessaan.</translation>
     </message>
 </context>
 <context>
@@ -967,7 +971,7 @@
     </message>
     <message>
         <source>Campaign Mode (...). IN DEVELOPMENT</source>
-        <translation type="unfinished"></translation>
+        <translation>Kampanja-tila (...). KEHITYS KESKEN</translation>
     </message>
 </context>
 <context>
@@ -1092,59 +1096,59 @@
     </message>
     <message>
         <source>generated maze...</source>
-        <translation type="unfinished"></translation>
+        <translation>Generoitu sokkelo...</translation>
     </message>
     <message>
         <source>Mission</source>
-        <translation type="unfinished"></translation>
+        <translation>Tehtävä</translation>
     </message>
     <message>
         <source>Community</source>
-        <translation type="unfinished"></translation>
+        <translation>Yhteisö</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>Mikä tahansa</translation>
     </message>
     <message>
         <source>In lobby</source>
-        <translation type="unfinished"></translation>
+        <translation>Aulassa</translation>
     </message>
     <message>
         <source>In progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Kesken</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Oletus</translation>
+        <translation>Oletus</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Pro-tila</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation type="unfinished"></translation>
+        <translation>Shoppa</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation type="unfinished"></translation>
+        <translation>Koripallo</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation type="unfinished"></translation>
+        <translation>Miinakenttä</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
+        <translation>Tynnyrikaaos</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
+        <translation>Tunnelisiilit</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation>Sekopäinen</translation>
     </message>
 </context>
 <context>
@@ -1334,19 +1338,19 @@
     </message>
     <message>
         <source>Explosives</source>
-        <translation type="unfinished"></translation>
+        <translation>Räjähteet</translation>
     </message>
     <message>
         <source>Tip: </source>
-        <translation type="unfinished"></translation>
+        <translation>Vinkki: </translation>
     </message>
     <message>
         <source>This development build is &apos;work in progress&apos; and may not be compatible with other versions of the game. Some features might be broken or incomplete. Use at your own risk!</source>
-        <translation type="unfinished"></translation>
+        <translation>Tämä kehitysversio on keskeneräinen ja ei välttämättä ole yhteensopiva muiden versioiden kanssa. Jotkut ominaisuudet voivat olla rikki tai kesken. Käytä omalla vastuulla!</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation type="unfinished"></translation>
+        <translation>Laatu</translation>
     </message>
 </context>
 <context>
@@ -1403,7 +1407,7 @@
     </message>
     <message>
         <source>Can not overwrite default weapon set &apos;%1&apos;!</source>
-        <translation type="unfinished"></translation>
+        <translation>Oletusasetussettiä &apos;%1&apos; ei voida ylikirjoittaa!</translation>
     </message>
 </context>
 <context>
@@ -1629,11 +1633,11 @@
     </message>
     <message>
         <source>Disable Land Objects</source>
-        <translation type="unfinished"></translation>
+        <translation>Ei maaobjekteja</translation>
     </message>
     <message>
         <source>AI Survival Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekoäly selviytymistila</translation>
     </message>
 </context>
 <context>
@@ -1798,7 +1802,7 @@
     </message>
     <message>
         <source>slot 10</source>
-        <translation type="unfinished">Paikka 10</translation>
+        <translation>paikka 10</translation>
     </message>
 </context>
 <context>
@@ -2203,7 +2207,7 @@
     </message>
     <message>
         <source>Mouse: Left button</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiiri: Vasen nappi</translation>
     </message>
 </context>
 </TS>
--- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts	Sat Oct 23 17:26:22 2010 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts	Sat Oct 30 20:04:38 2010 +0200
@@ -90,6 +90,16 @@
         <source>DefaultTeam</source>
         <translation>EquipePadrão</translation>
     </message>
+    <message>
+        <source>Hedgewars Demo File</source>
+        <comment>File Types</comment>
+        <translation>Arquivo de Demo do Hedgewars</translation>
+    </message>
+    <message>
+        <source>Hedgewars Save File</source>
+        <comment>File Types</comment>
+        <translation>Arquivo do Jogo Hedgewars</translation>
+    </message>
 </context>
 <context>
     <name>HWGame</name>
@@ -262,7 +272,7 @@
     </message>
     <message>
         <source>Fetch data</source>
-        <translation type="unfinished">Trazer dados</translation>
+        <translation>Trazer dados</translation>
     </message>
     <message>
         <source>Server message for latest version:</source>
@@ -282,7 +292,7 @@
     </message>
     <message>
         <source>Set data</source>
-        <translation type="unfinished">Atribuir Dados</translation>
+        <translation>Atribuir Dados</translation>
     </message>
 </context>
 <context>
@@ -324,54 +334,104 @@
         </translation>
     </message>
     <message>
+        <source>&lt;h1&gt;&lt;img src=&quot;:/res/StatsD.png&quot;&gt; Details&lt;/h1&gt;</source>
+        <translation type="obsolete">&lt;h1&gt;&lt;img src=&quot;:/res/StatsD.png&quot;&gt; Detalhes&lt;/h1&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;h1&gt;&lt;img src=&quot;:/res/StatsH.png&quot;&gt; Health graph&lt;/h1&gt;</source>
+        <translation type="obsolete">&lt;br&gt;&lt;h1&gt;&lt;img src=&quot;:/res/StatsH.png&quot;&gt; Desenvolvimento&lt;/h1&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img src=&quot;:/res/StatsR.png&quot;&gt; Ranking&lt;/h1&gt;</source>
+        <translation type="obsolete">&lt;h1&gt;&lt;img src=&quot;:/res/StatsR.png&quot;&gt; Ranking&lt;/h1&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;img src=&quot;:/res/StatsBestShot.png&quot;&gt; The best shot award was won by &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; pts.&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;&lt;img src=&quot;:/res/StatsBestShot.png&quot;&gt; O prêmio de melhor tiro vai para &lt;b&gt;%1&lt;/b&gt; com &lt;b&gt;%2&lt;/b&gt; pts.&lt;/p&gt;</translation>
+    </message>
+    <message numerus="yes">
+        <source>&lt;p&gt;&lt;img src=&quot;:/res/StatsBestKiller.png&quot;&gt; The best killer is &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; kills in a turn.&lt;/p&gt;</source>
+        <translation type="obsolete">
+            <numerusform>&lt;p&gt;&lt;img src=&quot;:/res/StatsBestKiller.png&quot;&gt; O melhor matador é &lt;b&gt;%1&lt;/b&gt; com &lt;b&gt;%2&lt;/b&gt; mortes em um turno.&lt;/p&gt;</numerusform>
+            <numerusform>&lt;p&gt;&lt;img src=&quot;:/res/StatsBestKiller.png&quot;&gt; Os melhores matadores são &lt;b&gt;%1&lt;/b&gt; com &lt;b&gt;%2&lt;/b&gt; mortes em um turno.&lt;/p&gt;</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>&lt;p&gt;&lt;img src=&quot;:/res/StatsHedgehogsKilled.png&quot;&gt; A total of &lt;b&gt;%1&lt;/b&gt; hedgehog(s) were killed during this round.&lt;/p&gt;</source>
+        <translation type="obsolete">
+            <numerusform>&lt;p&gt;&lt;img src=&quot;:/res/StatsHedgehogsKilled.png&quot;&gt; Um total de &lt;b&gt;%1&lt;/b&gt; ouriço foi morto neste round.&lt;/p&gt;</numerusform>
+            <numerusform>&lt;p&gt;&lt;img src=&quot;:/res/StatsHedgehogsKilled.png&quot;&gt; Um total de &lt;b&gt;%1&lt;/b&gt; ouriços foram mortos neste round.&lt;/p&gt;</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;h2&gt;%1 %2. &lt;font color=&quot;%5&quot;&gt;%3&lt;/font&gt;  (%4 kill).&lt;/h2&gt;&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;&lt;h2&gt;%1 %2. &lt;font color=&quot;%5&quot;&gt;%3&lt;/font&gt;  (%4 morte).&lt;/h2&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;h2&gt;%1 %2. &lt;font color=&quot;%5&quot;&gt;%3&lt;/font&gt;  (%4 kills).&lt;/h2&gt;&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;&lt;h2&gt;%1 %2. &lt;font color=&quot;%5&quot;&gt;%3&lt;/font&gt;  (%4 mortes).&lt;/h2&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;img src=&quot;:/res/StatsMostSelfDamage.png&quot;&gt; &lt;b&gt;%1&lt;/b&gt; thought it&apos;s good to shoot his own hedgehogs with &lt;b&gt;%2&lt;/b&gt; pts.&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;&lt;img src=&quot;:/res/StatsMostSelfDamage.png&quot;&gt; &lt;b&gt;%1&lt;/b&gt; pensou que era bom atirar na sua própria equipe totalizando &lt;b&gt;%2&lt;/b&gt; pts.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;img src=&quot;:/res/StatsSelfKilled.png&quot;&gt; &lt;b&gt;%1&lt;/b&gt; killed &lt;b&gt;%2&lt;/b&gt; of his own hedgehogs.&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;&lt;img src=&quot;:/res/StatsSelfKilled.png&quot;&gt; &lt;b&gt;%1&lt;/b&gt; matou &lt;b&gt;%2&lt;/b&gt; dos próprios ouriços.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;img src=&quot;:/res/StatsSkipped.png&quot;&gt; &lt;b&gt;%1&lt;/b&gt; was scared and skipped turn &lt;b&gt;%2&lt;/b&gt; times.&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;&lt;img src=&quot;:/res/StatsSkipped.png&quot;&gt; &lt;b&gt;%1&lt;/b&gt; estava assustado e passou o turno &lt;b&gt;%2&lt;/b&gt; vezes.&lt;/p&gt;</translation>
+    </message>
+    <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalhes</translation>
     </message>
     <message>
         <source>Health graph</source>
-        <translation type="unfinished"></translation>
+        <translation>Desenvolvimento</translation>
     </message>
     <message>
         <source>Ranking</source>
-        <translation type="unfinished"></translation>
+        <translation>Ranking</translation>
     </message>
     <message>
         <source>The best shot award was won by &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; pts.</source>
-        <translation type="unfinished"></translation>
+        <translation>O prêmio de melhor atirador foi para &lt;b&gt;%1&lt;/b&gt; com &lt;b&gt;%2&lt;/b&gt; pts.</translation>
     </message>
     <message numerus="yes">
         <source>The best killer is &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; kills in a turn.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>O melhor matador é &lt;b&gt;%1&lt;/b&gt; com &lt;b&gt;%2&lt;/b&gt; morte em um turno.</numerusform>
+            <numerusform>O melhor matador é &lt;b&gt;%1&lt;/b&gt; com &lt;b&gt;%2&lt;/b&gt; mortes em um turno.</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>A total of &lt;b&gt;%1&lt;/b&gt; hedgehog(s) were killed during this round.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>&lt;b&gt;%1&lt;/b&gt; ouriço foi morto neste round.</numerusform>
+            <numerusform>&lt;b&gt;%1&lt;/b&gt; ouriços foram mortos neste round.</numerusform>
         </translation>
     </message>
     <message>
         <source>(%1 kill)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1 morte)</translation>
     </message>
     <message>
         <source>(%1 kills)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1 mortes)</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; thought it&apos;s good to shoot his own hedgehogs with &lt;b&gt;%2&lt;/b&gt; pts.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; pensou que era bom atirar na sua própria equipe totalizando &lt;b&gt;%2&lt;/b&gt; pts.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; killed &lt;b&gt;%2&lt;/b&gt; of his own hedgehogs.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; matou &lt;b&gt;%2&lt;/b&gt; dos próprios ouriços.&lt;/p&gt;.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; was scared and skipped turn &lt;b&gt;%2&lt;/b&gt; times.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; estava assustado e passou o turno &lt;b&gt;%2&lt;/b&gt; vezes.&lt;/p&gt;.</translation>
     </message>
 </context>
 <context>
@@ -437,7 +497,7 @@
     <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>De tempos em tempos ocorrem torneios. Esses eventos podem ser acompanhados através do site http://www.hedgewars.org/  .</translation>
+        <translation>De tempos em tempos ocorrem torneios. Esses eventos podem ser acompanhados através do endereço 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>
@@ -447,7 +507,7 @@
     <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>Hedgewars pode ser jogado em muitos sistemas operacionais, incluindo Windows, Mas OS X e Linux.</translation>
+        <translation>Hedgewars pode ser jogado em muitos sistemas operacionais, incluindo Windows, Mac OS X e 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>
@@ -492,7 +552,7 @@
     <message>
         <source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgwars to its game list so your friends can see you playing.</source>
         <comment>Tips</comment>
-        <translation>A versão Windows deste jogo permite o uso do Xfire. Certifique-se de adicionar Hedgewars para sua lista de jogospara ver quem está jogando.</translation>
+        <translation>A versão Windows deste jogo permite o uso do Xfire. Certifique-se de adicionar Hedgewars para sua lista de jogos para ver quem está jogando.</translation>
     </message>
     <message>
         <source>You should never install Hedgewars on computers you don&apos;t own (school, university, work, etc.). Please ask the responsible person instead!</source>
@@ -517,122 +577,128 @@
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. If someone sold you the game, you should try get a refund!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars é um jogo de Código Aberto e grátis que criamos em nosso tempo livre. Se alguém te vendeu este jogo, você deveria pedir reembolso!</translation>
     </message>
     <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>Conecte um ou mais joysticks antes de começar o jogo para poder usá-los para controlar a sua equipe.</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>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Crie uma conta em %1 para evitar que outros usem seu apelido quando jogar no servidor oficial.</translation>
     </message>
     <message>
         <source>If your graphics card isn&apos;t able to provide hardware accelerated OpenGL, try to update the associated drivers.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Se sua placa gráfica não tem aceleração gráfica OpenGl, tente atualizar os drivers relacionados.</translation>
     </message>
     <message>
         <source>There are three different jumps available. Tap [high jump] twice to do a very high/backwards jump.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Há 3 diferentes pulos. Aperte [pulo alto] 2 vezes para fazer um pulo alto para trás.</translation>
     </message>
     <message>
         <source>Afraid of falling off a cliff? Hold down [precise] to turn [left] or [right] without actually moving.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>O que é o colchetes?</translatorcomment>
+        <translation>Medo de cair de um desfiladeiro? Mantenha pressionado [mira precisa] para virar à [esquerda] or [direita] sem se mover.</translation>
     </message>
     <message>
         <source>Some weapons require special strategies or just lots of training, so don&apos;t give up on a particular tool if you miss an enemy once.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Algumas armas necessitam estratégias especiais ou muito treino, então não desista de uma arma ou utilidade se você errou em seu uso.</translation>
     </message>
     <message>
         <source>Most weapons won&apos;t work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Muitas armas não funcionarão após tocar na água. A Abelha e o bolo são excessões a regra.</translation>
     </message>
     <message>
         <source>The Old Limbuger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>O Velho Limburger causa uma pequena explosão. Porém, o vento carregará uma nuvem fedorenta que poderá envenenar muitos ouriços.</translation>
     </message>
     <message>
         <source>The Piano Strike is the most damaging air strike. You&apos;ll lose the hedgehog performing it, so there&apos;s a huge downside as well.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>O Ataque com Piano é o mais violento ataque aéreo. Você perderá seu ouriço ao executá-lo, logo, há uma grande contra-partida.</translation>
     </message>
     <message>
         <source>The Homing Bee can be tricky to use. It&apos;s turn radius depends on it&apos;s velocity, so try to not use full power.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>A Abelha pode ser dificil de usar. O raio da sua volta depende da velocidade dela, então evite usar força máxima.</translation>
     </message>
     <message>
         <source>Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations ... or water.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Minas Adesivas são a arma perfeita para criar pequenas reações em cadeias, colocando ouriços inimigos em situações complicadas.... ou na água</translation>
     </message>
     <message>
         <source>The Hammer is most effective when used on bridges or girders. Hit hogs will just break through the ground.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>O Martelo é mais efetivo quando usado em pontes ou vigas. Ouriços atingidos atravessarão o chão.</translation>
     </message>
     <message>
         <source>If you&apos;re stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Se você está preso atrás de um ouriço inimigo, use o Martelo para se libertar sem sofrer danos.</translation>
     </message>
     <message>
         <source>The Cake&apos;s maximum walking distance depends on the ground it has to pass. Use [attack] to detonate it early.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>A distância máxima que o Bolo anda depende do terreno por onde ele passa. Use [ataque] para detoná-lo antes.</translation>
     </message>
     <message>
         <source>The Flame Thrower is a weapon but it can be used for tunnel digging as well.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>O Lança-Chamas é uma arma porém pode ser usado para cavar túneis também.</translation>
     </message>
     <message>
         <source>Use the Incinerating Grenade to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Use o Cocktail Molotov para evitar que ouriços atravessem terrenos como túneis ou plataformas temporariamente.</translation>
     </message>
     <message>
         <source>Want to know who&apos;s behind the game? Click on the Hedgewars logo in the main menu to see the credits.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Quer saber quem está por trás desse jogo? Clique no logo do Hedgewars no menu principal para ver os créditos.</translation>
     </message>
     <message>
         <source>Like Hedgewars? Become a fan on %1 or join our group at %2. You could follow us on %3 as well!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Gostou de Hedgewars? Se torne um fã no %1, participe em nosso grupo em %2. Você também poderia nos seguir no %3!</translation>
     </message>
     <message>
         <source>Feel free to draw your own graves, hats, flags or even maps and themes! But note that you&apos;ll have to share them somewhere to use them online.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Desenhe suas próprias tumbas, chapéus, bandeiras ou até mapas e temas! Mas observe que você terá que compartilhá-los para jogar online.</translation>
     </message>
     <message>
         <source>Really want to wear a specific hat? Donate to us and receive an exclusive hat of your choice!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Realmente quer usar um chapéu específico? Doe para o Hedgewars e receba um chapéu exclusivo!</translation>
     </message>
     <message>
         <source>Keep your video card drivers up to date to avoid issues playing the game.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mantenha a sua placa de vídeo atualizada para evitar problemas ao jogar este jogo.</translation>
     </message>
     <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>Você pode encontrar os arquivos de configuração em &quot;Meus Documentos\Hedgewars&quot;. Crie cópias ou leve os arquivos com você, mas não edite eles manualmente.</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>Você pode encontrar os arquivos de configuração em &quot;.hedgewars&quot;. Crie cópias ou leve os arquivos com você, mas não edite eles manualmente.</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>
+        <comment>Tips</comment>
+        <translation>Você pode associar os arquivos relacionados ao Hedgewars (jogos salvos e gravações demo), podendo abrí-los diretamente do gerenciador de arquivos ou do navegador</translation>
     </message>
 </context>
 <context>
@@ -657,7 +723,7 @@
     <name>PageNetGame</name>
     <message>
         <source>Control</source>
-        <translation>Control</translation>
+        <translation>Controle</translation>
     </message>
 </context>
 <context>
@@ -823,32 +889,33 @@
     </message>
     <message>
         <source>State:</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado:</translation>
     </message>
     <message>
         <source>Rules:</source>
-        <translation type="unfinished"></translation>
+        <translation>Regras:</translation>
     </message>
     <message>
         <source>Weapons:</source>
-        <translation type="unfinished"></translation>
+        <translation>Armas:</translation>
     </message>
     <message>
         <source>Search:</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar:</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished">Limpar</translation>
+        <translation>Limpar</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Aviso</translation>
     </message>
     <message>
         <source>The game you are trying to join has started.
 Do you still want to join the room?</source>
-        <translation type="unfinished"></translation>
+        <translation>O jogo no qual você está tentando entrar já começou.
+Você ainda quer entrar na sala?</translation>
     </message>
 </context>
 <context>
@@ -941,6 +1008,18 @@
         <source>AI respawns on death.</source>
         <translation>AI Renasce ao morrer.</translation>
     </message>
+    <message>
+        <source>Attacking does not end your turn.</source>
+        <translation>Ataque não termina o turno.</translation>
+    </message>
+    <message>
+        <source>Weapons are reset to starting values each turn.</source>
+        <translation>Armas são reiniciadas para o valor padrão ao início de cada turno.</translation>
+    </message>
+    <message>
+        <source>Each hedgehog has its own ammo. It does not share with the team.</source>
+        <translation>Cada ouriço tem sua própria munição. Ele não compartilha com a equipe.</translation>
+    </message>
 </context>
 <context>
     <name>PageSelectWeapon</name>
@@ -1110,51 +1189,51 @@
     </message>
     <message>
         <source>Community</source>
-        <translation type="unfinished"></translation>
+        <translation>Comunidade</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>Qualquer</translation>
     </message>
     <message>
         <source>In lobby</source>
-        <translation type="unfinished"></translation>
+        <translation>Em espera</translation>
     </message>
     <message>
         <source>In progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Em progresso</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Padrão</translation>
+        <translation>Padrão</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo Pro</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation type="unfinished"></translation>
+        <translation>Shoppa</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation type="unfinished"></translation>
+        <translation>Basketball</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation type="unfinished"></translation>
+        <translation>Campo Minado</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Inferno de Barris</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Túneis</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Crazy</translation>
     </message>
 </context>
 <context>
@@ -1427,6 +1506,10 @@
         <source>Can not overwrite default weapon set &apos;%1&apos;!</source>
         <translation>Não pode sobre-escrever o esquema %1!</translation>
     </message>
+    <message>
+        <source>All file associations have been set.</source>
+        <translation>Todos os arquivos foram associados.</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1517,6 +1600,10 @@
         <source>Random Team</source>
         <translation>Equipe Aleatória</translation>
     </message>
+    <message>
+        <source>Associate file extensions</source>
+        <translation>Associar extensão de arquivos.</translation>
+    </message>
 </context>
 <context>
     <name>QTableWidget</name>
@@ -1659,6 +1746,18 @@
         <source>AI Survival Mode</source>
         <translation>AI Modo de Sobrevivência</translation>
     </message>
+    <message>
+        <source>Unlimited Attacks</source>
+        <translation>Ataques Ilimitados</translation>
+    </message>
+    <message>
+        <source>Reset Weapons</source>
+        <translation>Reiniciar Armas</translation>
+    </message>
+    <message>
+        <source>Per Hedgehog Ammo</source>
+        <translation>Munição por Ouriço</translation>
+    </message>
 </context>
 <context>
     <name>binds</name>
@@ -1818,7 +1917,7 @@
     </message>
     <message>
         <source>high jump</source>
-        <translation>salto alto</translation>
+        <translation>pulo alto</translation>
     </message>
     <message>
         <source>slot 10</source>
--- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts	Sat Oct 23 17:26:22 2010 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts	Sat Oct 30 20:04:38 2010 +0200
@@ -87,7 +87,7 @@
     </message>
     <message>
         <source>DefaultTeam</source>
-        <translation type="unfinished"></translation>
+        <translation>默认团队</translation>
     </message>
 </context>
 <context>
@@ -187,7 +187,7 @@
     <name>HWNewNet</name>
     <message>
         <source>The host was not found. Please check the host name and port settings.</source>
-        <translation>错误没找到这个主机。请检查主机名和端口设置。</translation>
+        <translation>没有这个主机。请检查主机名和端口设置。</translation>
     </message>
     <message>
         <source>Connection refused</source>
@@ -195,7 +195,7 @@
     </message>
     <message>
         <source>Quit reason: </source>
-        <translation>退出原因:</translation>
+        <translation>退出原因:  </translation>
     </message>
     <message>
         <source>Room destroyed</source>
@@ -273,11 +273,11 @@
     </message>
     <message>
         <source>Server message for latest version:</source>
-        <translation>最新版本的服务器信息</translation>
+        <translation>最新版本的服务器信息:  </translation>
     </message>
     <message>
         <source>Server message for previous versions:</source>
-        <translation>之前版本的服务器信息</translation>
+        <translation>之前版本的服务器信息:  </translation>
     </message>
     <message>
         <source>Latest version protocol number:</source>
@@ -330,51 +330,51 @@
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>细节</translation>
     </message>
     <message>
         <source>Health graph</source>
-        <translation type="unfinished"></translation>
+        <translation>生命值图表</translation>
     </message>
     <message>
         <source>Ranking</source>
-        <translation type="unfinished"></translation>
+        <translation>等级</translation>
     </message>
     <message>
         <source>The best shot award was won by &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; pts.</source>
-        <translation type="unfinished"></translation>
+        <translation>最佳射手奖给与 &lt;b&gt;%1&lt;/b&gt;:伤害 &lt;b&gt;%2&lt;/b&gt;点。&lt;/p&gt;</translation>
     </message>
     <message numerus="yes">
         <source>The best killer is &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; kills in a turn.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>最佳杀手是 &lt;b&gt;%1&lt;/b&gt;单回合击杀 &lt;b&gt;%2&lt;/b&gt; 只刺猬.</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>A total of &lt;b&gt;%1&lt;/b&gt; hedgehog(s) were killed during this round.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>本轮总共有 &lt;b&gt;%1&lt;/b&gt; 只刺猬被击杀.&lt;/p&gt;</numerusform>
         </translation>
     </message>
     <message>
         <source>(%1 kill)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1 灭杀)</translation>
     </message>
     <message>
         <source>(%1 kills)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1 灭杀)</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; thought it&apos;s good to shoot his own hedgehogs with &lt;b&gt;%2&lt;/b&gt; pts.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt;另外,射击己方刺猬损失&lt;b&gt;%2&lt;/b&gt;点血。</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; killed &lt;b&gt;%2&lt;/b&gt; of his own hedgehogs.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt;个刺猬被&lt;b&gt;%2&lt;/b&gt;己方的刺猬误伤.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; was scared and skipped turn &lt;b&gt;%2&lt;/b&gt; times.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt;被迫跳过&lt;b&gt;%2&lt;/b&gt;回合。</translation>
     </message>
 </context>
 <context>
@@ -400,62 +400,62 @@
     <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>
         <comment>Tips</comment>
-        <translation>加入不确定怎么做,不要浪费弹药,跳过此回合。但是注意突然时间!</translation>
+        <translation>如果不确定该怎么做,不要浪费弹药,跳过此回合。但是注意突然死亡的时间!</translation>
     </message>
     <message>
         <source>Want to save ropse? 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>保存绳子?在半空释放然后再次射出。只要不接触地面停止就可以继续使用同一根不会浪费!</translation>
+        <translation>想节省绳子数量?在半空释放然后再次射出。只要不触地即可继续使用同一根而不浪费!</translation>
     </message>
     <message>
         <source>If you&apos;d like to keep others from using your preferred nickname on the official server, register an account at http://www.hedgewars.org/.</source>
         <comment>Tips</comment>
-        <translation>如果您确定好了一个昵称不想让别人使用,那么在  http://www.hedgewars.org/. 注册一个帐号吧</translation>
+        <translation>如果您让自己的昵称不被别人使用,请到  http://www.hedgewars.org/. 注册一个帐号吧.</translation>
     </message>
     <message>
         <source>You&apos;re bored of default gameplay? Try one of the missions - they&apos;ll offer different gameplay depending on the one you picked.</source>
         <comment>Tips</comment>
-        <translation>厌倦了默认的玩法?试试任务——</translation>
+        <translation>厌倦了默认的游戏?试试做任务吧——多种游戏模式让你无限选择.</translation>
     </message>
     <message>
         <source>By default the game will always record the last game played as a demo. Select &apos;Local Game&apos; and pick the &apos;Demos&apos; button on the lower right corner to play or manage them.</source>
         <comment>Tips</comment>
-        <translation>默认情况下游戏记录最后的游戏作为Demo,选择单机游戏——然后Demo——然后点击右下角开始回放或者整理。</translation>
+        <translation>默认时记录中最后的一次被称做Demo,选择单机游戏——然后选Demo——然后点击右下角开始回放或整理。</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. If you&apos;ve got problems, ask on our forums but please don&apos;t expect 24/7 support!</source>
         <comment>Tips</comment>
-        <translation>刺猬大作战是一个开放源代码的免费软件,它充分利用了我们的业余时间。如果您有问题,到论坛来吧,不过7×24小时支持不可能!</translation>
+        <translation>“刺猬杀”是一个开源的免费软件,它充分利用了我们的业余时间。如果您有问题,到论坛来吧,不过不要期待全天候支持!</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. If you like it, help us with a small donation or contribute your own work!</source>
         <comment>Tips</comment>
-        <translation>刺猬大作战是一个开放源代码的免费软件,它充分利用了我们的业余时间。如果您喜欢它,我们接受您的捐赠/感谢!</translation>
+        <translation>“刺猬杀”是一个开源的免费软件,它充分利用了我们的业余时间。如果您你喜欢它就来贡献你的力量吧!</translation>
     </message>
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. Share it with your family and friends as you like!</source>
         <comment>Tips</comment>
-        <translation>刺猬大作战是一个开放源代码的免费软件,它充分利用了我们的业余时间。与他人分享它吧!</translation>
+        <translation>“刺猬杀”是一个开源的免费软件,它充分利用了我们的业余时间。如果您你喜欢它,与别人分享吧!</translation>
     </message>
     <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>官方的竞赛一直存在。临近时去  http://www.hedgewars.org/  即可看到。</translation>
+        <translation>官方一直就有不断的对战,随时可以去  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>Hedgewars 被翻译成多种语言,中文是刺猬大作战——同样为翻译名。如果您的语言翻译有什么缺失/过时/遗漏或任何问题,来联系我们吧!</translation>
+        <translation>Hedgewars 被翻译成多种语言,中文是“刺猬杀”——同样为翻译名。如果您觉得语言翻译有什么缺失/过时/遗漏或任何问题,请联系我们吧!</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>刺猬大作战可以运行的操作系统包括:GNU/Linux、Mac OS X、MicroSoft Windows。</translation>
+        <translation>“刺猬杀”是一款跨平台游戏,可以运行的操作系统包括:GNU/Linux、Mac OS X、MicroSoft Windows、iOS等。</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>
         <comment>Tips</comment>
-        <translation>您可以建立自己的网络游戏/局域网游戏。不仅限于 &quot;简单游戏&quot; 选项。</translation>
+        <translation>您可以建立自己的网络游戏/局域网游戏。不仅限于 &quot;简单游戏&quot; 模式。</translation>
     </message>
     <message>
         <source>Create an account on http://www.hedgewars.org/ to keep others from using your most favourite nickname while playing on the official server.</source>
@@ -470,42 +470,42 @@
     <message>
         <source>If your graphics card isn&apos;t able to provide hardware accelerated OpenGL, try to enable the low quality mode to improve performance.</source>
         <comment>Tips</comment>
-        <translation>假如你的显卡不能提供OpenGL硬件加速,试着用降低效果的方式运行</translation>
+        <translation>假如你的显卡不能提供OpenGL硬件加速,试着用降低效果的方式运行。</translation>
     </message>
     <message>
         <source>We&apos;re open to suggestions and constructive feedback. If you don&apos;t like something or got a great idea, let us know!</source>
         <comment>Tips</comment>
-        <translation>我们接受意见和建设性反馈。假如您有好电子或者不喜欢的东西,告诉我们!</translation>
+        <translation>我们接受意见和建设性反馈。假如您有好点子或者不喜欢的东西,请告诉我们!</translation>
     </message>
     <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>特别是网络游戏,请有礼貌记住对方也和您一样是人!</translation>
+        <translation>特别是网络游戏,请注意礼节。记住:对方也和您一样是人!</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>
         <comment>Tips</comment>
-        <translation>特别游戏模式“吸血“、”因果报应“需要全新的战术。现在自定义游戏里试试!</translation>
+        <translation>特别游戏模式“吸血“、”因果报应“需要全新的战术。来&quot;自定义游戏&quot;里试试!</translation>
     </message>
     <message>
         <source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgwars to its game list so your friends can see you playing.</source>
         <comment>Tips</comment>
-        <translation>Windows版本的刺猬大作战支持Xfire。添加它到游戏列表里让您的朋友看到。</translation>
+        <translation>Windows版本的&quot;刺猬杀&quot;支持Xfire。添加它到游戏列表里让您的朋友看到。</translation>
     </message>
     <message>
         <source>You should never install Hedgewars on computers you don&apos;t own (school, university, work, etc.). Please ask the responsible person instead!</source>
         <comment>Tips</comment>
-        <translation>您不应该在不属于您的计算机上安装刺猬大作战——比如学校/工作场所。</translation>
+        <translation>您不应该在不属于您的计算机上安装“刺猬杀”——比如学校/工作场所!</translation>
     </message>
     <message>
         <source>Hedgewars can be perfect for short games during breaks. Just ensure you don&apos;t add too many hedgehogs or use an huge map. Reducing time and health might help as well.</source>
         <comment>Tips</comment>
-        <translation>刺猬大作战适合短时间休息,不需要太多刺猬挤在大地图上。</translation>
+        <translation>“刺猬杀”适合短时间休闲游戏,不需要将大量刺猬挤在一幅超大地图上。</translation>
     </message>
     <message>
         <source>No hedgehogs were harmed in making this game.</source>
         <comment>Tips</comment>
-        <translation>制作这个游戏时不曾伤害任何刺猬</translation>
+        <translation>制作这个游戏时不曾伤害任何刺猬。</translation>
     </message>
     <message>
         <source>Connect one or more gamepads before launching the game to be able to assign their controls to your teams.</source>
@@ -515,122 +515,122 @@
     <message>
         <source>Hedgewars is Open Source and Freeware we create in our spare time. If someone sold you the game, you should try get a refund!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>“刺猬杀”是一个开源的免费软件,它充分利用了我们的业余时间。如果有人想要将它卖给你,请你拒绝他!</translation>
     </message>
     <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>游戏运行前连上游戏板,让你的团队充分控制刺猬.</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>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>在官方服务器 %1 建立自己的帐号,就可以在官方服务器使用你最喜欢的昵称了.</translation>
     </message>
     <message>
         <source>If your graphics card isn&apos;t able to provide hardware accelerated OpenGL, try to update the associated drivers.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>假如你的显卡不能提供OpenGL硬件加速,试着用降低效果的方式运行。</translation>
     </message>
     <message>
         <source>There are three different jumps available. Tap [high jump] twice to do a very high/backwards jump.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>三种跳跃模式,快速按两次 [长跳] 键可以跳到非常高/向后跳.</translation>
     </message>
     <message>
         <source>Afraid of falling off a cliff? Hold down [precise] to turn [left] or [right] without actually moving.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>害怕掉进深渊?一直按住[精确控制]建并按[左][右]不用移动.</translation>
     </message>
     <message>
         <source>Some weapons require special strategies or just lots of training, so don&apos;t give up on a particular tool if you miss an enemy once.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>一些武器需要特别的技能与足够的训练,因此不要放弃练习,即便是失败。是曰:屡败屡战。</translation>
     </message>
     <message>
         <source>Most weapons won&apos;t work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>大多数武器在碰到水面的时候就失效了,除了“野蜂飞舞”和“蛋糕”。</translation>
     </message>
     <message>
         <source>The Old Limbuger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>毒奶酪只能造成不大的杀伤,不过能形成一片毒云并杀伤一片的刺猬.</translation>
     </message>
     <message>
         <source>The Piano Strike is the most damaging air strike. You&apos;ll lose the hedgehog performing it, so there&apos;s a huge downside as well.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>钢琴攻击能产生极大的空袭杀伤,同时你将失去这个刺猬,所以这招实在是个下下策.</translation>
     </message>
     <message>
         <source>The Homing Bee can be tricky to use. It&apos;s turn radius depends on it&apos;s velocity, so try to not use full power.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>“野蜂飞舞”可以蓄力使用,它旋转时的精度依赖于其速度,所以没必要发全力.</translation>
     </message>
     <message>
         <source>Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations ... or water.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>近身地雷完美的构建了一个链子因此可以将敌人打入地下或者...水里.</translation>
     </message>
     <message>
         <source>The Hammer is most effective when used on bridges or girders. Hit hogs will just break through the ground.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>大捶主要用在桥梁或者薄板,可以将敌人敲下去.</translation>
     </message>
     <message>
         <source>If you&apos;re stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>如果你被敌人围困,可以用大锤来解围。</translation>
     </message>
     <message>
         <source>The Cake&apos;s maximum walking distance depends on the ground it has to pass. Use [attack] to detonate it early.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>蛋糕最大行走距离取决于地形边缘,用[攻击]键尽早结束它。</translation>
     </message>
     <message>
         <source>The Flame Thrower is a weapon but it can be used for tunnel digging as well.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>[钻洞器]既可以当作武器,也可以用做为打洞器。</translation>
     </message>
     <message>
         <source>Use the Incinerating Grenade to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>可以用“飞碟”让刺猬暂时离开洞穴等地形环境.</translation>
     </message>
     <message>
         <source>Want to know who&apos;s behind the game? Click on the Hedgewars logo in the main menu to see the credits.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>想知道是谁贡献的这个游戏?请在主界面点击“Hedgewars”LOGO就可以看到“制作团队”.</translation>
     </message>
     <message>
         <source>Like Hedgewars? Become a fan on %1 or join our group at %2. You could follow us on %3 as well!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>喜欢“刺猬杀”?成为一名粉丝吧 %1,或者加入我们的团队 %2!你可以follow我们 %3!</translation>
     </message>
     <message>
         <source>Feel free to draw your own graves, hats, flags or even maps and themes! But note that you&apos;ll have to share them somewhere to use them online.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>你可以自由的构建自己的头像、帽子、旗帜甚至是地图和主题!但是请注意:你需要将这些在线分享出来。</translation>
     </message>
     <message>
         <source>Really want to wear a specific hat? Donate to us and receive an exclusive hat of your choice!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>喜欢一个很特别的帽子图案?贡献你的力量吧,你将得到一个属于自己的帽子图案!</translation>
     </message>
     <message>
         <source>Keep your video card drivers up to date to avoid issues playing the game.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>让你的显卡保持更新以便避免一些已知的游戏问题。</translation>
     </message>
     <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>你可以在“我的文档\Hedgewars”文件夹下找到“刺猬杀”的配置文件,可以新建和备份但不要随便修改。</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>你可以在你的主文件夹下下找到“Hedgewars”文件夹,里面又配置文件,你可以新建和备份这个文件,但请不要随便编辑它.</translation>
     </message>
 </context>
 <context>
@@ -796,7 +796,7 @@
     <message numerus="yes">
         <source>There are %1 clients connected to this room.</source>
         <translation>
-            <numerusform>有 %1 个客户端连接到这个房间。</numerusform>
+            <numerusform>有 %1 个客户端连接到这个房间.</numerusform>
         </translation>
     </message>
     <message numerus="yes">
@@ -819,32 +819,33 @@
     </message>
     <message>
         <source>State:</source>
-        <translation type="unfinished"></translation>
+        <translation>状态: </translation>
     </message>
     <message>
         <source>Rules:</source>
-        <translation type="unfinished"></translation>
+        <translation>规则: </translation>
     </message>
     <message>
         <source>Weapons:</source>
-        <translation type="unfinished"></translation>
+        <translation>武器: </translation>
     </message>
     <message>
         <source>Search:</source>
-        <translation type="unfinished"></translation>
+        <translation>搜索: </translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished">Num Lock / Clear</translation>
+        <translation>清除:</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>警告:</translation>
     </message>
     <message>
         <source>The game you are trying to join has started.
 Do you still want to join the room?</source>
-        <translation type="unfinished"></translation>
+        <translation>游戏正在大厅中。
+你是否想去观战?</translation>
     </message>
 </context>
 <context>
@@ -859,19 +860,19 @@
     </message>
     <message>
         <source>Defend your fort and destroy the opponents, two team colours max!</source>
-        <translation>保卫你的城堡,破坏对手的,努力吧!</translation>
+        <translation>保卫你的城堡,破坏对手的,对战努力吧!</translation>
     </message>
     <message>
         <source>Teams will start on opposite sides of the terrain, two team colours max!</source>
-        <translation>队伍开始在对手的地盘,努力!</translation>
+        <translation>队伍开始在对手的地盘,努力!</translation>
     </message>
     <message>
         <source>Land can not be destroyed!</source>
-        <translation>地面无法破坏!</translation>
+        <translation>地面无法破坏!</translation>
     </message>
     <message>
         <source>Add an indestructable border around the terrain</source>
-        <translation>添加不可毁坏地边界</translation>
+        <translation>添加不可毁坏地形</translation>
     </message>
     <message>
         <source>Lower gravity</source>
@@ -911,15 +912,15 @@
     </message>
     <message>
         <source>Order of play is random instead of in room order.</source>
-        <translation>随机出场顺序</translation>
+        <translation>随机出场顺序。</translation>
     </message>
     <message>
         <source>Play with a King. If he dies, your side dies.</source>
-        <translation>国王不能死!!</translation>
+        <translation>国王不能死!!否则自动输。</translation>
     </message>
     <message>
         <source>Take turns placing your hedgehogs before the start of play.</source>
-        <translation>在开局前手动放置刺猬</translation>
+        <translation>在开局前手动放置刺猬。</translation>
     </message>
     <message>
         <source>Ammo is shared between all teams that share a colour.</source>
@@ -927,15 +928,15 @@
     </message>
     <message>
         <source>Disable girders when generating random maps.</source>
-        <translation>禁止随机生成地图使用梁</translation>
+        <translation>禁止随机生成地图使用梁。</translation>
     </message>
     <message>
         <source>Disable land objects when generating random maps.</source>
-        <translation>禁止随机生成地图使用地面物体</translation>
+        <translation>禁止随机生成地图使用地面物体。</translation>
     </message>
     <message>
         <source>AI respawns on death.</source>
-        <translation type="unfinished"></translation>
+        <translation>AI死后重生。</translation>
     </message>
 </context>
 <context>
@@ -973,7 +974,7 @@
     </message>
     <message>
         <source>Campaign Mode (...). IN DEVELOPMENT</source>
-        <translation type="unfinished"></translation>
+        <translation>对战模式(...)开发中</translation>
     </message>
 </context>
 <context>
@@ -1098,7 +1099,7 @@
     </message>
     <message>
         <source>generated maze...</source>
-        <translation>生成的迷宫</translation>
+        <translation>生成的迷宫...</translation>
     </message>
     <message>
         <source>Mission</source>
@@ -1106,51 +1107,51 @@
     </message>
     <message>
         <source>Community</source>
-        <translation type="unfinished"></translation>
+        <translation>社区</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>任何</translation>
     </message>
     <message>
         <source>In lobby</source>
-        <translation type="unfinished"></translation>
+        <translation>在线状态</translation>
     </message>
     <message>
         <source>In progress</source>
-        <translation type="unfinished"></translation>
+        <translation>使用中</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">默认</translation>
+        <translation>默认</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Pro 模式</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation type="unfinished"></translation>
+        <translation>绳索模式</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation type="unfinished"></translation>
+        <translation>篮球模式</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation type="unfinished"></translation>
+        <translation>地雷模式</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
+        <translation>武器不共享</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
+        <translation>洞穴刺猬</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation>疯狂模式</translation>
     </message>
 </context>
 <context>
@@ -1212,7 +1213,7 @@
     </message>
     <message>
         <source>This program is distributed under the GNU General Public License</source>
-        <translation>This program is distributed under the GNU General Public License</translation>
+        <translation>这款程序遵守GPL协议的保护</translation>
     </message>
     <message>
         <source>Resolution</source>
@@ -1228,7 +1229,7 @@
     </message>
     <message>
         <source>Art:</source>
-        <translation>艺术:</translation>
+        <translation>美化:</translation>
     </message>
     <message>
         <source>Translations:</source>
@@ -1288,7 +1289,7 @@
     </message>
     <message>
         <source>Scheme Name:</source>
-        <translation>设置名称:</translation>
+        <translation>设置名称:  </translation>
     </message>
     <message>
         <source>Crate Drops</source>
@@ -1332,7 +1333,7 @@
     </message>
     <message>
         <source>Locale</source>
-        <translation>Locale</translation>
+        <translation>本土化</translation>
     </message>
     <message>
         <source>Restart game to apply</source>
@@ -1348,11 +1349,11 @@
     </message>
     <message>
         <source>This development build is &apos;work in progress&apos; and may not be compatible with other versions of the game. Some features might be broken or incomplete. Use at your own risk!</source>
-        <translation>开发版本。自己承担风险使用。</translation>
+        <translation>开发版本,尚不能和其他版本兼容,仍有不足。请谨慎使用!!</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation type="unfinished"></translation>
+        <translation>价值</translation>
     </message>
 </context>
 <context>
@@ -1366,7 +1367,7 @@
     <name>QMainWindow</name>
     <message>
         <source>Hedgewars %1</source>
-        <translation>刺猬大作战 %1</translation>
+        <translation>刺猬杀 %1</translation>
     </message>
 </context>
 <context>
@@ -1409,7 +1410,7 @@
     </message>
     <message>
         <source>Can not overwrite default weapon set &apos;%1&apos;!</source>
-        <translation>不能覆盖默认的武器配置 &apos;%1&apos;</translation>
+        <translation>不能覆盖默认的武器配置 &apos;%1&apos;!</translation>
     </message>
 </context>
 <context>
@@ -1451,7 +1452,7 @@
     </message>
     <message>
         <source>Go!</source>
-        <translation>上场!</translation>
+        <translation>上场!!</translation>
     </message>
     <message>
         <source>Start</source>
@@ -1545,7 +1546,7 @@
     </message>
     <message>
         <source>Ammo in boxes</source>
-        <translation>弹药箱</translation>
+        <translation>弹药数</translation>
     </message>
     <message>
         <source>Delays</source>
@@ -1639,7 +1640,7 @@
     </message>
     <message>
         <source>AI Survival Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>AI 复活模式</translation>
     </message>
 </context>
 <context>
@@ -1763,7 +1764,7 @@
     <message>
         <source>hedgehogs
 info</source>
-        <translation>刺猬大作战
+        <translation>刺猬杀
 信息</translation>
     </message>
     <message>
@@ -1830,67 +1831,67 @@
     <name>binds (descriptions)</name>
     <message>
         <source>Move your hogs and aim:</source>
-        <translation>移动您的刺猬同时瞄准:</translation>
+        <translation>移动您的刺猬同时瞄准: </translation>
     </message>
     <message>
         <source>Traverse gaps and obstacles by jumping:</source>
-        <translation>使用跳跃越过沟渠、障碍:</translation>
+        <translation>使用跳跃越过沟渠、障碍: </translation>
     </message>
     <message>
         <source>Fire your selected weapon or trigger an utility item:</source>
-        <translation>使用选择的武器开火、使用物品:</translation>
+        <translation>使用选择的武器开火、使用物品: </translation>
     </message>
     <message>
         <source>Pick a weapon or a target location under the cursor:</source>
-        <translation>失去一个武器、或者瞄准光标下的地点:</translation>
+        <translation>选择一个武器、或者瞄准光标下的某点:</translation>
     </message>
     <message>
         <source>Switch your currently active hog (if possible):</source>
-        <translation>切换到您当前活动的刺猬(如果可用):</translation>
+        <translation>切换到您当前活动的刺猬(如果可用): </translation>
     </message>
     <message>
         <source>Pick a weapon or utility item:</source>
-        <translation>选择一个武器或物品:</translation>
+        <translation>选择一个武器或物品: </translation>
     </message>
     <message>
         <source>Set the timer on bombs and timed weapons:</source>
-        <translation>设置定时炸弹等武器起爆时间:</translation>
+        <translation>设置定时炸弹等武器起爆时间: </translation>
     </message>
     <message>
         <source>Move the camera to the active hog:</source>
-        <translation>移动镜头到选中的刺猬:</translation>
+        <translation>移动镜头到选中的刺猬: </translation>
     </message>
     <message>
         <source>Move the cursor or camera without using the mouse:</source>
-        <translation>不用鼠标移动光标或镜头:</translation>
+        <translation>不用鼠标移动光标或镜头: </translation>
     </message>
     <message>
         <source>Modify the camera&apos;s zoom level:</source>
-        <translation>调整镜头放大倍数:</translation>
+        <translation>调整镜头放大倍数: </translation>
     </message>
     <message>
         <source>Talk to your team or all participants:</source>
-        <translation>同队友或全部参与者对话:</translation>
+        <translation>同队友或全部参与者对话: </translation>
     </message>
     <message>
         <source>Pause, continue or leave your game:</source>
-        <translation>暂停、继续或离开游戏:</translation>
+        <translation>暂停、继续或离开游戏: </translation>
     </message>
     <message>
         <source>Modify the game&apos;s volume while playing:</source>
-        <translation>调整游戏时音量:</translation>
+        <translation>调整游戏时音量: </translation>
     </message>
     <message>
         <source>Toggle fullscreen mode:</source>
-        <translation>全屏模式:</translation>
+        <translation>全屏模式: </translation>
     </message>
     <message>
         <source>Take a screenshot:</source>
-        <translation>截图:</translation>
+        <translation>截图: </translation>
     </message>
     <message>
         <source>Toggle labels above hedgehogs:</source>
-        <translation>切换刺猬头顶标签的显示方式:</translation>
+        <translation>切换刺猬标签的显示方式: </translation>
     </message>
 </context>
 <context>
@@ -1953,7 +1954,7 @@
     </message>
     <message>
         <source>Tab</source>
-        <translation>Tab</translation>
+        <translation>Tab 键</translation>
     </message>
     <message>
         <source>Clear</source>
@@ -2169,43 +2170,43 @@
     </message>
     <message>
         <source>Left stick (Right)</source>
-        <translation type="unfinished"></translation>
+        <translation>左摇杆(右)</translation>
     </message>
     <message>
         <source>Left stick (Left)</source>
-        <translation type="unfinished"></translation>
+        <translation>左摇杆(左)</translation>
     </message>
     <message>
         <source>Left stick (Down)</source>
-        <translation type="unfinished"></translation>
+        <translation>左摇杆(下)</translation>
     </message>
     <message>
         <source>Left stick (Up)</source>
-        <translation type="unfinished"></translation>
+        <translation>左摇杆(上)</translation>
     </message>
     <message>
         <source>Left trigger</source>
-        <translation type="unfinished"></translation>
+        <translation>左触发</translation>
     </message>
     <message>
         <source>Right trigger</source>
-        <translation type="unfinished"></translation>
+        <translation>右触发</translation>
     </message>
     <message>
         <source>Right stick (Down)</source>
-        <translation type="unfinished"></translation>
+        <translation>右摇杆(下)</translation>
     </message>
     <message>
         <source>Right stick (Up)</source>
-        <translation type="unfinished"></translation>
+        <translation>右摇杆(上)</translation>
     </message>
     <message>
         <source>Right stick (Right)</source>
-        <translation type="unfinished"></translation>
+        <translation>右摇杆(右)</translation>
     </message>
     <message>
         <source>Right stick (Left)</source>
-        <translation type="unfinished"></translation>
+        <translation>右摇杆(左)</translation>
     </message>
     <message>
         <source>DPad</source>
--- a/share/hedgewars/Data/Locale/pt_BR.txt	Sat Oct 23 17:26:22 2010 +0200
+++ b/share/hedgewars/Data/Locale/pt_BR.txt	Sat Oct 30 20:04:38 2010 +0200
@@ -45,10 +45,11 @@
 00:42=Gerador de Portais
 00:43=Ataque com Piano
 00:44=Queijo Fedorento
-00:45=Arma Senóide
+00:45=Arma Senóide (beta)
 00:46=Lança Chamas
-00:47=Mina aderente
+00:47=Mina Adesiva
 00:48=Martelo
+00:49=Ressucitador (beta)
 
 01:00=Hora de lutar!
 01:01=Partida empatou
@@ -211,6 +212,8 @@
 02:09=%1 não sabe para quem está jogando
 02:09=%1 é um vira casaca
 02:09=%1 mudou de equipe
+02:09=%1 acha que ninguém viu
+02:09=%1 devia procurar outro jogo
 
 ; Hog shot an home run (using the bat and another hog)
 02:10=Humilhooooouuu!
@@ -274,8 +277,9 @@
 03:44=Velho e fedorento
 03:45=Trigonometria pura
 03:46=Incendiário
-03:47=Bomba de proximidade
-03:48=Não desgrude
+03:47=Grudenta
+03:48=Tanto bate até que fura!
+09:49=Faz o que você imagina
 
 ; Weapon Descriptions (use | as line breaks)
 04:00=Ataque seus inimigos usando uma granada simples|Ela explodirá assim que o tempo passar|1-5: Escolha o tempo da granada|Ataque: Quanto mais tempo, mais forte o lançamento.
@@ -316,22 +320,23 @@
 04:31=O Aeromodelo é a arma ideal para coletar caixas ou|atacar ouriços distantes. Jogue o em algum inimigo ou|bombardeie primeiro.|Ataque: Lança o avião ou bombardeia|Salto Longo: Desconhecido|Esquerda/Direita: Manobra o aeromodelo
 04:32=Baixa gravidade é mais efetiva que uma dieta!|Salte mais alto e por longas distâncias ou faça|seu inimigo voar mais longe!.|Ataque: Ativa
 04:33=Algumas vezes você precisa de um pouco mais de efeito|para causar mais danos em seus ataques.|Ataque: Ativa
-04:34=Não me toque!|ataque: Ativa
-04:35=Algumas vezes o tempo parece passar muito rápido.|Ganhe alguns segundos para concluir sua jogada.|Ataque: Ativar
+04:34=Não me toque!|Ataque: Ativa
+04:35=Algumas vezes o tempo voa. Ganhe alguns|segundos para concluir sua jogada.|Ataque: Ativar
 04:36=As vezes você não é tão bom de mira.|Use a tecnologia moderna para auxílio.|Ataque: Ativa
 04:37=Não tema a luz do dia! Isto durará somente um turno|mas permitirá que você absorva os danos causados|a outros ouriços|Ataque: Ativa
 04:38=O rifle sniper é uma arma devastadora do seu|arsenal, mas é inefetiva a curto alcance pois o dano|causado aumenta com a distancia do alvo.|Ataque: Dispara (duas vezes)
-04:39=Voe para outras partes do mapa usando o disco voador.|Este veículo difícil de manobrar permite chegar a quase|qualquer posição do campo de batalha|Ataque: Ativa|Cima/Esquerda/Direita: Desloca o veículo na direção|Salto Longo: Joga granadas ou armas similares
+04:39=Voe para outras partes do mapa usando o disco voador.|Este veículo difícil de manobrar permite chegar a quase|qualquer posição do campo de batalha|Ataque: Ativa|Acima/Esquerda/Direita: Desloca o veículo na direção|Salto Longo: Joga granadas ou armas similares
 
-04:40=Ponha um pouco de fogo no chão com esta garrafa|cheia de líquido inflamável.|Ataque: Quanto mais tempo, mais forte o lançamento
+04:40=Deixe o chão em chamas com esta garrafa|cheia de líquido inflamável.|Ataque: Quanto mais tempo, mais forte o lançamento
 04:41=A natureza é mais poderosa que um disco voador.|O pássaro pode carregar seu ouriço e jogar ovos|no inimigo!|Ataque: Ativa e joga ovos|Cima/Esquerda/Direita: Bate asas na respectiva direção
-04:42=Utilize o gerador para criar portais, por onde você|poderá mover caixas, ouriços até disparar armas|através deles.|Ataque: Dispara o portal|Tab: Alterna a cor do portal.
-04:43=Execute a sonata Mortal de Bethoven, caindo dos |céus e destruindo tudo abaixo. Seu ouriço não|irá resistir ao esforço exigido!|Ataque: Venha do céu e destrua tudo abaixo
+04:42=Utilize o gerador para criar portais por onde você|poderá transportar caixas, ouriços e até armas|através deles.|Ataque: Dispara o portal|Tab: Alterna a cor do portal.
+04:43=Execute a Sonata Mortal de Bethoven, caindo dos |céus e destruindo tudo abaixo. Seu ouriço não|irá resistir ao esforço exigido!|Ataque: Venha do céu e destrua tudo abaixo
 04:44=Isso não é somente um queijo, é uma arma biológioca!|Não causa muitos danos mas envenenará ouriços|próximos quando detonar|1-5: Ajusta o tempo de detonação|Ataque: Quanto mais tempo, mais forte o lançamento.
-04:45=Use as suas aulas de trigonometria nesta poderosa |arma. Ela irá disparar um raio em forma de seno.| Ataque: Disapara a arma de raio
+04:45=Use as suas aulas de trigonometria nesta poderosa |arma. Ela irá disparar um raio com caminho em seno|Mas tome cuidado, o coice é forte.|Ataque: Dispara a arma de raio
 04:46=Que tal um churrasco? Use o lança chamas para|torrar o inimigo ou destruir o solo.|Ataque: Ativa o lança chamas
-04:47=Uma simples mina não basta? A mina aderente pode|ser arremessada e ficará aderida ao tocar no solo,| em um objeto, e até em um ouriço!|Ataque:Quanto mais tempo, mais forte o lançamento.
-04:48=Vamos a obra? Use esta arma para martelar|o inimigo no solo, ou através dele!!|Ataque: ativa o martelo
+04:47=Uma simples mina não basta? A mina aderente pode|ser arremessada e ficará aderida ao tocar no solo,|em um objeto, e até em um ouriço!|Ataque:Quanto mais tempo, mais forte o lançamento (duas vezes).
+04:48=Vamos a obra? Use esta arma para martelar|o inimigo no solo, ou através dele e tirando um terço da vida dele!|Ataque: Ativa
+04:49=Ressucite seus amigos!i Mas preste atenção|que ele também pode ressucitar inimigos|Ataque: Mantenha pressionado para ressucitar lentamente|Acima:Acelera a ressureição
 
 ; Game goal strings
 05:00=Modos de Jogo
--- a/share/hedgewars/Data/Locale/sk.txt	Sat Oct 23 17:26:22 2010 +0200
+++ b/share/hedgewars/Data/Locale/sk.txt	Sat Oct 30 20:04:38 2010 +0200
@@ -45,7 +45,11 @@
 00:42=Prenosné portálové zariadenie
 00:43=Klavírový útok
 00:44=Plynový granát
-00:45=Sínusová puška
+00:45=Sínusová puška (beta)
+00:46=Plameňomet
+00:47=Lepkavá mína
+00:48=Kladivo
+00:49=Oživovač
 
 01:00=Do boja!
 01:01=Remíza
@@ -61,6 +65,7 @@
 01:11=Táto zbraň alebo nástroj zatiaľ nie je dostupný!
 01:12=Posledné kolo pred Rýchlou smrťou!
 01:13=Ešte %1 kolá do Rýchlej smrti!
+01:14=Priprav sa, %1!
 
 ; Správy o udalostiach
 ; Ježko (%1) zomrel
@@ -159,7 +164,7 @@
 02:08=%1 si neverí
 02:08=%1 je zbabelec
 02:08=%1 čaká na rýchlu smrť
-02:08=%1 nie je bitkárom
+02:08=%1 nikdy nepatril k bitkárom
 02:08=Sklamal si ma, %1
 02:08=%1 má lepšie veci na práci
 02:08=%1 zaspal
@@ -231,52 +236,67 @@
 03:39=Pomôcka na presun
 03:40=Zápalný granát
 03:41=Skalný fanúšik škriekania
+03:42=Tu si urobím poznámku...
+03:43=Zahrať Beathovenovu smrteľnú sonátu
+03:44=Spotrebovať do: 1923
+03:45=Sila vedy
+03:46=Hot Hot Hot!
+03:47=Prilepte ich niekam šikovne!
+03:48=A je tu Hammer-time!
+03:49=Je dobrý na to, na čo si myslíte
 
 ; 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
-04:01=Zaútočte na vašich nepriateľov trieštivým granátom.|Vybuchne a rozpadne sa na menšie bomby,|keď vyprší časomiera.|1-5: Nastavenie časovača granátu|Útok: Držanie tlačidla zvyšuje silu hodu
-04:02=Zaútočte na vašich nepriateľov balistickou strelou,|ktorej dráha je ovplyvnená vetrom.|Útok: Držanie tlačidla zvyšuje silu
-04:03=Vypustite včelu naplnenú výbušninami,|ktorá je navádzaná na vybraný cieľ. Pre|vyššiu presnosť nepoužívajte plnú silu|Kurzor: Výber cieľa|Útok: Držanie tlačidla zvyšuje silu
-04:04=Zaútočte na vašich nepriateľov brokovnicou|s dvoma výstrelmi. Vďaka jej rozptylu nepotrebujete|zasiahnuť protivníkov priamym zásahom|Útok: Výstrel (viacnásobný)
-04:05=Rýchlo pod zem! Použite zbíjačku na vyvŕtanie|dieri v zemi a dosiahnutie ďalších miest.|Útok: Začatie alebo skončenie vŕtania
-04:06=Unudený? Útok nie je možný? Chcete ušetriť náboje?|Nie je problém! Stačí preskočiť ťah, zbabelec!|Útok: Ukončí ťah bez boja
-04:07=Zdolajte veľké vzdialenosti pomocou dobre|načasovaných výstrelov lana. Využite zotrvačnosť na posúvanie|ostatných ježkov alebo z výšky zhadzujte|bomby a iné zbrane|Útok: Vystrelenie alebo pustenie sa lana|Dlhý skok: Zhodenie granátov alebo podobných zbraní
-04:08=Udržujte nepriateľov v bezpečnej vzdialenosti|položením míny na rovinu alebo priamo pod nich.|Uistite sa, že ste v dostatočnej vzdialenosti, keď sa aktivujú!|Útok: Položí mínu na vašu aktuálnu pozíciu
-04:09=Nie ste si istý svojou muškou? Použite Desert Eagle,|ktorý má až štyri výstrely.|Útok: Výstrel (viacnásobný)
-04:10=Útok hrubou silou sa dá použiť vždy. Umiestnite|túto klasickú trhavinu vedľa vášho nepriateľa a vzdiaľte sa.|Útok: Položí mínu na vašu aktuálnu pozíciu
-04:11=Zbavte sa nepriateľských ježkov tak,|že ich odpálkujete mimo hranice mapy alebo do vody.|Alebo máte chuť svojim kamarátom poslať nejaké míny?|Útok: Odpálkuje čokoľvek, čo stojí pred vami
-04:12=Aby ste mohli použiť túto takmer smrtiacu|techniku bojového umenia musíte stáť blízko nepriateľa.|Útok: Vykoná Úder ohňa
-04:13=UNUSED
-04:14=Máte strach z výšok? Radšej si vezmite padák.|Sám sa otvorí, keď spadnete príliš hlboko|a uchráni vášho ježka pred zranením pádom.|Útok: Otvorenie padáku|Dlhý skok: Zhodenie granátov alebo podobných zbraní
-04:15=Privolajte leteckú podporu a zdecimujte|vašich nepriateľov bombardovaním.|Vľavo/Vpravo: Určenie smeru útoku|Kurzor: Výber cieľa bombardovania
-04:16=Privolajte leteckú podporu, ktorá do cieľovej|oblasti vypustí niekoľko mín.|Vľavo/Vpravo: Určenie smeru útoku|Kurzor: Výber cieľa útoku
-04:17=Hľadáte úkryt? Použitie lampu na vyhĺbenie|tunela do zeme, ktorá vám poskytne ochranu.|Útok: Začatie alebo skončenie kopania
-04:18=Potrebujete dodatočnú ochranu alebo chcete|zdolať prekážku? Umiestnite zopár trámov tam, kam sa vám to hodí.|Vľavo/Vpravo: Výber trámu|Kurzor: Umiestnenie kurzora na platnú pozíciu
-04:19=Ak je teleportovanie použité v správny okamih,|môže byť účinnejšie ako takmer všetky ostatné zbrane,|pretože vám umožní počas niekoľkých sekúnd|ochrániť ježkov pred nebezpečnými situáciami.|Kurzor: Výber cieľovej oblasti
-04:20=Umožní vám hrať aktuálny ťah s iným ježkom.|Útok: Povolenie prepínania ježkov
-04:21=Vystreľte projektil podobný granátu,|ktorý pri náraze vypustí viacero bômb.|Útok: Výstrel plnou silou
-04:22=Nielen pre Indiana Jonesa! Bič je užitočnou zbraňou v mnohých situáciach. Zvlášť|vtedy, ak chcete niekoho zhodiť z útesu.|Útok: Zasiahne čokoľvek, čo stojí pred vami
-04:23=Ak nemáte čo stratiť, toto sa môže hodiť.|Obetujte ježka jeho vystrelením vo vybranom smere. Počas|letu zraní všetko, čo mu stojí v ceste a nakoniec vybuchne.|Útok: Spustite devastujúci a smrteľný útok
-04:24=Všetko najlepšie k narodeninám! Vypustite túto tortu, nechajte ju prísť až|k vašim nepriateľom nech si užijú BOMBAstickú oslavu.|Torta je schopná prejsť takmer cez akýkoľvek terén,|ale takto môže vybuchnúť o niečo skôr.|Útok: Vypustite tortu alebo ju zastavte a nechajte vybuchnúť
-04:25=Použite túto maskovaciu súpravu, aby ste prinútili|nepriateľských ježkov skočiť smerom k vášmu ježkovi (do vody alebo priepasti).|Útok: Použije súpravu a skúsi zviesť iného ježka
-04:26=Hodí tento šťavnatý melón na vašich nepriateľov.|Po vypršaní časomiery sa rozpadne na niekoľko|vybuchujúcich kúskov.|1-5: Nastaví časovač melóna|Útok: Držanie tlačidla zvyšuje silu hodu
-04:27=Zošlite pekelné plamene na vašich súperov vďaka|tejto nepriateľskej výbušnine. Nezostaňte príliš blízko k explózii,|pretože malé plamienky môžu horieť dlhšie.|Útok: Držanie tlačidla zvyšuje silu hodu
-04:28=Chvíľku po vypustení tejto rakety sa začne|prevŕtavať do zeme a vybuchne vtedy, keď vyprší jej|časová poistka alebo sa objaví znova na povrchu.|Útok: Držanie tlačidla zvyšuje silu výstrelu
-04:29=Toto nie je nič pre malé deti! Loptičkový guľomet vypáli|množstvo malých farebných guličiek naplnených výbušninami.|Útok: Výstrel v plnej sile|Hore/Dole: Mierenie počas pálenia guličiek
-04:30=Privolajte leteckú podporu, ktorá spustí|silný napalmový útok. S dobrým mierením dokáže tento útok odstrániť veľké časti|krajiny vrátane ježkov, ktorý majú smolu v tom, že na nej stoja.|Vľavo/Vpravo: Určenie smeru útoku|Kurzor: Výber cieľovej oblasti
-04:31=Bezpilotný bombardér je ideálnou zbraňou|na pozbieranie krabíc alebo na zaútočenie ježkov,|ktorí sú príliš ďaleko. Buď ho navigujte priamo na nepriateľov|alebo najprv zhoďte zopár bômb.|Útok: Vypustenie lietadla alebo zhodenie bômb|Dlhý skok: Umožní vstup do boja valkýram|Hore/Dole: Navigovanie lietadla 
-04:32=Nízka gravitácia je účinnejšia ako ktorákoľvek diéta!|Skáčte vyššie a ďalej alebo nechajte vašich|nepriateľov letieť ešte ďalej.|Útok: Aktivácia
-04:33=Niekedy všetko čo potrebujete je len o trošku väčšia sila,|aby ste spôsobili ešte väčšiu škodu.|Útok: Aktivácia
-04:34=Nedotýkaj sa ma!|Útok: Aktivácia
-04:35=Niekedy čas beží príliš rýchlo. Získajte zopár|sekúnd navyše, aby ste mohli dokončiť útok.|Útok: Aktivácia
-04:36=No, niekedy proste nemáte mušku. Zapnite si podporu mierenia,|ktorá podporuje najmodernejšie technológie.|Útok: Aktivácia
-04:37=Nebojte sa denného svsetla. Vydrží len jeden ťah,|ale umožní vám vstrebať škodu, ktorú spôsobíte iným ježkom.|Útok: Aktivácia
-04:38=Ostreľovačka dokáže byť najdrvivejšou zbraňou|v celom vašom arzenále, je však veľmi neefektívna|pre blízke ciele. Škoda, ktorú spôsobí sa zvyšuje so zvyšujúcou|sa vzdialenosťou k cieľu.|Útok: Výstrel (dvakrát)
-04:39=Preleťte na iné miesta mapy v lietajúcom tanieri.|Táto komplikovane sa ovládajúca pomôcka je schopná|vás preniesť na takmer akúkoľvek pozíciu na mape.|Útok: Aktivácia|Hore/Vľavo/Vpravo: Použiť silu v jednom smere|Dlhý skok: Zhodiť granáty alebo iné zbrane
-04:40=Podpáľte kúsok zeme použitím tejto fľaše naplnenej|zápalnou tekutinou.|Útok: Držanie tlačidla zvyšuje silu hodu
-04:41=Dôkaz, že príroda môže dokonca predčiť lietajúci tanier.|Vtáčisko dokáže niesť vášho ježka a znášať vajcia na vašich nepriateľov!|Útok: Aktivácia a zhadzovanie vajec|Hore/Vľavo/Vpravo: Mávanie krídiel v jednom smere
-04:42=OBROVSKÝ ÚSPECH|||(ale chýba text!)
-04:43=(chýba text)
+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|
+04:01=Zaútočte na vašich nepriateľov trieštivým|granátom. Vybuchne a rozpadne sa na menšie bomby,|keď vyprší časomiera.|1‐5: Nastavenie časovača granátu|Útok: Držanie tlačidla zvyšuje silu hodu|
+04:02=Zaútočte na vašich nepriateľov balistickou|strelou, ktorej dráha je ovplyvnená vetrom.|Útok: Držanie tlačidla zvyšuje silu|
+04:03=Vypustite včelu naplnenú výbušninami, ktorá je|navádzaná na vybraný cieľ. Pre vyššiu presnosť|nepoužívajte plnú silu|Kurzor: Výber cieľa|Útok: Držanie tlačidla zvyšuje silu|
+04:04=Zaútočte na vašich nepriateľov brokovnicou s dvoma|výstrelmi. Vďaka jej rozptylu nepotrebujete|zasiahnuť protivníkov priamym zásahom|Útok: Výstrel (viacnásobný)|
+04:05=Rýchlo pod zem! Použite zbíjačku na vyvŕtanie|dieri v zemi a dosiahnutie ďalších miest.|Útok: Začatie alebo skončenie vŕtania|
+04:06=Unudený? Útok nie je možný? Chcete ušetriť náboje?|Nie je problém! Stačí preskočiť ťah, zbabelec!|Útok: Ukončí ťah bez boja|
+04:07=Zdolajte veľké vzdialenosti pomocou dobre|načasovaných výstrelov lana. Využite zotrvačnosť|na posúvanie ostatných ježkov alebo z výšky|zhadzujte bomby a iné zbrane|Útok: Vystrelenie alebo pustenie sa lana Dlhý|skok: Zhodenie granátov alebo podobných zbraní|
+04:08=Udržujte nepriateľov v bezpečnej vzdialenosti|položením míny na rovinu alebo priamo pod nich.|Uistite sa, že ste v dostatočnej vzdialenosti, keď|sa aktivujú!|Útok: Položí mínu na vašu aktuálnu pozíciu|
+04:09=Nie ste si istý svojou muškou? Použite Desert|Eagle, ktorý má až štyri výstrely.|Útok: Výstrel (viacnásobný)|
+04:10=Útok hrubou silou sa dá použiť vždy. Umiestnite|túto klasickú trhavinu vedľa vášho nepriateľa a|vzdiaľte sa.|Útok: Položí mínu na vašu aktuálnu pozíciu|
+04:11=Zbavte sa nepriateľských ježkov tak, že ich|odpálkujete mimo hranice mapy alebo do vody. Alebo|máte chuť svojim kamarátom poslať nejaké míny?|Útok: Odpálkuje čokoľvek, čo stojí pred vami|
+04:12=Aby ste mohli použiť túto takmer smrtiacu techniku|bojového umenia musíte stáť blízko nepriateľa.|Útok: Vykoná Úder ohňa|
+04:13=UNUSED|
+04:14=Máte strach z výšok? Radšej si vezmite padák. Sám|sa otvorí, keď spadnete príliš hlboko a uchráni|vášho ježka pred zranením pádom.|Útok: Otvorenie padáku Dlhý skok: Zhodenie|granátov alebo podobných zbraní|
+04:15=Privolajte leteckú podporu a zdecimujte vašich|nepriateľov bombardovaním.|Vľavo/Vpravo: Určenie smeru útoku|Kurzor: Výber cieľa bombardovania|
+04:16=Privolajte leteckú podporu, ktorá do cieľovej|oblasti vypustí niekoľko mín.|Vľavo/Vpravo: Určenie smeru útoku|Kurzor: Výber cieľa útoku|
+04:17=Hľadáte úkryt? Použitie lampu na vyhĺbenie tunela|do zeme, ktorá vám poskytne ochranu.|Útok: Začatie alebo skončenie kopania|
+04:18=Potrebujete dodatočnú ochranu alebo chcete zdolať|prekážku? Umiestnite zopár trámov tam, kam sa vám|to hodí.|Vľavo/Vpravo: Výber trámu|Kurzor: Umiestnenie kurzora na platnú pozíciu|
+04:19=Ak je teleportovanie použité v správny okamih,|môže byť účinnejšie ako takmer všetky ostatné|zbrane, pretože vám umožní počas niekoľkých sekúnd|ochrániť ježkov pred nebezpečnými situáciami.|Kurzor: Výber cieľovej oblasti|
+04:20=Umožní vám hrať aktuálny ťah s iným ježkom.|Útok: Povolenie prepínania ježkov|
+04:21=Vystreľte projektil podobný granátu, ktorý pri|náraze vypustí viacero bômb.|Útok: Výstrel plnou silou|
+04:22=Nielen pre Indiana Jonesa! Bič je užitočnou|zbraňou v mnohých situáciach. Zvlášť vtedy, ak|chcete niekoho zhodiť z útesu.|Útok: Zasiahne čokoľvek, čo stojí pred vami|
+04:23=Ak nemáte čo stratiť, toto sa môže hodiť. Obetujte|ježka jeho vystrelením vo vybranom smere. Počas|letu zraní všetko, čo mu stojí v ceste a nakoniec|vybuchne.|Útok: Spustite devastujúci a smrteľný útok|
+04:24=Všetko najlepšie k narodeninám! Vypustite túto|tortu, nechajte ju prísť až k vašim nepriateľom|nech si užijú BOMBAstickú oslavu. Torta je schopná|prejsť takmer cez akýkoľvek terén, ale takto môže|vybuchnúť o niečo skôr.|Útok: Vypustite tortu alebo ju zastavte a nechajte|vybuchnúť|
+04:25=Použite túto maskovaciu súpravu, aby ste prinútili|nepriateľských ježkov skočiť smerom k vášmu|ježkovi (do vody alebo priepasti).|Útok: Použije súpravu a skúsi zviesť iného ježka|
+04:26=Hodí tento šťavnatý melón na vašich nepriateľov.|Po vypršaní časomiery sa rozpadne na niekoľko|vybuchujúcich kúskov.|1‐5: Nastaví časovač melóna|Útok: Držanie tlačidla zvyšuje silu hodu|
+04:27=Zošlite pekelné plamene na vašich súperov vďaka|tejto nepriateľskej výbušnine. Nezostaňte príliš|blízko k explózii, pretože malé plamienky môžu|horieť dlhšie.|Útok: Držanie tlačidla zvyšuje silu hodu|
+04:28=Chvíľku po vypustení tejto rakety sa začne|prevŕtavať do zeme a vybuchne vtedy, keď vyprší|jej časová poistka alebo sa objaví znova na|povrchu.|Útok: Držanie tlačidla zvyšuje silu výstrelu|
+04:29=Toto nie je nič pre malé deti! Loptičkový guľomet|vypáli množstvo malých farebných guličiek|naplnených výbušninami.|Útok: Výstrel v plnej sile|Hore/Dole: Mierenie počas pálenia guličiek|
+04:30=Privolajte leteckú podporu, ktorá spustí silný|napalmový útok. S dobrým mierením dokáže tento|útok odstrániť veľké časti krajiny vrátane ježkov,|ktorý majú smolu v tom, že na nej stoja.|Vľavo/Vpravo: Určenie smeru útoku|Kurzor: Výber cieľovej oblasti|
+04:31=Bezpilotný bombardér je ideálnou zbraňou na|pozbieranie krabíc alebo na zaútočenie ježkov,|ktorí sú príliš ďaleko. Buď ho navigujte priamo na|nepriateľov alebo najprv zhoďte zopár bômb.|Útok: Vypustenie lietadla alebo zhodenie bômb Dlhý|skok: Umožní vstup do boja valkýram|Hore/Dole: Navigovanie lietadla|
+04:32=Nízka gravitácia je účinnejšia ako ktorákoľvek|diéta! Skáčte vyššie a ďalej alebo nechajte vašich|nepriateľov letieť ešte ďalej.|Útok: Aktivácia|
+04:33=Niekedy všetko čo potrebujete je len o trošku|väčšia sila, aby ste spôsobili ešte väčšiu škodu.|Útok: Aktivácia|
+04:34=Nedotýkaj sa ma!|Útok: Aktivácia|
+04:35=Niekedy čas beží príliš rýchlo. Získajte zopár|sekúnd navyše, aby ste mohli dokončiť útok.|Útok: Aktivácia|
+04:36=No, niekedy proste nemáte mušku. Zapnite si|podporu mierenia, ktorá podporuje najmodernejšie|technológie.|Útok: Aktivácia|
+04:37=Nebojte sa denného svetla. Vydrží len jeden ťah,|ale umožní vám vstrebať škodu, ktorú spôsobíte|iným ježkom.|Útok: Aktivácia|
+04:38=Ostreľovačka dokáže byť najdrvivejšou zbraňou v|celom vašom arzenále, je však veľmi neefektívna|pre blízke ciele. Škoda, ktorú spôsobí sa zvyšuje|so zvyšujúcou sa vzdialenosťou k cieľu.|Útok: Výstrel (dvakrát)|
+04:39=Preleťte na iné miesta mapy v lietajúcom tanieri.|Táto komplikovane sa ovládajúca pomôcka je schopná|vás preniesť na takmer akúkoľvek pozíciu na mape.|Útok: Aktivácia|Hore/Vľavo/Vpravo: Použiť silu v jednom smere Dlhý|skok: Zhodiť granáty alebo iné zbrane|
+04:40=Podpáľte kúsok zeme použitím tejto fľaše naplnenej|zápalnou tekutinou.|Útok: Držanie tlačidla zvyšuje silu hodu|
+04:41=Dôkaz, že príroda môže dokonca predčiť lietajúci|tanier. Vtáčisko dokáže niesť vášho ježka a znášať|vajcia na vašich nepriateľov!|Útok: Aktivácia a zhadzovanie vajec|Hore/Vľavo/Vpravo: Mávanie krídiel v jednom smere|
+04:42=Toto prenosné portálové zariadenie je schopné|okamžite preniesť vás, vašich nepriateľov alebo|zbrane medzi miestami na mape. Použite ho rozvážne|a vaše ťaženie bude...  OBROVSKÝM ÚSPECHOM|Útok: Vystrelenie portálu|Prepnutie: Rotovanie portálových farieb|
+04:43=Premeňte svoj debut v oblasti hudby na explozívny|úspech! Spustite klavír z nebies, ale pozor...|niekto naň musí hrať a to vás bude stáť život!|Kurzor: Výber cieľovej oblasti|F1‐F9: Hra na klavíri|
+04:44=Toto nie je obyčajný syr, je to biologická zbraň!|Nespôsobí veľkú škodu po tom, ako vyprší|časomiera, ale rozhodne otrávi každého, kto má tú|smolu, že ho zasiahne zápach!|1‐5: Nastavenie časomiery|Útok: Držanie tlačidla zvyšuje silu hodu|
+04:45=Všetky tie hodiny fyziky sa nakoniec vyplatili,|pošlite devastujúcu sínusovú vlnu na vašich|nepriateľov. Pozor, táto zbraň dáva slušný spätný|náraz. (Táto zbraň je nekompletná)|Útok: Výstrel|
+04:46=Pokryte vašich nepriateľov prskajúcim kvapkajúcim|plameňom. Zahreje aj pri srdci!|Útok: Aktivovanie|Hore/Dole: Mierenie počas používania|Vľavo/Vpravo: Regulácia sily|
+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
+
 
 ; Reťazce pre ciele hry
 05:00=Herné režimy
--- a/share/hedgewars/Data/Locale/zh_CN.txt	Sat Oct 23 17:26:22 2010 +0200
+++ b/share/hedgewars/Data/Locale/zh_CN.txt	Sat Oct 30 20:04:38 2010 +0200
@@ -1,6 +1,6 @@
-; Simplified Chinese locale
+; Simplified Chinese locale, Translated by Tonghuix (tonghuix@gmail.com) 21 Oct 2010
 
-00:00=手榴弹
+00:00=手榴蛋蛋
 00:01=集束炸弹
 00:02=反坦克火箭筒
 00:03=归巢的蜜蜂
@@ -12,9 +12,9 @@
 00:09=沙漠之鹰
 00:10=炸药
 00:11=球棒
-00:12=升龙拳
+00:12=喔嘻嘻呦拳
 00:13=秒
-00:14=空降
+00:14=降落伞
 00:15=空袭
 00:16=地雷空袭
 00:17=喷灯
@@ -25,7 +25,7 @@
 00:22=鞭子
 00:23=神风特工队
 00:24=蛋糕
-00:25=引诱
+00:25=色诱
 00:26=西瓜炸弹
 00:27=地狱礼花
 00:28=钻头火箭
@@ -56,242 +56,244 @@
 01:03=音量 %1%
 01:04=暂停
 01:05=确定要退出? (是Y/否Esc)
-01:06=死亡模式!
+01:06=突然死亡模式!
 01:07=%1 剩余
 01:08=燃料
 01:09=同步中...
 01:10=使用本工具不会结束回合!
 01:11=您还不能用它!
-01:12=死亡模式前最后一回合!
+01:12=突然死亡模式前最后一回合!
 01:13=%1 回合倒计时!
 01:14=预备上, %1!
 
 ; Event messages
 ; Hog (%1) died
 ; 02:00=%1 has kicked the bucket!
-02:00=%1 离去!
+02:00=%1踢到了春哥的腿!
 ; 02:00=%1 has seen the light!
-02:00=%1 目睹圣光降临!
+02:00=%1看到了小野妹子在向他招手!
 ; 02:00=%1 never saw that coming!
-02:00=%1 既不得知,死有何苦!
+02:00=阿西BUG!%1被人暗算了! 
 ; 02:00=%1 waves goodbye!
-02:00=%1 向大家挥手道别。
+02:00=%1我嘞个去!哪个混蛋竟用这个绝招!
 ; 02:00=%1 has gone to a better place!
-02:00=%1 去了极乐世界!
+02:00=%1:你竟然敢背叛组织!
 ; 02:00=%1 meets his maker!
-02:00=%1 去见造物主了!
+02:00=我嘞个去!这货不是%1!这货不是%1!
 ; 02:00=%1 can hang on no longer!
-02:00=%1 再也受不了了!
+02:00=真悲剧%1平田君(头顶内裤的哥们)!
 ; 02:00=%1 has done his duty!
-02:00=%1 完成了他的使命!
+02:00=%1再也不会蛋疼了!
 ; 02:00=%1 makes the ultimate sacrifice!
-02:00=%1 做了最大的牺牲!
+02:00=%1:剩下的哥们,加嘞个油!!
 ; 02:00=%1 departs this mortal coil!
-02:00=%1 摆脱了躯壳的束缚!
+02:00=%1想玩“移形幻影”,失败了!
 ; 02:00=%1 makes like a tree and leaves!
-02:00=%1 叶落归根。
+02:00=%1啊~内裤!我这辈子值啦!~
 ; 02:00=%1 has timed out!
-02:00=%1 大限已至。
+02:00=%1的人生杯具了
 ; 02:00=%1 says peace out!
-02:00=%1 悄然离场了。
+02:00=%1中了[喔嘻嘻呦拳]。。。这辈子值了!
 ; 02:00=%1 will be fondly remembered!
-02:00=%1 永远活在我们心中!
+02:00=不嘞个是吧!%1竟然会死!
 ; 02:00=%1 has an aneurysm!
-02:00=%1 不治而亡。
+02:00=湿父,让%1起死回生吧!
 ; 02:00=%1 leaves behind a wife and child
-02:00=%1 留下一家孤儿寡母。
+02:00=%1 留下一家孤儿寡母。。。
 ; 02:00=%1 has launched his last bazooka
-02:00=%1 发射了最后一发火箭弹
+02:00=%1发射了最后一发火箭弹
 ; 02:00=%1 has tossed his last grenade
-02:00=%1 扔出了最后一枚手榴弹
+02:00=%1扔出了最后一枚手榴弹
 ; 02:00=%1 has baked his last cake
-02:00=%1 烘烤了最后一块蛋糕
+02:00=%1烘烤了最后一块蛋糕
 ; 02:00=%1 has swung on his last rope
-02:00=%1 最后一次甩出了绳索
+02:00=%1甩出了最后一根绳索
 ; 02:00=%1 has called his last airstrike
-02:00=%1 最后一次呼叫空袭
+02:00=%1呼叫了最后一次空袭
 ; 02:00=%1 has pumped his last shotgun
-02:00=%1 最后一次抽出了霰弹枪
+02:00=%1抽出了最后一把霰弹枪
 ; 02:00=%1 has thrown his last melon
-02:00=%1 最后一次扔出了西瓜炸弹
+02:00=%1扔出了最后一个西瓜炸弹
 ; 02:00=%1 has drawn his last deagle
-02:00=%1 最后一次拔出了沙鹰
+02:00=%1拔出了最后一把沙鹰
 ; 02:00=%1 took one shot too many
-02:00=%1 挨了太多枪了
+02:00=%1好像看到那谁家的小谁了~~
 ; 02:00=%1 could really have used a health crate
-02:00=%1 真该用下医疗包的
+02:00=%1还没打倒“肉山大魔王”呢~
 ; 02:00=%1 has gone to play a better game
-02:00=%1 去玩更有意思的游戏去了
+02:00=徘句之神一屁股糊%1熊脸上了!
 ; 02:00=%1 has ragequit life
-02:00=%1 拔网线了!
+02:00=%1还没看到这个游戏的主线目标呢!
 ; 02:00=%1 fails
-02:00=%1 失败了
+02:00=洒家,%1还会再来的!
 ; 02:00=Poor poor %1...
-02:00=可怜的 %1...
+02:00=%1的人生简直就是一茶几(杯具+餐具)
 ; 02:00=%1 prefers wormux
-02:00=%1 更喜欢 Wormux
+02:00=%1老湿,这游戏不给力啊!
 ; 02:00=%1 has been blocking shots with his face
-02:00=%1 勇于面对,结果相当惨烈
+02:00=%1杯具啊!菊花要爆啦!
 ; 02:00=%1 is a hero amongst me...err..hogs
-02:00=%1 是我的英雄!
+02:00=我嘞个去!竟然有人爆%1的菊花!
 ; 02:00=%1 finds his place in Valhalla
-02:00=%1 在勇者纪念碑上找到了位置
+02:00=好好干吧!要不然,过世的%1会很伤心的!~
 ; 02:00=%1 has left the building
-02:00=%1 离开了这间屋子
+02:00=不要破坏团队合作!否则过世的%1会很伤心的!~
 ; 02:00=%1 goes the way of the dinosaurs
-02:00=%1 步上了恐龙的道路
+02:00=%1又开始蛋疼了!
 ; 02:00=%1 brings hedgehogs one step closer to extinction
-02:00=%1 让刺猬物种灭绝更近了一步
+02:00=我嘞个擦!%1要让刺猬灭绝了
 ; 02:00=%1 brings a tear to my eye
-02:00=%1 带走了我一滴眼泪
+02:00=我擦嘞!%1死的太突然那了!
 ; 02:00=%1 is an ex-hog
-02:00=%1 生前是一只刺猬
+02:00=%1的必杀技是——变成食物——开玩笑,呵呵
 ; 02:00=%1 is pushing up the daisies
-02:00=%1 被菊花簇拥
+02:00=%1诅咒害他那人蛋疼菊紧!
 ; 02:00=%1 has ceased to be
-02:00=%1 被“删除”了
+02:00=%1:啊呀!这种插法,为湿多疼啊!~
 ; 02:00=Say goodbye to %1
-02:00=对 %1 说再见
+02:00=比任何人都想去天竺的八戒,已经魂归天际啦!
 ; 02:00=No hope left for %1
-02:00=%1 没有希望了
+02:00=坑爹呢!为什么残念的%1会死!~
 ; 02:00=%1 faces the final curtain
-02:00=%1 面容被落下的帷幕遮住了
+02:00=%1:我杀了你们的朋友,现在搞我是吧!
 ; 02:00=Smoke 'em if you got 'em, %1
-02:00=%1 抓紧时间实现你最后的愿望吧
+02:00=%1心目中的世界观根本就是个BUG啊!
 ; 02:00=%1 suffers a Spontaneous Massive Existence Failure
-02:00=%1 遭遇了自发性大规模故障(出自星河舰队)
+02:00=%1休斯顿,我们出问题了!(出自阿波罗13)
 ; 02:00=%1 has passed on
-02:00=%1 走了
+02:00=%1被天朝“墙”了!
 ; 02:00=%1 is stone dead
-02:00=%1 永垂不朽
+02:00=%1被凤姐吻的不行了!~
 ; 02:00=%1 is no more
-02:00=%1 不在了
+02:00=春哥需要你,%1!
 ; 02:00=%1 has expired
-02:00=%1 已故
+02:00=%1被光腚总菊河蟹了!~~
 ; 02:00=Bereft of life, %1 rests in peace
-02:00=%1 安详地躺着
+02:00=%1说,这位玩家的表情太猥琐了
 ; 02:00=%1 joins the choir invisible
-02:00=%1 加入了隐形唱诗班
+02:00=%1用尽了全部的查克拉~
 ; 02:00=Farewell %1, we hardly knew ye!
-02:00=%1, 永别了,我们还不认识你呢!
+02:00=%1后悔没信春哥!
 ; 02:00=%1 had a low tolerance for being shot
-02:00=%1 抗打击能力不足
+02:00=%1想说,他一直暗恋凤姐很久了!~
 ; 02:00=%1 could have used an extra life
-02:00=%1 本该用另一条命的
+02:00=下一局,%1一定会妥妥儿的!~噢嗬!
 ; 02:00=Is there a doctor in the house?
-02:00=有医生吗?
+02:00=擦!擦!玩儿蛋去!
 
 ; Hog (%1) drowned
 ; 02:01=%1 plays submarine!
-02:01=%1 以为自己是潜水艇!
+02:01=%1感觉自己内心清澈,心静如水~
 ; 02:01=%1 mimics the Titanic!
-02:01=%1 学泰坦尼克去了!
+02:01=%1想看波~~波~~
 ; 02:01=%1 swims like a stone!
-02:01=%1 石沉大海!
+02:01=%1想在水下淫出一首好湿!
 ;02:01=%1 checks out the deep end
-02:01=%1 说要去检查深水区
+02:01=%1说凤姐在水下等她呢。。。
 ;02:01=%1 goes glug glug glug
-02:01=%1 :“咕噜咕噜咕噜……”
-;02:01=%1 goes splash
-02:01=%1 栽入水花里
-;02:01=%1 forgot his armbands
-02:01=%1 忘记了戴臂章
+02:01=%1 :菠萝菠萝蜜得隆东强~
+; 02:01=%1 goes splash
+02:01=芭蕉桑~你快醒醒吧~ 
+; 02:01=%1 forgot his armbands
+02:01=阿西BUG~!%1杯具了!
 ;02:01=%1 really should have taken swimming lessons
-02:01=%1 真的该去学游泳的
+02:01=%1的遗言:信春哥得永生!
 ;02:01=%1 left his surfboard at home
-02:01=%1 把救生圈忘家了
+02:01=不给力啊!老湿!
 ;02:01=%1 is washed up
-02:01=%1 冲走了
+02:01=%1庆幸自己没掉马桶里!
 ;02:01=%1 is one soggy hog
-02:01=%1 湿掉了
+02:01=%1生前是个拳湿~~
 ;02:01=%1 forgot to bring his life jacket
-02:01=%1 忘记带他的救生衣了
+02:01=我擦泪!下水前%1忘了脱内裤!
 ;02:01=%1 goes splish splash splish
-02:01=%1 实现了水上飘,落水,身后一片水花荡漾
+02:01=我嘞个去!%1怎么穿着内裤就掉下去了~
 ;02:01=%1 is sleeping with the fishes
-02:01=%1 将会和鱼睡在一起
+02:01=%1看到美人鱼在脱衣服~
 ;02:01=%1 thinks the water physics suck in this game
-02:01=%1 认为这游戏的设定糟糕透了
+02:01=%1认为这次元还真是个不毛之地啊!
 ;02:01=%1 looks thirsty
-02:01=%1 好像很渴
+02:01=这次元怎么连根毛都没有~
 ;02:01=the sea claims %1
-02:01=大海吞没了 %1
+02:01=雅买歹~~(河蟹)
 ;02:01=%1 is lost at sea
-02:01=%1 在海上迷失了
+02:01=%1宁愿自我河蟹~~
 ;02:01=%1 should have brought his scuba gear
-02:01=%1 应该要带潜水工具的
+02:01=水表示鸭梨很大~~
 ;02:01=%1 gets a burial at sea
-02:01=%1 享受到了海葬待遇
+02:01=%1,春哥要你
 ;02:01=%1 has that sinking feeling
-02:01=%1 觉得自己在下沉
+02:01=%1曾哥在水下唱“狮子座”
 ;02:01=%1 is practicing his backstroke
-02:01=%1 终于能实践自己的游泳理论了
+02:01=%1的内裤是粉红色的哦!
 ;02:01=%1 goes in search of the Titanic
-02:01=%1 去泰坦尼克号寻宝了
+02:01=水下竟然有神兽!
 ;02:01=%1 is not Jesus
-02:01=很遗憾 %1 不是耶稣
+02:01=%1正在观看河蟹狂吃草泥马~ 
 ;02:01=%1 is finding Nemo
-02:01=%1 找尼莫去了
+02:01=%1觉得陆地上房价太高了
 ;02:01=%1 springs a leak
-02:01=%1 钻入了一个水洼
+02:01=%1表示鸭梨很大~
+;02:01=%1 has tha
+02:01=%1想去看凤姐的内裤颜色~
 ;02:01=You've gotta wonder how many hogs are down there
-02:01=你会知道海底还会有多少同伴的
+02:01=你会知道出师未捷身先死的八戒在下面等你呢
 ;02:01=%1 makes the ocean slightly higher
 02:01=%1 让海平面高了那么一点, 就一点
 ;02:01=%1 didn't enlist in the Navy
-02:01=很明显 %1 没在海军服役过
+02:01=%1害怕城管来抓他~!
 ;02:01=%1 is doing his impersonation of a dead fish
-02:01=%1 其实是在模仿死鱼啦
+02:01=菲律宾警察营救%1失败~
 ;02:01=At least you didn't go down the toilet, %1
-02:01=还好 %1 你不是掉进了厕所
+02:01=%1撅着个腚飞起来啦~
 ;02:01=Sonic couldn't swim and neither can %1
-02:01=和索尼克一样, %1 也不会游泳的
+02:01=海底有个如意按摩棒~~ 
 ;02:01=%1 wants to play Ecco the dolphin
-02:01=%1 想玩海底漫步
+02:01=%1想当水下波霸~!
 ;02:01=%1 has gone to visit Aquaria
-02:01=%1 去水族馆报到了
+02:01=%1被气得忿忿儿的!
 ;02:01=%1 has found the lost city of Atlantis
-02:01=%1 找到了传说中的亚特兰蒂斯城
+02:01=%1被爆菊了,要到水下清洗一下!
 ;02:01=%1 aims for the lead role in Bioshock 3
-02:01=%1 的目的是为了在生化危机3中起带头作用
+02:01=%1华丽丽的掉下去啦~
 ;02:01=Your doggy paddle could use a little work, %1
-02:01=狗爬式会有用的, %1
+02:01=%1实在是太V5啦!连光腚总菊都拿他没辙!
 ;02:01=%1 should have brought a jet ski
-02:01=%1 居然没带摩托艇
+02:01=%1还没来得及吐槽!阿西BUG!
 ;02:01=%1 doesn't like watersports
-02:01=%1 不喜欢水上运动
+02:01=%1的伪娘气质还没表现出来呢
 ;02:01=%1 is forever blowing bubbles
-02:01=%1 学会了绝技: 神风吹泡泡
+02:01=%1落水时的体位亮了~
 ;02:01=%1 is short of a raft
-02:01=%1 腿太短了
+02:01=%1被天朝屏蔽了~
 ;02:01=%1 thinks salt water is good for the skin
-02:01=%1 认为盐水对皮肤有好处
+02:01=%1认为天朝实在是个伟大的国度
 ;02:01=%1 gets salt water in his wounds
-02:01=%1 的伤口沾上了盐水
+02:01=%1大喊:不给力啊,你个白痴老湿!
 ;02:01=%1 has walked the plank
-02:01=%1 错过了那块木板
+02:01=太不给力啦,老湿!
 ;02:01=%1 has a bath
-02:01=%1 洗澡去了
+02:01=这游戏不带感啊!
 ;02:01=%1 is wet wet wet
-02:01=%1 全身是水
+02:01=亮点永远都在最后
 ;02:01=%1 gets his quills wet
-02:01=%1 把刚毛弄湿了
+02:01=%1把屁股弄湿了
 ;02:01=It's Davy Jones' locker for %1
-02:01=深海阎王正在等待 %1
+02:01=天朝正在水下等%1呢
 
 ; Round starts
 ; 02:02=Let's fight!
+; 02:02=Armed and ready!
 02:02=开战!
-; 02:02=Armed and ready!
 02:02=准备!
 ;02:02=Let's get ready to rumble!
 02:02=准备对轰!
 ;02:02=Let's get it on!
-02:02=让我们得到胜利!
+02:02=让我们取得胜利!
 ;02:02=Let's get this party started
 02:02=这个Party要开始了
 ;02:02=Last hog standing wins
-02:02=胜利属于最后一个生还者
+02:02=胜利属于信春哥的人
 ;02:02=Let's go!
 02:02=出发吧!
 ;02:02=Let's rock!
@@ -301,23 +303,23 @@
 ;02:02=This is the start of something big
 02:02=这是一个伟大的开始
 ;02:02=Welcome to Hedgewars
-02:02=欢迎来到刺猬大作战
+02:02=欢迎来到“刺猬杀”!
 ;02:02=Welcome to the front lines
 02:02=欢迎来到前线
 ;02:02=Crush your enemies!
-02:02=目标:粉碎你的敌人!
+02:02=目标:吃掉你的敌人!
 ;02:02=May the best hog win
-02:02=祝愿胜利属于最厉害的刺猬!
+02:02=胜利属于会打飞机的那只!
 ;02:02=Victory or death
 02:02=胜利或死亡
 ;02:02=To the victor goes the spoils
 02:02=战利品只属于胜利者
 ;02:02=Losing is not an option
-02:02=字典里面应该没有"输"这个字的
+02:02=加嘞个油!老湿不能输啊!
 ;02:02=Cry havoc! Let loose the hogs of war!
-02:02=哭吧! 这是刺猬的战争
+02:02=哭吧! 这是刺猬的
 ;02:02=Hedgewars, brought to you by Hedgewars.org
-02:02=欢迎来到刺猬大作战, Hedgewars.org 为你呈现
+02:02=欢迎来到刺猬大作战, 官方网站 Hedgewars.org
 02:02=GL HF
 ;02:02=Just count yourself lucky you're not up against Tiyuri
 02:02=你看你多幸运你不是在对战 Tiyuri
@@ -332,7 +334,7 @@
 ;02:02=Give it your all!
 02:02=展现你的一切吧!
 ;02:02=The losers do the cleaning up!
-02:02=输的要罚扫厕所!
+02:02=输的要去吻凤姐!
 ;02:02=Let the fight of the millenium begin
 02:02=宇宙之战开始了
 ;02:02=Let the fight of the century begin
@@ -348,7 +350,7 @@
 ;02:02=Let the fight of the day begin
 02:02=本日最强入围赛开始了
 ;02:02=Let the fight of the hour begin
-02:02=我们能战一小时!
+02:02=我们能狂玩一小时!
 ;02:02=Do your best!
 02:02=诸君努力!
 ;02:02=Destroy the enemy!
@@ -356,31 +358,30 @@
 ;02:02=Good luck
 02:02=祝你好运
 ;02:02=Have fun~
-02:02=开心玩~
+02:02=玩儿蛋去~
 ;02:02=Fight the good fight
-02:02=漂亮的战斗
+02:02=要赢!
 ;02:02=Fight dirty
-02:02=不择手段
+02:02=不择手段也行!
 ;02:02=Fight with honour
-02:02=满载荣誉而战
+02:02=请注意文明用语
 ;02:02=Don't give up
-02:02=教练告诉你: 别放弃
+02:02=出师未捷身先死的教练: 别放弃
 ;02:02=Never surrender
 02:02=永不屈服!
 ;02:02=Rock 'em and sock 'em!
-02:02=蹂虐对手
+02:02=刺猬杀!杀!杀!
 ;02:02=Let the fragfest begin!
 02:02=积分赛开始!
 ;02:02=I hope you're ready for a tussle!
 02:02=你准备好恶战了么?
-;02:02=Go Go Go!
-02:02=上!
+02:02=Go Go Go!
 ;02:02=Hedgehogs advance!
-02:02=刺猬向前冲!
+02:02=刺猬历险记!
 ;02:02=Bring it to them!
 02:02=炸飞他们!
 ;02:02=Have no fear!
-02:02=无所畏惧!
+02:02=勇敢前进!
 ;02:02=Be brave and conquer
 02:02=敢于征服!
 
@@ -396,33 +397,33 @@
 ;02:05=Medic!
 02:05=急救包!
 ;02:05=First aid from the skies!
-02:05=救援物资空运来了!
+02:05=最NB的东西空运来了!
 ;02:05=A health pack for you
 02:05=你的医疗包到了
 ;02:05=Good health.. in box form!
-02:05=生命就在那箱子里!
+02:05=凤姐的内裤就在那箱子里!
 ;02:05=The doctor calls
-02:05=医生的紧急呼叫
+02:05=人在江湖飘啊,谁能不挨刀啊!PIA~PIA~
 ;02:05=Fresh band-aids!
 02:05=新鲜创可贴!
 ;02:05=This will make you feel better
-02:05=吃了这个感觉会好些的...
+02:05=吃了这个感觉像在吻春哥...
 ;02:05=A Hi-Potion! Whoops wrong game
-02:05=兴奋剂!呃。。。走错地方了
+02:05=伟哥!呃。。。走错地方了
 ;02:05=A pick-me-up!
 02:05=万金油!
 ;02:05=Grab it
-02:05=捉住它
+02:05=就是它了!
 ;02:05=A healthy snack
-02:05=健康食品
+02:05=春哥的吻如期而至~
 ;02:05=A remedy to pain
-02:05=止痛饼来了
+02:05=这货不是药包!这货不是药包!貌似这货就是药包。。。
 ;02:05=Correct Dosage: as many as you can find!
-02:05=使用方法: 吃得越多越好
+02:05=凤姐诚心提醒:这东西很管用
 ;02:05=Urgent delivery
-02:05=紧急物资
+02:05=请小心使用
 ;02:05=Supplies!
-02:05=补给!
+02:05=里面没有TT
 
 ; New ammo crate
 ; 02:06=More weapons!
@@ -430,79 +431,79 @@
 ;02:06=Reinforcements!
 02:06=增援!
 ;02:06=Lock and load!
-02:06=准备!
+02:06=凤姐的及时雨!
 ;02:06=I wonder what weapon is in there?
-02:06=我要的那个会在的吧...
+02:06=尿布湿...
 ;02:06=Supplies!
-02:06=补给!
+02:06=也许有伟哥哦!
 ;02:06=What could be inside?
 02:06=里面会有啥呢?
 ;02:06=Christmas comes early in Hedgewars
-02:06=刺猬大作战每天都是圣诞节
+02:06=刺猬杀特别派送~
 ;02:06=A present!
-02:06=礼物送到!
+02:06=今年过节不收礼!
 ;02:06=Special delivery!
-02:06=特快专递!
+02:06=特快专递,收件人付费!
 ;02:06=It was a nightmare getting this through customs
-02:06=本局的噩梦来了
+02:06=“肉山大魔王”来了
 ;02:06=Destructive toys from the heavens
-02:06=玩具从天堂掉下来了
+02:06=吃了这个可以找凤姐
 ;02:06=Warning! Contents Volatile
-02:06=警告! 内含危险物品
+02:06=警告! 小心喷鼻血~
 ;02:06=Pick it up or blow it up, choice is yours
-02:06=拿走或打爆, 随你
+02:06=拿走或爆掉, 随你
 ;02:06=Goodies!
-02:06=好玩意儿!
+02:06=貌似没有凤姐的内裤!
 ;02:06=Mmmmm Ammo
 02:06=弹药!!!!
 ;02:06=A box of destructive power
-02:06=潘朵拉之盒
+02:06=潘朵拉的宝盒
 ;02:06=Airmail!
-02:06=天降之物!
+02:06=航空邮件,收件人付费!
 ;02:06=Whatever's in that box, it ain't pizza
-02:06=无论里面是啥, 那肯定不会是软妹子
+02:06=无论里面是啥, 那肯定不会是小野妹子
 ;02:06=Get it!
 02:06=拿走它!
 ;02:06=Weapon drop incoming
 02:06=武器掉下来了!
 ;02:06=Don't let the enemy grab that!
-02:06=别让敌人拿了!
+02:06=别让平田君拿了!
 ;02:06=Shiny new toys!
-02:06=新玩具!
+02:06=把这玩意装备上!
 ;02:06=A mysterious box!
-02:06=谜的箱子...
+02:06=迷一般的玩意...
 
 ; New utility crate
 ; 02:07=Tooltime!
 02:07=工具箱!
 ;02:07=This could come in handy...
-02:07=这可能派上用场
+02:07=这货不是工具箱!貌似这货就是工具箱...
 ;02:07=Utilities!
 02:07=工具!
 ;02:07=Utilise this box
 02:07=工具在这里!
 ;02:07=Watch out below
-02:07=快看这里!
+02:07=令人蛋疼的东西!
 ;02:07=More utilities!
 02:07=更多选择更多欢笑, 尽在工具包
 ;02:07=Tools for you!
-02:07=一堆工具, 送给你!
+02:07=爆菊用的, 送给你!
 ;02:07=This should be good!
-02:07=这看见起来蛮好...
+02:07=菊花表示压力很大...
 ;02:07=Use this wisely
 02:07=使用这个才是明智的选择
 ;02:07=Ooo this box is heavy
-02:07=好重...好重...
+02:07=这东西让所有刺猬为之一震
 ;02:07=You might need this
 02:07=会有用的
 
 ; Hog (%1) skips his turn
 ; 02:08=%1 is sooo boring...
-02:08=%1 太无聊了...
+02:08=%1太无聊了...
 ;02:08=%1 couldn't be bothered
-02:08=%1 不想被打扰!
+02:08=%1要去找凤姐!
 ;02:08=%1 is one lazy hog
-02:08=%1 太懒了
+02:08=%1太懒了
 ;02:08=%1 is thoughtless
 02:08=%1 太轻率了
 ;02:08=%1 gave up
@@ -570,89 +571,163 @@
 ;02:08=%1 has fallen asleep
 02:08=%1 睡着了
 
+; Hog (%1) skips his turn
+; 02:08=%1 is sooo boring...
+02:08=%1 太无聊了...
+;02:08=%1 couldn't be bothered
+02:08=%1要去找凤姐!
+;02:08=%1 is one lazy hog
+02:08=%1找春哥要签名去了!
+;02:08=%1 is thoughtless
+02:08=%1吻凤姐去
+;02:08=%1 gave up
+02:08=%1阿西BUG!
+;02:08=You snooze you lose, %1
+02:08=%1无可奈何!
+;02:08=%1 shamelessly skips
+02:08=%1无耻的跳过了本回合
+;02:08=%1 is really lazy
+02:08=%1貌似长痔疮了!
+;02:08=%1 needs a little more motivation
+02:08=%1觉得自己需要伟哥
+;02:08=%1 is a pacifist
+02:08=%1脱了去
+;02:08=%1 has a breather
+02:08=%1正在吃饭呢
+;02:08=%1 has a rest
+02:08=%1需要食物
+;02:08=%1 chills out
+02:08=%1想要爱爱了
+;02:08=%1 has no faith in his own abilities
+02:08=%1做啥都没信心了
+;02:08=%1 decides to do nothing at all
+02:08=%1决定找凤姐一块玩
+;02:08=%1 lets the enemy destroy itself
+02:08=%1认为凤姐会来杀敌的
+;02:08=%1 would be terrible at parties
+02:08=%1撅着屁股摆体位
+;02:08=%1 hides out
+02:08=%1会隐身术
+;02:08=%1 has decided to pass on this opportunity
+02:08=%1已经决定放弃这个机会
+;02:08=%1 decides the best thing he can do is...nothing
+02:08=%1决定他现在最应该做的是......去找凤姐
+;02:08=%1 is a big wuss
+02:08=%1真是太蠢了!
+;02:08=Buck Buck Buck, %1 is a chicken
+02:08=%1找个内裤来玩玩
+;02:08=%1 is looking a little yellow
+02:08=%1看来有点印堂发黑
+;02:08=%1 is a coward!
+02:08=%1是圣德太子!
+;02:08=%1 is waiting for sudden death
+02:08=%1在等待突然死亡模式
+;02:08=%1 is not the fighting type
+02:08=%1妥妥儿的
+;02:08=%1 is reconsidering his purpose in life
+02:08=%1正在思考凤姐内裤的颜色
+;02:08=%1 was never much of a good shot anyway
+02:08=%1从来就没玩好过
+;02:08=%1 didn't want to join the army in the first place
+02:08=%1不想玩这游戏
+;02:08=Stop wasting our time, %1
+02:08=别浪费时间了! %1
+;02:08=I'm dissapointed in you, %1
+02:08=拳湿对你失望了,平田君
+;02:08=Come on, you can do better than that %1
+02:08=%1我嘞个去!
+;02:08=%1's will has broken
+02:08=%1正在打飞机
+;02:08=%1 apparently has better things to do
+02:08=%1显然有更好的事情等着做
+;02:08=%1 is scared stiff
+02:08=%1怕刺激
+;02:08=%1 has fallen asleep
+02:08=%1睡着了
+
 ; Hog (%1) hurts himself only
 ; 02:09=%1 should practice aiming!
-02:09=%1 该练练瞄准了!
+02:09=%1该练练瞄准了!
 ; 02:09=%1 seems to hate himself.
-02:09=%1 似乎看自己很不爽。
+02:09=%1似乎看自己很不爽。
 ; 02:09=%1 is standing on the wrong side!
-02:09=%1 在表演乌龙!
+02:09=%1在表演狗吃屎!
 ; 02:09=%1 makes like an emo
-02:09=%1 以为自己无敌
+02:09=%1以为自己是拳湿
 ; 02:09=%1 was holding his weapon the wrong way around
-02:09=%1 好像把武器拿错方向了
+02:09=%1好像把武器拿错方向了
 ;02:09=%1 is a little sadistic
-02:09=%1 有点施虐狂
+02:09=%1更喜欢凤姐来玩
 ;02:09=%1 is a masochist
-02:09=%1 是受虐狂
+02:09=%1是更喜欢春哥来玩
 ;02:09=%1 has no instinct of self-preservation
-02:09=%1 根本不会自我保护
+02:09=%1根本不会自我保护
 ;02:09=%1 messed up
-02:09=%1 乱套了
+02:09=%1吐槽了
 ;02:09=%1 screwed up
-02:09=%1 搞砸了
+02:09=%1体位搞错了
 ;02:09=That was a poor shot, %1
-02:09=%1 这一发真渣
+02:09=%1这一发真坑爹的!
 ;02:09=%1 is a little too careless with dangerous weapons
-02:09=%1 太不小心用那些危险的玩意了
+02:09=%1太不小心用那些危险的玩意了
 ;02:09=%1 should consider a change of career
-02:09=%1 正在考虑转职
+02:09=%1正在考虑玩凤姐
 ;02:09=Worst. Shot. Ever!
-02:09=更差! 最差! 非常差!
+02:09=值啦! 值啦! 太值啦!
 ;02:09=No no no %1, you shoot at the ENEMY!
-02:09=No no no %1, 你要打敌人!
+02:09=%1, 你要打敌人!不要打飞机!
 ;02:09=%1 should only be destroying the enemy
-02:09=%1 应该消灭敌人才对
+02:09=%1应该消灭宿敌啊
 ;02:09=%1 moves one step closer to suicide
-02:09=%1 正在走向自杀
+02:09=%1需要吃蘑菇了
 ;02:09=%1 aids the enemy
-02:09=%1 帮助敌人
+02:09=%1感觉自己蛋疼
 ;02:09=That was stupid %1
-02:09= %1 是笨蛋
+02:09=%1感觉自己菊紧
 ;02:09=%1 lives by the mantra of "no pain, no gain"
-02:09=%1 贯彻“不付出,何收获“的原则
+02:09=%1突然有点乳酸
 ;02:09=%1 is confused
-02:09=%1 思维混乱了
+02:09=%1貌似吃错药了
 ;02:09=%1 hurt itself in its confusion
-02:09=%1 在混乱中攻击自己
+02:09=%1吃错药而打错人
 ;02:09=%1 has a knack for embarrassing himself
-02:09=%1 正在为自己尴尬
+02:09=%1感觉菊花鸭梨很大
 ;02:09=%1 is a klutz!
-02:09=%1 就是一个笨蛋!
+02:09=%1要受不了啦
 ;02:09=%1 is clumsy
-02:09=%1 笨手笨脚的
+02:09=%1实在是笨到水了
 ;02:09=%1 shows the enemy what he's capable of
-02:09=%1 展示了自己的能力
+02:09=%1真是太杯具了
 ;02:09=%1 can't be expected to be perfect all the time
-02:09=%1 不能每次都完美
+02:09=%1感觉自己的人生就一茶几
 ;02:09=Don't worry %1, pobody's nerfect
-02:09=不用担心 %1 , 人都不是完美的
+02:09=杯具啊!
 ;02:09=%1 totally did that on purpose
-02:09=%1 这么做真的是有目的
+02:09=爆菊啦!
 ;02:09=I won't tell anyone if you don't, %1
-02:09=我不会把 %1 的事情到处说的
+02:09=脑仁疼啊!
 ;02:09=How embarrassing!
-02:09=何等的失态!
+02:09=内裤找不到啦,害羞!
 ;02:09=I'm sure nobody saw that %1
-02:09=保证,决没人看到 %1 做什么
+02:09=这游戏是谁发明的,画个圈圈诅咒他。。。
 ;02:09=%1 needs to review his field manual
-02:09=%1 需要复习说明书
+02:09=%1不看说明书就上场
 ;02:09=%1's weapon clearly malfunctioned
-02:09=%1 的武器很明显坏了
+02:09=%1被谁爆菊了吧
 
 ; Hog shot an home run (using the bat and another hog)
 ; 02:10=Home Run!
 02:10=全垒打!
 ; 02:10=A bird, a plane, ...
-02:10=一只鸟,一架飞机,...
+02:10=看!灰机!来打灰机啊!...
 ; 02:10=That one is out!
-02:10=那一位出界了!
+02:10=太差劲了,出局!
 
 ; Hog (%1) has to leave (team is gone)
-02:11=%1 必须上床了
-02:11=%1 玩的过火了,休息一下
-02:11=发射!这位已经被送出去
-02:11=%1 必须走了
+02:11=%1必须找凤姐上床了
+02:11=%1玩的过火了,找犀利哥替代一下
+02:11=发射!这位已经被射出去。。。
+02:11=%1必须颠菜了
 
 ; Weapon Categories
 03:00=定时手雷
@@ -697,9 +772,9 @@
 03:39=移动工具
 03:40=燃烧弹
 ;03:41=Huge fan of Squawks
-03:41=噪音
+03:41=强烈的震撼
 ;03:42=I'm making a note here...
-03:42=我将在此记录...
+03:42=我将名垂青湿...
 
 ; the misspelled "Beethoven" is intentional (-> to beat)
 ;03:43=Performing Beathoven's deadly sonata
@@ -735,9 +810,9 @@
 04:15=呼叫一架飞机轰炸你的敌人.|左/右方向键: 决定攻击方向|光标: 选定目标
 04:16=呼叫一架飞机投下大量地雷.|左/右方向键: 决定攻击方向|光标: 选定目标
 04:17=需要个安全的地方? 使用喷灯为你挖掘一条安全的隧道!|攻击键: 开始/停止挖掘
-04:18=喷灯还不够?还要个更安全的地方?|建造若干条大梁挡住吧.|左/右方向键: 选择梁的方向|光标: 建造
+04:18=钻洞器还不够?还要个更安全的地方?|建造若干条大梁挡住吧.|左/右方向键: 选择梁的方向|光标: 建造
 04:19=适当的时候撤退是比所有的攻击|更安全的选择|光标: 选择传送目标
-04:20=可以让你更换当前使用的刺猬.|攻击键: 启动切换功能
+04:20=可以让你更换当前使用的刺猬.|攻击键: 启动切换功能|TAB:切换刺猬
 04:21=用炮弹发射器发射一个手榴弹样|的东西. 在爆炸之后会裂开成小块|攻击键: 全力发射
 04:22=这不只是女王才用的东西!|这鞭子能解决很多问题, 比如说那些|喜欢站在悬崖边上的小屁孩.|攻击键: 鞭打你面前的一切东西
 04:23=自杀式炸弹袭击向来好用!|用你的一条命攻击直线上的一切东西并爆炸.|攻击键: 启动自杀性攻击
@@ -759,19 +834,19 @@
 04:39=驾驶飞碟可以飞到地图上的任何角落.|不过这个东西连发明者都认为很难用.|攻击键: 激活|上/左/右方向键: 向某方向飞|前跳:攻击敌人
 04:40=把地面填满汽油然后....|攻击键: 按住蓄力.
 ;04:41=自然的力量要盖过飞盘。|带着刺猬的鸟竟然毫不犹豫的空中下蛋!|攻击键: 激活和放蛋|上/左/右方向键: 向某方向飞
-;04:42=This portable portal device is capable|of instantly transporting you, your enemies,|or your weaponry between two points on the|terrain.|Use it wisely and your campaign will be a...|HUGE SUCCESS!|Attack: Shoot a portal|Switch: Cycle portal colours
+;04:42=这玩意可以,|or your weaponry between two points on the|terrain.|Use it wisely and your campaign will be a...|HUGE SUCCESS!|Attack: Shoot a portal|Switch: Cycle portal colours
 04:42=移动传送装置|迅速传输自己或者敌人或者|你的武器,直接连接|地表的两个不同位置。|用的聪明那么。。。|攻击键: 发射一个传送点|切换键: 改变颜色
 ;04:43=Make your musical debut an explosive success!|Drop a piano from the heavens, but beware...|someone needs to play it, and that may cost you|your life!|Cursor: Select target region|F1-F9: Play the piano
 04:43=音乐细胞的迸发!|钢琴从天堂降落,带|着演奏者最终回归天堂|光标: 选择目标区域|F1-F9:演奏钢琴
-04:44=这不是奶酪!而是生化武器!|爆炸只有一次,带来的毒害是深远的!|1-5: 设定定时器|攻击键: 按住蓄力
+04:44=这货不是奶酪!貌似是生化武器!|爆炸只有一次,带来的毒害是深远的!|1-5: 设定定时器|攻击键: 按住蓄力
 ;04:45=All those physics classes have finally |paid off, launch a devastating Sine |wave at your foes. |Watch out, this weapon packs quite a kick. (This weapon is incomplete)|Attack: Shoot
 04:45=全部物理阶级最终|转化为正弦波动|留心,力是相对的|攻击键: 发射
 ;04:46=Cover your foes with sizzling liquid flame.|Heartwarming!|Attack: Activate|Up/Down: Continue aiming|Left/Right: Modify spitting power
 04:46= 用满腔的火焰虐待你的对手吧。|攻击键: 激活|上/下方向键: 改变攻击方向|左/右方向键: 调整喷射距离
 ;04:47=Double the fun with two spiky, sneaky, sticky mines.|Set up a chain reaction or defend yourself (or both!)|Attack: Hold to shoot with more power (twice)
-04:47=两次机会双重乐趣,隐蔽且黏着的地雷。|利用脑力造成连锁反应!|攻击键: 按住蓄力(两发)
+04:47=两次机会双重乐趣,隐蔽且固定的地雷。|利用脑力造成连锁反应!|攻击键: 按住蓄力(两发)
 ;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:48=痛扁刺猬:用力一锤|将使中者镶入地表,削减它健康的1/3.|攻击键: 打
+04:48=痛扁刺猬:用力一锤|将使中者镶入地表,削减它生命值的1/3.|攻击键: 击打
 
 
 ; Game goal strings
@@ -784,7 +859,7 @@
 ;05:04=Invulnerability: Hogs are (almost) invulnerable
 05:04=无敌: 刺猬不受伤害
 ;05:05=Vampirism: Hogs will be healed for the damage dealt
-05:05=吸血: 敌人失去的就是我的
+05:05=吸血: 敌人失去的就是我得到的
 ;05:06=Karma: Hogs will be damaged for the damage dealt
 05:06=因果效应: 伤害有多少,自己都知道
 ;05:07=Protect the King: Don't let your king die!|Place the King: Pick a protected starting point for your King