# HG changeset patch
# User koda
# Date 1289615174 -3600
# Node ID 88714b6f36768fac31b45b94c1bc94c8c9210590
# Parent 82f1f1d819c07517cfd116eb339aad4d89e09dad# Parent 1f5604cd99bedfe1a47b76a25f59c49cc1a5a9b8
merge
diff -r 82f1f1d819c0 -r 88714b6f3676 QTfrontend/pages.cpp
--- a/QTfrontend/pages.cpp Sat Nov 13 03:25:40 2010 +0100
+++ b/QTfrontend/pages.cpp Sat Nov 13 03:26:14 2010 +0100
@@ -145,11 +145,15 @@
//Tips << tr("Want to play Hedgewars any time? Grab the Mobile version for %1 and %2.", "Tips").arg("").arg("");
Tips << tr("Keep your video card drivers up to date to avoid issues playing the game.", "Tips");
//Tips << tr("", "Tips");
+#ifndef __APPLE__
+ Tips << tr("You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.", "Tips");
+#endif
#ifdef _WIN32
Tips << tr("You can find your Hedgewars configuration files under \"My Documents\\Hedgewars\". Create backups or take the files with you, but don't edit them by hand.", "Tips");
- Tips << tr("You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.", "Tips");
-#else
- Tips << tr("You can find your Hedgewars configuration files under \"Hedgewars\" in your home directory. Create backups or take the files with you, but don't edit them by hand.", "Tips");
+#elif defined __APPLE__
+ Tips << tr("You can find your Hedgewars configuration files under \"Library/Application Support/Hedgewars\" in your home directory. Create backups or take the files with you, but don't edit them by hand.", "Tips");
+#else
+ Tips << tr("You can find your Hedgewars configuration files under \".hedgewars\" in your home directory. Create backups or take the files with you, but don't edit them by hand.", "Tips");
#endif
mainNote->setText(QLabel::tr("Tip: ") + Tips[QTime(0, 0, 0).secsTo(QTime::currentTime()) % Tips.length()]);
}
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/Actions.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/CMakeLists.txt
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/ClientIO.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/CoreTypes.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/HWProtoCore.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/HWProtoInRoomState.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/HWProtoLobbyState.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/HWProtoNEState.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/NetRoutines.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/OfficialServer/DBInteraction.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/OfficialServer/extdbinterface.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/Opts.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/ServerCore.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/Utils.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/hedgewars-server.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/stresstest.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 gameServer/stresstest2.hs
diff -r 82f1f1d819c0 -r 88714b6f3676 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc Sat Nov 13 03:25:40 2010 +0100
+++ b/hedgewars/GSHandlers.inc Sat Nov 13 03:26:14 2010 +0100
@@ -2085,7 +2085,7 @@
2: for i:= -19 to 19 do
FollowGear := AddGear(hwRound(Gear^.X) + i div 3, hwRound(Gear^.Y), gtFlame, 0,
_0_001 * i, _0, 0);
- 3: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtDrill, 0, cBombsSpeed *
+ 3: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtDrill, gsttmpFlag, cBombsSpeed *
Gear^.Tag, _0, 0);
//4: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtWaterMelon, 0, cBombsSpeed *
// Gear^.Tag, _0, 5000);
@@ -2730,6 +2730,8 @@
Gear^.X := Gear^.X + Gear^.dX;
Gear^.Y := Gear^.Y + Gear^.dY;
DrawTunnel(oX, oY, Gear^.dX, Gear^.dY, 2, 6);
+ if (Gear^.Timer mod 30) = 0 then
+ AddVisualGear(hwRound(Gear^.X + _20 * Gear^.dX), hwRound(Gear^.Y + _20 * Gear^.dY), vgtDust);
if (CheckGearDrowning(Gear)) then
begin
StopSound(Gear^.SoundChannel);
@@ -2748,7 +2750,10 @@
begin
//out of time or exited ground
StopSound(Gear^.SoundChannel);
- doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound);
+ if (Gear^.State and gsttmpFlag) <> 0 then
+ doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, EXPLAutoSound)
+ else
+ doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound);
DeleteGear(Gear);
exit
end;
@@ -2764,7 +2769,9 @@
begin
AllInactive := false;
- Gear^.dX := Gear^.dX + cWindSpeed;
+ if (Gear^.State and gsttmpFlag) = 0 then
+ Gear^.dX := Gear^.dX + cWindSpeed;
+
oldDx := Gear^.dX;
oldDy := Gear^.dY;
@@ -2790,7 +2797,10 @@
else
begin
//explode right on contact with HH
- doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound);
+ if (Gear^.State and gsttmpFlag) <> 0 then
+ doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, EXPLAutoSound)
+ else
+ doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound);
DeleteGear(Gear);
exit;
end;
@@ -4229,7 +4239,7 @@
Gear^.doStep := @doStepHammerHitWork
end;
-
+////////////////////////////////////////////////////////////////////////////////
procedure doStepResurrectorWork(Gear: PGear);
var
graves: TPGearArray;
@@ -4344,3 +4354,5 @@
end
end;
+////////////////////////////////////////////////////////////////////////////////
+
diff -r 82f1f1d819c0 -r 88714b6f3676 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas Sat Nov 13 03:25:40 2010 +0100
+++ b/hedgewars/uConsts.pas Sat Nov 13 03:26:14 2010 +0100
@@ -89,7 +89,7 @@
gtHellishBomb, gtWaterUp, gtDrill, gtBallGun, gtBall, gtRCPlane, // 40
gtSniperRifleShot, gtJetpack, gtMolotov, gtExplosives, gtBirdy, // 45
gtEgg, gtPortal, gtPiano, gtGasBomb, gtSineGunShot, gtFlamethrower, // 51
- gtSMine, gtPoisonCloud, gtHammer, gtHammerHit, gtResurrector);
+ gtSMine, gtPoisonCloud, gtHammer, gtHammerHit, gtResurrector); // 56
// Gears that are _only_ of visual nature (e.g. background stuff, visual effects, speechbubbles, etc.)
TVisualGearType = (vgtFlake, vgtCloud, vgtExplPart, vgtExplPart2, vgtFire,
diff -r 82f1f1d819c0 -r 88714b6f3676 hedgewars/uGears.pas
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_ar.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ar.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts Sat Nov 13 03:26:14 2010 +0100
@@ -41,6 +41,10 @@
<source>Edit schemes</source>
<translation>Edit schemes</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -635,12 +639,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <source>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground you'll reuse your rope without wasting ammo!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground you'll reuse your rope without wasting ammo!</source>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
@@ -1375,6 +1384,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_bg.ts
--- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Sat Nov 13 03:26:14 2010 +0100
@@ -40,6 +40,10 @@
<source>Illegal ammo scheme</source>
<translation>Невалидна оръжейна схема</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -601,11 +605,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -615,6 +614,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1333,6 +1342,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_cs.ts
--- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Sat Nov 13 03:26:14 2010 +0100
@@ -41,6 +41,10 @@
<source>Edit schemes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -608,11 +612,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -622,6 +621,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1342,6 +1351,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_de.ts
--- a/share/hedgewars/Data/Locale/hedgewars_de.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Sat Nov 13 03:26:14 2010 +0100
@@ -40,6 +40,10 @@
<source>Edit schemes</source>
<translation>Spielprofile bearbeiten</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -653,7 +657,7 @@
<message>
<source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation>Du findest die Hedgewars Konfigurationsdateien in deinem Home-Verzeichnis. Erstelle Backups oder kopiere deine Dateien, aber editiere sie besser nicht selbst.</translation>
+ <translation type="obsolete">Du findest die Hedgewars Konfigurationsdateien in deinem Home-Verzeichnis. Erstelle Backups oder kopiere deine Dateien, aber editiere sie besser nicht selbst.</translation>
</message>
<message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
@@ -665,6 +669,16 @@
<comment>Tips</comment>
<translation>Du willst Seile sparen? Lass das Seil in der Luft los und schieß nochmal. Solange du nicht den Boden berührst kannst du es wiederverwenden ohne Munition zu verschwenden!</translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1400,6 +1414,10 @@
<source>Sudden Death Health Decrease</source>
<translation>Schaden bei Sudden Death</translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_en.ts
--- a/share/hedgewars/Data/Locale/hedgewars_en.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Sat Nov 13 03:26:14 2010 +0100
@@ -40,6 +40,10 @@
<source>Edit schemes</source>
<translation>Edit schemes</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -636,11 +640,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -650,6 +649,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1379,6 +1388,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_es.ts
--- a/share/hedgewars/Data/Locale/hedgewars_es.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Sat Nov 13 03:26:14 2010 +0100
@@ -40,6 +40,10 @@
<source>Edit schemes</source>
<translation>Editar modos de juego</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -651,7 +655,7 @@
<message>
<source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <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>
+ <translation type="obsolete">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'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>
@@ -663,6 +667,16 @@
<comment>Tips</comment>
<translation>¿Necesitas conservar cuerdas? Cuando estés usando una cuerda puedes desengancharla y volver a lanzarla de nuevo. ¡Mientras no toques el suelo seguirás usando la misma cuerda continuamente sin desperdiciar munición adicional!</translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1429,6 +1443,10 @@
<source>Sudden Death Health Decrease</source>
<translation>Decremento de vida en muerte súbita</translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_fi.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Sat Nov 13 03:26:14 2010 +0100
@@ -40,6 +40,10 @@
<source>Edit schemes</source>
<translation>Muokkaa kaavaa</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -647,7 +651,7 @@
<message>
<source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation>Löydät Hedgewars-asetustiedostot "Hedgewars"-hakemistosta kotihakemistossasi. Ota varmuuskopio tai ota ne mukaasi, mutta älä muokkaa niitä käsin.</translation>
+ <translation type="obsolete">Löydät Hedgewars-asetustiedostot "Hedgewars"-hakemistosta kotihakemistossasi. Ota varmuuskopio tai ota ne mukaasi, mutta älä muokkaa niitä käsin.</translation>
</message>
<message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
@@ -659,6 +663,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1416,6 +1430,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_fr.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Sat Nov 13 03:26:14 2010 +0100
@@ -40,6 +40,10 @@
<source>Edit schemes</source>
<translation>Éditer les paramètres</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -628,11 +632,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -647,6 +646,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1375,6 +1384,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_hu.ts
--- a/share/hedgewars/Data/Locale/hedgewars_hu.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts Sat Nov 13 03:26:14 2010 +0100
@@ -39,6 +39,10 @@
<source>Edit schemes</source>
<translation>Sémák szerkesztése</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -629,12 +633,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <source>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground you'll reuse your rope without wasting ammo!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground you'll reuse your rope without wasting ammo!</source>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
@@ -1370,6 +1379,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_it.ts
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Sat Nov 13 03:26:14 2010 +0100
@@ -40,6 +40,10 @@
<source>Edit schemes</source>
<translation>Modifica schemi</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -637,11 +641,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -651,6 +650,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1385,6 +1394,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_ja.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Sat Nov 13 03:26:14 2010 +0100
@@ -39,6 +39,10 @@
<source>Edit schemes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -594,11 +598,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -608,6 +607,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1324,6 +1333,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_pl.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Sat Nov 13 03:26:14 2010 +0100
@@ -41,6 +41,10 @@
<source>Edit weapons</source>
<translation>Edytuj uzbrojenie</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -675,7 +679,7 @@
<message>
<source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation>Swoje zespoły i konfigurację gry znajdzie4sz w folderze ".hedgewars" w twoim katalogu domowym. Twórz regularnie kopie zapasowe ale nie edytuj tych plików własnoręcznie.</translation>
+ <translation type="obsolete">Swoje zespoły i konfigurację gry znajdzie4sz w folderze ".hedgewars" w twoim katalogu domowym. Twórz regularnie kopie zapasowe ale nie edytuj tych plików własnoręcznie.</translation>
</message>
<message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
@@ -687,6 +691,16 @@
<comment>Tips</comment>
<translation>Chcesz zaoszczędzić liny? Odłącz ją będąc w powietrzu, a potem wypuść ją ponownie. Tak długo jak nie dotkniesz ziemi, będziesz używał pojedynczego naboju!</translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1458,6 +1472,10 @@
<source>Sudden Death Health Decrease</source>
<translation>Tracone HP podczas NŚ</translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_pt_BR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sat Nov 13 03:26:14 2010 +0100
@@ -40,6 +40,10 @@
<source>Edit schemes</source>
<translation>Editar esquemas</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -705,7 +709,7 @@
<message>
<source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation>Você pode encontrar os arquivos de configuração em ".hedgewars". Crie cópias ou leve os arquivos com você, mas não edite eles manualmente.</translation>
+ <translation type="obsolete">Você pode encontrar os arquivos de configuração em ".hedgewars". Crie cópias ou leve os arquivos com você, mas não edite eles manualmente.</translation>
</message>
<message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
@@ -717,6 +721,16 @@
<comment>Tips</comment>
<translation type="unfinished">Quer economizar corda? Solte-a quando estiver no meio do ar e então atire de novo. Se você não tocar o solo, você reutilizará a corda e não desperdiçará o seu arsenal!</translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1484,6 +1498,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished">Morte Subita: redução de vida</translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_pt_PT.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sat Nov 13 03:26:14 2010 +0100
@@ -40,6 +40,10 @@
<source>Edit weapons</source>
<translation>Editar armas</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -647,7 +651,7 @@
<message>
<source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation>Podes encontrar os ficheiros de configuração do Hedgewars na pasta "Hedgewars" dentro da tua "Pasta Pessoal". Cria cópias de segurança ou leva os ficheiros contigo, apenas não os edites.</translation>
+ <translation type="obsolete">Podes encontrar os ficheiros de configuração do Hedgewars na pasta "Hedgewars" dentro da tua "Pasta Pessoal". Cria cópias de segurança ou leva os ficheiros contigo, apenas não os edites.</translation>
</message>
<message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
@@ -659,6 +663,16 @@
<comment>Tips</comment>
<translation>Gostavas de poupar algumas cordas? Solta a corda enquanto no ar e dispara-a novamente. Desde que não toques no solo podes reutilizar a usar a mesma corda quantas vezes quiseres!</translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1388,6 +1402,10 @@
<source>Sudden Death Health Decrease</source>
<translation>Vida perdida durante Morte Súbita</translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_ru.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Sat Nov 13 03:26:14 2010 +0100
@@ -41,6 +41,10 @@
<source>Edit schemes</source>
<translation>Редактировать схемы</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -645,11 +649,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -659,6 +658,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1396,6 +1405,10 @@
<source>Sudden Death Health Decrease</source>
<translation>Скорость уменьшения здоровья</translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_sk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Sat Nov 13 03:26:14 2010 +0100
@@ -41,6 +41,10 @@
<source>Edit schemes</source>
<translation>Upraviť schémy</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -89,7 +93,7 @@
</message>
<message>
<source>DefaultTeam</source>
- <translation type="unfinished"></translation>
+ <translation>VýchodzíTím</translation>
</message>
<message>
<source>Hedgewars Demo File</source>
@@ -199,7 +203,7 @@
<name>HWNewNet</name>
<message>
<source>The host was not found. Please check the host name and port settings.</source>
- <translation>Stanica nebola nájdená. Prosím, skontrolujte názov stanice a nastavenia portu.</translation>
+ <translation>Hostiteľ nebol nájdený. Prosím, skontrolujte názov hostiteľa a nastavenia portu.</translation>
</message>
<message>
<source>Connection refused</source>
@@ -376,15 +380,15 @@
<message numerus="yes">
<source>(%1 kill)</source>
<translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <numerusform>(%1 zabitie)</numerusform>
+ <numerusform>(%1 zabití)</numerusform>
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
<translation type="unfinished">
- <numerusform></numerusform>
+ <numerusform><b>%1</b> sa nazdával, že je vhodné strieľať po svojich a získal tak <b>%2</b> bodov.</numerusform>
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
@@ -392,7 +396,7 @@
<message numerus="yes">
<source><b>%1</b> killed <b>%2</b> of his own hedgehogs.</source>
<translation type="unfinished">
- <numerusform></numerusform>
+ <numerusform><b>%1</b> zabil <b>%2</b> svojich druhov.</numerusform>
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
@@ -400,7 +404,7 @@
<message numerus="yes">
<source><b>%1</b> was scared and skipped turn <b>%2</b> times.</source>
<translation type="unfinished">
- <numerusform></numerusform>
+ <numerusform><b>%1</b> sa zľakol a preskočil ťah <b>%2</b>krát.</numerusform>
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
@@ -429,7 +433,7 @@
<message>
<source>If you're unsure what to do and don't want to waste ammo, skip one round. But don't let too much time pass as there will be Sudden Death!</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Ak neviete, čo robiť a nechcete mrhať muníciou, preskočte ťah. Ale nerobte tak príliš často, pretože príde Náhla smrť!</translation>
</message>
<message>
<source>If you'd like to keep others from using your preferred nickname on the official server, register an account at http://www.hedgewars.org/.</source>
@@ -639,12 +643,12 @@
<message>
<source>You can find your Hedgewars configuration files under "My Documents\Hedgewars". Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <translation>Konfiguračné súbory Hedgewars nájdete v "Moje Dokumenty\Hedgewars". Vytvárajte si zálohy alebo prenášajte si tieto súbory medzi počítačmi, ale needitujte ich ručne.</translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Konfiguračné súbory Hedgewars nájdete v ".hedgewars" vo vašom domovskom adresári. Vytvárajte si zálohy alebo prenášajte si tieto súbory medzi počítačmi, ale needitujte ich ručne.</translation>
</message>
<message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
@@ -654,6 +658,11 @@
<message>
<source>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground you'll reuse your rope without wasting ammo!</source>
<comment>Tips</comment>
+ <translation>Chcete ušetriť lano? Kým ste vo vzduchu, uvoľnite ho a opäť vystreľte. Kým sa nedotknete zeme, môžete to isté lano znovu použiť bez toho, aby sa vám míňali jeho zásoby!</translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
</context>
@@ -963,7 +972,7 @@
</message>
<message>
<source>AI respawns on death.</source>
- <translation type="unfinished"></translation>
+ <translation>Počítač po smrti ožije.</translation>
</message>
<message>
<source>All (living) hedgehogs are fully restored at the end of turn</source>
@@ -1374,7 +1383,7 @@
</message>
<message>
<source>Quality</source>
- <translation type="unfinished"></translation>
+ <translation>Kvalita</translation>
</message>
<message>
<source>% Health Crates</source>
@@ -1392,6 +1401,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
@@ -1447,7 +1460,7 @@
</message>
<message>
<source>Can not overwrite default weapon set '%1'!</source>
- <translation type="unfinished"></translation>
+ <translation>Nie je možné prepísať východziu sadu zbraní '%1'!</translation>
</message>
<message>
<source>All file associations have been set.</source>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_sv.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Sat Nov 13 03:26:14 2010 +0100
@@ -40,6 +40,10 @@
<source>Edit schemes</source>
<translation>Redigera spelscheman</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -647,7 +651,7 @@
<message>
<source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation>Du kan hitta dina konfigurationsfiler under "Hedgewars" i din hem-mapp. Gör en säkerhetskopia eller ta med dig filerna, men redigera dem inte för hand.</translation>
+ <translation type="obsolete">Du kan hitta dina konfigurationsfiler under "Hedgewars" i din hem-mapp. Gör en säkerhetskopia eller ta med dig filerna, men redigera dem inte för hand.</translation>
</message>
<message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
@@ -659,6 +663,16 @@
<comment>Tips</comment>
<translation>Vill du spara rep? Släpp repet i luften och sedan sjut igen. Så länge du inte nuddar marken använder du samma rep utan att slösa på ammunition!</translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1422,6 +1436,10 @@
<source>Sudden Death Health Decrease</source>
<translation>Sudden Death livminskning</translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_tr_TR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sat Nov 13 03:26:14 2010 +0100
@@ -39,6 +39,10 @@
<source>Edit schemes</source>
<translation>Düzeni değiştir</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -602,11 +606,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -616,6 +615,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1336,6 +1345,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_uk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Sat Nov 13 03:26:14 2010 +0100
@@ -41,6 +41,10 @@
<source>Edit schemes</source>
<translation>Редагувати схеми</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -642,11 +646,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -656,6 +655,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1392,6 +1401,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_zh_CN.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sat Nov 13 03:26:14 2010 +0100
@@ -39,6 +39,10 @@
<source>Edit weapons</source>
<translation>修改武器</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -648,7 +652,7 @@
<message>
<source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation>你可以在你的主文件夹下下找到“Hedgewars”文件夹，里面又配置文件，你可以新建和备份这个文件，但请不要随便编辑它.</translation>
+ <translation type="obsolete">你可以在你的主文件夹下下找到“Hedgewars”文件夹，里面又配置文件，你可以新建和备份这个文件，但请不要随便编辑它.</translation>
</message>
<message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
@@ -660,6 +664,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1415,6 +1429,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/hedgewars_zh_TW.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sat Nov 13 03:26:14 2010 +0100
@@ -39,6 +39,10 @@
<source>Edit schemes</source>
<translation type="unfinished">修改遊戲設置</translation>
</message>
+ <message>
+ <source>When this option is enabled selecting a game scheme will auto-select a weapon (and viceversa)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWChatWidget</name>
@@ -624,11 +628,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can find your Hedgewars configuration files under "Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -638,6 +637,16 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1364,6 +1373,10 @@
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Bind schemes and weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QLineEdit</name>
diff -r 82f1f1d819c0 -r 88714b6f3676 share/hedgewars/Data/Locale/sk.txt
--- a/share/hedgewars/Data/Locale/sk.txt Sat Nov 13 03:25:40 2010 +0100
+++ b/share/hedgewars/Data/Locale/sk.txt Sat Nov 13 03:26:14 2010 +0100
@@ -315,3 +315,8 @@
05:13=Časovače mín: Míny detonujú okamžite
05:14=Časovače mín: Míny detonujú po 0-3 sekundách
05:15=Modifikátor škody: Všetky zbrane spôsobia škodu %1%
+05:16=Na konci každého ťahu je zdravie všetkých ježkov resetované
+05:17=Počítačoví ježkovia po smrti ožijú
+05:18=Neobmedzené útoky
+05:19=Zbrane sú na konci ťahu resetované
+05:20=Zbrane nie sú zdieľané ježkami