Remove the last vestiges of the shoppa hack by adding 2 spinners for percentage health and amount of health in crate, also update translations and increase SD spinner (some users have requested it)
authorhenek
Fri, 05 Nov 2010 22:32:00 -0400
changeset 4143 eb7981f34800
parent 4142 980ec01b98e1
child 4144 cda2685feeb4
Remove the last vestiges of the shoppa hack by adding 2 spinners for percentage health and amount of health in crate, also update translations and increase SD spinner (some users have requested it)
QTfrontend/ammoSchemeModel.cpp
QTfrontend/gamecfgwidget.cpp
QTfrontend/pages.cpp
QTfrontend/pages.h
hedgewars/uAmmos.pas
hedgewars/uConsole.pas
hedgewars/uGears.pas
hedgewars/uMisc.pas
share/hedgewars/Data/Locale/hedgewars_ar.ts
share/hedgewars/Data/Locale/hedgewars_bg.ts
share/hedgewars/Data/Locale/hedgewars_cs.ts
share/hedgewars/Data/Locale/hedgewars_de.ts
share/hedgewars/Data/Locale/hedgewars_en.ts
share/hedgewars/Data/Locale/hedgewars_es.ts
share/hedgewars/Data/Locale/hedgewars_fi.ts
share/hedgewars/Data/Locale/hedgewars_fr.ts
share/hedgewars/Data/Locale/hedgewars_hu.ts
share/hedgewars/Data/Locale/hedgewars_it.ts
share/hedgewars/Data/Locale/hedgewars_ja.ts
share/hedgewars/Data/Locale/hedgewars_pl.ts
share/hedgewars/Data/Locale/hedgewars_pt_BR.ts
share/hedgewars/Data/Locale/hedgewars_pt_PT.ts
share/hedgewars/Data/Locale/hedgewars_ru.ts
share/hedgewars/Data/Locale/hedgewars_sk.ts
share/hedgewars/Data/Locale/hedgewars_sv.ts
share/hedgewars/Data/Locale/hedgewars_tr_TR.ts
share/hedgewars/Data/Locale/hedgewars_uk.ts
share/hedgewars/Data/Locale/hedgewars_zh_CN.ts
share/hedgewars/Data/Locale/hedgewars_zh_TW.ts
--- a/QTfrontend/ammoSchemeModel.cpp	Fri Nov 05 21:59:02 2010 -0400
+++ b/QTfrontend/ammoSchemeModel.cpp	Fri Nov 05 22:32:00 2010 -0400
@@ -54,6 +54,8 @@
         << QVariant(4)             // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(2)             // explosives     30
+        << QVariant(35)            // health case pct 31
+        << QVariant(25)            // health case amt 32
         ;
 
 AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) :
@@ -104,6 +106,8 @@
         << "minesnum"         // 28
         << "minedudpct"       // 29
         << "explosives"       // 30
+        << "healthprobability" // 31
+        << "healthcaseamount" // 32
         ;
 
     QList<QVariant> proMode;
@@ -139,6 +143,8 @@
         << QVariant(0)             // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(2)             // explosives     30
+        << QVariant(35)            // health case pct 31
+        << QVariant(25)            // health case amt 32
         ;
 
     QList<QVariant> shoppa;
@@ -174,6 +180,8 @@
         << QVariant(0)             // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(0)             // explosives     30
+        << QVariant(0)             // health case pct 31
+        << QVariant(25)            // health case amt 32
         ;
 
     QList<QVariant> cleanslate;
@@ -209,6 +217,8 @@
         << QVariant(4)             // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(2)             // explosives     30
+        << QVariant(35)            // health case pct 31
+        << QVariant(25)            // health case amt 32
         ;
 
     QList<QVariant> minefield;
@@ -244,6 +254,8 @@
         << QVariant(80)            // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(0)             // explosives     30
+        << QVariant(35)            // health case pct 31
+        << QVariant(25)            // health case amt 32
         ;
 
     QList<QVariant> barrelmayhem;
@@ -279,6 +291,8 @@
         << QVariant(0)             // mines number   28
         << QVariant(0)             // mine dud pct   29
         << QVariant(80)            // explosives     30
+        << QVariant(35)            // health case pct 31
+        << QVariant(25)            // health case amt 32
         ;
 
     QList<QVariant> tunnelhogs;
@@ -314,6 +328,8 @@
         << QVariant(10)            // mines number   28
         << QVariant(10)            // mine dud pct   29
         << QVariant(10)            // explosives     30
+        << QVariant(35)            // health case pct 31
+        << QVariant(25)            // health case amt 32
         ;
 
     schemes.append(defaultScheme);
--- a/QTfrontend/gamecfgwidget.cpp	Fri Nov 05 21:59:02 2010 -0400
+++ b/QTfrontend/gamecfgwidget.cpp	Fri Nov 05 22:32:00 2010 -0400
@@ -164,6 +164,8 @@
     sl.append(QString("e$casefreq %1").arg(schemeData(26).toInt()));
     sl.append(QString("e$minedudpct %1").arg(schemeData(29).toInt()));
     sl.append(QString("e$explosives %1").arg(schemeData(30).toInt()));
+    sl.append(QString("e$healthprob %1").arg(schemeData(31).toInt()));
+    sl.append(QString("e$hcaseamount %1").arg(schemeData(32).toInt()));
     sl.append(QString("e$template_filter %1").arg(pMapContainer->getTemplateFilter()));
     sl.append(QString("e$mapgen %1").arg(pMapContainer->get_mapgen()));
     sl.append(QString("e$maze_size %1").arg(pMapContainer->get_maze_size()));
--- a/QTfrontend/pages.cpp	Fri Nov 05 21:59:02 2010 -0400
+++ b/QTfrontend/pages.cpp	Fri Nov 05 22:32:00 2010 -0400
@@ -1570,7 +1570,6 @@
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconDamage.png"));
     glBSLayout->addWidget(l,0,1,1,1);
-
     SB_DamageModifier = new QSpinBox(gbBasicSettings);
     SB_DamageModifier->setRange(10, 300);
     SB_DamageModifier->setValue(100);
@@ -1585,7 +1584,6 @@
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconTime.png"));
     glBSLayout->addWidget(l,1,1,1,1);
-
     SB_TurnTime = new QSpinBox(gbBasicSettings);
     SB_TurnTime->setRange(1, 9999);
     SB_TurnTime->setValue(45);
@@ -1600,7 +1598,6 @@
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconHealth.png"));
     glBSLayout->addWidget(l,2,1,1,1);
-
     SB_InitHealth = new QSpinBox(gbBasicSettings);
     SB_InitHealth->setRange(50, 200);
     SB_InitHealth->setValue(100);
@@ -1615,9 +1612,8 @@
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconSuddenDeath.png"));
     glBSLayout->addWidget(l,3,1,1,1);
-
     SB_SuddenDeath = new QSpinBox(gbBasicSettings);
-    SB_SuddenDeath->setRange(0, 50);
+    SB_SuddenDeath->setRange(0, 999);
     SB_SuddenDeath->setValue(15);
     SB_SuddenDeath->setSingleStep(3);
     glBSLayout->addWidget(SB_SuddenDeath,3,2,1,1);
@@ -1630,70 +1626,97 @@
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconBox.png"));
     glBSLayout->addWidget(l,4,1,1,1);
-
     SB_CaseProb = new FreqSpinBox(gbBasicSettings);
     SB_CaseProb->setRange(0, 9);
     SB_CaseProb->setValue(5);
     glBSLayout->addWidget(SB_CaseProb,4,2,1,1);
 
     l = new QLabel(gbBasicSettings);
-    l->setText(QLabel::tr("Mines Time"));
+    l->setText(QLabel::tr("% Health Crates"));
     l->setWordWrap(true);
     glBSLayout->addWidget(l,5,0,1,1);
     l = new QLabel(gbBasicSettings);
     l->setFixedSize(32,32);
+    l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon
+    glBSLayout->addWidget(l,5,1,1,1);
+    SB_HealthCrates = new QSpinBox(gbBasicSettings);
+    SB_HealthCrates->setRange(0, 100);
+    SB_HealthCrates->setValue(35);
+    SB_HealthCrates->setSingleStep(5);
+    glBSLayout->addWidget(SB_HealthCrates,5,2,1,1);
+
+    l = new QLabel(gbBasicSettings);
+    l->setText(QLabel::tr("Health in Crates"));
+    l->setWordWrap(true);
+    glBSLayout->addWidget(l,6,0,1,1);
+    l = new QLabel(gbBasicSettings);
+    l->setFixedSize(32,32);
+    l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon
+    glBSLayout->addWidget(l,6,1,1,1);
+    SB_CrateHealth = new QSpinBox(gbBasicSettings);
+    SB_CrateHealth->setRange(0, 200);
+    SB_CrateHealth->setValue(25);
+    SB_CrateHealth->setSingleStep(5);
+    glBSLayout->addWidget(SB_CrateHealth,6,2,1,1);
+
+    l = new QLabel(gbBasicSettings);
+    l->setText(QLabel::tr("Mines Time"));
+    l->setWordWrap(true);
+    glBSLayout->addWidget(l,7,0,1,1);
+    l = new QLabel(gbBasicSettings);
+    l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconTime.png")); // TODO: icon
-    glBSLayout->addWidget(l,5,1,1,1);
+    glBSLayout->addWidget(l,7,1,1,1);
     SB_MinesTime = new QSpinBox(gbBasicSettings);
     SB_MinesTime->setRange(-1, 5);
     SB_MinesTime->setValue(3);
     SB_MinesTime->setSingleStep(1);
     SB_MinesTime->setSpecialValueText(tr("Random"));
     SB_MinesTime->setSuffix(" "+ tr("Seconds"));
-    glBSLayout->addWidget(SB_MinesTime,5,2,1,1);
+    glBSLayout->addWidget(SB_MinesTime,7,2,1,1);
 
     l = new QLabel(gbBasicSettings);
     l->setText(QLabel::tr("Mines"));
     l->setWordWrap(true);
-    glBSLayout->addWidget(l,6,0,1,1);
+    glBSLayout->addWidget(l,8,0,1,1);
     l = new QLabel(gbBasicSettings);
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconMine.png")); // TODO: icon
-    glBSLayout->addWidget(l,6,1,1,1);
+    glBSLayout->addWidget(l,8,1,1,1);
     SB_Mines = new QSpinBox(gbBasicSettings);
     SB_Mines->setRange(0, 80);
     SB_Mines->setValue(0);
     SB_Mines->setSingleStep(5);
-    glBSLayout->addWidget(SB_Mines,6,2,1,1);
+    glBSLayout->addWidget(SB_Mines,8,2,1,1);
 
     l = new QLabel(gbBasicSettings);
     l->setText(QLabel::tr("% Dud Mines"));
     l->setWordWrap(true);
-    glBSLayout->addWidget(l,7,0,1,1);
+    glBSLayout->addWidget(l,9,0,1,1);
     l = new QLabel(gbBasicSettings);
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconDud.png"));
-    glBSLayout->addWidget(l,7,1,1,1);
+    glBSLayout->addWidget(l,9,1,1,1);
     SB_MineDuds = new QSpinBox(gbBasicSettings);
     SB_MineDuds->setRange(0, 100);
     SB_MineDuds->setValue(0);
     SB_MineDuds->setSingleStep(5);
-    glBSLayout->addWidget(SB_MineDuds,7,2,1,1);
+    glBSLayout->addWidget(SB_MineDuds,9,2,1,1);
 
 
     l = new QLabel(gbBasicSettings);
     l->setText(QLabel::tr("Explosives"));
     l->setWordWrap(true);
-    glBSLayout->addWidget(l,8,0,1,1);
+    glBSLayout->addWidget(l,10,0,1,1);
     l = new QLabel(gbBasicSettings);
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconDamage.png"));
-    glBSLayout->addWidget(l,8,1,1,1);
+    glBSLayout->addWidget(l,10,1,1,1);
     SB_Explosives = new QSpinBox(gbBasicSettings);
     SB_Explosives->setRange(0, 40);
     SB_Explosives->setValue(0);
     SB_Explosives->setSingleStep(1);
-    glBSLayout->addWidget(SB_Explosives,8,2,1,1);
+    glBSLayout->addWidget(SB_Explosives,10,2,1,1);
 
 
     l = new QLabel(gbBasicSettings);
@@ -1755,6 +1778,8 @@
     mapper->addMapping(SB_Mines, 28);
     mapper->addMapping(SB_MineDuds, 29);
     mapper->addMapping(SB_Explosives, 30);
+    mapper->addMapping(SB_HealthCrates, 31);
+    mapper->addMapping(SB_CrateHealth, 32);
 
     mapper->toFirst();
 }
--- a/QTfrontend/pages.h	Fri Nov 05 21:59:02 2010 -0400
+++ b/QTfrontend/pages.h	Fri Nov 05 22:32:00 2010 -0400
@@ -486,6 +486,8 @@
     QSpinBox * SB_InitHealth;
     QSpinBox * SB_SuddenDeath;
     FreqSpinBox * SB_CaseProb;
+    QSpinBox * SB_HealthCrates;
+    QSpinBox * SB_CrateHealth;
     QSpinBox * SB_MinesTime;
     QSpinBox * SB_Mines;
     QSpinBox * SB_MineDuds;
--- a/hedgewars/uAmmos.pas	Fri Nov 05 21:59:02 2010 -0400
+++ b/hedgewars/uAmmos.pas	Fri Nov 05 22:32:00 2010 -0400
@@ -44,8 +44,7 @@
 function  GetAmmoByNum(num: Longword): PHHAmmo;
 function  GetAmmoEntry(var Hedgehog: THedgehog): PAmmo;
 
-var shoppa: boolean;
-    StoreCnt: Longword;
+var StoreCnt: Longword;
 
 implementation
 uses uMisc, uGears, uWorld, uLocale, uConsole, uMobile;
@@ -97,14 +96,6 @@
 begin
 TryDo((byte(ammoLoadout[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoProbability[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoDelay[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoReinforcement[0]) = byte(ord(High(TAmmoType)))), 'Incomplete or missing ammo scheme set (incompatible frontend or demo/save?)', true);
 
-// FIXME - TEMPORARY hardcoded check on shoppa pending creation of crate *type* probability editor
-substr:= Copy(ammoLoadout,1,42);
-if (substr = '000000990000009000000000000000000000000000') or  // ropes + parachute
-   (substr = '000000900000000000000000000000000000009000') or  // saucer
-   (substr = '000000900000000000000000000000000000000009') or  // portal
-   (substr = '000000990000000000000000000000000000000000')     // ropes
-   then shoppa:= true;
-
 inc(StoreCnt);
 TryDo(StoreCnt <= cMaxHHs, 'Ammo stores overflow', true);
 
@@ -432,7 +423,6 @@
 
 procedure initModule;
 begin
-    shoppa:= false;
     StoreCnt:= 0;
     ammoLoadout:= '';
     ammoProbability:= '';
--- a/hedgewars/uConsole.pas	Fri Nov 05 21:59:02 2010 -0400
+++ b/hedgewars/uConsole.pas	Fri Nov 05 22:32:00 2010 -0400
@@ -234,6 +234,8 @@
     RegisterVariable('delay'   , vtLongInt, @cInactDelay    , false);
     RegisterVariable('ready'   , vtLongInt, @cReadyDelay    , false);
     RegisterVariable('casefreq', vtLongInt, @cCaseFactor    , false);
+    RegisterVariable('healthprob', vtLongInt, @cHealthCaseProb, false);
+    RegisterVariable('hcaseamount', vtLongInt, @cHealthCaseAmount, false);
     RegisterVariable('sd_turns', vtLongInt, @cSuddenDTurns  , false);
     RegisterVariable('damagepct',vtLongInt, @cDamagePercent , false);
     RegisterVariable('minedudpct',vtLongInt,@cMineDudPercent, false);
--- a/hedgewars/uGears.pas	Fri Nov 05 21:59:02 2010 -0400
+++ b/hedgewars/uGears.pas	Fri Nov 05 22:32:00 2010 -0400
@@ -1657,7 +1657,7 @@
 
     case crate of
         HealthCrate: begin
-            FollowGear^.Health := 25;
+            FollowGear^.Health := cHealthCaseAmount;
             FollowGear^.Pos := posCaseHealth;
             AddCaption(GetEventString(eidNewHealthPack), cWhiteColor, capgrpAmmoInfo);
             end;
@@ -1699,14 +1699,13 @@
 t:=0;
 a:=aTot;
 h:= 1;
-// FIXME - shoppa is TEMPORARY REMOVE WHEN CRATE PROBABILITY ALLOWS DISABLING OF HEALTH CRATES
-// Preserving health crate distribution of 35% until that happens
+
 if (aTot+uTot) <> 0 then
-    if not shoppa and ((GameFlags and gfInvulnerable) = 0) then
+    if ((GameFlags and gfInvulnerable) = 0) then
         begin
-        h:= 3500;
+        h:= cHealthCaseProb * 100;
         t:= GetRandom(10000);
-        a:= 6500*aTot div (aTot+uTot)
+        a:= (10000-h)*aTot div (aTot+uTot)
         end
     else
         begin
@@ -1718,7 +1717,7 @@
 if t<h then
     begin
     FollowGear:= AddGear(0, 0, gtCase, 0, _0, _0, 0);
-    FollowGear^.Health:= 25;
+    FollowGear^.Health:= cHealthCaseAmount;
     FollowGear^.Pos:= posCaseHealth;
     AddCaption(GetEventString(eidNewHealthPack), cWhiteColor, capgrpAmmoInfo);
     end
--- a/hedgewars/uMisc.pas	Fri Nov 05 21:59:02 2010 -0400
+++ b/hedgewars/uMisc.pas	Fri Nov 05 22:32:00 2010 -0400
@@ -74,6 +74,9 @@
     cMinesTime       : LongInt;
     cMaxAIThinkTime  : Longword;
 
+    cHealthCaseProb  : LongInt;
+    cHealthCaseAmount: LongInt;
+
     cCloudsNumber    : LongInt;
 
     cTagsMask        : byte;
@@ -758,6 +761,8 @@
     cMinesTime          := 3000;
     cMaxAIThinkTime     := 9000;
     cCloudsNumber       := 9;
+    cHealthCaseProb     := 35;
+    cHealthCaseAmount   := 25;
 
     cTagsMask       := 0;
     KBnum           := 0;
--- a/share/hedgewars/Data/Locale/hedgewars_ar.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1147,35 +1147,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">التلقائي</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">التلقائي</translation>
     </message>
 </context>
 <context>
@@ -1379,6 +1351,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_bg.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1105,35 +1105,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">По подразбиране</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">По подразбиране</translation>
     </message>
 </context>
 <context>
@@ -1337,6 +1309,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_cs.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1110,35 +1110,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Základní</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Základní</translation>
     </message>
 </context>
 <context>
@@ -1342,6 +1314,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_de.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_de.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1157,35 +1157,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Standard</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Standard</translation>
     </message>
 </context>
 <context>
@@ -1395,6 +1367,14 @@
         <source>Quality</source>
         <translation>Qualität</translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_en.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_en.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1151,35 +1151,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Default</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Default</translation>
     </message>
 </context>
 <context>
@@ -1383,6 +1355,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_es.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_es.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1155,35 +1155,35 @@
     </message>
     <message>
         <source>Default</source>
-        <translation>Predeterminado</translation>
+        <translation type="obsolete">Predeterminado</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation>Modo pro</translation>
+        <translation type="obsolete">Modo pro</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation>Shoppa</translation>
+        <translation type="obsolete">Shoppa</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation>Baloncesto</translation>
+        <translation type="obsolete">Baloncesto</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation>Campo de minas</translation>
+        <translation type="obsolete">Campo de minas</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation>Bodega infernal</translation>
+        <translation type="obsolete">Bodega infernal</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation>Erizos subterráneos</translation>
+        <translation type="obsolete">Erizos subterráneos</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation>Lunático</translation>
+        <translation type="obsolete">Lunático</translation>
     </message>
 </context>
 <context>
@@ -1396,6 +1396,14 @@
         <source>Quality</source>
         <translation>Calidad</translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_fi.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1151,35 +1151,35 @@
     </message>
     <message>
         <source>Default</source>
-        <translation>Oletus</translation>
+        <translation type="obsolete">Oletus</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation>Pro-tila</translation>
+        <translation type="obsolete">Pro-tila</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation>Shoppa</translation>
+        <translation type="obsolete">Shoppa</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation>Koripallo</translation>
+        <translation type="obsolete">Koripallo</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation>Miinakenttä</translation>
+        <translation type="obsolete">Miinakenttä</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation>Tynnyrikaaos</translation>
+        <translation type="obsolete">Tynnyrikaaos</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation>Tunnelisiilit</translation>
+        <translation type="obsolete">Tunnelisiilit</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation>Sekopäinen</translation>
+        <translation type="obsolete">Sekopäinen</translation>
     </message>
 </context>
 <context>
@@ -1383,6 +1383,14 @@
         <source>Quality</source>
         <translation>Laatu</translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_fr.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -605,11 +605,6 @@
         <translation type="unfinished"></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>
-    </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>
@@ -639,6 +634,11 @@
         <comment>Tips</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Like Hedgewars? Become a fan on %1 or follow us on %2!</source>
+        <comment>Tips</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageMultiplayer</name>
@@ -868,7 +868,7 @@
     </message>
     <message>
         <source>Enable random mines</source>
-        <translation>Activer les mines aléatoires</translation>
+        <translation type="obsolete">Activer les mines aléatoires</translation>
     </message>
     <message>
         <source>Gain 80% of the damage you do back in health</source>
@@ -1147,35 +1147,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Défaut</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Défaut</translation>
     </message>
 </context>
 <context>
@@ -1341,7 +1313,7 @@
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Type</translation>
     </message>
     <message>
         <source>Grave</source>
@@ -1379,6 +1351,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
@@ -1648,7 +1628,7 @@
     </message>
     <message>
         <source>Add Mines</source>
-        <translation>Ajouter des Mines</translation>
+        <translation type="obsolete">Ajouter des Mines</translation>
     </message>
     <message>
         <source>Random Order</source>
--- a/share/hedgewars/Data/Locale/hedgewars_hu.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1140,35 +1140,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Default</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Default</translation>
     </message>
 </context>
 <context>
@@ -1378,6 +1350,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1151,35 +1151,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Default</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Default</translation>
     </message>
 </context>
 <context>
@@ -1389,6 +1361,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_ja.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1100,35 +1100,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">デフォールト</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">デフォールト</translation>
     </message>
 </context>
 <context>
@@ -1332,6 +1304,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_pl.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1177,35 +1177,35 @@
     </message>
     <message>
         <source>Default</source>
-        <translation>Domyślne</translation>
+        <translation type="obsolete">Domyślne</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation>Pro mode</translation>
+        <translation type="obsolete">Pro mode</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation>Shoppa</translation>
+        <translation type="obsolete">Shoppa</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation>Basketball</translation>
+        <translation type="obsolete">Basketball</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation>Minefield</translation>
+        <translation type="obsolete">Minefield</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation>Barrel mayhem</translation>
+        <translation type="obsolete">Barrel mayhem</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation>Tunnel hogs</translation>
+        <translation type="obsolete">Tunnel hogs</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation>Crazy</translation>
+        <translation type="obsolete">Crazy</translation>
     </message>
 </context>
 <context>
@@ -1421,6 +1421,14 @@
         <source>Quality</source>
         <translation>Jakość</translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1209,35 +1209,35 @@
     </message>
     <message>
         <source>Default</source>
-        <translation>Padrão</translation>
+        <translation type="obsolete">Padrão</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation>Modo Pro</translation>
+        <translation type="obsolete">Modo Pro</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation>Shoppa</translation>
+        <translation type="obsolete">Shoppa</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation>Basketball</translation>
+        <translation type="obsolete">Basketball</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation>Campo Minado</translation>
+        <translation type="obsolete">Campo Minado</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation type="unfinished">Inferno de Barris</translation>
+        <translation type="obsolete">Inferno de Barris</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation type="unfinished">Túneis</translation>
+        <translation type="obsolete">Túneis</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation type="unfinished">Crazy</translation>
+        <translation type="obsolete">Crazy</translation>
     </message>
 </context>
 <context>
@@ -1451,6 +1451,14 @@
         <source>Quality</source>
         <translation>Qualidade</translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1151,35 +1151,35 @@
     </message>
     <message>
         <source>Default</source>
-        <translation>Predefinido</translation>
+        <translation type="obsolete">Predefinido</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation>Modo Profissional</translation>
+        <translation type="obsolete">Modo Profissional</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation>Shoppa</translation>
+        <translation type="obsolete">Shoppa</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation>Basquetebol</translation>
+        <translation type="obsolete">Basquetebol</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation>Campo de minas</translation>
+        <translation type="obsolete">Campo de minas</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation>Barrel mayhem</translation>
+        <translation type="obsolete">Barrel mayhem</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation>Tuneis</translation>
+        <translation type="obsolete">Tuneis</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation>Crazy</translation>
+        <translation type="obsolete">Crazy</translation>
     </message>
 </context>
 <context>
@@ -1383,6 +1383,14 @@
         <source>Quality</source>
         <translation>Qualidade</translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation>% de Caixas de Vida</translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation>Vida por Caixa</translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_ru.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1154,35 +1154,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">По умолчанию</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">По умолчанию</translation>
     </message>
 </context>
 <context>
@@ -1392,6 +1364,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1154,35 +1154,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Východzie</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Východzie</translation>
     </message>
 </context>
 <context>
@@ -1392,6 +1364,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_sv.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -347,7 +347,7 @@
     </message>
     <message>
         <source>Health graph</source>
-        <translation>Hälsograf</translation>
+        <translation>Livgraf</translation>
     </message>
     <message>
         <source>Ranking</source>
@@ -1151,35 +1151,35 @@
     </message>
     <message>
         <source>Default</source>
-        <translation>Standard</translation>
+        <translation type="obsolete">Standard</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation>Pro-läge</translation>
+        <translation type="obsolete">Pro-läge</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation>Shoppa</translation>
+        <translation type="obsolete">Shoppa</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation>Basket</translation>
+        <translation type="obsolete">Basket</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation>Minfält</translation>
+        <translation type="obsolete">Minfält</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation>Tunnförödelse</translation>
+        <translation type="obsolete">Tunnförödelse</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation>Tunnelkottar</translation>
+        <translation type="obsolete">Tunnelkottar</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation>Galet</translation>
+        <translation type="obsolete">Galet</translation>
     </message>
 </context>
 <context>
@@ -1389,6 +1389,14 @@
         <source>Quality</source>
         <translation>Kvalitet</translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation>% förbandslådor</translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation>Liv i förbandslådor</translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1112,35 +1112,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">Öntanımlı</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Öntanımlı</translation>
     </message>
 </context>
 <context>
@@ -1344,6 +1316,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_uk.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1154,35 +1154,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">За замовчуванням</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">За замовчуванням</translation>
     </message>
 </context>
 <context>
@@ -1392,6 +1364,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1154,35 +1154,35 @@
     </message>
     <message>
         <source>Default</source>
-        <translation>默认</translation>
+        <translation type="obsolete">默认</translation>
     </message>
     <message>
         <source>Pro mode</source>
-        <translation>Pro 模式</translation>
+        <translation type="obsolete">Pro 模式</translation>
     </message>
     <message>
         <source>Shoppa</source>
-        <translation>绳索模式</translation>
+        <translation type="obsolete">绳索模式</translation>
     </message>
     <message>
         <source>Basketball</source>
-        <translation>篮球模式</translation>
+        <translation type="obsolete">篮球模式</translation>
     </message>
     <message>
         <source>Minefield</source>
-        <translation>地雷模式</translation>
+        <translation type="obsolete">地雷模式</translation>
     </message>
     <message>
         <source>Barrel mayhem</source>
-        <translation>武器不共享</translation>
+        <translation type="obsolete">武器不共享</translation>
     </message>
     <message>
         <source>Tunnel hogs</source>
-        <translation>洞穴刺猬</translation>
+        <translation type="obsolete">洞穴刺猬</translation>
     </message>
     <message>
         <source>Crazy</source>
-        <translation>疯狂模式</translation>
+        <translation type="obsolete">疯狂模式</translation>
     </message>
 </context>
 <context>
@@ -1386,6 +1386,14 @@
         <source>Quality</source>
         <translation>价值</translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>
--- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts	Fri Nov 05 21:59:02 2010 -0400
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts	Fri Nov 05 22:32:00 2010 -0400
@@ -1140,35 +1140,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished">默認</translation>
-    </message>
-    <message>
-        <source>Pro mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shoppa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Basketball</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minefield</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barrel mayhem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunnel hogs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Crazy</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">默認</translation>
     </message>
 </context>
 <context>
@@ -1372,6 +1344,14 @@
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>% Health Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Health in Crates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QLineEdit</name>