# HG changeset patch
# User unc0rr
# Date 1352834506 -14400
# Node ID b216953c261722bcc0f39d78c6f235b999b0ada0
# Parent fcbaa236a2d5433c032a3ff6b6e3534dc87383bf# Parent 70d386de989f14aa8f6d36f8aea2beff55a4e7dc
merge with default
diff -r fcbaa236a2d5 -r b216953c2617 CMakeLists.txt
--- a/CMakeLists.txt Tue Nov 13 23:16:21 2012 +0400
+++ b/CMakeLists.txt Tue Nov 13 23:21:46 2012 +0400
@@ -12,7 +12,7 @@
#detect Mercurial revision (if present)
-set(version_suffix "") #UNSET THIS VARIABLE AT RELEASE TIME
+set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
set(HGCHANGED "")
IF(version_suffix MATCHES "-dev")
set(HW_DEV true)
@@ -43,8 +43,8 @@
#versioning
set(CPACK_PACKAGE_VERSION_MAJOR 0)
set(CPACK_PACKAGE_VERSION_MINOR 9)
-set(CPACK_PACKAGE_VERSION_PATCH 18${version_suffix})
-set(HEDGEWARS_PROTO_VER 43)
+set(CPACK_PACKAGE_VERSION_PATCH 19${version_suffix})
+set(HEDGEWARS_PROTO_VER 44)
set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
@@ -55,10 +55,9 @@
option(BUILD_ENGINE_LIBRARY "Enable hwengine library [default: off]" OFF)
option(ANDROID "Enable Android build [default: off]" OFF)
-
option(NOAUTOUPDATE "Disable OS X Sparkle update checking" OFF)
option(CROSSAPPLE "Enable OSX when not on OSX [default: off]" OFF)
-
+option(MINIMAL_FLAGS "Respect system flags as much as possible [default: off]" OFF)
#bundle .app setup
if(APPLE OR CROSSAPPLE)
@@ -158,14 +157,21 @@
set (CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Choose the build type, options are: Debug Release." FORCE)
endif (CMAKE_BUILD_TYPE)
-
-#set default flags values for all projects
-set(CMAKE_C_FLAGS "-pipe ${CMAKE_C_FLAGS}")
-set(CMAKE_C_FLAGS_RELEASE "-w -Os -fomit-frame-pointer ${CMAKE_C_FLAGS_RELEASE}")
-set(CMAKE_C_FLAGS_DEBUG "-Wall -O0 -g -DDEBUG ${CMAKE_C_FLAGS_DEBUG}")
-set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
-set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
-set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+#set default flags values for all projects (unless MINIMAL_FLAGS is true)
+if(NOT MINIMAL_FLAGS)
+ set(CMAKE_C_FLAGS "-pipe")
+ set(CMAKE_C_FLAGS_RELEASE "-w -Os -fomit-frame-pointer")
+ set(CMAKE_C_FLAGS_DEBUG "-Wall -O0 -g -DDEBUG")
+ set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
+ set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
+ set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+else()
+ #CMake adds a lot of additional configuration flags, so let's clear them up
+ set(CMAKE_C_FLAGS_RELEASE "")
+ set(CMAKE_C_FLAGS_DEBUG "-Wall -DDEBUG")
+ set(CMAKE_CXX_FLAGS_RELEASE "")
+ set(CMAKE_CXX_FLAGS_DEBUG "-Wall -DDEBUG")
+endif()
#parse additional parameters
if(FPFLAGS OR GHFLAGS)
diff -r fcbaa236a2d5 -r b216953c2617 INSTALL
--- a/INSTALL Tue Nov 13 23:16:21 2012 +0400
+++ b/INSTALL Tue Nov 13 23:21:46 2012 +0400
@@ -13,6 +13,9 @@
- bytestring-show package
- dataenc package
- hslogger package
+For videorecording:
+ - FFmpeg or LibAV
+ - GLUT (when SDL < 2)
1. Configure:
$ cmake .
diff -r fcbaa236a2d5 -r b216953c2617 gameServer/Actions.hs
--- a/gameServer/Actions.hs Tue Nov 13 23:16:21 2012 +0400
+++ b/gameServer/Actions.hs Tue Nov 13 23:21:46 2012 +0400
@@ -276,7 +276,7 @@
newRoom' <- io $ room'sM rnc id ri
chans <- liftM (map sendChan) $! sameProtoClientsS proto
- processAction $ AnswerClients chans ("ROOM" : "UPD" : oldRoomName : roomInfo newRoomName newRoom')
+ processAction $ AnswerClients chans ("ROOM" : "UPD" : oldRoomName : roomInfo (nick newMaster) newRoom')
processAction (AddRoom roomName roomPassword) = do
diff -r fcbaa236a2d5 -r b216953c2617 gameServer/CoreTypes.hs
--- a/gameServer/CoreTypes.hs Tue Nov 13 23:16:21 2012 +0400
+++ b/gameServer/CoreTypes.hs Tue Nov 13 23:21:46 2012 +0400
@@ -100,7 +100,7 @@
readyPlayers :: !Int,
isRestrictedJoins :: Bool,
isRestrictedTeams :: Bool,
- roomBansList :: [B.ByteString],
+ roomBansList :: ![B.ByteString],
mapParams :: Map.Map B.ByteString B.ByteString,
params :: Map.Map B.ByteString [B.ByteString]
}
diff -r fcbaa236a2d5 -r b216953c2617 gameServer/HWProtoInRoomState.hs
--- a/gameServer/HWProtoInRoomState.hs Tue Nov 13 23:16:21 2012 +0400
+++ b/gameServer/HWProtoInRoomState.hs Tue Nov 13 23:21:46 2012 +0400
@@ -8,6 +8,7 @@
import qualified Data.ByteString.Char8 as B
import Control.Monad
import Control.Monad.Reader
+import Control.DeepSeq
--------------------------------------
import CoreTypes
import Actions
@@ -59,6 +60,7 @@
return color
else
liftM (head . (L.\\) (map B.singleton ['0'..]) . map teamcolor . teams) thisRoom
+ let newTeam = clNick `seq` TeamInfo ci clNick tName teamColor grave fort voicepack flag dif (newTeamHHNum rm) (hhsList hhsInfo)
return $
if not . null . drop (maxTeams rm - 1) $ teams rm then
[Warning "too many teams"]
@@ -71,17 +73,16 @@
else if isRestrictedTeams rm then
[Warning "restricted"]
else
- [ModifyRoom (\r -> r{teams = teams r ++ [newTeam ci clNick r teamColor]}),
+ [ModifyRoom (\r -> r{teams = teams r ++ [newTeam]}),
SendUpdateOnThisRoom,
ModifyClient (\c -> c{teamsInGame = teamsInGame c + 1, clientClan = Just teamColor}),
AnswerClients clChan ["TEAM_ACCEPTED", tName],
- AnswerClients othChans $ teamToNet $ newTeam ci clNick rm teamColor,
+ AnswerClients othChans $ teamToNet $ newTeam,
AnswerClients roomChans ["TEAM_COLOR", tName, teamColor]
]
where
canAddNumber r = 48 - (sum . map hhnum $ teams r)
findTeam = find (\t -> tName == teamname t) . teams
- newTeam ci clNick r tColor = TeamInfo ci clNick tName tColor grave fort voicepack flag dif (newTeamHHNum r) (hhsList hhsInfo)
dif = readInt_ difStr
hhsList [] = []
hhsList [_] = error "Hedgehogs list with odd elements number"
@@ -300,11 +301,18 @@
engineMsg cl = toEngineMsg $ B.concat ["b", nick cl, "(team): ", msg, "\x20\x20"]
handleCmd_inRoom ["BAN", banNick] = do
- (_, rnc) <- ask
+ (thisClientId, rnc) <- ask
maybeClientId <- clientByNick banNick
+ master <- liftM isMaster thisClient
let banId = fromJust maybeClientId
- master <- liftM isMaster thisClient
- return [ModifyRoom (\r -> r{roomBansList = (host $ rnc `client` banId) : roomBansList r}) | master && isJust maybeClientId]
+ let sameRoom = clientRoom rnc thisClientId == clientRoom rnc banId
+ if master && isJust maybeClientId && (banId /= thisClientId) && sameRoom then
+ return [
+ ModifyRoom (\r -> r{roomBansList = let h = host $ rnc `client` banId in h `deepseq` h : roomBansList r})
+ , KickRoomClient banId
+ ]
+ else
+ return []
handleCmd_inRoom ["LIST"] = return [] -- for old clients (<= 0.9.17)
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/CMakeLists.txt
--- a/hedgewars/CMakeLists.txt Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/CMakeLists.txt Tue Nov 13 23:21:46 2012 +0400
@@ -197,7 +197,14 @@
#this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6
if(fpc_version LESS "020600")
- add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
+ #under some configurations CMAKE_BUILD_TOOL fails to pass on the jobserver, breaking parallel compilation
+ #TODO: check if this is needed on windows too
+ if(UNIX)
+ set(SAFE_BUILD_TOOL $(MAKE))
+ else()
+ set(SAFE_BUILD_TOOL ${CMAKE_BUILD_TOOL})
+ endif()
+ add_custom_target(ENGINECLEAN COMMAND ${SAFE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
endif()
@@ -205,6 +212,11 @@
set(FFMPEG_FIND_QUIETLY true)
find_package(FFMPEG)
if(${FFMPEG_FOUND})
+ # TODO: this check is only for SDL < 2
+ # fpc will take care of linking but we need to have this library installed
+ find_package(GLUT REQUIRED)
+
+ #TODO: convert avwrapper to .pas unit so we can skip this step
include_directories(${FFMPEG_INCLUDE_DIR})
set(pascal_flags "-dUSE_VIDEO_RECORDING" ${pascal_flags})
IF (WIN32)
@@ -216,9 +228,6 @@
add_library(avwrapper STATIC avwrapper.c)
set(pascal_flags "-k${FFMPEG_LIBAVCODEC}" "-k${FFMPEG_LIBAVFORMAT}" "-k${FFMPEG_LIBAVUTIL}" ${pascal_flags})
ENDIF()
- if(fpc_version LESS "020600")
- add_dependencies(avwrapper ENGINECLEAN)
- endif()
else()
message(STATUS "Could NOT find FFMPEG/LibAV, video recording will be disabled")
endif()
@@ -264,8 +273,15 @@
add_dependencies(${engine_output_name} lua)
endif()
+# compile physfs before engine
add_dependencies(${engine_output_name} physfs)
+#when ffmpeg/libav is found we need to compile it before engine
+#TODO: convert avwrapper to .pas unit so we can skip this step
+if(${FFMPEG_FOUND})
+ add_dependencies(${engine_output_name} avwrapper)
+endif()
+
#this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6
if((fpc_version LESS "020600") AND (NOVIDEOREC OR NOT ${FFMPEG_FOUND}))
add_dependencies(${engine_output_name} ENGINECLEAN)
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/GSHandlers.inc Tue Nov 13 23:21:46 2012 +0400
@@ -722,7 +722,7 @@
end;
Gear^.Pos:= 0;
Gear^.X:= int2hwFloat(LongInt(GetRandom(snowRight - snowLeft)) + snowLeft);
- Gear^.Y:= int2hwFloat(LongInt(LAND_HEIGHT + GetRandom(50)) - 1325);
+ Gear^.Y:= int2hwFloat(LAND_HEIGHT + LongInt(GetRandom(50)) - 1325);
Gear^.State:= Gear^.State or gstInvisible;
end
end;
@@ -3847,7 +3847,7 @@
begin
inc(iterator^.PortalCounter);
iterator^.Active:= true;
- iterator^.State:= iterator^.State and (not gstHHHJump)
+ iterator^.State:= iterator^.State and (not gstHHHJump) or gstMoving;
end;
// is it worth adding an arcsin table? Just how often would we end up doing something like this?
@@ -4051,7 +4051,7 @@
or ((iterator^.Message and gmAllStoppable) = 0)) then
begin
iterator^.Active:= true;
- if iterator^.dY.QWordValue = _0.QWordValue then
+ if iterator^.dY.QWordValue = 0 then
iterator^.dY.isNegative:= false;
iterator^.State:= iterator^.State or gstMoving;
DeleteCI(iterator);
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/hwengine.pas
--- a/hedgewars/hwengine.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/hwengine.pas Tue Nov 13 23:21:46 2012 +0400
@@ -387,7 +387,7 @@
if cLocaleFName <> 'en.txt' then
begin
// Try two letter locale first before trying specific locale overrides
- if (Length(cLocale) > 2) and (Copy(cLocale,1,2) <> 'en') then
+ if (Length(cLocale) > 3) and (Copy(cLocale,1,2) <> 'en') then
begin
LoadLocale(UserPathz[ptLocale] + '/' + Copy(cLocale,1,2)+'.txt');
LoadLocale(Pathz[ptLocale] + '/' + Copy(cLocale,1,2)+'.txt')
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uAI.pas
--- a/hedgewars/uAI.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uAI.pas Tue Nov 13 23:21:46 2012 +0400
@@ -317,7 +317,14 @@
// at final check where we go after jump walking backward
if Push(ticks, Actions, AltMe, Me^.Message xor 3) then
with Stack.States[Pred(Stack.Count)] do
+ begin
+ if Me^.dX.isNegative then
+ AddAction(MadeActions, aia_LookLeft, 0, 200, 0, 0)
+ else
+ AddAction(MadeActions, aia_LookRight, 0, 200, 0, 0);
+
AddAction(MadeActions, aia_LJump, 0, 305 + random(50), 0, 0);
+ end;
// push current position so we proceed from it after checking jump+forward walk opportunities
if CanGo then Push(ticks, Actions, Me^, Me^.Message);
@@ -353,6 +360,7 @@
addMark(hwRound(Me^.X), hwRound(Me^.Y), markWalkedHere);
TestAmmos(Actions, Me, ticks shr 12 = oldticks shr 12);
+
end;
if GoInfo.FallPix >= FallPixForBranching then
@@ -429,7 +437,7 @@
AddAction(BestActions, aia_Skip, 0, 250, 0, 0);
end;
- end else
+ end else SDL_Delay(100)
else
begin
BackMe:= PGear(Me)^;
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uAIAmmoTests.pas
--- a/hedgewars/uAIAmmoTests.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uAIAmmoTests.pas Tue Nov 13 23:21:46 2012 +0400
@@ -121,8 +121,6 @@
(proc: nil; flags: 0) // amKnife
);
-const BadTurn = Low(LongInt) div 4;
-
implementation
uses uAIMisc, uVariables, uUtils, uGearsHandlers;
@@ -149,7 +147,7 @@
repeat
rTime:= rTime + 300 + Level * 50 + random(300);
Vx:= - windSpeed * rTime * 0.5 + (Targ.X + AIrndSign(2) - mX) / rTime;
- Vy:= cGravityf * rTime * 0.5 - (Targ.Y - mY) / rTime;
+ Vy:= cGravityf * rTime * 0.5 - (Targ.Y + 1 - mY) / rTime;
r:= sqr(Vx) + sqr(Vy);
if not (r > 1) then
begin
@@ -173,7 +171,7 @@
value:= RateExplosion(Me, EX, EY, 101, afTrackFall or afErasesLand)
else value:= RateExplosion(Me, EX, EY, 101);
if value = 0 then
- value:= - Metric(Targ.X, Targ.Y, EX, EY) div 64;
+ value:= 1024 - Metric(Targ.X, Targ.Y, EX, EY) div 64;
if valueResult <= value then
begin
ap.Angle:= DxDy2AttackAnglef(Vx, Vy) + AIrndSign(random((Level - 1) * 9));
@@ -229,8 +227,9 @@
EY:= trunc(y);
value:= RateShove(trunc(x), trunc(y), 5, 1, trunc((abs(dX)+abs(dY))*20), -dX, -dY, afTrackFall);
- if value = 0 then
- value:= - Metric(Targ.X, Targ.Y, EX, EY) div 64;
+ // LOL copypasta: this is score for digging with... snowball
+ //if value = 0 then
+ // value:= - Metric(Targ.X, Targ.Y, EX, EY) div 64;
if valueResult <= value then
begin
@@ -337,7 +336,7 @@
else
Score:= BadTurn;
- if valueResult < Score then
+ if (valueResult < Score) and (Score > 0) then
begin
ap.Angle:= DxDy2AttackAnglef(Vx, Vy) + AIrndSign(random(Level));
ap.Power:= trunc(sqrt(r) * cMaxPower) + AIrndSign(random(Level) * 15);
@@ -582,7 +581,7 @@
valueResult:= RateShotgun(Me, vX, vY, rx, ry);
if valueResult = 0 then
- valueResult:= - Metric(Targ.X, Targ.Y, rx, ry) div 64
+ valueResult:= 1024 - Metric(Targ.X, Targ.Y, rx, ry) div 64
else
dec(valueResult, Level * 4000);
// 27/20 is reuse bonus
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uAIMisc.pas
--- a/hedgewars/uAIMisc.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uAIMisc.pas Tue Nov 13 23:21:46 2012 +0400
@@ -28,11 +28,12 @@
afErasesLand = $00000002;
afSetSkip = $00000004;
+ BadTurn = Low(LongInt) div 4;
type TTarget = record
Point: TPoint;
Score: LongInt;
- skip: boolean;
+ skip, matters: boolean;
end;
TTargets = record
Count: Longword;
@@ -110,13 +111,15 @@
begin
for i:= 0 to cMaxHHIndex do
if (Hedgehogs[i].Gear <> nil)
- and (Hedgehogs[i].Gear <> ThinkingHH)
+ and (Hedgehogs[i].Gear <> ThinkingHH)
and (Hedgehogs[i].Gear^.Health > Hedgehogs[i].Gear^.Damage)
then
begin
with Targets.ar[Targets.Count], Hedgehogs[i] do
begin
skip:= false;
+ matters:= (Hedgehogs[i].Gear^.AIHints and aihDoesntMatter) = 0;
+
Point.X:= hwRound(Gear^.X);
Point.Y:= hwRound(Gear^.Y);
if Clan <> CurrentTeam^.Clan then
@@ -407,6 +410,7 @@
function RateExplosion(Me: PGear; x, y, r: LongInt; Flags: LongWord): LongInt;
var i, fallDmg, dmg, dmgBase, rate, erasure: LongInt;
dX, dY, dmgMod: real;
+ hadSkips: boolean;
begin
fallDmg:= 0;
dmgMod:= 0.01 * hwFloat2Float(cDamageModifier) * cDamagePercent;
@@ -416,14 +420,22 @@
begin
Point.x:= hwRound(Me^.X);
Point.y:= hwRound(Me^.Y);
+ skip:= false;
+ matters:= true;
Score:= - ThinkingHH^.Health
end;
// rate explosion
dmgBase:= r + cHHRadius div 2;
+
if (Flags and afErasesLand <> 0) and (GameFlags and gfSolidLand = 0) then erasure:= r
else erasure:= 0;
+
+hadSkips:= false;
+
for i:= 0 to Targets.Count do
with Targets.ar[i] do
+ if not matters then hadSkips:= true
+ else
begin
dmg:= 0;
if abs(Point.x - x) + abs(Point.y - y) < dmgBase then
@@ -456,7 +468,11 @@
else dec(rate, (dmg + fallDmg) * friendlyfactor div 100 * 1024)
end;
end;
-RateExplosion:= rate;
+
+if hadSkips and (rate = 0) then
+ RateExplosion:= BadTurn
+ else
+ RateExplosion:= rate;
end;
function RateShove(x, y, r, power, kick: LongInt; gdX, gdY: real; Flags: LongWord): LongInt;
@@ -472,7 +488,7 @@
with Targets.ar[i] do
if skip then
if (Flags and afSetSkip = 0) then skip:= false else {still skip}
- else
+ else if matters then
begin
dmg:= 0;
if abs(Point.x - x) + abs(Point.y - y) < r then
@@ -506,6 +522,7 @@
function RateShotgun(Me: PGear; gdX, gdY: real; x, y: LongInt): LongInt;
var i, dmg, fallDmg, baseDmg, rate, erasure: LongInt;
dX, dY, dmgMod: real;
+ hadSkips: boolean;
begin
dmgMod:= 0.01 * hwFloat2Float(cDamageModifier) * cDamagePercent;
rate:= 0;
@@ -516,14 +533,22 @@
begin
Point.x:= hwRound(Me^.X);
Point.y:= hwRound(Me^.Y);
+ skip:= false;
+ matters:= true;
Score:= - ThinkingHH^.Health
end;
// rate shot
baseDmg:= cHHRadius + cShotgunRadius + 4;
+
if GameFlags and gfSolidLand = 0 then erasure:= cShotgunRadius
else erasure:= 0;
+
+hadSkips:= false;
+
for i:= 0 to Targets.Count do
with Targets.ar[i] do
+ if not matters then hadSkips:= true
+ else
begin
dmg:= 0;
if abs(Point.x - x) + abs(Point.y - y) < baseDmg then
@@ -557,8 +582,12 @@
else
dec(rate, (dmg+fallDmg) * friendlyfactor div 100)
end;
- end;
-RateShotgun:= rate * 1024;
+ end;
+
+if hadSkips and (rate = 0) then
+ RateShotgun:= BadTurn
+ else
+ RateShotgun:= rate * 1024;
end;
function RateHammer(Me: PGear): LongInt;
@@ -571,6 +600,7 @@
for i:= 0 to Pred(Targets.Count) do
with Targets.ar[i] do
+ if matters then
// hammer hit radius is 8, shift is 10
if abs(Point.x - x) + abs(Point.y - y) < 18 then
begin
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uCommandHandlers.pas
--- a/hedgewars/uCommandHandlers.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uCommandHandlers.pas Tue Nov 13 23:21:46 2012 +0400
@@ -598,9 +598,9 @@
if bShowAmmoMenu then
bShowAmmoMenu:= false
- else if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0)
+ else if not(CurrentTeam^.Extdriven) and (((Gear^.State and (gstAttacking or gstAttacked)) <> 0)
or ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0))
- or ((Gear^.State and gstHHDriven) = 0) then
+ or ((Gear^.State and gstHHDriven) = 0)) then
begin
end
else
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uConsts.pas Tue Nov 13 23:21:46 2012 +0400
@@ -161,21 +161,10 @@
// do not change this value
cDefaultZoomLevel = 2.0;
-{$IFDEF MOBILE}
- cMaxZoomLevel = 0.5;
- cMinZoomLevel = 3.5;
- cZoomDelta = 0.20;
-{$ELSE}
- cMaxZoomLevel = 1.0;
- cMinZoomLevel = 3.0;
- cZoomDelta = 0.25;
-{$ENDIF}
-
- cMinMaxZoomLevelDelta = cMaxZoomLevel - cMinZoomLevel;
-
cSendEmptyPacketTime = 1000;
trigTurns = $80000001;
+ // game flags
gfAny = $FFFFFFFF;
gfOneClanMode = $00000001; // used in trainings
gfMultiWeapon = $00000002; // used in trainings
@@ -208,6 +197,7 @@
// if a "game start notice" would be useful. If so,
// add one in uWorld.pas - look for "AddGoal".
+ // gear states
gstDrowning = $00000001;
gstHHDriven = $00000002;
gstMoving = $00000004;
@@ -229,6 +219,7 @@
gstHHGone = $00100000;
gstInvisible = $00200000;
+ // gear messages
gmLeft = $00000001;
gmRight = $00000002;
gmUp = $00000004;
@@ -251,7 +242,12 @@
cMaxSlotIndex = 9;
cMaxSlotAmmoIndex = 5;
-
+
+ // ai hints
+ aihUsualProcessing = $00000000;
+ aihDoesntMatter = $00000001;
+
+ // ammo properties
ammoprop_Timerable = $00000001;
ammoprop_Power = $00000002;
ammoprop_NeedTarget = $00000004;
@@ -274,6 +270,7 @@
AMMO_INFINITE = 100;
+ // explosion flags
//EXPLAllDamageInRadius = $00000001; Completely unused for ages
EXPLAutoSound = $00000002;
EXPLNoDamage = $00000004;
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uGears.pas
--- a/hedgewars/uGears.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uGears.pas Tue Nov 13 23:21:46 2012 +0400
@@ -472,6 +472,7 @@
AddRandomness(CheckSum);
ScriptCall('onGameTick');
if GameTicks mod 20 = 0 then ScriptCall('onGameTick20');
+
inc(GameTicks)
end;
@@ -656,7 +657,7 @@
if (not hasBorder) and ((Theme = 'Snow') or (Theme = 'Christmas')) then
for i:= vobCount * Longword(max(LAND_WIDTH,4096)) div 2048 downto 1 do
- AddGear(LongInt(GetRandom(snowRight - snowLeft)) + snowLeft, LongInt(LAND_HEIGHT + GetRandom(750)) - 1300, gtFlake, 0, _0, _0, 0);
+ AddGear(LongInt(GetRandom(snowRight - snowLeft)) + snowLeft, LAND_HEIGHT + LongInt(GetRandom(750)) - 1300, gtFlake, 0, _0, _0, 0);
end;
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uGearsHedgehog.pas
--- a/hedgewars/uGearsHedgehog.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uGearsHedgehog.pas Tue Nov 13 23:21:46 2012 +0400
@@ -971,7 +971,7 @@
if (not isZero(Gear^.dY)) and (Gear^.FlightTime > 0) and ((GameFlags and gfLowGravity) = 0) then
begin
inc(Gear^.FlightTime);
- if (Gear^.FlightTime > 1500) and ((hwRound(Gear^.X) < leftX-250) or (hwRound(Gear^.X) > rightX+250)) then
+ if (Gear^.FlightTime > 1500) and ((hwRound(Gear^.X) < LongInt(leftX)-250) or (hwRound(Gear^.X) > LongInt(rightX)+250)) then
begin
Gear^.FlightTime:= 0;
AddCaption(GetEventString(eidHomerun), cWhiteColor, capgrpMessage);
@@ -1060,8 +1060,7 @@
end;
if (CurAmmoGear = nil)
-or ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0)
-or ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) then
+or ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) then
begin
if ((HHGear^.Message and gmSlot) <> 0) then
if ChangeAmmo(HHGear) then ApplyAmmoChanges(Hedgehog^);
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uGearsRender.pas
--- a/hedgewars/uGearsRender.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uGearsRender.pas Tue Nov 13 23:21:46 2012 +0400
@@ -750,6 +750,7 @@
begin
if defaultPos then
begin
+ if HH^.Team^.hasGone then Tint($FF, $FF, $FF, $80);
DrawSpriteRotatedF(sprHHIdle,
sx,
sy,
@@ -791,7 +792,8 @@
32,
32);
Tint($FF, $FF, $FF, $FF)
- end
+ end;
+ if HH^.Team^.hasGone then Tint($FF, $FF, $FF, $FF)
end
else
begin
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uGearsUtils.pas
--- a/hedgewars/uGearsUtils.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uGearsUtils.pas Tue Nov 13 23:21:46 2012 +0400
@@ -286,7 +286,7 @@
procedure CheckHHDamage(Gear: PGear);
var
dmg: Longword;
- i: LongInt;
+ i: LongWord;
particle: PVisualGear;
begin
if _0_4 < Gear^.dY then
@@ -555,8 +555,8 @@
procedure FindPlace(var Gear: PGear; withFall: boolean; Left, Right: LongInt; skipProximity: boolean);
var x: LongInt;
y, sy: LongInt;
- ar: array[0..511] of TPoint;
- ar2: array[0..1023] of TPoint;
+ ar: array[0..1023] of TPoint;
+ ar2: array[0..2047] of TPoint;
cnt, cnt2: Longword;
delta: LongInt;
ignoreNearObjects, ignoreOverlap, tryAgain: boolean;
@@ -566,10 +566,10 @@
tryAgain:= true;
while tryAgain do
begin
- delta:= 250;
+ delta:= LAND_WIDTH div 16;
cnt2:= 0;
repeat
- x:= Left + LongInt(GetRandom(Delta));
+ x:= Left + max(LAND_WIDTH div 2048, LongInt(GetRandom(Delta)));
repeat
inc(x, Delta);
cnt:= 0;
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uIO.pas
--- a/hedgewars/uIO.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uIO.pas Tue Nov 13 23:21:46 2012 +0400
@@ -27,7 +27,7 @@
procedure InitIPC;
procedure SendIPC(s: shortstring);
-procedure SendIPCXY(cmd: char; X, Y: SmallInt);
+procedure SendIPCXY(cmd: char; X, Y: LongInt);
procedure SendIPCRaw(p: pointer; len: Longword);
procedure SendIPCAndWaitReply(s: shortstring);
procedure SendKeepAliveMessage(Lag: Longword);
@@ -48,7 +48,7 @@
case byte of
1: (len: byte;
cmd: Char;
- X, Y: SmallInt);
+ X, Y: LongInt);
2: (str: shortstring);
end;
@@ -234,13 +234,13 @@
end
end;
-procedure SendIPCXY(cmd: char; X, Y: SmallInt);
+procedure SendIPCXY(cmd: char; X, Y: LongInt);
var s: shortstring;
begin
s[0]:= #5;
s[1]:= cmd;
-SDLNet_Write16(X, @s[2]);
-SDLNet_Write16(Y, @s[4]);
+SDLNet_Write32(X, @s[2]);
+SDLNet_Write32(Y, @s[4]);
SendIPC(s)
end;
@@ -270,7 +270,7 @@
procedure NetGetNextCmd;
var tmpflag: boolean;
s: shortstring;
- x16, y16: SmallInt;
+ x32, y32: LongInt;
begin
tmpflag:= true;
@@ -327,9 +327,9 @@
AddFileLog('got cmd "N": time '+IntToStr(hiTicks shl 16 + headcmd^.loTime))
end;
'p': begin
- x16:= SDLNet_Read16(@(headcmd^.X));
- y16:= SDLNet_Read16(@(headcmd^.Y));
- doPut(x16, y16, false)
+ x32:= SDLNet_Read32(@(headcmd^.X));
+ y32:= SDLNet_Read32(@(headcmd^.Y));
+ doPut(x32, y32, false)
end;
'P': begin
// these are equations solved for CursorPoint
@@ -337,8 +337,8 @@
// SDLNet_Read16(@(headcmd^.Y)) == cScreenHeight - CursorPoint.Y - WorldDy;
if not (CurrentTeam^.ExtDriven and bShowAmmoMenu) then
begin
- CursorPoint.X:= SmallInt(SDLNet_Read16(@(headcmd^.X))) + WorldDx;
- CursorPoint.Y:= cScreenHeight - SmallInt(SDLNet_Read16(@(headcmd^.Y))) - WorldDy
+ CursorPoint.X:= LongInt(SDLNet_Read32(@(headcmd^.X))) + WorldDx;
+ CursorPoint.Y:= cScreenHeight - LongInt(SDLNet_Read32(@(headcmd^.Y))) - WorldDy
end
end;
'w': ParseCommand('setweap ' + headcmd^.str[2], true);
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uInputHandler.pas
--- a/hedgewars/uInputHandler.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uInputHandler.pas Tue Nov 13 23:21:46 2012 +0400
@@ -121,7 +121,6 @@
if not(tkbd[code] xor KeyDown) then exit;
tkbd[code]:= KeyDown;
-hideAmmoMenu:= false;
Trusted:= (CurrentTeam <> nil)
and (not CurrentTeam^.ExtDriven)
and (CurrentHedgehog^.BotLevel = 0);
@@ -155,7 +154,7 @@
if CurrentBinds[code][0] <> #0 then
begin
- if (code > 3) and KeyDown and (not ((CurrentBinds[code] = 'put')) or (CurrentBinds[code] = 'ammomenu') or (CurrentBinds[code] = '+cur_u') or (CurrentBinds[code] = '+cur_d') or (CurrentBinds[code] = '+cur_l') or (CurrentBinds[code] = '+cur_r')) then hideAmmoMenu:= true;
+ if (code > 3) and KeyDown and (not ((CurrentBinds[code] = 'put')) or (CurrentBinds[code] = 'ammomenu') or (CurrentBinds[code] = '+cur_u') or (CurrentBinds[code] = '+cur_d') or (CurrentBinds[code] = '+cur_l') or (CurrentBinds[code] = '+cur_r')) and (CurrentTeam <> nil) and (not CurrentTeam^.ExtDriven) then bShowAmmoMenu:= false;
if KeyDown then
begin
@@ -281,8 +280,8 @@
DefaultBinds[KeyNameToCode(_S'y')]:= 'confirm';
DefaultBinds[KeyNameToCode('mousem')]:= 'zoomreset';
-DefaultBinds[KeyNameToCode('wheelup')]:= 'zoomin';
-DefaultBinds[KeyNameToCode('wheeldown')]:= 'zoomout';
+DefaultBinds[KeyNameToCode('wheelup')]:= 'zoomout';
+DefaultBinds[KeyNameToCode('wheeldown')]:= 'zoomin';
DefaultBinds[KeyNameToCode('f12')]:= 'fullscr';
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uLand.pas
--- a/hedgewars/uLand.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uLand.pas Tue Nov 13 23:21:46 2012 +0400
@@ -36,7 +36,7 @@
var digest: shortstring;
procedure ResizeLand(width, height: LongWord);
-var potW, potH: LongWord;
+var potW, potH: LongInt;
begin
potW:= toPowerOf2(width);
potH:= toPowerOf2(height);
@@ -54,6 +54,9 @@
SetLength(Land, LAND_HEIGHT, LAND_WIDTH);
SetLength(LandDirty, (LAND_HEIGHT div 32), (LAND_WIDTH div 32));
+ // 0.5 is already approaching on unplayable
+ if (width div 4096 >= 2) or (height div 2048 >= 2) then cMaxZoomLevel:= 0.5;
+ cMinMaxZoomLevelDelta:= cMaxZoomLevel - cMinZoomLevel
end;
end;
@@ -324,14 +327,6 @@
var tmpsurf: PSDL_Surface;
x,y: Longword;
begin
- WriteLnToConsole('Generating land...');
- case cMapGen of
- 0: GenBlank(EdgeTemplates[SelectTemplate]);
- 1: begin ResizeLand(4096,2048); GenMaze; end;
- 2: GenDrawnMap;
- else
- OutError('Unknown mapgen', true);
- end;
AddProgress();
tmpsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, LAND_WIDTH, LAND_HEIGHT, 32, RMask, GMask, BMask, 0);
@@ -427,11 +422,39 @@
SDL_FreeSurface(tmpsurf);
end;
+procedure LoadMapConfig;
+var f: textfile;
+ s: shortstring;
+begin
+// unC0Rr - should this be passed from the GUI? I am not sure which layer does what
+s:= UserPathz[ptMapCurrent] + '/map.cfg';
+if not FileExists(s) then
+ s:= Pathz[ptMapCurrent] + '/map.cfg';
+WriteLnToConsole('Fetching map HH limit');
+{$I-}
+Assign(f, s);
+filemode:= 0; // readonly
+Reset(f);
+if IOResult <> 0 then
+ begin
+ s:= Pathz[ptMissionMaps] + '/' + ExtractFileName(Pathz[ptMapCurrent]) + '/map.cfg';
+ Assign(f, s);
+ Reset(f);
+ end;
+Readln(f);
+if not eof(f) then
+ Readln(f, MaxHedgehogs);
+{$I+}
+if (MaxHedgehogs = 0) then
+ MaxHedgehogs:= 18;
+end;
+
// Loads Land[] from an image, allowing overriding standard collision
-procedure LoadMask(mapName: shortstring);
+procedure LoadMask;
var tmpsurf: PSDL_Surface;
p: PLongwordArray;
x, y, cpX, cpY: Longword;
+ mapName: shortstring;
begin
tmpsurf:= LoadDataImage(ptMapCurrent, 'mask', ifAlpha or ifTransparent or ifIgnoreCaps);
if tmpsurf = nil then
@@ -441,8 +464,18 @@
end;
-if (tmpsurf <> nil) and (tmpsurf^.w <= LAND_WIDTH) and (tmpsurf^.h <= LAND_HEIGHT) and (tmpsurf^.format^.BytesPerPixel = 4) then
+if (tmpsurf <> nil) and (tmpsurf^.format^.BytesPerPixel = 4) then
begin
+ if LAND_WIDTH = 0 then
+ begin
+ LoadMapConfig;
+ ResizeLand(tmpsurf^.w, tmpsurf^.h);
+ playHeight:= tmpsurf^.h;
+ playWidth:= tmpsurf^.w;
+ leftX:= (LAND_WIDTH - playWidth) div 2;
+ rightX:= (playWidth + ((LAND_WIDTH - playWidth) div 2)) - 1;
+ topY:= LAND_HEIGHT - playHeight;
+ end;
disableLandBack:= true;
cpX:= (LAND_WIDTH - tmpsurf^.w) div 2;
@@ -493,7 +526,6 @@
procedure LoadMap;
var tmpsurf: PSDL_Surface;
s: shortstring;
- f: textfile;
mapName: shortstring = '';
begin
WriteLnToConsole('Loading land from file...');
@@ -508,28 +540,7 @@
TryDo((tmpsurf^.w < $40000000) and (tmpsurf^.h < $40000000) and (tmpsurf^.w * tmpsurf^.h < 6*1024*1024*1024), 'Map dimensions too big!', true);
ResizeLand(tmpsurf^.w, tmpsurf^.h);
-
-// unC0Rr - should this be passed from the GUI? I am not sure which layer does what
-s:= UserPathz[ptMapCurrent] + '/map.cfg';
-if not FileExists(s) then
- s:= Pathz[ptMapCurrent] + '/map.cfg';
-WriteLnToConsole('Fetching map HH limit');
-{$I-}
-Assign(f, s);
-filemode:= 0; // readonly
-Reset(f);
-if IOResult <> 0 then
- begin
- s:= Pathz[ptMissionMaps] + '/' + mapName + '/map.cfg';
- Assign(f, s);
- Reset(f);
- end;
-Readln(f);
-if not eof(f) then
- Readln(f, MaxHedgehogs);
-{$I+}
-if (MaxHedgehogs = 0) then
- MaxHedgehogs:= 18;
+LoadMapConfig;
playHeight:= tmpsurf^.h;
playWidth:= tmpsurf^.w;
@@ -546,7 +557,7 @@
tmpsurf);
SDL_FreeSurface(tmpsurf);
-LoadMask(mapname);
+LoadMask;
end;
procedure DrawBottomBorder; // broken out from other borders for doing a floor-only map, or possibly updating bottom during SD
@@ -570,8 +581,11 @@
procedure GenMap;
var x, y, w, c: Longword;
+ usermap, usermask, map, mask: shortstring;
+ maskOnly: boolean;
begin
hasBorder:= false;
+ maskOnly:= false;
LoadThemeConfig;
@@ -581,9 +595,32 @@
if (GameFlags and gfForts) = 0 then
if Pathz[ptMapCurrent] <> '' then
- LoadMap
+ begin
+ usermap:= UserPathz[ptMapCurrent] + '/map.png';
+ usermask:= UserPathz[ptMapCurrent] + '/mask.png';
+ map:= Pathz[ptMapCurrent] + '/map.png';
+ mask:= Pathz[ptMapCurrent] + '/mask.png';
+ if (not(FileExists(usermap)) and FileExists(usermask)) or
+ (not(FileExists(map)) and FileExists(mask)) then
+ begin
+ maskOnly:= true;
+ LoadMask;
+ GenLandSurface
+ end
+ else LoadMap;
+ end
else
+ begin
+ WriteLnToConsole('Generating land...');
+ case cMapGen of
+ 0: GenBlank(EdgeTemplates[SelectTemplate]);
+ 1: begin ResizeLand(4096,2048); GenMaze; end;
+ 2: GenDrawnMap;
+ else
+ OutError('Unknown mapgen', true);
+ end;
GenLandSurface
+ end
else
MakeFortsMap;
@@ -659,7 +696,7 @@
if (GameFlags and gfDisableGirders) <> 0 then
hasGirders:= false;
-if ((GameFlags and gfForts) = 0) and (Pathz[ptMapCurrent] = '') then
+if (GameFlags and gfForts = 0) and (maskOnly or (Pathz[ptMapCurrent] = '')) then
AddObjects
else
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uLandTemplates.pas
--- a/hedgewars/uLandTemplates.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uLandTemplates.pas Tue Nov 13 23:21:46 2012 +0400
@@ -24,12 +24,10 @@
const NTPX = Low(SmallInt);
-type TRectArray = array[0..64] of TSDL_Rect;
- PRectArray = ^TRectArray;
- TPointArray = array[0..64] of TPoint;
+type TPointArray = array[0..64] of TSDL_Rect;
PPointArray = ^TPointArray;
TEdgeTemplate = record
- BasePoints: PRectArray;
+ BasePoints: PPointArray;
BasePointsCount: Longword;
FillPoints: PPointArray;
FillPointsCount: Longword;
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uScript.pas
--- a/hedgewars/uScript.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uScript.pas Tue Nov 13 23:21:46 2012 +0400
@@ -1727,36 +1727,29 @@
else
begin
gear:= GearByUID(lua_tointeger(L, 1));
- hiddenHedgehogs[hiddenHedgehogsNumber]:=gear^.hedgehog;
- inc(hiddenHedgehogsNumber);
- HideHog(gear^.hedgehog);
+ HideHog(gear^.hedgehog)
end;
lc_hidehog := 0;
end;
function lc_restorehog(L: Plua_State): LongInt; Cdecl;
var hog: PHedgehog;
- i, j: LongInt;
+ i, h: LongInt;
+ uid: LongWord;
begin
if lua_gettop(L) <> 1 then
LuaError('Lua: Wrong number of parameters passed to RestoreHog!')
else
begin
- i := 0;
- while (i < hiddenHedgehogsNumber) do
- begin
- if hiddenHedgehogs[i]^.gearHidden^.uid = LongWord(lua_tointeger(L, 1)) then
- begin
- hog := hiddenHedgehogs[i];
- RestoreHog(hog);
- dec(hiddenHedgehogsNumber);
- for j := i to hiddenHedgehogsNumber - 1 do
- hiddenHedgehogs[j] := hiddenHedgehogs[j + 1];
- lc_restorehog := 0;
- exit;
- end;
- inc(i);
- end;
+ uid:= LongWord(lua_tointeger(L, 1));
+ if TeamsCount > 0 then
+ for i:= 0 to Pred(TeamsCount) do
+ for h:= 0 to cMaxHHIndex do
+ if (TeamsArray[i]^.Hedgehogs[h].GearHidden <> nil) and (TeamsArray[i]^.Hedgehogs[h].GearHidden^.uid = uid) then
+ begin
+ RestoreHog(@TeamsArray[i]^.Hedgehogs[h]);
+ exit(0)
+ end
end;
lc_restorehog := 0;
end;
@@ -1783,6 +1776,22 @@
end;
lc_testrectforobstacle:= 1
end;
+
+
+function lc_setaihintsongear(L : Plua_State) : LongInt; Cdecl;
+var gear: PGear;
+begin
+ if lua_gettop(L) <> 2 then
+ LuaError('Lua: Wrong number of parameters passed to SetAIHintOnGear!')
+ else
+ begin
+ gear:= GearByUID(lua_tointeger(L, 1));
+ if gear <> nil then
+ gear^.aihints:= lua_tointeger(L, 2);
+ end;
+ lc_setaihintsongear:= 0
+end;
+
///////////////////
procedure ScriptPrintStack;
@@ -2287,6 +2296,9 @@
ScriptSetInteger('gstHHGone' ,$00100000);
ScriptSetInteger('gstInvisible' ,$00200000);
+ScriptSetInteger('aihUsualProcessing' ,$00000000);
+ScriptSetInteger('aihDoesntMatter' ,$00000001);
+
// register functions
lua_register(luaState, _P'HideHog', @lc_hidehog);
lua_register(luaState, _P'RestoreHog', @lc_restorehog);
@@ -2380,6 +2392,8 @@
lua_register(luaState, _P'GetCurAmmoType', @lc_getcurammotype);
lua_register(luaState, _P'TestRectForObstacle', @lc_testrectforobstacle);
+lua_register(luaState, _P'SetGearAIHints', @lc_setaihintsongear);
+
ScriptClearStack; // just to be sure stack is empty
ScriptLoaded:= false;
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uSound.pas
--- a/hedgewars/uSound.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uSound.pas Tue Nov 13 23:21:46 2012 +0400
@@ -139,7 +139,7 @@
path:= Pathz[ptVoices] + '/' + locName;
if DirectoryExists(path) then
name:= locName
- else if Length(cLocale) > 2
+ else if Length(cLocale) > 3
then
begin
locName:= name+'_'+Copy(cLocale,1,2);
@@ -270,6 +270,8 @@
s:= UserPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
if not FileExists(s) then
s:= Pathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
+ if (not FileExists(s)) and (snd in [sndFirePunch2, sndFirePunch3, sndFirePunch4, sndFirePunch5, sndFirePunch6]) then
+ s:= Pathz[Soundz[sndFirePunch1].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
WriteToConsole(msgLoading + s + ' ');
voicepack^.chunks[snd]:= Mix_LoadWAV_RW(SDL_RWFromFile(Str2PChar(s), _P'rb'), 1);
if voicepack^.chunks[snd] = nil then
@@ -454,7 +456,7 @@
function ChangeVolume(voldelta: LongInt): LongInt;
begin
ChangeVolume:= 0;
- if (not isSoundEnabled) or ((voldelta = 0) and not (cInitVolume = 0)) then
+ if (not isSoundEnabled) or ((voldelta = 0) and (not (cInitVolume = 0))) then
exit;
inc(Volume, voldelta);
@@ -494,7 +496,7 @@
procedure MuteAudio;
begin
- if (not isSoundEnabled) then
+ if not isSoundEnabled then
exit;
if (isAudioMuted) then
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uTeams.pas
--- a/hedgewars/uTeams.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uTeams.pas Tue Nov 13 23:21:46 2012 +0400
@@ -292,10 +292,15 @@
TagTurnTimeLeft:= 0;
NextClan:= false;
end;
+
if (TurnTimeLeft > 0) and (CurrentHedgehog^.BotLevel = 0) then
begin
if CurrentTeam^.ExtDriven then
- AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
+ begin
+ if GetRandom(2) = 0 then
+ AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
+ else AddVoice(sndJustYouWait, CurrentTeam^.voicepack)
+ end
else
AddVoice(sndYesSir, CurrentTeam^.voicepack);
if cHedgehogTurnTime < 1000000 then
@@ -305,7 +310,11 @@
else
begin
if TurnTimeLeft > 0 then
- AddVoice(sndIllGetYou, CurrentTeam^.voicepack);
+ begin
+ if GetRandom(2) = 0 then
+ AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
+ else AddVoice(sndJustYouWait, CurrentTeam^.voicepack)
+ end;
ReadyTimeLeft:= 0
end;
@@ -438,16 +447,18 @@
begin
with team^ do
begin
- NewTeamHealthBarWidth:= 0;
+ TeamHealth:= 0;
+ for i:= 0 to cMaxHHIndex do
+ if Hedgehogs[i].Gear <> nil then
+ inc(TeamHealth, Hedgehogs[i].Gear^.Health)
+ else if Hedgehogs[i].GearHidden <> nil then
+ inc(TeamHealth, Hedgehogs[i].GearHidden^.Health);
if not hasGone then
- for i:= 0 to cMaxHHIndex do
- if Hedgehogs[i].Gear <> nil then
- inc(NewTeamHealthBarWidth, Hedgehogs[i].Gear^.Health)
- else if Hedgehogs[i].GearHidden <> nil then
- inc(NewTeamHealthBarWidth, Hedgehogs[i].GearHidden^.Health);
+ NewTeamHealthBarWidth:= TeamHealth
+ else
+ NewTeamHealthBarWidth:= 0;
- TeamHealth:= NewTeamHealthBarWidth;
if NewTeamHealthBarWidth > MaxTeamHealth then
begin
MaxTeamHealth:= NewTeamHealthBarWidth;
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uTypes.pas
--- a/hedgewars/uTypes.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uTypes.pas Tue Nov 13 23:21:46 2012 +0400
@@ -123,7 +123,7 @@
sndSplash, sndShotgunReload, sndShotgunFire, sndGraveImpact,
sndMineImpact, sndMineTick, sndMudballImpact,
sndPickhammer, sndGun, sndBee, sndJump1, sndJump2,
- sndJump3, sndYesSir, sndLaugh, sndIllGetYou, sndIncoming,
+ sndJump3, sndYesSir, sndLaugh, sndIllGetYou, sndJustYouWait, sndIncoming,
sndMissed, sndStupid, sndFirstBlood, sndBoring, sndByeBye,
sndSameTeam, sndNutter, sndReinforce, sndTraitor, sndRegret,
sndEnemyDown, sndCoward, sndHurry, sndWatchIt, sndKamikaze,
@@ -258,6 +258,7 @@
nImpactSounds: Word; // count of ImpactSounds
SoundChannel: LongInt;
PortalCounter: LongWord; // Hopefully temporary, but avoids infinite portal loops in a guaranteed fashion.
+ AIHints: LongWord; // hints for ai. haha ^^^^^^ temporary, sure
LastDamage: PHedgehog;
end;
TPGearArray = array of PGear;
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uVariables.pas
--- a/hedgewars/uVariables.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uVariables.pas Tue Nov 13 23:21:46 2012 +0400
@@ -21,7 +21,7 @@
unit uVariables;
interface
-uses SDLh, uTypes, uFloat, GLunit, uConsts, Math, uMobile;
+uses SDLh, uTypes, uFloat, GLunit, uConsts, Math, uMobile, uUtils;
var
/////// init flags ///////
@@ -108,7 +108,7 @@
zoom : GLfloat;
ZoomValue : GLfloat;
- cWaterLine : Word;
+ cWaterLine : LongInt;
cGearScrEdgesDist: LongInt;
isAudioMuted : boolean;
@@ -122,8 +122,8 @@
Pathz: array[TPathType] of shortstring;
UserPathz: array[TPathType] of shortstring;
CountTexz: array[0..Pred(AMMO_INFINITE)] of PTexture;
- LAND_WIDTH : Word;
- LAND_HEIGHT : Word;
+ LAND_WIDTH : LongInt;
+ LAND_HEIGHT : LongInt;
LAND_WIDTH_MASK : LongWord;
LAND_HEIGHT_MASK : LongWord;
@@ -164,6 +164,10 @@
AmmoMenuInvalidated: boolean;
AmmoRect : TSDL_Rect;
HHTexture : PTexture;
+ cMaxZoomLevel : real;
+ cMinZoomLevel : real;
+ cZoomDelta : real;
+ cMinMaxZoomLevelDelta : real;
flagMakeCapture : boolean;
@@ -192,8 +196,6 @@
hiTicks: Word;
LuaGoals : shortstring;
- hiddenHedgehogs : array [0..cMaxHHs] of PHedgehog;
- hiddenHedgehogsNumber : longint;
LuaTemplateNumber : LongWord;
@@ -716,6 +718,7 @@
(FileName: 'Yessir.ogg'; Path: ptVoices),// sndYesSir
(FileName: 'Laugh.ogg'; Path: ptVoices),// sndLaugh
(FileName: 'Illgetyou.ogg'; Path: ptVoices),// sndIllGetYou
+ (FileName: 'JustYouWait.ogg'; Path: ptVoices),// sndJustYouWait
(FileName: 'Incoming.ogg'; Path: ptVoices),// sndIncoming
(FileName: 'Missed.ogg'; Path: ptVoices),// sndMissed
(FileName: 'Stupid.ogg'; Path: ptVoices),// sndStupid
@@ -2509,8 +2512,6 @@
vobSDFrameTicks, vobSDFramesCount, vobSDCount: Longword;
vobSDVelocity, vobSDFallSpeed: LongInt;
- hideAmmoMenu: boolean;
-
ControllerNumControllers: Integer;
ControllerEnabled: Integer;
ControllerNumAxes: array[0..5] of Integer;
@@ -2555,6 +2556,7 @@
UserPathPrefix := '';
ipcPort := 0;
+ recordFileName := '';
UserNick := '';
cStereoMode := smNone;
GrayScale := false;
@@ -2573,19 +2575,16 @@
end;
procedure initModule;
+var s: ShortString;
begin
-
- if (Length(cLocaleFName) > 6) then
- cLocale := Copy(cLocaleFName,1,5)
- else
- cLocale := Copy(cLocaleFName,1,2);
+ cLocale:= cLocaleFName;
+ SplitByChar(cLocale, s, '.');
cFlattenFlakes := false;
cFlattenClouds := false;
cOnlyStats := False;
lastVisualGearByUID := nil;
lastGearByUID := nil;
- recordFileName := '';
cReadyDelay := 5000;
Pathz := cPathz;
@@ -2634,6 +2633,18 @@
cDamageModifier := _1;
TargetPoint := cTargetPointRef;
+{$IFDEF MOBILE}
+ cMaxZoomLevel:= 0.5;
+ cMinZoomLevel:= 3.5;
+ cZoomDelta:= 0.20;
+{$ELSE}
+ cMaxZoomLevel:= 1.0;
+ cMinZoomLevel:= 3.0;
+ cZoomDelta:= 0.25;
+{$ENDIF}
+
+ cMinMaxZoomLevelDelta:= cMaxZoomLevel - cMinZoomLevel;
+
// int, longint longword and byte
CursorMovementX := 0;
CursorMovementY := 0;
@@ -2730,7 +2741,6 @@
cMapName:= '';
LuaTemplateNumber:= 0;
- hiddenHedgehogsNumber:=0;
end;
procedure freeModule;
diff -r fcbaa236a2d5 -r b216953c2617 hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas Tue Nov 13 23:16:21 2012 +0400
+++ b/hedgewars/uWorld.pas Tue Nov 13 23:21:46 2012 +0400
@@ -511,9 +511,7 @@
Ammo: PHHAmmo;
c,i,g,t,STurns: LongInt;
begin
-if (TurnTimeLeft = 0) or (not CurrentTeam^.ExtDriven and (((CurAmmoGear = nil)
-or ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) = 0)) and hideAmmoMenu)) then
- bShowAmmoMenu:= false;
+if TurnTimeLeft = 0 then bShowAmmoMenu:= false;
// give the assigned ammo to hedgehog
Ammo:= nil;
@@ -552,16 +550,19 @@
AmmoRect.x:= (cScreenWidth shr 1) - AmmoRect.w - AMSlotSize;
AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize);
{$ENDIF}
- AMShiftTargetX:= (cScreenWidth shr 1) - AmmoRect.x;
- AMShiftTargetY:= cScreenHeight - AmmoRect.y;
+ if AMState <> AMShowing then
+ begin
+ AMShiftTargetX:= (cScreenWidth shr 1) - AmmoRect.x;
+ AMShiftTargetY:= cScreenHeight - AmmoRect.y;
- if (AMAnimType and AMTypeMaskX) <> 0 then AMShiftTargetX:= (cScreenWidth shr 1) - AmmoRect.x
- else AMShiftTargetX:= 0;
- if (AMAnimType and AMTypeMaskY) <> 0 then AMShiftTargetY:= cScreenHeight - AmmoRect.y
- else AMShiftTargetY:= 0;
+ if (AMAnimType and AMTypeMaskX) <> 0 then AMShiftTargetX:= (cScreenWidth shr 1) - AmmoRect.x
+ else AMShiftTargetX:= 0;
+ if (AMAnimType and AMTypeMaskY) <> 0 then AMShiftTargetY:= cScreenHeight - AmmoRect.y
+ else AMShiftTargetY:= 0;
- AMShiftX:= AMShiftTargetX;
- AMShiftY:= AMShiftTargetY;
+ AMShiftX:= AMShiftTargetX;
+ AMShiftY:= AMShiftTargetY
+ end
end;
AMAnimState:= (RealTicks - AMAnimStartTime) / AMAnimDuration;
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Pirate/Firepunch2.ogg
Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch2.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Pirate/Firepunch3.ogg
Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch3.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Pirate/Firepunch4.ogg
Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch4.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Pirate/Firepunch5.ogg
Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch5.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Pirate/Firepunch6.ogg
Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch6.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Robot/Firepunch2.ogg
Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch2.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Robot/Firepunch3.ogg
Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch3.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Robot/Firepunch4.ogg
Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch4.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Robot/Firepunch5.ogg
Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch5.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Robot/Firepunch6.ogg
Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch6.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Singer/Firepunch2.ogg
Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch2.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Singer/Firepunch3.ogg
Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch3.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Singer/Firepunch4.ogg
Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch4.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Singer/Firepunch5.ogg
Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch5.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Singer/Firepunch6.ogg
Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch6.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Surfer/Firepunch2.ogg
Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch2.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Surfer/Firepunch3.ogg
Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch3.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Surfer/Firepunch4.ogg
Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch4.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Surfer/Firepunch5.ogg
Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch5.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/AudioMono/Sounds/voices/Surfer/Firepunch6.ogg
Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch6.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Nov 13 23:16:21 2012 +0400
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Nov 13 23:21:46 2012 +0400
@@ -1206,6 +1206,7 @@
1D60588D0D05DD3D006BFB54 /* Resources */,
1D60588E0D05DD3D006BFB54 /* Sources */,
1D60588F0D05DD3D006BFB54 /* Frameworks */,
+ 6137A859164732120043D108 /* Update Revision Information */,
);
buildRules = (
9283015B0F10E46D00CC5A3C /* PBXBuildRule */,
@@ -1474,6 +1475,20 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
+ 6137A859164732120043D108 /* Update Revision Information */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Update Revision Information";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "HEDGEWARS_REVISION=`/usr/local/bin/hg identify -n ${SOURCE_DIR}|sed -e 's/\\+//'`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $HEDGEWARS_REVISION\" \"${TARGET_BUILD_DIR}\"/\"${INFOPLIST_PATH}\"";
+ };
6179928A114AE0C800BA94A9 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
diff -r fcbaa236a2d5 -r b216953c2617 project_files/HedgewarsMobile/Info.plist
--- a/project_files/HedgewarsMobile/Info.plist Tue Nov 13 23:16:21 2012 +0400
+++ b/project_files/HedgewarsMobile/Info.plist Tue Nov 13 23:21:46 2012 +0400
@@ -28,6 +28,8 @@
CFBundleSignature
????
CFBundleVersion
+ ${HEDGEWARS_REVISION}
+ CFBundleShortVersionString
1.3.2
LSRequiresIPhoneOS
diff -r fcbaa236a2d5 -r b216953c2617 project_files/hedgewars.pro
--- a/project_files/hedgewars.pro Tue Nov 13 23:16:21 2012 +0400
+++ b/project_files/hedgewars.pro Tue Nov 13 23:21:46 2012 +0400
@@ -1,264 +1,270 @@
-TEMPLATE = app
-TARGET = hedgewars
-DEPENDPATH += ../QTfrontend/
-INCLUDEPATH += ../QTfrontend/
-INCLUDEPATH += ../QTfrontend/model
-INCLUDEPATH += ../QTfrontend/ui
-INCLUDEPATH += ../QTfrontend/ui/widget
-INCLUDEPATH += ../QTfrontend/ui/page
-INCLUDEPATH += ../QTfrontend/ui/dialog
-INCLUDEPATH += ../QTfrontend/net
-INCLUDEPATH += ../QTfrontend/util
-INCLUDEPATH += ../misc/quazip/
-INCLUDEPATH += ../misc/physfs/src/
-
-DESTDIR = ../bin
-
-QT += network
-QT += webkit
-
-HEADERS += ../QTfrontend/model/ThemeModel.h \
- ../QTfrontend/model/MapModel.h \
- ../QTfrontend/model/ammoSchemeModel.h \
- ../QTfrontend/model/netserverslist.h \
- ../QTfrontend/ui/page/pagedrawmap.h \
- ../QTfrontend/ui/page/pagedata.h \
- ../QTfrontend/ui/page/pagetraining.h \
- ../QTfrontend/ui/page/pageselectweapon.h \
- ../QTfrontend/ui/page/pagesingleplayer.h \
- ../QTfrontend/ui/page/pagenettype.h \
- ../QTfrontend/ui/page/pageingame.h \
- ../QTfrontend/ui/page/pageadmin.h \
- ../QTfrontend/ui/page/pagescheme.h \
- ../QTfrontend/ui/page/pagemultiplayer.h \
- ../QTfrontend/ui/page/pageplayrecord.h \
- ../QTfrontend/ui/page/pagemain.h \
- ../QTfrontend/ui/page/pageoptions.h \
- ../QTfrontend/ui/page/pagenetgame.h \
- ../QTfrontend/ui/page/pageeditteam.h \
- ../QTfrontend/ui/page/pageconnecting.h \
- ../QTfrontend/ui/page/pageroomslist.h \
- ../QTfrontend/ui/page/pagenet.h \
- ../QTfrontend/ui/page/pagecampaign.h \
- ../QTfrontend/ui/page/pageinfo.h \
- ../QTfrontend/ui/page/pagenetserver.h \
- ../QTfrontend/ui/page/pagegamestats.h \
- ../QTfrontend/ui/dialog/input_ip.h \
- ../QTfrontend/ui/qaspectratiolayout.h \
- ../QTfrontend/ui/widget/bgwidget.h \
- ../QTfrontend/ui/widget/fpsedit.h \
- ../QTfrontend/ui/widget/FreqSpinBox.h \
- ../QTfrontend/ui/widget/igbox.h \
- ../QTfrontend/ui/widget/chatwidget.h \
- ../QTfrontend/ui/widget/togglebutton.h \
- ../QTfrontend/ui/widget/SquareLabel.h \
- ../QTfrontend/ui/widget/itemNum.h \
- ../QTfrontend/ui/widget/frameTeam.h \
- ../QTfrontend/ui/widget/teamselect.h \
- ../QTfrontend/ui/widget/vertScrollArea.h \
- ../QTfrontend/ui/widget/about.h \
- ../QTfrontend/ui/widget/teamselhelper.h \
- ../QTfrontend/ui/widget/drawmapwidget.h \
- ../QTfrontend/ui/widget/databrowser.h \
- ../QTfrontend/ui/widget/hedgehogerWidget.h \
- ../QTfrontend/ui/widget/selectWeapon.h \
- ../QTfrontend/ui/widget/weaponItem.h \
- ../QTfrontend/ui/widget/gamecfgwidget.h \
- ../QTfrontend/ui/widget/mapContainer.h \
- ../QTfrontend/ui/widget/HistoryLineEdit.h \
- ../QTfrontend/ui/widget/SmartLineEdit.h \
- ../QTfrontend/util/DataManager.h \
- ../QTfrontend/net/netregister.h \
- ../QTfrontend/net/netserver.h \
- ../QTfrontend/net/netudpwidget.h \
- ../QTfrontend/net/tcpBase.h \
- ../QTfrontend/net/proto.h \
- ../QTfrontend/net/newnetclient.h \
- ../QTfrontend/net/netudpserver.h \
- ../QTfrontend/net/hwmap.h \
- ../QTfrontend/util/namegen.h \
- ../QTfrontend/ui/page/AbstractPage.h \
- ../QTfrontend/drawmapscene.h \
- ../QTfrontend/game.h \
- ../QTfrontend/gameuiconfig.h \
- ../QTfrontend/HWApplication.h \
- ../QTfrontend/hwform.h \
- ../QTfrontend/util/SDLInteraction.h \
- ../QTfrontend/team.h \
- ../QTfrontend/achievements.h \
- ../QTfrontend/binds.h \
- ../QTfrontend/ui_hwform.h \
- ../QTfrontend/KB.h \
- ../QTfrontend/hwconsts.h \
- ../QTfrontend/sdlkeys.h \
- ../QTfrontend/ui/mouseoverfilter.h \
- ../QTfrontend/ui/qpushbuttonwithsound.h \
- ../QTfrontend/ui/widget/qpushbuttonwithsound.h \
- ../QTfrontend/ui/page/pagefeedback.h \
- ../QTfrontend/model/roomslistmodel.h \
- ../QTfrontend/ui/dialog/input_password.h \
- ../QTfrontend/ui/widget/colorwidget.h \
- ../QTfrontend/model/HatModel.h \
- ../QTfrontend/model/GameStyleModel.h \
- ../QTfrontend/ui/page/pagevideos.h \
- ../QTfrontend/net/recorder.h \
- ../QTfrontend/ui/dialog/ask_quit.h \
- ../QTfrontend/ui/dialog/upload_video.h \
- ../QTfrontend/campaign.h \
- ../QTfrontend/model/playerslistmodel.h \
- ../QTfrontend/util/LibavInteraction.h \
- ../QTfrontend/util/FileEngine.h
-
-SOURCES += ../QTfrontend/model/ammoSchemeModel.cpp \
- ../QTfrontend/model/MapModel.cpp \
- ../QTfrontend/model/ThemeModel.cpp \
- ../QTfrontend/model/netserverslist.cpp \
- ../QTfrontend/ui/qaspectratiolayout.cpp \
- ../QTfrontend/ui/page/pagemain.cpp \
- ../QTfrontend/ui/page/pagetraining.cpp \
- ../QTfrontend/ui/page/pageroomslist.cpp \
- ../QTfrontend/ui/page/pagemultiplayer.cpp \
- ../QTfrontend/ui/page/pagegamestats.cpp \
- ../QTfrontend/ui/page/pagenettype.cpp \
- ../QTfrontend/ui/page/pageeditteam.cpp \
- ../QTfrontend/ui/page/pagenetgame.cpp \
- ../QTfrontend/ui/page/pagedata.cpp \
- ../QTfrontend/ui/page/pagedrawmap.cpp \
- ../QTfrontend/ui/page/pageplayrecord.cpp \
- ../QTfrontend/ui/page/pageselectweapon.cpp \
- ../QTfrontend/ui/page/pageingame.cpp \
- ../QTfrontend/ui/page/pagenetserver.cpp \
- ../QTfrontend/ui/page/pagecampaign.cpp \
- ../QTfrontend/ui/page/pageadmin.cpp \
- ../QTfrontend/ui/page/pageinfo.cpp \
- ../QTfrontend/ui/page/pageconnecting.cpp \
- ../QTfrontend/ui/page/pagesingleplayer.cpp \
- ../QTfrontend/ui/page/pagenet.cpp \
- ../QTfrontend/ui/page/pagescheme.cpp \
- ../QTfrontend/ui/page/pageoptions.cpp \
- ../QTfrontend/ui/dialog/input_ip.cpp \
- ../QTfrontend/ui/widget/igbox.cpp \
- ../QTfrontend/ui/widget/selectWeapon.cpp \
- ../QTfrontend/ui/widget/FreqSpinBox.cpp \
- ../QTfrontend/ui/widget/SquareLabel.cpp \
- ../QTfrontend/ui/widget/frameTeam.cpp \
- ../QTfrontend/ui/widget/fpsedit.cpp \
- ../QTfrontend/ui/widget/databrowser.cpp \
- ../QTfrontend/ui/widget/teamselect.cpp \
- ../QTfrontend/ui/widget/gamecfgwidget.cpp \
- ../QTfrontend/ui/widget/chatwidget.cpp \
- ../QTfrontend/ui/widget/itemNum.cpp \
- ../QTfrontend/ui/widget/bgwidget.cpp \
- ../QTfrontend/ui/widget/about.cpp \
- ../QTfrontend/ui/widget/togglebutton.cpp \
- ../QTfrontend/ui/widget/vertScrollArea.cpp \
- ../QTfrontend/ui/widget/hedgehogerWidget.cpp \
- ../QTfrontend/ui/widget/teamselhelper.cpp \
- ../QTfrontend/ui/widget/drawmapwidget.cpp \
- ../QTfrontend/ui/widget/weaponItem.cpp \
- ../QTfrontend/ui/widget/mapContainer.cpp \
- ../QTfrontend/ui/widget/HistoryLineEdit.cpp \
- ../QTfrontend/ui/widget/SmartLineEdit.cpp \
- ../QTfrontend/util/DataManager.cpp \
- ../QTfrontend/net/tcpBase.cpp \
- ../QTfrontend/net/netregister.cpp \
- ../QTfrontend/net/proto.cpp \
- ../QTfrontend/net/hwmap.cpp \
- ../QTfrontend/net/netudpserver.cpp \
- ../QTfrontend/net/newnetclient.cpp \
- ../QTfrontend/net/netudpwidget.cpp \
- ../QTfrontend/net/netserver.cpp \
- ../QTfrontend/util/namegen.cpp \
- ../QTfrontend/ui/page/AbstractPage.cpp \
- ../QTfrontend/achievements.cpp \
- ../QTfrontend/binds.cpp \
- ../QTfrontend/drawmapscene.cpp \
- ../QTfrontend/game.cpp \
- ../QTfrontend/gameuiconfig.cpp \
- ../QTfrontend/HWApplication.cpp \
- ../QTfrontend/hwform.cpp \
- ../QTfrontend/main.cpp \
- ../QTfrontend/util/SDLInteraction.cpp \
- ../QTfrontend/team.cpp \
- ../QTfrontend/ui_hwform.cpp \
- ../QTfrontend/hwconsts.cpp \
- ../QTfrontend/ui/mouseoverfilter.cpp \
- ../QTfrontend/ui/widget/qpushbuttonwithsound.cpp \
- ../QTfrontend/ui/page/pagefeedback.cpp \
- ../QTfrontend/model/roomslistmodel.cpp \
- ../QTfrontend/ui/dialog/input_password.cpp \
- ../QTfrontend/ui/widget/colorwidget.cpp \
- ../QTfrontend/model/HatModel.cpp \
- ../QTfrontend/model/GameStyleModel.cpp \
- ../QTfrontend/ui/page/pagevideos.cpp \
- ../QTfrontend/net/recorder.cpp \
- ../QTfrontend/ui/dialog/ask_quit.cpp \
- ../QTfrontend/ui/dialog/upload_video.cpp \
- ../QTfrontend/campaign.cpp \
- ../QTfrontend/model/playerslistmodel.cpp \
- ../QTfrontend/util/LibavInteraction.cpp \
- ../QTfrontend/util/FileEngine.cpp
-
-
-TRANSLATIONS += ../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_ko.ts \
- ../share/hedgewars/Data/Locale/hedgewars_lt.ts \
- ../share/hedgewars/Data/Locale/hedgewars_nl.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
-
-RESOURCES += ../QTfrontend/hedgewars.qrc
-
-LIBS += -L../bin -lquazip -lphysfs
-
-macx {
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
- QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.6.sdk
-
- OBJECTIVE_SOURCES += ../QTfrontend/*.m ../QTfrontend/*.mm
- SOURCES += ../QTfrontend/AutoUpdater.cpp ../QTfrontend/InstallController.cpp \
- ../../build/QTfrontend/hwconsts.cpp
- HEADERS += ../QTfrontend/M3InstallController.h ../QTfrontend/M3Panel.h \
- ../QTfrontend/NSWorkspace_RBAdditions.h ../QTfrontend/AutoUpdater.h \
- ../QTfrontend/CocoaInitializer.h ../QTfrontend/InstallController.h \
- ../QTfrontend/SparkleAutoUpdater.h
-
- LIBS += -lobjc -framework AppKit -framework IOKit -framework Foundation -framework SDL -framework SDL_Mixer -framework Sparkle -DSPARKLE_ENABLED
- INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers /Library/Frameworks/SDL_Mixer.framework/Headers
- CONFIG += warn_on x86
- #CONFIG += x86 ppc x86_64 ppc64
-}
-
-win32 {
- RC_FILE = ../QTfrontend/hedgewars.rc
- SOURCES += ../QTfrontend/xfire.cpp
- INCLUDEPATH += ../misc/winutils/include
- LIBS += -L../misc/winutils/lib
-}
-
-!macx {
- LIBS += -lSDL -lSDL_mixer
- !win32 {
- INCLUDEPATH += /usr/local/include/SDL /usr/include/SDL
- }
-}
-
-FORMS +=
+TEMPLATE = app
+TARGET = hedgewars
+DEPENDPATH += ../QTfrontend/
+INCLUDEPATH += ../QTfrontend/
+INCLUDEPATH += ../QTfrontend/model
+INCLUDEPATH += ../QTfrontend/ui
+INCLUDEPATH += ../QTfrontend/ui/widget
+INCLUDEPATH += ../QTfrontend/ui/page
+INCLUDEPATH += ../QTfrontend/ui/dialog
+INCLUDEPATH += ../QTfrontend/net
+INCLUDEPATH += ../QTfrontend/util
+INCLUDEPATH += ../misc/quazip/
+INCLUDEPATH += ../misc/physfs/src/
+
+DESTDIR = ../bin
+
+QT += network
+QT += webkit
+
+HEADERS += ../QTfrontend/model/ThemeModel.h \
+ ../QTfrontend/model/MapModel.h \
+ ../QTfrontend/model/ammoSchemeModel.h \
+ ../QTfrontend/model/netserverslist.h \
+ ../QTfrontend/ui/page/pagedrawmap.h \
+ ../QTfrontend/ui/page/pagedata.h \
+ ../QTfrontend/ui/page/pagetraining.h \
+ ../QTfrontend/ui/page/pageselectweapon.h \
+ ../QTfrontend/ui/page/pagesingleplayer.h \
+ ../QTfrontend/ui/page/pagenettype.h \
+ ../QTfrontend/ui/page/pageingame.h \
+ ../QTfrontend/ui/page/pageadmin.h \
+ ../QTfrontend/ui/page/pagescheme.h \
+ ../QTfrontend/ui/page/pagemultiplayer.h \
+ ../QTfrontend/ui/page/pageplayrecord.h \
+ ../QTfrontend/ui/page/pagemain.h \
+ ../QTfrontend/ui/page/pageoptions.h \
+ ../QTfrontend/ui/page/pagenetgame.h \
+ ../QTfrontend/ui/page/pageeditteam.h \
+ ../QTfrontend/ui/page/pageconnecting.h \
+ ../QTfrontend/ui/page/pageroomslist.h \
+ ../QTfrontend/ui/page/pagenet.h \
+ ../QTfrontend/ui/page/pagecampaign.h \
+ ../QTfrontend/ui/page/pageinfo.h \
+ ../QTfrontend/ui/page/pagenetserver.h \
+ ../QTfrontend/ui/page/pagegamestats.h \
+ ../QTfrontend/ui/dialog/input_ip.h \
+ ../QTfrontend/ui/qaspectratiolayout.h \
+ ../QTfrontend/ui/widget/bgwidget.h \
+ ../QTfrontend/ui/widget/fpsedit.h \
+ ../QTfrontend/ui/widget/FreqSpinBox.h \
+ ../QTfrontend/ui/widget/igbox.h \
+ ../QTfrontend/ui/widget/chatwidget.h \
+ ../QTfrontend/ui/widget/togglebutton.h \
+ ../QTfrontend/ui/widget/SquareLabel.h \
+ ../QTfrontend/ui/widget/itemNum.h \
+ ../QTfrontend/ui/widget/frameTeam.h \
+ ../QTfrontend/ui/widget/teamselect.h \
+ ../QTfrontend/ui/widget/vertScrollArea.h \
+ ../QTfrontend/ui/widget/about.h \
+ ../QTfrontend/ui/widget/teamselhelper.h \
+ ../QTfrontend/ui/widget/drawmapwidget.h \
+ ../QTfrontend/ui/widget/databrowser.h \
+ ../QTfrontend/ui/widget/hedgehogerWidget.h \
+ ../QTfrontend/ui/widget/selectWeapon.h \
+ ../QTfrontend/ui/widget/weaponItem.h \
+ ../QTfrontend/ui/widget/gamecfgwidget.h \
+ ../QTfrontend/ui/widget/mapContainer.h \
+ ../QTfrontend/ui/widget/HistoryLineEdit.h \
+ ../QTfrontend/ui/widget/SmartLineEdit.h \
+ ../QTfrontend/util/DataManager.h \
+ ../QTfrontend/net/netregister.h \
+ ../QTfrontend/net/netserver.h \
+ ../QTfrontend/net/netudpwidget.h \
+ ../QTfrontend/net/tcpBase.h \
+ ../QTfrontend/net/proto.h \
+ ../QTfrontend/net/newnetclient.h \
+ ../QTfrontend/net/netudpserver.h \
+ ../QTfrontend/net/hwmap.h \
+ ../QTfrontend/util/namegen.h \
+ ../QTfrontend/ui/page/AbstractPage.h \
+ ../QTfrontend/drawmapscene.h \
+ ../QTfrontend/game.h \
+ ../QTfrontend/gameuiconfig.h \
+ ../QTfrontend/HWApplication.h \
+ ../QTfrontend/hwform.h \
+ ../QTfrontend/util/SDLInteraction.h \
+ ../QTfrontend/team.h \
+ ../QTfrontend/achievements.h \
+ ../QTfrontend/binds.h \
+ ../QTfrontend/ui_hwform.h \
+ ../QTfrontend/KB.h \
+ ../QTfrontend/hwconsts.h \
+ ../QTfrontend/sdlkeys.h \
+ ../QTfrontend/ui/mouseoverfilter.h \
+ ../QTfrontend/ui/qpushbuttonwithsound.h \
+ ../QTfrontend/ui/widget/qpushbuttonwithsound.h \
+ ../QTfrontend/ui/page/pagefeedback.h \
+ ../QTfrontend/model/roomslistmodel.h \
+ ../QTfrontend/ui/dialog/input_password.h \
+ ../QTfrontend/ui/widget/colorwidget.h \
+ ../QTfrontend/model/HatModel.h \
+ ../QTfrontend/model/GameStyleModel.h \
+ ../QTfrontend/ui/page/pagevideos.h \
+ ../QTfrontend/net/recorder.h \
+ ../QTfrontend/ui/dialog/ask_quit.h \
+ ../QTfrontend/ui/dialog/upload_video.h \
+ ../QTfrontend/campaign.h \
+ ../QTfrontend/model/playerslistmodel.h \
+ ../QTfrontend/util/LibavInteraction.h \
+ ../QTfrontend/util/FileEngine.h
+
+
+SOURCES += ../QTfrontend/model/ammoSchemeModel.cpp \
+ ../QTfrontend/model/MapModel.cpp \
+ ../QTfrontend/model/ThemeModel.cpp \
+ ../QTfrontend/model/netserverslist.cpp \
+ ../QTfrontend/ui/qaspectratiolayout.cpp \
+ ../QTfrontend/ui/page/pagemain.cpp \
+ ../QTfrontend/ui/page/pagetraining.cpp \
+ ../QTfrontend/ui/page/pageroomslist.cpp \
+ ../QTfrontend/ui/page/pagemultiplayer.cpp \
+ ../QTfrontend/ui/page/pagegamestats.cpp \
+ ../QTfrontend/ui/page/pagenettype.cpp \
+ ../QTfrontend/ui/page/pageeditteam.cpp \
+ ../QTfrontend/ui/page/pagenetgame.cpp \
+ ../QTfrontend/ui/page/pagedata.cpp \
+ ../QTfrontend/ui/page/pagedrawmap.cpp \
+ ../QTfrontend/ui/page/pageplayrecord.cpp \
+ ../QTfrontend/ui/page/pageselectweapon.cpp \
+ ../QTfrontend/ui/page/pageingame.cpp \
+ ../QTfrontend/ui/page/pagenetserver.cpp \
+ ../QTfrontend/ui/page/pagecampaign.cpp \
+ ../QTfrontend/ui/page/pageadmin.cpp \
+ ../QTfrontend/ui/page/pageinfo.cpp \
+ ../QTfrontend/ui/page/pageconnecting.cpp \
+ ../QTfrontend/ui/page/pagesingleplayer.cpp \
+ ../QTfrontend/ui/page/pagenet.cpp \
+ ../QTfrontend/ui/page/pagescheme.cpp \
+ ../QTfrontend/ui/page/pageoptions.cpp \
+ ../QTfrontend/ui/dialog/input_ip.cpp \
+ ../QTfrontend/ui/widget/igbox.cpp \
+ ../QTfrontend/ui/widget/selectWeapon.cpp \
+ ../QTfrontend/ui/widget/FreqSpinBox.cpp \
+ ../QTfrontend/ui/widget/SquareLabel.cpp \
+ ../QTfrontend/ui/widget/frameTeam.cpp \
+ ../QTfrontend/ui/widget/fpsedit.cpp \
+ ../QTfrontend/ui/widget/databrowser.cpp \
+ ../QTfrontend/ui/widget/teamselect.cpp \
+ ../QTfrontend/ui/widget/gamecfgwidget.cpp \
+ ../QTfrontend/ui/widget/chatwidget.cpp \
+ ../QTfrontend/ui/widget/itemNum.cpp \
+ ../QTfrontend/ui/widget/bgwidget.cpp \
+ ../QTfrontend/ui/widget/about.cpp \
+ ../QTfrontend/ui/widget/togglebutton.cpp \
+ ../QTfrontend/ui/widget/vertScrollArea.cpp \
+ ../QTfrontend/ui/widget/hedgehogerWidget.cpp \
+ ../QTfrontend/ui/widget/teamselhelper.cpp \
+ ../QTfrontend/ui/widget/drawmapwidget.cpp \
+ ../QTfrontend/ui/widget/weaponItem.cpp \
+ ../QTfrontend/ui/widget/mapContainer.cpp \
+ ../QTfrontend/ui/widget/HistoryLineEdit.cpp \
+ ../QTfrontend/ui/widget/SmartLineEdit.cpp \
+ ../QTfrontend/util/DataManager.cpp \
+ ../QTfrontend/net/tcpBase.cpp \
+ ../QTfrontend/net/netregister.cpp \
+ ../QTfrontend/net/proto.cpp \
+ ../QTfrontend/net/hwmap.cpp \
+ ../QTfrontend/net/netudpserver.cpp \
+ ../QTfrontend/net/newnetclient.cpp \
+ ../QTfrontend/net/netudpwidget.cpp \
+ ../QTfrontend/net/netserver.cpp \
+ ../QTfrontend/util/namegen.cpp \
+ ../QTfrontend/ui/page/AbstractPage.cpp \
+ ../QTfrontend/achievements.cpp \
+ ../QTfrontend/binds.cpp \
+ ../QTfrontend/drawmapscene.cpp \
+ ../QTfrontend/game.cpp \
+ ../QTfrontend/gameuiconfig.cpp \
+ ../QTfrontend/HWApplication.cpp \
+ ../QTfrontend/hwform.cpp \
+ ../QTfrontend/main.cpp \
+ ../QTfrontend/util/SDLInteraction.cpp \
+ ../QTfrontend/team.cpp \
+ ../QTfrontend/ui_hwform.cpp \
+ ../QTfrontend/hwconsts.cpp \
+ ../QTfrontend/ui/mouseoverfilter.cpp \
+ ../QTfrontend/ui/widget/qpushbuttonwithsound.cpp \
+ ../QTfrontend/ui/page/pagefeedback.cpp \
+ ../QTfrontend/model/roomslistmodel.cpp \
+ ../QTfrontend/ui/dialog/input_password.cpp \
+ ../QTfrontend/ui/widget/colorwidget.cpp \
+ ../QTfrontend/model/HatModel.cpp \
+ ../QTfrontend/model/GameStyleModel.cpp \
+ ../QTfrontend/ui/page/pagevideos.cpp \
+ ../QTfrontend/net/recorder.cpp \
+ ../QTfrontend/ui/dialog/ask_quit.cpp \
+ ../QTfrontend/ui/dialog/upload_video.cpp \
+ ../QTfrontend/campaign.cpp \
+ ../QTfrontend/model/playerslistmodel.cpp \
+ ../QTfrontend/util/LibavInteraction.cpp \
+ ../QTfrontend/util/FileEngine.cpp
+
+
+TRANSLATIONS += ../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_da.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_de.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_el.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_gl.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_ko.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_lt.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_ms.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_nl.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_ro.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
+
+RESOURCES += ../QTfrontend/hedgewars.qrc
+
+LIBS += -L../bin -lquazip -lphysfs
+
+macx {
+ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+ QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.6.sdk
+
+ OBJECTIVE_SOURCES += ../QTfrontend/*.m ../QTfrontend/*.mm
+ SOURCES += ../QTfrontend/AutoUpdater.cpp ../QTfrontend/InstallController.cpp \
+ ../../build/QTfrontend/hwconsts.cpp
+ HEADERS += ../QTfrontend/M3InstallController.h ../QTfrontend/M3Panel.h \
+ ../QTfrontend/NSWorkspace_RBAdditions.h ../QTfrontend/AutoUpdater.h \
+ ../QTfrontend/CocoaInitializer.h ../QTfrontend/InstallController.h \
+ ../QTfrontend/SparkleAutoUpdater.h
+
+ LIBS += -lobjc -framework AppKit -framework IOKit -framework Foundation -framework SDL -framework SDL_Mixer -framework Sparkle -DSPARKLE_ENABLED
+ INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers /Library/Frameworks/SDL_Mixer.framework/Headers
+ CONFIG += warn_on x86
+ #CONFIG += x86 ppc x86_64 ppc64
+}
+
+win32 {
+ RC_FILE = ../QTfrontend/hedgewars.rc
+ SOURCES += ../QTfrontend/xfire.cpp
+ INCLUDEPATH += ../misc/winutils/include
+ LIBS += -L../misc/winutils/lib
+}
+
+!macx {
+ LIBS += -lSDL -lSDL_mixer
+ !win32 {
+ INCLUDEPATH += /usr/local/include/SDL /usr/include/SDL
+ }
+}
+
+FORMS +=
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/cs.lua
--- a/share/hedgewars/Data/Locale/cs.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/cs.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Nejrychlejší kolo: ",
["Feeble Resistance"] = "Slabý odpor",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/da.lua
--- a/share/hedgewars/Data/Locale/da.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/da.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Hurtigste omgang: ",
["Feeble Resistance"] = "Sølle Modstand",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/de.lua
--- a/share/hedgewars/Data/Locale/de.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/de.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Schnellste Runde: ",
["Feeble Resistance"] = "Kraftloser Widerstand",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/el.txt
--- a/share/hedgewars/Data/Locale/el.txt Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/el.txt Tue Nov 13 23:21:46 2012 +0400
@@ -1,4 +1,4 @@
-; Greek locale
+; Greek locale
00:00=Χειροβομβίδα
00:01=Χειροβομβίδα Διασποράς
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/es.lua
--- a/share/hedgewars/Data/Locale/es.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/es.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Vuelta rápida: ",
["Feeble Resistance"] = "Resistencia Fútil",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/fr.lua
--- a/share/hedgewars/Data/Locale/fr.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/fr.lua Tue Nov 13 23:21:46 2012 +0400
@@ -208,7 +208,7 @@
["Everything looks OK..."] = "Tout à l'air d'être OK ...",
["Exactly, man! That was my dream."] = "Exactement, mec ! C'était mon rêve.",
["Eye Chewer"] = "Eye Chewer",
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
["Get your teammates out of their natural prison and save the princess!|Hint: Drilling holes should solve everything.|Hint: It might be a good idea to place a girder before starting to drill. Just saying.|Hint: All your hedgehogs need to be above the marked height!|Hint: Leaks A Lot needs to get really close to the princess!"] = "Fais sortir tes coéquipiers de leur prison naturelle et sauve la princesse ! |Percer des trous résoudrait tout. |ca serait une bonne idée de placer quelque poutres avant de commencer à percer. je dis ça, je dis rien. |Tous vos hérissons doivent être au dessus de la hauteur marquée ! | Leaks A Lot doit être très proche de la princesse ! ",
["Family Reunion"] = "Réunion de famille ",
["Fastest lap: "] = "Meilleur tour : ",
@@ -253,7 +253,6 @@
["Get that crate!"] = "Prends cette caisse",
["Get the crate on the other side of the island!|"] = "Prends la caisse de l'autre côté de l'île !",
-- ["Get to the target using your rope! |Controls: Left & Right to swing the rope - Up & Down to Contract and Expand!"] = "", -- Basic_Training_-_Rope
- ["Get your teammates out of their natural prison and save the princess!|Hint: Drilling holes should solve everything.|Hint: It might be a good idea to place a girder before starting to drill. Just saying.| Hint: All your hedgehogs need to be above the marked height!|Hint: Leaks A Lot needs to get really close to the princess!"]
-- ["Get your teammates out of their natural prison and save the princess!|Hint: Drilling holes should solve everything.|Hint: It might be a good idea to place a girder before starting to drill. Just saying.|Hint: All your hedgehogs need to be above the marked height!|Hint: Leaks A Lot needs to get really close to the princess!"] = "", -- A_Classic_Fairytale:family
-- ["GG!"] = "", -- User_Mission_-_Rope_Knock_Challenge
-- ["Gimme Bones"] = "",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_ar.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ar.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts Tue Nov 13 23:21:46 2012 +0400
@@ -342,7 +342,7 @@
- LibavIteraction
+ LibavInteraction
@@ -829,14 +829,6 @@
تحكم
-
-
-
-
-
-
-
-
PageNetType
@@ -2147,6 +2139,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_bg.ts
--- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Tue Nov 13 23:21:46 2012 +0400
@@ -344,7 +344,7 @@
- LibavIteraction
+ LibavInteraction
@@ -831,14 +831,6 @@
Контрол
-
-
-
-
-
-
-
-
PageNetType
@@ -2150,6 +2142,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_cs.ts
--- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Tue Nov 13 23:21:46 2012 +0400
@@ -345,7 +345,7 @@
- LibavIteraction
+ LibavInteraction
@@ -838,14 +838,6 @@
Ovládání
-
-
-
-
-
-
-
-
PageNetType
@@ -2160,6 +2152,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_da.ts
--- a/share/hedgewars/Data/Locale/hedgewars_da.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_da.ts Tue Nov 13 23:21:46 2012 +0400
@@ -2,6 +2,13 @@
+ AbstractPage
+
+
+
+
+
+
AmmoSchemeModel
@@ -16,15 +23,15 @@
DrawMapWidget
- Fejl i fil
+ Fejl i fil
- Kan ikke åbne filen '%1' til skrivning
+ Kan ikke åbne filen '%1' til skrivning
- Kan ikke læse filen '%1'
+ Kan ikke læse filen '%1'
@@ -49,11 +56,11 @@
- Fejl
+ Fejl
- Ugyldig ammunitionssystem
+ Ugyldig ammunitionssystem
@@ -69,22 +76,29 @@
+ HWAskQuitDialog
+
+
+
+
+
+
HWChatWidget
- %1 *** %2 er blevet fjernet fra din ignoreringsliste
+ %1 *** %2 er blevet fjernet fra din ignoreringsliste
- %1 *** %2 er blevet tilføjet til din ignoreringsliste
+ %1 *** %2 er blevet tilføjet til din ignoreringsliste
- %1 *** %2 er blevet fjernet fra din venneliste
+ %1 *** %2 er blevet fjernet fra din venneliste
- %1 *** %2 er blevet tilføjet til din venneliste
+ %1 *** %2 er blevet tilføjet til din venneliste
@@ -132,26 +146,26 @@
- Smider %1 ud...
+ Smider %1 ud...
HWForm
- ny
+ ny
- Fejl
+ Fejl
- OK
+ OK
- Ude af stand til at starte serveren
+ Ude af stand til at starte serveren
@@ -159,7 +173,7 @@
- Vælg venligst en optagelse fra den ovenstående liste
+ Vælg venligst en optagelse fra den ovenstående liste
@@ -189,7 +203,7 @@
- Kodeord
+ Kodeord
- En eller anden bruger allerede
+ En eller anden bruger allerede
dit brugernavn %1
på serveren.
Vælg venligst et andet brugernavn:
@@ -223,6 +237,11 @@
Intet brugernavn indtastet.
+
+
+
+
HWGame
@@ -349,7 +368,7 @@
- Kodeord
+ Kodeord
- Brugernavn
+ Brugernavn
En bruger forlod
+
+
+
+
+
+
+
+
+
+
+ HWPasswordDialog
+
+
+ Kodeord
+
+
+
+ HWUploadVideoDialog
+
+
+
+
+
+
+
+
KB
@@ -404,14 +449,34 @@
+ LibavInteraction
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PageAdmin
- Serverbesked:
+ Serverbesked:
- Indstil besked
+ Indstil besked
@@ -450,7 +515,7 @@
- Annuler
+ Annuler
@@ -487,6 +552,10 @@
Alle filer
+
+
+
+
PageEditTeam
@@ -503,7 +572,7 @@
PageGameStats
- <p>Prisen for det bedste skud gik til <b>%1</b> med <b>%2</b> point.</p>
+ <p>Prisen for det bedste skud gik til <b>%1</b> med <b>%2</b> point.</p>
@@ -586,14 +655,21 @@
+ PageInfo
+
+
+
+
+
+
PageMain
- Lokalt spil (Spil et spil på én enkelt computer)
+ Lokalt spil (Spil et spil på én enkelt computer)
- Netværksspil (Spil et spil over et netværk)
+ Netværksspil (Spil et spil over et netværk)
@@ -844,6 +920,46 @@
Indhold der kan Downloades
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PageMultiplayer
@@ -856,11 +972,11 @@
PageNet
- Fejl
+ Fejl
- Vælg venligst en server fra den ovenstående liste
+ Vælg venligst en server fra den ovenstående liste
@@ -871,15 +987,15 @@
- Fejl
+ Fejl
- Indtast venligst navnet på rummet
+ Indtast venligst navnet på rummet
- OK
+ OK
@@ -892,6 +1008,14 @@
Officiel server
+
+
+
+
+
+
+
+
PageOptions
@@ -909,15 +1033,15 @@
- Nyt våbensystem
+ Nyt våbensystem
- Rediger våbensystem
+ Rediger våbensystem
- Slet våbensystem
+ Slet våbensystem
@@ -947,16 +1071,60 @@
Slet våbensæt
+
+
+ Generelt
+
+
+
+ Advanceret
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PagePlayDemo
- Fejl
+ Fejl
- OK
+ OK
@@ -968,15 +1136,15 @@
- Kan ikke omdøbe til
+ Kan ikke omdøbe til
- Kan ikke slette fil
+ Kan ikke slette fil
- Vælg venligst en optagelse fra listen
+ Vælg venligst en optagelse fra listen
@@ -991,15 +1159,15 @@
- Opdater
+ Opdater
- Fejl
+ Fejl
- OK
+ OK
@@ -1012,60 +1180,60 @@
- Dette spil er i lobbyen.
+ Dette spil er i lobbyen.
Du kan tilslutte dig og spille med når spillet starter.
- Dette spil er i gang.
+ Dette spil er i gang.
Du kan tilslutte dig og kigge med med det samme, men du må vente på at spillet slutter med selv at kunne spille med.
- %1 er værten. Han kan ændre indstillingerne og starte spillet.
+ %1 er værten. Han kan ændre indstillingerne og starte spillet.
- Tilfældig Bane
+ Tilfældig Bane
- Man kan spille enten på allerede lavede eller tilfældigt genererede baner.
+ Man kan spille enten på allerede lavede eller tilfældigt genererede baner.
- Spilsystemet definerer generelle indstillinger og præferencer, så som rundelængden, Pludselig Død og Vampyr.
+ Spilsystemet definerer generelle indstillinger og præferencer, så som rundelængden, Pludselig Død og Vampyr.
- Våbensystemet definere hvilke våben der er tilgængelige og hvor meget ammunition de har.
+ Våbensystemet definere hvilke våben der er tilgængelige og hvor meget ammunition de har.
-
+
Der er %1 klient forbundet til dette rum.
Der er %1 klienter forbundet til dette rum.
-
+
Der deltager %1 hold i dette rum.
Der deltager %1 hold i dette rum.
- Indtast venligst rummets navn
+ Indtast venligst rummets navn
- Vælg venligst et rum fra listen
+ Vælg venligst et rum fra listen
- Tilfældig Labyrint
+ Tilfældig Labyrint
@@ -1085,12 +1253,12 @@
- Advarsel
+ Advarsel
- Det spil du forsøge at tilslutte dig er allerede startet.
+ Det spil du forsøge at tilslutte dig er allerede startet.
Har du stadig lyst til at tilslutte dig rummet?
@@ -1117,7 +1285,7 @@
- Tilføj en kant rundt om banen som ikke kan destrueres
+ Tilføj en kant rundt om banen som ikke kan destrueres
@@ -1133,7 +1301,7 @@
- Aktiver tilfældige miner
+ Aktiver tilfældige miner
@@ -1255,27 +1423,71 @@
PageSinglePlayer
- Simpelt spil (et hurtigt spil mod computeren, hvor indstillingerne er valgt på forhånd)
+ Simpelt spil (et hurtigt spil mod computeren, hvor indstillingerne er valgt på forhånd)
- Multiplayer (spil mod flere venner eller AI hold ved samme computer)
+ Multiplayer (spil mod flere venner eller AI hold ved samme computer)
- Træningsspil (Rafiner dine evner i en række forskellige træningsmissioner)
+ Træningsspil (Rafiner dine evner i en række forskellige træningsmissioner)
- Demoer (Afspil optagede demoer)
+ Demoer (Afspil optagede demoer)
- Indlæs (Indlæs et tidligere gemt spil)
+ Indlæs (Indlæs et tidligere gemt spil)
- Kampagnespil (...)
+ Kampagnespil (...)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Indlæs
+
+
+
+
@@ -1288,6 +1500,52 @@
Vælg en mission!
+
+
+
+
+
+
+
+
+
+
+ PageVideos
+
+
+ Navn
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QAction
@@ -1376,7 +1634,7 @@
- Reduceret kvalitet
+ Reduceret kvalitet
@@ -1394,6 +1652,26 @@
Effekter (frontend)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QComboBox
@@ -1439,7 +1717,7 @@
- Standard
+ Standard
@@ -1530,7 +1808,7 @@
- Våben
+ Våben
@@ -1564,6 +1842,30 @@
Spilsystemer og Våben
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QLabel
@@ -1581,7 +1883,7 @@
- Dette program distribueres under GNU General Public License
+ Dette program distribueres under GNU General Public License
@@ -1617,7 +1919,7 @@
- Brugernavn
+ Brugernavn
@@ -1697,7 +1999,7 @@
- Genstart spil for at anvende
+ Genstart spil for at anvende
@@ -1749,7 +2051,7 @@
- Kodeord
+ Kodeord
@@ -1759,6 +2061,68 @@
Dette program distribueres under GNU General Public License v2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Brugernavn
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QLineEdit
@@ -1770,6 +2134,10 @@
pindsvin %1
+
+
+
+
QMainWindow
@@ -1782,7 +2150,7 @@
QMessageBox
- Netværk
+ Netværk
@@ -1796,33 +2164,33 @@
- Det mislykkedes at åbne data mappen:
+ Det mislykkedes at åbne data mappen:
%1
Tjek venligst om spillet er installeret korrekt
- Våben
+ Våben
- Kan ikke ændre standardvåbensæt
+ Kan ikke ændre standardvåbensæt
- Kan ikke slette standardvåbensæt
+ Kan ikke slette standardvåbensæt
- Vil du virkelig slette dette våbensæt?
+ Vil du virkelig slette dette våbensæt?
- Kan ikke overskrive standardvåbensættet '%1'!
+ Kan ikke overskrive standardvåbensættet '%1'!
- Alle filtilknytninger er blevet indstillede.
+ Alle filtilknytninger er blevet indstillede.
@@ -1830,42 +2198,252 @@
- Hold
+ Hold
- Vil du virkelig slette dette hold?
+ Vil du virkelig slette dette hold?
- Spilsystemer
+ Spilsystemer
- Kan ikke slette standardspilsystemet '%1'!
+ Kan ikke slette standardspilsystemet '%1'!
- Vil du virkelig slette dette spilsystem?
+ Vil du virkelig slette dette spilsystem?
- Kan ikke slette standardvåbensættet '%1'!
+ Kan ikke slette standardvåbensættet '%1'!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Kan ikke oprette mappe %1
+
+
+
+
+
+
+
+
+
+
+
+ Ude af stand til at starte serveren: %1.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Vælg venligst en optagelse fra listen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Vælg venligst et rum fra listen
+
+
+
+
+
+
+
+ Det spil du forsøge at tilslutte dig er allerede startet.
+Har du stadig lyst til at tilslutte dig rummet?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fejl i fil
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QObject
- Fejl
+ Fejl
- Kan ikke oprette mappe %1
+ Kan ikke oprette mappe %1
- OK
+ OK
@@ -1950,36 +2528,127 @@
mere
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QTableWidget
- Navn på Rum
+ Navn på Rum
- C
+ C
- T
+ T
- Ejer
+ Ejer
- Bane
+ Bane
- Regler
+ Regler
- Våben
+ Våben
+
+
+
+ RoomsListModel
+
+
+ I gang
+
+
+
+ Navn på Rum
+
+
+
+ C
+
+
+
+ T
+
+
+
+ Ejer
+
+
+
+ Bane
+
+
+
+ Regler
+
+
+
+ Våben
+
+
+
+ Tilfældig Bane
+
+
+
+ Tilfældig Labyrint
+
+
+
+
@@ -2013,15 +2682,15 @@
TCPBase
- Fejl
+ Fejl
- Ude af stand til at starte serveren: %1.
+ Ude af stand til at starte serveren: %1.
- Ude af stand til at starte spilmotoren: %1 (
+ Ude af stand til at starte spilmotoren: %1 (
@@ -2068,7 +2737,7 @@
- Tilføj Miner
+ Tilføj Miner
@@ -2295,6 +2964,14 @@
åbning 10
+
+
+
+
+
+
+
+
binds (categories)
@@ -2381,6 +3058,10 @@
Slå mærkater over pindsvin fra og til:
+
+
+
+
binds (keys)
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_de.ts
--- a/share/hedgewars/Data/Locale/hedgewars_de.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Tue Nov 13 23:21:46 2012 +0400
@@ -346,23 +346,43 @@
+ LibavInteraction
+
+
+ Dauer: %1m %2s
+
+
+
+ Video: %1x%2,
+
+
+
+ %1 fps,
+
+
+
+ Audio:
+
+
+
LibavIteraction
- Dauer: %1m %2s
+ Dauer: %1m %2s
- Video: %1x%2,
+ Video: %1x%2,
- %1 fps,
+ %1 fps,
- Audio:
+ Audio:
@@ -835,11 +855,11 @@
- DLC
+ DLC
- Herunterladbare Inhalte
+ Herunterladbare Inhalte
@@ -2159,6 +2179,26 @@
Hochladen abbrechen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_el.ts
--- a/share/hedgewars/Data/Locale/hedgewars_el.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_el.ts Tue Nov 13 23:21:46 2012 +0400
@@ -2,11 +2,22 @@
+ AbstractPage
+
+
+
+
+
+
AmmoSchemeModel
Νέο
+
+
+
+
FreqSpinBox
@@ -30,11 +41,11 @@
- Σφάλμα
+ Σφάλμα
- Ασύμβατος σχεδιασμός όπλων
+ Ασύμβατος σχεδιασμός όπλων
@@ -42,45 +53,104 @@
- Όταν αυτή η επιλογη είναι ενεργοποιημένη, επιλέγοντας ένα σχεδιασμό παιχνιδιού θα επιλέγεται αυτομάτως ένα όπλο (και αντιστρόφως)
+ Όταν αυτή η επιλογη είναι ενεργοποιημένη, επιλέγοντας ένα σχεδιασμό παιχνιδιού θα επιλέγεται αυτομάτως ένα όπλο (και αντιστρόφως)
+
+
+
+
+
+
+
+
+
+
+
+ HWAskQuitDialog
+
+
+
HWChatWidget
- %1 *** %2 αφαιρέθηκε από τη "μαύρη" λίστα
+ %1 *** %2 αφαιρέθηκε από τη "μαύρη" λίστα
- %1 *** %2 προστέθηκε στη "μαύρη" λίστα
+ %1 *** %2 προστέθηκε στη "μαύρη" λίστα
- %1 *** %2 αφαιρέθηκε από τη λίστα φίλων
+ %1 *** %2 αφαιρέθηκε από τη λίστα φίλων
- %1 *** %2 προστέθηκε στη λίστα φίλων
+ %1 *** %2 προστέθηκε στη λίστα φίλων
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
HWForm
- Νέο
+ Νέο
- Σφάλμα
+ Σφάλμα
- Εντάξει
+ Εντάξει
- Δεν είναι δυνατόν να ξεκινήσει ο εξυπηρετητής
+ Δεν είναι δυνατόν να ξεκινήσει ο εξυπηρετητής
@@ -88,7 +158,7 @@
- Παρακαλώ επέλεξε εγγραφή από την παραπάνω λίστα
+ Παρακαλώ επέλεξε εγγραφή από την παραπάνω λίστα
@@ -106,17 +176,61 @@
Τύπος Αρχείων
Αρχείο Αποθήκευσης Hedgewars
+
+
+
+
+
+
+ Το ψευδώνυμο %1 είναι ήδη
+καταχωρημένο στο Hedgewars.org
+Παρακαλώ εισάγετε τον κωδικό σας
+ή επιλέξτε άλλο ψευδώνυμο από τις
+ρυθμίσεις του παιχνιδιού:
+
+
+
+
+
+
+
+ Ψευδώνυμο
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
HWGame
- el.txt
+ el.txt
Δεν μπορεί να φορτωθεί το αρχείο επιδείξεων %1
+
+
+
+
HWMapContainer
@@ -184,6 +298,14 @@
Μεγάλα επιπλέοντα νησιά
+
+
+
+
+
+
+
+
HWNetServersModel
@@ -224,7 +346,7 @@
- Κωδικός
+ Κωδικός
- Το ψευδώνυμο %1 είναι ήδη
+ Το ψευδώνυμο %1 είναι ήδη
καταχωρημένο στο Hedgewars.org
Παρακαλώ εισάγετε τον κωδικό σας
ή επιλέξτε άλλο ψευδώνυμο από τις
ρυθμίσεις του παιχνιδιού:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HWPasswordDialog
+
+
+ Κωδικός
+
+
+
+ HWUploadVideoDialog
+
+
+
+
+
+
+
+
KB
@@ -272,6 +424,26 @@
+ LibavInteraction
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PageAdmin
@@ -318,6 +490,45 @@
+ PageDrawMap
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Φόρτωση
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PageEditTeam
@@ -408,14 +619,28 @@
+ PageInGame
+
+
+
+
+
+
+ PageInfo
+
+
+
+
+
+
PageMain
- Τοπικό Παιχνίδι (Παίξιμο παιχνιδιού σε ένα υπολογιστή)
+ Τοπικό Παιχνίδι (Παίξιμο παιχνιδιού σε ένα υπολογιστή)
- Δικτυακό Παιχνίδι (Παίξιμο παιχνιδιού σε δίκτυο)
+ Δικτυακό Παιχνίδι (Παίξιμο παιχνιδιού σε δίκτυο)
@@ -510,7 +735,7 @@
Tips
- Η έκδοση Hedgewars για Windows υποστηρίζει Xfire. Σιγουρευτείτε οτι προσθέσατε το Hedgewars στη λίστα παιχνιδιών του, ώστε οι φίλοι σας να μπορούν να σας δουν όταν εσείς παίζετε.
+ Η έκδοση Hedgewars για Windows υποστηρίζει Xfire. Σιγουρευτείτε οτι προσθέσατε το Hedgewars στη λίστα παιχνιδιών του, ώστε οι φίλοι σας να μπορούν να σας δουν όταν εσείς παίζετε.
@@ -580,7 +805,7 @@
Tips
- Η Αυτοκαθοδηγούμενη Μέλισσα μπορεί να είναι δύσκολη στη χρήση. Η ακτίνα καμπυλότητάς της εξαρτάται από την ταχύτητά της, επομένως προσπαθήστε να μην χρησιμοποιείτε την πλήρη ισχύ.
+ Η Αυτοκαθοδηγούμενη Μέλισσα μπορεί να είναι δύσκολη στη χρήση. Η ακτίνα καμπυλότητάς της εξαρτάται από την ταχύτητά της, επομένως προσπαθήστε να μην χρησιμοποιείτε την πλήρη ισχύ.
@@ -610,7 +835,7 @@
Tips
- Χρησιμοποιήστε την Καυστική Χειροβομβίδα για να εμποδίσετε προσωρινώς τους σκατζόχοιρους από το να διασχίσουν έδαφος, όπως σήραγγες ή εξέδρες.
+ Χρησιμοποιήστε την Καυστική Χειροβομβίδα για να εμποδίσετε προσωρινώς τους σκατζόχοιρους από το να διασχίσουν έδαφος, όπως σήραγγες ή εξέδρες.
@@ -662,6 +887,65 @@
Tips
Μπορείτε να βρείτε τα αρχεία ρυθμίσεων του Hedgewars στο ".hedgewars" στον προσωπικό σας φάκελο. Δημιουργήστε αντίγραφα ασφαλείας ή πάρτε τα αρχεία μαζί σας, αλλά μην τα επεξεργαστείτε χειροκίνητα.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
PageMultiplayer
@@ -674,11 +958,11 @@
PageNet
- Σφάλμα
+ Σφάλμα
- Παρακαλώ επιλέξτε εξυπηρετητή από την παρακάτω λίστα
+ Παρακαλώ επιλέξτε εξυπηρετητή από την παρακάτω λίστα
@@ -698,6 +982,14 @@
Επίσημος εξυπηρετητής
+
+
+
+
+
+
+
+
PageOptions
@@ -715,30 +1007,98 @@
- Νέος σχεδιασμός όπλων
+ Νέος σχεδιασμός όπλων
- Επεξεργασία σχεδιασμού όπλων
+ Επεξεργασία σχεδιασμού όπλων
- Διαγραφή σχεδιασμού όπλων
+ Διαγραφή σχεδιασμού όπλων
Δεν μπορείτε να επεξεργαστείτε τις ομάδες από την επιλογή ομάδων. Πηγαίνετε πίσω στην κύρια σελίδα για να προσθέσετε, να επεξεργαστείτε ή να διαγράψετε ομάδες.
+
+
+ Γενικά
+
+
+
+ Για προχωρημένους
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PagePlayDemo
- Σφάλμα
+ Σφάλμα
- Εντάξει
+ Εντάξει
@@ -750,15 +1110,15 @@
- Δεν μπορεί να γίνει μετονομασία σε
+ Δεν μπορεί να γίνει μετονομασία σε
- Δεν μπορεί να διαγραφεί το αρχείο
+ Δεν μπορεί να διαγραφεί το αρχείο
- Παρακαλώ επιλέξτε εγγραφή από την λίστα
+ Παρακαλώ επιλέξτε εγγραφή από την λίστα
@@ -773,15 +1133,15 @@
- Ανανέωση
+ Ανανέωση
- Σφάλμα
+ Σφάλμα
- Εντάξει
+ Εντάξει
@@ -794,64 +1154,64 @@
- Αυτό το παιχνίδι είναι σε αναμονή.
+ Αυτό το παιχνίδι είναι σε αναμονή.
Μπορείτε να συνδεθείτε και να παίξετε μόλις το παιχνίδι ξεκινήσει.
- Αυτό το παιχνίδι είναι σε εξέλιξη.
+ Αυτό το παιχνίδι είναι σε εξέλιξη.
Μπορείτε να συνδεθείτε και να παρακολουθείτε την εξέλιξη αλλά θα πρέπει να περιμένετε να τελειώσει το παιχνίδι για να ξεκινήσετε να παίζετε.
- %1 είναι ο οικοδεσπότης. Μπορεί να προσαρμόζει τις ρυθμίσεις και να ξεκινά το παιχνίδι.
+ %1 είναι ο οικοδεσπότης. Μπορεί να προσαρμόζει τις ρυθμίσεις και να ξεκινά το παιχνίδι.
- Τυχαίος χάρτης
+ Τυχαίος χάρτης
- Τα παιχνίδια μπορούν να παίζονται σε προκατασκευασμένους ή τυχαιοποιημένους χάρτες.
+ Τα παιχνίδια μπορούν να παίζονται σε προκατασκευασμένους ή τυχαιοποιημένους χάρτες.
- Ο σχεδιασμός του παιχνιδιού καθορίζει τις γενικές επιλογές και τις προτιμήσεις όπως τον Χρόνο του Γύρου, τον Ξαφνικό Θάνατο ή τον Βαμπιρισμό.
+ Ο σχεδιασμός του παιχνιδιού καθορίζει τις γενικές επιλογές και τις προτιμήσεις όπως τον Χρόνο του Γύρου, τον Ξαφνικό Θάνατο ή τον Βαμπιρισμό.
- Ο Σχεδιασμός των Όπλων καθορίζει τα διαθέσιμα όπλα και το ποσό των πυρομαχικών.
+ Ο Σχεδιασμός των Όπλων καθορίζει τα διαθέσιμα όπλα και το ποσό των πυρομαχικών.
-
+
Υπάρχει %1 χρήστης συνδεδεμένος σε αυτό το δωμάτιο.
Υπάρχουν %1 χρήστες συνδεδεμένοι σε αυτό το δωμάτιο.
-
+
%1 ομάδα συμμετέχει σε αυτό το δωμάτιο.
%1 ομάδες συμμετέχουν σε αυτό το δωμάτιο.
- Εισάγετε το όνομα του δωματίου
+ Εισάγετε το όνομα του δωματίου
- Παρακαλώ επιλέξτε δωμάτιο από τη λίστα
+ Παρακαλώ επιλέξτε δωμάτιο από τη λίστα
- Τυχαίος Λαβύρινθος
+ Τυχαίος Λαβύρινθος
- Κατάσταση :
+ Κατάσταση :
@@ -871,14 +1231,21 @@
- Προσοχή
+ Προσοχή
- Το παιχνίδι στο οποίο προσπαθείτε να συνδεθείτε έχει ήδη ξεκινήσει.
+ Το παιχνίδι στο οποίο προσπαθείτε να συνδεθείτε έχει ήδη ξεκινήσει.
Θέλετε ακόμα να συνδεθείτε με το δωμάτιο;
+
+
+
+
+
+
+
PageScheme
@@ -896,7 +1263,7 @@
- Προσθήκη ενός άφθαρτου συνόρου γύρω από την πίστα
+ Προσθήκη ενός άφθαρτου συνόρου γύρω από την πίστα
@@ -986,6 +1353,30 @@
Κάθε σκατζόχοιρος έχει τα δικά του πυρομαχικά. Δεν τα μοιράζεται με την ομάδα.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PageSelectWeapon
@@ -997,32 +1388,141 @@
Διαγραφή
+
+
+ Νέο
+
+
+
+
+
PageSinglePlayer
- Απλό Παιχνίδι (ένα γρήγορο παιχνίδι εναντίον του υπολογιστή, οι ρυθμίσεις είναι προεπιλεγμένεs)
+ Απλό Παιχνίδι (ένα γρήγορο παιχνίδι εναντίον του υπολογιστή, οι ρυθμίσεις είναι προεπιλεγμένεs)
- Πολλοί Παίχτες (ένα παιχνίδι εναντίον των φίλων σας ή του υπολογιστή)
+ Πολλοί Παίχτες (ένα παιχνίδι εναντίον των φίλων σας ή του υπολογιστή)
- Εξάσκηση (Εξασκήστε τις δεξιότητές σας σε ένα εύρος εκπαιδευτικών αποστολών). ΣΕ ΕΞΕΛΙΞΗ
+ Εξάσκηση (Εξασκήστε τις δεξιότητές σας σε ένα εύρος εκπαιδευτικών αποστολών). ΣΕ ΕΞΕΛΙΞΗ
- Επιδείξεις (Παρακολουθήστε καταγεγραμμένες επιδείξεις)
+ Επιδείξεις (Παρακολουθήστε καταγεγραμμένες επιδείξεις)
- Φόρτωση Σωσμένου Παιχνιδιού (Φορτώστε ένα σωσμένο παιχνίδι)
+ Φόρτωση Σωσμένου Παιχνιδιού (Φορτώστε ένα σωσμένο παιχνίδι)
- Εκστρατεία ΣΕ ΕΞΕΛΙΞΗ
+ Εκστρατεία ΣΕ ΕΞΕΛΙΞΗ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Φόρτωση
+
+
+
+
+
+
+
+ PageTraining
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageVideos
+
+
+ Όνομα
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1071,6 +1571,10 @@
Αφαίρεση φίλου
+
+
+ Αναβάθμιση
+
QCheckBox
@@ -1126,6 +1630,26 @@
Ενεργοποίηση εφε διεπαφής
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QComboBox
@@ -1173,6 +1697,74 @@
Default
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QGroupBox
@@ -1194,7 +1786,7 @@
- Όπλα
+ Όπλα
@@ -1224,6 +1816,34 @@
Διάφορα
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QLabel
@@ -1241,7 +1861,7 @@
- Το πρόγραμμα αυτό διανέμεται κάτω από την GNU General Public License
+ Το πρόγραμμα αυτό διανέμεται κάτω από την GNU General Public License
@@ -1277,7 +1897,7 @@
- Ψευδώνυμο
+ Ψευδώνυμο
@@ -1357,7 +1977,7 @@
- Επανεκκινήστε το παιχνίδι για εφαρμογή των αλλαγών
+ Επανεκκινήστε το παιχνίδι για εφαρμογή των αλλαγών
@@ -1393,7 +2013,93 @@
- Σύζευξη σχεδιασμών και όπλων
+ Σύζευξη σχεδιασμών και όπλων
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ψευδώνυμο
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1402,6 +2108,14 @@
Ανώνυμο
+
+
+
+
+
+
+
+
QMainWindow
@@ -1414,7 +2128,7 @@
QMessageBox
- Δίκτυο
+ Δίκτυο
@@ -1428,13 +2142,13 @@
- Αποτυχία ανοίγματος φακέλου δεδομένων :
+ Αποτυχία ανοίγματος φακέλου δεδομένων :
%1
Παρακαλώ ελέγξτε την εγκατάστασή σας
- Όπλα
+ Όπλα
@@ -1442,38 +2156,248 @@
- Δεν μπορεί να διαγραφεί η βασική σειρά όπλων
+ Δεν μπορεί να διαγραφεί η βασική σειρά όπλων
- Σίγουρα να διαγραφεί αυτή η σειρά όπλων ;
+ Σίγουρα να διαγραφεί αυτή η σειρά όπλων ;
- Δεν μπορεί να αντικατασταθεί η βασική σειρά όπλων '%1'!
+ Δεν μπορεί να αντικατασταθεί η βασική σειρά όπλων '%1'!
- Όλες οι αντιστοιχίσεις αρχείων έχουν τεθεί.
+ Όλες οι αντιστοιχίσεις αρχείων έχουν τεθεί.
Η αντιστοίχιση του αρχείου απέτυχε.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Δεν μπορεί να δημιουργηθεί ο κατάλογος %1
+
+
+
+
+
+
+
+
+
+
+
+ Δεν είναι δυνατόν να ξεκινήσει ο εξυπηρετητής : %1.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Εισάγετε το όνομα του δωματίου
+
+
+
+
+
+
+
+ Παρακαλώ επιλέξτε εγγραφή από την λίστα
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Παρακαλώ επιλέξτε δωμάτιο από τη λίστα
+
+
+
+
+
+
+
+ Το παιχνίδι στο οποίο προσπαθείτε να συνδεθείτε έχει ήδη ξεκινήσει.
+Θέλετε ακόμα να συνδεθείτε με το δωμάτιο;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QObject
- Σφάλμα
+ Σφάλμα
- Δεν μπορεί να δημιουργηθεί ο κατάλογος %1
+ Δεν μπορεί να δημιουργηθεί ο κατάλογος %1
- Εντάξει
+ Εντάξει
@@ -1554,20 +2478,103 @@
Αντιστοίχηση επεκτάσεων αρχείων
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
QTableWidget
+ Όνομα Δωματίου
+
+
+
+ C
+
+
+
+ T
+
+
+
+ Ιδιοκτήτης
+
+
+
+ Χάρτης
+
+
+
+ Κανόνες
+
+
+
+ Όπλα
+
+
+
+ RoomsListModel
+
+
+ Σε εξέλιξη
+
+
+
Όνομα Δωματίου
- C
+ C
- T
+ T
@@ -1585,6 +2592,18 @@
Όπλα
+
+
+ Τυχαίος χάρτης
+
+
+
+ Τυχαίος Λαβύρινθος
+
+
+
+
+
SelWeaponWidget
@@ -1604,20 +2623,28 @@
Καθυστερήσεις
+
+
+ Νέο
+
+
+
+
+
TCPBase
- Σφάλμα
+ Σφάλμα
- Δεν είναι δυνατόν να ξεκινήσει ο εξυπηρετητής : %1.
+ Δεν είναι δυνατόν να ξεκινήσει ο εξυπηρετητής : %1.
- Δεν είναι δυνατόν να τρέξει η μηχανή : %1 (
+ Δεν είναι δυνατόν να τρέξει η μηχανή : %1 (
@@ -1710,6 +2737,22 @@
Πυρομαχικά ανά σκατζόχοιρο
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
binds
@@ -1875,6 +2918,14 @@
θέση 10
+
+
+
+
+
+
+
+
binds (categories)
@@ -1961,6 +3012,10 @@
Εναλλάξτε τις επιγραφές πάνω από τους σκατζόχοιρους :
+
+
+
+
binds (keys)
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_en.ts
--- a/share/hedgewars/Data/Locale/hedgewars_en.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Tue Nov 13 23:21:46 2012 +0400
@@ -344,7 +344,7 @@
- LibavIteraction
+ LibavInteraction
@@ -831,14 +831,6 @@
Control
-
-
-
-
-
-
-
-
PageNetType
@@ -2150,6 +2142,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_es.ts
--- a/share/hedgewars/Data/Locale/hedgewars_es.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Tue Nov 13 23:21:46 2012 +0400
@@ -344,7 +344,7 @@
- LibavIteraction
+ LibavInteraction
@@ -832,12 +832,8 @@
Opciones
-
-
-
-
- Contenido adicional
+ Contenido adicional
@@ -2152,6 +2148,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
@@ -2185,7 +2201,7 @@
-
+ Set de armas
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_fi.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Tue Nov 13 23:21:46 2012 +0400
@@ -344,7 +344,7 @@
- LibavIteraction
+ LibavInteraction
@@ -831,14 +831,6 @@
Säädöt
-
-
-
-
-
-
-
-
PageNetType
@@ -2150,6 +2142,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_fr.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Tue Nov 13 23:21:46 2012 +0400
@@ -344,7 +344,7 @@
- LibavIteraction
+ LibavInteraction
@@ -831,14 +831,6 @@
Contrôles
-
-
-
-
-
-
-
-
PageNetType
@@ -2149,6 +2141,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_gl.ts
--- a/share/hedgewars/Data/Locale/hedgewars_gl.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_gl.ts Tue Nov 13 23:21:46 2012 +0400
@@ -1,1577 +1,3248 @@
-
-
-
-
- AmmoSchemeModel
-
-
- novo
-
-
-
- FreqSpinBox
-
-
- Nunca
-
-
-
-
- Cada rolda
- Cada %1 roldas
-
-
-
-
- GameCFGWidget
-
-
- Editar os armamentos
-
-
-
- Erro
-
-
-
- Non se permite ese armamento
-
-
-
- Editar os modos de xogo
-
-
-
- HWForm
-
-
- novo
-
-
-
- Erro
-
-
-
- Aceptar
-
-
-
- Non se puido iniciar o servidor
-
-
-
- Non se pode gardar a gravación no ficheiro %1
-
-
-
- Selecciona unha gravación da seguinte lista
-
-
-
- HWGame
-
-
- Houbo un erro ao ler o ficheiro de configuración do adestramento
-
-
-
- gl.txt
-
-
-
- Non se pode abrir a demostración %1
-
-
-
- HWMapContainer
-
-
- Mapa
-
-
-
- Temas visuais
-
-
-
- Filtro
-
-
-
- Todos
-
-
-
- Pequeno
-
-
-
- Mediano
-
-
-
- Grande
-
-
-
- Caverna
-
-
-
- Absurdo
-
-
-
- HWNetServersModel
-
-
- Nome
-
-
-
- IP
-
-
-
- Porto
-
-
-
- HWNewNet
-
-
- Non se atopou o anfitrión. Comproba o nome e mailo porto do anfitrión.
-
-
-
- Rexeitouse a conexión
-
-
-
- Destruiuse a sala
-
-
-
- Motivo da expulsión:
-
-
-
- Botáronte
-
-
-
- Contrasinal
-
-
-
- O teu alcume, «%1»
-está rexistrado en Hedgewars.org
-Introduce o contrasinal ou
-escolle outro alcume:
-
-
-
- %1 *** %2 entrou na sala
-
-
-
- %1 *** %2 uniuse
-
-
-
- %1 *** %2 marchou (%3)
-
-
-
- %1 *** %2 marchou
-
-
-
- KB
-
-
- SDL_ttf devolveu un erro ao renderizar o texto, seguramente sexa por mor do erro de freetype2. Cómpre que actualices a túa biblioteca freetype.
-
-
-
- PageAdmin
-
-
- Mensaxe do servidor:
-
-
-
- Establecer a mensaxe
-
-
-
- Borrar a caché das contas
-
-
-
- PageConnecting
-
-
- Conectando...
-
-
-
- PageEditTeam
-
-
- Xeral
-
-
-
- Avanzado
-
-
-
- PageGameStats
-
-
- <p>O mellor tirador foi <b>%1</b>, con <b>%2</b> puntos.</p>
-
-
-
-
- <p>O mellor asasino é <b>%1</b>, con <b>%2</b> vítima nunha rolda.</p>
- <p>O mellor asasino é <b>%1</b>, con <b>%2</b> vítimas nunha rolda.</p>
-
-
-
-
-
- <p>Nesta rolda morrereu <b>un</b> ourizo.</p>
- <p>Nesta rolda morreron <b>%1</b> ourizos.</p>
-
-
-
-
- PageMain
-
-
- Partida local (xoga unha partida nun só computador)
-
-
-
- Partida na rede (xoga unha partida na rede)
-
-
-
- PageMultiplayer
-
-
- Iniciar
-
-
-
- PageNet
-
-
- Erro
-
-
-
- Selecciona un servidor da seguinte lista
-
-
-
- PageNetGame
-
-
- Control
-
-
-
- PageNetType
-
-
- Partida na rede local
-
-
-
- Servidor oficial
-
-
-
- PageOptions
-
-
- Novo equipo
-
-
-
- Editar o equipo
-
-
-
- Armamento
-
-
-
- Editar
-
-
-
- PagePlayDemo
-
-
- Erro
-
-
-
- Aceptar
-
-
-
- Diálogo de cambio de nome
-
-
-
- Introduce un novo nome para o ficheiro:
-
-
-
- Non se pode cambiar o nome a
-
-
-
- Non se pode borrar o ficheiro
-
-
-
- Selecciona unha gravación da lista
-
-
-
- PageRoomsList
-
-
- Crear
-
-
-
- Entrar
-
-
-
- Actualizar
-
-
-
- Erro
-
-
-
- Aceptar
-
-
-
- Administración
-
-
-
- Nome da sala:
-
-
-
- Aínda non comezou a partida.
-Podes entrar e empezar a xogar cando comece.
-
-
-
- A partida estase xogando.
-Poder entrar a ver, pero terás que agardar a que remate para xogar ti.
-
-
-
- %1 é o anfitrión. Pode configurar e iniciar a partida.
-
-
-
- Mapa ao chou
-
-
-
- Pódese xogar en mapas elaborados ou mapas xerados ao chou.
-
-
-
- O modo de xogo establece as opcións xerais tales coma "tempo por rolda", "morte súbita" ou "vampirismo".
-
-
-
- O armamento establece as armas dispoñibles e a cantidade de munición para cada unha.
-
-
-
-
- Hai un cliente conectado a esta sala.
- Hai %1 clientes conectados a esta sala.
-
-
-
-
-
- Hai un equipo participando nesta sala.
- Hai %1 equipos participando nesta sala.
-
-
-
-
- Introduce o nome da sala
-
-
-
- Selecciona unha sala da lista
-
-
-
- PageScheme
-
-
- Defende o teu forte e elimina os inimigos, máximo dous bandos!
-
-
-
- Os bandos comezarán en lados opostos da superficie, máximo dous bandos!
-
-
-
- Non se pode destruír o terreo!
-
-
-
- Engade un bordo indestructible arredor do terreo
-
-
-
- Baixa gravidade
-
-
-
- Mira láser
-
-
-
- Todos os ourizos teñen un escudo protector
-
-
-
- Activar as minas esparexidas
-
-
-
- Gañar o 80% do daño inflixido en vida
-
-
-
- Acompañar aos inimigos no sentimento e no dano
-
-
-
- Os ourizos non se poden mover, pon a probas a túa faceta de artilleiro
-
-
-
- Ao chou
-
-
-
- segundos
-
-
-
- Novo
-
-
-
- Borrar
-
-
-
- PageSelectWeapon
-
-
- Por defecto
-
-
-
- Borrar
-
-
-
- PageSinglePlayer
-
-
- Partida simple (unha partida rápida xa configurada contra a intelixencia artificial)
-
-
-
- Partida colectiva (xoga no teu computador contra os teus amigos ou contra a intelixencia artificial)
-
-
-
- Adestramento (practica as túas habilidades nunha serie de misións de adestramento). EN DESENVOLVEMENTO
-
-
-
- Demostracións (reproduce demostracións gravadas)
-
-
-
- Cargar (carga unha partida gardada)
-
-
-
- QAction
-
-
- Botar
-
-
-
- Información
-
-
-
- Iniciar
-
-
-
- Restrinxir a entrada
-
-
-
- Restrinxir o engadido de equipos
-
-
-
- Expulsar
-
-
-
- QCheckBox
-
-
- Comprobar se hai actualizacións ao iniciar
-
-
-
- Partidas a pantalla completa
-
-
-
- Interface a pantalla completa
-
-
-
- Activar os sons
-
-
-
- Activar a música
-
-
-
- Amosar as FPS
-
-
-
- Gráficos de dano alternativos
-
-
-
- Engadir a data e maila hora ao nome dos ficheiros de gravación
-
-
-
- Efectos na interface (hai que reiniciar)
-
-
-
- Baixa calidade
-
-
-
- QComboBox
-
-
- Mapa xerado...
-
-
-
- Xogador
-
-
-
- Nivel
-
-
-
- QGroupBox
-
-
- Membros do equipo
-
-
-
- Equipo
-
-
-
- Forte
-
-
-
- Controis
-
-
-
- Equipos
-
-
-
- Armamento
-
-
-
- Configuración audiovisual
-
-
-
- Partida na rede
-
-
-
- Equipos xogando
-
-
-
- Modificadores da partida
-
-
-
- Configuración básica
-
-
-
- QLabel
-
-
- Temporizador das minas
-
-
-
- Minas
-
-
-
- Versión
-
-
-
- Esta aplicación distribúese baixo a GNU General Public License
-
-
-
- Desenvolvedores:
-
-
-
- Gráficos:
-
-
-
- Sons:
-
-
-
- Traducións:
-
-
-
- Un especial agradecemento a:
-
-
-
- Armamento
-
-
-
- Anfitrión:
-
-
-
- Porto:
-
-
-
- Alcume
-
-
-
- Resolución
-
-
-
- Límite de FPS
-
-
-
- Nome do servidor:
-
-
-
- Porto do servidor:
-
-
-
- Volume inicial
-
-
-
- Modificador de dano
-
-
-
- Tempo por rolda
-
-
-
- Saúde inicial
-
-
-
- Conta atrás ata a morte súbita
-
-
-
- Nome do modo:
-
-
-
- Caída de caixas
-
-
-
- Modo de xogo
-
-
-
- QLineEdit
-
-
- sen nome
-
-
-
- QMainWindow
-
-
- Hedgewars %1
-
-
-
- QMessageBox
-
-
- Rede
-
-
-
- Perdeuse a conexión co servidor
-
-
-
- Erro
-
-
-
- Non se puido abrir o directorio dos datos:
- %1
-Verifica a instalación
-
-
-
- Armamento
-
-
-
- Non se pode editar o armamento por defecto
-
-
-
- Non se pode borrar o armamento por defecto
-
-
-
- Seguro que queres borrar este armamento?
-
-
-
- QObject
-
-
- Erro
-
-
-
- Non se puido crear o directorio %1
-
-
-
- Aceptar
-
-
-
- Alcume
-
-
-
- Introduce o teu alcume
-
-
-
- QPushButton
-
-
- por defecto
-
-
-
- Aceptar
-
-
-
- Cancelar
-
-
-
- Iniciar un servidor
-
-
-
- Conectar
-
-
-
- Actualizar
-
-
-
- Especificar
-
-
-
- Iniciar
-
-
-
- Dálle!
-
-
-
- Reproducir a demostración
-
-
-
- Cambiar o nome
-
-
-
- Borrar
-
-
-
- Cargar
-
-
-
- Configuración
-
-
-
- Preparado
-
-
-
- QTableWidget
-
-
- Nome da sala
-
-
-
- C
-
-
-
- T
-
-
-
- Dono
-
-
-
- Mapa
-
-
-
- Regras
-
-
-
- Armamento
-
-
-
- SelWeaponWidget
-
-
- Armamento
-
-
-
- Probabilidades
-
-
-
- TCPBase
-
-
- Erro
-
-
-
- Non se puido iniciar o servidor: %1.
-
-
-
- Non se puido executar o motor: %1 (
-
-
-
- ToggleButtonWidget
-
-
- Vampirismo
-
-
-
- Karma
-
-
-
- Artillería
-
-
-
- Modo fortaleza
-
-
-
- Equipos divididos
-
-
-
- Terreo indestructible
-
-
-
- Con bordos
-
-
-
- Baixa gravidade
-
-
-
- Mira láser
-
-
-
- Invulnerable
-
-
-
- Engadir minas
-
-
-
- binds
-
-
- arriba
-
-
-
- esquerda
-
-
-
- dereita
-
-
-
- abaixo
-
-
-
- atacar
-
-
-
- apuntar con precisión
-
-
-
- poñer
-
-
-
- cambiar
-
-
-
- atopar ourizo
-
-
-
- menú de armas
-
-
-
- 1ª ranura
-
-
-
- 2ª ranura
-
-
-
- 3ª ranura
-
-
-
- 4ª ranura
-
-
-
- 5ª ranura
-
-
-
- 6ª ranura
-
-
-
- 7ª ranura
-
-
-
- 8ª ranura
-
-
-
- 9ª ranura
-
-
-
- temporizador a 1 segundo
-
-
-
- temporizador a 2 segundos
-
-
-
- temporizador a 3 segundos
-
-
-
- temporizador a 4 segundos
-
-
-
- temporizador a 5 segundos
-
-
-
- conversa
-
-
-
- historial de conversa
-
-
-
- pausa
-
-
-
- confirmación
-
-
-
- baixar o volume
-
-
-
- subir o volume
-
-
-
- cambiar o modo
-
-
-
- capturar
-
-
-
- información
-dos ourizos
-
-
-
- saír
-
-
-
- achegar
-
-
-
- afastar
-
-
-
- distancia inicial
-
-
-
- salto cara adiante
-
-
-
- salto cara arriba
-
-
-
- binds (categories)
-
-
- Controis básicos
-
-
-
- Controis das armas
-
-
-
- Controis da cámara e mailo cursor
-
-
-
- Outros
-
-
-
- binds (descriptions)
-
-
- Move os teus ourizos e apunta:
-
-
-
- Supera os obstáculos saltando:
-
-
-
- Dispara a arma seleccionada ou activa unha ferramenta:
-
-
-
- Recolle un arma ou a situación dun obxectivo onde o cursor:
-
-
-
- Cambia de ourizo (se se pode):
-
-
-
- Recolle unha arma ou ferramenta:
-
-
-
- Establece o temporizador para as armas que o teñan:
-
-
-
- Move a cámara ao ourizo activo:
-
-
-
- Move o cursor ou a cámara sen usar o rato:
-
-
-
- Cambia a distancia da cámara:
-
-
-
- Fala co teu equipo ou con todos:
-
-
-
- Pausa, continúa ou sal da túa partida:
-
-
-
- Cambia o volume do xogo durante unha partida:
-
-
-
- Cambiar a pantalla completa:
-
-
-
- Facer unha captura de pantalla:
-
-
-
- Cambiar as etiquetas sobre os ourizos:
-
-
-
- binds (keys)
-
-
- Eixo
-
-
-
- (Arriba)
-
-
-
- (Abaixo)
-
-
-
- Sombreiro
-
-
-
- (Esquerda)
-
-
-
- (Dereita)
-
-
-
- Botón
-
-
-
- Teclado
-
-
-
- Rato: botón esquerdo
-
-
-
- Rato: botón central
-
-
-
- Rato: botón dereito
-
-
-
- Rato: roda cara arriba
-
-
-
- Rato: roda cara abaixo
-
-
-
- Retroceso
-
-
-
- Tabulador
-
-
-
- Borrado
-
-
-
- Retorno
-
-
-
- Pausa
-
-
-
- Escape
-
-
-
- Espazo
-
-
-
- Borrar
-
-
-
- Teclado numérico: 0
-
-
-
- Teclado numérico: 1
-
-
-
- Teclado numérico: 2
-
-
-
- Teclado numérico: 3
-
-
-
- Teclado numérico: 4
-
-
-
- Teclado numérico: 5
-
-
-
- Teclado numérico: 6
-
-
-
- Teclado numérico: 7
-
-
-
- Teclado numérico: 8
-
-
-
- Teclado numérico: 9
-
-
-
- Teclado numérico: .
-
-
-
- Teclado numérico: /
-
-
-
- Teclado numérico: *
-
-
-
- Teclado numérico: -
-
-
-
- Teclado numérico: +
-
-
-
- Intro
-
-
-
- Igual
-
-
-
- Arriba
-
-
-
- Abaixo
-
-
-
- Dereita
-
-
-
- Esquerda
-
-
-
- Inserir
-
-
-
- Inicio
-
-
-
- Fin
-
-
-
- Re Páx
-
-
-
- Av Páx
-
-
-
- Bloq Num
-
-
-
- Bloq Maiús
-
-
-
- Bloq Despr
-
-
-
- Maiús dereito
-
-
-
- Maiús esquerdo
-
-
-
- Ctrl dereito
-
-
-
- Ctrl esquerdo
-
-
-
- Alt dereito
-
-
-
- Alt esquerdo
-
-
-
- Meta dereito
-
-
-
- Meta esquerdo
-
-
-
- Botón A
-
-
-
- Botón B
-
-
-
- Botón X
-
-
-
- Botón Y
-
-
-
- Botón LB
-
-
-
- Botón RB
-
-
-
- Botón de volver
-
-
-
- Botón de inicio
-
-
-
- Stick esquerdo
-
-
-
- Stick dereito
-
-
-
- Stick esquerdo (Dereita)
-
-
-
- Stick esquerdo (Esquerda)
-
-
-
- Stick esquerdo (Abaixo)
-
-
-
- Stick esquerdo (Arriba)
-
-
-
- Gatillo esquerdo
-
-
-
- Gatillo dereito
-
-
-
- Stick dereito (Abaixo)
-
-
-
- Stick dereito (Arriba)
-
-
-
- Stick dereito (Dereita)
-
-
-
- Stick dereito (Esquerda)
-
-
-
- Mando
-
-
-
+
+
+
+
+ AbstractPage
+
+
+
+
+
+
+ AmmoSchemeModel
+
+
+ novo
+
+
+
+
+
+
+
+ FreqSpinBox
+
+
+ Nunca
+
+
+
+
+ Cada rolda
+ Cada %1 roldas
+
+
+
+
+ GameCFGWidget
+
+
+ Editar os armamentos
+
+
+
+ Erro
+
+
+
+ Non se permite ese armamento
+
+
+
+ Editar os modos de xogo
+
+
+
+
+
+
+
+
+
+
+
+ HWAskQuitDialog
+
+
+
+
+
+
+ HWChatWidget
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HWForm
+
+
+ novo
+
+
+
+ Erro
+
+
+
+ Aceptar
+
+
+
+ Non se puido iniciar o servidor
+
+
+
+ Non se pode gardar a gravación no ficheiro %1
+
+
+
+ Selecciona unha gravación da seguinte lista
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Alcume
+
+
+
+
+
+
+
+
+
+
+
+ File Types
+
+
+
+
+ File Types
+
+
+
+
+
+
+
+
+
+
+
+
+ HWGame
+
+
+ Houbo un erro ao ler o ficheiro de configuración do adestramento
+
+
+
+ gl.txt
+
+
+
+ Non se pode abrir a demostración %1
+
+
+
+ HWMapContainer
+
+
+ Mapa
+
+
+
+ Temas visuais
+
+
+
+ Filtro
+
+
+
+ Todos
+
+
+
+ Pequeno
+
+
+
+ Mediano
+
+
+
+ Grande
+
+
+
+ Caverna
+
+
+
+ Absurdo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HWNetServersModel
+
+
+ Nome
+
+
+
+ IP
+
+
+
+ Porto
+
+
+
+ HWNewNet
+
+
+ Non se atopou o anfitrión. Comproba o nome e mailo porto do anfitrión.
+
+
+
+ Rexeitouse a conexión
+
+
+
+ Destruiuse a sala
+
+
+
+ Motivo da expulsión:
+
+
+
+ Botáronte
+
+
+
+ Contrasinal
+
+
+
+ O teu alcume, «%1»
+está rexistrado en Hedgewars.org
+Introduce o contrasinal ou
+escolle outro alcume:
+
+
+
+ %1 *** %2 entrou na sala
+
+
+
+ %1 *** %2 uniuse
+
+
+
+ %1 *** %2 marchou (%3)
+
+
+
+ %1 *** %2 marchou
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HWPasswordDialog
+
+
+ Contrasinal
+
+
+
+ HWUploadVideoDialog
+
+
+
+
+
+
+
+
+
+
+ KB
+
+
+ SDL_ttf devolveu un erro ao renderizar o texto, seguramente sexa por mor do erro de freetype2. Cómpre que actualices a túa biblioteca freetype.
+
+
+
+ LibavInteraction
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageAdmin
+
+
+ Mensaxe do servidor:
+
+
+
+ Establecer a mensaxe
+
+
+
+ Borrar a caché das contas
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageConnecting
+
+
+ Conectando...
+
+
+
+ PageDrawMap
+
+
+
+
+
+
+
+
+
+
+ Borrado
+
+
+
+ Cargar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageEditTeam
+
+
+ Xeral
+
+
+
+ Avanzado
+
+
+
+ PageGameStats
+
+
+ <p>O mellor tirador foi <b>%1</b>, con <b>%2</b> puntos.</p>
+
+
+
+
+ <p>O mellor asasino é <b>%1</b>, con <b>%2</b> vítima nunha rolda.</p>
+ <p>O mellor asasino é <b>%1</b>, con <b>%2</b> vítimas nunha rolda.</p>
+
+
+
+
+
+ <p>Nesta rolda morrereu <b>un</b> ourizo.</p>
+ <p>Nesta rolda morreron <b>%1</b> ourizos.</p>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageInGame
+
+
+
+
+
+
+ PageInfo
+
+
+
+
+
+
+ PageMain
+
+
+ Partida local (xoga unha partida nun só computador)
+
+
+
+ Partida na rede (xoga unha partida na rede)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ Tips
+
+
+
+
+ PageMultiplayer
+
+
+ Iniciar
+
+
+
+ PageNet
+
+
+ Erro
+
+
+
+ Selecciona un servidor da seguinte lista
+
+
+
+ PageNetGame
+
+
+ Control
+
+
+
+ PageNetType
+
+
+ Partida na rede local
+
+
+
+ Servidor oficial
+
+
+
+
+
+
+
+
+
+
+
+ PageOptions
+
+
+ Novo equipo
+
+
+
+ Editar o equipo
+
+
+
+ Armamento
+
+
+
+ Editar
+
+
+
+ Xeral
+
+
+
+ Avanzado
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PagePlayDemo
+
+
+ Erro
+
+
+
+ Aceptar
+
+
+
+ Diálogo de cambio de nome
+
+
+
+ Introduce un novo nome para o ficheiro:
+
+
+
+ Non se pode cambiar o nome a
+
+
+
+ Non se pode borrar o ficheiro
+
+
+
+ Selecciona unha gravación da lista
+
+
+
+ PageRoomsList
+
+
+ Crear
+
+
+
+ Entrar
+
+
+
+ Actualizar
+
+
+
+ Erro
+
+
+
+ Aceptar
+
+
+
+ Administración
+
+
+
+ Nome da sala:
+
+
+
+ Aínda non comezou a partida.
+Podes entrar e empezar a xogar cando comece.
+
+
+
+ A partida estase xogando.
+Poder entrar a ver, pero terás que agardar a que remate para xogar ti.
+
+
+
+ %1 é o anfitrión. Pode configurar e iniciar a partida.
+
+
+
+ Mapa ao chou
+
+
+
+ Pódese xogar en mapas elaborados ou mapas xerados ao chou.
+
+
+
+ O modo de xogo establece as opcións xerais tales coma "tempo por rolda", "morte súbita" ou "vampirismo".
+
+
+
+ O armamento establece as armas dispoñibles e a cantidade de munición para cada unha.
+
+
+
+
+ Hai un cliente conectado a esta sala.
+ Hai %1 clientes conectados a esta sala.
+
+
+
+
+
+ Hai un equipo participando nesta sala.
+ Hai %1 equipos participando nesta sala.
+
+
+
+
+ Introduce o nome da sala
+
+
+
+ Selecciona unha sala da lista
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Borrado
+
+
+
+
+
+
+
+
+
+
+ PageScheme
+
+
+ Defende o teu forte e elimina os inimigos, máximo dous bandos!
+
+
+
+ Os bandos comezarán en lados opostos da superficie, máximo dous bandos!
+
+
+
+ Non se pode destruír o terreo!
+
+
+
+ Engade un bordo indestructible arredor do terreo
+
+
+
+ Baixa gravidade
+
+
+
+ Mira láser
+
+
+
+ Todos os ourizos teñen un escudo protector
+
+
+
+ Activar as minas esparexidas
+
+
+
+ Gañar o 80% do daño inflixido en vida
+
+
+
+ Acompañar aos inimigos no sentimento e no dano
+
+
+
+ Os ourizos non se poden mover, pon a probas a túa faceta de artilleiro
+
+
+
+ Ao chou
+
+
+
+ segundos
+
+
+
+ Novo
+
+
+
+ Borrar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageSelectWeapon
+
+
+ Por defecto
+
+
+
+ Borrar
+
+
+
+ Novo
+
+
+
+
+
+
+
+ PageSinglePlayer
+
+
+ Partida simple (unha partida rápida xa configurada contra a intelixencia artificial)
+
+
+
+ Partida colectiva (xoga no teu computador contra os teus amigos ou contra a intelixencia artificial)
+
+
+
+ Adestramento (practica as túas habilidades nunha serie de misións de adestramento). EN DESENVOLVEMENTO
+
+
+
+ Demostracións (reproduce demostracións gravadas)
+
+
+
+ Cargar (carga unha partida gardada)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Cargar
+
+
+
+
+
+
+
+ PageTraining
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageVideos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QAction
+
+
+ Botar
+
+
+
+ Información
+
+
+
+ Iniciar
+
+
+
+ Restrinxir a entrada
+
+
+
+ Restrinxir o engadido de equipos
+
+
+
+ Expulsar
+
+
+
+ Actualizar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QCheckBox
+
+
+ Comprobar se hai actualizacións ao iniciar
+
+
+
+ Partidas a pantalla completa
+
+
+
+ Interface a pantalla completa
+
+
+
+ Activar os sons
+
+
+
+ Activar a música
+
+
+
+ Amosar as FPS
+
+
+
+ Gráficos de dano alternativos
+
+
+
+ Engadir a data e maila hora ao nome dos ficheiros de gravación
+
+
+
+ Efectos na interface (hai que reiniciar)
+
+
+
+ Baixa calidade
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QComboBox
+
+
+ Mapa xerado...
+
+
+
+ Xogador
+
+
+
+ Nivel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QGroupBox
+
+
+ Membros do equipo
+
+
+
+ Equipo
+
+
+
+ Forte
+
+
+
+ Controis
+
+
+
+ Equipos
+
+
+
+ Armamento
+
+
+
+ Configuración audiovisual
+
+
+
+ Partida na rede
+
+
+
+ Equipos xogando
+
+
+
+ Modificadores da partida
+
+
+
+ Configuración básica
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QLabel
+
+
+ Temporizador das minas
+
+
+
+ Minas
+
+
+
+ Versión
+
+
+
+ Esta aplicación distribúese baixo a GNU General Public License
+
+
+
+ Desenvolvedores:
+
+
+
+ Gráficos:
+
+
+
+ Sons:
+
+
+
+ Traducións:
+
+
+
+ Un especial agradecemento a:
+
+
+
+ Armamento
+
+
+
+ Anfitrión:
+
+
+
+ Porto:
+
+
+
+ Alcume
+
+
+
+ Resolución
+
+
+
+ Límite de FPS
+
+
+
+ Nome do servidor:
+
+
+
+ Porto do servidor:
+
+
+
+ Volume inicial
+
+
+
+ Modificador de dano
+
+
+
+ Tempo por rolda
+
+
+
+ Saúde inicial
+
+
+
+ Conta atrás ata a morte súbita
+
+
+
+ Nome do modo:
+
+
+
+ Caída de caixas
+
+
+
+ Modo de xogo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Alcume
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QLineEdit
+
+
+ sen nome
+
+
+
+
+
+
+
+
+
+
+
+ QMainWindow
+
+
+ Hedgewars %1
+
+
+
+ QMessageBox
+
+
+ Rede
+
+
+
+ Perdeuse a conexión co servidor
+
+
+
+ Erro
+
+
+
+ Non se puido abrir o directorio dos datos:
+ %1
+Verifica a instalación
+
+
+
+ Armamento
+
+
+
+ Non se pode editar o armamento por defecto
+
+
+
+ Non se pode borrar o armamento por defecto
+
+
+
+ Seguro que queres borrar este armamento?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Non se puido crear o directorio %1
+
+
+
+
+
+
+
+
+
+
+
+ Non se puido iniciar o servidor: %1.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Introduce o nome da sala
+
+
+
+
+
+
+
+ Selecciona unha gravación da lista
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Selecciona unha sala da lista
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QObject
+
+
+ Erro
+
+
+
+ Non se puido crear o directorio %1
+
+
+
+ Aceptar
+
+
+
+ Alcume
+
+
+
+ Introduce o teu alcume
+
+
+
+ QPushButton
+
+
+ por defecto
+
+
+
+ Aceptar
+
+
+
+ Cancelar
+
+
+
+ Iniciar un servidor
+
+
+
+ Conectar
+
+
+
+ Actualizar
+
+
+
+ Especificar
+
+
+
+ Iniciar
+
+
+
+ Dálle!
+
+
+
+ Reproducir a demostración
+
+
+
+ Cambiar o nome
+
+
+
+ Borrar
+
+
+
+ Cargar
+
+
+
+ Configuración
+
+
+
+ Preparado
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QTableWidget
+
+
+ Nome da sala
+
+
+
+ C
+
+
+
+ T
+
+
+
+ Dono
+
+
+
+ Mapa
+
+
+
+ Regras
+
+
+
+ Armamento
+
+
+
+ RoomsListModel
+
+
+
+
+
+
+ Nome da sala
+
+
+
+ C
+
+
+
+ T
+
+
+
+ Dono
+
+
+
+ Mapa
+
+
+
+ Regras
+
+
+
+ Armamento
+
+
+
+ Mapa ao chou
+
+
+
+
+
+
+
+
+
+
+
+ SelWeaponWidget
+
+
+ Armamento
+
+
+
+ Probabilidades
+
+
+
+
+
+
+
+
+
+
+
+ novo
+
+
+
+
+
+
+
+ TCPBase
+
+
+ Erro
+
+
+
+ Non se puido iniciar o servidor: %1.
+
+
+
+ Non se puido executar o motor: %1 (
+
+
+
+ ToggleButtonWidget
+
+
+ Vampirismo
+
+
+
+ Karma
+
+
+
+ Artillería
+
+
+
+ Modo fortaleza
+
+
+
+ Equipos divididos
+
+
+
+ Terreo indestructible
+
+
+
+ Con bordos
+
+
+
+ Baixa gravidade
+
+
+
+ Mira láser
+
+
+
+ Invulnerable
+
+
+
+ Engadir minas
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ binds
+
+
+ arriba
+
+
+
+ esquerda
+
+
+
+ dereita
+
+
+
+ abaixo
+
+
+
+ atacar
+
+
+
+ apuntar con precisión
+
+
+
+ poñer
+
+
+
+ cambiar
+
+
+
+ atopar ourizo
+
+
+
+ menú de armas
+
+
+
+ 1ª ranura
+
+
+
+ 2ª ranura
+
+
+
+ 3ª ranura
+
+
+
+ 4ª ranura
+
+
+
+ 5ª ranura
+
+
+
+ 6ª ranura
+
+
+
+ 7ª ranura
+
+
+
+ 8ª ranura
+
+
+
+ 9ª ranura
+
+
+
+ temporizador a 1 segundo
+
+
+
+ temporizador a 2 segundos
+
+
+
+ temporizador a 3 segundos
+
+
+
+ temporizador a 4 segundos
+
+
+
+ temporizador a 5 segundos
+
+
+
+ conversa
+
+
+
+ historial de conversa
+
+
+
+ pausa
+
+
+
+ confirmación
+
+
+
+ baixar o volume
+
+
+
+ subir o volume
+
+
+
+ cambiar o modo
+
+
+
+ capturar
+
+
+
+ información
+dos ourizos
+
+
+
+ saír
+
+
+
+ achegar
+
+
+
+ afastar
+
+
+
+ distancia inicial
+
+
+
+ salto cara adiante
+
+
+
+ salto cara arriba
+
+
+
+ 10ª ranura
+
+
+
+
+
+
+
+
+
+
+
+ binds (categories)
+
+
+ Controis básicos
+
+
+
+ Controis das armas
+
+
+
+ Controis da cámara e mailo cursor
+
+
+
+ Outros
+
+
+
+ binds (descriptions)
+
+
+ Move os teus ourizos e apunta:
+
+
+
+ Supera os obstáculos saltando:
+
+
+
+ Dispara a arma seleccionada ou activa unha ferramenta:
+
+
+
+ Recolle un arma ou a situación dun obxectivo onde o cursor:
+
+
+
+ Cambia de ourizo (se se pode):
+
+
+
+ Recolle unha arma ou ferramenta:
+
+
+
+ Establece o temporizador para as armas que o teñan:
+
+
+
+ Move a cámara ao ourizo activo:
+
+
+
+ Move o cursor ou a cámara sen usar o rato:
+
+
+
+ Cambia a distancia da cámara:
+
+
+
+ Fala co teu equipo ou con todos:
+
+
+
+ Pausa, continúa ou sal da túa partida:
+
+
+
+ Cambia o volume do xogo durante unha partida:
+
+
+
+ Cambiar a pantalla completa:
+
+
+
+ Facer unha captura de pantalla:
+
+
+
+ Cambiar as etiquetas sobre os ourizos:
+
+
+
+
+
+
+
+ binds (keys)
+
+
+ Eixo
+
+
+
+ (Arriba)
+
+
+
+ (Abaixo)
+
+
+
+ Sombreiro
+
+
+
+ (Esquerda)
+
+
+
+ (Dereita)
+
+
+
+ Botón
+
+
+
+ Teclado
+
+
+
+ Rato: botón esquerdo
+
+
+
+ Rato: botón central
+
+
+
+ Rato: botón dereito
+
+
+
+ Rato: roda cara arriba
+
+
+
+ Rato: roda cara abaixo
+
+
+
+ Retroceso
+
+
+
+ Tabulador
+
+
+
+ Borrado
+
+
+
+ Retorno
+
+
+
+ Pausa
+
+
+
+ Escape
+
+
+
+ Espazo
+
+
+
+ Borrar
+
+
+
+ Teclado numérico: 0
+
+
+
+ Teclado numérico: 1
+
+
+
+ Teclado numérico: 2
+
+
+
+ Teclado numérico: 3
+
+
+
+ Teclado numérico: 4
+
+
+
+ Teclado numérico: 5
+
+
+
+ Teclado numérico: 6
+
+
+
+ Teclado numérico: 7
+
+
+
+ Teclado numérico: 8
+
+
+
+ Teclado numérico: 9
+
+
+
+ Teclado numérico: .
+
+
+
+ Teclado numérico: /
+
+
+
+ Teclado numérico: *
+
+
+
+ Teclado numérico: -
+
+
+
+ Teclado numérico: +
+
+
+
+ Intro
+
+
+
+ Igual
+
+
+
+ Arriba
+
+
+
+ Abaixo
+
+
+
+ Dereita
+
+
+
+ Esquerda
+
+
+
+ Inserir
+
+
+
+ Inicio
+
+
+
+ Fin
+
+
+
+ Re Páx
+
+
+
+ Av Páx
+
+
+
+ Bloq Num
+
+
+
+ Bloq Maiús
+
+
+
+ Bloq Despr
+
+
+
+ Maiús dereito
+
+
+
+ Maiús esquerdo
+
+
+
+ Ctrl dereito
+
+
+
+ Ctrl esquerdo
+
+
+
+ Alt dereito
+
+
+
+ Alt esquerdo
+
+
+
+ Meta dereito
+
+
+
+ Meta esquerdo
+
+
+
+ Botón A
+
+
+
+ Botón B
+
+
+
+ Botón X
+
+
+
+ Botón Y
+
+
+
+ Botón LB
+
+
+
+ Botón RB
+
+
+
+ Botón de volver
+
+
+
+ Botón de inicio
+
+
+
+ Stick esquerdo
+
+
+
+ Stick dereito
+
+
+
+ Stick esquerdo (Dereita)
+
+
+
+ Stick esquerdo (Esquerda)
+
+
+
+ Stick esquerdo (Abaixo)
+
+
+
+ Stick esquerdo (Arriba)
+
+
+
+ Gatillo esquerdo
+
+
+
+ Gatillo dereito
+
+
+
+ Stick dereito (Abaixo)
+
+
+
+ Stick dereito (Arriba)
+
+
+
+ Stick dereito (Dereita)
+
+
+
+ Stick dereito (Esquerda)
+
+
+
+ Mando
+
+
+
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_hu.ts
--- a/share/hedgewars/Data/Locale/hedgewars_hu.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts Tue Nov 13 23:21:46 2012 +0400
@@ -340,7 +340,7 @@
- LibavIteraction
+ LibavInteraction
@@ -821,14 +821,6 @@
Irányítás
-
-
-
-
-
-
-
-
PageNetType
@@ -2136,6 +2128,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_it.ts
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Tue Nov 13 23:21:46 2012 +0400
@@ -344,23 +344,43 @@
+ LibavInteraction
+
+
+ Durata: %1m %2s
+
+
+
+ Video: %1x%2,
+
+
+
+ %1 fps,
+
+
+
+ Audio:
+
+
+
LibavIteraction
- Durata: %1m %2s
+ Durata: %1m %2s
- Video: %1x%2,
+ Video: %1x%2,
- %1 fps,
+ %1 fps,
- Audio:
+ Audio:
@@ -833,11 +853,11 @@
- DLC
+ DLC
- Contenuti Scaricabili
+ Contenuti Scaricabili
@@ -2152,6 +2172,26 @@
Sospendi caricamento
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_ja.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Tue Nov 13 23:21:46 2012 +0400
@@ -344,7 +344,7 @@
- LibavIteraction
+ LibavInteraction
@@ -825,14 +825,6 @@
コントロール
-
-
-
-
-
-
-
-
PageNetType
@@ -2140,6 +2132,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_ko.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ko.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ko.ts Tue Nov 13 23:21:46 2012 +0400
@@ -340,7 +340,7 @@
- LibavIteraction
+ LibavInteraction
@@ -821,14 +821,6 @@
-
-
-
-
-
-
-
-
PageNetType
@@ -2136,6 +2128,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_lt.ts
--- a/share/hedgewars/Data/Locale/hedgewars_lt.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_lt.ts Tue Nov 13 23:21:46 2012 +0400
@@ -131,18 +131,18 @@
HWForm
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
File Types
-
+
File Types
-
+
-
+
@@ -202,13 +202,13 @@
HWGame
-
+
lt.txt
-
+
@@ -385,7 +385,7 @@
-
+
@@ -420,25 +420,25 @@
- LibavIteraction
-
-
+ LibavInteraction
+
+
-
+
-
+
-
+
@@ -1008,17 +1008,7 @@
PageNetGame
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1480,17 +1470,17 @@
PageVideos
-
+
-
+
-
+
@@ -1499,27 +1489,27 @@
-
+
-
+
-
+
-
+
-
+
@@ -1569,22 +1559,22 @@
-
+
-
+
-
+
-
+
@@ -1901,12 +1891,12 @@
-
+
-
+
@@ -1929,22 +1919,22 @@
-
+
-
+
-
+
-
+
@@ -2216,7 +2206,7 @@
QLineEdit
-
+
@@ -2243,77 +2233,77 @@
QMessageBox
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
@@ -2392,7 +2382,7 @@
-
+
@@ -2402,7 +2392,7 @@
-
+
@@ -2469,19 +2459,19 @@
-
-
-
+
+
+
-
+
-
+
@@ -2490,7 +2480,7 @@
-
+
@@ -2511,28 +2501,28 @@
-
-
+
+
-
+
-
+
-
+
-
+
@@ -2540,12 +2530,12 @@
QObject
-
+
-
+
@@ -2565,7 +2555,7 @@
-
+
@@ -2612,7 +2602,7 @@
-
+
@@ -2639,8 +2629,8 @@
-
-
+
+
@@ -2660,23 +2650,48 @@
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -2762,14 +2777,14 @@
-
-
+
+
-
-
+
+
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_ms.ts
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_ms.ts Tue Nov 13 23:21:46 2012 +0400
@@ -0,0 +1,3629 @@
+
+
+
+
+ AbstractPage
+
+
+
+
+
+
+
+ AmmoSchemeModel
+
+
+
+
+
+
+
+
+
+
+
+
+ FreqSpinBox
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GameCFGWidget
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HWAskQuitDialog
+
+
+
+
+
+
+
+ HWChatWidget
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HWForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ File Types
+
+
+
+
+
+ File Types
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HWGame
+
+
+
+
+ ms.txt
+
+
+
+
+
+
+
+
+ HWMapContainer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HWNetServersModel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HWNewNet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HWPasswordDialog
+
+
+
+
+
+
+
+ HWUploadVideoDialog
+
+
+
+
+
+
+
+
+
+
+
+
+ KB
+
+
+
+
+
+
+
+ LibavInteraction
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageAdmin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageConnecting
+
+
+
+
+
+
+
+ PageDrawMap
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageEditTeam
+
+
+
+
+
+
+
+
+
+
+
+
+ PageGameStats
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageInGame
+
+
+
+
+
+
+
+ PageInfo
+
+
+
+
+
+
+
+ PageMain
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+
+ Tips
+
+
+
+
+ PageMultiplayer
+
+
+
+
+
+
+
+ PageNetGame
+
+
+
+
+
+
+
+ PageNetType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageOptions
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PagePlayDemo
+
+
+
+
+
+
+
+
+
+
+
+
+ PageRoomsList
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageScheme
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageSelectWeapon
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageSinglePlayer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageTraining
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageVideos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QAction
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QCheckBox
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QComboBox
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QGroupBox
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QLabel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QLineEdit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QMainWindow
+
+
+
+
+
+
+
+ QMessageBox
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QObject
+
+
+
+
+
+
+
+
+
+
+
+
+ QPushButton
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RoomsListModel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SelWeaponWidget
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ToggleButtonWidget
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ binds
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ binds (categories)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ binds (descriptions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ binds (keys)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_nl.ts
--- a/share/hedgewars/Data/Locale/hedgewars_nl.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_nl.ts Tue Nov 13 23:21:46 2012 +0400
@@ -341,7 +341,7 @@
- LibavIteraction
+ LibavInteraction
@@ -828,14 +828,6 @@
-
-
-
-
-
-
-
-
PageNetType
@@ -2146,6 +2138,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_pl.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Tue Nov 13 23:21:46 2012 +0400
@@ -346,23 +346,43 @@
+ LibavInteraction
+
+
+ Długość: %1m %2s
+
+
+
+ Wideo: %1x%2,
+
+
+
+ %1 kl/s,
+
+
+
+ Audio:
+
+
+
LibavIteraction
- Długość: %1m %2s
+ Długość: %1m %2s
- Wideo: %1x%2,
+ Wideo: %1x%2,
- %1 kl/s,
+ %1 kl/s,
- Audio:
+ Audio:
@@ -841,11 +861,11 @@
- DLC
+ DLC
- Dodatki
+ Dodatki
@@ -2167,6 +2187,26 @@
Anuluj wysyłanie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_pt_BR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Tue Nov 13 23:21:46 2012 +0400
@@ -345,7 +345,7 @@
- LibavIteraction
+ LibavInteraction
@@ -833,14 +833,6 @@
Controle
-
-
-
-
-
-
-
-
PageNetType
@@ -2152,6 +2144,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_pt_PT.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Tue Nov 13 23:21:46 2012 +0400
@@ -345,22 +345,42 @@
- LibavIteraction
-
-
- Duração: %1m %2s
+ LibavInteraction
+
+
+
- Vídeo: %1x%2,
+ Vídeo: %1x%2,
- %1 fps,
+ %1 fps,
- Audio:
+ Audio:
+
+
+
+ LibavIteraction
+
+
+ Duração: %1m %2s
+
+
+
+ Vídeo: %1x%2,
+
+
+
+ %1 fps,
+
+
+
+ Audio:
@@ -833,11 +853,11 @@
- DLC
+ DLC
- Conteúdo Transferível
+ Conteúdo Transferível
@@ -2157,6 +2177,26 @@
Cancelar o upload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_ro.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ro.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ro.ts Tue Nov 13 23:21:46 2012 +0400
@@ -2,6 +2,13 @@
+ AbstractPage
+
+
+
+
+
+
AmmoSchemeModel
@@ -13,21 +20,6 @@
- DrawMapWidget
-
-
-
-
-
-
-
-
-
-
-
-
-
-
FreqSpinBox
@@ -38,6 +30,7 @@
Each turn
Every %1 turns
+
@@ -49,11 +42,11 @@
- Error
+ Error
- Illegal ammo scheme
+ Illegal ammo scheme
@@ -69,6 +62,13 @@
+ HWAskQuitDialog
+
+
+
+
+
+
HWChatWidget
@@ -130,10 +130,6 @@
-
-
-
-
HWForm
@@ -143,15 +139,15 @@
- Error
+ Error
- OK
+ OK
- Unable to start the server
+ Unable to start the server
@@ -159,7 +155,7 @@
- Please select record from the list above
+ Please select record from the list above
@@ -189,7 +185,7 @@
- Password
+ Password
-
+
+ Someone already uses your nickname %1 on the server.
Please pick another nickname:
-
- No nickname supplied.
-
-
HWGame
@@ -392,6 +386,32 @@
User quit
+
+ Remote host has closed connection
+
+
+
+ The server is too old. Disconnecting now.
+
+
+
+
+ HWPasswordDialog
+
+ Password
+ Password
+
+
+
+ HWUploadVideoDialog
+
+ Upload video
+
+
+
+ Upload
+
+
KB
@@ -401,6 +421,26 @@
+ LibavInteraction
+
+ Duration: %1m %2s
+
+
+
+
+ Video: %1x%2,
+
+
+
+ %1 fps,
+
+
+
+ Audio:
+
+
+
+
PageAdmin
Server message:
@@ -484,6 +524,10 @@
All files
+
+ Eraser
+
+
PageEditTeam
@@ -507,6 +551,7 @@
<p>The best killer is <b>%1</b> with <b>%2</b> kill in a turn.</p>
<p>The best killer is <b>%1</b> with <b>%2</b> kills in a turn.</p>
+
@@ -514,6 +559,7 @@
<p>A total of <b>%1</b> hedgehog was killed during this round.</p>
<p>A total of <b>%1</b> hedgehogs were killed during this round.</p>
+
@@ -537,6 +583,7 @@
The best killer is <b>%1</b> with <b>%2</b> kill in a turn.
The best killer is <b>%1</b> with <b>%2</b> kills in a turn.
+
@@ -544,6 +591,7 @@
<b>%1</b> hedgehog was killed during this round.
A total of <b>%1</b> hedgehogs were killed during this round.
+
@@ -551,6 +599,7 @@
(%1 kill)
(%1 kills)
+
@@ -558,6 +607,7 @@
+
@@ -565,6 +615,7 @@
+
@@ -572,6 +623,7 @@
<b>%1</b> was scared and skipped turn <b>%2</b> time.
<b>%1</b> was scared and skipped turn <b>%2</b> times.
+
@@ -583,14 +635,21 @@
+ PageInfo
+
+ Open the snapshot folder
+
+
+
+
PageMain
Local Game (Play a game on a single computer)
- Local Game (Play a game on a single computer)
+ Local Game (Play a game on a single computer)
Network Game (Play a game across a network)
- Network Game (Play a game across a network)
+ Network Game (Play a game across a network)
Simply pick the same color as a friend to play together as a team. Each of you will still control his or her own hedgehogs but they'll win or lose together.
@@ -841,6 +900,46 @@
Downloadable Content
+
+ Local Game
+
+
+
+ Play a game on a single computer
+
+
+
+ Network Game
+
+
+
+ Play a game across a network
+
+
+
+ Read about who is behind the Hedgewars Project
+
+
+
+ Leave a feedback here reporting issues, suggesting features or just saying how you like Hedgewars
+
+
+
+ Access the user created content downloadable from our website
+
+
+
+ Exit game
+
+
+
+ Manage videos recorded from game
+
+
+
+ Edit game preferences
+
+
PageMultiplayer
@@ -853,11 +952,11 @@
PageNet
Error
- Error
+ Error
Please select server from the list above
- Please select server from the list above
+ Please select server from the list above
@@ -868,15 +967,15 @@
Error
- Error
+ Error
Please enter room name
- Please enter room name
+ Please enter room name
OK
- OK
+ OK
@@ -889,6 +988,14 @@
Official server
Official server
+
+ Join or host your own game server in a Local Area Network.
+
+
+
+ Join hundreds of players online!
+
+
PageOptions
@@ -944,16 +1051,60 @@
Delete weapon set
+
+ General
+ General
+
+
+ Advanced
+ Advanced
+
+
+ Reset to default colors
+
+
+
+ Proxy host
+
+
+
+ Proxy port
+
+
+
+ Proxy login
+
+
+
+ Proxy password
+
+
+
+ No proxy
+
+
+
+ System proxy settings
+
+
+
+ Socks5 proxy
+
+
+
+ HTTP proxy
+
+
PagePlayDemo
Error
- Error
+ Error
OK
- OK
+ OK
Rename dialog
@@ -965,15 +1116,15 @@
Cannot rename to
- Cannot rename to
+ Cannot rename to
Cannot delete file
- Cannot delete file
+ Cannot delete file
Please select record from the list
- Please select record from the list
+ Please select record from the list
@@ -988,15 +1139,15 @@
Refresh
- Refresh
+ Refresh
Error
- Error
+ Error
OK
- OK
+ OK
Admin features
@@ -1009,60 +1160,58 @@
This game is in lobby.
You may join and start playing once the game starts.
- This game is in lobby.
+ This game is in lobby.
You may join and start playing once the game starts.
This game is in progress.
You may join and spectate now but you'll have to wait for the game to end to start playing.
- This game is in progress.
+ This game is in progress.
You may join and spectate now but you'll have to wait for the game to end to start playing.
%1 is the host. He may adjust settings and start the game.
- %1 is the host. He may adjust settings and start the game.
+ %1 is the host. He may adjust settings and start the game.
Random Map
- Random Map
+ Random Map
Games may be played on precreated or randomized maps.
- Games may be played on precreated or randomized maps.
+ Games may be played on precreated or randomized maps.
The Game Scheme defines general options and preferences like Round Time, Sudden Death or Vampirism.
- The Game Scheme defines general options and preferences like Round Time, Sudden Death or Vampirism.
+ The Game Scheme defines general options and preferences like Round Time, Sudden Death or Vampirism.
The Weapon Scheme defines available weapons and their ammunition count.
- The Weapon Scheme defines available weapons and their ammunition count.
+ The Weapon Scheme defines available weapons and their ammunition count.
There are %1 clients connected to this room.
-
+
There is %1 client connected to this room.
There are %1 clients connected to this room.
+
There are %1 teams participating in this room.
-
+
There is %1 team participating in this room.
There are %1 teams participating in this room.
+
Please enter room name
- Please enter room name
+ Please enter room name
Please select room from the list
- Please select room from the list
-
-
- Random Maze
-
+ Please select room from the list
Rules:
@@ -1081,13 +1230,9 @@
- Warning
-
-
-
The game you are trying to join has started.
Do you still want to join the room?
- The game you are trying to join has started.
+ The game you are trying to join has started.
Do you still want to join the room?
@@ -1095,6 +1240,7 @@
+
@@ -1252,26 +1398,66 @@
PageSinglePlayer
Simple Game (a quick game against the computer, settings are chosen for you)
- Simple Game (a quick game against the computer, settings are chosen for you)
+ Simple Game (a quick game against the computer, settings are chosen for you)
Multiplayer (play a hotseat game against your friends, or AI teams)
- Multiplayer (play a hotseat game against your friends, or AI teams)
+ Multiplayer (play a hotseat game against your friends, or AI teams)
Training Mode (Practice your skills in a range of training missions)
- Training Mode (Practice your skills in a range of training missions)
+ Training Mode (Practice your skills in a range of training missions)
Demos (Watch recorded demos)
- Demos (Watch recorded demos)
+ Demos (Watch recorded demos)
Load (Load a previously saved game)
- Load (Load a previously saved game)
-
-
- Campaign Mode (...)
+ Load (Load a previously saved game)
+
+
+ Simple Game
+
+
+
+ Play a quick game against the computer with random settings
+
+
+
+ Multiplayer
+
+
+
+ Play a hotseat game against your friends, or AI teams
+
+
+
+ Campaign Mode
+
+
+
+ Training Mode
+
+
+
+ Practice your skills in a range of training missions
+
+
+
+ Demos
+
+
+
+ Watch recorded demos
+
+
+
+ Load
+ Load
+
+
+ Load a previously saved game
@@ -1285,6 +1471,53 @@
Select a mission!
+
+ Pick the mission or training to play
+
+
+
+ Start fighting
+
+
+
+
+ PageVideos
+
+ Name
+ Name
+
+
+ Size
+
+
+
+ %1 bytes
+
+
+
+
+
+
+
+ (in progress...)
+
+
+
+ Date:
+
+
+
+ Size:
+
+
+
+ encoding
+
+
+
+ uploading
+
+
QAction
@@ -1391,6 +1624,26 @@
Frontend effects
Frontend effects
+
+ Save password
+
+
+
+ Save account name and password
+
+
+
+ Video is private
+
+
+
+ Record audio
+
+
+
+ Use game resolution
+
+
QComboBox
@@ -1561,6 +1814,30 @@
Schemes and Weapons
+
+ Custom colors
+
+
+
+ Miscellaneous
+
+
+
+ Proxy settings
+
+
+
+ Video recording options
+
+
+
+ Videos
+
+
+
+ Description
+
+
QLabel
@@ -1614,7 +1891,7 @@
Net nick
- Net nick
+ Net nick
Resolution
@@ -1694,7 +1971,7 @@
Restart game to apply
- Restart game to apply
+ Restart game to apply
Explosives
@@ -1746,7 +2023,7 @@
Password
- Password
+ Password
% Get Away Time
@@ -1756,6 +2033,68 @@
This program is distributed under the GNU General Public License v2
+
+ There are videos that are currently being processed.
+Exiting now will abort them.
+Do you really want to quit?
+
+
+
+ Please provide either the YouTube account name or the email address associated with the Google Account.
+
+
+
+ Account name (or email):
+
+
+
+ Password:
+
+
+
+ Video title:
+
+
+
+ Video description:
+
+
+
+ Tags (comma separated):
+
+
+
+ Summary
+
+
+
+ Description
+
+
+
+ Nickname
+ Nickname
+
+
+ Format
+
+
+
+ Audio codec
+
+
+
+ Video codec
+
+
+
+ Framerate
+
+
+
+ Bitrate (Kbps)
+
+
QLineEdit
@@ -1767,6 +2106,10 @@
hedgehog %1
+
+ anonymous
+
+
QMainWindow
@@ -1779,7 +2122,7 @@
QMessageBox
Network
- Network
+ Network
Connection to server is lost
@@ -1793,13 +2136,13 @@
Failed to open data directory:
%1
Please check your installation
- Failed to open data directory:
+ Failed to open data directory:
%1
Please check your installation
Weapons
- Weapons
+ Weapons
Can not edit default weapon set
@@ -1811,15 +2154,7 @@
Really delete this weapon set?
- Really delete this weapon set?
-
-
- Can not overwrite default weapon set '%1'!
-
-
-
- All file associations have been set.
-
+ Really delete this weapon set?
File association failed.
@@ -1827,26 +2162,217 @@
Teams
- Teams
-
-
- Really delete this team?
-
-
-
- Schemes
-
-
-
- Can not delete default scheme '%1'!
-
-
-
- Really delete this game scheme?
-
-
-
- Can not delete default weapon set '%1'!
+ Teams
+
+
+ Teams - Are you sure?
+
+
+
+ Do you really want to delete the team '%1'?
+
+
+
+ Cannot delete default scheme '%1'!
+
+
+
+ Please select a record from the list
+
+
+
+ Unable to start server
+
+
+
+ Hedgewars - Error
+
+
+
+ Hedgewars - Success
+
+
+
+ All file associations have been set
+
+
+
+ Please fill out all fields
+
+
+
+ Successfully posted the issue on hedgewars.googlecode.com
+
+
+
+ Error during authentication at google.com
+
+
+
+ Error reporting the issue, please try again later (or visit hedgewars.googlecode.com directly)
+
+
+
+ Main - Error
+
+
+
+ Cannot create directory %1
+ Cannot create directory %1
+
+
+ Failed to open data directory:
+%1
+
+Please check your installation!
+
+
+
+ TCP - Error
+
+
+
+ Unable to start the server: %1.
+ Unable to start the server: %1.
+
+
+ Unable to run engine at
+
+
+
+ Error code: %1
+
+
+
+ Error while authenticating at google.com:
+
+
+
+
+ Login or password is incorrect
+
+
+
+ Video upload - Error
+
+
+
+ Error while sending metadata to youtube.com:
+
+
+
+
+ Netgame - Error
+
+
+
+ Please select a server from the list
+
+
+
+ Please enter room name
+ Please enter room name
+
+
+ Record Play - Error
+
+
+
+ Please select record from the list
+ Please select record from the list
+
+
+ Cannot rename to
+
+
+
+ Cannot delete file
+
+
+
+ Room Name - Error
+
+
+
+ Please select room from the list
+ Please select room from the list
+
+
+ Room Name - Are you sure?
+
+
+
+ The game you are trying to join has started.
+Do you still want to join the room?
+ The game you are trying to join has started.
+Do you still want to join the room?
+
+
+ Schemes - Warning
+
+
+
+ Schemes - Are you sure?
+
+
+
+ Do you really want to delete the game scheme '%1'?
+
+
+
+ Videos - Are you sure?
+
+
+
+ Do you really want to delete the video '%1'?
+
+
+
+ Do you really want to remove %1 file(s)?
+
+
+
+
+
+
+
+ Do you really want to cancel uploading %1?
+
+
+
+ File error
+
+
+
+ Cannot open '%1' for writing
+
+
+
+ Cannot open '%1' for reading
+
+
+
+ Cannot use the ammo '%1'!
+
+
+
+ Weapons - Warning
+
+
+
+ Cannot overwrite default weapon set '%1'!
+
+
+
+ Cannot delete default weapon set '%1'!
+
+
+
+ Weapons - Are you sure?
+
+
+
+ Do you really want to delete the weapon set '%1'?
@@ -1854,15 +2380,15 @@
QObject
Error
- Error
+ Error
Cannot create directory %1
- Cannot create directory %1
+ Cannot create directory %1
OK
- OK
+ OK
Nickname
@@ -1947,36 +2473,127 @@
more
+
+ More info
+
+
+
+ Set default options
+
+
+
+ Restore default coding parameters
+
+
+
+ Open videos directory
+
+
+
+ Open the video directory in your system
+
+
+
+ Play
+
+
+
+ Play this video
+
+
+
+ Delete this video
+
+
+
+ Upload to YouTube
+
+
+
+ Upload this video to your Youtube account
+
+
+
+ Cancel uploading
+
+
QTableWidget
Room Name
- Room Name
+ Room Name
C
- C
+ C
T
- T
+ T
Owner
- Owner
+ Owner
Map
- Map
+ Map
Rules
- Rules
+ Rules
Weapons
- Weapons
+ Weapons
+
+
+
+ RoomsListModel
+
+ In progress
+
+
+
+ Room Name
+ Room Name
+
+
+ C
+ C
+
+
+ T
+ T
+
+
+ Owner
+ Owner
+
+
+ Map
+ Map
+
+
+ Rules
+ Rules
+
+
+ Weapons
+ Weapons
+
+
+ Random Map
+ Random Map
+
+
+ Random Maze
+
+
+
+ Hand-drawn
+
@@ -2010,15 +2627,15 @@
TCPBase
Error
- Error
+ Error
Unable to start the server: %1.
- Unable to start the server: %1.
+ Unable to start the server: %1.
Unable to run engine: %1 (
- Unable to run engine: %1 (
+ Unable to run engine: %1 (
@@ -2292,6 +2909,14 @@
slot 10
slot 10
+
+ mute audio
+
+
+
+ record
+
+
binds (categories)
@@ -2378,6 +3003,10 @@
Toggle labels above hedgehogs:
Toggle labels above hedgehogs:
+
+ Record video:
+
+
binds (keys)
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_ru.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Tue Nov 13 23:21:46 2012 +0400
@@ -346,23 +346,43 @@
+ LibavInteraction
+
+ Duration: %1m %2s
+
+ Длительность: %1мин %2сек
+
+
+ Video: %1x%2,
+ Видео: %1x%2,
+
+
+ %1 fps,
+ %1 кадров/сек,
+
+
+ Audio:
+ Аудио:
+
+
+
LibavIteraction
Duration: %1m %2s
- Длительность: %1мин %2сек
+ Длительность: %1мин %2сек
Video: %1x%2,
- Видео: %1x%2,
+ Видео: %1x%2,
%1 fps,
- %1 кадров/сек,
+ %1 кадров/сек,
Audio:
- Аудио:
+ Аудио:
@@ -839,14 +859,6 @@
Control
Управление
-
- DLC
-
-
-
- Downloadable Content
-
-
PageNetType
@@ -2009,6 +2021,8 @@
Do you really want to remove %1 file(s)?
+
+
@@ -2161,6 +2175,26 @@
Cancel uploading
Отменить отправку
+
+ Restore default coding parameters
+
+
+
+ Open the video directory in your system
+
+
+
+ Play this video
+
+
+
+ Delete this video
+
+
+
+ Upload this video to your Youtube account
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_sk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Tue Nov 13 23:21:46 2012 +0400
@@ -347,7 +347,7 @@
- LibavIteraction
+ LibavInteraction
Duration: %1m %2s
@@ -841,12 +841,8 @@
Ovládanie
- DLC
-
-
-
Downloadable Content
- Stiahnuteľný obsah
+ Stiahnuteľný obsah
@@ -2163,6 +2159,26 @@
Cancel uploading
+
+ Restore default coding parameters
+
+
+
+ Open the video directory in your system
+
+
+
+ Play this video
+
+
+
+ Delete this video
+
+
+
+ Upload this video to your Youtube account
+
+
RoomsListModel
@@ -2196,7 +2212,7 @@
Weapons
-
+ Výzbroj
Random Map
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_sv.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Tue Nov 13 23:21:46 2012 +0400
@@ -344,7 +344,7 @@
- LibavIteraction
+ LibavInteraction
Duration: %1m %2s
@@ -832,12 +832,8 @@
Kontroll
- DLC
-
-
-
Downloadable Content
- Nedladdningsbart innehåll
+ Nedladdningsbart innehåll
@@ -2150,6 +2146,26 @@
Cancel uploading
+
+ Restore default coding parameters
+
+
+
+ Open the video directory in your system
+
+
+
+ Play this video
+
+
+
+ Delete this video
+
+
+
+ Upload this video to your Youtube account
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_tr_TR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Tue Nov 13 23:21:46 2012 +0400
@@ -340,7 +340,7 @@
- LibavIteraction
+ LibavInteraction
Duration: %1m %2s
@@ -821,14 +821,6 @@
Control
Kontrol
-
- DLC
-
-
-
- Downloadable Content
-
-
PageNetType
@@ -2136,6 +2128,26 @@
Cancel uploading
+
+ Restore default coding parameters
+
+
+
+ Open the video directory in your system
+
+
+
+ Play this video
+
+
+
+ Delete this video
+
+
+
+ Upload this video to your Youtube account
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_uk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Tue Nov 13 23:21:46 2012 +0400
@@ -155,7 +155,7 @@
Nickname
-
+ Ім'я
No nickname supplied.
@@ -345,7 +345,7 @@
- LibavIteraction
+ LibavInteraction
Duration: %1m %2s
@@ -838,14 +838,6 @@
Control
Керування
-
- DLC
-
-
-
- Downloadable Content
-
-
PageNetType
@@ -1780,7 +1772,7 @@
Nickname
-
+ Ім'я
Format
@@ -2160,6 +2152,26 @@
Cancel uploading
+
+ Restore default coding parameters
+
+
+
+ Open the video directory in your system
+
+
+
+ Play this video
+
+
+
+ Delete this video
+
+
+
+ Upload this video to your Youtube account
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_zh_CN.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Tue Nov 13 23:21:46 2012 +0400
@@ -129,18 +129,18 @@
HWForm
-
-
+
+
DefaultTeam
-
+
Game aborted
-
+
Your nickname %1 is
registered on Hedgewars.org
Please provide your password below
@@ -148,51 +148,51 @@
-
+
No password supplied.
-
+
Nickname
-
+
Someone already uses your nickname %1 on the server.
Please pick another nickname:
-
+
No nickname supplied.
-
+
Hedgewars Demo File
File Types
-
+
Hedgewars Save File
File Types
-
+
Demo name
-
+
Demo name:
-
-
+
+
Cannot save record to file %1
无法录入文件 %1
@@ -200,13 +200,13 @@
HWGame
-
+
en.txt
zh_CN.txt
-
+
Cannot open demofile %1
DEMO %1 打不开
@@ -373,7 +373,7 @@
-
+
Quit reason:
退出原因:
@@ -418,25 +418,25 @@
- LibavIteraction
-
-
+ LibavInteraction
+
+
Duration: %1m %2s
-
+
Video: %1x%2,
-
+
%1 fps,
-
+
Audio:
@@ -994,17 +994,7 @@
PageNetGame
-
- DLC
-
-
-
-
- Downloadable Content
-
-
-
-
+
Control
Ctrl
@@ -1464,44 +1454,44 @@
PageVideos
-
+
Name
-
+
Size
-
+
%1 bytes
-
+
(in progress...)
-
+
Date:
-
+
Size:
-
+
encoding
-
+
uploading
@@ -1514,22 +1504,22 @@
踢
-
+
Update
更新
-
+
Start
开始
-
+
Restrict Joins
限制参与
-
+
Restrict Team Additions
限制团队插件
@@ -1883,12 +1873,12 @@
-
+
Videos
-
+
Description
@@ -1937,17 +1927,17 @@
开发者:
-
+
Art:
艺术:
-
+
Translations:
翻译:
-
+
Special thanks:
特别感谢:
@@ -1983,7 +1973,7 @@
版本
-
+
Sounds:
声音:
@@ -2198,7 +2188,7 @@
QLineEdit
-
+
unnamed
无名
@@ -2235,77 +2225,77 @@
-
+
Teams - Are you sure?
-
+
Do you really want to delete the team '%1'?
-
+
Cannot delete default scheme '%1'!
-
+
Please select a record from the list
-
+
Unable to start server
-
+
Connection to server is lost
服务器连接丢失
-
+
Hedgewars - Error
-
-
+
+
Hedgewars - Success
-
+
All file associations have been set
-
+
Successfully posted the issue on hedgewars.googlecode.com
-
-
+
+
Error during authentication at google.com
-
+
Error reporting the issue, please try again later (or visit hedgewars.googlecode.com directly)
-
+
File association failed.
-
+
Please fill out all fields
@@ -2374,7 +2364,7 @@
-
+
Netgame - Error
@@ -2384,7 +2374,7 @@
-
+
Please enter room name
@@ -2451,26 +2441,26 @@
-
-
-
+
+
+
Videos - Are you sure?
-
+
Do you really want to delete the video '%1'?
-
+
Do you really want to remove %1 file(s)?
-
+
Do you really want to cancel uploading %1?
@@ -2491,28 +2481,28 @@
-
-
+
+
Weapons - Warning
-
+
Cannot overwrite default weapon set '%1'!
-
+
Cannot delete default weapon set '%1'!
-
+
Weapons - Are you sure?
-
+
Do you really want to delete the weapon set '%1'?
@@ -2520,12 +2510,12 @@
QObject
-
+
Nickname
-
+
Please enter your nickname
@@ -2598,19 +2588,19 @@
-
+
Cancel
取消
-
-
+
+
Delete
删除
-
+
Ready
准备好了
@@ -2635,23 +2625,48 @@
-
+
+ Restore default coding parameters
+
+
+
+
Open videos directory
-
+
+ Open the video directory in your system
+
+
+
+
Play
-
-
+
+ Play this video
+
+
+
+
+ Delete this video
+
+
+
+
+
Upload to YouTube
-
+
+ Upload this video to your Youtube account
+
+
+
+
Cancel uploading
@@ -2742,14 +2757,14 @@
-
-
+
+
new
新
-
-
+
+
copy of
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/hedgewars_zh_TW.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Tue Nov 13 23:21:46 2012 +0400
@@ -340,7 +340,7 @@
- LibavIteraction
+ LibavInteraction
Duration: %1m %2s
@@ -821,14 +821,6 @@
Control
房間管理
-
- DLC
-
-
-
- Downloadable Content
-
-
PageNetType
@@ -2136,6 +2128,26 @@
Cancel uploading
+
+ Restore default coding parameters
+
+
+
+ Open the video directory in your system
+
+
+
+ Play this video
+
+
+
+ Delete this video
+
+
+
+ Upload this video to your Youtube account
+
+
RoomsListModel
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/it.lua
--- a/share/hedgewars/Data/Locale/it.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/it.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Giro migliore: ",
["Feeble Resistance"] = "Resistenza Finale",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/ko.lua
--- a/share/hedgewars/Data/Locale/ko.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/ko.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
-- ["Fastest lap: "] = "",
-- ["Feeble Resistance"] = "",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/lt.lua
--- a/share/hedgewars/Data/Locale/lt.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/lt.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Greièiausias Ratas: ",
["Feeble Resistance"] = "Silpnaus Atsparumo Tvirtovë",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/pl.lua
--- a/share/hedgewars/Data/Locale/pl.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/pl.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Najszybsze okrążenie: ",
["Feeble Resistance"] = "Ruch Oporu",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/pt_BR.lua
--- a/share/hedgewars/Data/Locale/pt_BR.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/pt_BR.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Volta mais rápida: ",
-- ["Feeble Resistance"] = "",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/pt_PT.lua
--- a/share/hedgewars/Data/Locale/pt_PT.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/pt_PT.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Volta mais rápida: ",
-- ["Feeble Resistance"] = "",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/ro.txt
--- a/share/hedgewars/Data/Locale/ro.txt Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/ro.txt Tue Nov 13 23:21:46 2012 +0400
@@ -1,4 +1,4 @@
-; English locale
+; Romanian locale
00:00=Grenadă
00:01=Bombă cu dispersie
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/ru.lua
--- a/share/hedgewars/Data/Locale/ru.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/ru.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
-- ["Fastest lap: "] = "",
-- ["Feeble Resistance"] = "",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/sk.lua
--- a/share/hedgewars/Data/Locale/sk.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/sk.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Najrýchlejšie kolo: ",
["Feeble Resistance"] = "Slabý odpor",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/stub.lua
--- a/share/hedgewars/Data/Locale/stub.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/stub.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
-- ["Fastest lap: "] = "",
-- ["Feeble Resistance"] = "",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/sv.lua
--- a/share/hedgewars/Data/Locale/sv.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/sv.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,7 +209,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Snabbast varv: ",
["Feeble Resistance"] = "Klent motstånd",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/uk.lua
--- a/share/hedgewars/Data/Locale/uk.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/uk.lua Tue Nov 13 23:21:46 2012 +0400
@@ -208,7 +208,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "Найшвидша партія: ",
["Feeble Resistance"] = "Жалюгідні Повстанці",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Locale/zh_CN.lua
--- a/share/hedgewars/Data/Locale/zh_CN.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Locale/zh_CN.lua Tue Nov 13 23:21:46 2012 +0400
@@ -208,7 +208,7 @@
-- ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
-- ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
-- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
--- ["FAG"] = "", -- Mutant
+-- ["INSANITY"] = "", -- Mutant
-- ["Family Reunion"] = "", -- A_Classic_Fairytale:family
["Fastest lap: "] = "最快记录:",
["Feeble Resistance"] = "反抗者",
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua Tue Nov 13 23:16:21 2012 +0400
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua Tue Nov 13 23:21:46 2012 +0400
@@ -209,6 +209,7 @@
checkScore()
giveWeapons(CurrentHedgehog)
drawCircles()
+ setAIHints()
kill_reward= numhhs*10
if CurrentHedgehog == mutant then
@@ -240,7 +241,7 @@
AddCaption(loc("HOLY SHIT!"))
PlaySound(sndLaugh)
elseif killsCounter > 8 then
- AddCaption(loc("FAG"))
+ AddCaption(loc("INSANITY"))
end
end
@@ -399,6 +400,16 @@
mutant=nil
end
+function setAIHints()
+ for i = 0, #hhs do
+ if mutant == nil or hhs[i] == mutant or CurrentHedgehog == mutant then
+ SetGearAIHints(hhs[i], aihUsual)
+ else
+ SetGearAIHints(hhs[i], aihDoesntMatter)
+ end
+ end
+end
+
function removeFeeder(gear)
if gear~=nil then
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Pirate/Firepunch2.ogg
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch2.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Pirate/Firepunch3.ogg
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch3.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Pirate/Firepunch4.ogg
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch4.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Pirate/Firepunch5.ogg
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch5.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Pirate/Firepunch6.ogg
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch6.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Robot/Firepunch2.ogg
Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch2.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Robot/Firepunch3.ogg
Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch3.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Robot/Firepunch4.ogg
Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch4.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Robot/Firepunch5.ogg
Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch5.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Robot/Firepunch6.ogg
Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch6.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Singer/Firepunch2.ogg
Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch2.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Singer/Firepunch3.ogg
Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch3.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Singer/Firepunch4.ogg
Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch4.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Singer/Firepunch5.ogg
Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch5.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Singer/Firepunch6.ogg
Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch6.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Surfer/Firepunch2.ogg
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch2.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Surfer/Firepunch3.ogg
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch3.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Surfer/Firepunch4.ogg
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch4.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Surfer/Firepunch5.ogg
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch5.ogg has changed
diff -r fcbaa236a2d5 -r b216953c2617 share/hedgewars/Data/Sounds/voices/Surfer/Firepunch6.ogg
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch6.ogg has changed