diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/BUGS codeciv/BUGS
--- freeciv/BUGS	Sat Apr 14 20:41:54 2001
+++ codeciv/BUGS	Sat Apr 14 21:07:03 2001
@@ -14,13 +14,6 @@
 KNOWN BUGS:
 ===========
 
- - The Gtk+ client sometimes has a problem where the focus gets stuck
-   on the chatline, and the arrow keys no longer work to move units in
-   the main window.  A way to get back to the main window is to use
-   the <Tab> key to advance to focus to some other widget.  Then the
-   arrow keys will work again.  (Clicking on the main window should also
-   do the trick.)
-
  - The easy AI is not easy enough for novice players.  If the AI is
    beating you up early in the game, try setting the "generator" server
    option to 2 or 3.  That is, in the server, before starting a game,
@@ -40,6 +33,43 @@
  - The Great Wall wonder, which acts as a city wall in every city,
    disallows cities to build "proper" city walls that won't disappear
    when wonder becomes obsolete.
+
+ - Some effects of wonders and research first take effect the turn
+   after. Fx when building the lighthouse some triremes will only get
+   the movement bonus the next turn.
+
+ - The XAW client can only display 25 citizens in the city dialog
+
+ - The autoattack functionality is out of date.
+
+ - When planning a goto in the server, fx for an autosettler or an
+   airplane, the server will use knowledge not available to the player.
+
+ - The science dialog is not updated when you gain a tech. You need to
+   close and open it.
+
+ - In the gtk client, sometimes the area near the minimap contains
+   garbage.
+
+ - Automate-routines don't handle triremes very well.
+
+ - The isometric view lacks graphics for civ 1 ruleset.
+
+ - LOG_DEBUG doesn't work with non-GCC compilers.
+
+ - The color markup in the gtk message window is lost if the dialog
+   is closed and then reopened.
+
+ - When setting server variables, the server in many cases doesn't
+   check the values as well as it could.
+
+ - Bad things happen when you have multiple global worklists.
+
+ - The timeout label is too small to display long timeouts.
+
+ - Even in singelplayer the AI will get a chance to move both before
+   and  after the human player each turn. This will sometimes give the
+   impression that the AI moves twice.
 
 REPORTING A BUG:
 ================
diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/NEWS codeciv/NEWS
--- freeciv/NEWS	Sat Apr 14 20:41:56 2001
+++ codeciv/NEWS	Sat Apr 14 21:16:20 2001
@@ -1,14 +1,85 @@
 =======================
-Welcome to Freeciv 1.11
+Welcome to Freeciv 1.12
 =======================
 
-This is release 1.11.4.
+This is release 1.12.0.
 
 Thanks again to all our developers, who continue to work so hard.
 
 This release includes lots of changes, outlined below.  Those who
 are interested in seeing the detailed changes should check the
 ChangeLog file.
+
+WHAT'S CHANGED SINCE 1.11.4
+
+ - Internationalization extended.  Still needs improvement.
+   Current localizations: de en_GB es fr hu ja nl no pl pt pt_BR ru sv.
+ - Isometric view in gtk and amiga clients using the mostly civ2-
+   compatible HiRes tileset. This is on by default, but the old non-
+   isometric tiles are still available by giving a --tiles argument to
+   the client, fx "civclient --tiles trident".
+ - While planning a goto (after hitting "g") a line will be displayed
+   showing the route from the selected unit to the mouse pointer.
+   Hitting "g" will insert a waypoint at the mouse pointer.
+ - The server now have readline completion. This works at all levels,
+   fx "cu<TAB>" completes to "cut", and if there exist a player named
+   "paulz" "cut pau<TAB>" will complete to "cut paulz".
+ - Layer view menu items allow you to only display some map info on the
+   main map. Fx you can choose to not show roads.
+ - The server will ping all connected clients and cut off those too slow
+   to respond.
+ - Smarter placing of partisans.
+ - The server no longer automatically starts when the maximum number of
+   players have been reached.
+ - If commandlevels are used and the controlling player disconnects a
+   connected player can assume the "first" level with the "/firstlevel"
+   command.
+ - "Restrictions and Limitations" section added to the README.ruleset
+ - Caravans, diplomats and spies can move into allied cities.
+ - Elefants, Crusaders and Fanatics activated in civ 2 ruleset.
+ - The size of the city foodbox is now controlled by the ruleset
+   variables "granary_food_ini" and "granary_food_inc".
+ - Limit on number of improvement types in rulesets removed.
+ - Capitalization is available from the start of the game in the default
+   ruleset. (renamed coinage)
+ - Cities can have 0 trade. (used to be at least 1)
+ - If you paradrop a unit into unknown terrain and the terrain contains
+   an enemy unit the paradropping unit is lost. If you drop into terrain
+   you thought was land, but which has changed to water, the unit is
+   also lost.
+ - Refueling air units at turn update will refuel units with only 1 fuel
+   first. Secundary criteria is unit cost.
+ - Trireme loss percentage depends upon known technologies.
+ - Leonardo's workshop will upgrade a random unit each turn, and not
+   just the next one.
+ - Allied cities count as friendly when determining whether a unit is
+   being agressive. (gives unhappyness under some govs.)
+ - Deserts are created primarily 15 to 35 degrees off the equator.
+ - Only arctic tiles generated at poles.
+ - The server will report when a new government becomes available.
+ - Changed wording of message "famine feared" to "famine occured". New
+  "famine feared" message just before food runs out.
+ - "wonder soon build" message when another player is about to complete
+   a wonder.
+ - Players are notified when one of their wonders have become obsolete.
+ - In the players dialog it is now reported which nations have an
+   embassy with you. Your embassies are also listed.
+ - Wonders being build are listed in the "wonders of the world" popup.
+ - Server "save" command saves to <auto-save name prefix><year>m.sav[.gz]
+   if it is not given any arguments.
+ - "quitidle" server commandline option makes server quit if there has
+   been no connected players for the specified amount of time.
+ - When turning on the autotoggle option existing human nations without
+   a connected player will be put on AI.
+ - Server doesn't block as long when writing to a slow host, controlled
+   by variables "tcptimeout" and "netwait".
+ - "savename" server variable controls the prefix of autosaves.
+ - "allowconnect" server variable lets you control which types of
+   players (new players; human players; AI players; dead players;
+   barbarian players) can connect.
+ - Amiga internationalization/localization.
+ - Amiga client: history added to chatline.
+ - Lots of bug fixes and code cleanups.
 
 WHAT'S CHANGED SINCE 1.11.0:
 
diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/PEOPLE codeciv/PEOPLE
--- freeciv/PEOPLE	Sat Apr 14 20:41:56 2001
+++ codeciv/PEOPLE	Sat Apr 14 21:29:07 2001
@@ -20,54 +20,114 @@
      David Pfitzner <dwp@xxxxxxxxxxxxxx> (Dec 1998 to Oct 1999 [1.8.0 to 1.9.0])
      Nicolas Brunel <brunel@xxxxxxxxxxxxxxxxxxxx> (Jan 1999 to Jun 1999 [1.8.0])
 
-  Coders since 1.11.0 release:
-
-     Jeff Mallatt <jjm@xxxxxxxxxxxx>
-	(nuclear fallout, readline, patches, bugfixes)
-     Thue Janus Kristensen <thue@xxxxxxx> (readline, bugfixes, cleanup)
-     Dirk Stoecker <stoecker@xxxxxxxxxxxxxxxxxxxxx> (Amiga, bugfix)
-     David Pfitzner <dwp@xxxxxxxxxxxxxx> (zlib, bugfixes, cleanup)
-     Tomasz Wegrzanowski <maniek@xxxxxxxx> ("dispersion" opt.)
-     Reinier Post <reinpost@xxxxxxxxxx> ("cmdlevel first" cmd.)
-     Andreas Kemnade <akemnade@xxxxxxxxxxx> (bugfix)
-     Markus Linnala <maage@xxxxxxxxx> (zlib)
+  Coders since 1.11.4 release:
+     Thue Janus Kristensen <thue@xxxxxxx>
+	(readline completion, cleanup, patches, shared vision,
+	 goto polyline, isometric view)
+     Jeff Mallatt <jjm@xxxxxxxxxxxx> (co-admin, patches, cleanup)
+     David Pfitzner <dwp@xxxxxxxxxxxxxx> (cleanup,
+	experimental multiple connection support, patches,
+	networking patches, events fix, LOG_ERROR)
+     Sebastian Bauer <sebauer@xxxxxxxxxxx> (amiga maintainance)
+     Dirk Stoecker <stoecker@xxxxxxxxxxxxxxxxxxxxx>
+	(amiga, patches, internationalization, cleanup)
+     Marko Lindqvist <caz@xxxxxxxxx>
+	(autosave name prefix, patches, README.ruleset,
+	client-server interface improvements, cleanup)
+     Vasco Alexandre da Silva Costa <vasc@xxxxxxxxxxxxxx>
+	(patches, networking improvements)
+     Erik Sigra <freeciv@xxxxxxx> (patches, keyboard shortcuts,
+	improved river generation)
+     Anthony Stuckey <stuckey@xxxxxxxxxxxxxxxxx> (co-admin, patches)
+     Gaute Strokkenes <gs234@xxxxxxxxx> (many patches, cleanup)
+     Mike Jing <mike_jing@xxxxxxxxx>
+	(patches, foodbox generalization, key shortcuts)
+     Robert Rendell <rob@xxxxxxxxxxxxxxxxxxxxxxxxx> (patches)
+     Nicolas Brunel <brunel@xxxxxxxxxxxxxxxxxxxx> (patches)
+     Lauri Tarkkala <ltarkkal@xxxxxxxxxxxxxxx> (improved networking)
+     Reinier Post <rp@xxxxxxxxxx> (patches)
+     Mike Kaufman <mkaufman@xxxxxxxxxxxxxx> (patch)
+     Tuomas Airaksinen <tuomas.airaksinen@xxxxxxxxxx> (patches)
+     Kero van Gelder <kero@xxxxxxxxxxxxxxxxxxxxxx>
+	(patches, goto improvement)
+     Chris Chittleborough <cchittleborough@xxxxxxxxxxxx> (patch)
+     Raimar Falke <hawk@xxxxxxxxxxxxxxxxxxxxxxx> (patch)
+     Daniel M Church <dchurch@xxxxxxxxxxxxxxxxxxx> (layer view)
+     Joona Kiiski <zamar@xxxxxxxxxxxxxx> (patches, production fixes)
+     Arien Malec <arien_malec@xxxxxxxxx> (patch)
+     Andreas Kemnade <akemnade@xxxxxxxxxxx> (patches, win32 server)
+     Andrew McGuinness <andrew_mcguinness@xxxxxxxxxxx> (patch)
+     Lino Mastrodomenico <l.mastrodomenico@xxxxxxxxxxxxxx> (patch)
+     Michael Grundel <michael42@xxxxxxxxxx> (patch)
+     Daniel Sjolie <deepone@xxxxxxxxxx> (patch)
+     Paul Zastoupil <paulz@xxxxxxxxxxxx> (patch)
+     Jerzy Klek <qpkjeek@xxxxxxxxxxxxxxx> (patch)
+     Andy Black <ablack@xxxxxxxxxxxxxx> (mac patches)
+     Jacob Luna Lundberg <jacob@xxxxxxxxxxxxxxxxx> (readline test)
+     Dmitriy Genzel <udgenzel@xxxxxxxxxxxxxx> (patch)
+     Jed Davis <jldavis@xxxxxxxxxxxxxx> (patch)
+     Karl-Ingo Friese <kif@xxxxxxxxxxxxxxxxxxxxxxxxxx> (patch)
+     Stepan Roh <sroh7497@xxxxxxxxxxxxxxxxxxxxx> (patch)
+     Karen Yeats <kayeats@xxxxxxxxxxxxxxxx> (mapgen deserts)
+     Rutger Nijlunsing <rutger@xxxxxxxx> (patch)
+     Mika Korhonen <mikak@xxxxxxxxxxxx> (patch)
      IQ <iquin@xxxxxxxxxxxxxxxx> (cleanup)
-     Vasco Alexandre da Silva Costa <vasc@xxxxxxxxxxxxxx> (bugfix, cleanup)
-     Roger Tucker <roger.tucker@xxxxxxxx> (OpenVMS)
-     Marko Lindqvist <caz@xxxxxxxxxxxxxxxx> (game.ruleset, bugfixes)
-     Joseph Beckenbach <jrb3@xxxxxxxxx> (BeOS)
-     Gaute Strokkenes <gs234@xxxxxxxxx> (bugfix)
-     Robert Rendell <rob@xxxxxxxxxxxxxxxxxxxxxxxxx> (bugfix)
-     Kero van Gelder <kero@xxxxxx> (bugfix)
-     Karl-Ingo Friese <kif@xxxxxxxxxxxxxxxxxxxxxxxxxx> (bugfix)
-     Thomas Strub <ue80@xxxxxxxxxxxxxxxxxxx> (bugfix)
+     Luke Reeves <luke949@xxxxxxxxxxxx> (patches)
+     Oliver Gantert <lucyg@xxxxxxxxxxx> (patch)
+     Raahul Kumar <z1156937@xxxxxxxxxxxxxxxxxxxxx> (patch)
+     toner supply guy (toner supply spam to freeciv-cvs)
 
-  Coders up to 1.11.0 release:
+  Coders up to 1.11.4 release:
      (Version numbers refer to the first non-beta release
      to contain that patch or bugfix.)
 
-     Thue Janus Kristensen <thue@xxxxxxx>
-	(fog of war, air unit goto, 30 players, diplomatic states, patches
-	1.11.0, bugfix 1.10.0)
-     Robert Rendell <rob@xxxxxxxxxxxxxxxxxxxxxxxxx>
-	(timeout impr., patches 1.11.0)
      Jeff Mallatt <jjm@xxxxxxxxxxxx>
-	(co-admin 1.11.x, 1.10.x, gen. improvements part 1, diplomatic states,
-	drawing impr., patches 1.11.0, diplomat/spy cleanup, Xaw key/menu
-	cleanup 1.10.0, terrain rulesets 1.9.0, patches 1.8.x, diagonal roads)
+	(co-admin, nuclear fallout, readline, patches, bugfixes 1.11.4,
+	co-admin 1.11.0, 1.10.x, gen. improvements part 1,
+	diplomatic states, drawing impr., patches 1.11.0,
+	diplomat/spy cleanup, Xaw key/menu cleanup 1.10.0,
+	terrain rulesets 1.9.0, patches 1.8.x, diagonal roads)
+     David Pfitzner <dwp@xxxxxxxxxxxxxx>
+	(zlib, bugfixes, cleanup 1.11.4, rulesout, split nations,
+	registry impr., hashes, patches 1.11.0, safer strings,
+	'help' cmd., tilespec impr. 1.10.0, tilespec 1.9.0,
+	co-admin 1.8.x, 1.7.2, patches 1.8.x, rulesets, spacerace, 1.7.x)
      Vasco Alexandre da Silva Costa <vasc@xxxxxxxxxxxxxx>
-	(network code impr., patches 1.11.0, Gtk+ speedup 1.10.0, Gtk+ client
-	port/patches/maint 1.9.0, 1.8.1)
-     Tomasz Wegrzanowski <maniek@xxxxxxxx> (patches 1.11.0, patches 1.10.0)
+	(bugfix, cleanup 1.11.4, network code impr., patches 1.11.0,
+	Gtk+ speedup 1.10.0, Gtk+ client port/patches/maint 1.9.0, 1.8.1)
+     Thue Janus Kristensen <thue@xxxxxxx>
+	(readline, bugfixes, cleanup 1.11.4, fog of war, air unit goto,
+	30 players, diplomatic states, patches 1.11.0, bugfix 1.10.0)
+     Dirk Stoecker <stoecker@xxxxxxxxxxxxxxxxxxxxx>
+	(Amiga, bugfix 1.11.4)
+     Tomasz Wegrzanowski <maniek@xxxxxxxx>
+	("dispersion" opt. 1.11.4, patches 1.11.0, patches 1.10.0)
+     Reinier Post <reinpost@xxxxxxxxxx>
+	("cmdlevel first" cmd. 1.11.4, info, bugfixes 1.11.0,
+	'read' and 'write' cmds. 1.10.0, bugfixes 1.9.0,
+	patches 1.8.1, server commands from clients, 1.7.x)
+     Andreas Kemnade <akemnade@xxxxxxxxxxx> (bugfix 1.11.4)
+     Markus Linnala <maage@xxxxxxxxx>
+	(zlib 1.11.4, bugfixes 1.10.0, patches 1.9.0, 1.8.1,
+	 logging, 1.7.x, configure)
+     IQ <iquin@xxxxxxxxxxxxxxxx>
+	(cleanup 1.11.4, gen. improvements part 1, cleanup 1.11.0,
+	"concise" opt., better gen 2+ rivers 1.10.0)
+     Marko Lindqvist <caz@xxxxxxxxxxxxxxxx> (game.ruleset, bugfixes 1.11.4,
+	patches 1.11.0)
      Joseph Beckenbach <jrb3@xxxxxxxxx>
-	(BeOS 1.11.0, 1.10.0, 1.9.0, cleanup 1.11.0, multi-client 1.10.0)
+	(BeOS 1.11.x, 1.10.0, 1.9.0, cleanup 1.11.0, multi-client 1.10.0)
+     Gaute Strokkenes <gs234@xxxxxxxxx> (bugfix 1.11.4)
+     Robert Rendell <rob@xxxxxxxxxxxxxxxxxxxxxxxxx>
+	(bugfix 1.11.4, timeout impr., patches 1.11.0)
+     Kero van Gelder <kero@xxxxxx> (bugfix 1.11.4, patch 1.11.0)
+     Karl-Ingo Friese <kif@xxxxxxxxxxxxxxxxxxxxxxxxxx>
+	(bugfix 1.11.4, Gtk+ speedup 1.10.0)
+     Thomas Strub <ue80@xxxxxxxxxxxxxxxxxxx> (bugfix 1.11.4)
+
      Sebastian Bauer <sebauer@xxxxxxxxxxx>
 	(Amiga 1.11.0, 1.10.0, 1.9.0, cleanup 1.11.0, turns-remaining 1.10.0,
 	paratroopers, airbases 1.8.1)
-     David Pfitzner <dwp@xxxxxxxxxxxxxx>
-	(rulesout, split nations, registry impr., hashes, patches 1.11.0,
-	safer strings, 'help' cmd., tilespec impr. 1.10.0, tilespec 1.9.0,
-	co-admin 1.8.x, 1.7.2, patches 1.8.x, rulesets, spacerace, 1.7.x)
      Dan Gohman <gohmandj@xxxxxxxxxxx> (cleanup 1.11.0)
      Andrew McGuinness <cogers@xxxxxxxxx> (cleanup 1.11.0, get-tech 1.10.0)
      Tuomas Airaksinen <tuma@xxxxxxxxxxxx> (cleanup 1.11.0)
@@ -75,9 +135,6 @@
 	(diplomatic states, patch 1.11.0, explode animation 1.10.0, mini style
 	guide 1.9.0, patches 1.8.x, spacerace, 1.7.0, 1.6.0, autoconf support)
      Paul Thomas <paul.thomas@xxxxxxxxxxxxx> (diplomatic states 1.11.0)
-     IQ <iquin@xxxxxxxxxxxxxxxx>
-	(gen. improvements part 1, cleanup 1.11.0, "concise" opt.,
-	better gen 2+ rivers 1.10.0)
      Daniel Zinsli <s830+priv@xxxxxxxxx>
 	(patches, bugfixes 1.11.0, turns-remaining 1.10.0)
      Sawada Katsuya <amanatto@xxxxxxxxxxxxxxxx> (bugfix 1.11.0)
@@ -100,19 +157,11 @@
 	(co-admin 1.11.0-1.8.1, bugfixes 1.11.0, AI diplomats 1.10.0,
 	AI spacerace 1.9.0, admin help 1.8.1, patches 1.8.x, 1.7.2, 1.7.1)
      Pieter J. Kersten <kersten@xxxxxxxxxx> (patch, bugfix 1.11.0)
-     Reinier Post <reinpost@xxxxxxxxxx>
-	(info, bugfixes 1.11.0, 'read' and 'write' cmds. 1.10.0,
-	bugfixes 1.9.0, patches 1.8.1, server commands from clients, 1.7.x)
      Mike Jing <miky40@xxxxxxxxxxx> (patches 1.11.0, rapture impr. 1.10.0)
      Lalo Martins <lalo@xxxxxxxxxxxxxxx>
 	(Debian 1.11.0, patch 1.8.0 client --help, --version)
-     Kero van Gelder <kero@xxxxxx> (patch 1.11.0)
-     Marko Lindqvist <caz@xxxxxxxxxxxxxxxx> (patches 1.11.0)
 
-     Karl-Ingo Friese <kif@xxxxxxxxxxxxxxxxxxxxxxxxxx> (Gtk+ speedup 1.10.0)
      Corin Anderson <corin@xxxxxxxxxx> (worklists 1.10.0, bugfix 1.9.0)
-     Markus Linnala <maage@xxxxxxxxx>
-	(bugfixes 1.10.0, patches 1.9.0, 1.8.1, logging, 1.7.x, configure)
      Daniel Burrows <Daniel_Burrows@xxxxxxxxx>
 	(Gtk+ patch 1.10.0, hp regeneration patches 1.8.0)
      Per I. Mathisen <Per.Inge.Mathisen@xxxxxxxxxxx>
@@ -214,6 +263,9 @@
 
   Graphics:
 
+     Tim Smith <yoohootim@xxxxxxxxxxx> (HiRes tileset)
+     T.J.T van Kooten <thomas@xxxxxxxxxxxxxx> (HiRes fallout icon)
+     Bobby D. Bryant <bdbryant@xxxxxxxxxxxxxxx> (engels elephant)
      Jussi Asp <ja66598@xxxxxx> (engels fog)
      Tatu Rissanen <tatu.rissanen@xxxxxx> ("trident" tileset, now default)
      Ralph Engels <rengels@xxxxxxxxxxxxxxxxxxxxxxxxxxx> ("engels" tileset)
@@ -239,29 +291,46 @@
 
   Maps:
 
+     Helge Arne Gudmestad <gudmesta@xxxxxxxxxxxxxxxxxxxx> (New earth map)
+     martin.mcmahon <martin.mcmahon@xxxxxxxxxxxxxx> (British Isles)
      Christian Grothoff <ma0035@xxxxxxxxxxxxxxxxxxxxx> (Europe v1.0)
      Daniel Gudlat <gudlat@xxxxxxxxxxxxxxxxxxxxxxx> (Earth)
      Jerzy Klek <qpkjeek@xxxxxxxxxxxxxxx> (Europe v1.1)
 
-  Ruleset data since 1.11.0 release:
+  Ruleset data since 1.11.4 release:
 
-     Gianni Ciolli <ciolli@xxxxxxxxxxxxx> (nations)
+     Miguel Farah <miguel@xxxxxxxxxxxxx> (nations)
+     Juan Cortes <cortes@xxxxxxxxxxxxxx> (nations)
+     Ivan Kosak <ivan.kosak@xxxxxxxxx> (nation)
+     Tomasz Wegrzanowski <maniek@xxxxxxxx> (nations)
      Wong TM [Huang Deming] <lookmeow@xxxxxxxxxxxx> (nations)
-     Martin Willemoes Hansen <mwh@xxxxxxxxxxxx> (nations)
+     Markus Buechele <markus.buechele@xxxxxx> (nations)
      Martin McMahon <martin.mcmahon@xxxxxxxxxxxxxx> (nations)
-     Erik Sigra <sigra@xxxxxxx> (nations)
-     Tomasz Wegrzanowski <maniek@xxxxxxxx> (nations)
-     Jerzy Klek <qpkjeek@xxxxxxxxxxxxxxx> (nations)
-     Aivo Kalu <aivo.kalu@xxxxxx> (nations)
+     Niels Weber <nath@xxxxxxxx> (nations)
+     Valius <valius@xxxxxxxxxxxxx> (nations)
+     Vilius Puidokas <vilius@xxxxxxxxxxxxxxxx> (nations)
+     Pieter J. Kersten <kersten@xxxxxxxxxx> (nations)
+     Markus Buechele <markus.buechele@xxxxxx> (nations)
+     Juan Cortes <cortes@xxxxxxxxxxxxxx> (nations)
 
-  Ruleset data up to 1.11.0 release:
+  Ruleset data up to 1.11.4 release:
      (Version numbers refer to the first non-beta release
      to contain that information.)
 
-     Tomasz Wegrzanowski <maniek@xxxxxxxx> (nations 1.11.0, 1.10.0)
+     Gianni Ciolli <ciolli@xxxxxxxxxxxxx> (nations 1.11.4)
+     Wong TM [Huang Deming] <lookmeow@xxxxxxxxxxxx> (nations 1.11.4)
+     Martin Willemoes Hansen <mwh@xxxxxxxxxxxx> (nations 1.11.4)
+     Martin McMahon <martin.mcmahon@xxxxxxxxxxxxxx>
+	(nations 1.11.4, nations 1.11.0)
+     Erik Sigra <sigra@xxxxxxx> (nations 1.11.4)
+     Tomasz Wegrzanowski <maniek@xxxxxxxx>
+	(nations 1.11.4, nations 1.11.0, 1.10.0)
+     Jerzy Klek <qpkjeek@xxxxxxxxxxxxxxx>
+	(nations 1.11.4, cities, nations 1.9.0)
+     Aivo Kalu <aivo.kalu@xxxxxx> (nations 1.11.4)
+
      Robert Brady <rwb197@xxxxxxxxxxxxxxx>
 	(nations 1.11.0, nations, buildings 1.10.0)
-     Martin McMahon <martin.mcmahon@xxxxxxxxxxxxxx> (nations 1.11.0)
      Joaquin Cuenca Abela <cuenca@xxxxxxxxxxxxx> (nations 1.11.0)
      Lalo Martins <lalo@xxxxxxxxxxxxxxx> (nations 1.11.0)
      Richard Garrel <rgarrel@xxxxxxxxxxxx> (nations 1.11.0)
@@ -287,7 +356,6 @@
 
      Per I. Mathisen <Per.Inge.Mathisen@xxxxxxxxxxx>
 	(buildings, techs, units 1.9.0)
-     Jerzy Klek <qpkjeek@xxxxxxxxxxxxxxx> (cities, nations 1.9.0)
      Sune Kirkeby <sune@xxxxxxxxxxxxx> (governments, units 1.9.0)
      Vasco Alexandre da Silva Costa <vasc@xxxxxxxxxxxxxx> (nations 1.9.0)
      Jarda Benkovsky <pvt.benkovsk@xxxxxxxxx> (nations 1.9.0)
@@ -330,6 +398,7 @@
   Website contributors:
 
      Paul Zastoupil <paulz@xxxxxxxxxxxx>
+     Reineir Post <reinpost@xxxxxxxxxx>
      Patrick Gardella <patrick@xxxxxxxxxxxxxxxxx> (Games Announcement)
      Fabrice Noilhan <fabrice.noilhan@xxxxxx> (Poll system)
      Jeff Mallatt <jjm@xxxxxxxxxxxx> (i18n, l10n, DB intf.)
@@ -339,26 +408,59 @@
 
      Peter Dam Mains <lancelot@xxxxxxxxxxx>
 
-  Bug reports since 1.11.0 release:
+  Bug reports since 1.11.4 release:
 
-     Urban Mueller <mueller@xxxxxxxx>
-     Marko Lindqvist <caz@xxxxxxxxxxxxxxxx>
-     Michael Kiermaier <michael.kiermaier@xxxxxxx>
-     Tomasz Wegrzanowski <maniek@xxxxxxxx>
-     Gaute Strokkenes <gs234@xxxxxxxxx>
-     Jan Heidefuss <jan_heidefuss@xxxxxxxx>
-     Mark Polo <mark@xxxxxxxxx>
-     Martin Manns <mmanns@xxxxxxx>
      Christian Knoke <chrisk@xxxxxxxx>
-     Jeff Mallatt <jjm@xxxxxxxxxxxx>
-     Alex Davidoff <aldave@xxxxxxxxxxx>
+     Jan Heidefuss <jan_heidefuss@xxxxxxxx>
+     Paul Zastoupil <paulz@xxxxxxxxxxxx>
+     Mark Saward <mark_saward@xxxxxxxxxxxx>
+     Martin Olveyra <molv@xxxxxxxxxxxxx>
+     Thomas Aglassinger <agi@xxxxxxxxxxxxxx>
+     Marko Lindqvist <caz@xxxxxxxxx>
+     Tuomas Airaksinen <tuomas.airaksinen@xxxxxxxxxx>
+     Lino Mastrodomenico <l.mastrodomenico@xxxxxxxxxxxxxx>
+     Patrice LaFlamme <patrix@xxxxxxxxxx>
+     Michael Kruglos <mike14@xxxxxxxxxxx>
+     Joona Kiiski <zamar@xxxxxxxxxxxxxxxxxxxxxx>
+     Gordon Tetlow <gordont@xxxxxxxxxxx>
+     Rigel Freden <rigelf@xxxxxxxxxxxxx>
+     Mike Jing <mike_jing@xxxxxxxxx>
+     Gerhard Killesreiter <killesreiter@xxxxxxxxxxxxxxxxxxxxxx>
+     Urban Dominik Mueller <mueller@xxxxxxxx>
+     Michael Schreiber <M.Schreiber@xxxxxx>
+     Michael Kiermaier <michael.kiermaier@xxxxxxx>
+     Michael Grundel <michael42@xxxxxx>
+     Dmitriy Genzel <udgenzel@xxxxxxxxxxxxxx>
+     Falk Hueffner <falk.hueffner@xxxxxxxxxxxxxxxxxxxxxxxx>
+     Jarda Benkovsky <pvt.benkovsk@xxxxxxxxx>
+     James Novak <jnovak@xxxxxxxxxx>
+     Taneli Huuskonen <huuskone@xxxxxxxxxxxxxx>
+     Kero van Gelder <kero@xxxxxxxxxxxxxxxxxxxxxx>
+     Erik Sigra <freeciv@xxxxxxx>
+     Dirk Stoecker <stoecker@xxxxxxxxxxxxxxxxxxxxx>
+     Mark Savage <marksbg@xxxxxxxxxxxxxx>
+     Stepan Roh <sroh7497@xxxxxxxxxxxxxxxxxxxxx>
+     Andy Black <ablack@xxxxxxxxxxxxxx>
+     Richard Atkins <rja@xxxxxxxxxxx>
+     Chris Snow <chris@xxxxxxxxxxxxxx>
 
-  Bug reports up to 1.11.0 release:
+  Bug reports up to 1.11.4 release:
      (Version numbers refer to the release the bug was reported on.)
 
+     Urban Mueller <mueller@xxxxxxxx> (1.11.4)
+     Marko Lindqvist <caz@xxxxxxxxxxxxxxxxxx> (1.11.4, 1.8.1, 1.8.0)
+     Michael Kiermaier <michael.kiermaier@xxxxxxx> (1.11.4)
+     Tomasz Wegrzanowski <maniek@xxxxxxxx> (1.11.4, 1.9.0)
+     Gaute Strokkenes <gs234@xxxxxxxxx> (1.11.4)
+     Jan Heidefuss <jan_heidefuss@xxxxxxxx> (1.11.4, 1.10.0)
+     Mark Polo <mark@xxxxxxxxx> (1.11.4)
+     Martin Manns <mmanns@xxxxxxx> (1.11.4)
+     Christian Knoke <chrisk@xxxxxxxx> (1.11.4, 1.10.0)
+     Jeff Mallatt <jjm@xxxxxxxxxxxx> (1.11.4)
+     Alex Davidoff <aldave@xxxxxxxxxxx> (1.11.4, 1.10.0)
+
      Gerhard Killesreiter <killesreiter@xxxxxxxxxxxxxxxxxxxxxx>
 	(1.10.0, 1.9.0)
-     Christian Knoke <chrisk@xxxxxxxx> (1.10.0)
      Egbert Hinzen <garfy@xxxxxxxxxx> (1.10.0, 1.9.0)
      Shalon Wood <dstar@xxxxxxx> (1.10.0)
      Anthony DeRobertis <derobert@xxxxxxxxx> (1.10.0)
@@ -376,7 +478,6 @@
      Thomas Aglassinger <agi@xxxxxxxxxxxxxx> (1.10.0)
      Urban Mueller <mueller@xxxxxxxx> (1.10.0)
      AP Remmers <aremmers@xxxxxxxxxxxx> (1.10.0)
-     Jan Heidefuss <jan_heidefuss@xxxxxxxx> (1.10.0)
      Mark Nettle <markn@xxxxxxxxxxxxxxxxxxx> (1.10.0)
      Paul Zastoupil <paulz@xxxxxxxxxxxx> (1.10.0)
      Mark Hayden <hayden@xxxxxxxxxxxxxx> (1.10.0)
@@ -387,7 +488,6 @@
      Igor Nazarov <nazarov@xxxxxxxxxxxx> (1.10.0)
      Karl-Ingo Friese <kif@xxxxxxxxxxxxxxxxxxxxxxxxxx> (1.10.0)
      Mike Webb <mjw@xxxxxxxxxxxx> (1.10.0)
-     Alex Davidoff <aldave@xxxxxxxxxxx> (1.10.0)
      Brett Smith <brett@xxxxxxxxxxxxxx> (1.10.0)
      Dennis Seekles <seekles@xxxxxxxxxxxx> (1.10.0)
      Marc Espie <espie@xxxxxxxxxxxxxxx> (1.10.0)
@@ -408,7 +508,6 @@
      David R. Relyea <relyea@xxxxxxxxxxxxxxxxx> (1.9.0)
      Pascal Andoux <pascal@xxxxxxxxxxxx> (1.9.0)
      Massimo Campostrini <campo@xxxxxxxxxxxxxxxxxxxxx> (1.9.0)
-     Tomasz Wegrzanowski <maniek@xxxxxxxx> (1.9.0)
      Jorgen Skjaanes <jorgen@xxxxxxxxxxxx> (1.9.0)
      Patrick Schmid <patrick@xxxxxxxxxxxx> (1.9.0)
      John-Marc Chandonia <jmc@xxxxxxxxxxxxxxxx> (1.9.0)
@@ -425,7 +524,6 @@
      Mikolaj Konarski <mikon@xxxxxxxxxxxx> (1.9.0)
      Greg Wooledge <wooledge@xxxxxxxxxxx> (1.9.0)
 
-     Marko Lindqvist <caz@xxxxxxxxxxxxxxxxxx> (1.8.1, 1.8.0)
      Artur Biesiadowski <abies@xxxxxxxxx> (1.8.1)
      Reuben Thomas <rrt1001@xxxxxxxxx> (1.8.1)
      Idan Sofer <sofer@xxxxxxx> (1.8.1)
@@ -472,35 +570,49 @@
 
      David King <crkinger@xxxxxxx> (new Freeciv Client and Server Guides)
 
-  Localization (l10n) since 1.11.0 release:
+  Localization (l10n) since 1.11.4 release:
 
-     Sawada Katsuya <amanatto@xxxxxxxxxxxxxxxx> (ja.po, NEWS.ja)
-     Egbert Hinzen <egbert@xxxxxxxxxx> (de.po)
-     Pieter J. Kersten <kersten@xxxxxxxxxx> (nl.po)
-     David Pfitzner <dwp@xxxxxxxxxxxxxx> (en_GB.po)
-     Olivier Beyssac <ob@xxxxxxxxxxxxxxx> (fr.po)
-     Christian Knoke <chrisk@xxxxxxxx> (de.po)
-     Gerhard Killesreiter <killesreiter@xxxxxxxxxxxxxxxxxxxxxx> (de.po)
-     Pascal Audoux <audoux@xxxxxxxxx> (fr.po)
+     Erik Sigra <freeciv@xxxxxxx> (sv.po, HOWTOPLAY.sv)
+     Pieter J. Kersten <kersten@xxxxxxxxxx> (nl.po 1.11.4)
+     Egbert Hinzen <egbert@xxxxxxxxxx> (de.po 1.11.4)
+     Sawada Katsuya <amanatto@xxxxxxxxxxxxxxxx> (ja.po)
+     Gaute Strokkenes <gs234@xxxxxxxxx> (no.po)
+     Dmitriy Genzel <udgenzel@xxxxxxxxxxxxxx> (ru.po)
+     Frank Osterfeld <frank.osterfeld@xxxxxxxxxxxx> (HOWTOPLAY.de)
+     Jens Georg <jgeorg@xxxxxxxxxx> (INSTALL.de)
+     Christian Marillat <marillat.christian@xxxxxxxxxx> (fr.po)
+     Franck Reinquin <freinquin@xxxxxxxxxxxxxx> (fr.po)
+     Nicolas Lannier <archeide@xxxxxxxxx> (fr.po)
+     Francisco Javier Felix <fflix@xxxxxx> (es.po)
+     Miguel Lobo <miguell@xxxxxxxxxx> (es.po)
+     David Perez Serrada <dperezs@xxxxxxx> (es.po)
+     SLUG Freeciv Team <http://freeciv.siena.linux.it/> (HOWTOPLAY.it)
+     Olivier Beyssac <ob@xxxxxxxxxxxxxxxxxxxx>
+	(HOWTOPLAY.fr INSTALL.fr README.fr)
+     Paolo Sammicheli <xdatap1@xxxxxxxxxxx> (INSTALL.it, README.it)
+     Dirk Stoecker <stoecker@xxxxxxxxxxxxxxxxxxxxx> (de.po)
+     Gábor Dukai <dukai@xxxxxxxx> (hu.po)
 
-  Localization (l10n) up to 1.11.0 release:
+  Localization (l10n) up to 1.11.4 release:
      (Version numbers refer to the first non-beta release
      to contain the translations.)
 
-     Sawada Katsuya <amanatto@xxxxxxxxxxxxxxxx> (ja.po 1.11.0)
-     Egbert Hinzen <garfy@xxxxxxxxxx> (de.po, README.de 1.11.0, 1.10.0)
+     Gerhard Killesreiter <killesreiter@xxxxxxxxxxxxxxxxxxxxxx> (de.po)
+     David Pfitzner <dwp@xxxxxxxxxxxxxx> (en_GB.po 1.11.4)
+     Sawada Katsuya <amanatto@xxxxxxxxxxxxxxxx> (ja.po 1.11.4, 1.11.0)
+     Egbert Hinzen <garfy@xxxxxxxxxx> (de.po, README.de 1.11.4, 1.11.0, 1.10.0)
      Vasco Alexandre da Silva Costa <vasc@xxxxxxxxxxxxxx>
 	(pt.po 1.11.0, 1.10.0, 1.9.0)
      Tomasz Wegrzanowski <maniek@xxxxxxxx> (pl.po 1.11.0)
-     Christian Knoke <chrisk@xxxxxxxx> (de.po 1.11.0)
+     Christian Knoke <chrisk@xxxxxxxx> (de.po 1.11.4, 1.11.0)
      Frank Osterfeld <fraos@xxxxxx> (de.po 1.11.0)
      Jens Georg <jgeorg@xxxxxxxxxx> (INSTALL.de 1.11.0, 1.10.0)
-     Pieter J. Kersten <kersten@xxxxxxxxxx> (nl.po 1.11.0)
+     Pieter J. Kersten <kersten@xxxxxxxxxx> (nl.po 1.11.4, 1.11.0)
      Gabor Dukai <dukai@xxxxxxxx> (hu.po 1.11.0, 1.10.0)
      Lalo Martins <lalo@xxxxxxxxxxxxxxx> (pt_BR.po 1.11.0, 1.9.0)
      Piotr Sulecki <piotr.sulecki@xxxxxxxxxxxxx> (pl.po 1.11.0)
-     Olivier Beyssac <ob@xxxxxxxxxxxxxxx> (fr.po 1.11.0, 1.10.0)
-     Pascal Audoux <audoux@xxxxxxxxx> (fr.po 1.11.0, 1.10.0)
+     Olivier Beyssac <ob@xxxxxxxxxxxxxxx> (fr.po 1.11.4, 1.11.0, 1.10.0)
+     Pascal Audoux <audoux@xxxxxxxxx> (fr.po 1.11.4, 1.11.0, 1.10.0)
      Benoit Timbert <benoit.timbert@xxxxxxxxxxxxxxxx> (fr.po 1.11.0, 1.10.0)
      Nicolas Lannier <archeide@xxxxxxxxx> (fr.po 1.11.0, 1.10.0)
      Franck Reinquin <freinquin@xxxxxxxxxx> (fr.po 1.11.0, 1.10.0)
@@ -528,47 +640,63 @@
 
   Package maintainers:
 
-     Lalo Martins <lalo@xxxxxxxxxxxxxxx> (Debian GNU/Linux)
-     Martin Willemoes Hansen <mwh@xxxxxxxxxxxx> (Stampede GNU/Linux)
-     Todd Goodman <tsg1@xxxxxxxxxxxxx> (Windows with Cygwin and X server)
-     Hugo van der Kooji <hvdkooij@xxxxxxx> (Redhat Linux)
-     Niilo Kajander <ganon@xxxxxxxxxx> (Slackware Linux)
-     Jan Dittberner <jan@xxxxxxxxxxxxxxxxx> (Mandrake Linux)
-     Fred Hohlen <fhohlen@xxxxxxxxxxxxxx> (LinuxPPC)
      Sebastian Bauer <sebauer@xxxxxxxxxxx> (Amiga)
+     Shane Smit <ssmit@xxxxxxxxxxx> (Caldera)
+     Jan Dittberner <jan@xxxxxxxxxxxxxxxxx> (Mandrake Linux)
+     Christian Gruber <christian.edward.gruber@xxxxxxx> (OpenBSD)
+     Alexander Mai <st002279@xxxxxxxxxxxxxxxxxxxxxx> (OS/2)
+     Dmitry V.Vasiliev <qnx@xxxxxxxxxx> (QNX)
+     Mathias Hasselmann <mathias.hasselmann@xxxxxx> (Red Hat)
+     Stepan Roh <sroh7497@xxxxxxxxxxxxxxxxxxxxx> (Slackware)
+     Bryan Blackburn <blb@xxxxxxxxx> (Solaris)
+     Pascal Bleser <guru@xxxxxxxxxxx> (Suse)
+     Andreas Kemnade <akemnade@xxxxxxxxxxx> (Windows)
+     Todd Goodman <tsg@xxxxxxxxxxxxx> (Windows+X)
 
   Monetary donations:
 
+     Paul Zastoupil <paulz@xxxxxxxxxxxx> (Domain name, hardware)
      Ian Rees <irees@xxxxxxx> (Domain name)
-     Paul Zastoupil <paulz@xxxxxxxxxxxx> (Domain name)
      Martin Willemoes Hansen <mwh@xxxxxxxxxxxx> (Domain name)
      Mitch Davis <mjd@xxxxxxxxxx> (Domain name)
      James Blackwell <innocent@xxxxxxxxxxxxxxxxxxxxxx> (Domain name)
 
   CivWorld (our map editor):
 
+     Mike Kaufman <mkaufman@xxxxxxxxxxxxxx> (maintainer)
+     Thue Janus Kristensen <thue@xxxxxxx> (rewrite)
+     Daniel Gudlat <gudlat@xxxxxxxxxxxxxxxxxxxxxxx> (previous maintainer)
      Benjamin Drieu <drieu@xxxxxxxxxxxxxxxxxxxxxxx> (original author)
-     Daniel Gudlat <gudlat@xxxxxxxxxxxxxxxxxxxxxxx> (recent maintainer)
 
   Modpacks:
 
      Bobby D. Bryant <bdbryant@xxxxxxxxxxxxxxx> (Ancients)
+     Mark Polo <mark@xxxxxxxxx> (Fantasy)
+     Paul Zastoupil <paulz@xxxxxxxxxxxx> (Middle-Earth)
 
   Projects:
 
      Artur Biesiadowski <abies@xxxxxxxxx> (Java Client 2)
-     Joseph Beckenbach <jrb3@xxxxxxxxx> (BeOS)
-     Marko Lindqvist <caz@xxxxxxxxxxxxxxxxxx> (Client-side AI)
+     Patrice LaFlamme <patrix@xxxxxxxxxx> (BeOS)
      Paul Zastoupil <paulz@xxxxxxxxxxxx> (Freeciv Manual)
+     Marko Lindqvist <caz@xxxxxxxxxxxxxxxxxx> (Client-side AI)
+     Ben Webb  <ben@xxxxxxxxxxxxxxxxxxxxxx> (FreecivAC)
+     Stewart Adcock <stewart@xxxxxxxxxxxxxxxxxxxxxx> (FreecivAC)
      John Goerzen <jgoerzen@xxxxxxxxxxxx> (Java Client 1)
      Andy Black <ablack@xxxxxxxxxxxxxx> (Macintosh)
-     Paul Zastoupil <paulz@xxxxxxxxxxxx> (Middle-Earth Modpack)
-     Daniel Glassey <danglassey@xxxxxxxxxxxxx> (Windows - Gtk+)
-     Justin Hopkins <hop@xxxxxxxxxxxxxxxxx> (Windows - native)
-     Mark Nettle <mark@xxxxxxxxxxxxxxx> (Fantasy modpack)
-     Alexandre Beraud <a_beraud@xxxxxxxx> (Window Maker launcher)
+     Brian Bolson <bolson@xxxxxxxxxxxxxx> (MacOS X port)
+     Sam Barnett-Cormack <sambc@xxxxxxxxxxxxxxxxxxxxx> (C++ port)
      Roger Tucker <roger.tucker@xxxxxxxx> (OpenVMS)
+     Arnold Krille <arnold@xxxxxxxxxxxxx> (Star Trek addon)
      Andreas Kemnade <akemnade@xxxxxxxxxxx> (Windows - Gtk+)
+     Alexandre Beraud <a_beraud@xxxxxxxx> (Window Maker launcher)
+     Heikki Pernu <Heikki.Pernu@xxxxxx> (xcivclient)
+     David Pfitzner <dwp@xxxxxxxxxxxxxx> (TechTree)
+     Wong Teck Meng <lookmeow@xxxxxxxxxxxx> (CivLog)
+     Christian Knoke <ChrisK@xxxxxxxx> (CivGo)
+     Andreas Kemnade <akemnade@xxxxxxxxxxx> (WinCivGo)
+     Daniel Glassey <danglassey@xxxxxxxxxxxxx> (Windows - Gtk+)
+     Justin Hopkins <hop@xxxxxxxxxxxxxxxxx> (Windows - native)
 
   Others: