merge...
--- a/gameServer/Actions.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/Actions.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE CPP, OverloadedStrings, ScopedTypeVariables #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
module Actions where
--- a/gameServer/ClientIO.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/ClientIO.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE ScopedTypeVariables, OverloadedStrings, Rank2Types #-}
module ClientIO where
--- a/gameServer/ConfigFile.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/ConfigFile.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE RankNTypes #-}
module ConfigFile where
--- a/gameServer/Consts.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/Consts.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE OverloadedStrings #-}
module Consts where
--- a/gameServer/CoreTypes.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/CoreTypes.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE CPP, OverloadedStrings, DeriveDataTypeable #-}
module CoreTypes where
--- a/gameServer/EngineInteraction.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/EngineInteraction.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE OverloadedStrings #-}
module EngineInteraction(replayToDemo, checkNetCmd, toEngineMsg, drawnMapData) where
--- a/gameServer/FloodDetection.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/FloodDetection.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE OverloadedStrings, BangPatterns #-}
module FloodDetection where
--- a/gameServer/HWProtoChecker.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/HWProtoChecker.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE OverloadedStrings #-}
module HWProtoChecker where
--- a/gameServer/HWProtoCore.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/HWProtoCore.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE OverloadedStrings #-}
module HWProtoCore where
--- a/gameServer/HWProtoInRoomState.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/HWProtoInRoomState.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE OverloadedStrings #-}
module HWProtoInRoomState where
--- a/gameServer/HWProtoLobbyState.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/HWProtoLobbyState.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE OverloadedStrings #-}
module HWProtoLobbyState where
--- a/gameServer/HWProtoNEState.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/HWProtoNEState.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE OverloadedStrings, CPP #-}
module HWProtoNEState where
--- a/gameServer/HandlerUtils.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/HandlerUtils.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
module HandlerUtils where
import Control.Monad.Reader
--- a/gameServer/JoinsMonitor.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/JoinsMonitor.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE BangPatterns #-}
module JoinsMonitor(
--- a/gameServer/NetRoutines.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/NetRoutines.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE ScopedTypeVariables, OverloadedStrings #-}
module NetRoutines where
--- a/gameServer/OfficialServer/DBInteraction.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/OfficialServer/DBInteraction.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE CPP, ScopedTypeVariables, OverloadedStrings #-}
module OfficialServer.DBInteraction
(
--- a/gameServer/OfficialServer/GameReplayStore.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/OfficialServer/GameReplayStore.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE ScopedTypeVariables #-}
module OfficialServer.GameReplayStore where
--- a/gameServer/OfficialServer/checker.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/OfficialServer/checker.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE CPP, ScopedTypeVariables, OverloadedStrings #-}
module Main where
--- a/gameServer/OfficialServer/extdbinterface.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/OfficialServer/extdbinterface.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE ScopedTypeVariables, OverloadedStrings #-}
module Main where
--- a/gameServer/Opts.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/Opts.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE CPP #-}
module Opts
(
--- a/gameServer/RoomsAndClients.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/RoomsAndClients.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE BangPatterns, GeneralizedNewtypeDeriving #-}
module RoomsAndClients(
--- a/gameServer/ServerCore.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/ServerCore.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
module ServerCore where
import Control.Concurrent
--- a/gameServer/ServerState.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/ServerState.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
module ServerState
(
module RoomsAndClients,
--- a/gameServer/Store.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/Store.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE BangPatterns, GeneralizedNewtypeDeriving #-}
module Store(
ElemIndex(),
--- a/gameServer/Utils.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/Utils.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE OverloadedStrings #-}
module Utils where
--- a/gameServer/Votes.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/Votes.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE OverloadedStrings #-}
module Votes where
--- a/gameServer/hedgewars-server.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/hedgewars-server.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE CPP, ScopedTypeVariables, OverloadedStrings #-}
module Main where
--- a/gameServer/stresstest.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/stresstest.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE CPP #-}
module Main where
--- a/gameServer/stresstest2.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/stresstest2.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE CPP #-}
module Main where
--- a/gameServer/stresstest3.hs Sat Nov 08 11:26:16 2014 -0500
+++ b/gameServer/stresstest3.hs Sun Nov 09 14:33:31 2014 -0500
@@ -1,3 +1,21 @@
+{-
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \-}
+
{-# LANGUAGE CPP #-}
module Main where
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts Sat Nov 08 11:26:16 2014 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Sun Nov 09 14:33:31 2014 -0500
@@ -22,10 +22,6 @@
<translation>nuovo</translation>
</message>
<message>
- <source>copy of</source>
- <translation type="obsolete">copia di</translation>
- </message>
- <message>
<source>copy of %1</source>
<translation>copia di %1</translation>
</message>
@@ -103,22 +99,10 @@
<translation>Invia commento</translation>
</message>
<message>
- <source>Please give us feedback!</source>
- <translation type="obsolete">Per favore, inviaci un commento!</translation>
- </message>
- <message>
<source>We are always happy about suggestions, ideas, or bug reports.</source>
<translation>Siamo sempre felici di ricevere suggerimenti, idee o segnalazioni di bachi.</translation>
</message>
<message>
- <source>If you found a bug, you can see if it's already known here (english): </source>
- <translation type="obsolete">Se trovi un baco, puoi vedere se è già conosciuto qui (in inglese): </translation>
- </message>
- <message>
- <source>Your email address is optional, but we may want to contact you.</source>
- <translation type="obsolete">Il tuo indirizzo di posta elettronica è opzionale, ma potremmo volerti contattare.</translation>
- </message>
- <message>
<source>Send us feedback!</source>
<translation>Mandaci un commento!</translation>
</message>
@@ -156,10 +140,6 @@
<translation>Modifica schemi</translation>
</message>
<message>
- <source>Game Options</source>
- <translation type="obsolete">Opzioni di Gioco</translation>
- </message>
- <message>
<source>Game scheme will auto-select a weapon</source>
<translation>Lo schema di gioco sceglierà automaticamente un'arma</translation>
</message>
@@ -493,7 +473,7 @@
Last two engine messages:
%2</source>
- <translation type="unfinished">ERRORE non recuperabile! Il motore di gioco si è dovuto arrestare.
+ <translation>ERRORE non recuperabile! Il motore di gioco si è dovuto arrestare.
Ci dispiace molto per l'inconveniente :(
@@ -610,10 +590,6 @@
<translation>Mappa:</translation>
</message>
<message>
- <source>Theme: </source>
- <translation type="obsolete">Tema: </translation>
- </message>
- <message>
<source>Load drawn map</source>
<translation>Carica mappa disegnata</translation>
</message>
@@ -635,7 +611,7 @@
</message>
<message>
<source>Random perlin</source>
- <translation type="unfinished"></translation>
+ <translation>Rumore casuale</translation>
</message>
<message>
<source>Style:</source>
@@ -684,10 +660,6 @@
<translation>%1 *** %2 è entrato nella stanza</translation>
</message>
<message>
- <source>%1 *** %2 has joined</source>
- <translation type="obsolete">%1 *** %2 è entrato</translation>
- </message>
- <message>
<source>%1 *** %2 has left (%3)</source>
<translation>%1 *** %2 ha lasciato (%3)</translation>
</message>
@@ -771,13 +743,6 @@
</message>
</context>
<context>
- <name>KB</name>
- <message>
- <source>SDL_ttf returned error while rendering text, most propably it is related to the bug in freetype2. It's recommended to update your freetype lib.</source>
- <translation type="obsolete">SDL_ttf ha restituito un errore durante il rendering del testo, probabilmente relativo ad un bug della libreria freetype2. Si raccomanda di aggiornare le proprie librerie freetype.</translation>
- </message>
-</context>
-<context>
<name>KeyBinder</name>
<message>
<source>Category</source>
@@ -787,19 +752,6 @@
<context>
<name>LibavInteraction</name>
<message>
- <source>Duration: %1m %2s
-</source>
- <translation type="obsolete">Durata: %1m %2s</translation>
- </message>
- <message>
- <source>Video: %1x%2, </source>
- <translation type="obsolete">Video: %1x%2, </translation>
- </message>
- <message>
- <source>%1 fps, </source>
- <translation type="obsolete">%1 fps, </translation>
- </message>
- <message>
<source>Audio: </source>
<translation>Audio:</translation>
</message>
@@ -1083,9 +1035,9 @@
</message>
<message numerus="yes">
<source>(%1 %2)</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>(%1 %2)</numerusform>
+ <numerusform>(%1 %2)</numerusform>
</translation>
</message>
</context>
@@ -1176,10 +1128,6 @@
<context>
<name>PageNetGame</name>
<message>
- <source>Control</source>
- <translation type="obsolete">Controllo</translation>
- </message>
- <message>
<source>Edit game preferences</source>
<translation>Modifica preferenze</translation>
</message>
@@ -1392,37 +1340,9 @@
<context>
<name>PageRoomsList</name>
<message>
- <source>Create</source>
- <translation type="obsolete">Crea</translation>
- </message>
- <message>
- <source>Join</source>
- <translation type="obsolete">Entra</translation>
- </message>
- <message>
<source>Admin features</source>
<translation>Opzioni amministrative</translation>
</message>
- <message>
- <source>Room Name:</source>
- <translation type="obsolete">Nome stanza:</translation>
- </message>
- <message>
- <source>Rules:</source>
- <translation type="obsolete">Regole:</translation>
- </message>
- <message>
- <source>Weapons:</source>
- <translation type="obsolete">Armi:</translation>
- </message>
- <message>
- <source>Search:</source>
- <translation type="obsolete">Cerca:</translation>
- </message>
- <message>
- <source>Clear</source>
- <translation type="obsolete">Cancella</translation>
- </message>
<message numerus="yes">
<source>%1 players online</source>
<translation>
@@ -1447,10 +1367,6 @@
<translation>Stato della stanza</translation>
</message>
<message>
- <source>Clear filters</source>
- <translation type="obsolete">Rimuovi filtri</translation>
- </message>
- <message>
<source>Open server administration page</source>
<translation>Apri pagina di amministrazione del server</translation>
</message>
@@ -1579,19 +1495,19 @@
</message>
<message>
<source>None (Default)</source>
- <translation type="unfinished"></translation>
+ <translation>Nessuno (Default)</translation>
</message>
<message>
<source>Wrap (World wraps)</source>
- <translation type="unfinished"></translation>
+ <translation>Avvolgi (il mondo avvolge)</translation>
</message>
<message>
<source>Bounce (Edges reflect)</source>
- <translation type="unfinished"></translation>
+ <translation>Rimbalza (i bordi si riflettono)</translation>
</message>
<message>
<source>Sea (Edges connect to sea)</source>
- <translation type="unfinished"></translation>
+ <translation>Mare (i bordi si connettono al mare)</translation>
</message>
</context>
<context>
@@ -1689,26 +1605,12 @@
<translation>caricamento</translation>
</message>
<message>
- <source>Date: %1
-</source>
- <translation type="obsolete">Data: %1
-</translation>
- </message>
- <message>
- <source>Size: %1
-</source>
- <translation type="obsolete">Dimensione: %1
-</translation>
- </message>
- <message>
<source>Date: %1</source>
- <translation type="unfinished">Data: %1
- {1?}</translation>
+ <translation>Data: %1</translation>
</message>
<message>
<source>Size: %1</source>
- <translation type="unfinished">Dimensione: %1
- {1?}</translation>
+ <translation>Dimensione: %1</translation>
</message>
</context>
<context>
@@ -1754,10 +1656,6 @@
<translation>Rimuovi amico</translation>
</message>
<message>
- <source>Update</source>
- <translation type="obsolete">Aggiorna</translation>
- </message>
- <message>
<source>Restrict Unregistered Players Join</source>
<translation>Impedisci la partecipazione di giocatori non registrati</translation>
</message>
@@ -1846,35 +1744,35 @@
</message>
<message>
<source>Team</source>
- <translation type="unfinished">Squadra</translation>
+ <translation>Squadra</translation>
</message>
<message>
<source>Enable team tags by default</source>
- <translation type="unfinished">Abilita i tag della squadra in automatico</translation>
+ <translation>Abilita i tag della squadra in automatico</translation>
</message>
<message>
<source>Hog</source>
- <translation type="unfinished">Riccio</translation>
+ <translation>Riccio</translation>
</message>
<message>
<source>Enable hedgehog tags by default</source>
- <translation type="unfinished">Abilita i tag dei ricci in automatico</translation>
+ <translation>Abilita i tag dei ricci in automatico</translation>
</message>
<message>
<source>Health</source>
- <translation type="unfinished">Vita</translation>
+ <translation>Vita</translation>
</message>
<message>
<source>Enable health tags by default</source>
- <translation type="unfinished">Abilita i tag della vita in automatico</translation>
+ <translation>Abilita i tag della vita in automatico</translation>
</message>
<message>
<source>Translucent</source>
- <translation type="unfinished"></translation>
+ <translation>Semitrasparente</translation>
</message>
<message>
<source>Enable translucent tags by default</source>
- <translation type="unfinished"></translation>
+ <translation>Abilita i tag semitrasparenti in automatico</translation>
</message>
</context>
<context>
@@ -1896,18 +1794,6 @@
<translation>Comunità</translation>
</message>
<message>
- <source>Any</source>
- <translation type="obsolete">Qualsiasi</translation>
- </message>
- <message>
- <source>In lobby</source>
- <translation type="obsolete">In lobby</translation>
- </message>
- <message>
- <source>In progress</source>
- <translation type="obsolete">In corso</translation>
- </message>
- <message>
<source>Disabled</source>
<translation>Disabilitato</translation>
</message>
@@ -2046,10 +1932,6 @@
<translation>Porta del server:</translation>
</message>
<message>
- <source>Version</source>
- <translation type="obsolete">Versione</translation>
- </message>
- <message>
<source>Initial sound volume</source>
<translation>Volume sonoro iniziale</translation>
</message>
@@ -2110,10 +1992,6 @@
<translation>Esplosivi</translation>
</message>
<message>
- <source>Tip: </source>
- <translation type="obsolete">Suggerimento: </translation>
- </message>
- <message>
<source>Quality</source>
<translation>Qualità</translation>
</message>
@@ -2154,10 +2032,6 @@
<translation>% Tempo regalo</translation>
</message>
<message>
- <source>This program is distributed under the GNU General Public License v2</source>
- <translation type="obsolete">Questo programma è distribuito con licenza GNU General Public License v2</translation>
- </message>
- <message>
<source>There are videos that are currently being processed.
Exiting now will abort them.
Do you really want to quit?</source>
@@ -2263,19 +2137,19 @@
</message>
<message>
<source>Tip: %1</source>
- <translation type="unfinished">Consiglio: %1</translation>
+ <translation>Consiglio: %1</translation>
</message>
<message>
<source>Displayed tags above hogs and translucent tags</source>
- <translation type="unfinished"></translation>
+ <translation>Visualizza i tag sopra i ricci e i tag semitrasparenti</translation>
</message>
<message>
<source>World Edge</source>
- <translation type="unfinished"></translation>
+ <translation>Bordi del mondo</translation>
</message>
<message>
<source>Script parameter</source>
- <translation type="unfinished">Parametro dello script</translation>
+ <translation>Parametro dello script</translation>
</message>
</context>
<context>
@@ -2286,7 +2160,7 @@
</message>
<message>
<source>hedgehog %1</source>
- <translation>Riccio %1</translation>
+ <translation>riccio %1</translation>
</message>
<message>
<source>anonymous</source>
@@ -2299,10 +2173,6 @@
<source>Hedgewars %1</source>
<translation>Hedgewars %1</translation>
</message>
- <message>
- <source>-r%1 (%2)</source>
- <translation type="obsolete">-r%1 (%2)</translation>
- </message>
</context>
<context>
<name>QMessageBox</name>
@@ -2365,40 +2235,6 @@
<translation>Tutte le associazioni di file sono state impostate</translation>
</message>
<message>
- <source>Main - Error</source>
- <translation type="obsolete">Main - Errore</translation>
- </message>
- <message>
- <source>Cannot create directory %1</source>
- <translation type="obsolete">Impossibile creare la directory %1</translation>
- </message>
- <message>
- <source>Failed to open data directory:
-%1
-
-Please check your installation!</source>
- <translation type="obsolete">Impossibile creare la directory dati:
-%1
-
-Per favore controlla l'installazione!</translation>
- </message>
- <message>
- <source>TCP - Error</source>
- <translation type="obsolete">TCP - Errore</translation>
- </message>
- <message>
- <source>Unable to start the server: %1.</source>
- <translation type="obsolete">Impossibile avviare il server: %1.</translation>
- </message>
- <message>
- <source>Unable to run engine at </source>
- <translation type="obsolete">Impossibile avviare il motore a </translation>
- </message>
- <message>
- <source>Error code: %1</source>
- <translation type="obsolete">Codice di errore: %1</translation>
- </message>
- <message>
<source>Video upload - Error</source>
<translation>Caricamento video - Errore</translation>
</message>
@@ -2544,10 +2380,6 @@
<translation>Hedgewars - Avviso</translation>
</message>
<message>
- <source>Hedgewars</source>
- <translation type="obsolete">Hedgewars</translation>
- </message>
- <message>
<source>Not all players are ready</source>
<translation>Non tutti i giocatori sono pronti</translation>
</message>
@@ -2759,7 +2591,7 @@
</message>
<message>
<source>Random Perlin</source>
- <translation type="unfinished"></translation>
+ <translation>Rumore casuale</translation>
</message>
</context>
<context>
@@ -2804,10 +2636,6 @@
<translation>nuovo</translation>
</message>
<message>
- <source>copy of</source>
- <translation type="obsolete">copia di</translation>
- </message>
- <message>
<source>copy of %1</source>
<translation>copia di %1</translation>
</message>
@@ -2831,7 +2659,12 @@
We are very sorry for the inconvenience :(
If this keeps happening, please click the '%2' button in the main menu!</source>
- <translation type="unfinished"></translation>
+ <translation>Il motore del gioco è morto inaspettatamente!
+(codice di uscita %1)
+
+Ci dispiace molto per l'inconveniente :(
+
+Se questo continua a succedere, per piacere clicca il bottone '%2' nel menu principale!</translation>
</message>
</context>
<context>
@@ -2842,13 +2675,6 @@
</message>
</context>
<context>
- <name>TeamShowWidget</name>
- <message>
- <source>%1's team</source>
- <translation type="obsolete">Squadra di %1</translation>
- </message>
-</context>
-<context>
<name>ThemePrompt</name>
<message>
<source>Cancel</source>
@@ -2894,10 +2720,6 @@
<translation>cambia</translation>
</message>
<message>
- <source>find hedgehog</source>
- <translation type="obsolete">trova riccio</translation>
- </message>
- <message>
<source>ammo menu</source>
<translation>menu delle armi</translation>
</message>
@@ -3035,7 +2857,7 @@
</message>
<message>
<source>autocam / find hedgehog</source>
- <translation type="unfinished"></translation>
+ <translation>camera automatica / trova riccio</translation>
</message>
<message>
<source>speed up replay</source>
@@ -3088,10 +2910,6 @@
<translation>Imposta il timer di granate e armi a tempo:</translation>
</message>
<message>
- <source>Move the camera to the active hog:</source>
- <translation type="obsolete">Muovi la camera verso il riccio attivo:</translation>
- </message>
- <message>
<source>Move the cursor or camera without using the mouse:</source>
<translation>Muovi il cursore o la camera senza usare il mouse:</translation>
</message>
@@ -3133,11 +2951,11 @@
</message>
<message>
<source>Toggle automatic camera / refocus on active hedgehog:</source>
- <translation type="unfinished"></translation>
+ <translation>Togli camera automatica / riposiziona sul riccio attivo:</translation>
</message>
<message>
<source>Demo replay:</source>
- <translation type="unfinished"></translation>
+ <translation>Vizualizza demo:</translation>
</message>
</context>
<context>
@@ -3575,7 +3393,7 @@
</message>
<message>
<source>No checker rights</source>
- <translation type="unfinished"></translation>
+ <translation>Nessun diritto di modifica</translation>
</message>
<message>
<source>Room version incompatible to your hedgewars version</source>
@@ -3619,19 +3437,19 @@
</message>
<message>
<source>Excess flood</source>
- <translation type="unfinished">Eccessivo numero messaggi</translation>
+ <translation>Eccessivo numero messaggi</translation>
</message>
<message>
<source>Game messages flood detected - 1</source>
- <translation type="unfinished">Rilevato numero messaggi di gioco eccessivo - 1</translation>
+ <translation>Rilevato numero messaggi di gioco eccessivo - 1</translation>
</message>
<message>
<source>Game messages flood detected - 2</source>
- <translation type="unfinished">Rilevato numero messaggi di gioco eccessivo - 2</translation>
+ <translation>Rilevato numero messaggi di gioco eccessivo - 2</translation>
</message>
<message>
<source>Warning! Joins flood protection activated</source>
- <translation type="unfinished">Attenzione! Protezione congiunta eccessivo numero messaggi attivata</translation>
+ <translation>Attenzione! Protezione congiunta eccessivo numero messaggi attivata</translation>
</message>
<message>
<source>There's no voting going on</source>
--- a/share/hedgewars/Data/misc/CMakeLists.txt Sat Nov 08 11:26:16 2014 -0500
+++ b/share/hedgewars/Data/misc/CMakeLists.txt Sun Nov 09 14:33:31 2014 -0500
@@ -5,5 +5,6 @@
file(GLOB miscfiles *.xml *.desktop)
install(FILES ${miscfiles} DESTINATION ${SHAREPATH}/Data/misc)
+ install(FILES hedgewars.xpm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
endif()
--- a/share/hedgewars/Data/misc/hedgewars.desktop Sat Nov 08 11:26:16 2014 -0500
+++ b/share/hedgewars/Data/misc/hedgewars.desktop Sun Nov 09 14:33:31 2014 -0500
@@ -2,6 +2,7 @@
Type=Application
Version=1.0
Name=Hedgewars
+Keywords=game;strategy;
GenericName=Fighting Hedgehogs
GenericName[de]=Kämpfende Igel
GenericName[es]=Batallas entre erizos
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/misc/hedgewars.xpm Sun Nov 09 14:33:31 2014 -0500
@@ -0,0 +1,239 @@
+/* XPM */
+static char *Icon___x__x__[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 201 2",
+" c #010101",
+". c #0A0709",
+"X c #1A1A1A",
+"o c #454545",
+"O c #94005E",
+"+ c #AE005D",
+"@ c #970063",
+"# c #9B0064",
+"$ c #94066D",
+"% c #9D036A",
+"& c #9E086E",
+"* c #880873",
+"= c #960E74",
+"- c #980D73",
+"; c #8C1578",
+": c #8C1A7D",
+"> c #9D1075",
+", c #9D177C",
+"< c #91187D",
+"1 c #9B1C7D",
+"2 c #A20065",
+"3 c #AA0067",
+"4 c #A3046B",
+"5 c #A0096F",
+"6 c #A20C73",
+"7 c #AD0B72",
+"8 c #A41276",
+"9 c #AD1074",
+"0 c #A61479",
+"q c #A81C7B",
+"w c #7B2083",
+"e c #772E8F",
+"r c #7D2C8E",
+"t c #732F91",
+"y c #6B3596",
+"u c #653B9B",
+"i c #6D3A9B",
+"p c #743294",
+"a c #783092",
+"s c #713899",
+"d c #5641A1",
+"f c #504BA9",
+"g c #5A4EAD",
+"h c #4D5AB6",
+"j c #5652B0",
+"k c #5058B5",
+"l c #6444A3",
+"z c #7C4CA8",
+"x c #7654B2",
+"c c #4363BF",
+"v c #3D67C3",
+"b c #3A69C5",
+"n c #3C73CE",
+"m c #2C77D1",
+"M c #237CD6",
+"N c #2C78D2",
+"B c #2F7ED8",
+"V c #3E7BD5",
+"C c #5F71CC",
+"Z c #6F6ECA",
+"A c #627FD6",
+"S c #6C7ED6",
+"D c #617ED9",
+"F c #6F7ED9",
+"G c #881F82",
+"H c #A11F83",
+"J c #AC1D82",
+"K c #872386",
+"L c #8A2387",
+"P c #8D2689",
+"I c #8A2C8F",
+"U c #952388",
+"Y c #812F91",
+"T c #873595",
+"R c #8D3192",
+"E c #8A3799",
+"W c #84399A",
+"Q c #AE2285",
+"! c #A32488",
+"~ c #A92D8D",
+"^ c #B1258A",
+"/ c #B32C8C",
+"( c #BD298E",
+") c #B5308E",
+"_ c #B72E91",
+"` c #BE2C91",
+"' c #BA3495",
+"] c #BA3895",
+"[ c #BC3C9A",
+"{ c #BF3BA0",
+"} c #C32E93",
+"| c #C23391",
+" . c #CF3D9D",
+".. c #C13DA2",
+"X. c #CA3BA0",
+"o. c #BE419C",
+"O. c #8148A4",
+"+. c #8152B0",
+"@. c #C0439E",
+"#. c #C345A3",
+"$. c #C54EA5",
+"%. c #CE4AA3",
+"&. c #C645AA",
+"*. c #C74EA9",
+"=. c #C94AAE",
+"-. c #D045AA",
+";. c #D04BAF",
+":. c #C750A8",
+">. c #CC59AB",
+",. c #CB4DB1",
+"<. c #CC51B4",
+"1. c #CD5AB0",
+"2. c #D45CBF",
+"3. c #D363BA",
+"4. c #D65FC3",
+"5. c #D769C0",
+"6. c #DB6CC3",
+"7. c #DE66C9",
+"8. c #DE6BCE",
+"9. c #DB74C5",
+"0. c #DE76CB",
+"q. c #DF6DD0",
+"w. c #E068CC",
+"e. c #EA7FCF",
+"r. c #E06FD1",
+"t. c #E274D5",
+"y. c #E47BD6",
+"u. c #E376D8",
+"i. c #E479D9",
+"p. c #E87FDE",
+"a. c #1E83DC",
+"s. c #2482DB",
+"d. c #2B80DA",
+"f. c #3682DC",
+"g. c #1B8BE3",
+"h. c #3187E0",
+"j. c #3D8BE4",
+"k. c #2790E8",
+"l. c #3594EC",
+"z. c #3D94EC",
+"x. c #4C90EA",
+"c. c #5494EB",
+"v. c #469CF4",
+"b. c #4C98F1",
+"n. c #5A97F1",
+"m. c #529AF2",
+"M. c #5A9FF8",
+"N. c #6B87E1",
+"B. c #49A1F9",
+"V. c #59A3F6",
+"C. c #52A6FE",
+"Z. c #5DA7FE",
+"A. c #56AFFF",
+"S. c #5CABFF",
+"D. c #56B4FF",
+"F. c #58B5FF",
+"G. c #54BBFF",
+"H. c #898989",
+"J. c #8A918D",
+"K. c #949394",
+"L. c #9C9B9C",
+"P. c #B5B4B5",
+"I. c #E483D2",
+"U. c #E789D6",
+"Y. c #E781DA",
+"T. c #E985DC",
+"R. c #EA89DC",
+"E. c #EC91DE",
+"W. c #EE9BDA",
+"Q. c #EC87E2",
+"!. c #EC8CE2",
+"~. c #EE93E1",
+"^. c #F195E6",
+"/. c #F29BE7",
+"(. c #F49EE9",
+"). c #F4A6E5",
+"_. c #F5A2EB",
+"`. c #F9A6EF",
+"'. c #F6AAED",
+"]. c #F5B2EC",
+"[. c #F6A2F0",
+"{. c #FAA6F1",
+"}. c #FAAAF3",
+"|. c #FBB7F5",
+" X c #FEB1F8",
+".X c #C8C7C8",
+"XX c #CBCBCC",
+"oX c #CDD1CF",
+"OX c #F3D2EB",
+"+X c #F7C6F0",
+"@X c #F8C1F1",
+"#X c #F8CAF2",
+"$X c #FFD1FC",
+"%X c #FDDBFB",
+"&X c #F9E6F7",
+"*X c #FDE5FA",
+"=X c #FDEDFB",
+"-X c #F3FCF5",
+";X c #FCF3FA",
+":X c #FEFEFE",
+">X c None",
+/* pixels */
+">X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>X= & >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>Xp v : >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>Xr k.f.u 4 >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>Xt z.Z.l.c : 3 >X>X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>Xy l.Z.Z.B.h.l > >X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X4 >X>X>X>X>X>Xt j.Z.A.S.n.C f * % >X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X4 l g l i p r K : T P L R ~ ] [ ] ^ 8 O >X>X>X>X>X>X>X>X>X",
+">X>X>X>Xs g.s.s.s.M M s.d 8 %.I.(._.{.`._.E.3.Q # >X>X>X>X>X>X>X",
+">X>X>X>X4 D C.m.m.b.v.p ' E.}._.(././.(./._.`._.1.& >X>X>X>X>X>X",
+">X>X>X>X>XT A.Z.D.D.W .}._././.(._.(.(././.^./.}.6.6 >X>X>X>X>X",
+">X>X>X>X>X2 A D.N.W ( _._./.(.(.(.(.(./.'.+X@X_.].$X9.# >X>X>X>X",
+">X>X>X>X>X>X1 E ; 7 i._.(.(.(.(.(._./.].:X:X:X;X:X:X:X$.>X>X>X>X",
+">X>X>X>X4 < i b y -.!.(.(.(._.(.(.(./.*X:X:X:X:X:X:X-XOX6 >X>X>X",
+">X>X6 r k m a.m ! 7.!._.(.(.(.(.(./._.:X:X:XL.P.:XH. XX>.>X>X>X",
+">X* n a.M B z.C ( t.R._.(.(.(.(.(./.'.;X:X.X X :Xo J.W.# >X>X",
+">X# a V v.V.G.z X.t.R._./._.(./.(.(.(.=X:X.X X :XK.. oX).% >X>X",
+">X>X>X0 F G.S 2 ,.t.Y._./.(.(._.(._.^.#X:X:XK.P.:X:X-X=X~.8 >X>X",
+">X>X>X>X4 x I w ,.u.y.(.(._.(.(._.(.(./.&X:X:X:X=X+X%X'.U.) ] >X",
+">X>X>X>X>X+ h f .t.7.~.(./.(.(./.(.(.(._.#X&X*X|.{.3.U.U.] ^.q ",
+">X>X>X>X>Xp g.h ` i.t.Q.}._./.(.(.(.(.(./.(.~.6.3.@.$.}.3.#. X) ",
+">X>X>X>X: m d.c.! 7.,...3.E.`./.(._.(.(./._./.| @.r._.}.' 3.U.q ",
+">X>X>X4 c M x.F.O.7 [ :.o.Q 3.{./.(.(._.(./._.{. X_._.R.^ r.J >X",
+">X>X4 j g.z.F.V.U 6.}.}.}.E.Q 9.`./.(./.(.(.(././.).[.] 8 6 >X>X",
+">X>X- l g Z N.x } [.(././.}.9._ (.(.(._._.(.(.(.^.^.,.% >X>X>X>X",
+">X>X>X>X>X4 4 2 &.Q.(.(./._.T.Q t.y.R.~.~.~.Q.Q.Y.=.- >X>X>X>X>X",
+">X>X>X>X>X>X>X>X^ u.R./.(.{.*.[ i.q.8.8.q.r.i.q.' & >X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X% _ 4.r.8.#.& ,.q.t.t.t.q.4.| J | 0 >X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X6 0 6 - &.' Q ^ ^ ^ Q / *.U. X[ >X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>X>X>X6 q.!.~.I.U.*.] }.}._.}.@.>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>X>X>X>X' u.Q.^.~.Q &.Q.~.(.r.8 >X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>X>X>X>X% ^ ,.&.J % 0 ..,...6 >X>X>X>X>X>X>X"
+};