From a2297d91e38127817145c1a8dfedc286ec07dc99 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 29 Jul 2015 11:47:09 +0930
Subject: [PATCH 001/323] Strictly derive autosave directory from save
 directory.

---
 .../freecol/common/io/FreeColDirectories.java | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/net/sf/freecol/common/io/FreeColDirectories.java b/src/net/sf/freecol/common/io/FreeColDirectories.java
index 50bc4081b..418c2cdeb 100644
--- a/src/net/sf/freecol/common/io/FreeColDirectories.java
+++ b/src/net/sf/freecol/common/io/FreeColDirectories.java
@@ -515,6 +515,16 @@ public class FreeColDirectories {
         }
     }
 
+    /**
+     * Derive the directory for the autosave files from the save directory.
+     */
+    private static void deriveAutosaveDirectory() {
+        if (autosaveDirectory == null && saveDirectory != null) {
+            autosaveDirectory = new File(saveDirectory, AUTOSAVE_DIRECTORY);
+            if (!insistDirectory(autosaveDirectory)) autosaveDirectory = null;
+        }
+    }
+        
 
     // Main initialization/bootstrap routines.
     // These need to be called early before the subsidiary directory
@@ -630,9 +640,7 @@ public class FreeColDirectories {
             saveDirectory = new File(getUserDataDirectory(), SAVE_DIRECTORY);
             if (!insistDirectory(saveDirectory)) return "main.userDir.fail";
         }
-
-        autosaveDirectory = new File(getSaveDirectory(), AUTOSAVE_DIRECTORY);
-        if (!insistDirectory(autosaveDirectory)) autosaveDirectory = null;
+        deriveAutosaveDirectory();
 
         userModsDirectory = new File(getUserDataDirectory(), MODS_DIRECTORY);
         if (!insistDirectory(userModsDirectory)) userModsDirectory = null;
@@ -644,7 +652,6 @@ public class FreeColDirectories {
             : null;
     }
 
-
     // Directory accessors.
     // Where there are supported command line arguments there will also
     // be a mutator.
@@ -843,9 +850,10 @@ public class FreeColDirectories {
             if (!file.exists() || !file.isFile() || !file.canRead()) return false;
         }
         setSavegameFile(file);
-        setSaveDirectory(file.getParentFile());
-        File autoDirectory = new File(getSaveDirectory(), AUTOSAVE_DIRECTORY);
-        if (insistDirectory(autoDirectory)) autosaveDirectory = autoDirectory;
+        File parent = file.getParentFile();
+        if (parent == null) parent = new File(".");
+        setSaveDirectory(parent);
+        deriveAutosaveDirectory();
         return true;
     }
 

From 8342697e76a8eb5a688e3a92e31d6dce8e191afd Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 25 Jul 2015 20:35:12 +0930
Subject: [PATCH 002/323] Pluralization correction for coastal colony limit
 message.

---
 data/strings/FreeColMessages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 12a641fea..587b8c003 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -1802,7 +1802,7 @@ model.improvement.road.occupationString=R
 
 # Limits
 model.limit.independence.coastalColonies.name=Coastal Colony Limit
-model.limit.independence.coastalColonies.description=You need at least %limit% coastal colonies in order to declare independence.
+model.limit.independence.coastalColonies.description=You need at least %limit% coastal {{plural:%limit%|one=colony|other=colonies}} in order to declare independence.
 model.limit.independence.rebels.name=Rebel Limit
 model.limit.independence.rebels.description=At least %limit%% of your colonists must support independence.
 model.limit.independence.year.name=Year Limit

From 396e080b9f89b9e7e506132c936c0271c8b16a07 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 15 Jul 2015 14:01:47 +0930
Subject: [PATCH 003/323] Add colonyCenter message.

---
 data/strings/FreeColMessages.properties   | 1 +
 src/net/sf/freecol/common/model/Tile.java | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 587b8c003..17844af40 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -131,6 +131,7 @@ cargoOnCarrier=Cargo on carrier
 cashInTreasureTrain=Cash in treasure train
 clearOrders=Clear orders
 colonists=Colonists
+colonyCenter=colony center
 colopedia=Colopedia
 difficulty=Difficulty
 docks=Docks
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index a7de4c973..3b14610fb 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -1101,8 +1101,7 @@ public final class Tile extends UnitLocation implements Named, Ownable {
         StringTemplate t = StringTemplate.template("model.tile.nameLocation");
         if (ct == this) {
             t.addStringTemplate("%location%",
-                // TODO-post-0.11.4-release: add message
-                StringTemplate.key("colopedia.terrain.colonyCenterTile"));
+                StringTemplate.key("colonyCenter"));
         } else {
             Direction d = getMap().getDirection(ct, this);
             if (d == null) return null;

From 2ea457c26468e7ed80cf5423191f0d6db7170a78 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 5 Jul 2015 17:17:52 +0930
Subject: [PATCH 004/323] Distinguish famine (low food) from starvation (no
 food) in colony warnings.

---
 data/strings/FreeColMessages.properties     |  1 +
 src/net/sf/freecol/common/model/Colony.java | 32 ++++++++++++---------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 17844af40..e071c4e2d 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -2527,6 +2527,7 @@ model.colony.colonyStarved=The last colonist in %colony% has starved, leaving th
 model.colony.customs.sale=The Customs House at %colony% sold: %data%.
 model.colony.customs.saleData=%amount% %goods% for %gold%
 model.colony.famineFeared=Famine feared in %colony%. Only %number% turns of food left.
+model.colony.starving=%colony% is starving.
 model.colony.newColonist=New colonist in %colony%.
 model.colony.newConvert=A new %nation% convert has arrived in %colony%.
 model.colony.notBuildingAnything=Nothing is being built in %colony%.
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 735052a6e..8b280c34c 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -2255,19 +2255,25 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
         List<StringTemplate> result = new ArrayList<>();
         final int amount = getGoodsCount(goodsType);
         final int production = getNetProductionOf(goodsType);
-
-        if (goodsType.isFoodType() && goodsType.isStorable()) {
-            // Food is never wasted -> new settler is produced
-            if (amount + production < 0) {
-                result.add(StringTemplate
-                    .template("model.colony.famineFeared")
-                    .addName("%colony%", getName())
-                    .addAmount("%number%", 0));
-            }
-        } else {
-            int waste = (amount + production - getWarehouseCapacity());
-            if (waste > 0 && !getExportData(goodsType).getExported()
-                && !goodsType.limitIgnored()) {
+        int waste;
+        
+        if (goodsType.isStorable()) {
+            if (goodsType.limitIgnored()) {
+                if (goodsType.isFoodType()) {
+                    int starve = getStarvationTurns();
+                    if (starve == 0) {
+                        result.add(StringTemplate
+                            .template("model.colony.starving")
+                            .addName("%colony%", getName()));
+                    } else if (starve <= Colony.FAMINE_TURNS) {
+                        result.add(StringTemplate
+                            .template("model.colony.famineFeared")
+                            .addName("%colony%", getName())
+                            .addAmount("%number%", starve));
+                    }
+                }
+            } else if (!getExportData(goodsType).getExported()
+                && (waste = amount + production - getWarehouseCapacity()) > 0) {
                 result.add(StringTemplate
                     .template("model.building.warehouseSoonFull")
                     .addNamed("%goods%", goodsType)

From 7e726dc768e06b14a8acba4c92e1ea2fc0b20700 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 5 Jul 2015 16:47:10 +0930
Subject: [PATCH 005/323] Generalize insufficient production warning.

---
 data/strings/FreeColMessages.properties     | 2 +-
 data/strings/FreeColMessages_qqq.properties | 1 +
 src/net/sf/freecol/common/model/Colony.java | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index e071c4e2d..7d780e74c 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -2220,7 +2220,7 @@ model.colony.badGovernment=The government of %colony% is inefficient. Production
 model.colony.goodGovernment=Government efficiency has improved! Rebel sentiment in %colony% now equals or exceeds %number% percent.
 model.colony.governmentImproved1=The government of %colony% has improved, but is still inefficient. Production penalties still apply.
 model.colony.governmentImproved2=The government of %colony% has improved. Production penalties no longer apply.
-model.colony.insufficientProduction=%outputAmount% more %outputType% could be produced in %colony%, if only we had %inputAmount% more %inputType% surplus.
+model.colony.insufficientProduction=%outputAmount% more %outputType% could be produced in %colony%, if an extra %consumptionDeficit% were available.
 model.colony.lostGoodGovernment=Government efficiency has decreased! Rebel sentiment in %colony% no longer equals or exceeds %number% percent. Colony no longer gains any production bonus.
 model.colony.lostVeryGoodGovernment=Government efficiency has decreased! Rebel sentiment in %colony% no longer equals or exceeds %number% percent. Some production bonuses were lost.
 model.colony.minimumColonySize=%object% prevents reducing the population any further.
diff --git a/data/strings/FreeColMessages_qqq.properties b/data/strings/FreeColMessages_qqq.properties
index 226ad9e76..50368d033 100644
--- a/data/strings/FreeColMessages_qqq.properties
+++ b/data/strings/FreeColMessages_qqq.properties
@@ -504,6 +504,7 @@ model.unit.unitState.toAmerica=A symbol; shorthand for the action a specific uni
 model.unit.unitState.toEurope=A symbol; shorthand for the action a specific unit is doing on the map. See [http://www.freecol.org/images/screen-0.8.0-large.jpg example screenshot].
 model.noAddReason.ownedByEnemy.description=Эта территория принадлежит другой нации.
 model.colony.customs.sale=A prefix for customs sales at a colony.  The %data% part will be multiple instances of customs.saleData messages.
+model.colony.insufficientProduction=Consumption deficit is a comma separated list of goods labels (e.g. "2 furs")
 model.region.north.name={{Identical|North}}
 model.region.center.name={{Identical|Center}}
 main.defaultPlayerName={{Identical|Player name}}
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 8b280c34c..f0fa87887 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -2335,13 +2335,14 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
 
         List<AbstractGoods> input = info.getConsumptionDeficit();
         if (input.isEmpty()) return null;
-
+        StringTemplate label = StringTemplate.label(", ");
+        for (AbstractGoods ag : input) label.addStringTemplate(ag.getLabel());
+        
         return StringTemplate.template("model.colony.insufficientProduction")
             .addName("%colony%", getName())
             .addNamed("%outputType%", deficit.getType())
             .addAmount("%outputAmount%", deficit.getAmount())
-            .addNamed("%inputType%", input.get(0).getType())
-            .addAmount("%inputAmount%", input.get(0).getAmount());
+            .addStringTemplate("%consumptionDeficit%", label);
     }
 
     /**

From 37714d165a973ae7fcf275254bd7381649a4618c Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 5 Jul 2015 15:54:58 +0930
Subject: [PATCH 006/323] Add exported goods tooltip to ReportTradePanel.

---
 data/strings/FreeColMessages.properties                   | 3 ++-
 src/net/sf/freecol/client/gui/panel/ReportTradePanel.java | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 7d780e74c..d9cd85fa1 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -3157,7 +3157,8 @@ report.requirements.surplus=A surplus of %goods% is being produced at
 report.trade.afterTaxes=Income after taxes
 report.trade.beforeTaxes=Income before taxes
 report.trade.cargoUnits=Units in Cargo
-report.trade.hasCustomHouse=* This colony has a custom house; these goods are exported.
+report.trade.export=Exporting %goods% above %amount%
+report.trade.hasCustomHouse=* This colony has a custom house, and may export goods.
 report.trade.totalDelta=Total Production
 report.trade.totalUnits=Total Units
 report.trade.unitsSold=Units bought or sold
diff --git a/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java b/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
index 5df300d83..14c44023a 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
@@ -176,6 +176,13 @@ public final class ReportTradePanel extends ReportPanel {
                     : Utility.CELLBORDER);
                 goodsLabel.setForeground(GoodsLabel.getColor(goodsType, amount,
                                                              colony));
+                ExportData ed = colony.getExportData(goodsType);
+                if (ed.getExported()) {
+                    goodsLabel.setToolTipText(Messages.message(StringTemplate
+                            .template("report.trade.export")
+                            .addNamed("%goods%", goodsType)
+                            .addAmount("%amount%", ed.getExportLevel())));
+                }
                 reportPanel.add(goodsLabel, "cell " + column + " " + row);
 
                 int production = colony.getNetProductionOf(goodsType);

From 5de4460fc3f4c9dc0874bebf2f5e22d2a286dd1a Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 28 Jul 2015 09:39:39 +0930
Subject: [PATCH 007/323] Enforce IntegerOption limits.

---
 .../sf/freecol/common/option/IntegerOption.java    | 14 +++++++++++++-
 .../src/net/sf/freecol/common/model/LimitTest.java |  5 +++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/common/option/IntegerOption.java b/src/net/sf/freecol/common/option/IntegerOption.java
index 817e90c6e..e205fcfe2 100644
--- a/src/net/sf/freecol/common/option/IntegerOption.java
+++ b/src/net/sf/freecol/common/option/IntegerOption.java
@@ -102,6 +102,16 @@ public class IntegerOption extends AbstractOption<Integer> {
         this.maximumValue = maximumValue;
     }
 
+    /**
+     * Limit a value with respect to the limits of this option.
+     *
+     * @param value The value to limit.
+     * @return The value limited by the option limits.
+     */
+    public int limitValue(int value) {
+        return Math.min(Math.max(value, this.minimumValue), this.maximumValue);
+    }
+
 
     // Interface Option
 
@@ -131,7 +141,7 @@ public class IntegerOption extends AbstractOption<Integer> {
     @Override
     public void setValue(Integer value) {
         final int oldValue = this.value;
-        this.value = value;
+        this.value = limitValue(value);
 
         if (value != oldValue && isDefined) {
             firePropertyChange(VALUE_TAG, oldValue, (int)value);
@@ -189,6 +199,8 @@ public class IntegerOption extends AbstractOption<Integer> {
         maximumValue = xr.getAttribute(MAXIMUM_VALUE_TAG, Integer.MAX_VALUE);
 
         minimumValue = xr.getAttribute(MINIMUM_VALUE_TAG, Integer.MIN_VALUE);
+
+        this.value = limitValue(this.value);
     }
 
     /**
diff --git a/test/src/net/sf/freecol/common/model/LimitTest.java b/test/src/net/sf/freecol/common/model/LimitTest.java
index c5b315034..97510c8d5 100644
--- a/test/src/net/sf/freecol/common/model/LimitTest.java
+++ b/test/src/net/sf/freecol/common/model/LimitTest.java
@@ -135,10 +135,11 @@ public class LimitTest extends FreeColTestCase {
         assertTrue(colonyLimit.getLeftHandSide().appliesTo(colony));
         assertTrue(colonyLimit.evaluate(dutch));
 
-        IntegerOption option = spec().getIntegerOption(GameOptions.LAST_COLONIAL_YEAR);
+        IntegerOption option = spec()
+            .getIntegerOption(GameOptions.LAST_COLONIAL_YEAR);
+        option.setMinimumValue(1300);
         option.setValue(1300);
         assertFalse(yearLimit.evaluate(dutch));
-
     }
 
     public void testSuccessionLimits() {

From 7aef6f5924e426a3c79176d657b3e06d832a78cd Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 29 Jul 2015 21:23:25 +0200
Subject: [PATCH 008/323] Simplify setSelectedTile, removing the single use
 goto clearing

---
 .../client/control/ConnectController.java     |  4 ++--
 .../client/control/InGameController.java      | 10 ++++-----
 .../gui/CanvasMapEditorMouseListener.java     |  4 ++--
 .../client/gui/CanvasMouseListener.java       | 12 +++++++++--
 src/net/sf/freecol/client/gui/GUI.java        |  3 +--
 src/net/sf/freecol/client/gui/MapViewer.java  | 21 ++++---------------
 src/net/sf/freecol/client/gui/SwingGUI.java   |  7 +++----
 .../client/gui/action/ScaleMapAction.java     |  2 +-
 8 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
index ed17fd833..3403b6a1f 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -317,10 +317,10 @@ public final class ConnectController {
                         activeUnit.getOwner().setNextActiveUnit(activeUnit);
                         gui.setActiveUnit(activeUnit);
                     } else {
-                        gui.setSelectedTile(entryTile, false);
+                        gui.setSelectedTile(entryTile);
                     }
                 } else {
-                    gui.setSelectedTile(entryTile, false);
+                    gui.setSelectedTile(entryTile);
                 }
             }
         }
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 2d32955f7..dbbf4ab8d 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -853,7 +853,7 @@ public final class InGameController implements NetworkConstants {
         // just select nothing and wait.
         ClientOptions options = freeColClient.getClientOptions();
         if (tile != null) {
-            gui.setSelectedTile(tile, false);
+            gui.setSelectedTile(tile);
         } else if (options.getBoolean(ClientOptions.AUTO_END_TURN)) {
             doEndTurn(options.getBoolean(ClientOptions.SHOW_END_TURN_DIALOG));
         }
@@ -1631,7 +1631,7 @@ public final class InGameController implements NetworkConstants {
         }
         if (unit.getMovesLeft() <= 0) return false;
         displayModelMessages(false);
-        if (!gui.onScreen(tile)) gui.setSelectedTile(tile, false);
+        if (!gui.onScreen(tile)) gui.setSelectedTile(tile);
         return true;
     }
 
@@ -2563,7 +2563,7 @@ public final class InGameController implements NetworkConstants {
         if (ret) {
             player.invalidateCanSeeTiles();
             gui.setActiveUnit(null);
-            gui.setSelectedTile(tile, false);
+            gui.setSelectedTile(tile);
         }
         return ret;
     }
@@ -2727,7 +2727,7 @@ public final class InGameController implements NetworkConstants {
         if (ret) {
             player.invalidateCanSeeTiles();
             gui.setActiveUnit(null);
-            gui.setSelectedTile(tile, false);
+            gui.setSelectedTile(tile);
             freeColClient.getSoundController()
                 .playSound("sound.event.buildingComplete");
             // Check units present for treasure cash-in as they are now
@@ -3826,7 +3826,7 @@ public final class InGameController implements NetworkConstants {
         Tile newTile = tile.getNeighbourOrNull(direction);
         if (newTile == null) return false;
 
-        gui.setSelectedTile(newTile, false);
+        gui.setSelectedTile(newTile);
         return true;
     } 
 
diff --git a/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java b/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java
index 2282600fb..3b4d4b639 100644
--- a/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java
@@ -139,7 +139,7 @@ public final class CanvasMapEditorMouseListener extends AbstractCanvasListener
         try {
             if (e.getButton() == MouseEvent.BUTTON1) {
                 Tile tile = mapViewer.convertToMapTile(e.getX(), e.getY());
-                if (tile != null) getGUI().setSelectedTile(tile, false);
+                if (tile != null) getGUI().setSelectedTile(tile);
                 startPoint = endPoint = null;
 
             } else if (e.getButton() == MouseEvent.BUTTON2) {
@@ -167,7 +167,7 @@ public final class CanvasMapEditorMouseListener extends AbstractCanvasListener
                         canvas.showEditSettlementDialog(tile.getIndianSettlement());
                     }
                 } else {
-                    getGUI().setSelectedTile(null, false);
+                    getGUI().setSelectedTile(null);
                 }
             }
         } catch (Exception ex) {
diff --git a/src/net/sf/freecol/client/gui/CanvasMouseListener.java b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
index b471742d0..eac714fa9 100644
--- a/src/net/sf/freecol/client/gui/CanvasMouseListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
@@ -205,7 +205,15 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
     @Override
     public void actionPerformed(ActionEvent e) {
         doubleClickTimer.stop();
-        mapViewer.setSelectedTile(mapViewer.convertToMapTile(centerX, centerY),
-            true);
+        Tile tile=mapViewer.convertToMapTile(centerX, centerY);
+        if(mapViewer.getViewMode() == GUI.MOVE_UNITS_MODE) {
+            // Clear goto order when active unit is on the tile
+            Unit unit=mapViewer.getActiveUnit();
+            if(unit != null && unit.getTile() == tile) {
+                freeColClient.getInGameController().clearGotoOrders(unit);
+                mapViewer.updateCurrentPathForActiveUnit();
+            }
+        }
+        mapViewer.setSelectedTile(tile);
     }
 }
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 0c7a3f6d4..7fd44f305 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -1632,8 +1632,7 @@ public class GUI {
     public void setFocusImmediately(Tile tileToFocus) {
     }
 
-    public boolean setSelectedTile(Tile newTileToSelect,
-                                   boolean clearGoToOrders) {
+    public boolean setSelectedTile(Tile newTileToSelect) {
         return true; // Pretending again.
     }
 
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 183856961..f8e202365 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -947,7 +947,7 @@ public final class MapViewer {
             freeColClient.updateActions();
         } else {
             updateCurrentPathForActiveUnit();
-            if (!setSelectedTile(tile, false)
+            if (!setSelectedTile(tile)
                 || freeColClient.getClientOptions()
                 .getBoolean(ClientOptions.JUMP_TO_ACTIVE_UNIT)) {
                 setFocus(tile);
@@ -1064,8 +1064,7 @@ public final class MapViewer {
      *   <li>If there is a {@link Colony} on the {@link Tile} the
      *       {@link Canvas#showColonyPanel} will be invoked.
      *   <li>If the tile contains a unit that can become active, then
-     *       that unit will be set as the active unit, and clear their
-     *       goto orders if clearGoToOrders is <code>true</code>
+     *       that unit will be set as the active unit.
      *   <li>If the two conditions above do not match, then the
      *       <code>selectedTile</code> will become the map focus.
      * </ol>
@@ -1074,20 +1073,18 @@ public final class MapViewer {
      * then nothing (except perhaps a map reposition) will happen.
      *
      * @param newTile The <code>Tile</code>, the tile to be selected
-     * @param clearGoToOrders Use <code>true</code> to clear goto
-     *     orders of the unit which is activated
      * @return True if the focus was set.
      * @see #getSelectedTile
      * @see #setActiveUnit
      * @see #setFocus(Tile)
      */
-    boolean setSelectedTile(Tile newTile, boolean clearGoToOrders) {
+    boolean setSelectedTile(Tile newTile) {
         Tile oldTile = this.selectedTile;
         boolean ret = false;
         selectedTile = newTile;
 
         if (getViewMode() == GUI.MOVE_UNITS_MODE) {
-            if (isNoActiveUnitAt(newTile)) {
+            if (activeUnit == null || activeUnit.getTile() != newTile) {
                 if (newTile != null && newTile.hasSettlement()) {
                     gui.showSettlement(newTile.getSettlement());
                     return false;
@@ -1102,12 +1099,6 @@ public final class MapViewer {
                     setFocus(newTile);
                     ret = true;
                 }
-            } else {
-                // Clear goto order when unit is already active
-                if (clearGoToOrders) {
-                    freeColClient.getInGameController().clearGotoOrders(activeUnit);
-                    updateCurrentPathForActiveUnit();
-                }
             }
         }
 
@@ -2498,10 +2489,6 @@ public final class MapViewer {
             && tile.getX() >= leftColumn && tile.getX() <= rightColumn;
     }
 
-    private boolean isNoActiveUnitAt(Tile tile) {
-        return activeUnit == null || activeUnit.getTile() != tile;
-    }
-
     /**
      * Draws the borders of a territory on the given Tile. The
      * territory is either a country or a region.
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 14c27a3fb..93ed20483 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -204,7 +204,7 @@ public class SwingGUI extends GUI {
         canvas.initializeInGame();
         enableMapControls(freeColClient.getClientOptions()
             .getBoolean(ClientOptions.DISPLAY_MAP_CONTROLS));
-        setSelectedTile(tile, false);
+        setSelectedTile(tile);
     }
 
     /**
@@ -1658,9 +1658,8 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public boolean setSelectedTile(Tile newTileToSelect,
-                                   boolean clearGoToOrders) {
-        return mapViewer.setSelectedTile(newTileToSelect, clearGoToOrders);
+    public boolean setSelectedTile(Tile newTileToSelect) {
+        return mapViewer.setSelectedTile(newTileToSelect);
     }
 
     @Override
diff --git a/src/net/sf/freecol/client/gui/action/ScaleMapAction.java b/src/net/sf/freecol/client/gui/action/ScaleMapAction.java
index 326bf09f1..65718ebb7 100644
--- a/src/net/sf/freecol/client/gui/action/ScaleMapAction.java
+++ b/src/net/sf/freecol/client/gui/action/ScaleMapAction.java
@@ -96,7 +96,7 @@ public class ScaleMapAction extends FreeColAction {
             t.getTileItemContainer().updateRiver();
         }*/
 
-        getGUI().setSelectedTile(map.getTile(0, 0), false);
+        getGUI().setSelectedTile(map.getTile(0, 0));
         getGUI().refresh();
     }
 

From 167ecf98618f50493751ed06db8b7355d033e2bf Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 30 Jul 2015 19:18:38 +0930
Subject: [PATCH 009/323] Work around the lakes work around, BR#2878.

---
 .../sf/freecol/server/model/ServerRegion.java | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/net/sf/freecol/server/model/ServerRegion.java b/src/net/sf/freecol/server/model/ServerRegion.java
index 9f66efd26..5ac429456 100644
--- a/src/net/sf/freecol/server/model/ServerRegion.java
+++ b/src/net/sf/freecol/server/model/ServerRegion.java
@@ -96,6 +96,21 @@ public class ServerRegion extends Region {
         this.setDiscoverable(true);
     }
     
+    /**
+     * Create a new fixed server region.
+     *
+     * @param map The <code>Map</code> to create in.
+     * @param key The key for the region.
+     * @param type The <code>RegionType</code> to use.
+     * @param parent The <code>Region</code> to be the parent of this one.
+     */
+    private ServerRegion(Map map, String key, RegionType type,
+                         Region parent) {
+        this(map.getGame(), key, type, parent);
+
+        map.addRegion(this);
+    }
+
     /**
      * Create a new fixed server region.
      *
@@ -118,7 +133,6 @@ public class ServerRegion extends Region {
         this.discoveredIn = null;
         this.discoveredBy = null;
         this.scoreValue = 0;
-        game.getMap().addRegion(this);
     }
 
 
@@ -241,7 +255,7 @@ public class ServerRegion extends Region {
         final int arcticHeight = Map.POLAR_HEIGHT;
         ServerRegion arctic = (ServerRegion)fixed.get("model.region.arctic");
         if (arctic == null) {
-            arctic = new ServerRegion(game, "model.region.arctic",
+            arctic = new ServerRegion(map, "model.region.arctic",
                                       RegionType.LAND, null);
             for (int x = 0; x < map.getWidth(); x++) {
                 for (int y = 0; y < arcticHeight; y++) {
@@ -257,7 +271,7 @@ public class ServerRegion extends Region {
         final int antarcticHeight = map.getHeight() - Map.POLAR_HEIGHT - 1;
         ServerRegion antarctic = (ServerRegion)fixed.get("model.region.antarctic");
         if (antarctic == null) {
-            antarctic = new ServerRegion(game, "model.region.antarctic",
+            antarctic = new ServerRegion(map, "model.region.antarctic",
                                          RegionType.LAND, null);
             for (int x = 0; x < map.getWidth(); x++) {
                 for (int y = antarcticHeight; y < map.getHeight(); y++) {
@@ -282,7 +296,7 @@ public class ServerRegion extends Region {
 
         ServerRegion northWest = (ServerRegion)fixed.get("model.region.northWest");
         if (northWest == null) {
-            northWest = new ServerRegion(game, "model.region.northWest",
+            northWest = new ServerRegion(map, "model.region.northWest",
                                          RegionType.LAND, null);
             northWest.bounds.setBounds(new Rectangle(0,0,thirdWidth,thirdHeight));
             lb.add("+NW");
@@ -291,7 +305,7 @@ public class ServerRegion extends Region {
 
         ServerRegion north = (ServerRegion)fixed.get("model.region.north");
         if (north == null) {
-            north = new ServerRegion(game, "model.region.north",
+            north = new ServerRegion(map, "model.region.north",
                                      RegionType.LAND, null);
             north.bounds.setBounds(new Rectangle(thirdWidth,0,thirdWidth,thirdHeight));
             lb.add("+N");
@@ -300,7 +314,7 @@ public class ServerRegion extends Region {
 
         ServerRegion northEast = (ServerRegion)fixed.get("model.region.northEast");
         if (northEast == null) {
-            northEast = new ServerRegion(game, "model.region.northEast",
+            northEast = new ServerRegion(map, "model.region.northEast",
                                          RegionType.LAND, null);
             northEast.bounds.setBounds(new Rectangle(twoThirdWidth,0,thirdWidth,thirdHeight));
             lb.add("+NE");
@@ -309,7 +323,7 @@ public class ServerRegion extends Region {
 
         ServerRegion west = (ServerRegion)fixed.get("model.region.west");
         if (west == null) {
-            west = new ServerRegion(game, "model.region.west",
+            west = new ServerRegion(map, "model.region.west",
                                     RegionType.LAND, null);
             west.bounds.setBounds(new Rectangle(0,thirdHeight,thirdWidth,thirdHeight));
             lb.add("+W");
@@ -318,7 +332,7 @@ public class ServerRegion extends Region {
 
         ServerRegion center = (ServerRegion)fixed.get("model.region.center");
         if (center == null) {
-            center = new ServerRegion(game, "model.region.center",
+            center = new ServerRegion(map, "model.region.center",
                                       RegionType.LAND, null);
             center.bounds.setBounds(new Rectangle(thirdWidth,thirdHeight,thirdWidth,thirdHeight));
             lb.add("+center");
@@ -327,7 +341,7 @@ public class ServerRegion extends Region {
 
         ServerRegion east = (ServerRegion)fixed.get("model.region.east");
         if (east == null) {
-            east = new ServerRegion(game, "model.region.east",
+            east = new ServerRegion(map, "model.region.east",
                                     RegionType.LAND, null);
             east.bounds.setBounds(new Rectangle(twoThirdWidth,thirdHeight,thirdWidth,thirdHeight));
             lb.add("+E");
@@ -336,7 +350,7 @@ public class ServerRegion extends Region {
 
         ServerRegion southWest = (ServerRegion)fixed.get("model.region.southWest");
         if (southWest == null) {
-            southWest = new ServerRegion(game, "model.region.southWest",
+            southWest = new ServerRegion(map, "model.region.southWest",
                                          RegionType.LAND, null);
             southWest.bounds.setBounds(new Rectangle(0,twoThirdHeight,thirdWidth,thirdHeight));
             lb.add("+SW");
@@ -345,7 +359,7 @@ public class ServerRegion extends Region {
 
         ServerRegion south = (ServerRegion)fixed.get("model.region.south");
         if (south == null) {
-            south = new ServerRegion(game, "model.region.south",
+            south = new ServerRegion(map, "model.region.south",
                                      RegionType.LAND, null);
             south.bounds.setBounds(new Rectangle(thirdWidth,twoThirdHeight,thirdWidth,thirdHeight));
             lb.add("+S");
@@ -354,7 +368,7 @@ public class ServerRegion extends Region {
 
         ServerRegion southEast = (ServerRegion)fixed.get("model.region.southEast");
         if (southEast == null) {
-            southEast = new ServerRegion(game, "model.region.southEast",
+            southEast = new ServerRegion(map, "model.region.southEast",
                                          RegionType.LAND, null);
             southEast.bounds.setBounds(new Rectangle(twoThirdWidth,twoThirdHeight,thirdWidth,thirdHeight));
             lb.add("+SE");
@@ -364,7 +378,7 @@ public class ServerRegion extends Region {
         boolean allOceans = true;
         ServerRegion pacific = (ServerRegion)fixed.get("model.region.pacific");
         if (pacific == null) {
-            pacific = new ServerRegion(game, "model.region.pacific",
+            pacific = new ServerRegion(map, "model.region.pacific",
                                        RegionType.OCEAN, null);
             pacific.setDiscoverable(true);
             pacific.setScoreValue(PACIFIC_SCORE_VALUE);
@@ -374,7 +388,7 @@ public class ServerRegion extends Region {
         result.add(pacific);
         ServerRegion northPacific = (ServerRegion)fixed.get("model.region.northPacific");
         if (northPacific == null) {
-            northPacific = new ServerRegion(game, "model.region.northPacific",
+            northPacific = new ServerRegion(map, "model.region.northPacific",
                                             RegionType.OCEAN, pacific);
             northPacific.setDiscoverable(false); // discovers parent
             allOceans = false;
@@ -383,7 +397,7 @@ public class ServerRegion extends Region {
         result.add(northPacific);
         ServerRegion southPacific = (ServerRegion)fixed.get("model.region.southPacific");
         if (southPacific == null) {
-            southPacific = new ServerRegion(game, "model.region.southPacific",
+            southPacific = new ServerRegion(map, "model.region.southPacific",
                                             RegionType.OCEAN, pacific);
             southPacific.setDiscoverable(false); // discovers parent
             allOceans = false;
@@ -393,7 +407,7 @@ public class ServerRegion extends Region {
 
         ServerRegion atlantic = (ServerRegion)fixed.get("model.region.atlantic");
         if (atlantic == null) {
-            atlantic = new ServerRegion(game, "model.region.atlantic",
+            atlantic = new ServerRegion(map, "model.region.atlantic",
                                         RegionType.OCEAN, null);
             atlantic.setDiscoverable(false);
             allOceans = false;
@@ -402,7 +416,7 @@ public class ServerRegion extends Region {
         result.add(atlantic);
         ServerRegion northAtlantic = (ServerRegion)fixed.get("model.region.northAtlantic");
         if (northAtlantic == null) {
-            northAtlantic = new ServerRegion(game, "model.region.northAtlantic",
+            northAtlantic = new ServerRegion(map, "model.region.northAtlantic",
                                              RegionType.OCEAN, atlantic);
             northAtlantic.setDiscoverable(false);
             allOceans = false;
@@ -411,7 +425,7 @@ public class ServerRegion extends Region {
         result.add(northAtlantic);
         ServerRegion southAtlantic = (ServerRegion)fixed.get("model.region.southAtlantic");
         if (southAtlantic == null) {
-            southAtlantic = new ServerRegion(game, "model.region.southAtlantic",
+            southAtlantic = new ServerRegion(map, "model.region.southAtlantic",
                                              RegionType.OCEAN, atlantic);
             southAtlantic.setDiscoverable(false);
             allOceans = false;

From cbb348dd4a6c0d3a39a933d83834de362499360a Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 5 Jul 2015 17:32:51 +0930
Subject: [PATCH 010/323] Implement tooltips for the summary fields in RCCP.

---
 .../client/gui/panel/ReportCompactColonyPanel.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index 9da827587..8cdebdc92 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -667,17 +667,19 @@ public final class ReportCompactColonyPanel extends ReportPanel
                 break;
             case PRODUCTION:
                 c = cWarn;
-                t = stpld("report.colony.production")
+                t = stpld("report.colony.production.maxProduction")
                         .addName("%colony%", s.colony.getName())
                         .addNamed("%goods%", gt)
-                        .addAmount("%amount%", gp.amount);
+                        .addAmount("%amount%", gp.amount)
+                        .addAmount("%more%", gp.extra);
                 break;
             case CONSUMPTION:
                 c = cWarn;
-                t = stpld("report.colony.production")
+                t = stpld("report.colony.production.maxConsumption")
                         .addName("%colony%", s.colony.getName())
                         .addNamed("%goods%", gt)
-                        .addAmount("%amount%", gp.amount);
+                        .addAmount("%amount%", gp.amount)
+                        .addAmount("%more%", gp.extra);
                 break;
             default:
                 throw new IllegalStateException("Bogus status: " + gp.status);

From 250c2f0eae30fce9ccca13b502fc63bfc9338035 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 16 Jul 2015 20:07:30 +0930
Subject: [PATCH 011/323] Add RCCP summary tooltips.

---
 .../gui/panel/ReportCompactColonyPanel.java   | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index 8cdebdc92..4af9b6cac 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -893,13 +893,15 @@ public final class ReportCompactColonyPanel extends ReportPanel
         // Colour: Plain
         t = mapEntriesByValue(rRegionMap, descendingIntegerComparator)
             .get(0).getKey().getLabel();
-        reportPanel.add(newLabel(Messages.message(t), null, cPlain, null),
+        reportPanel.add(newLabel(Messages.message(t), null, cPlain,
+                                 stpld("report.colony.name.summary")),
                         "newline");
 
         // Field: The total of the size change field.
         // Colour: cGood if efficient/cAlarm if inefficient.
         reportPanel.add(newLabel(Integer.toString(rSizeChange), null,
-                                 (rSizeChange < 0) ? cAlarm : cGood, null));
+                                 (rSizeChange < 0) ? cAlarm : cGood,
+                                 stpld("report.colony.growing.summary")));
 
         // Field: The number of potential colony tiles that need
         // exploring.
@@ -911,7 +913,8 @@ public final class ReportCompactColonyPanel extends ReportPanel
             }
         }
         reportPanel.add((tiles.isEmpty()) ? new JLabel()
-            : newLabel(Integer.toString(tiles.size()), null, cAlarm, null));
+            : newLabel(Integer.toString(tiles.size()), null, cAlarm,
+                       stpld("report.colony.exploring.summary")));
 
         // Fields: The number of existing colony tiles that would
         // benefit from improvements.
@@ -926,7 +929,9 @@ public final class ReportCompactColonyPanel extends ReportPanel
                 }
             }
             reportPanel.add((tiles.isEmpty()) ? new JLabel()
-                : newLabel(Integer.toString(tiles.size()), null, cAlarm, null));
+                : newLabel(Integer.toString(tiles.size()), null, cAlarm,
+                           stpld("report.colony.tile." + ti.getSuffix()
+                               + ".summary")));
         }
 
         // Fields: The net production of each storable+non-trade-goods
@@ -952,13 +957,16 @@ public final class ReportCompactColonyPanel extends ReportPanel
                 throw new IllegalStateException("Bogus status: " + gp.status);
             }
             reportPanel.add((c == null) ? new JLabel()
-                : newLabel(Integer.toString(gp.amount), null, c, null));
+                : newLabel(Integer.toString(gp.amount), null, c,
+                    stpld("report.colony.production.summary")
+                        .addNamed("%goods%", gt)));
         }
 
         // Field: New colonist arrival or famine warning.
         // Colour: cWarn if negative, else cGood
         reportPanel.add(newLabel(Integer.toString((int)rNewColonist), null,
-                                 (rNewColonist < 0) ? cWarn : cGood, null));
+                                 (rNewColonist < 0) ? cWarn : cGood,
+                                 stpld("report.colony.arriving.summary")));
 
         // Field: The required goods rates.
         // Colour: cPlain
@@ -967,18 +975,22 @@ public final class ReportCompactColonyPanel extends ReportPanel
                  : mapEntriesByValue(rNeeded, descendingDoubleComparator)) {
             labels.add(newLabel(String.format("%4.1f %s", e.getValue(),
                                               Messages.getName(e.getKey())),
-                                null, cPlain, null));
+                                null, cPlain,
+                                stpld("report.colony.making.summary")
+                                    .addNamed("%goods%", e.getKey())));
         }
 
         // Field: What is being trained (attached to previous)
         // Colour: cPlain.
         teacherLen = Math.max(3, teacherLen); // Always some room here
-        labels.addAll(unitTypeLabels(rTeachers, teacherLen, null));
+        labels.addAll(unitTypeLabels(rTeachers, teacherLen,
+                stpld("report.colony.making.educating.summary")));
         addTogether(labels);
 
         // Field: The units that could be upgraded, followed by the units
         // that could be added.
-        addTogether(unitTypeLabels(rImprove, improveLen, null));
+        addTogether(unitTypeLabels(rImprove, improveLen,
+                stpld("report.colony.improving.summary")));
     }
 
     private List<JLabel> unitTypeLabels(Map<UnitType, Integer> unitTypeMap,

From 7fe4c5f3d6c1dd79250d203b8b5a437c7a1fbef6 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 16 Jul 2015 09:06:22 +0930
Subject: [PATCH 012/323] Fix messages for getTileImprovementSuggestions.

---
 .../gui/panel/ReportCompactColonyPanel.java   | 40 ++++++++++---------
 .../gui/panel/ReportRequirementsPanel.java    | 25 +++++-------
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index 4af9b6cac..f09e0e9ba 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -580,17 +580,27 @@ public final class ReportCompactColonyPanel extends ReportPanel
             }
             if (n > 0) {
                 c = cAlarm;
-                // TODO-post-0.11.4-release: temporary hack until 0.11.4-release
-                String key = ("model.improvement.plow".equals(ti.getId())
-                    || "model.improvement.clearForest".equals(ti.getId()))
-                    ? "report.colony.plowing"
-                    : ("model.improvement.road".equals(ti.getId()))
-                    ? "report.colony.roadBuilding"
-                    : null;
-                t = (key == null) ? null : stpld(key)
-                    .addName("%colony%", s.colony.getName())
-                    .addAmount("%amount%", n);
-                // end temporary hack
+                if (n == 1) {
+                    TileImprovementSuggestion tis = s.tileSuggestions.get(0);
+                    for (Unit u : tis.tile.getUnitList()) {
+                        if (u.getState() == Unit.UnitState.IMPROVING
+                            && u.getWorkImprovement() != null
+                            && u.getWorkImprovement().getType()
+                                == tis.tileImprovementType) {
+                            c = cWarn; // Work is underway
+                            break;
+                        }
+                    }
+                    t = stpld("report.colony.tile." + ti.getSuffix()
+                              + ".specific")
+                        .addName("%colony%", s.colony.getName())
+                        .addStringTemplate("%location%",
+                            tis.tile.getColonyTileLocationLabel(s.colony));
+                } else {
+                    t = stpld("report.colony.tile." + ti.getSuffix())
+                        .addName("%colony%", s.colony.getName())
+                        .addAmount("%amount%", n);
+                }
                 b = newButton(cac, Integer.toString(n), null, c, t);
                 if (center) b.setFont(b.getFont().deriveFont(Font.BOLD));
             } else {
@@ -1028,13 +1038,7 @@ public final class ReportCompactColonyPanel extends ReportPanel
                                  stpld("report.colony.explore")));
         for (TileImprovementType ti : this.spec.getTileImprovementTypeList()) {
             if (ti.isNatural()) continue;
-            // TODO-post-0.11.4-release: temporary hack until 0.11.4-release
-            String key = (("model.improvement.plow".equals(ti.getId()))
-                ? "report.colony.plow"
-                : ("model.improvement.road".equals(ti.getId()))
-                ? "report.colony.road"
-                : null) + ".header";
-            // end temporary hack
+            String key = "report.colony.tile." + ti.getSuffix() + ".header";
             reportPanel.add(newLabel(key, null, null, stpld(key)));
         }
         for (GoodsType gt : this.goodsTypes) {
diff --git a/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java b/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
index d365becfb..83de5e9ea 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
@@ -190,20 +190,17 @@ public final class ReportRequirementsPanel extends ReportPanel {
         List<TileImprovementSuggestion> tileSuggestions
             = colony.getTileImprovementSuggestions();
         for (TileImprovementSuggestion tis : tileSuggestions) {
-            // TODO-post-0.11.4-release: temporary hack until 0.11.4-release
-            String key = (tis.isExploration())
-                ? "report.requirements.exploreTile"
-                : ("model.improvement.plow".equals(tis.tileImprovementType.getId()))
-                ? ((tis.tile == colony.getTile())
-                    ? "report.requirements.plowCenter"
-                    : "report.requirements.plowTile")
-                : ("model.improvement.clearForest".equals(tis.tileImprovementType.getId()))
-                ? "report.requirements.clearTile"
-                : ("model.improvement.road".equals(tis.tileImprovementType.getId()))
-                ? "report.requirements.roadTile"
-                : null;
-            // end temporary hack
-            addTileWarning(doc, colony, key, tis.tile);
+            if (tis.tileImprovementType == null) {
+                addTileWarning(doc, colony, "report.requirements.exploreTile",
+                               tis.tile);
+            } else {
+                String key = "report.requirements.tile."
+                    + tis.tileImprovementType.getSuffix();
+                if (tis.tile == colony.getTile()) key += ".center";
+                if (Messages.containsKey(key)) {
+                    addTileWarning(doc, colony, key, tis.tile);
+                }
+            }
         }
 
         if (tileSuggestions.isEmpty()

From fd3fd306b33ecc3bdfb2db1899960da22f801876 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 11 Jul 2015 20:45:22 +0930
Subject: [PATCH 013/323] Add work location to RCCP suggestion tool tips.

---
 .../client/gui/panel/ReportCompactColonyPanel.java     |  4 ++++
 src/net/sf/freecol/common/model/WorkLocation.java      | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index f09e0e9ba..db386d360 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -826,12 +826,16 @@ public final class ReportCompactColonyPanel extends ReportPanel
                 ? stpld("report.colony.wanting")
                     .addName("%colony%", colony.getName())
                     .addNamed("%unit%", type)
+                    .addStringTemplate("%location%",
+                        suggestion.workLocation.getLabel())
                     .addNamed("%goods%", suggestion.goodsType)
                     .addAmount("%amount%", suggestion.amount)
                 : stpld("report.colony.improving")
                     .addName("%colony%", colony.getName())
                     .addNamed("%oldUnit%", suggestion.oldType)
                     .addNamed("%unit%", type)
+                    .addStringTemplate("%location%",
+                        suggestion.workLocation.getLabel())
                     .addNamed("%goods%", suggestion.goodsType)
                     .addAmount("%amount%", suggestion.amount);
             JButton b = newButton(cac, label, icon,
diff --git a/src/net/sf/freecol/common/model/WorkLocation.java b/src/net/sf/freecol/common/model/WorkLocation.java
index b24d95f53..22307982d 100644
--- a/src/net/sf/freecol/common/model/WorkLocation.java
+++ b/src/net/sf/freecol/common/model/WorkLocation.java
@@ -74,6 +74,7 @@ public abstract class WorkLocation extends UnitLocation
                     }
                 };
                     
+        public final WorkLocation workLocation;
         public final UnitType oldType;
         public final UnitType newType;
         public final GoodsType goodsType;
@@ -86,6 +87,8 @@ public abstract class WorkLocation extends UnitLocation
          * could produce <code>amount</code> more
          * <code>goodsType</code>.
          *
+         * @param workLocation The <code>WorkLocation</code> to add
+         *     a unit to.
          * @param oldType The optional <code>UnitType</code> currently
          *     doing the work.
          * @param newType A new <code>UnitType</code> to do the work.
@@ -93,8 +96,9 @@ public abstract class WorkLocation extends UnitLocation
          * @param amount The extra goods that would be produced if the
          *     suggestion is taken.
          */
-        public Suggestion(UnitType oldType, UnitType newType,
-            GoodsType goodsType, int amount) {
+        public Suggestion(WorkLocation workLocation, UnitType oldType,
+                          UnitType newType, GoodsType goodsType, int amount) {
+            this.workLocation = workLocation;
             this.oldType = oldType;
             this.newType = newType;
             this.goodsType = goodsType;
@@ -358,7 +362,7 @@ public abstract class WorkLocation extends UnitLocation
             }
         }
         return (!ok) ? null
-            : new Suggestion((unit == null) ? null : unit.getType(),
+            : new Suggestion(this, (unit == null) ? null : unit.getType(),
                              better, goodsType, delta);
     }
 

From 4adfbd55f89cd5078a0fb80e615c2fc7f05d71ef Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 16 Jul 2015 20:03:41 +0930
Subject: [PATCH 014/323] Add messages for RCCP improvements.

---
 data/mods/plantForest/ModMessages.properties |  6 +++
 data/strings/FreeColMessages.properties      | 55 ++++++++++++++------
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/data/mods/plantForest/ModMessages.properties b/data/mods/plantForest/ModMessages.properties
index 4c6e34a94..656832aa5 100644
--- a/data/mods/plantForest/ModMessages.properties
+++ b/data/mods/plantForest/ModMessages.properties
@@ -3,3 +3,9 @@ model.improvement.plantForest.action=Plant forest
 model.improvement.plantForest.occupationString=f
 plantForestAction.name=Plant forest
 plantForestAction.accelerator=
+report.requirements.tile.plantForest=%type% to the %direction% of %colony% would benefit from planting a new forest.
+report.requirements.tile.plantForest.center=%colony% would benefit from plant a forest on its tile.
+report.colony.tile.plantForest.description=%colony% would benefit from reforesting {{plural:%amount%|one=one tile|other=%amount% tiles}}
+report.colony.tile.plantForest.specific.description=%colony% would benefit from reforesting %location%
+report.colony.tile.plantForest.header=f
+report.colony.tile.plantForest.header.description=Number of colony tiles that would benefit from reforestation.
diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index d9cd85fa1..fc3bff7d3 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -3035,40 +3035,59 @@ report.labour.workingAsOther=other
 # ReportColonyPanel
 # reuses colonyPanel.currentlyBuilding
 report.colony.arriving.description=%colony%: new %unit% {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.arriving.summary.description=The average number of turns before a new colonist arrives in the colonies of this continent
 report.colony.birth.description=Number of turns until a new colonist arrives or starves
 report.colony.explore.description=Number of tiles to Explore adjacent to this colony
 report.colony.explore.header=E
 report.colony.exploring.description=%colony% would benefit from exploring {{plural:%amount%|one=one tile|other=%amount% tiles}}
+report.colony.exploring.summary.description=Total number of colony tiles that would benefit from exploring for this continent.
 report.colony.grow.description=Number of units the colony can grow by without harming production
 report.colony.grow.header=+
 report.colony.growing.description=%colony% can grow by {{plural:%amount%|one=one unit|other=%amount% units}} without harming production
+report.colony.growing.summary.description=The total number of colonists that can join colonies of this continent without harming production
 report.colony.improve.description=Units that could improve production.
 report.colony.improve.header=Improve
-report.colony.improving.description=%colony%: To make %amount% more %goods%, replace %oldUnit% with %unit%
-report.colony.wanting.description=%colony%: To make %amount% more %goods%, add %unit%
+report.colony.improving.description=%colony% %location%: To make %amount% more %goods%, replace %oldUnit% with %unit%
+report.colony.improving.summary.description=Units (type and count) that would benefit colonies of this continent
 report.colony.making.blocking.description=%colony%: %amount% %goods% needed for %buildable% {{plural:%turns%|one=next turn|other=in %turns% turns}}
 report.colony.making.constructing.description=%colony%: %buildable% completes {{plural:%turns%|one=next turn|other=in %turns% turns}}
 report.colony.making.description=What this colony is making
 report.colony.making.educating.description=%colony%: %teacher% graduates {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.making.educating.summary.description=Units (type and count) expected to graduate from schools of this continent
 report.colony.making.header=Making
 report.colony.making.noconstruction.description=%colony%: No construction occurring
 report.colony.making.noteach.description=%colony%: %teacher% lacks a student
+report.colony.making.summary.description=The per turn %goods% deficit due to the unsatisfied building requirements of this continent
 report.colony.name.description=The list of colonies
 report.colony.name.header=Colony
-report.colony.plow.description=Number of colony tiles that would benefit from Plowing
-report.colony.plow.header=P
-report.colony.plowing.description=%colony% would benefit from plowing {{plural:%amount%|one=one tile|other=%amount% tiles}}
-report.colony.production.description=%colony%: net %goods% production = %amount%
-report.colony.production.export.description=%colony%: net %goods% production is %amount% (exporting above %export%)
+report.colony.name.summary.description=The region containing more of the above colonies of this continent
+report.colony.production.description=%colony%: %amount% %goods% are being produced
+report.colony.production.export.description=%colony%: %amount% %goods% are being produced (exporting above %export%)
 report.colony.production.header=Net %goods% production
-report.colony.production.high.description=%colony%: net %goods% production = %amount%, full {{plural:%turns%|one=next turn|other=in %turns% turns}}
-report.colony.production.low.description=%colony%: net %goods% production = %amount%, gone {{plural:%turns%|one=next turn|other=in %turns% turns}}
-report.colony.production.waste.description=%colony%: net %goods% production = %amount%, warehouse will overflow, %waste% will be wasted
-report.colony.road.description=Number of colony tiles that would benefit from Road building
-report.colony.road.header=R
-report.colony.roadBuilding.description=%colony% would benefit from building {{plural:%amount%|one=a road|other=%amount% roads}}
+report.colony.production.high.description=%colony%: %amount% %goods% are being produced, full {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.production.low.description=%colony%: %amount% %goods% are being consumed, gone {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.production.maxConsumption.description=%colony%: %amount% %goods% are being consumed (could consume %more% more)
+report.colony.production.maxProduction.description=%colony%: %amount% %goods% are being produced (could produce %more% more)
+report.colony.production.summary.description=The amount of goods being produced or consumed
+report.colony.production.waste.description=%colony%: %amount% %goods% are being produced, warehouse will overflow, %waste% will be wasted
+report.colony.tile.clearForest.description=%colony% would benefit from clearing {{plural:%amount%|one=one tile|other=%amount% tiles}}
+report.colony.tile.clearForest.specific.description=%colony% would benefit from clearing %location%
+report.colony.tile.clearForest.header=C
+report.colony.tile.clearForest.header.description=Number of colony tiles that would benefit from clearing.
+report.colony.tile.clearForest.summary.description=Total number of colony tiles that would benefit from clearing for this continent.
+report.colony.tile.plow.description=%colony% would benefit from plowing {{plural:%amount%|one=one tile|other=%amount% tiles}}
+report.colony.tile.plow.specific.description=%colony% would benefit from plowing %location%
+report.colony.tile.plow.header=P
+report.colony.tile.plow.header.description=Number of colony tiles that would benefit from plowing.
+report.colony.tile.plow.summary.description=Total number of colony tiles that would benefit from plowing for this continent.
+report.colony.tile.road.description=%colony% would benefit from building {{plural:%amount%|one=a road|other=%amount% roads}}
+report.colony.tile.road.specific.description=%colony% would benefit from building a road at %location%
+report.colony.tile.road.header=R
+report.colony.tile.road.header.description=Number of colony tiles that would benefit from road building.
+report.colony.tile.road.summary.description=Total number of colony tiles that would benefit from road building for this continent.
 report.colony.shrinking.description=%colony% must shrink by {{plural:%amount%|one=one unit|other=%amount% units}} to improve production
 report.colony.starving.description=%colony%: starvation {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.wanting.description=%colony% %location%: To make %amount% more %goods%, add %unit%
 
 # ReportContinentalCongressPanel
 report.continentalCongress.available=Available
@@ -3141,15 +3160,17 @@ report.production.update=Update
 # ReportRequirementsPanel
 report.requirements.badAssignment=%colony% has a %expert% currently working as %expertWork%, while a %nonExpert% is working as %nonExpertWork%. Production would be greater if the colonists swapped jobs.
 report.requirements.canTrainExperts={{plural:2|%unit%}} can be trained at
-report.requirements.clearTile=%type% to the %direction% of %colony% would benefit from clearing.
 report.requirements.exploreTile=%type% to the %direction% of %colony% would benefit from exploration.
 report.requirements.met=All requirements are met.
 report.requirements.missingGoods=%colony% is producing %goods%, but requires more %input%.
 report.requirements.misusedExperts=There are {{plural:2|%unit%}} not working as %work% present at
 report.requirements.noExpert=%colony% is producing %goods%, but has no %unit%.
-report.requirements.plowCenter=%colony% would benefit from plowing its tile.
-report.requirements.plowTile=%type% to the %direction% of %colony% would benefit from plowing.
-report.requirements.roadTile=%type% to the %direction% of %colony% would benefit from road building.
+report.requirements.tile.clearForest=%type% to the %direction% of %colony% would benefit from clearing.
+report.requirements.tile.clearForest.center=%colony% would benefit from clearing its tile.
+report.requirements.tile.plow=%type% to the %direction% of %colony% would benefit from plowing.
+report.requirements.tile.plow.center=%colony% would benefit from plowing its tile.
+report.requirements.tile.road=%type% to the %direction% of %colony% would benefit from road building.
+#report.requirements.tile.road.center can not happen
 report.requirements.severalExperts=Several {{plural:2|%unit%}} are present at
 report.requirements.surplus=A surplus of %goods% is being produced at
 

From b8c21dc23c2b239506ab14693bc998cc38d8c81a Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 30 Jul 2015 17:12:28 +0200
Subject: [PATCH 015/323] Remove opening of colony/settlement panel in
 MapViewer.setSelectedTile, fixing remaining part of BR#2875

---
 .../freecol/client/control/InGameController.java   |  4 +++-
 .../sf/freecol/client/gui/CanvasMouseListener.java |  5 +++++
 src/net/sf/freecol/client/gui/MapViewer.java       | 14 +++-----------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index dbbf4ab8d..556c66461 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -2727,6 +2727,8 @@ public final class InGameController implements NetworkConstants {
         if (ret) {
             player.invalidateCanSeeTiles();
             gui.setActiveUnit(null);
+            gui.showColonyPanel((Colony)tile.getSettlement(), unit);
+            // FIXME: Check if next line can be removed or replaced
             gui.setSelectedTile(tile);
             freeColClient.getSoundController()
                 .playSound("sound.event.buildingComplete");
@@ -2960,7 +2962,7 @@ public final class InGameController implements NetworkConstants {
      * Clears the goto orders of the given unit by setting its destination
      * to null.
      *
-     * Called from MapViewer.setSelectedTile
+     * Called from CanvasMouseListener
      *
      * @param unit The <code>Unit</code> to clear the destination for.
      * @return True if the unit has no destination.
diff --git a/src/net/sf/freecol/client/gui/CanvasMouseListener.java b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
index eac714fa9..367c29472 100644
--- a/src/net/sf/freecol/client/gui/CanvasMouseListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
@@ -212,6 +212,11 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
             if(unit != null && unit.getTile() == tile) {
                 freeColClient.getInGameController().clearGotoOrders(unit);
                 mapViewer.updateCurrentPathForActiveUnit();
+            } else {
+                if (tile != null && tile.hasSettlement()) {
+                    freeColClient.getGUI().showSettlement(tile.getSettlement());
+                    return;
+                }
             }
         }
         mapViewer.setSelectedTile(tile);
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index f8e202365..977b7c718 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1057,16 +1057,13 @@ public final class MapViewer {
     }
 
     /**
-     * Selects the tile at the specified position.  There are three
+     * Selects the tile at the specified position.  There are two
      * possible cases:
      *
      * <ol>
-     *   <li>If there is a {@link Colony} on the {@link Tile} the
-     *       {@link Canvas#showColonyPanel} will be invoked.
      *   <li>If the tile contains a unit that can become active, then
      *       that unit will be set as the active unit.
-     *   <li>If the two conditions above do not match, then the
-     *       <code>selectedTile</code> will become the map focus.
+     *   <li>If not, the <code>selectedTile</code> will become the map focus.
      * </ol>
      *
      * If a unit is active and is located on the selected tile,
@@ -1085,12 +1082,7 @@ public final class MapViewer {
 
         if (getViewMode() == GUI.MOVE_UNITS_MODE) {
             if (activeUnit == null || activeUnit.getTile() != newTile) {
-                if (newTile != null && newTile.hasSettlement()) {
-                    gui.showSettlement(newTile.getSettlement());
-                    return false;
-                }
-
-                // else, just select a unit on the selected tile
+                // select a unit on the selected tile
                 Unit unitInFront = findUnitInFront(newTile);
                 if (unitInFront != null) {
                     ret = setActiveUnit(unitInFront);

From f001515a73d9c55e0452a813d7fd143092a760e6 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 30 Jul 2015 17:33:56 +0200
Subject: [PATCH 016/323] Update fixme for GUI.createMiniMapThumbNail method

---
 src/net/sf/freecol/client/gui/GUI.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 7fd44f305..9c5373737 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -278,6 +278,10 @@ public class GUI {
     /**
      * Create a thumbnail for the minimap.
      * 
+     * FIXME: Delete all code inside this method and replace it with
+     *        sensible code directly drawing in necessary size,
+     *        without creating a throwaway GUI panel, drawing in wrong
+     *        size and immediately resizing.
      * @return The created image.
      */
     public BufferedImage createMiniMapThumbNail() {
@@ -293,8 +297,6 @@ public class GUI {
         miniMap.paintMap(g1);
         g1.dispose();
 
-        // FIXME: this can probably done more efficiently by applying
-        // a suitable AffineTransform to the Graphics2D
         int scaledWidth = Math.min((int)((64 * width) / (float)height), 128);
         BufferedImage scaledImage = new BufferedImage(scaledWidth, 64,
             BufferedImage.TYPE_INT_ARGB);

From ec4c21dcc8ac52898cf9987453a8021aa75fa697 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 30 Jul 2015 18:09:42 +0200
Subject: [PATCH 017/323] Move code for creating ImageIcons from
 InGameController to GUI

---
 .../client/control/ConnectController.java     |  2 +-
 .../client/control/InGameController.java      | 16 +++---
 src/net/sf/freecol/client/gui/GUI.java        | 49 ++++++++++++++-----
 .../gui/panel/MapEditorTransformPanel.java    |  2 +-
 .../sf/freecol/common/debug/DebugUtils.java   | 23 +++++----
 5 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
index 3403b6a1f..cab7568a2 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -420,7 +420,7 @@ public final class ConnectController {
                 choices.add(new ChoiceItem<>(Messages.getName(n), n));
             }
             String choice = gui.getChoice(true, null,
-                Messages.message("client.choicePlayer"), null,
+                Messages.message("client.choicePlayer"),
                 "cancel", choices);
             if (choice == null) return false; // User cancelled
 
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 556c66461..accbc9419 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -1373,7 +1373,7 @@ public final class InGameController implements NetworkConstants {
             // other special handling.
             Unit u = gui.getChoice(true, unit.getTile(),
                                    Messages.message("disembark.text"),
-                                   gui.createUnitImageIcon(unit),
+                                   unit,
                                    "none", choices);
             if (u == null) {
                 // Cancelled, done.
@@ -1426,7 +1426,7 @@ public final class InGameController implements NetworkConstants {
         } else {
             carrier = gui.getChoice(true, unit.getTile(),
                                     Messages.message("embark.text"),
-                                    gui.createUnitImageIcon(unit),
+                                    unit,
                                     "none", choices);
             if (carrier == null) return true; // User cancelled
         }
@@ -1922,7 +1922,7 @@ public final class InGameController implements NetworkConstants {
             }
             goods = gui.getChoice(true, unit.getTile(),
                                   Messages.message("buyProposition.text"),
-                                  gui.createSettlementImageIcon(settlement),
+                                  settlement,
                                   "nothing", choices);
             if (goods == null) break; // Trade aborted by the player
 
@@ -1979,7 +1979,7 @@ public final class InGameController implements NetworkConstants {
             }
             goods = gui.getChoice(true, unit.getTile(),
                                   Messages.message("sellProposition.text"),
-                                  gui.createSettlementImageIcon(settlement),
+                                  settlement,
                                   "nothing", choices);
             if (goods == null) break; // Trade aborted by the player
 
@@ -2036,7 +2036,7 @@ public final class InGameController implements NetworkConstants {
         }
         Goods goods = gui.getChoice(true, unit.getTile(),
                                     Messages.message("gift.text"),
-                                    gui.createSettlementImageIcon(settlement),
+                                    settlement,
                                     "cancel", choices);
         if (goods != null
             && askServer().deliverGiftToSettlement(unit, settlement, goods)) {
@@ -2117,7 +2117,7 @@ public final class InGameController implements NetworkConstants {
             }
             Player enemy = gui.getChoice(true, unit.getTile(),
                 Messages.message("missionarySettlement.inciteQuestion"),
-                gui.createUnitImageIcon(unit),
+                unit,
                 "missionarySettlement.cancel", choices);
             if (enemy == null) return true;
             int gold = askServer().incite(unit, direction, enemy, -1);
@@ -4008,7 +4008,7 @@ public final class InGameController implements NetworkConstants {
         boolean ret = gui.confirm(true, null, StringTemplate
             .template("payArrears.text")
             .addAmount("%amount%", arrears),
-            gui.createGoodsImageIcon(type),
+            type,
             "ok", "cancel")
             && askServer().payArrears(type)
             && player.canTrade(type);
@@ -4043,7 +4043,7 @@ public final class InGameController implements NetworkConstants {
         if (!gui.confirm(true, null, StringTemplate
                 .template("payForBuilding.text")
                 .addAmount("%amount%", price),
-                gui.createSettlementImageIcon(colony),
+                colony,
                 "yes", "no")) {
             return false;
         }
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 9c5373737..68449160b 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -252,18 +252,6 @@ public class GUI {
         return (image==null) ? null : new ImageIcon(image);
     }
 
-    public ImageIcon createUnitImageIcon(Unit unit) {
-        return new ImageIcon(imageLibrary.getUnitImage(unit));
-    }
-
-    public ImageIcon createSettlementImageIcon(Settlement settlement) {
-        return new ImageIcon(imageLibrary.getSettlementImage(settlement));
-    }
-
-    public ImageIcon createGoodsImageIcon(GoodsType goodsType) {
-        return new ImageIcon(imageLibrary.getIconImage(goodsType));
-    }
-
     /**
      * Make image icon from an object.
      *
@@ -517,6 +505,22 @@ public class GUI {
         return false;
     }
 
+    final public boolean confirm(boolean modal, Tile tile,
+                                 StringTemplate template, Settlement settlement,
+                                 String okKey, String cancelKey) {
+        return confirm(modal, tile, template,
+            new ImageIcon(imageLibrary.getSettlementImage(settlement)),
+            okKey, cancelKey);
+    }
+
+    final public boolean confirm(boolean modal, Tile tile,
+                                 StringTemplate template, GoodsType goodsType,
+                                 String okKey, String cancelKey) {
+        return confirm(modal, tile, template,
+            new ImageIcon(imageLibrary.getIconImage(goodsType)),
+            okKey, cancelKey);
+    }
+
     /**
      * Confirm that a unit should abandon its educational activity.
      *
@@ -1114,6 +1118,27 @@ public class GUI {
         return null;
     }
 
+    final public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                                 String cancelKey, List<ChoiceItem<T>> choices) {
+        return getChoice(modal, tile, explain,
+            (ImageIcon)null, cancelKey, choices);
+    }
+
+    final public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                                 Unit unit,
+                                 String cancelKey, List<ChoiceItem<T>> choices) {
+        return getChoice(modal, tile, explain,
+            new ImageIcon(imageLibrary.getUnitImage(unit)), cancelKey, choices);
+    }
+
+    final public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                                 Settlement settlement,
+                                 String cancelKey, List<ChoiceItem<T>> choices) {
+        return getChoice(modal, tile, explain,
+            new ImageIcon(imageLibrary.getSettlementImage(settlement)),
+            cancelKey, choices);
+    }
+
     /**
      * General input dialog.
      *
diff --git a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
index 43c1cefc9..29ed90d10 100644
--- a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
@@ -313,7 +313,7 @@ public final class MapEditorTransformPanel extends FreeColPanel {
                     }
                     ResourceType choice = getGUI().getChoice(true, null, 
                         Messages.message("mapEditorTransformPanel.chooseResource"),
-                        null, "cancel", choices);
+                        "cancel", choices);
                     if (choice != null) {
                         t.addResource(new Resource(t.getGame(), t, choice,
                                       choice.getMaxValue()));
diff --git a/src/net/sf/freecol/common/debug/DebugUtils.java b/src/net/sf/freecol/common/debug/DebugUtils.java
index 7671d8abd..42639bfa0 100644
--- a/src/net/sf/freecol/common/debug/DebugUtils.java
+++ b/src/net/sf/freecol/common/debug/DebugUtils.java
@@ -121,8 +121,7 @@ public class DebugUtils {
         Collections.sort(buildings);
 
         BuildingType buildingType
-            = gui.getChoice(true, null, buildingTitle, null, "cancel",
-                            buildings);
+            = gui.getChoice(true, null, buildingTitle, "cancel", buildings);
         if (buildingType == null) return;
 
         final Game sGame = server.getGame();
@@ -181,7 +180,7 @@ public class DebugUtils {
         }
         Collections.sort(fathers);
 
-        FoundingFather father = gui.getChoice(true, null, fatherTitle, null,
+        FoundingFather father = gui.getChoice(true, null, fatherTitle,
                                               "cancel", fathers);
         if (father != null) {
             server.getInGameController()
@@ -329,7 +328,7 @@ public class DebugUtils {
         Collections.sort(uts);
         UnitType unitChoice = gui.getChoice(true, null,
             StringTemplate.template("prompt.selectUnitType"),
-            null, "cancel", uts);
+            "cancel", uts);
         if (unitChoice == null) return;
 
         Unit carrier = null, sCarrier = null;
@@ -384,7 +383,7 @@ public class DebugUtils {
         Collections.sort(gtl);
         GoodsType goodsType = gui.getChoice(true, null,
             StringTemplate.template("prompt.selectGoodsType"),
-            null, "cancel", gtl);
+            "cancel", gtl);
         if (goodsType == null) return;
 
         String amount = gui.getInput(true, null,
@@ -433,7 +432,7 @@ public class DebugUtils {
         Collections.sort(choices);
         Disaster disaster = gui.getChoice(true, null,
             StringTemplate.template("prompt.selectDisaster"),
-            null, "cancel", choices);
+            "cancel", choices);
         if (disaster == null) return;
 
         final FreeColServer server = freeColClient.getFreeColServer();
@@ -477,7 +476,7 @@ public class DebugUtils {
         Collections.sort(pcs);
         Player player = gui.getChoice(true, null,
             StringTemplate.template("prompt.selectOwner"),
-            null, "cancel", pcs);
+            "cancel", pcs);
         if (player == null) return;
 
         ServerPlayer sPlayer = sGame.getFreeColGameObject(player.getId(),
@@ -517,7 +516,7 @@ public class DebugUtils {
         Collections.sort(pcs);
         Player player = gui.getChoice(true, null,
             StringTemplate.template("prompt.selectOwner"),
-            null, "cancel", pcs);
+            "cancel", pcs);
         if (player == null || unit.getOwner() == player) return;
 
         final Game sGame = server.getGame();
@@ -559,7 +558,7 @@ public class DebugUtils {
         Collections.sort(rcs);
         Role roleChoice = gui.getChoice(true, null,
             StringTemplate.template("prompt.selectRole"),
-            null, "cancel", rcs);
+            "cancel", rcs);
         if (roleChoice == null) return;
 
         sUnit.changeRole(roleChoice, roleChoice.getMaximumCount());
@@ -954,7 +953,7 @@ public class DebugUtils {
         Collections.sort(gtl);
         GoodsType goodsType = freeColClient.getGUI().getChoice(true, null,
             StringTemplate.template("prompt.selectGoodsType"),
-            null, "cancel", gtl);
+            "cancel", gtl);
         if (goodsType == null) return;
 
         String response = freeColClient.getGUI().getInput(true, null,
@@ -1002,7 +1001,7 @@ public class DebugUtils {
             actions.add(new ChoiceItem<>(action));
         }
         Collections.sort(actions);
-        MonarchAction action = gui.getChoice(true, null, monarchTitle, null,
+        MonarchAction action = gui.getChoice(true, null, monarchTitle,
                                              "cancel", actions);
         server.getInGameController().setMonarchAction(sPlayer, action);
     }
@@ -1030,7 +1029,7 @@ public class DebugUtils {
         Collections.sort(rumours);
         RumourType rumourChoice = freeColClient.getGUI().getChoice(true, null,
             StringTemplate.template("prompt.selectLostCityRumour"),
-            null, "cancel", rumours);
+            "cancel", rumours);
         tile.getTileItemContainer().getLostCityRumour().setType(rumourChoice);
         sTile.getTileItemContainer().getLostCityRumour()
             .setType(rumourChoice);

From 310d6652cad5298179c1f9852bcef375c92029d0 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 30 Jul 2015 18:24:50 +0200
Subject: [PATCH 018/323] Move ImageIcon methods from GUI to Canvas, as they
 are only used there

---
 src/net/sf/freecol/client/gui/Canvas.java | 26 +++++++++++++++++++++--
 src/net/sf/freecol/client/gui/GUI.java    | 22 -------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 2b13fa73e..31572bd38 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -1950,6 +1950,28 @@ public final class Canvas extends JDesktopPane {
         showFreeColPanel(panel, indianSettlement.getTile(), true);
     }
 
+    /**
+     * Make image icon from an image.
+     * Use only if you know having null is possible!
+     *
+     * @param image The <code>Image</code> to create an icon for.
+     * @return The <code>ImageIcon</code>.
+     */
+    private static ImageIcon createImageIcon(Image image) {
+        return (image==null) ? null : new ImageIcon(image);
+    }
+
+    /**
+     * Make image icon from an object.
+     *
+     * @param display The FreeColObject to find an icon for.
+     * @return The <code>ImageIcon</code> found.
+     */
+    private ImageIcon createObjectImageIcon(FreeColObject display) {
+        return (display == null) ? null
+            : createImageIcon(gui.getImageLibrary().getObjectImage(display, 2f));
+    }
+
     /**
      * Shows a message with some information and an "OK"-button.
      *
@@ -1961,7 +1983,7 @@ public final class Canvas extends JDesktopPane {
         ImageIcon icon = null;
         Tile tile = null;
         if(displayObject != null) {
-            icon = gui.createObjectImageIcon(displayObject);
+            icon = createObjectImageIcon(displayObject);
             tile = (displayObject instanceof Location)
                 ? ((Location)displayObject).getTile()
                 : null;
@@ -2110,7 +2132,7 @@ public final class Canvas extends JDesktopPane {
             ModelMessage m = messages.get(i);
             texts[i] = Messages.message(m);
             fcos[i] = game.getMessageSource(m);
-            icons[i] = gui.createObjectImageIcon(game.getMessageDisplay(m));
+            icons[i] = createObjectImageIcon(game.getMessageDisplay(m));
             if (tile == null && fcos[i] instanceof Location) {
                 tile = ((Location)fcos[i]).getTile();
             }
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 68449160b..249940341 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -241,28 +241,6 @@ public class GUI {
     public void clearGotoPath() {
     }
 
-    /**
-     * Make image icon from an image.
-     * Use only if you know having null is possible!
-     *
-     * @param image The <code>Image</code> to create an icon for.
-     * @return The <code>ImageIcon</code>.
-     */
-    public static ImageIcon createImageIcon(Image image) {
-        return (image==null) ? null : new ImageIcon(image);
-    }
-
-    /**
-     * Make image icon from an object.
-     *
-     * @param display The FreeColObject to find an icon for.
-     * @return The <code>ImageIcon</code> found.
-     */
-    protected ImageIcon createObjectImageIcon(FreeColObject display) {
-        return (display == null) ? null
-            : createImageIcon(imageLibrary.getObjectImage(display, 2f));
-    }
-
     /**
      * Create a thumbnail for the minimap.
      * 

From c4cbf60165ecbf7ddb7914d9784f29c0690d9f8f Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 30 Jul 2015 19:13:50 +0200
Subject: [PATCH 019/323] Make ConnectController not rely on the type of
 LoadingSavegameDialog

---
 .../client/control/ConnectController.java     | 12 ++--
 src/net/sf/freecol/client/gui/GUI.java        |  4 +-
 .../client/gui/LoadingSavegameInfo.java       | 64 +++++++++++++++++++
 src/net/sf/freecol/client/gui/SwingGUI.java   |  4 +-
 .../gui/panel/LoadingSavegameDialog.java      | 10 +++
 5 files changed, 83 insertions(+), 11 deletions(-)
 create mode 100644 src/net/sf/freecol/client/gui/LoadingSavegameInfo.java

diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
index cab7568a2..79f4187eb 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -30,12 +30,15 @@ import java.util.logging.Logger;
 import javax.swing.SwingUtilities;
 import javax.xml.stream.XMLStreamException;
 
-import net.sf.freecol.FreeCol;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import net.sf.freecol.FreeCol; 
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient; 
 import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.LoadingSavegameInfo;
 import net.sf.freecol.client.gui.panel.ChoiceItem;
-import net.sf.freecol.client.gui.panel.LoadingSavegameDialog;
 import net.sf.freecol.common.FreeColException;
 import net.sf.freecol.common.ServerInfo;
 import net.sf.freecol.common.debug.FreeColDebugger;
@@ -57,9 +60,6 @@ import net.sf.freecol.common.resources.ResourceManager;
 import net.sf.freecol.server.FreeColServer;
 import net.sf.freecol.server.FreeColServer.GameState;
 
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
 
 /**
  * The controller responsible for starting a server and connecting to it.
@@ -581,7 +581,7 @@ public final class ConnectController {
             if (!gui.showLoadingSavegameDialog(defaultPublicServer,
                                                defaultSinglePlayer))
                 return false;
-            LoadingSavegameDialog lsd = gui.getLoadingSavegameDialog();
+            LoadingSavegameInfo lsd = gui.getLoadingSavegameInfo();
             singlePlayer = lsd.isSinglePlayer();
             name = lsd.getServerName();
             port = lsd.getPort();
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 249940341..691d814ec 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -22,7 +22,6 @@ package net.sf.freecol.client.gui;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
-import java.awt.Image;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.ActionListener;
@@ -47,7 +46,6 @@ import net.sf.freecol.client.gui.panel.ColonyPanel;
 import net.sf.freecol.client.gui.panel.ColorChooserPanel;
 import net.sf.freecol.client.gui.panel.FreeColDialog;
 import net.sf.freecol.client.gui.panel.LabourData.UnitData;
-import net.sf.freecol.client.gui.panel.LoadingSavegameDialog;
 import net.sf.freecol.client.gui.panel.MiniMap;
 import net.sf.freecol.client.gui.panel.Parameters;
 import net.sf.freecol.client.gui.panel.TradeRoutePanel;
@@ -1152,7 +1150,7 @@ public class GUI {
     public void displayObject(FreeColObject fco) {
     }
 
-    public LoadingSavegameDialog getLoadingSavegameDialog() {
+    public LoadingSavegameInfo getLoadingSavegameInfo() {
         return null;
     }
 
diff --git a/src/net/sf/freecol/client/gui/LoadingSavegameInfo.java b/src/net/sf/freecol/client/gui/LoadingSavegameInfo.java
new file mode 100644
index 000000000..7beb3f8ff
--- /dev/null
+++ b/src/net/sf/freecol/client/gui/LoadingSavegameInfo.java
@@ -0,0 +1,64 @@
+/**
+ *  Copyright (C) 2002-2015   The FreeCol Team
+ *
+ *  This file is part of FreeCol.
+ *
+ *  FreeCol 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, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  FreeCol 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 FreeCol.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sf.freecol.client.gui;
+
+/**
+ * Used for transferring data for the savegame to be loaded.
+*/
+public class LoadingSavegameInfo {
+
+    private final boolean singlePlayer;
+    private final int port;
+    private final String serverName;
+
+    public LoadingSavegameInfo(boolean singlePlayer, int port, String serverName) {
+        this.singlePlayer=singlePlayer;
+        this.port=port;
+        this.serverName=serverName;
+    }
+
+    /**
+     * Is a single player game selected?
+     *
+     * @return True if single player is selected.
+     */
+    public boolean isSinglePlayer() {
+        return singlePlayer;
+    }
+
+    /**
+     * Get the selected port number.
+     *
+     * @return The port number.
+     */
+    public int getPort() {
+        return port;
+    }
+
+    /**
+     * Get the specified server name.
+     *
+     * @return The server name.
+     */
+    public String getServerName() {
+        return serverName;
+    }
+
+}
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 93ed20483..ac349f04f 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -906,8 +906,8 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public LoadingSavegameDialog getLoadingSavegameDialog() {
-        return canvas.getLoadingSavegameDialog();
+    public LoadingSavegameInfo getLoadingSavegameInfo() {
+        return canvas.getLoadingSavegameDialog().getInfo();
     }
 
     @Override
diff --git a/src/net/sf/freecol/client/gui/panel/LoadingSavegameDialog.java b/src/net/sf/freecol/client/gui/panel/LoadingSavegameDialog.java
index 82d5e263e..a648d0681 100644
--- a/src/net/sf/freecol/client/gui/panel/LoadingSavegameDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/LoadingSavegameDialog.java
@@ -35,6 +35,7 @@ import javax.swing.SpinnerNumberModel;
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.FontLibrary;
+import net.sf.freecol.client.gui.LoadingSavegameInfo;
 import net.sf.freecol.common.i18n.Messages;
 
 
@@ -146,6 +147,15 @@ public final class LoadingSavegameDialog extends FreeColConfirmDialog {
         return serverNameField.getName();
     }
 
+    /**
+     * Get all important information at once.
+     * 
+     * @return A LoadingSavegameInfo.
+     */
+    public LoadingSavegameInfo getInfo() {
+        return new LoadingSavegameInfo(isSinglePlayer(), getPort(), getServerName());
+    }
+
     /**
      * Reset the dialog to a given state.
      *

From 0a18e250a0500dc54f7fe25102f8e26103442688 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 30 Jul 2015 19:26:50 +0200
Subject: [PATCH 020/323] Move ChoiceItem one level up, as it is no panel and
 is needed outside of gui

---
 src/net/sf/freecol/client/control/ConnectController.java  | 2 +-
 src/net/sf/freecol/client/control/InGameController.java   | 5 +++--
 src/net/sf/freecol/client/gui/{panel => }/ChoiceItem.java | 2 +-
 src/net/sf/freecol/client/gui/GUI.java                    | 1 -
 src/net/sf/freecol/client/gui/SwingGUI.java               | 1 -
 .../sf/freecol/client/gui/panel/CaptureGoodsDialog.java   | 1 +
 .../client/gui/panel/ChooseFoundingFatherDialog.java      | 1 +
 .../client/gui/panel/ConfirmDeclarationDialog.java        | 2 +-
 src/net/sf/freecol/client/gui/panel/DumpCargoDialog.java  | 1 +
 .../sf/freecol/client/gui/panel/EditSettlementDialog.java | 1 +
 src/net/sf/freecol/client/gui/panel/EmigrationDialog.java | 1 +
 .../sf/freecol/client/gui/panel/FreeColChoiceDialog.java  | 1 +
 .../sf/freecol/client/gui/panel/FreeColConfirmDialog.java | 1 +
 src/net/sf/freecol/client/gui/panel/FreeColDialog.java    | 1 +
 .../sf/freecol/client/gui/panel/FreeColInputDialog.java   | 4 ++--
 src/net/sf/freecol/client/gui/panel/LoadDialog.java       | 3 ++-
 .../freecol/client/gui/panel/MapEditorTransformPanel.java | 3 ++-
 src/net/sf/freecol/client/gui/panel/MonarchDialog.java    | 2 +-
 .../sf/freecol/client/gui/panel/NegotiationDialog.java    | 2 +-
 src/net/sf/freecol/client/gui/panel/OptionsDialog.java    | 1 +
 src/net/sf/freecol/client/gui/panel/ParametersDialog.java | 1 +
 src/net/sf/freecol/client/gui/panel/RiverStyleDialog.java | 6 +++---
 src/net/sf/freecol/client/gui/panel/SaveDialog.java       | 8 +++-----
 .../sf/freecol/client/gui/panel/ScaleMapSizeDialog.java   | 1 +
 .../freecol/client/gui/panel/SelectDestinationDialog.java | 4 ++--
 .../sf/freecol/client/gui/plaf/FreeColOptionPaneUI.java   | 2 +-
 src/net/sf/freecol/common/debug/DebugUtils.java           | 4 +++-
 27 files changed, 37 insertions(+), 25 deletions(-)
 rename src/net/sf/freecol/client/gui/{panel => }/ChoiceItem.java (99%)

diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
index 79f4187eb..c5ad4c2aa 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -36,9 +36,9 @@ import org.w3c.dom.NodeList;
 import net.sf.freecol.FreeCol; 
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient; 
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.LoadingSavegameInfo;
-import net.sf.freecol.client.gui.panel.ChoiceItem;
 import net.sf.freecol.common.FreeColException;
 import net.sf.freecol.common.ServerInfo;
 import net.sf.freecol.common.debug.FreeColDebugger;
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index accbc9419..160d54d8e 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -35,9 +35,9 @@ import javax.swing.SwingUtilities;
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.option.FreeColActionUI;
-import net.sf.freecol.client.gui.panel.ChoiceItem;
 import net.sf.freecol.common.debug.DebugUtils;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
@@ -99,13 +99,14 @@ import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
 import net.sf.freecol.common.model.UnitWas;
 import net.sf.freecol.common.model.WorkLocation;
-import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.common.networking.NetworkConstants;
 import net.sf.freecol.common.networking.ServerAPI;
 import net.sf.freecol.common.option.BooleanOption;
 import net.sf.freecol.server.FreeColServer;
 
+import static net.sf.freecol.common.util.CollectionUtils.*;
+
 
 /**
  * The controller that will be used while the game is played.
diff --git a/src/net/sf/freecol/client/gui/panel/ChoiceItem.java b/src/net/sf/freecol/client/gui/ChoiceItem.java
similarity index 99%
rename from src/net/sf/freecol/client/gui/panel/ChoiceItem.java
rename to src/net/sf/freecol/client/gui/ChoiceItem.java
index e09628f6f..725232dbc 100644
--- a/src/net/sf/freecol/client/gui/panel/ChoiceItem.java
+++ b/src/net/sf/freecol/client/gui/ChoiceItem.java
@@ -17,7 +17,7 @@
  *  along with FreeCol.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sf.freecol.client.gui.panel;
+package net.sf.freecol.client.gui;
 
 import javax.swing.ImageIcon;
 
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 691d814ec..afb605371 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -41,7 +41,6 @@ import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
 import net.sf.freecol.client.control.InGameController.*;
-import net.sf.freecol.client.gui.panel.ChoiceItem;
 import net.sf.freecol.client.gui.panel.ColonyPanel;
 import net.sf.freecol.client.gui.panel.ColorChooserPanel;
 import net.sf.freecol.client.gui.panel.FreeColDialog;
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index ac349f04f..bd2e1eb32 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -54,7 +54,6 @@ import javax.swing.filechooser.FileFilter;
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.animation.Animations;
-import net.sf.freecol.client.gui.panel.ChoiceItem;
 import net.sf.freecol.client.gui.panel.ColonyPanel;
 import net.sf.freecol.client.gui.panel.ColorChooserPanel;
 import net.sf.freecol.client.gui.panel.CornerMapControls;
diff --git a/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java b/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
index b4dfa4d13..bd0fe0164 100644
--- a/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
@@ -38,6 +38,7 @@ import javax.swing.ListCellRenderer;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Goods;
 import net.sf.freecol.common.model.Unit;
diff --git a/src/net/sf/freecol/client/gui/panel/ChooseFoundingFatherDialog.java b/src/net/sf/freecol/client/gui/panel/ChooseFoundingFatherDialog.java
index 72e5f2b0d..a9bd946c1 100644
--- a/src/net/sf/freecol/client/gui/panel/ChooseFoundingFatherDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/ChooseFoundingFatherDialog.java
@@ -30,6 +30,7 @@ import javax.swing.JTabbedPane;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.FoundingFather;
 
diff --git a/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java b/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java
index 58ba4c9bf..74c5fd47e 100644
--- a/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java
@@ -42,7 +42,7 @@ import javax.swing.JTextField;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.panel.Flag.Background;
 import net.sf.freecol.client.gui.panel.Flag.Decoration;
 import net.sf.freecol.client.gui.panel.Flag.UnionPosition;
diff --git a/src/net/sf/freecol/client/gui/panel/DumpCargoDialog.java b/src/net/sf/freecol/client/gui/panel/DumpCargoDialog.java
index 64d87cd64..af9b45f4a 100644
--- a/src/net/sf/freecol/client/gui/panel/DumpCargoDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/DumpCargoDialog.java
@@ -30,6 +30,7 @@ import javax.swing.JFrame;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Goods;
 import net.sf.freecol.common.model.Unit;
diff --git a/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java b/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
index 6def7e01b..141baf89f 100644
--- a/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
@@ -37,6 +37,7 @@ import javax.swing.SpinnerNumberModel;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.plaf.FreeColComboBoxRenderer;
 import net.sf.freecol.common.i18n.Messages;
diff --git a/src/net/sf/freecol/client/gui/panel/EmigrationDialog.java b/src/net/sf/freecol/client/gui/panel/EmigrationDialog.java
index 8355357f0..edf5f227b 100644
--- a/src/net/sf/freecol/client/gui/panel/EmigrationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/EmigrationDialog.java
@@ -29,6 +29,7 @@ import javax.swing.JTextArea;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Europe;
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColChoiceDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColChoiceDialog.java
index ce334ccea..565c639c7 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColChoiceDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColChoiceDialog.java
@@ -25,6 +25,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.common.i18n.Messages;
 
 
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColConfirmDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColConfirmDialog.java
index 103fc80e9..1a4152de3 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColConfirmDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColConfirmDialog.java
@@ -25,6 +25,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.common.i18n.Messages;
 
 
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
index d75bc8fbe..837635759 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
@@ -44,6 +44,7 @@ import javax.swing.SwingUtilities;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.client.gui.plaf.FreeColOptionPaneUI;
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColInputDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColInputDialog.java
index 3083e03e9..fcc6460d4 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColInputDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColInputDialog.java
@@ -19,14 +19,14 @@
 
 package net.sf.freecol.client.gui.panel;
 
-import javax.swing.ImageIcon;
-
 import java.util.List;
 import java.util.logging.Logger;
 
+import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.common.i18n.Messages;
 
 
diff --git a/src/net/sf/freecol/client/gui/panel/LoadDialog.java b/src/net/sf/freecol/client/gui/panel/LoadDialog.java
index 0d5cfd3d0..8dc868e20 100644
--- a/src/net/sf/freecol/client/gui/panel/LoadDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/LoadDialog.java
@@ -24,11 +24,12 @@ import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.List;
 
-import javax.swing.filechooser.FileFilter;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
+import javax.swing.filechooser.FileFilter;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.common.i18n.Messages;
 
 
diff --git a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
index 29ed90d10..25efede23 100644
--- a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
@@ -38,12 +38,13 @@ import javax.swing.JToggleButton;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.MapEditorController;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.client.gui.MapViewer;
 import net.sf.freecol.common.i18n.Messages;
+import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.IndianNationType;
 import net.sf.freecol.common.model.LostCityRumour;
-import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.ModelMessage;
 import net.sf.freecol.common.model.Nation;
 import net.sf.freecol.common.model.Player;
diff --git a/src/net/sf/freecol/client/gui/panel/MonarchDialog.java b/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
index 690746ba7..f2a5329c8 100644
--- a/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
@@ -24,7 +24,6 @@ import java.awt.event.ActionListener;
 import java.util.List;
 
 import javax.swing.ImageIcon;
-
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JTextArea;
@@ -32,6 +31,7 @@ import javax.swing.JTextArea;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.FontLibrary;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.common.i18n.Messages;
diff --git a/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java b/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
index 1877a93f1..49c3555a8 100644
--- a/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
@@ -24,7 +24,6 @@ import java.awt.Cursor;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -47,6 +46,7 @@ import javax.swing.SpinnerNumberModel;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.FontLibrary;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
diff --git a/src/net/sf/freecol/client/gui/panel/OptionsDialog.java b/src/net/sf/freecol/client/gui/panel/OptionsDialog.java
index 09edb1ceb..1bfde9548 100644
--- a/src/net/sf/freecol/client/gui/panel/OptionsDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/OptionsDialog.java
@@ -31,6 +31,7 @@ import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.option.OptionGroupUI;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColDirectories;
diff --git a/src/net/sf/freecol/client/gui/panel/ParametersDialog.java b/src/net/sf/freecol/client/gui/panel/ParametersDialog.java
index 6853edfa0..db5685f9f 100644
--- a/src/net/sf/freecol/client/gui/panel/ParametersDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/ParametersDialog.java
@@ -32,6 +32,7 @@ import javax.swing.JTextField;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.common.i18n.Messages;
 
 
diff --git a/src/net/sf/freecol/client/gui/panel/RiverStyleDialog.java b/src/net/sf/freecol/client/gui/panel/RiverStyleDialog.java
index ccdcad0cb..389e5476e 100644
--- a/src/net/sf/freecol/client/gui/panel/RiverStyleDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/RiverStyleDialog.java
@@ -19,15 +19,15 @@
 
 package net.sf.freecol.client.gui.panel;
 
-import javax.swing.ImageIcon;
-import javax.swing.JPanel;
-
 import java.util.List;
 import java.util.logging.Logger;
 
+import javax.swing.ImageIcon;
 import javax.swing.JFrame;
+import javax.swing.JPanel;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.common.resources.ResourceManager;
 
diff --git a/src/net/sf/freecol/client/gui/panel/SaveDialog.java b/src/net/sf/freecol/client/gui/panel/SaveDialog.java
index 2b2713de2..6b87015de 100644
--- a/src/net/sf/freecol/client/gui/panel/SaveDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/SaveDialog.java
@@ -21,17 +21,15 @@ package net.sf.freecol.client.gui.panel;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
-import javax.swing.JFileChooser;
-import javax.swing.filechooser.FileFilter;
-
 import java.io.File;
-
 import java.util.List;
 
+import javax.swing.JFileChooser;
 import javax.swing.JFrame;
+import javax.swing.filechooser.FileFilter;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 
 
 /**
diff --git a/src/net/sf/freecol/client/gui/panel/ScaleMapSizeDialog.java b/src/net/sf/freecol/client/gui/panel/ScaleMapSizeDialog.java
index 84982f337..0f33e3a84 100644
--- a/src/net/sf/freecol/client/gui/panel/ScaleMapSizeDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/ScaleMapSizeDialog.java
@@ -33,6 +33,7 @@ import javax.swing.JTextField;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Map;
 
diff --git a/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java b/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
index fe743c338..018d6d6a3 100644
--- a/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
@@ -48,7 +48,7 @@ import javax.swing.event.ListSelectionListener;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.client.gui.plaf.FreeColComboBoxRenderer;
 import net.sf.freecol.common.i18n.Messages;
@@ -73,8 +73,8 @@ import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
 import net.sf.freecol.common.model.pathfinding.GoalDeciders.MultipleAdjacentDecider;
-import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.common.resources.ResourceManager;
+import net.sf.freecol.common.util.LogBuilder;
 
 
 /**
diff --git a/src/net/sf/freecol/client/gui/plaf/FreeColOptionPaneUI.java b/src/net/sf/freecol/client/gui/plaf/FreeColOptionPaneUI.java
index 4df0492fa..35f7e7594 100644
--- a/src/net/sf/freecol/client/gui/plaf/FreeColOptionPaneUI.java
+++ b/src/net/sf/freecol/client/gui/plaf/FreeColOptionPaneUI.java
@@ -40,7 +40,7 @@ import javax.swing.plaf.basic.BasicOptionPaneUI;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.gui.ImageLibrary;
-import net.sf.freecol.client.gui.panel.ChoiceItem;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.panel.MigPanel;
 import net.sf.freecol.common.i18n.Messages;
 
diff --git a/src/net/sf/freecol/common/debug/DebugUtils.java b/src/net/sf/freecol/common/debug/DebugUtils.java
index 42639bfa0..d50f57fcd 100644
--- a/src/net/sf/freecol/common/debug/DebugUtils.java
+++ b/src/net/sf/freecol/common/debug/DebugUtils.java
@@ -33,7 +33,7 @@ import javax.swing.event.ChangeListener;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.GUI;
-import net.sf.freecol.client.gui.panel.ChoiceItem;
+import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColXMLWriter.WriteScope;
 import net.sf.freecol.common.model.Building;
@@ -64,7 +64,9 @@ import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.option.BooleanOption;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.common.util.RandomChoice;
+
 import static net.sf.freecol.common.util.StringUtils.*;
+
 import net.sf.freecol.server.FreeColServer;
 import net.sf.freecol.server.ai.AIColony;
 import net.sf.freecol.server.ai.AIMain;

From 3e5b67dfc658f7a98b8d92b0411e1bf0ff00038a Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 30 Jul 2015 19:54:31 +0200
Subject: [PATCH 021/323] Make MapEditorController independent from
 MapEditorTransformPanel.MapTransform

---
 .../client/control/MapEditorController.java   | 19 ++++++++++++++-----
 .../gui/panel/MapEditorTransformPanel.java    |  3 ++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/client/control/MapEditorController.java b/src/net/sf/freecol/client/control/MapEditorController.java
index a87b40017..c6e7f5e85 100644
--- a/src/net/sf/freecol/client/control/MapEditorController.java
+++ b/src/net/sf/freecol/client/control/MapEditorController.java
@@ -31,7 +31,6 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.GUI;
-import net.sf.freecol.client.gui.panel.MapEditorTransformPanel.MapTransform;
 import net.sf.freecol.common.FreeColException;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColDirectories;
@@ -48,8 +47,8 @@ import net.sf.freecol.common.option.MapGeneratorOptions;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.server.FreeColServer;
-import net.sf.freecol.server.model.ServerPlayer;
 import net.sf.freecol.server.generator.MapGenerator;
+import net.sf.freecol.server.model.ServerPlayer;
 
 
 /**
@@ -65,11 +64,21 @@ public final class MapEditorController {
 
     private final GUI gui;
 
+    public interface IMapTransform {
+
+        /**
+         * Applies this transformation to the given tile.
+         * @param t The <code>Tile</code> to be transformed,
+         */
+        public abstract void transform(Tile t);
+
+    }
+
     /**
      * The transform that should be applied to a <code>Tile</code>
      * that is clicked on the map.
      */
-    private MapTransform currentMapTransform = null;
+    private IMapTransform currentMapTransform = null;
 
 
     /**
@@ -132,7 +141,7 @@ public final class MapEditorController {
      * @param mt The transform that should be applied to a
      *      <code>Tile</code> that is clicked on the map.
      */
-    public void setMapTransform(MapTransform mt) {
+    public void setMapTransform(IMapTransform mt) {
         currentMapTransform = mt;
         gui.updateMapControls();
     }
@@ -142,7 +151,7 @@ public final class MapEditorController {
      * @return The transform that should be applied to a
      *      <code>Tile</code> that is clicked on the map.
      */
-    public MapTransform getMapTransform() {
+    public IMapTransform getMapTransform() {
         return currentMapTransform;
     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
index 25efede23..bf2566354 100644
--- a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
@@ -38,6 +38,7 @@ import javax.swing.JToggleButton;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.MapEditorController;
+import net.sf.freecol.client.control.MapEditorController.IMapTransform;
 import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.client.gui.MapViewer;
@@ -196,7 +197,7 @@ public final class MapEditorTransformPanel extends FreeColPanel {
      *
      * @see #transform(Tile)
      */
-    public abstract class MapTransform {
+    public abstract class MapTransform implements IMapTransform {
 
         /**
          * A panel with information about this transformation.

From 94b94f56eb2ff83bcaa62e66b7e1c93cb95cbb0d Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 30 Jul 2015 20:13:18 +0200
Subject: [PATCH 022/323] Remove dependence of GUI on ColonyPanel

---
 src/net/sf/freecol/client/gui/GUI.java             |  4 +---
 src/net/sf/freecol/client/gui/SwingGUI.java        |  6 +++++-
 .../client/gui/panel/ReportCompactColonyPanel.java | 14 +++++---------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index afb605371..f4b4a8d5e 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -41,7 +41,6 @@ import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
 import net.sf.freecol.client.control.InGameController.*;
-import net.sf.freecol.client.gui.panel.ColonyPanel;
 import net.sf.freecol.client.gui.panel.ColorChooserPanel;
 import net.sf.freecol.client.gui.panel.FreeColDialog;
 import net.sf.freecol.client.gui.panel.LabourData.UnitData;
@@ -1244,8 +1243,7 @@ public class GUI {
     protected void showForeignColony(Settlement settlement) {
     }
 
-    public ColonyPanel showColonyPanel(Colony colony, Unit unit) {
-        return null;
+    public void showColonyPanel(Colony colony, Unit unit) {
     }
 
     public void showColopediaPanel(String nodeId) {
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index bd2e1eb32..c11fff36b 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1036,7 +1036,11 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public ColonyPanel showColonyPanel(Colony colony, Unit unit) {
+    public void showColonyPanel(Colony colony, Unit unit) {
+        canvas.showColonyPanel(colony, unit);
+    }
+
+    public ColonyPanel showColonyPanel2(Colony colony, Unit unit) {
         return canvas.showColonyPanel(colony, unit);
     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index db386d360..091bdb51b 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -36,14 +36,14 @@ import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
-import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
+
 import net.miginfocom.swing.MigLayout;
 
-import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.ImageLibrary;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.AbstractGoods;
@@ -51,20 +51,15 @@ import net.sf.freecol.common.model.BuildableType;
 import net.sf.freecol.common.model.Building;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.Colony.TileImprovementSuggestion;
-import net.sf.freecol.common.model.ColonyTile;
 import net.sf.freecol.common.model.ExportData;
 import net.sf.freecol.common.model.FreeColObject;
 import net.sf.freecol.common.model.Game;
-import net.sf.freecol.common.model.Goods;
 import net.sf.freecol.common.model.GoodsContainer;
 import net.sf.freecol.common.model.GoodsType;
-import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.Market;
-import net.sf.freecol.common.model.Occupation;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.ProductionInfo;
 import net.sf.freecol.common.model.Region;
-import net.sf.freecol.common.model.Settlement;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Tile;
@@ -74,9 +69,10 @@ import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.model.WorkLocation;
 import net.sf.freecol.common.model.WorkLocation.Suggestion;
 import net.sf.freecol.common.resources.ResourceManager;
-import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.CollectionUtils.Accumulator;
 
+import static net.sf.freecol.common.util.CollectionUtils.*;
+
 
 /**
  * This panel displays the compact colony report.
@@ -1122,7 +1118,7 @@ public final class ReportCompactColonyPanel extends ReportPanel
         } else {
             Colony colony = game.getFreeColGameObject(command, Colony.class);
             if (colony != null) {
-                getGUI().showColonyPanel(colony, null)
+                ((SwingGUI)getGUI()).showColonyPanel2(colony, null)
                     .addClosingCallback(new Runnable() {
                             @Override
                             public void run() {

From 57507f0d693d2993238ccb89fad205676afb05b5 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 30 Jul 2015 20:24:23 +0200
Subject: [PATCH 023/323] Remove dependence of GUI on FreeColDialog

---
 src/net/sf/freecol/client/gui/GUI.java                 | 4 ----
 src/net/sf/freecol/client/gui/SwingGUI.java            | 1 -
 src/net/sf/freecol/client/gui/panel/FreeColDialog.java | 8 ++++----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index f4b4a8d5e..f9813db79 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -42,7 +42,6 @@ import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
 import net.sf.freecol.client.control.InGameController.*;
 import net.sf.freecol.client.gui.panel.ColorChooserPanel;
-import net.sf.freecol.client.gui.panel.FreeColDialog;
 import net.sf.freecol.client.gui.panel.LabourData.UnitData;
 import net.sf.freecol.client.gui.panel.MiniMap;
 import net.sf.freecol.client.gui.panel.Parameters;
@@ -1142,9 +1141,6 @@ public class GUI {
         return false;
     }
 
-    public void dialogRemove(FreeColDialog<?> fcd) {
-    }
-
     public void displayObject(FreeColObject fco) {
     }
 
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index c11fff36b..f3411deac 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -870,7 +870,6 @@ public class SwingGUI extends GUI {
         return canvas.containsInGameComponents();
     }
 
-    @Override
     public void dialogRemove(FreeColDialog<?> fcd) {
         canvas.dialogRemove(fcd);
     }
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
index 837635759..d205bccb2 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
@@ -45,8 +45,8 @@ import javax.swing.SwingUtilities;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
 import net.sf.freecol.client.gui.ChoiceItem;
-import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.ImageLibrary;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.client.gui.plaf.FreeColOptionPaneUI;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Game;
@@ -272,8 +272,8 @@ public class FreeColDialog<T> extends JDialog implements PropertyChangeListener
      *
      * @return The <code>GUI</code>.
      */
-    protected GUI getGUI() {
-        return freeColClient.getGUI();
+    protected SwingGUI getGUI() {
+        return (SwingGUI)freeColClient.getGUI();
     }
 
     /**
@@ -429,7 +429,7 @@ public class FreeColDialog<T> extends JDialog implements PropertyChangeListener
     public void removeNotify() {
         super.removeNotify();
 
-        freeColClient.getGUI().dialogRemove(FreeColDialog.this);
+        getGUI().dialogRemove(FreeColDialog.this);
 
         removeAll();
         if (this.pane != null) {

From f483359f49afcb618cb6c66af912ce09a1171976 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 30 Jul 2015 20:28:51 +0200
Subject: [PATCH 024/323] Remove dependence of GUI on TradeRoutePanel

---
 src/net/sf/freecol/client/gui/GUI.java                | 4 ----
 src/net/sf/freecol/client/gui/SwingGUI.java           | 1 -
 src/net/sf/freecol/client/gui/panel/FreeColPanel.java | 6 +++---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index f9813db79..265a17679 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -45,7 +45,6 @@ import net.sf.freecol.client.gui.panel.ColorChooserPanel;
 import net.sf.freecol.client.gui.panel.LabourData.UnitData;
 import net.sf.freecol.client.gui.panel.MiniMap;
 import net.sf.freecol.client.gui.panel.Parameters;
-import net.sf.freecol.client.gui.panel.TradeRoutePanel;
 import net.sf.freecol.client.gui.panel.Utility;
 import net.sf.freecol.common.FreeColException;
 import net.sf.freecol.common.ServerInfo;
@@ -1175,9 +1174,6 @@ public class GUI {
     public void removeInGameComponents() {
     }
 
-    public void removeTradeRoutePanel(TradeRoutePanel panel) {
-    }
-
     public void requestFocusForSubPanel() {
     }
 
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index f3411deac..e2423a592 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -948,7 +948,6 @@ public class SwingGUI extends GUI {
         canvas.removeInGameComponents();
     }
 
-    @Override
     public void removeTradeRoutePanel(TradeRoutePanel panel) {
         canvas.removeTradeRoutePanel(panel);
     }
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColPanel.java b/src/net/sf/freecol/client/gui/panel/FreeColPanel.java
index 16d04e250..12d5507cf 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColPanel.java
@@ -39,8 +39,8 @@ import javax.swing.KeyStroke;
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
-import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.ImageLibrary;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.Player;
@@ -128,8 +128,8 @@ public abstract class FreeColPanel extends MigPanel implements ActionListener {
      *
      * @return The current <code>GUI</code>.
      */
-    protected GUI getGUI() {
-        return freeColClient.getGUI();
+    protected SwingGUI getGUI() {
+        return (SwingGUI)freeColClient.getGUI();
     }
 
     /**

From f96926ad03b79cb028f359319abf015d44017f63 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 31 Jul 2015 14:53:39 +0930
Subject: [PATCH 025/323] Use getColonyTileLocationLabel in RRP.

---
 data/strings/FreeColMessages.properties            | 10 ++++------
 .../client/gui/panel/ReportRequirementsPanel.java  | 14 ++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index fc3bff7d3..65c67b71b 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -3160,16 +3160,14 @@ report.production.update=Update
 # ReportRequirementsPanel
 report.requirements.badAssignment=%colony% has a %expert% currently working as %expertWork%, while a %nonExpert% is working as %nonExpertWork%. Production would be greater if the colonists swapped jobs.
 report.requirements.canTrainExperts={{plural:2|%unit%}} can be trained at
-report.requirements.exploreTile=%type% to the %direction% of %colony% would benefit from exploration.
+report.requirements.exploreTile=%location% would benefit from exploration.
 report.requirements.met=All requirements are met.
 report.requirements.missingGoods=%colony% is producing %goods%, but requires more %input%.
 report.requirements.misusedExperts=There are {{plural:2|%unit%}} not working as %work% present at
 report.requirements.noExpert=%colony% is producing %goods%, but has no %unit%.
-report.requirements.tile.clearForest=%type% to the %direction% of %colony% would benefit from clearing.
-report.requirements.tile.clearForest.center=%colony% would benefit from clearing its tile.
-report.requirements.tile.plow=%type% to the %direction% of %colony% would benefit from plowing.
-report.requirements.tile.plow.center=%colony% would benefit from plowing its tile.
-report.requirements.tile.road=%type% to the %direction% of %colony% would benefit from road building.
+report.requirements.tile.clearForest=%location% would benefit from clearing.
+report.requirements.tile.plow=%location% would benefit from plowing.
+report.requirements.tile.road=%location% would benefit from road building.
 #report.requirements.tile.road.center can not happen
 report.requirements.severalExperts=Several {{plural:2|%unit%}} are present at
 report.requirements.surplus=A surplus of %goods% is being produced at
diff --git a/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java b/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
index 83de5e9ea..517233053 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
@@ -196,7 +196,6 @@ public final class ReportRequirementsPanel extends ReportPanel {
             } else {
                 String key = "report.requirements.tile."
                     + tis.tileImprovementType.getSuffix();
-                if (tis.tile == colony.getTile()) key += ".center";
                 if (Messages.containsKey(key)) {
                     addTileWarning(doc, colony, key, tis.tile);
                 }
@@ -220,12 +219,9 @@ public final class ReportRequirementsPanel extends ReportPanel {
     private void addTileWarning(StyledDocument doc, Colony colony,
                                 String messageId, Tile tile) {
         if (messageId == null || !Messages.containsKey(messageId)) return;
-        // TODO-post-0.11.4-release: migrate to using Tile.getColonyTileLocationLabel()
-        Direction direction = colony.getTile().getDirection(tile);
         StringTemplate t = StringTemplate.template(messageId)
-            .addNamed("%type%", tile.getType())
-            .addName("%colony%", colony.getName());
-        if (direction != null) t.addNamed("%direction%", direction);
+            .addStringTemplate("%location%",
+                tile.getColonyTileLocationLabel(colony));
         try {
             doc.insertString(doc.getLength(), "\n\n" + Messages.message(t),
                              doc.getStyle("regular"));
@@ -234,7 +230,8 @@ public final class ReportRequirementsPanel extends ReportPanel {
         }
     }
 
-    private void addBadAssignmentWarning(StyledDocument doc, Colony colony, Unit expert, Unit nonExpert) {
+    private void addBadAssignmentWarning(StyledDocument doc, Colony colony,
+                                         Unit expert, Unit nonExpert) {
         GoodsType expertGoods = expert.getWorkType();
         GoodsType nonExpertGoods = nonExpert.getWorkType();
         String colonyName = colony.getName();
@@ -257,7 +254,8 @@ public final class ReportRequirementsPanel extends ReportPanel {
         }
     }
 
-    private void addExpertWarning(StyledDocument doc, Colony c, GoodsType goodsType, UnitType workType) {
+    private void addExpertWarning(StyledDocument doc, Colony c,
+                                  GoodsType goodsType, UnitType workType) {
         String newMessage = Messages.message(StringTemplate
             .template("report.requirements.noExpert")
             .addName("%colony%", c.getName())

From 72190eeb7db6c262c0baee07f132f42928773b79 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 30 Jul 2015 09:54:42 +0930
Subject: [PATCH 026/323] Move splash.jpg into the FreeCol.jar.

---
 build.xml                                    |   2 +-
 splash.jpg => build/splash.jpg               | Bin
 data/strings/FreeColMessages.properties      |   2 +
 doc/FreeCol.tex                              |  27 +++---
 src/net/sf/freecol/FreeCol.java              |  94 +++++++++++++++----
 src/net/sf/freecol/client/FreeColClient.java |  11 ++-
 src/net/sf/freecol/client/gui/GUI.java       |   5 +-
 src/net/sf/freecol/client/gui/SwingGUI.java  |  13 +--
 8 files changed, 111 insertions(+), 43 deletions(-)
 rename splash.jpg => build/splash.jpg (100%)

diff --git a/build.xml b/build.xml
index 2c06c9979..1fa1b87fb 100644
--- a/build.xml
+++ b/build.xml
@@ -182,7 +182,7 @@
         <jar jarfile="${freecol.jar.file}"
              basedir="${freecol.build.dir}"
              manifest="${basedir}/src/MANIFEST.MF"
-             includes="net/**, org/**"
+             includes="net/**, splash.jpg"
              excludes="**/metaserver/**"/>
     </target>
 
diff --git a/splash.jpg b/build/splash.jpg
similarity index 100%
rename from splash.jpg
rename to build/splash.jpg
diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 65c67b71b..7038bd6f6 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -217,6 +217,7 @@ cli.error.home.notDir=%string% is not a directory.
 cli.error.home.notExists=Directory %string% does not exist.
 cli.error.save=Can not read saved game %string%.
 cli.error.serverPort=%string% is not a valid port number.
+cli.error.splash=Splash file %name% not found.
 cli.error.timeout=%string% is too short (less than %minimum%).
 
 cli.advantages=set the type of ADVANTAGES (%advantages%)
@@ -246,6 +247,7 @@ cli.no-intro=skip the intro video
 cli.no-java-check=skip the java version check
 cli.no-memory-check=skip the memory check
 cli.no-sound=run FreeCol without sound
+cli.no-splash=skip the splash screen
 cli.private=start a private server (not published to the metaserver)
 cli.seed=provide a SEED for the pseudo-random number generator
 cli.server-name=specify a custom NAME for the server
diff --git a/doc/FreeCol.tex b/doc/FreeCol.tex
index 9253c613b..744cb00e5 100644
--- a/doc/FreeCol.tex
+++ b/doc/FreeCol.tex
@@ -336,8 +336,8 @@ options:
 \item\verb$--version$ Display the version number.
 \item\verb$--default-locale LOCALE$ Specify a locale.
 \item\verb$--freecol-data DIR$ Specify the directory that contains
-FreeCol's data files. In general, you will only need to use this if
-you have installed a modified copy of FreeCol's data files.
+  FreeCol's data files.  In general, you will only need to use this if
+  you have installed a modified copy of FreeCol's data files.
 \item\verb$--advantages ADVANTAGES$ Set the European nation advantages
   type, which must be one of \texttt{Selected} (each nation may choose
   an advantage), \texttt{Fixed} (the standard advantage types are
@@ -352,21 +352,22 @@ you have installed a modified copy of FreeCol's data files.
   European colonial nations (normally the classic four: Dutch,
   English, French, Spanish).
 \item\verb$--font FONTSPEC$ Override the default font with a Java
-font specifier (e.g. Arial-BOLD-12).
+  font specifier (e.g. Arial-BOLD-12).
 \item\verb$--full-screen$ Run FreeCol in full screen mode.
 \item\verb$--load-savegame SAVEGAME_FILE$ Load the given
-  savegame. This is particularly useful in combination with the client
+  savegame.  This is particularly useful in combination with the client
   option \hyperlink{show savegame settings}{show savegame settings}.
 \item\verb$--log-file FILE$ Override the location of the log file.
 \item\verb$--name NAME$ Specify a player name.
 \item\verb$--no-intro$ Skip the introductory video.
-\item\verb$--no-sound$ Run FreeCol without sound. Note that the game
-does not yet contain any music, so the only sounds you will hear will
-be special effects.
+\item\verb$--no-sound$ Run FreeCol without sound.  Note that the game
+  does not yet contain background music, so the only sounds you will
+  hear will be special effects.
+\item\verb$--no-splash$ Skip the splash screen.
 \item\verb$--server PORT$ Start a stand-alone server on the specified
-port. If you don't know what that means, you will not need the option.
+  port.
 \item\verb$--server-help$ Display a help screen for the more advanced
-server options.
+  server options.
 \item\verb$--splash FILE$ Specify the location of the splash screen file.
 \item\verb$--timeout TIMEOUT$ Specifies the number of seconds the
   server should wait for a player to answer a question (e.g. demands
@@ -378,20 +379,20 @@ server options.
   exist this option will be ignored.
 \item\verb$--user-config-directory DIRECTORY$ Use the given directory
   instead of your default FreeCol user configuration directory to load
-  client and custom options. You can use this in order to run the
+  client and custom options.  You can use this in order to run the
   game from a USB stick\index{USB stick}, for example.  Please note
   that specifying a client options file on the command line will override
   the options directory.  If the specified directory does not
   exist this option will be ignored.
 \item\verb$--user-data-directory DIRECTORY$ Use the given directory
   instead of your default FreeCol user data directory to load and save
-  games, and user mods. You can use this in order to run the
-  game from a USB stick\index{USB stick}, for example. Please note
+  games, and user mods.  You can use this in order to run the
+  game from a USB stick\index{USB stick}, for example.  Please note
   that specifying a save game file on the command line will override
   the save game directory.  If the specified directory does not
   exist FreeCol will exit.
 \item\verb$--windowed[[=]WIDTHxHEIGHT]$ Run FreeCol in windowed mode,
-  and optionally explicitly set the window width and height. If the
+  and optionally explicitly set the window width and height.  If the
   size is not specified FreeCol will attempt to use as much space as
   possible without overlapping menu bars et al.  Window size
   determination is not always correct for all combinations of
diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index 5cf7e19dd..aef00ed60 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -22,16 +22,23 @@ package net.sf.freecol;
 import java.awt.Dimension;
 import java.io.File;
 import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.io.IOException;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.net.InetAddress;
+import java.net.JarURLConnection;
 import java.net.URL;
 import java.net.JarURLConnection;
 import java.util.Locale;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
 
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
@@ -125,7 +132,7 @@ public final class FreeCol {
     private static final String JAVA_VERSION_MIN = "1.7";
     private static final int    MEMORY_MIN = 128; // Mbytes
     private static final int    PORT_DEFAULT = 3541;
-    private static final String SPLASH_FILE_DEFAULT = "splash.jpg";
+    private static final String SPLASH_DEFAULT = "splash.jpg";
     private static final String TC_DEFAULT = "freecol";
     public static final int     TIMEOUT_DEFAULT = 60; // 1 minute
     public static final int     TIMEOUT_MIN = 10; // 10s
@@ -174,8 +181,8 @@ public final class FreeCol {
     private static int serverPort = -1;
     private static String serverName = null;
 
-    /** Where the splash file lives. */
-    private static String splashFilename = SPLASH_FILE_DEFAULT;
+    /** A stream to get the splash image from. */
+    private static InputStream splashStream;
 
     /** The TotalConversion / ruleset in play, defaults to "freecol". */
     private static String tc = null;
@@ -202,13 +209,30 @@ public final class FreeCol {
      */
     public static void main(String[] args) {
         freeColRevision = FREECOL_VERSION;
+        JarURLConnection juc;
         try {
-            String revision = readVersion(FreeCol.class);
-            if (revision != null) {
-                freeColRevision += " (Revision: " + revision + ")";
+            juc = getJarURLConnection(FreeCol.class);
+        } catch (IOException ioe) {
+            juc = null;
+            System.err.println("Unable to open class jar: "
+                + ioe.getMessage());
+        }
+        if (juc != null) {
+            try {
+                String revision = readVersion(juc);
+                if (revision != null) {
+                    freeColRevision += " (Revision: " + revision + ")";
+                }
+            } catch (Exception e) {
+                System.err.println("Unable to load Manifest: "
+                    + e.getMessage());
+            }
+            try {
+                splashStream = getDefaultSplashStream(juc);
+            } catch (Exception e) {
+                System.err.println("Unable to open default splash: "
+                    + e.getMessage());
             }
-        } catch (Exception e) {
-            System.err.println("Unable to load Manifest: " + e.getMessage());
         }
 
         // Java bug #7075600 causes BR#2554.  The workaround is to set
@@ -316,18 +340,43 @@ public final class FreeCol {
 
 
     /**
-     * Extract the package version from the class.
+     * Get the JarURLConnection from a class.
      *
-     * @param c The <code>Class</code> to extract from.
-     * @return A value of the package version attribute.
+     * @return The <code>JarURLConnection</code>.
      */
-    private static String readVersion(Class c) throws IOException {
+    private static JarURLConnection getJarURLConnection(Class c) throws IOException {
         String resourceName = "/" + c.getName().replace('.', '/') + ".class";
         URL url = c.getResource(resourceName);
-        Manifest mf = ((JarURLConnection)url.openConnection()).getManifest();
-        return mf.getMainAttributes().getValue("Package-Version");
+        return (JarURLConnection)url.openConnection();
+    }
+        
+    /**
+     * Extract the package version from the class.
+     *
+     * @param juc The <code>JarURLConnection</code> to extract from.
+     * @return A value of the package version attribute.
+     */
+    private static String readVersion(JarURLConnection juc) throws IOException {
+        Manifest mf = juc.getManifest();
+        return (mf == null) ? null
+            : mf.getMainAttributes().getValue("Package-Version");
     }
 
+    /**
+     * Get a stream for the default splash file.
+     *
+     * Note: Not bothering to check for nulls as this is called in try
+     * block that ignores all exceptions.
+     *
+     * @param juc The <code>JarURLConnection</code> to extract from.
+     * @return A suitable <code>InputStream</code>, or null on error.
+     */
+    private static InputStream getDefaultSplashStream(JarURLConnection juc) throws IOException {
+        JarFile jf = juc.getJarFile();
+        ZipEntry ze = jf.getEntry(SPLASH_DEFAULT);
+        return jf.getInputStream(ze);
+    }
+            
     /**
      * Exit printing fatal error message.
      *
@@ -517,6 +566,9 @@ public final class FreeCol {
         options.addOption(OptionBuilder.withLongOpt("no-sound")
                           .withDescription(Messages.message("cli.no-sound"))
                           .create());
+        options.addOption(OptionBuilder.withLongOpt("no-splash")
+                          .withDescription(Messages.message("cli.no-splash"))
+                          .create());
         options.addOption(OptionBuilder.withLongOpt("private")
                           .withDescription(Messages.message("cli.private"))
                           .create());
@@ -722,6 +774,9 @@ public final class FreeCol {
             if (line.hasOption("no-sound")) {
                 sound = false;
             }
+            if (line.hasOption("no-splash")) {
+                splashStream = null;
+            }
 
             if (line.hasOption("private")) {
                 publicServer = false;
@@ -744,7 +799,14 @@ public final class FreeCol {
             }
 
             if (line.hasOption("splash")) {
-                splashFilename = line.getOptionValue("splash");
+                String splash = line.getOptionValue("splash");
+                try {
+                    FileInputStream fis = new FileInputStream(splash);
+                    splashStream = fis;
+                } catch (FileNotFoundException fnfe) {
+                    gripe(StringTemplate.template("cli.error.splash")
+                        .addName("%name%", splash));
+                }
             }
 
             if (line.hasOption("tc")) {
@@ -1312,7 +1374,7 @@ public final class FreeCol {
             // savegame was specified on command line
         }
         final FreeColClient freeColClient
-            = new FreeColClient(splashFilename, fontName, guiScale, headless);
+            = new FreeColClient(splashStream, fontName, guiScale, headless);
         freeColClient.startClient(windowSize, userMsg, sound, introVideo,
                                   savegame, spec);
     }
diff --git a/src/net/sf/freecol/client/FreeColClient.java b/src/net/sf/freecol/client/FreeColClient.java
index f1d6ace99..bd216212f 100644
--- a/src/net/sf/freecol/client/FreeColClient.java
+++ b/src/net/sf/freecol/client/FreeColClient.java
@@ -21,6 +21,7 @@ package net.sf.freecol.client;
 
 import java.awt.Dimension;
 import java.io.File;
+import java.io.InputStream;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
@@ -132,21 +133,21 @@ public final class FreeColClient {
     private final boolean headless;
 
 
-    public FreeColClient(final String splashFilename,
+    public FreeColClient(final InputStream splashStream,
                          final String fontName) {
-        this(splashFilename, fontName, FreeCol.GUI_SCALE_DEFAULT, true);
+        this(splashStream, fontName, FreeCol.GUI_SCALE_DEFAULT, true);
     }
 
     /**
      * Creates a new <code>FreeColClient</code>.  Creates the control
      * objects.
      *
-     * @param splashFilename The name of the splash image.
+     * @param splashStream A stream to read the splash image from.
      * @param fontName An optional override of the main font.
      * @param scale The scale factor for gui elements.
      * @param headless Run in headless mode.
      */
-    public FreeColClient(final String splashFilename, final String fontName,
+    public FreeColClient(final InputStream splashStream, final String fontName,
                          final float scale, boolean headless) {
         mapEditor = false;
         this.headless = headless
@@ -161,7 +162,7 @@ public final class FreeColClient {
         // Get the splash screen up early on to show activity.
         gui = (this.headless) ? new GUI(this, scale)
                               : new SwingGUI(this, scale);
-        gui.displaySplashScreen(splashFilename);
+        gui.displaySplashScreen(splashStream);
 
         // Look for base data directory.  Failure is fatal.
         File baseDirectory = FreeColDirectories.getBaseDirectory();
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 265a17679..4432ccb0f 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -27,6 +27,7 @@ import java.awt.Rectangle;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -177,9 +178,9 @@ public class GUI {
     /**
      * Display the splash screen.
      *
-     * @param splashFilename The name of the file to find the image in.
+     * @param splashStream A stream to find the image in.
      */
-    public void displaySplashScreen(final String splashFilename) {
+    public void displaySplashScreen(final InputStream splashStream) {
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index e2423a592..d971df40a 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -30,21 +30,23 @@ import java.awt.Image;
 import java.awt.MouseInfo;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.awt.image.BufferedImage;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
 
+import javax.imageio.ImageIO;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JWindow;
@@ -217,15 +219,14 @@ public class SwingGUI extends GUI {
     /**
      * Display the splash screen.
      *
-     * @param splashFilename The name of the file to find the image in.
+     * @param splashStream A stream to read the splash image from.
      */
     @Override
-    public void displaySplashScreen(final String splashFilename) {
+    public void displaySplashScreen(final InputStream splashStream) {
         splash = null;
-        if (splashFilename == null)
-            return;
+        if (splashStream == null) return;
         try {
-            Image im = Toolkit.getDefaultToolkit().getImage(splashFilename);
+            BufferedImage im = ImageIO.read(splashStream);
             splash = new JWindow(graphicsDevice.getDefaultConfiguration());
             splash.getContentPane().add(new JLabel(new ImageIcon(im)));
             splash.pack();

From 14e703927eca2f1e08f64c63f564a86bcd7db6d6 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 28 Jul 2015 11:57:44 +0930
Subject: [PATCH 027/323] Add greyed unit icons for vacant education places in
 RCCP.

---
 data/strings/FreeColMessages.properties       |  1 +
 .../gui/panel/ReportCompactColonyPanel.java   | 24 ++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 7038bd6f6..8389c0ec7 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -3055,6 +3055,7 @@ report.colony.making.blocking.description=%colony%: %amount% %goods% needed for
 report.colony.making.constructing.description=%colony%: %buildable% completes {{plural:%turns%|one=next turn|other=in %turns% turns}}
 report.colony.making.description=What this colony is making
 report.colony.making.educating.description=%colony%: %teacher% graduates {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.making.educationVacancy.description=%colony%: {{plural:%number%|one=one student place is|other=%number% student places are}} vacant
 report.colony.making.educating.summary.description=Units (type and count) expected to graduate from schools of this continent
 report.colony.making.header=Making
 report.colony.making.noconstruction.description=%colony%: No construction occurring
diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index 091bdb51b..490cab07b 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -504,6 +504,8 @@ public final class ReportCompactColonyPanel extends ReportPanel
      */
     private void updateColony(ColonySummary s) {
         final String cac = s.colony.getId();
+        final UnitType defaultUnitType
+            = spec.getDefaultUnitType(s.colony.getOwner());
         List<JComponent> buttons = new ArrayList<>();
         JButton b;
         Color c;
@@ -700,8 +702,7 @@ public final class ReportCompactColonyPanel extends ReportPanel
         if (s.newColonist > 0) {
             t = stpld("report.colony.arriving")
                     .addName("%colony%", s.colony.getName())
-                    .addNamed("%unit%",
-                        spec.getDefaultUnitType(s.colony.getOwner()))
+                    .addNamed("%unit%", defaultUnitType)
                     .addAmount("%turns%", s.newColonist);
             b = newButton(cac, Integer.toString(s.newColonist), null,
                           cGood, t);
@@ -755,8 +756,13 @@ public final class ReportCompactColonyPanel extends ReportPanel
             buttons.add(b);
         }
 
-        // Field: What is being trained.
+        // Field: What is being trained, including shadow units for vacant
+        // places.
         // Colour: cAlarm if completion is blocked, otherwise cPlain.
+        int empty = 0;
+        Building school = s.colony.getWorkLocationWithAbility(Ability.TEACH,
+                                                              Building.class);
+        if (school != null) empty = school.getType().getWorkPlaces();
         for (Entry<Unit, Integer> e
                  : mapEntriesByValue(s.teachers, descendingIntegerComparator)) {
             Unit u = e.getKey();
@@ -778,6 +784,18 @@ public final class ReportCompactColonyPanel extends ReportPanel
                               cPlain, t);
             }
             buttons.add(b);
+            empty--;
+        }
+
+        if (empty > 0) {
+            final ImageIcon emptyIcon
+                = new ImageIcon(this.lib.getTinyUnitImage(defaultUnitType, true));
+            t = stpld("report.colony.making.educationVacancy")
+                    .addName("%colony%", s.colony.getName())
+                    .addAmount("%number%", empty);
+            for (; empty > 0; empty--) {
+                buttons.add(newButton(cac, "", emptyIcon, cPlain, t));
+            }
         }
         addTogether(buttons);
 

From 8394732cb9cbfab04aacf5e895e765f3a0f04ec7 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 31 Jul 2015 14:19:25 +0930
Subject: [PATCH 028/323] Add back the colony popup for a case in IGC.

---
 src/net/sf/freecol/client/control/InGameController.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 160d54d8e..403eebb1f 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -907,6 +907,9 @@ public final class InGameController implements NetworkConstants {
         // Clear ordinary destinations if arrived.
         if (movePath(unit, path) && unit.isAtLocation(destination)) {
             askClearGotoOrders(unit);
+            Colony colony = (unit.hasTile()) ? unit.getTile().getColony()
+                : null;
+            if (colony != null) gui.showColonyPanel(colony, unit);
             // Check cash-in, and if the unit has moves left and was
             // not set to SKIPPED by moveDirection, then return true
             // to show that this unit could continue.
@@ -2563,8 +2566,7 @@ public final class InGameController implements NetworkConstants {
             && !tile.hasSettlement();
         if (ret) {
             player.invalidateCanSeeTiles();
-            gui.setActiveUnit(null);
-            gui.setSelectedTile(tile);
+            gui.setActiveUnit(tile.getFirstUnit());
         }
         return ret;
     }
@@ -2727,10 +2729,7 @@ public final class InGameController implements NetworkConstants {
             && tile.hasSettlement();
         if (ret) {
             player.invalidateCanSeeTiles();
-            gui.setActiveUnit(null);
             gui.showColonyPanel((Colony)tile.getSettlement(), unit);
-            // FIXME: Check if next line can be removed or replaced
-            gui.setSelectedTile(tile);
             freeColClient.getSoundController()
                 .playSound("sound.event.buildingComplete");
             // Check units present for treasure cash-in as they are now

From 1728101dbd630995a85407120d49067fdb9f9af0 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 16 Jun 2015 09:20:28 +0930
Subject: [PATCH 029/323] Simplification of InfoPanel mode, BR#2867b.

---
 src/net/sf/freecol/client/gui/panel/InfoPanel.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index a30637022..d2393bee3 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -441,10 +441,7 @@ public final class InfoPanel extends FreeColPanel {
             ? InfoPanelMode.TILE
             : (unitInfoPanel.hasUnit())
             ? InfoPanelMode.UNIT
-            : ((player = getFreeColClient().getMyPlayer()) != null
-                && !player.hasNextActiveUnit())
-            ? InfoPanelMode.END
-            : InfoPanelMode.NONE;
+            : InfoPanelMode.END;
     }
 
     /**

From a81761390e3e44b9ce364a9bd59061fc5b0b1319 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 31 Jul 2015 19:02:59 +0200
Subject: [PATCH 030/323] Tentatively fix BR#2806

Partially reverts git.1728101d, which still needs reconsideration.
I think the problem was active units being available, but the
InfoPanel not having the reference to the unit updated,
but I can't verify it, as BR#2806 could never be reliably reproduced.
---
 src/net/sf/freecol/client/gui/panel/InfoPanel.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index d2393bee3..1bc5555f3 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -441,6 +441,10 @@ public final class InfoPanel extends FreeColPanel {
             ? InfoPanelMode.TILE
             : (unitInfoPanel.hasUnit())
             ? InfoPanelMode.UNIT
+            : ((player = getFreeColClient().getMyPlayer()) == null)
+            ? InfoPanelMode.NONE
+            : player.hasNextActiveUnit()
+            ? InfoPanelMode.UNIT
             : InfoPanelMode.END;
     }
 
@@ -493,6 +497,10 @@ public final class InfoPanel extends FreeColPanel {
      */
     public void update() {
         InfoPanelMode newMode = getMode();
+        if(newMode == InfoPanelMode.UNIT && !unitInfoPanel.hasUnit()) {
+            unitInfoPanel.update(
+                getFreeColClient().getMyPlayer().getNextActiveUnit());
+        }
         if (this.mode != newMode) {
             switch (this.mode = newMode) {
             case END:

From a8ec7dbd79c41dedf12e24a4e4d98ed16d75e272 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 31 Jul 2015 19:39:39 +0200
Subject: [PATCH 031/323] Revert addition of cast in git.94b94f56, which got
 unnecessary through git.f483359f

---
 .../sf/freecol/client/gui/panel/ReportCompactColonyPanel.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index 490cab07b..7ed5b806c 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -1136,7 +1136,7 @@ public final class ReportCompactColonyPanel extends ReportPanel
         } else {
             Colony colony = game.getFreeColGameObject(command, Colony.class);
             if (colony != null) {
-                ((SwingGUI)getGUI()).showColonyPanel2(colony, null)
+                getGUI().showColonyPanel2(colony, null)
                     .addClosingCallback(new Runnable() {
                             @Override
                             public void run() {

From 6df2c12b39b0532794f318d10677927bb9a207db Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 31 Jul 2015 19:48:09 +0200
Subject: [PATCH 032/323] Remove dependence of GUI on ColorChooserPanel

---
 src/net/sf/freecol/client/gui/GUI.java                   | 6 ------
 src/net/sf/freecol/client/gui/SwingGUI.java              | 1 -
 src/net/sf/freecol/client/gui/panel/ColorCellEditor.java | 4 ++--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 4432ccb0f..49f9fd311 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -24,7 +24,6 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.InputStream;
@@ -42,7 +41,6 @@ import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
 import net.sf.freecol.client.control.InGameController.*;
-import net.sf.freecol.client.gui.panel.ColorChooserPanel;
 import net.sf.freecol.client.gui.panel.LabourData.UnitData;
 import net.sf.freecol.client.gui.panel.MiniMap;
 import net.sf.freecol.client.gui.panel.Parameters;
@@ -1242,10 +1240,6 @@ public class GUI {
     public void showColopediaPanel(String nodeId) {
     }
 
-    public ColorChooserPanel showColorChooserPanel(ActionListener al) {
-        return null;
-    }
-
     public void showCompactLabourReport() {
     }
 
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index d971df40a..9651b7def 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1048,7 +1048,6 @@ public class SwingGUI extends GUI {
         canvas.showColopediaPanel(nodeId);
     }
 
-    @Override
     public ColorChooserPanel showColorChooserPanel(ActionListener al) {
         return canvas.showColorChooserPanel(al);
     }
diff --git a/src/net/sf/freecol/client/gui/panel/ColorCellEditor.java b/src/net/sf/freecol/client/gui/panel/ColorCellEditor.java
index b7bb89202..eb1e2c0f2 100644
--- a/src/net/sf/freecol/client/gui/panel/ColorCellEditor.java
+++ b/src/net/sf/freecol/client/gui/panel/ColorCellEditor.java
@@ -32,7 +32,7 @@ import javax.swing.JTable;
 import javax.swing.table.TableCellEditor;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.SwingGUI;
 
 
 /**
@@ -98,7 +98,7 @@ public final class ColorCellEditor extends AbstractCellEditor
     @Override
     public void actionPerformed(ActionEvent event) {
         final String command = event.getActionCommand();
-        GUI gui = freeColClient.getGUI();
+        SwingGUI gui = (SwingGUI)freeColClient.getGUI();
         if (null != command) switch (command) {
             case EDIT:
                 this.colorChooserPanel = gui.showColorChooserPanel(this);

From ee21593c0cdfad486b055793f4280cd53d03397d Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 31 Jul 2015 20:17:21 +0200
Subject: [PATCH 033/323] Clean up confirm methods in GUI and SwingGUI

---
 src/net/sf/freecol/client/gui/GUI.java      | 31 +++----------
 src/net/sf/freecol/client/gui/SwingGUI.java | 49 ++++++++++-----------
 2 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 49f9fd311..1e7d57fa8 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -448,48 +448,27 @@ public class GUI {
      * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param template The <code>StringTemplate</code> explaining the choice.
-     * @param obj An optional unit to make an icon for the dialog from.
+     * @param unit An optional unit to make an icon for the dialog from.
      * @param okKey A key for the "ok" button.
      * @param cancelKey A key for the "cancel" button.
      * @return True if the "ok" button was selected.
      */
     public boolean confirm(boolean modal, Tile tile,
-                           StringTemplate template, Unit obj,
+                           StringTemplate template, Unit unit,
                            String okKey, String cancelKey) {
         return false;
     }
 
-    /**
-     * General confirmation dialog.
-     *
-     * @param modal Is this a modal dialog?
-     * @param tile An optional <code>Tile</code> to expose.
-     * @param template The <code>StringTemplate</code> explaining the choice.
-     * @param icon An optional icon for the dialog.
-     * @param okKey A key for the "ok" button.
-     * @param cancelKey A key for the "cancel" button.
-     * @return True if the "ok" button was selected.
-     */
     public boolean confirm(boolean modal, Tile tile,
-                           StringTemplate template, ImageIcon icon,
-                           String okKey, String cancelKey) {
-        return false;
-    }
-
-    final public boolean confirm(boolean modal, Tile tile,
                                  StringTemplate template, Settlement settlement,
                                  String okKey, String cancelKey) {
-        return confirm(modal, tile, template,
-            new ImageIcon(imageLibrary.getSettlementImage(settlement)),
-            okKey, cancelKey);
+        return false;
     }
 
-    final public boolean confirm(boolean modal, Tile tile,
+    public boolean confirm(boolean modal, Tile tile,
                                  StringTemplate template, GoodsType goodsType,
                                  String okKey, String cancelKey) {
-        return confirm(modal, tile, template,
-            new ImageIcon(imageLibrary.getIconImage(goodsType)),
-            okKey, cancelKey);
+        return false;
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 9651b7def..a14d33101 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -734,9 +734,8 @@ public class SwingGUI extends GUI {
      */
     @Override
     public boolean confirm(String textKey, String okKey, String cancelKey) {
-        return canvas.showConfirmDialog(true, null,
-                                        Messages.message(textKey), null,
-                                        okKey, cancelKey);
+        return canvas.showConfirmDialog(true, null, Messages.message(textKey),
+            null, okKey, cancelKey);
     }
 
     /**
@@ -754,8 +753,7 @@ public class SwingGUI extends GUI {
                            StringTemplate template,
                            String okKey, String cancelKey) {
         return canvas.showConfirmDialog(modal, tile,
-                                        Utility.localizedTextArea(template),
-                                        null, okKey, cancelKey);
+            Utility.localizedTextArea(template), null, okKey, cancelKey);
     }
 
     /**
@@ -764,40 +762,39 @@ public class SwingGUI extends GUI {
      * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param template The <code>StringTemplate</code> explaining the choice.
-     * @param obj An optional unit to make an icon for the dialog from.
+     * @param unit An optional unit to make an icon for the dialog from.
      * @param okKey A key for the "ok" button.
      * @param cancelKey A key for the "cancel" button.
      * @return True if the "ok" button was selected.
      */
     @Override
     public boolean confirm(boolean modal, Tile tile,
-                           StringTemplate template, Unit obj,
+                           StringTemplate template, Unit unit,
                            String okKey, String cancelKey) {
         return canvas.showConfirmDialog(modal, tile,
-                                        Utility.localizedTextArea(template),
-                                        (obj == null) ? null : new ImageIcon(
-                                            imageLibrary.getUnitImage(obj)),
-                                        okKey, cancelKey);
+            Utility.localizedTextArea(template),
+            new ImageIcon(imageLibrary.getUnitImage(unit)),
+            okKey, cancelKey);
     }
 
-    /**
-     * General confirmation dialog.
-     *
-     * @param modal Is this a modal dialog?
-     * @param tile An optional <code>Tile</code> to expose.
-     * @param template The <code>StringTemplate</code> explaining the choice.
-     * @param icon An optional icon for the dialog.
-     * @param okKey A key for the "ok" button.
-     * @param cancelKey A key for the "cancel" button.
-     * @return True if the "ok" button was selected.
-     */
     @Override
     public boolean confirm(boolean modal, Tile tile,
-                           StringTemplate template, ImageIcon icon,
-                           String okKey, String cancelKey) {
+                                 StringTemplate template, Settlement settlement,
+                                 String okKey, String cancelKey) {
         return canvas.showConfirmDialog(modal, tile,
-                                        Utility.localizedTextArea(template),
-                                        icon, okKey, cancelKey);
+            Utility.localizedTextArea(template),
+            new ImageIcon(imageLibrary.getSettlementImage(settlement)),
+            okKey, cancelKey);
+    }
+
+    @Override
+    public boolean confirm(boolean modal, Tile tile,
+                                 StringTemplate template, GoodsType goodsType,
+                                 String okKey, String cancelKey) {
+        return canvas.showConfirmDialog(modal, tile,
+            Utility.localizedTextArea(template),
+            new ImageIcon(imageLibrary.getIconImage(goodsType)),
+            okKey, cancelKey);
     }
 
     /**

From 8f2348bbceb1576d329120654afe9011b98bc9a0 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 31 Jul 2015 20:47:21 +0200
Subject: [PATCH 034/323] Clean up getChoice methods in GUI and SwingGUI

---
 src/net/sf/freecol/client/gui/GUI.java      | 68 +++++++++------------
 src/net/sf/freecol/client/gui/SwingGUI.java | 43 +++++++++++--
 2 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 1e7d57fa8..9590d7d83 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -33,7 +33,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.filechooser.FileFilter;
 
@@ -67,6 +66,7 @@ import net.sf.freecol.common.model.IndianSettlement;
 import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.ModelMessage;
 import net.sf.freecol.common.model.Monarch.MonarchAction;
+import net.sf.freecol.common.model.Nation;
 import net.sf.freecol.common.model.NationSummary;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Region;
@@ -721,8 +721,7 @@ public class GUI {
 
         return getChoice(true, settlement.getTile(),
             Utility.localizedTextArea(settlement.getAlarmLevelLabel(player)),
-            new ImageIcon(imageLibrary.getSettlementImage(settlement)),
-            "cancel", choices);
+            settlement, "cancel", choices);
     }
 
     /**
@@ -749,8 +748,7 @@ public class GUI {
                 BoycottAction.DUMP_CARGO));
 
         return getChoice(true, null, Utility.localizedTextArea(template),
-                         new ImageIcon(imageLibrary.getIconImage(goods.getType())),
-                         "cancel", choices);
+                         goods.getType(), "cancel", choices);
     }
 
     /**
@@ -777,8 +775,7 @@ public class GUI {
                                      BuyAction.HAGGLE));
 
         return getChoice(true, unit.getTile(), Utility.localizedTextArea(template),
-                         new ImageIcon(imageLibrary.getIconImage(goods.getType())),
-                         "cancel", choices);
+                         goods.getType(), "cancel", choices);
     }
 
     /**
@@ -810,8 +807,7 @@ public class GUI {
                                      ClaimAction.STEAL));
 
         return getChoice(true, tile, Utility.localizedTextArea(template),
-                         new ImageIcon(imageLibrary.getMiscIconImage(owner.getNation())),
-                         "indianLand.cancel", choices);
+                         owner.getNation(), "indianLand.cancel", choices);
     }
 
     /**
@@ -848,9 +844,7 @@ public class GUI {
 
         return getChoice(true, settlement.getTile(),
                          Utility.localizedTextArea(template),
-                         new ImageIcon(
-                             imageLibrary.getSettlementImage(settlement)),
-                         "cancel", choices);
+                         settlement, "cancel", choices);
     }
 
     /**
@@ -890,9 +884,7 @@ public class GUI {
 
         return getChoice(true, unit.getTile(),
                          Utility.localizedTextArea(template),
-                         new ImageIcon(
-                             imageLibrary.getSettlementImage(settlement)),
-                         "cancel", choices);
+                         settlement, "cancel", choices);
     }
 
     /**
@@ -949,9 +941,7 @@ public class GUI {
 
         return getChoice(true, unit.getTile(),
                          Utility.localizedTextArea(template),
-                         new ImageIcon(
-                             imageLibrary.getSettlementImage(colony)),
-                         "cancel", choices);
+                         colony, "cancel", choices);
     }
 
     /**
@@ -1011,9 +1001,7 @@ public class GUI {
 
         return getChoice(true, settlement.getTile(),
                          Utility.localizedTextArea(template),
-                         new ImageIcon(
-                             imageLibrary.getSettlementImage(settlement)),
-                         "cancel", choices);
+                         settlement, "cancel", choices);
     }
 
     /**
@@ -1045,8 +1033,7 @@ public class GUI {
 
         return getChoice(true, unit.getTile(),
                          Utility.localizedTextArea(template),
-                         new ImageIcon(imageLibrary.getIconImage(goods.getType())),
-                         "cancel", choices);
+                         goods.getType(), "cancel", choices);
     }
 
 
@@ -1056,37 +1043,38 @@ public class GUI {
      * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param explain An object explaining the choice.
-     * @param icon An optional icon for the dialog.
      * @param cancelKey A key for the "cancel" button.
      * @param choices A list a <code>ChoiceItem</code>s to choose from.
      * @return The selected value of the selected <code>ChoiceItem</code>,
      *     or null if cancelled.
      */
     public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                           ImageIcon icon,
                            String cancelKey, List<ChoiceItem<T>> choices) {
         return null;
     }
 
-    final public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                                 String cancelKey, List<ChoiceItem<T>> choices) {
-        return getChoice(modal, tile, explain,
-            (ImageIcon)null, cancelKey, choices);
+    public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                           Unit unit,
+                           String cancelKey, List<ChoiceItem<T>> choices) {
+        return null;
     }
 
-    final public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                                 Unit unit,
-                                 String cancelKey, List<ChoiceItem<T>> choices) {
-        return getChoice(modal, tile, explain,
-            new ImageIcon(imageLibrary.getUnitImage(unit)), cancelKey, choices);
+    public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                           Settlement settlement,
+                           String cancelKey, List<ChoiceItem<T>> choices) {
+        return null;
     }
 
-    final public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                                 Settlement settlement,
-                                 String cancelKey, List<ChoiceItem<T>> choices) {
-        return getChoice(modal, tile, explain,
-            new ImageIcon(imageLibrary.getSettlementImage(settlement)),
-            cancelKey, choices);
+    public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                           GoodsType goodsType,
+                           String cancelKey, List<ChoiceItem<T>> choices) {
+        return null;
+    }
+
+    public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                           Nation nation,
+                           String cancelKey, List<ChoiceItem<T>> choices) {
+        return null;
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index a14d33101..45e0f5698 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -87,6 +87,7 @@ import net.sf.freecol.common.model.IndianSettlement;
 import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.ModelMessage;
 import net.sf.freecol.common.model.Monarch.MonarchAction;
+import net.sf.freecol.common.model.Nation;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Region;
 import net.sf.freecol.common.model.Settlement;
@@ -813,7 +814,6 @@ public class SwingGUI extends GUI {
      * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param explain An object explaining the choice.
-     * @param icon An optional icon for the dialog.
      * @param cancelKey A key for the "cancel" button.
      * @param choices A list a <code>ChoiceItem</code>s to choose from.
      * @return The selected value of the selected <code>ChoiceItem</code>,
@@ -821,10 +821,45 @@ public class SwingGUI extends GUI {
      */
     @Override
     public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                           ImageIcon icon,
                            String cancelKey, List<ChoiceItem<T>> choices) {
-        return canvas.showChoiceDialog(modal, tile, explain, icon,
-                                       cancelKey, choices);
+        return canvas.showChoiceDialog(modal, tile, explain,
+            null, cancelKey, choices);
+    }
+
+    @Override
+    public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                           Unit unit,
+                           String cancelKey, List<ChoiceItem<T>> choices) {
+        return canvas.showChoiceDialog(modal, tile, explain,
+            new ImageIcon(imageLibrary.getUnitImage(unit)),
+            cancelKey, choices);
+    }
+
+    @Override
+    public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                           Settlement settlement,
+                           String cancelKey, List<ChoiceItem<T>> choices) {
+        return canvas.showChoiceDialog(modal, tile, explain,
+            new ImageIcon(imageLibrary.getSettlementImage(settlement)),
+            cancelKey, choices);
+    }
+
+    @Override
+    public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                           GoodsType goodsType,
+                           String cancelKey, List<ChoiceItem<T>> choices) {
+        return canvas.showChoiceDialog(modal, tile, explain,
+            new ImageIcon(imageLibrary.getIconImage(goodsType)),
+            cancelKey, choices);
+    }
+
+    @Override
+    public <T> T getChoice(boolean modal, Tile tile, Object explain,
+                           Nation nation,
+                           String cancelKey, List<ChoiceItem<T>> choices) {
+        return canvas.showChoiceDialog(modal, tile, explain,
+            new ImageIcon(imageLibrary.getMiscIconImage(nation)),
+            cancelKey, choices);
     }
 
     /**

From b379aeaecb77a7e09d0f2736ab0fd95c4a814b72 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 31 Jul 2015 21:59:48 +0200
Subject: [PATCH 035/323] Remove GUI.displayObject()

---
 src/net/sf/freecol/client/gui/GUI.java                    | 3 ---
 src/net/sf/freecol/client/gui/SwingGUI.java               | 1 -
 src/net/sf/freecol/client/gui/panel/InformationPanel.java | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 9590d7d83..d7685e79c 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -1106,9 +1106,6 @@ public class GUI {
         return false;
     }
 
-    public void displayObject(FreeColObject fco) {
-    }
-
     public LoadingSavegameInfo getLoadingSavegameInfo() {
         return null;
     }
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 45e0f5698..7fb8c8104 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -914,7 +914,6 @@ public class SwingGUI extends GUI {
      *
      * @param fco The <code>FreeColObject</code> to display.
      */
-    @Override
     public void displayObject(FreeColObject fco) {
         if (fco instanceof Colony) {
             canvas.showColonyPanel((Colony)fco, null);
diff --git a/src/net/sf/freecol/client/gui/panel/InformationPanel.java b/src/net/sf/freecol/client/gui/panel/InformationPanel.java
index 075869f74..0c4c64593 100644
--- a/src/net/sf/freecol/client/gui/panel/InformationPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InformationPanel.java
@@ -33,7 +33,7 @@ import javax.swing.JScrollPane;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.model.FreeColObject;
 import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.StringTemplate;
@@ -75,7 +75,7 @@ public class InformationPanel extends FreeColPanel {
         super(freeColClient, new MigLayout("wrap 1, insets 200 10 10 10",
                 "[510]", "[242]20[20]"));
 
-        final GUI gui = getGUI();
+        final SwingGUI gui = getGUI();
         JPanel textPanel = new MigPanel();
         textPanel.setOpaque(false);
         textPanel.setLayout(new MigLayout("wrap 2", "", "top"));

From 16b2aa31e7be08ea51435ba405d8cabcc0cc76ca Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 1 Aug 2015 13:01:39 +0930
Subject: [PATCH 036/323] Add link for the manual to AboutPanel.

---
 data/strings/FreeColMessages.properties       | 68 ++++++-------------
 .../freecol/client/gui/panel/AboutPanel.java  | 15 +++-
 2 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 8389c0ec7..13d580990 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -131,7 +131,6 @@ cargoOnCarrier=Cargo on carrier
 cashInTreasureTrain=Cash in treasure train
 clearOrders=Clear orders
 colonists=Colonists
-colonyCenter=colony center
 colopedia=Colopedia
 difficulty=Difficulty
 docks=Docks
@@ -217,7 +216,6 @@ cli.error.home.notDir=%string% is not a directory.
 cli.error.home.notExists=Directory %string% does not exist.
 cli.error.save=Can not read saved game %string%.
 cli.error.serverPort=%string% is not a valid port number.
-cli.error.splash=Splash file %name% not found.
 cli.error.timeout=%string% is too short (less than %minimum%).
 
 cli.advantages=set the type of ADVANTAGES (%advantages%)
@@ -247,7 +245,6 @@ cli.no-intro=skip the intro video
 cli.no-java-check=skip the java version check
 cli.no-memory-check=skip the memory check
 cli.no-sound=run FreeCol without sound
-cli.no-splash=skip the splash screen
 cli.private=start a private server (not published to the metaserver)
 cli.seed=provide a SEED for the pseudo-random number generator
 cli.server-name=specify a custom NAME for the server
@@ -1805,7 +1802,7 @@ model.improvement.road.occupationString=R
 
 # Limits
 model.limit.independence.coastalColonies.name=Coastal Colony Limit
-model.limit.independence.coastalColonies.description=You need at least %limit% coastal {{plural:%limit%|one=colony|other=colonies}} in order to declare independence.
+model.limit.independence.coastalColonies.description=You need at least %limit% coastal colonies in order to declare independence.
 model.limit.independence.rebels.name=Rebel Limit
 model.limit.independence.rebels.description=At least %limit%% of your colonists must support independence.
 model.limit.independence.year.name=Year Limit
@@ -2222,7 +2219,7 @@ model.colony.badGovernment=The government of %colony% is inefficient. Production
 model.colony.goodGovernment=Government efficiency has improved! Rebel sentiment in %colony% now equals or exceeds %number% percent.
 model.colony.governmentImproved1=The government of %colony% has improved, but is still inefficient. Production penalties still apply.
 model.colony.governmentImproved2=The government of %colony% has improved. Production penalties no longer apply.
-model.colony.insufficientProduction=%outputAmount% more %outputType% could be produced in %colony%, if an extra %consumptionDeficit% were available.
+model.colony.insufficientProduction=%outputAmount% more %outputType% could be produced in %colony%, if only we had %inputAmount% more %inputType% surplus.
 model.colony.lostGoodGovernment=Government efficiency has decreased! Rebel sentiment in %colony% no longer equals or exceeds %number% percent. Colony no longer gains any production bonus.
 model.colony.lostVeryGoodGovernment=Government efficiency has decreased! Rebel sentiment in %colony% no longer equals or exceeds %number% percent. Some production bonuses were lost.
 model.colony.minimumColonySize=%object% prevents reducing the population any further.
@@ -2529,7 +2526,6 @@ model.colony.colonyStarved=The last colonist in %colony% has starved, leaving th
 model.colony.customs.sale=The Customs House at %colony% sold: %data%.
 model.colony.customs.saleData=%amount% %goods% for %gold%
 model.colony.famineFeared=Famine feared in %colony%. Only %number% turns of food left.
-model.colony.starving=%colony% is starving.
 model.colony.newColonist=New colonist in %colony%.
 model.colony.newConvert=A new %nation% convert has arrived in %colony%.
 model.colony.notBuildingAnything=Nothing is being built in %colony%.
@@ -3037,60 +3033,40 @@ report.labour.workingAsOther=other
 # ReportColonyPanel
 # reuses colonyPanel.currentlyBuilding
 report.colony.arriving.description=%colony%: new %unit% {{plural:%turns%|one=next turn|other=in %turns% turns}}
-report.colony.arriving.summary.description=The average number of turns before a new colonist arrives in the colonies of this continent
 report.colony.birth.description=Number of turns until a new colonist arrives or starves
 report.colony.explore.description=Number of tiles to Explore adjacent to this colony
 report.colony.explore.header=E
 report.colony.exploring.description=%colony% would benefit from exploring {{plural:%amount%|one=one tile|other=%amount% tiles}}
-report.colony.exploring.summary.description=Total number of colony tiles that would benefit from exploring for this continent.
 report.colony.grow.description=Number of units the colony can grow by without harming production
 report.colony.grow.header=+
 report.colony.growing.description=%colony% can grow by {{plural:%amount%|one=one unit|other=%amount% units}} without harming production
-report.colony.growing.summary.description=The total number of colonists that can join colonies of this continent without harming production
 report.colony.improve.description=Units that could improve production.
 report.colony.improve.header=Improve
-report.colony.improving.description=%colony% %location%: To make %amount% more %goods%, replace %oldUnit% with %unit%
-report.colony.improving.summary.description=Units (type and count) that would benefit colonies of this continent
+report.colony.improving.description=%colony%: To make %amount% more %goods%, replace %oldUnit% with %unit%
+report.colony.wanting.description=%colony%: To make %amount% more %goods%, add %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% needed for %buildable% {{plural:%turns%|one=next turn|other=in %turns% turns}}
 report.colony.making.constructing.description=%colony%: %buildable% completes {{plural:%turns%|one=next turn|other=in %turns% turns}}
 report.colony.making.description=What this colony is making
 report.colony.making.educating.description=%colony%: %teacher% graduates {{plural:%turns%|one=next turn|other=in %turns% turns}}
-report.colony.making.educationVacancy.description=%colony%: {{plural:%number%|one=one student place is|other=%number% student places are}} vacant
-report.colony.making.educating.summary.description=Units (type and count) expected to graduate from schools of this continent
 report.colony.making.header=Making
 report.colony.making.noconstruction.description=%colony%: No construction occurring
 report.colony.making.noteach.description=%colony%: %teacher% lacks a student
-report.colony.making.summary.description=The per turn %goods% deficit due to the unsatisfied building requirements of this continent
 report.colony.name.description=The list of colonies
 report.colony.name.header=Colony
-report.colony.name.summary.description=The region containing more of the above colonies of this continent
-report.colony.production.description=%colony%: %amount% %goods% are being produced
-report.colony.production.export.description=%colony%: %amount% %goods% are being produced (exporting above %export%)
+report.colony.plow.description=Number of colony tiles that would benefit from Plowing
+report.colony.plow.header=P
+report.colony.plowing.description=%colony% would benefit from plowing {{plural:%amount%|one=one tile|other=%amount% tiles}}
+report.colony.production.description=%colony%: net %goods% production = %amount%
+report.colony.production.export.description=%colony%: net %goods% production is %amount% (exporting above %export%)
 report.colony.production.header=Net %goods% production
-report.colony.production.high.description=%colony%: %amount% %goods% are being produced, full {{plural:%turns%|one=next turn|other=in %turns% turns}}
-report.colony.production.low.description=%colony%: %amount% %goods% are being consumed, gone {{plural:%turns%|one=next turn|other=in %turns% turns}}
-report.colony.production.maxConsumption.description=%colony%: %amount% %goods% are being consumed (could consume %more% more)
-report.colony.production.maxProduction.description=%colony%: %amount% %goods% are being produced (could produce %more% more)
-report.colony.production.summary.description=The amount of goods being produced or consumed
-report.colony.production.waste.description=%colony%: %amount% %goods% are being produced, warehouse will overflow, %waste% will be wasted
-report.colony.tile.clearForest.description=%colony% would benefit from clearing {{plural:%amount%|one=one tile|other=%amount% tiles}}
-report.colony.tile.clearForest.specific.description=%colony% would benefit from clearing %location%
-report.colony.tile.clearForest.header=C
-report.colony.tile.clearForest.header.description=Number of colony tiles that would benefit from clearing.
-report.colony.tile.clearForest.summary.description=Total number of colony tiles that would benefit from clearing for this continent.
-report.colony.tile.plow.description=%colony% would benefit from plowing {{plural:%amount%|one=one tile|other=%amount% tiles}}
-report.colony.tile.plow.specific.description=%colony% would benefit from plowing %location%
-report.colony.tile.plow.header=P
-report.colony.tile.plow.header.description=Number of colony tiles that would benefit from plowing.
-report.colony.tile.plow.summary.description=Total number of colony tiles that would benefit from plowing for this continent.
-report.colony.tile.road.description=%colony% would benefit from building {{plural:%amount%|one=a road|other=%amount% roads}}
-report.colony.tile.road.specific.description=%colony% would benefit from building a road at %location%
-report.colony.tile.road.header=R
-report.colony.tile.road.header.description=Number of colony tiles that would benefit from road building.
-report.colony.tile.road.summary.description=Total number of colony tiles that would benefit from road building for this continent.
+report.colony.production.high.description=%colony%: net %goods% production = %amount%, full {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.production.low.description=%colony%: net %goods% production = %amount%, gone {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.production.waste.description=%colony%: net %goods% production = %amount%, warehouse will overflow, %waste% will be wasted
+report.colony.road.description=Number of colony tiles that would benefit from Road building
+report.colony.road.header=R
+report.colony.roadBuilding.description=%colony% would benefit from building {{plural:%amount%|one=a road|other=%amount% roads}}
 report.colony.shrinking.description=%colony% must shrink by {{plural:%amount%|one=one unit|other=%amount% units}} to improve production
 report.colony.starving.description=%colony%: starvation {{plural:%turns%|one=next turn|other=in %turns% turns}}
-report.colony.wanting.description=%colony% %location%: To make %amount% more %goods%, add %unit%
 
 # ReportContinentalCongressPanel
 report.continentalCongress.available=Available
@@ -3163,15 +3139,15 @@ report.production.update=Update
 # ReportRequirementsPanel
 report.requirements.badAssignment=%colony% has a %expert% currently working as %expertWork%, while a %nonExpert% is working as %nonExpertWork%. Production would be greater if the colonists swapped jobs.
 report.requirements.canTrainExperts={{plural:2|%unit%}} can be trained at
-report.requirements.exploreTile=%location% would benefit from exploration.
+report.requirements.clearTile=%type% to the %direction% of %colony% would benefit from clearing.
+report.requirements.exploreTile=%type% to the %direction% of %colony% would benefit from exploration.
 report.requirements.met=All requirements are met.
 report.requirements.missingGoods=%colony% is producing %goods%, but requires more %input%.
 report.requirements.misusedExperts=There are {{plural:2|%unit%}} not working as %work% present at
 report.requirements.noExpert=%colony% is producing %goods%, but has no %unit%.
-report.requirements.tile.clearForest=%location% would benefit from clearing.
-report.requirements.tile.plow=%location% would benefit from plowing.
-report.requirements.tile.road=%location% would benefit from road building.
-#report.requirements.tile.road.center can not happen
+report.requirements.plowCenter=%colony% would benefit from plowing its tile.
+report.requirements.plowTile=%type% to the %direction% of %colony% would benefit from plowing.
+report.requirements.roadTile=%type% to the %direction% of %colony% would benefit from road building.
 report.requirements.severalExperts=Several {{plural:2|%unit%}} are present at
 report.requirements.surplus=A surplus of %goods% is being produced at
 
@@ -3179,8 +3155,7 @@ report.requirements.surplus=A surplus of %goods% is being produced at
 report.trade.afterTaxes=Income after taxes
 report.trade.beforeTaxes=Income before taxes
 report.trade.cargoUnits=Units in Cargo
-report.trade.export=Exporting %goods% above %amount%
-report.trade.hasCustomHouse=* This colony has a custom house, and may export goods.
+report.trade.hasCustomHouse=* This colony has a custom house; these goods are exported.
 report.trade.totalDelta=Total Production
 report.trade.totalUnits=Total Units
 report.trade.unitsSold=Units bought or sold
@@ -3196,6 +3171,7 @@ report.turn.playerNation=%player%'s %nation%
 # AboutPanel
 aboutPanel.copyright=Copyright © 2002-2015 The FreeCol Team
 aboutPanel.legalDisclaimer=FreeCol 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, either version 2 of the License, or any later version.
+aboutPanel.manual=FreeCol Manual Download
 aboutPanel.officialSite=Official site:
 aboutPanel.sfProject=SourceForge project:
 aboutPanel.version=Version:
diff --git a/src/net/sf/freecol/client/gui/panel/AboutPanel.java b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
index 16206315a..8e1f79f16 100644
--- a/src/net/sf/freecol/client/gui/panel/AboutPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
@@ -72,13 +72,15 @@ import net.sf.freecol.common.resources.ResourceManager;
  */
 public final class AboutPanel extends FreeColPanel {
 
-    private static final Logger logger = Logger
-            .getLogger(AboutPanel.class.getName());
+    private static final Logger logger = Logger.getLogger(AboutPanel.class.getName());
 
     public static final String SITE_URL
         = "http://www.freecol.org";
     public static final String PROJECT_URL
         = "http://sourceforge.net/projects/freecol/";
+    private static final String MANUAL_URL
+        = "http://www.freecol.org/documentation/freecol-user-manual.html";
+
 
     /**
      * The constructor that will add the items to this panel.
@@ -131,6 +133,15 @@ public final class AboutPanel extends FreeColPanel {
         apProjectURL.setFont(fontNormal);
         add(apProjectURL, "newline");
 
+        // Manual
+        JLabel apManual = Utility.localizedLabel("aboutPanel.manual");
+        apManual.setFont(fontBold);
+        add(apManual, "newline 10");
+        JButton apManualURL = Utility.getLinkButton(MANUAL_URL, null,
+                                                    MANUAL_URL);
+        apManualURL.addActionListener(this);
+        add(apManualURL, "newline");
+        
         // License Disclaimer
         JTextArea apLegal
             = Utility.localizedTextArea("aboutPanel.legalDisclaimer");

From 62073e9c8e38c6c9331d66110e8947fe98987dfb Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 1 Aug 2015 19:34:36 +0930
Subject: [PATCH 037/323] Make sure IR#164 is fixed.

---
 src/net/sf/freecol/client/FreeColClient.java             | 9 ++++++---
 src/net/sf/freecol/client/control/InGameController.java  | 2 +-
 src/net/sf/freecol/client/gui/action/NewAction.java      | 2 +-
 src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/client/FreeColClient.java b/src/net/sf/freecol/client/FreeColClient.java
index bd216212f..2f39342be 100644
--- a/src/net/sf/freecol/client/FreeColClient.java
+++ b/src/net/sf/freecol/client/FreeColClient.java
@@ -734,14 +734,17 @@ public final class FreeColClient {
      *
      * When the game is clear, show the new game panel.
      *
-     * Called from the New action, often from the button on the MainPanel.
+     * Called from the New action, often from the button on the MainPanel,
+     * and IGC.victory()
+     *
+     * @param prompt If true, prompt to confirm stopping the game.
      */
-    public void newGame() {
+    public void newGame(boolean prompt) {
         Specification specification = null;
         if (getGame() != null) {
             if (isMapEditor()) {
                 specification = getGame().getSpecification();
-            } else if (gui.confirmStopGame()) {
+            } else if (!prompt || gui.confirmStopGame()) {
                 getConnectController().quitGame(true);
                 FreeColSeed.incrementFreeColSeed();
             } else {
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 403eebb1f..580c0f629 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -4661,7 +4661,7 @@ public final class InGameController implements NetworkConstants {
      */
     public boolean victory(Boolean quit) {
         if (quit) {
-            freeColClient.quit();
+            freeColClient.newGame(false);
         } else {
             askServer().continuePlaying();
         }
diff --git a/src/net/sf/freecol/client/gui/action/NewAction.java b/src/net/sf/freecol/client/gui/action/NewAction.java
index baa8fdccb..7b011d965 100644
--- a/src/net/sf/freecol/client/gui/action/NewAction.java
+++ b/src/net/sf/freecol/client/gui/action/NewAction.java
@@ -52,7 +52,7 @@ public class NewAction extends FreeColAction {
         if (freeColClient.isMapEditor()) {
             freeColClient.getMapEditorController().newMap();
         } else {
-            freeColClient.newGame();
+            freeColClient.newGame(true);
         }
     }
 }
diff --git a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
index 70c7395e2..eb0885e8d 100644
--- a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
@@ -117,7 +117,7 @@ public class MapEditorMenuBar extends FreeColMenuBar {
                     try {
                         options.save(mapOptionsFile);
                     } catch (FileNotFoundException fnfe) {}
-                    freeColClient.newGame();
+                    freeColClient.newGame(true);
                 }
             });
         menu.add(playItem);

From c4786ac94955458f0b13be3aa1bb674fe66b724e Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 1 Aug 2015 20:40:13 +0930
Subject: [PATCH 038/323] Portuguese mountain order, IR#180.

---
 data/strings/FreeColMessages.properties | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 13d580990..b8bc97b81 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -4796,16 +4796,16 @@ model.nation.portuguese.region.river.22=São Francisco
 model.nation.portuguese.region.river.23=Parnaíba
 model.nation.portuguese.region.river.24=Tietê
 
-model.nation.portuguese.region.mountain.1=Serra da Estrela
-model.nation.portuguese.region.mountain.2=Serra do Morião
-model.nation.portuguese.region.mountain.3=Serra de Santa Bárbara
-model.nation.portuguese.region.mountain.4=Serra da Ribeirinha
-model.nation.portuguese.region.mountain.5=Serra da Boa Viagem
-model.nation.portuguese.region.mountain.6=Serra da Marofa
-model.nation.portuguese.region.mountain.7=Serra do Bussaco
-model.nation.portuguese.region.mountain.8=Serra da Coroa
-model.nation.portuguese.region.mountain.9=Serra de Sintra
-model.nation.portuguese.region.mountain.10=Monte Pascoal
+model.nation.portuguese.region.mountain.1=Monte Pascoal
+model.nation.portuguese.region.mountain.2=Serra da Estrela
+model.nation.portuguese.region.mountain.3=Serra do Morião
+model.nation.portuguese.region.mountain.4=Serra de Santa Bárbara
+model.nation.portuguese.region.mountain.5=Serra da Ribeirinha
+model.nation.portuguese.region.mountain.6=Serra da Boa Viagem
+model.nation.portuguese.region.mountain.7=Serra da Marofa
+model.nation.portuguese.region.mountain.8=Serra do Bussaco
+model.nation.portuguese.region.mountain.9=Serra da Coroa
+model.nation.portuguese.region.mountain.10=Serra de Sintra
 model.nation.portuguese.region.mountain.11=Serra Geral
 model.nation.portuguese.region.mountain.12=Serra do Mar
 model.nation.portuguese.region.mountain.13=Serra Vermelha

From 56ecbac7f74100a9acc73f48a0dced6ee9d45d1f Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 2 Aug 2015 10:49:47 +0930
Subject: [PATCH 039/323] Fix region generation, BR#2885.

---
 .../server/generator/TerrainGenerator.java    | 277 +++++++++---------
 1 file changed, 134 insertions(+), 143 deletions(-)

diff --git a/src/net/sf/freecol/server/generator/TerrainGenerator.java b/src/net/sf/freecol/server/generator/TerrainGenerator.java
index 53dafb4fe..1c8f2952a 100644
--- a/src/net/sf/freecol/server/generator/TerrainGenerator.java
+++ b/src/net/sf/freecol/server/generator/TerrainGenerator.java
@@ -20,6 +20,7 @@
 package net.sf.freecol.server.generator;
 
 import java.awt.Rectangle;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -124,26 +125,6 @@ public class TerrainGenerator {
             / 100;
     }
 
-    /**
-     * Set a parent region from the geographic regions now we
-     * know where each region is.
-     *
-     * @param sr The <code>ServerRegion</code> to find a parent for.
-     * @param geographicRegions A list of all the geographic
-     *     <code>ServerRegion</code>s.
-     */
-    private void setGeographicRegion(ServerRegion sr,
-                                     List<ServerRegion> geographicRegions) {
-        for (ServerRegion gr : geographicRegions) {
-            if (gr.containsCenter(sr)) {
-                sr.setParent(gr);
-                gr.addChild(sr);
-                gr.setSize(gr.getSize() + sr.getSize());
-                break;
-            }
-        }
-    }
-
     /**
      * Creates a random tile for the specified position.
      *
@@ -354,12 +335,10 @@ public class TerrainGenerator {
      * landmass is created.
      *
      * @param map The <code>Map</code> to work on.
-     * @param geographicRegions A list of all the geographic
-     *     <code>ServerRegion</code>s.
      * @param lb A <code>LogBuilder</code> to log to.
+     * @return A list of created <code>ServerRegion</code>s.
      */
-    private void createLandRegions(Map map,
-        List<ServerRegion> geographicRegions, LogBuilder lb) {
+    private List<ServerRegion> createLandRegions(Map map, LogBuilder lb) {
         // Create "explorable" land regions
         int continents = 0;
         boolean[][] landmap = new boolean[map.getWidth()][map.getHeight()];
@@ -482,13 +461,48 @@ public class TerrainGenerator {
                                        * LAND_REGIONS_SCORE_VALUE),
                                  LAND_REGION_MIN_SCORE);
             sr.setScoreValue(score);
-            setGeographicRegion(sr, geographicRegions);
             lb.add("Created land region ", sr.toString(),
                 " (size ", sr.getSize(),
                 ", score ", sr.getScoreValue(),
                 ", parent ", ((sr.getParent() == null) ? "(null)"
                     : sr.getParent().toString()), ")\n");
         }
+        return Arrays.asList(Arrays.copyOfRange(landregions, 1, continents+1));
+    }
+
+    /**
+     * Pick a good tile to put elevated terrain on.
+     *
+     * @param map A <code>Map</code> to choose from.
+     * @return A suitable <code>Tile</code>, or null if none found.
+     */
+    private Tile getGoodMountainTile(Map map) {
+        final TileType hills = spec.getTileType("model.tile.hills");
+        final TileType mountains = spec.getTileType("model.tile.mountains");
+        Tile t = null;
+        nextTry: for (;;) {
+            if ((t = map.getRandomLandTile(random)) == null) break;
+            
+            if (t.getType() == hills || t.getType() == mountains) {
+                continue; // Already on high ground
+            }
+
+            // Do not add hills too close to a mountain range
+            // this would defeat the purpose of adding random hills.
+            for (Tile tile : t.getSurroundingTiles(3)) {
+                if (tile.getType() == mountains) continue nextTry;
+            }
+
+            // Do not add hills too close to the ocean/lake this
+            // helps with good locations for building colonies on
+            // shore.
+            for (Tile tile : t.getSurroundingTiles(1)) {
+                if (!tile.isLand()) continue nextTry;
+            }
+
+            break; // OK, good tile found.
+        }
+        return t;
     }
 
     /**
@@ -496,12 +510,11 @@ public class TerrainGenerator {
      * of mountain ranges depends on the map size.
      *
      * @param map The map to use.
-     * @param geographicRegions A list of all the geographic
-     *     <code>ServerRegion</code>s.
      * @param lb A <code>LogBuilder</code> to log to.
+     * @return A list of created <code>ServerRegion</code>s.
      */
-    private void createMountains(Map map, List<ServerRegion> geographicRegions,
-                                 LogBuilder lb) {
+    private List<ServerRegion> createMountains(Map map, LogBuilder lb) {
+        List<ServerRegion> result = new ArrayList<>();
         float randomHillsRatio = 0.5f;
         // 50% of user settings will be allocated for random hills
         // here and there the rest will be allocated for large
@@ -516,70 +529,54 @@ public class TerrainGenerator {
             "Maximum length of mountain ranges is ", maximumLength, "\n");
 
         // lookup the resources from specification
-        TileType hills = spec.getTileType("model.tile.hills");
-        TileType mountains = spec.getTileType("model.tile.mountains");
+        final TileType hills = spec.getTileType("model.tile.hills");
+        final TileType mountains = spec.getTileType("model.tile.mountains");
         if (hills == null || mountains == null) {
             throw new RuntimeException("Both Hills and Mountains TileTypes must be defined");
         }
 
         // Generate the mountain ranges
         int counter = 0;
-        nextTry: for (int tries = 0; tries < 100; tries++) {
-            if (counter < number) {
-                Tile startTile = map.getRandomLandTile(random);
-                if (startTile == null) return; // No land found!
+        for (int tries = 0; tries < 100; tries++) {
+            Tile startTile = getGoodMountainTile(map);
+            if (startTile == null) break;
 
-                if (startTile.getType() == hills
-                    || startTile.getType() == mountains) {
-                    // already a high ground
-                    continue;
-                }
-
-                // do not start a mountain range too close to another
-                for (Tile t : startTile.getSurroundingTiles(3)) {
-                    if (t.getType() == mountains) continue nextTry;
-                }
-
-                // Do not add a mountain range too close to the
-                // ocean/lake this helps with good locations for
-                // building colonies on shore
-                for (Tile t : startTile.getSurroundingTiles(2)) {
-                    if (!t.isLand()) continue nextTry;
-                }
-
-                ServerRegion mountainRegion = new ServerRegion(game, RegionType.MOUNTAIN);
-                Direction direction = Direction.getRandomDirection("getLand",
-                    logger, random);
-                int length = maximumLength
-                    - randomInt(logger, "MLen", random, maximumLength/2);
-                for (int index = 0; index < length; index++) {
-                    Tile nextTile = startTile.getNeighbourOrNull(direction);
-                    if (nextTile == null || !nextTile.isLand()) continue;
-                    nextTile.setType(mountains);
-                    mountainRegion.addTile(nextTile);
-                    counter++;
-                    for (Tile neighbour : nextTile.getSurroundingTiles(1)) {
-                        if (!neighbour.isLand()
-                            || neighbour.getType() == mountains) continue;
-                        int r = randomInt(logger, "MSiz", random, 8);
-                        if (r == 0) {
-                            neighbour.setType(mountains);
-                            mountainRegion.addTile(neighbour);
-                            counter++;
-                        } else if (r > 2) {
-                            neighbour.setType(hills);
-                            mountainRegion.addTile(neighbour);
-                        }
+            ServerRegion mountainRegion
+                = new ServerRegion(game, RegionType.MOUNTAIN);
+            startTile.setType(mountains);
+            mountainRegion.addTile(startTile);
+            Direction direction = Direction.getRandomDirection("getLand",
+                logger, random);
+            int length = maximumLength
+                - randomInt(logger, "MLen", random, maximumLength/2);
+            for (int index = 0; index < length; index++) {
+                Tile nextTile = startTile.getNeighbourOrNull(direction);
+                if (nextTile == null || !nextTile.isLand()) continue;
+                nextTile.setType(mountains);
+                mountainRegion.addTile(nextTile);
+                counter++;
+                for (Tile neighbour : nextTile.getSurroundingTiles(1)) {
+                    if (!neighbour.isLand()
+                        || neighbour.getType() == mountains) continue;
+                    int r = randomInt(logger, "MSiz", random, 8);
+                    if (r == 0) {
+                        neighbour.setType(mountains);
+                        mountainRegion.addTile(neighbour);
+                        counter++;
+                    } else if (r > 2) {
+                        neighbour.setType(hills);
+                        mountainRegion.addTile(neighbour);
                     }
                 }
-                int scoreValue = 2 * mountainRegion.getSize();
-                mountainRegion.setScoreValue(scoreValue);
-                setGeographicRegion(mountainRegion, geographicRegions);
-                lb.add("Created mountain region (direction ", direction,
-                    ", length ", length,
-                    ", size ", mountainRegion.getSize(),
-                    ", score value ", scoreValue, ").\n");
             }
+            int scoreValue = 2 * mountainRegion.getSize();
+            mountainRegion.setScoreValue(scoreValue);
+            result.add(mountainRegion);
+            lb.add("Created mountain region (direction ", direction,
+                ", length ", length,
+                ", size ", mountainRegion.getSize(),
+                ", score value ", scoreValue, ").\n");
+            if (counter >= number) break;
         }
         lb.add("Added ", counter, " mountain range tiles.\n");
 
@@ -587,35 +584,17 @@ public class TerrainGenerator {
         number = (int) (getApproximateLandCount() * randomHillsRatio)
             / mapOptions.getInteger(MapGeneratorOptions.MOUNTAIN_NUMBER);
         counter = 0;
-        nextTry: for (int tries = 0; tries < 1000; tries++) {
-            if (counter < number) {
-                Tile t = map.getRandomLandTile(random);
-                if (t == null) return;
+        for (int tries = 0; tries < 1000; tries++) {
+            Tile t = getGoodMountainTile(map);
+            if (t == null) break;
 
-                if (t.getType() == hills || t.getType() == mountains) {
-                    continue; // Already on high ground
-                }
-
-                // Do not add hills too close to a mountain range
-                // this would defeat the purpose of adding random hills.
-                for (Tile tile : t.getSurroundingTiles(3)) {
-                    if (tile.getType() == mountains) continue nextTry;
-                }
-
-                // Do not add hills too close to the ocean/lake this
-                // helps with good locations for building colonies on
-                // shore.
-                for (Tile tile : t.getSurroundingTiles(1)) {
-                    if (!tile.isLand()) continue nextTry;
-                }
-
-                // 25% mountains, 75% hills
-                boolean m = randomInt(logger, "MorH", random, 4) == 0;
-                t.setType((m) ? mountains : hills);
-                counter++;
-            }
+            // 25% mountains, 75% hills
+            boolean m = randomInt(logger, "MorH", random, 4) == 0;
+            t.setType((m) ? mountains : hills);
+            if (++counter >= number) break;
         }
-        lb.add("Added ", counter, " random hills tiles.\n");
+        lb.add("Added ", counter, " random hilly tiles.\n");
+        return result;
     }
 
     /**
@@ -623,12 +602,11 @@ public class TerrainGenerator {
      * on the map size.
      *
      * @param map The <code>Map</code> to create rivers on.
-     * @param geographicRegions A list of all the geographic
-     *     <code>ServerRegion</code>s.
      * @param lb A <code>LogBuilder</code> to log to.
+     * @return A list of created <code>ServerRegion</code>s.
      */
-    private void createRivers(Map map, List<ServerRegion> geographicRegions,
-                              LogBuilder lb) {
+    private List<ServerRegion> createRivers(Map map, LogBuilder lb) {
+        List<ServerRegion> result = new ArrayList<>();
         final TileImprovementType riverType
             = spec.getTileImprovementType("model.improvement.river");
         final int number = getApproximateLandCount()
@@ -637,18 +615,16 @@ public class TerrainGenerator {
         HashMap<Tile, River> riverMap = new HashMap<>();
         List<River> rivers = new ArrayList<>();
 
-        for (int i = 0; i < number; i++) {
-            nextTry: for (int tries = 0; tries < 100; tries++) {
+        outer: for (int i = 0; i < number; i++) {
+            for (int tries = 0; tries < 100; tries++) {
                 Tile tile = map.getRandomLandTile(random);
-                if (tile == null) return;
+                if (tile == null) break outer;
 
                 if (!riverType.isTileTypeAllowed(tile.getType())) continue;
 
                 // check the river source/spring is not too close to the ocean
                 for (Tile neighborTile : tile.getSurroundingTiles(2)) {
-                    if (!neighborTile.isLand()) {
-                        continue nextTry;
-                    }
+                    if (!neighborTile.isLand()) continue;
                 }
                 if (riverMap.get(tile) == null) {
                     // no river here yet
@@ -657,9 +633,9 @@ public class TerrainGenerator {
                     if (river.flowFromSource(tile)) {
                         lb.add("Created new river with length ",
                             river.getLength(), "\n");
-                        map.addRegion(riverRegion);
+                        result.add(riverRegion);
                         rivers.add(river);
-                        counter++;
+                        if (++counter >= number) break;
                     } else {
                         lb.add("Failed to generate river.\n");
                     }
@@ -677,22 +653,20 @@ public class TerrainGenerator {
             }
             scoreValue *= 2;
             region.setScoreValue(scoreValue);
-            setGeographicRegion(region, geographicRegions);
             lb.add("Created river region (length ", river.getLength(),
                 ", score value ", scoreValue, ").\n");
         }
+        return result;
     }
 
     /**
      * Finds all the lake regions.
      *
      * @param map The <code>Map</code> to work on.
-     * @param geographicRegions A list of all the geographic
-     *     <code>ServerRegion</code>s.
      * @param lb A <code>LogBuilder</code> to log to.
+     * @return A list of created <code>ServerRegion</code>s.
      */
-    private void createLakeRegions(Map map,
-        List<ServerRegion> geographicRegions, LogBuilder lb) {
+    private List<ServerRegion> createLakeRegions(Map map, LogBuilder lb) {
         final TileType lakeType = spec.getTileType("model.tile.lake");
 
         // Create the water map, and find any tiles that are water but
@@ -711,13 +685,11 @@ public class TerrainGenerator {
                 }
             }
         }
-        for (ServerRegion sr : makeLakes(map, lakes)) {
-            setGeographicRegion(sr, geographicRegions);
-        }            
         lb.add("\n");
+        
+        return makeLakes(map, lakes);
     }
 
-
     /**
      * Make lake regions from unassigned lake tiles.
      *
@@ -989,31 +961,49 @@ public class TerrainGenerator {
             }
         }
         game.setMap(map);
-        List<ServerRegion> fixed = ServerRegion.requireFixedRegions(map, lb);
-        List<ServerRegion> geographic = new ArrayList<>();
-        for (ServerRegion sr : fixed) {
-            if (sr.isGeographic()) geographic.add(sr);
-        }
 
+        // Build the regions.
+        List<ServerRegion> fixed = ServerRegion.requireFixedRegions(map, lb);
+        List<ServerRegion> newRegions = new ArrayList<>();
         if (importTerrain) {
             if (!fixRegions.isEmpty()) { // Fix the tiles missing regions.
-                createLakeRegions(map, geographic, lb);
-                createLandRegions(map, geographic, lb);
+                newRegions.addAll(createLakeRegions(map, lb));
+                newRegions.addAll(createLandRegions(map, lb));
             }
         } else {
             map.resetHighSeas(
                 mapOptions.getInteger(MapGeneratorOptions.DISTANCE_TO_HIGH_SEA),
                 mapOptions.getInteger(MapGeneratorOptions.MAXIMUM_DISTANCE_TO_EDGE));
             if (mapHasLand) {
-                createMountains(map, geographic, lb);
-                createRivers(map, geographic, lb);
-                createLakeRegions(map, geographic, lb);
-                createLandRegions(map, geographic, lb);
+                newRegions.addAll(createMountains(map, lb));
+                newRegions.addAll(createRivers(map, lb));
+                newRegions.addAll(createLakeRegions(map, lb));
+                newRegions.addAll(createLandRegions(map, lb));
             }
         }
-        map.fixupRegions();
         lb.shrink("\n");
 
+        // Connect all new regions to their geographic parent and add to
+        // the map.
+        List<ServerRegion> geographic = new ArrayList<>();
+        for (ServerRegion sr : fixed) {
+            if (sr.isGeographic()) geographic.add(sr);
+        }
+        for (ServerRegion sr : newRegions) {
+            for (ServerRegion gr : geographic) {
+                if (gr.containsCenter(sr)) {
+                    sr.setParent(gr);
+                    gr.addChild(sr);
+                    gr.setSize(gr.getSize() + sr.getSize());
+                    break;
+                }
+            }
+            map.addRegion(sr);
+        }
+
+        // Probably only needed on import of old maps.
+        map.fixupRegions();
+
         // Add the bonuses only after the map is completed.
         // Otherwise we risk creating resources on fields where they
         // do not belong (like sugar in large rivers or tobacco on hills).
@@ -1024,6 +1014,7 @@ public class TerrainGenerator {
             }
         }
 
+        // Final cleanups
         map.resetContiguity();
         map.resetHighSeasCount();
         return map;

From 9f0b19cbf91a6c29cbe4e69b35dff7347e4e100c Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 2 Aug 2015 11:36:56 +0930
Subject: [PATCH 040/323] Withdraw 0.11.4 on website.

---
 www.freecol.org/download.html                 | 48 +++++++++----------
 .../news/freecol-0.11.4-released.html         | 21 ++------
 www.freecol.org/news/index.html               | 34 +++++--------
 www.freecol.org/news/releases.html            | 33 +++++--------
 4 files changed, 51 insertions(+), 85 deletions(-)

diff --git a/www.freecol.org/download.html b/www.freecol.org/download.html
index b06faeff7..c2f382c58 100644
--- a/www.freecol.org/download.html
+++ b/www.freecol.org/download.html
@@ -72,13 +72,13 @@
                                     <tbody>
                                     <tr class="cBody">
                                         <td class="cBody">
-                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-installer.jar?download">
+                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.jar?download">
                                                 <img src="images/java_jar.png" border="0" alt="JAVA INSTALLER" width="32" height="32" />
                                             </a>
                                         </td>
                                         <td class="cBody">
-                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-installer.jar?download">
-                                                freecol-0.11.4-installer.jar
+                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.jar?download">
+                                                freecol-0.11.3-installer.jar
                                             </a>
                                         </td>
                                         <td class="cBody">
@@ -92,52 +92,52 @@
                                 <tbody>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-installer.exe?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.exe?download">
                                             <img src="images/xplogo.png" border="0" alt="WINDOWS INSTALLER" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-installer.exe?download">
-                                            freecol-0.11.4-installer.exe
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.exe?download">
+                                            freecol-0.11.3-installer.exe
                                         </a>
                                     </td>
                                     <td class="cBody">Windows Installer</td>
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-mac.tar.bz2?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-mac.tar.bz2?download">
                                             <img src="images/mac-bz2.png" border="0" alt="MACOSX" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-mac.tar.bz2?download">
-                                            freecol-0.11.4-mac.tar.bz2
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-mac.tar.bz2?download">
+                                            freecol-0.11.3-mac.tar.bz2
                                         </a>
                                     </td>
                                     <td class="cBody">Package for MacOSX</td>
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-installer.jar?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.jar?download">
                                             <img src="images/java_jar.png" border="0" alt="JAVA INSTALLER" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-installer.jar?download">
-                                            freecol-0.11.4-installer.jar
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.jar?download">
+                                            freecol-0.11.3-installer.jar
                                         </a>
                                     </td>
                                     <td class="cBody">Platform independent installer</td>
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/free%20col-0.11.4.zip?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/free%20col-0.11.3.zip?download">
                                             <img src="images/zip.png" border="0" alt=".ZIP" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4.zip?download">
-                                            freecol-0.11.4.zip
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3.zip?download">
+                                            freecol-0.11.3.zip
                                         </a>
                                     </td>
                                     <td class="cBody">Precompiled .zip</td>
@@ -152,12 +152,12 @@
                                 <tbody>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-installer-with-sources.jar?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer-with-sources.jar?download">
                                             <img src="images/java_jar.png" border="0" alt="JAVA INSTALLER WITH SOURCES" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-installer-with-sources.jar?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer-with-sources.jar?download">
                                             freecol-...-with-sources.jar
                                         </a>
                                     </td>
@@ -165,13 +165,13 @@
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-src.zip?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-src.zip?download">
                                             <img src="images/zip.png" border="0" alt="SOURCE .ZIP" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-src.zip?download">
-                                            freecol-0.11.4-src.zip
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-src.zip?download">
+                                            freecol-0.11.3-src.zip
                                         </a>
                                     </td>
                                     <td class="cBody">Precompiled .zip with source code included</td>
@@ -190,14 +190,14 @@
                             <h4>Instructions:</h4>
                             <p align="justify">
                                 Windows users should download
-                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-installer.exe?download">freecol-0.11.4-installer.exe</a>.
+                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.exe?download">freecol-0.11.3-installer.exe</a>.
                                 You can run the file directly or save it to disk. If you choose the latter then just double-click the file once it&#39;s downloaded.
                                 <br /><br />
                                 Mac OS X users should download
-                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-mac.tar.bz2?download">freecol-0.11.4-mac.tar.bz2</a>.
+                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-mac.tar.bz2?download">freecol-0.11.3-mac.tar.bz2</a>.
                                 Just double click the downloaded file and copy the resulting &#39;FreeCol&#39; to some place (e.g. your Application folder). FreeCol has some problems running on Mac OS X, so you should save your game frequently. <br /><br />
-                                Users that know how to start a java program can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-installer.jar?download">freecol-0.11.4-installer.jar</a>. Start the installation program by running the command: &quot;java -jar freecol-0.11.4-installer.jar&quot;. This installer is recommended for Linux users. <br /><br />
-                                If you don&#39;t need a desktop icon and you know how to start a java program then you can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4.zip?download">freecol-0.11.4.zip</a>. The same applies for <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.4-src.zip?download">freecol-0.11.4-src.zip</a>, but the source files are included as well in these two packages. In that case you might want to take a look at the README file to get information on how to compile and run FreeCol.
+                                Users that know how to start a java program can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.jar?download">freecol-0.11.3-installer.jar</a>. Start the installation program by running the command: &quot;java -jar freecol-0.11.3-installer.jar&quot;. This installer is recommended for Linux users. <br /><br />
+                                If you don&#39;t need a desktop icon and you know how to start a java program then you can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3.zip?download">freecol-0.11.3.zip</a>. The same applies for <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-src.zip?download">freecol-0.11.3-src.zip</a>, but the source files are included as well in these two packages. In that case you might want to take a look at the README file to get information on how to compile and run FreeCol.
                             </p>
                             <p class="cWarning" align="justify">
                                 Note 1: You may ignore the message &quot;<em>The music files could not be loaded by FreeCol. Disabling music.</em>&quot;. There is no music available yet in this release of FreeCol. </p>
diff --git a/www.freecol.org/news/freecol-0.11.4-released.html b/www.freecol.org/news/freecol-0.11.4-released.html
index aa9b3be1b..5f622c2ec 100644
--- a/www.freecol.org/news/freecol-0.11.4-released.html
+++ b/www.freecol.org/news/freecol-0.11.4-released.html
@@ -101,30 +101,19 @@
           <div class="content"><a name="content"></a>
 
             <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
-                  FreeCol 0.11.4 released
+                  FreeCol 0.11.4 released, and withdrawn
             </td></tr></table>
             <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
-                  Sunday, ? July 2015
+                  Sunday, 2 August 2015
               </td></tr>
               <tr>
                 <td valign="top" colspan="2">
                   <div align="left">FreeCol 0.11.4</div>
                   <div align="left">&nbsp;</div>
                   <div align="left">
-                    The FreeCol team are relieved to announce
-                    the release of FreeCol 0.11.4.  While many
-                    bugs were fixed in this release, there has
-                    also been progress in completing the
-                    required feature set for the 1.0 release.
-                    See the
-                    <a href="https://sourceforge.net/p/freecol/wiki/0.11.4%20Release%20Notes/"
-                       title="release notes">release notes</a> for
-                    more detail. All 0.10.x and 0.11.x games
-                    should continue to work with 0.11.4.<br />&nbsp;
-                  </div>
-                  <div align="left">We hope you enjoy FreeCol
-                    0.11.4.&nbsp; Onward to 1.0.
-                    <br /><br />The FreeCol Team
+                    FreeCol 0.11.4 was released on Friday, but found
+                    to generate broken maps.  It has been withdrawn.
+                    0.11.5 will be released soon.
                   </div>
                   <div align="left">&nbsp;</div>
                   <!-- Here is the download button.
diff --git a/www.freecol.org/news/index.html b/www.freecol.org/news/index.html
index 9e1670805..c34e34ed6 100644
--- a/www.freecol.org/news/index.html
+++ b/www.freecol.org/news/index.html
@@ -97,38 +97,20 @@
 
                   <!-- 0.11.4 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
-                        FreeCol 0.11.4 released
+                        FreeCol 0.11.4 released and withdrawn
                   </td></tr></table>
                   <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
-                        Sunday, ? July 2015
+                        Sunday, 2 August 2015
                     </td></tr>
                     <tr>
                       <td valign="top" colspan="2">
                         <div align="left">FreeCol 0.11.4</div>
                         <div align="left">&nbsp;</div>
                         <div align="left">
-                          The FreeCol team are relieved to announce
-                          the release of FreeCol 0.11.4.  While many
-                          bugs were fixed in this release, there has
-                          also been progress in completing the
-                          required feature set for the 1.0 release.
-                          See the
-                          <a href="https://sourceforge.net/p/freecol/wiki/0.11.4%20Release%20Notes/"
-                             title="release notes">release notes</a> for
-                          more detail. All 0.10.x and 0.11.x games
-                          should continue to work with 0.11.4.<br />&nbsp;
-                        </div>
-                        <div align="left">We hope you enjoy FreeCol
-                          0.11.4.&nbsp; Onward to 1.0.
-                          <br /><br />The FreeCol Team
-                        </div>
+                    FreeCol 0.11.4 was released on Friday, but found
+                    to generate broken maps.  It has been withdrawn.
+                    0.11.5 will be released soon.
                         <div align="left">&nbsp;</div>
-                        <!-- Here is the download button.
-                             Move it to the new release! -->
-                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                                    <a href="download.html">Download FreeCol 0.11.3</a>
-                        </em></strong></td></tr></tbody></table>
-                        <!-- End of download button -->
                   </td></tr></table>
                   
                   <span class="article_seperator">&nbsp;</span>
@@ -161,6 +143,12 @@
                           <br /><br />The FreeCol Team
                         </div>
                         <div align="left">&nbsp;</div>
+                        <!-- Here is the download button.
+                             Move it to the new release! -->
+                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
+                                    <a href="download.html">Download FreeCol 0.11.3</a>
+                        </em></strong></td></tr></tbody></table>
+                        <!-- End of download button -->
                   </td></tr></table>
                   
                   <span class="article_seperator">&nbsp;</span>
diff --git a/www.freecol.org/news/releases.html b/www.freecol.org/news/releases.html
index d2426931e..9a1fc7210 100644
--- a/www.freecol.org/news/releases.html
+++ b/www.freecol.org/news/releases.html
@@ -97,38 +97,21 @@
 
                   <!-- 0.11.4 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
-                        FreeCol 0.11.4 released
+                        FreeCol 0.11.4 released, and withdrawn
                   </td></tr></table>
                   <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
-                        Sunday, ? July 2015
+                        Sunday, 2 August 2015
                     </td></tr>
                     <tr>
                       <td valign="top" colspan="2">
                         <div align="left">FreeCol 0.11.4</div>
                         <div align="left">&nbsp;</div>
                         <div align="left">
-                          The FreeCol team are relieved to announce
-                          the release of FreeCol 0.11.4.  While many
-                          bugs were fixed in this release, there has
-                          also been progress in completing the
-                          required feature set for the 1.0 release.
-                          See the
-                          <a href="https://sourceforge.net/p/freecol/wiki/0.11.4%20Release%20Notes/"
-                             title="release notes">release notes</a> for
-                          more detail. All 0.10.x and 0.11.x games
-                          should continue to work with 0.11.4.<br />&nbsp;
-                        </div>
-                        <div align="left">We hope you enjoy FreeCol
-                          0.11.4.&nbsp; Onward to 1.0.
-                          <br /><br />The FreeCol Team
+                    FreeCol 0.11.4 was released on Friday, but found
+                    to generate broken maps.  It has been withdrawn.
+                    0.11.5 will be released soon.
                         </div>
                         <div align="left">&nbsp;</div>
-                        <!-- Here is the download button.
-                             Move it to the new release! -->
-                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                                    <a href="download.html">Download FreeCol 0.11.3</a>
-                        </em></strong></td></tr></tbody></table>
-                        <!-- End of download button -->
                   </td></tr></table>
                   
                   <span class="article_seperator">&nbsp;</span>
@@ -161,6 +144,12 @@
                           <br /><br />The FreeCol Team
                         </div>
                         <div align="left">&nbsp;</div>
+                        <!-- Here is the download button.
+                             Move it to the new release! -->
+                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
+                                    <a href="download.html">Download FreeCol 0.11.3</a>
+                        </em></strong></td></tr></tbody></table>
+                        <!-- End of download button -->
                   </td></tr></table>
                   
                   <span class="article_seperator">&nbsp;</span>

From fa00b09352184283e4b5b94851dfdeeccd9bbca6 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 2 Aug 2015 11:54:55 +0930
Subject: [PATCH 041/323] Download link was broken in several places.

---
 www.freecol.org/news/Page-2.html                        | 4 ++--
 www.freecol.org/news/freecol-0.10.0-alpha-released.html | 4 ++--
 www.freecol.org/news/freecol-0.10.3-released.html       | 4 ++--
 www.freecol.org/news/freecol-0.11.1-released.html       | 4 ++--
 www.freecol.org/news/freecol-0.11.2-released.html       | 2 +-
 www.freecol.org/news/freecol-0.11.3-released.html       | 2 +-
 www.freecol.org/news/freecol-0.11.4-released.html       | 2 +-
 www.freecol.org/news/freecol-0.8.4-released.html        | 6 +++---
 www.freecol.org/news/freecol-0.9.2-released.html        | 4 ++--
 www.freecol.org/news/index.html                         | 2 +-
 www.freecol.org/news/releases.html                      | 2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/www.freecol.org/news/Page-2.html b/www.freecol.org/news/Page-2.html
index 7d71881e6..b4c5db819 100644
--- a/www.freecol.org/news/Page-2.html
+++ b/www.freecol.org/news/Page-2.html
@@ -135,7 +135,7 @@
 			</tr>
 					<tr>
 			<td valign="top" colspan="2">
-				<div align="left">FreeCol 0.10.3 has been released. This is a bug-fix release which does not add any new features.</div><div align="left">&nbsp;</div><div align="left">&nbsp;</div><table border="0"><tbody><tr><td>&nbsp;</td><td><strong><em><a href="download.html"><br /></a></em></strong></td>                     </tr>                 </tbody></table>			</td>
+				<div align="left">FreeCol 0.10.3 has been released. This is a bug-fix release which does not add any new features.</div><div align="left">&nbsp;</div><div align="left">&nbsp;</div><table border="0"><tbody><tr><td>&nbsp;</td><td><strong><em><a href="../download.html"><br /></a></em></strong></td>                     </tr>                 </tbody></table>			</td>
 		</tr>
 				</table>
 
@@ -238,4 +238,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163639 -->
\ No newline at end of file
+<!-- 1419163639 -->
diff --git a/www.freecol.org/news/freecol-0.10.0-alpha-released.html b/www.freecol.org/news/freecol-0.10.0-alpha-released.html
index ab51c6ff3..47a14682c 100644
--- a/www.freecol.org/news/freecol-0.10.0-alpha-released.html
+++ b/www.freecol.org/news/freecol-0.10.0-alpha-released.html
@@ -161,7 +161,7 @@
         </tr>
     </tbody>
 </table>
-<strong><em><a href="download.html"></a></em></strong></div>			</td>
+<strong><em><a href="../download.html"></a></em></strong></div>			</td>
 		</tr>
 				</table>
 
@@ -201,4 +201,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163604 -->
\ No newline at end of file
+<!-- 1419163604 -->
diff --git a/www.freecol.org/news/freecol-0.10.3-released.html b/www.freecol.org/news/freecol-0.10.3-released.html
index 1304cf9b8..739eb363f 100644
--- a/www.freecol.org/news/freecol-0.10.3-released.html
+++ b/www.freecol.org/news/freecol-0.10.3-released.html
@@ -113,7 +113,7 @@
 			</tr>
 					<tr>
 			<td valign="top" colspan="2">
-				<div align="left">FreeCol 0.10.3 has been released. This is a bug-fix release which does not add any new features.</div><div align="left">&nbsp;</div><div align="left">&nbsp;</div><table border="0"><tbody><tr><td>&nbsp;</td><td><strong><em><a href="download.html"><br /></a></em></strong></td>                     </tr>                 </tbody></table>
+				<div align="left">FreeCol 0.10.3 has been released. This is a bug-fix release which does not add any new features.</div><div align="left">&nbsp;</div><div align="left">&nbsp;</div><table border="0"><tbody><tr><td>&nbsp;</td><td><strong><em><a href="../download.html"><br /></a></em></strong></td>                     </tr>                 </tbody></table>
 
 			</td>
 		</tr>
@@ -155,4 +155,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163602 -->
\ No newline at end of file
+<!-- 1419163602 -->
diff --git a/www.freecol.org/news/freecol-0.11.1-released.html b/www.freecol.org/news/freecol-0.11.1-released.html
index ebd61740f..0ee869134 100644
--- a/www.freecol.org/news/freecol-0.11.1-released.html
+++ b/www.freecol.org/news/freecol-0.11.1-released.html
@@ -113,7 +113,7 @@
 			</tr>
 					<tr>
 			<td valign="top" colspan="2">
-				<div align="left">FreeCol 0.11.1</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are sort-of pleased to announce the release of FreeCol 0.11.1.&nbsp; This is a bug fix release to clean up some annoying problems in version 0.11.0. All 0.10.x and 0.11.0 games should continue to work with 0.11.1.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.1.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="download.html">Download FreeCol 0.11.1</a></em></strong>                         </td>                     </tr>                 </tbody></table>
+				<div align="left">FreeCol 0.11.1</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are sort-of pleased to announce the release of FreeCol 0.11.1.&nbsp; This is a bug fix release to clean up some annoying problems in version 0.11.0. All 0.10.x and 0.11.0 games should continue to work with 0.11.1.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.1.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="download.html">Download FreeCol 0.11.1</a></em></strong>                         </td>                     </tr>                 </tbody></table>
 
 			</td>
 		</tr>
@@ -148,4 +148,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163600 -->
\ No newline at end of file
+<!-- 1419163600 -->
diff --git a/www.freecol.org/news/freecol-0.11.2-released.html b/www.freecol.org/news/freecol-0.11.2-released.html
index 5e41a6625..1488f180e 100644
--- a/www.freecol.org/news/freecol-0.11.2-released.html
+++ b/www.freecol.org/news/freecol-0.11.2-released.html
@@ -113,7 +113,7 @@
 			</tr>
 					<tr>
 			<td valign="top" colspan="2">
-				<div align="left">FreeCol 0.11.2</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are mostly pleased to announce the release of FreeCol 0.11.2.  This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1. See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.2%20Release%20Notes/" title="release notes">release notes</a> for more detail. All 0.10.x and 0.11.x games should continue to work with 0.11.2.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.2.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="download.html">Download FreeCol 0.11.2</a></em></strong>                         </td>                     </tr>                 </tbody></table>			</td>
+				<div align="left">FreeCol 0.11.2</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are mostly pleased to announce the release of FreeCol 0.11.2.  This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1. See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.2%20Release%20Notes/" title="release notes">release notes</a> for more detail. All 0.10.x and 0.11.x games should continue to work with 0.11.2.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.2.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="download.html">Download FreeCol 0.11.2</a></em></strong>                         </td>                     </tr>                 </tbody></table>			</td>
 		</tr>
 				</table>
 
diff --git a/www.freecol.org/news/freecol-0.11.3-released.html b/www.freecol.org/news/freecol-0.11.3-released.html
index ec634791c..9b9bf9937 100644
--- a/www.freecol.org/news/freecol-0.11.3-released.html
+++ b/www.freecol.org/news/freecol-0.11.3-released.html
@@ -110,7 +110,7 @@
 					<tr>
 			<td valign="top" colspan="2">
 				<div align="left">FreeCol 0.11.3</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are vaguely pleased to announce the release of
-FreeCol 0.11.3. This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1/2. See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.3%20Release%20Notes/" title="release notes">release notes</a> for more detail. All 0.10.x and 0.11.x games should continue to work with 0.11.3.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.3.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="download.html">Download FreeCol 0.11.3</a></em></strong>                         </td>                     </tr>                 </tbody></table>			</td>
+FreeCol 0.11.3. This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1/2. See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.3%20Release%20Notes/" title="release notes">release notes</a> for more detail. All 0.10.x and 0.11.x games should continue to work with 0.11.3.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.3.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="download.html">Download FreeCol 0.11.3</a></em></strong>                         </td>                     </tr>                 </tbody></table>			</td>
 		</tr>
 				</table>
 
diff --git a/www.freecol.org/news/freecol-0.11.4-released.html b/www.freecol.org/news/freecol-0.11.4-released.html
index 5f622c2ec..2daa29819 100644
--- a/www.freecol.org/news/freecol-0.11.4-released.html
+++ b/www.freecol.org/news/freecol-0.11.4-released.html
@@ -119,7 +119,7 @@
                   <!-- Here is the download button.
                   Move it to the new release! -->
                   <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                              <a href="download.html">Download FreeCol 0.11.3</a>
+                              <a href="../download.html">Download FreeCol 0.11.3</a>
                   </em></strong></td></tr></tbody></table>
                   <!-- End of download button -->
             </td></tr></table>
diff --git a/www.freecol.org/news/freecol-0.8.4-released.html b/www.freecol.org/news/freecol-0.8.4-released.html
index 37c31c43c..fe4ff7997 100644
--- a/www.freecol.org/news/freecol-0.8.4-released.html
+++ b/www.freecol.org/news/freecol-0.8.4-released.html
@@ -118,10 +118,10 @@
    <table border="0">
         <tr>
             <td>
-                <a href="download.html"><img src="/images/download2.png" border="0" alt="" /></a>
+                <a href="../download.html"><img src="/images/download2.png" border="0" alt="" /></a>
              </td>
             <td>
-                <strong><i><a href="download.html">Download FreeCol 0.8.4</a></i></strong>
+                <strong><i><a href="../download.html">Download FreeCol 0.8.4</a></i></strong>
             </td>
         </tr>
     </table>
@@ -167,4 +167,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163608 -->
\ No newline at end of file
+<!-- 1419163608 -->
diff --git a/www.freecol.org/news/freecol-0.9.2-released.html b/www.freecol.org/news/freecol-0.9.2-released.html
index 236074844..6bddd37a5 100644
--- a/www.freecol.org/news/freecol-0.9.2-released.html
+++ b/www.freecol.org/news/freecol-0.9.2-released.html
@@ -115,7 +115,7 @@
 			<td valign="top" colspan="2">
 				<div align="left">FreeCol 0.9.2 has been released. <table border="0"><tbody></tbody></table></div>
 
-<div align="left"> This is a bug/feature-fix release, the main changes being:<br /><ul><li>The increased native land claims in 0.9.1 have been reverted to the more moderate 0.9.0 behaviour, following comment that this made the game too difficult.&nbsp; This feature will be back in a later release, but only after implementing the feature that at least exempts your <em>first </em>colony from having to buy its land (as was the case with the original Colonization).</li><li>Fixed a serious bug in privateer combat.</li></ul>No new features were introduced with this release, and saved games from previous 0.9.x versions should remain compatible.&nbsp; We hope this release will provide a stable, playable and enjoyable version of FreeCol. <br /></div><div align="left"><strong><em><a href="download.html"><br /></a></em></strong>             </div>			</td>
+<div align="left"> This is a bug/feature-fix release, the main changes being:<br /><ul><li>The increased native land claims in 0.9.1 have been reverted to the more moderate 0.9.0 behaviour, following comment that this made the game too difficult.&nbsp; This feature will be back in a later release, but only after implementing the feature that at least exempts your <em>first </em>colony from having to buy its land (as was the case with the original Colonization).</li><li>Fixed a serious bug in privateer combat.</li></ul>No new features were introduced with this release, and saved games from previous 0.9.x versions should remain compatible.&nbsp; We hope this release will provide a stable, playable and enjoyable version of FreeCol. <br /></div><div align="left"><strong><em><a href="../download.html"><br /></a></em></strong>             </div>			</td>
 		</tr>
 				</table>
 
@@ -155,4 +155,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163606 -->
\ No newline at end of file
+<!-- 1419163606 -->
diff --git a/www.freecol.org/news/index.html b/www.freecol.org/news/index.html
index c34e34ed6..471af34fc 100644
--- a/www.freecol.org/news/index.html
+++ b/www.freecol.org/news/index.html
@@ -146,7 +146,7 @@
                         <!-- Here is the download button.
                              Move it to the new release! -->
                         <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                                    <a href="download.html">Download FreeCol 0.11.3</a>
+                                    <a href="../download.html">Download FreeCol 0.11.3</a>
                         </em></strong></td></tr></tbody></table>
                         <!-- End of download button -->
                   </td></tr></table>
diff --git a/www.freecol.org/news/releases.html b/www.freecol.org/news/releases.html
index 9a1fc7210..b92c4badf 100644
--- a/www.freecol.org/news/releases.html
+++ b/www.freecol.org/news/releases.html
@@ -147,7 +147,7 @@
                         <!-- Here is the download button.
                              Move it to the new release! -->
                         <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                                    <a href="download.html">Download FreeCol 0.11.3</a>
+                                    <a href="../download.html">Download FreeCol 0.11.3</a>
                         </em></strong></td></tr></tbody></table>
                         <!-- End of download button -->
                   </td></tr></table>

From 67e79229a902b9986fb9c9c8f74519e17aa7ef26 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 2 Aug 2015 12:19:36 +0930
Subject: [PATCH 042/323] Fix some more download links.

---
 www.freecol.org/news/freecol-0.11.1-released.html | 2 +-
 www.freecol.org/news/freecol-0.11.2-released.html | 2 +-
 www.freecol.org/news/freecol-0.11.3-released.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www.freecol.org/news/freecol-0.11.1-released.html b/www.freecol.org/news/freecol-0.11.1-released.html
index 0ee869134..1b1ffd8e0 100644
--- a/www.freecol.org/news/freecol-0.11.1-released.html
+++ b/www.freecol.org/news/freecol-0.11.1-released.html
@@ -113,7 +113,7 @@
 			</tr>
 					<tr>
 			<td valign="top" colspan="2">
-				<div align="left">FreeCol 0.11.1</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are sort-of pleased to announce the release of FreeCol 0.11.1.&nbsp; This is a bug fix release to clean up some annoying problems in version 0.11.0. All 0.10.x and 0.11.0 games should continue to work with 0.11.1.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.1.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="download.html">Download FreeCol 0.11.1</a></em></strong>                         </td>                     </tr>                 </tbody></table>
+				<div align="left">FreeCol 0.11.1</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are sort-of pleased to announce the release of FreeCol 0.11.1.&nbsp; This is a bug fix release to clean up some annoying problems in version 0.11.0. All 0.10.x and 0.11.0 games should continue to work with 0.11.1.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.1.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="../download.html">Download FreeCol 0.11.1</a></em></strong>                         </td>                     </tr>                 </tbody></table>
 
 			</td>
 		</tr>
diff --git a/www.freecol.org/news/freecol-0.11.2-released.html b/www.freecol.org/news/freecol-0.11.2-released.html
index 1488f180e..fd070467b 100644
--- a/www.freecol.org/news/freecol-0.11.2-released.html
+++ b/www.freecol.org/news/freecol-0.11.2-released.html
@@ -113,7 +113,7 @@
 			</tr>
 					<tr>
 			<td valign="top" colspan="2">
-				<div align="left">FreeCol 0.11.2</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are mostly pleased to announce the release of FreeCol 0.11.2.  This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1. See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.2%20Release%20Notes/" title="release notes">release notes</a> for more detail. All 0.10.x and 0.11.x games should continue to work with 0.11.2.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.2.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="download.html">Download FreeCol 0.11.2</a></em></strong>                         </td>                     </tr>                 </tbody></table>			</td>
+				<div align="left">FreeCol 0.11.2</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are mostly pleased to announce the release of FreeCol 0.11.2.  This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1. See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.2%20Release%20Notes/" title="release notes">release notes</a> for more detail. All 0.10.x and 0.11.x games should continue to work with 0.11.2.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.2.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="../download.html">Download FreeCol 0.11.2</a></em></strong>                         </td>                     </tr>                 </tbody></table>			</td>
 		</tr>
 				</table>
 
diff --git a/www.freecol.org/news/freecol-0.11.3-released.html b/www.freecol.org/news/freecol-0.11.3-released.html
index 9b9bf9937..444969f55 100644
--- a/www.freecol.org/news/freecol-0.11.3-released.html
+++ b/www.freecol.org/news/freecol-0.11.3-released.html
@@ -110,7 +110,7 @@
 					<tr>
 			<td valign="top" colspan="2">
 				<div align="left">FreeCol 0.11.3</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are vaguely pleased to announce the release of
-FreeCol 0.11.3. This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1/2. See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.3%20Release%20Notes/" title="release notes">release notes</a> for more detail. All 0.10.x and 0.11.x games should continue to work with 0.11.3.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.3.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="download.html">Download FreeCol 0.11.3</a></em></strong>                         </td>                     </tr>                 </tbody></table>			</td>
+FreeCol 0.11.3. This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1/2. See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.3%20Release%20Notes/" title="release notes">release notes</a> for more detail. All 0.10.x and 0.11.x games should continue to work with 0.11.3.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.3.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="../download.html">Download FreeCol 0.11.3</a></em></strong>                         </td>                     </tr>                 </tbody></table>			</td>
 		</tr>
 				</table>
 

From 4d706113201207272d95bd6c9c110d081311101f Mon Sep 17 00:00:00 2001
From: Fenyo <fenyo.pub+github@gmail.com>
Date: Fri, 31 Jul 2015 22:44:37 +0200
Subject: [PATCH 043/323] New hotkey: Move all cargo with Control key pressed
 down.

---
 .../client/gui/panel/AbstractGoodsLabel.java  | 20 +++++++++++++++++++
 .../gui/panel/DefaultTransferHandler.java     |  1 +
 .../client/gui/panel/DragListener.java        |  2 ++
 3 files changed, 23 insertions(+)

diff --git a/src/net/sf/freecol/client/gui/panel/AbstractGoodsLabel.java b/src/net/sf/freecol/client/gui/panel/AbstractGoodsLabel.java
index 8699a22af..ae67389b4 100644
--- a/src/net/sf/freecol/client/gui/panel/AbstractGoodsLabel.java
+++ b/src/net/sf/freecol/client/gui/panel/AbstractGoodsLabel.java
@@ -38,6 +38,8 @@ public class AbstractGoodsLabel extends JLabel {
 
     private boolean partialChosen = false;
 
+    private boolean fullChosen = false;
+
 
     /**
      * Initializes this JLabel with the given goods data.
@@ -72,6 +74,24 @@ public class AbstractGoodsLabel extends JLabel {
         this.partialChosen = partialChosen;
     }
 
+    /**
+     * Has full amount been selected?
+     *
+     * @return True if a full amount has been selected.
+     */
+    public boolean isFullChosen() {
+        return fullChosen;
+    }
+
+    /**
+     * Set the full amount state.
+     *
+     * @param fullChosen The new full amount state.
+     */
+    public void setFullChosen(boolean fullChosen) {
+        this.fullChosen = fullChosen;
+    }
+
     /**
      * Get the goods data.
      *
diff --git a/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java b/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
index 7441a93ac..dbca942c4 100644
--- a/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
+++ b/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
@@ -393,6 +393,7 @@ public final class DefaultTransferHandler extends TransferHandler {
                                            defaultAmount, false);
                     if (amount <= 0) return false;
                     goods.setAmount(amount);
+                } else if (label.isFullChosen()) {
                 } else if (goods.getAmount() > GoodsContainer.CARGO_SIZE) {
                     goods.setAmount(GoodsContainer.CARGO_SIZE);
                 }
diff --git a/src/net/sf/freecol/client/gui/panel/DragListener.java b/src/net/sf/freecol/client/gui/panel/DragListener.java
index d9ead3167..2175ae25d 100644
--- a/src/net/sf/freecol/client/gui/panel/DragListener.java
+++ b/src/net/sf/freecol/client/gui/panel/DragListener.java
@@ -112,6 +112,8 @@ public final class DragListener extends MouseAdapter {
                 AbstractGoodsLabel label = (AbstractGoodsLabel)comp;
                 if (e.isShiftDown()) {
                     label.setPartialChosen(true);
+                } else if (e.isControlDown()) {
+                    label.setFullChosen(true);
                 } else {
                     label.setPartialChosen(false);
                     label.setDefaultAmount();

From 234239b2353751d35e8962ea7dd0d17187190d15 Mon Sep 17 00:00:00 2001
From: calebrw <calebrw@gmail.com>
Date: Sun, 2 Aug 2015 14:24:57 -0500
Subject: [PATCH 044/323] FreeCol 0.11.5 release news update.

---
 www.freecol.org/download.html                 |  48 +++---
 www.freecol.org/index.html                    |  15 +-
 .../news/freecol-0.11.4-released.html         |  21 ++-
 .../news/freecol-0.11.5-released.html         | 158 ++++++++++++++++++
 www.freecol.org/news/index.html               |  51 ++++--
 www.freecol.org/news/releases.html            |  65 ++++---
 www.freecol.org/sitemap.html                  |   2 +
 7 files changed, 290 insertions(+), 70 deletions(-)
 create mode 100644 www.freecol.org/news/freecol-0.11.5-released.html

diff --git a/www.freecol.org/download.html b/www.freecol.org/download.html
index c2f382c58..694354d15 100644
--- a/www.freecol.org/download.html
+++ b/www.freecol.org/download.html
@@ -72,13 +72,13 @@
                                     <tbody>
                                     <tr class="cBody">
                                         <td class="cBody">
-                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.jar?download">
+                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">
                                                 <img src="images/java_jar.png" border="0" alt="JAVA INSTALLER" width="32" height="32" />
                                             </a>
                                         </td>
                                         <td class="cBody">
-                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.jar?download">
-                                                freecol-0.11.3-installer.jar
+                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">
+                                                freecol-0.11.5-installer.jar
                                             </a>
                                         </td>
                                         <td class="cBody">
@@ -92,52 +92,52 @@
                                 <tbody>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.exe?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.exe?download">
                                             <img src="images/xplogo.png" border="0" alt="WINDOWS INSTALLER" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.exe?download">
-                                            freecol-0.11.3-installer.exe
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.exe?download">
+                                            freecol-0.11.5-installer.exe
                                         </a>
                                     </td>
                                     <td class="cBody">Windows Installer</td>
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-mac.tar.bz2?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-mac.tar.bz2?download">
                                             <img src="images/mac-bz2.png" border="0" alt="MACOSX" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-mac.tar.bz2?download">
-                                            freecol-0.11.3-mac.tar.bz2
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-mac.tar.bz2?download">
+                                            freecol-0.11.5-mac.tar.bz2
                                         </a>
                                     </td>
                                     <td class="cBody">Package for MacOSX</td>
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.jar?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">
                                             <img src="images/java_jar.png" border="0" alt="JAVA INSTALLER" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.jar?download">
-                                            freecol-0.11.3-installer.jar
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">
+                                            freecol-0.11.5-installer.jar
                                         </a>
                                     </td>
                                     <td class="cBody">Platform independent installer</td>
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/free%20col-0.11.3.zip?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/free%20col-0.11.5.zip?download">
                                             <img src="images/zip.png" border="0" alt=".ZIP" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3.zip?download">
-                                            freecol-0.11.3.zip
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5.zip?download">
+                                            freecol-0.11.5.zip
                                         </a>
                                     </td>
                                     <td class="cBody">Precompiled .zip</td>
@@ -152,12 +152,12 @@
                                 <tbody>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer-with-sources.jar?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer-with-sources.jar?download">
                                             <img src="images/java_jar.png" border="0" alt="JAVA INSTALLER WITH SOURCES" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer-with-sources.jar?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer-with-sources.jar?download">
                                             freecol-...-with-sources.jar
                                         </a>
                                     </td>
@@ -165,13 +165,13 @@
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-src.zip?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-src.zip?download">
                                             <img src="images/zip.png" border="0" alt="SOURCE .ZIP" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-src.zip?download">
-                                            freecol-0.11.3-src.zip
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-src.zip?download">
+                                            freecol-0.11.5-src.zip
                                         </a>
                                     </td>
                                     <td class="cBody">Precompiled .zip with source code included</td>
@@ -190,14 +190,14 @@
                             <h4>Instructions:</h4>
                             <p align="justify">
                                 Windows users should download
-                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.exe?download">freecol-0.11.3-installer.exe</a>.
+                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.exe?download">freecol-0.11.5-installer.exe</a>.
                                 You can run the file directly or save it to disk. If you choose the latter then just double-click the file once it&#39;s downloaded.
                                 <br /><br />
                                 Mac OS X users should download
-                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-mac.tar.bz2?download">freecol-0.11.3-mac.tar.bz2</a>.
+                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-mac.tar.bz2?download">freecol-0.11.5-mac.tar.bz2</a>.
                                 Just double click the downloaded file and copy the resulting &#39;FreeCol&#39; to some place (e.g. your Application folder). FreeCol has some problems running on Mac OS X, so you should save your game frequently. <br /><br />
-                                Users that know how to start a java program can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-installer.jar?download">freecol-0.11.3-installer.jar</a>. Start the installation program by running the command: &quot;java -jar freecol-0.11.3-installer.jar&quot;. This installer is recommended for Linux users. <br /><br />
-                                If you don&#39;t need a desktop icon and you know how to start a java program then you can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3.zip?download">freecol-0.11.3.zip</a>. The same applies for <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.3-src.zip?download">freecol-0.11.3-src.zip</a>, but the source files are included as well in these two packages. In that case you might want to take a look at the README file to get information on how to compile and run FreeCol.
+                                Users that know how to start a java program can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">freecol-0.11.5-installer.jar</a>. Start the installation program by running the command: &quot;java -jar freecol-0.11.5-installer.jar&quot;. This installer is recommended for Linux users. <br /><br />
+                                If you don&#39;t need a desktop icon and you know how to start a java program then you can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5.zip?download">freecol-0.11.5.zip</a>. The same applies for <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-src.zip?download">freecol-0.11.5-src.zip</a>, but the source files are included as well in these two packages. In that case you might want to take a look at the README file to get information on how to compile and run FreeCol.
                             </p>
                             <p class="cWarning" align="justify">
                                 Note 1: You may ignore the message &quot;<em>The music files could not be loaded by FreeCol. Disabling music.</em>&quot;. There is no music available yet in this release of FreeCol. </p>
diff --git a/www.freecol.org/index.html b/www.freecol.org/index.html
index be6c00cc8..8fe907d9b 100644
--- a/www.freecol.org/index.html
+++ b/www.freecol.org/index.html
@@ -94,17 +94,20 @@
                                 <td valign="top">
                                     <div class="blog_more">
                                         <ul>
+                                            <li>
+                                                <a class="blogsection" href="news/freecol-0.11.5-released.html">
+                                                    FreeCol 0.11.5 released
+                                                </a>
+                                            </li>
                                             <li>
                                                 <a class="blogsection" href="news/freecol-0.11.4-released.html">
-                                                    FreeCol 0.11.4 released</a>
+                                                    FreeCol 0.11.4 released
+                                                </a>
                                             </li>
                                             <li>
                                                 <a class="blogsection" href="news/freecol-0.11.3-released.html">
-                                                    FreeCol 0.11.3 released</a>
-                                            </li>
-                                            <li>
-                                                <a class="blogsection" href="news/freecol-0.11.2-released.html">
-                                                    FreeCol 0.11.2 released</a>
+                                                    FreeCol 0.11.3 released
+                                                </a>
                                             </li>
                                         </ul>
                                     </div>
diff --git a/www.freecol.org/news/freecol-0.11.4-released.html b/www.freecol.org/news/freecol-0.11.4-released.html
index 2daa29819..2bcf3cef2 100644
--- a/www.freecol.org/news/freecol-0.11.4-released.html
+++ b/www.freecol.org/news/freecol-0.11.4-released.html
@@ -126,13 +126,20 @@
 
 		        <span class="article_seperator">&nbsp;</span>
 
-					  <table align="center" style="margin-top: 25px;">
-			        <tr>
-								<th class="pagenav_next">
-						      <a href="../news/freecol-0.11.3-released.html">
-							      Next &gt;</a>
-					      </th>
-							</tr>
+                <table align="center" style="margin-top: 25px;">
+                    <tr>
+                      <th class="pagenav_prev">
+                        <a href="../news/freecol-0.11.3-released.html">
+                          &lt; Prev</a>
+                      </th>
+                      <td width="50">&nbsp;
+
+                      </td>
+                      <th class="pagenav_next">
+                        <a href="../news/freecol-0.11.5-released.html">
+                          Next &gt;</a>
+                      </th>
+                    </tr>
 			      </table>
 						<div class="back_button">
 				      <a href='javascript:history.go(-1)'>
diff --git a/www.freecol.org/news/freecol-0.11.5-released.html b/www.freecol.org/news/freecol-0.11.5-released.html
new file mode 100644
index 000000000..481274cdb
--- /dev/null
+++ b/www.freecol.org/news/freecol-0.11.5-released.html
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
+    <title>FreeCol - FreeCol 0.11.5 released</title>
+    <meta name="title" content="FreeCol 0.11.5 released" />
+    <meta name="author" content="Caleb Williams" />
+    <meta name="description" content="FreeCol - a turn based strategy game" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="robots" content="index, follow" />
+
+    <link rel="shortcut icon" href="../images/favicon.ico" />
+    <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
+    <link href="../templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div id="pagewidth-800" >
+    <div id="header" >
+        <div id="top-top">
+            <div id="topmenu">
+            </div>
+        </div>
+        <div class="clr"></div>
+        <div id="top-bottom">
+            <a href="index.html"><img src="../templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
+        </div>
+    </div>
+    <div id="outer-800" >
+        <div id="pathway">
+          <span class="pathway"><a href="../index.html" class="pathway">Home</a>
+            <img src="../images/M_images/arrow.png" alt="arrow" />
+            <a href="../news/" class="pathway">News</a>
+            <img src="../images/M_images/arrow.png" alt="arrow" />
+            FreeCol 0.11.5 released
+          </span>
+          <span class="pathway-right">
+            <a href="../sitemap.html"><img src="../templates/freecol/images/sitemap.png" border="0" width="14" height="16" alt="SITEMAP" /></a>
+          </span>
+        </div>
+        <div id="leftcol">
+            <a name="menu"></a>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Main Menu</h3>
+                            <table width="100%" border="0" cellpadding="0" cellspacing="0">
+                                <tr align="left"><td><a href="../index.html" class="mainlevel" >Home</a></td></tr>
+                                <tr align="left"><td><a href="../news/" class="mainlevel" id="active_menu">News</a>
+
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/releases.html" class="sublevel" >Releases</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/development.html" class="sublevel" >Development</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/other.html" class="sublevel" >Other</a></div>
+                                </td></tr>
+                                <tr align="left"><td><a href="../about.html" class="mainlevel" >About FreeCol</a></td></tr>
+                                <tr align="left"><td><a href="../documentation/" class="mainlevel" >Documentation</a></td></tr>
+                                <tr align="left"><td><a href="../screenshots.html" class="mainlevel" >Screenshots</a></td></tr>
+                                <tr align="left"><td><a href="../download.html" class="mainlevel" >Download</a></td></tr>
+                                <tr align="left"><td><a href="../community.html" class="mainlevel" >Community</a></td></tr>
+                            </table>					</div>
+                    </div>
+                </div>
+            </div>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Syndicate</h3><div class="syndicate">
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS0.91/no_html,1/">
+                                    <img src="../images/M_images/rss091.gif"  alt="RSS 0.91" name="RSS091" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS1.0/no_html,1/">
+                                    <img src="../images/M_images/rss10.gif"  alt="RSS 1.0" name="RSS10" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS2.0/no_html,1/">
+                                    <img src="../images/M_images/rss20.gif"  alt="RSS 2.0" name="RSS20" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,ATOM0.3/no_html,1/">
+                                    <img src="../images/M_images/atom03.gif"  alt="ATOM 0.3" name="ATOM03" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,OPML/no_html,1/">
+                                    <img src="../images/M_images/opml.png"  alt="OPML" name="OPML" align="middle" border="0" /></a>
+                            </div>
+                        </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div id="maincol-wide-800" >
+            <div class="clr"></div>
+            <div class="content"><a name="content"></a>
+
+                <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
+                    FreeCol 0.11.5 released
+                </td></tr></table>
+                <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
+                    Monday, 3 August 2015
+                </td></tr>
+                    <tr>
+                        <td valign="top" colspan="2">
+                            <div align="left">FreeCol 0.11.5</div>
+                            <div align="left">&nbsp;</div>
+                            <div align="left">
+                                FreeCol 0.11.5 has been released to fix
+                                file corruption in 0.11.4. All users of
+                                FreeCol 0.11.4 are encouraged to upgrade
+                                as soon as possible.
+                            </div>
+                            <div align="left">&nbsp;</div>
+                            <!-- Here is the download button.
+                            Move it to the new release! -->
+                            <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
+                                <a href="../download.html">Download FreeCol 0.11.5</a>
+                            </em></strong></td></tr></tbody></table>
+                            <!-- End of download button -->
+                        </td></tr></table>
+
+                <span class="article_seperator">&nbsp;</span>
+
+                <table align="center" style="margin-top: 25px;">
+                    <tr>
+                        <th class="pagenav_prev">
+                            <a href="../news/freecol-0.11.4-released.html">
+                                Next &gt;</a>
+                        </th>
+                        <th class="pagenav_next">
+                            <a href="#">&nbsp;</a>
+                        </th>
+                    </tr>
+                </table>
+                <div class="back_button">
+                    <a href='javascript:history.go(-1)'>
+                        [ Back ]</a>
+                </div>
+            </div>
+        </div>
+        <div class="clr"></div>
+    </div>
+    <div id="sflogo">
+        <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
+    </div>
+    <div id="footer-800" >
+        <div align="center" class="footer-copyright">
+            &copy; 2002-2015 FreeCol - <a href="../contact.html">Contact Us</a>
+        </div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/www.freecol.org/news/index.html b/www.freecol.org/news/index.html
index 471af34fc..ff78667b0 100644
--- a/www.freecol.org/news/index.html
+++ b/www.freecol.org/news/index.html
@@ -95,6 +95,35 @@
               <tr>
                 <td valign="top">
 
+                <!-- 0.11.5 -->
+                <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
+                    FreeCol 0.11.5 released
+                </td></tr></table>
+                <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
+                    Monday, 3 August 2015
+                </td></tr>
+                    <tr>
+                        <td valign="top" colspan="2">
+                            <div align="left">FreeCol 0.11.3</div>
+                            <div align="left">&nbsp;</div>
+                            <div align="left">
+                                FreeCol 0.11.5 has been released to fix
+                                file corruption in 0.11.4. All users of
+                                FreeCol 0.11.4 are encouraged to upgrade
+                                as soon as possible.
+                                <div align="left">&nbsp;</div>
+
+                                <!-- Here is the download button.
+                                     Move it to the new release! -->
+                                <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
+                                    <a href="../download.html">Download FreeCol 0.11.5</a>
+                                </em></strong></td></tr></tbody></table>
+                                <!-- End of download button -->
+                            </div>
+                        </td></tr></table>
+
+                <span class="article_seperator">&nbsp;</span>
+
                   <!-- 0.11.4 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
                         FreeCol 0.11.4 released and withdrawn
@@ -107,10 +136,11 @@
                         <div align="left">FreeCol 0.11.4</div>
                         <div align="left">&nbsp;</div>
                         <div align="left">
-                    FreeCol 0.11.4 was released on Friday, but found
-                    to generate broken maps.  It has been withdrawn.
-                    0.11.5 will be released soon.
-                        <div align="left">&nbsp;</div>
+                            FreeCol 0.11.4 was released on Friday, but found
+                            to generate broken maps. It has been withdrawn.
+                            0.11.5 will be released soon.
+                            <div align="left">&nbsp;</div>
+                        </div>
                   </td></tr></table>
                   
                   <span class="article_seperator">&nbsp;</span>
@@ -143,12 +173,8 @@
                           <br /><br />The FreeCol Team
                         </div>
                         <div align="left">&nbsp;</div>
-                        <!-- Here is the download button.
-                             Move it to the new release! -->
-                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                                    <a href="../download.html">Download FreeCol 0.11.3</a>
-                        </em></strong></td></tr></tbody></table>
-                        <!-- End of download button -->
+
+
                   </td></tr></table>
                   
                   <span class="article_seperator">&nbsp;</span>
@@ -501,8 +527,8 @@
                   <a href="../news/Page-8.html" class="pagenav"><strong>8</strong></a> 
                   <a href="../news/Page-9.html" class="pagenav"><strong>9</strong></a>
                   <a href="../news/Page-10.html" class="pagenav"><strong>10</strong></a>
-                  <a href="../news/Page-2.html " class="pagenav" title="Next">Next&nbsp;&gt;</a> 
-                  <a href="../news/Page-13.html " class="pagenav" title="End">End&nbsp;&gt;&gt;</a>
+                  <a href="../news/Page-2.html" class="pagenav" title="Next">Next&nbsp;&gt;</a>
+                  <a href="../news/Page-13.html" class="pagenav" title="End">End&nbsp;&gt;&gt;</a>
                   <br /><br />
                 </td>
               </tr>
@@ -531,4 +557,3 @@
     </div>
   </body>
 </html>
-<!-- 1419163597 -->
diff --git a/www.freecol.org/news/releases.html b/www.freecol.org/news/releases.html
index b92c4badf..622845aae 100644
--- a/www.freecol.org/news/releases.html
+++ b/www.freecol.org/news/releases.html
@@ -95,34 +95,63 @@
               <tr>
                 <td valign="top">
 
-                  <!-- 0.11.4 -->
+                  <!-- 0.11.5 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
-                        FreeCol 0.11.4 released, and withdrawn
+                    FreeCol 0.11.5 released
                   </td></tr></table>
                   <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
-                        Sunday, 2 August 2015
-                    </td></tr>
+                    Monday, 3 August 2015
+                  </td></tr>
+                    <tr>
+                      <td valign="top" colspan="2">
+                        <div align="left">FreeCol 0.11.3</div>
+                        <div align="left">&nbsp;</div>
+                        <div align="left">
+                          FreeCol 0.11.5 has been released to fix
+                          file corruption in 0.11.4. All users of
+                          FreeCol 0.11.4 are encouraged to upgrade
+                          as soon as possible.
+                          <div align="left">&nbsp;</div>
+
+                          <!-- Here is the download button.
+                               Move it to the new release! -->
+                          <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
+                            <a href="../download.html">Download FreeCol 0.11.5</a>
+                          </em></strong></td></tr></tbody></table>
+                          <!-- End of download button -->
+                        </div>
+                      </td></tr></table>
+
+                  <span class="article_seperator">&nbsp;</span>
+
+                  <!-- 0.11.4 -->
+                  <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
+                    FreeCol 0.11.4 released and withdrawn
+                  </td></tr></table>
+                  <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
+                    Sunday, 2 August 2015
+                  </td></tr>
                     <tr>
                       <td valign="top" colspan="2">
                         <div align="left">FreeCol 0.11.4</div>
                         <div align="left">&nbsp;</div>
                         <div align="left">
-                    FreeCol 0.11.4 was released on Friday, but found
-                    to generate broken maps.  It has been withdrawn.
-                    0.11.5 will be released soon.
+                          FreeCol 0.11.4 was released on Friday, but found
+                          to generate broken maps. It has been withdrawn.
+                          0.11.5 will be released soon.
+                          <div align="left">&nbsp;</div>
                         </div>
-                        <div align="left">&nbsp;</div>
-                  </td></tr></table>
-                  
+                      </td></tr></table>
+
                   <span class="article_seperator">&nbsp;</span>
 
                   <!-- 0.11.3 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
-                        FreeCol 0.11.3 released
+                    FreeCol 0.11.3 released
                   </td></tr></table>
                   <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
-                        Sunday, 8 March 2015
-                    </td></tr>
+                    Sunday, 8 March 2015
+                  </td></tr>
                     <tr>
                       <td valign="top" colspan="2">
                         <div align="left">FreeCol 0.11.3</div>
@@ -144,13 +173,9 @@
                           <br /><br />The FreeCol Team
                         </div>
                         <div align="left">&nbsp;</div>
-                        <!-- Here is the download button.
-                             Move it to the new release! -->
-                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                                    <a href="../download.html">Download FreeCol 0.11.3</a>
-                        </em></strong></td></tr></tbody></table>
-                        <!-- End of download button -->
-                  </td></tr></table>
+
+
+                      </td></tr></table>
                   
                   <span class="article_seperator">&nbsp;</span>
 
diff --git a/www.freecol.org/sitemap.html b/www.freecol.org/sitemap.html
index 24932c785..449c29096 100644
--- a/www.freecol.org/sitemap.html
+++ b/www.freecol.org/sitemap.html
@@ -63,6 +63,8 @@
                             <li><a href="index.html" title="Home">Home</a></li>
                             <li><a href="news/" title="News">News</a>
                                 <ul class="level_1">
+                                    <li><a href="news/freecol-0.11.5-released.html" title="FreeCol 0.11.3 released">FreeCol 0.11.5 released</a></li>
+                                    <li><a href="news/freecol-0.11.4-released.html" title="FreeCol 0.11.3 released">FreeCol 0.11.4 released and withdrawn</a></li>
                                     <li><a href="news/freecol-0.11.3-released.html" title="FreeCol 0.11.3 released">FreeCol 0.11.3 released</a></li>
                                     <li><a href="news/freecol-0.11.2-released.html" title="FreeCol 0.11.2 released">FreeCol 0.11.2 released</a></li>
                                     <li><a href="news/freecol-0.11.1-released.html" title="FreeCol 0.11.1 released">FreeCol 0.11.1 released</a></li>

From 93373cac8b170fcab1d1292de185e328d9bd0c7e Mon Sep 17 00:00:00 2001
From: calebrw <calebrw@gmail.com>
Date: Sun, 2 Aug 2015 14:45:34 -0500
Subject: [PATCH 045/323] Fix web links.

---
 www.freecol.org/index.html                    |  2 +-
 .../news/freecol-0.11.3-released.html         | 22 ++++++++++++++-----
 .../news/freecol-0.11.4-released.html         |  4 ++--
 .../news/freecol-0.11.5-released.html         |  6 ++---
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/www.freecol.org/index.html b/www.freecol.org/index.html
index 8fe907d9b..832e20711 100644
--- a/www.freecol.org/index.html
+++ b/www.freecol.org/index.html
@@ -77,7 +77,7 @@
                                                             <a href="download.html"><img src="images/download2.png" border="0" alt="" /></a>
                                                         </td>
                                                         <td>
-                                                            <strong><em><a href="download.html">Download FreeCol 0.11.3</a></em></strong>
+                                                            <strong><em><a href="download.html">Download FreeCol 0.11.5</a></em></strong>
                                                         </td>
                                                     </tr>
                                                 </table>
diff --git a/www.freecol.org/news/freecol-0.11.3-released.html b/www.freecol.org/news/freecol-0.11.3-released.html
index 444969f55..6a9109737 100644
--- a/www.freecol.org/news/freecol-0.11.3-released.html
+++ b/www.freecol.org/news/freecol-0.11.3-released.html
@@ -109,8 +109,15 @@
 			</tr>
 					<tr>
 			<td valign="top" colspan="2">
-				<div align="left">FreeCol 0.11.3</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are vaguely pleased to announce the release of
-FreeCol 0.11.3. This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1/2. See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.3%20Release%20Notes/" title="release notes">release notes</a> for more detail. All 0.10.x and 0.11.x games should continue to work with 0.11.3.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.3.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="../download.html">Download FreeCol 0.11.3</a></em></strong>                         </td>                     </tr>                 </tbody></table>			</td>
+				<div align="left">FreeCol 0.11.3</div>
+                <div align="left">&nbsp;</div>
+                <div align="left">The FreeCol team are vaguely pleased to announce the release of
+                    FreeCol 0.11.3. This is a bug fix release to clean up yet more annoying
+                    problems in version 0.11.0/1/2. See the
+                    <a href="https://sourceforge.net/p/freecol/wiki/0.11.3%20Release%20Notes/" title="release notes">release notes</a> for more detail.
+                    All 0.10.x and 0.11.x games should continue to work with 0.11.3.<br /></div>&nbsp;
+                <div align="left">We hope you enjoy FreeCol 0.11.3.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div>
+			</td>
 		</tr>
 				</table>
 
@@ -118,11 +125,16 @@ FreeCol 0.11.3. This is a bug fix release to clean up yet more annoying problems
 
 					<table align="center" style="margin-top: 25px;">
 			<tr>
-									<th class="pagenav_next">
+                <th class="pagenav_prev">
+                    <a href="../news/freecol-0.11.4-released.html">
+                        &lt; Previous
+                    </a>
+                </th>
+                <th class="pagenav_next">
 						<a href="../news/freecol-0.11.2-released.html">
 							Next &gt;</a>
-					</th>
-								</tr>
+                </th>
+			</tr>
 			</table>
 						<div class="back_button">
 				<a href='javascript:history.go(-1)'>
diff --git a/www.freecol.org/news/freecol-0.11.4-released.html b/www.freecol.org/news/freecol-0.11.4-released.html
index 2bcf3cef2..10245a311 100644
--- a/www.freecol.org/news/freecol-0.11.4-released.html
+++ b/www.freecol.org/news/freecol-0.11.4-released.html
@@ -129,14 +129,14 @@
                 <table align="center" style="margin-top: 25px;">
                     <tr>
                       <th class="pagenav_prev">
-                        <a href="../news/freecol-0.11.3-released.html">
+                        <a href="../news/freecol-0.11.5-released.html">
                           &lt; Prev</a>
                       </th>
                       <td width="50">&nbsp;
 
                       </td>
                       <th class="pagenav_next">
-                        <a href="../news/freecol-0.11.5-released.html">
+                        <a href="../news/freecol-0.11.3-released.html">
                           Next &gt;</a>
                       </th>
                     </tr>
diff --git a/www.freecol.org/news/freecol-0.11.5-released.html b/www.freecol.org/news/freecol-0.11.5-released.html
index 481274cdb..b74ca1ad2 100644
--- a/www.freecol.org/news/freecol-0.11.5-released.html
+++ b/www.freecol.org/news/freecol-0.11.5-released.html
@@ -129,11 +129,11 @@
                 <table align="center" style="margin-top: 25px;">
                     <tr>
                         <th class="pagenav_prev">
-                            <a href="../news/freecol-0.11.4-released.html">
-                                Next &gt;</a>
+                            <a href="#"><!-- &lt; Previous --></a>
                         </th>
                         <th class="pagenav_next">
-                            <a href="#">&nbsp;</a>
+                            <a href="../news/freecol-0.11.4-released.html">
+                                Next &gt;</a>
                         </th>
                     </tr>
                 </table>

From 156f6855ab3ebd67687ad9ec06aca25cc208961d Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 3 Aug 2015 16:08:03 +0930
Subject: [PATCH 046/323] More doco and website fixes for 0.11.5.

---
 doc/developer.tex                  |  6 +++
 www.freecol.org/index.html         |  2 +-
 www.freecol.org/news/index.html    | 78 +++++++++++++++------------
 www.freecol.org/news/releases.html | 86 +++++++++++++++++-------------
 www.freecol.org/sitemap.html       |  4 +-
 www.freecol.org/status.html        |  2 +-
 6 files changed, 104 insertions(+), 74 deletions(-)

diff --git a/doc/developer.tex b/doc/developer.tex
index 41f8d0ec7..bf8587f00 100644
--- a/doc/developer.tex
+++ b/doc/developer.tex
@@ -442,9 +442,15 @@ recommended for a release.  Uploads to sourceforge use \texttt{sftp}.
     version number.
   \item[\texttt{www.freecol.org/index.html}] Add a reference to the
     new release.
+  \item[\texttt{www.freecol.org/sitemap.html}] Add a reference to the
+    new release.
+  \item[\texttt{www.freecol.org/status.html}] Update the release
+    version number.
   \item[\texttt{www.freecol.org/news/index.html}] Add a section for
     the new release containing the release announcement, and move the
     download button from the previous release to the new one.
+  \item[\texttt{www.freecol.org/news/releases.html}] Copy in the same
+    section from the previous file, these two are nearly identical.
   \end{description}
   Use \texttt{sftp} to log in at
   \emph{username}\texttt{,freecol@web.sf.net} to upload changes (the
diff --git a/www.freecol.org/index.html b/www.freecol.org/index.html
index 832e20711..025ff5cd2 100644
--- a/www.freecol.org/index.html
+++ b/www.freecol.org/index.html
@@ -101,7 +101,7 @@
                                             </li>
                                             <li>
                                                 <a class="blogsection" href="news/freecol-0.11.4-released.html">
-                                                    FreeCol 0.11.4 released
+                                                    FreeCol 0.11.4 released and withdrawn
                                                 </a>
                                             </li>
                                             <li>
diff --git a/www.freecol.org/news/index.html b/www.freecol.org/news/index.html
index ff78667b0..caa1a7cd5 100644
--- a/www.freecol.org/news/index.html
+++ b/www.freecol.org/news/index.html
@@ -27,7 +27,11 @@
       </div>
       <div id="outer-800" >
         <div id="pathway">
-          <span class="pathway"><a href="../index.html" class="pathway">Home</a> <img src="../images/M_images/arrow.png" alt="arrow" />   News </span>
+          <span class="pathway">
+            <a href="../index.html" class="pathway">Home</a>
+            <img src="../images/M_images/arrow.png" alt="arrow" />
+            News
+          </span>
           <span class="pathway-right">
             <a href="../sitemap.html"><img src="../templates/freecol/images/sitemap.png" border="0" width="14" height="16" alt="SITEMAP" /></a>
           </span>
@@ -95,34 +99,44 @@
               <tr>
                 <td valign="top">
 
-                <!-- 0.11.5 -->
-                <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
-                    FreeCol 0.11.5 released
-                </td></tr></table>
-                <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
-                    Monday, 3 August 2015
-                </td></tr>
+                  <!-- 0.11.5 -->
+                  <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
+                        FreeCol 0.11.5 released
+                  </td></tr></table>
+                  <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
+                        Monday, 3 August 2015
+                  </td></tr>
                     <tr>
-                        <td valign="top" colspan="2">
-                            <div align="left">FreeCol 0.11.3</div>
-                            <div align="left">&nbsp;</div>
-                            <div align="left">
-                                FreeCol 0.11.5 has been released to fix
-                                file corruption in 0.11.4. All users of
-                                FreeCol 0.11.4 are encouraged to upgrade
-                                as soon as possible.
-                                <div align="left">&nbsp;</div>
+                      <td valign="top" colspan="2">
+                        <div align="left">FreeCol 0.11.3</div>
+                        <div align="left">&nbsp;</div>
+                        <div align="left">
+                          FreeCol 0.11.5 has been released with one
+                          critical bug fix from the withdrawn 0.11.4.
+                          All 0.10.x and 0.11.x games should continue
+                          to work with 0.11.5, with the exception of
+                          games generated with 0.11.4 which are badly
+                          broken.  For more details on the changes
+                          since 0.11.3, see the                       
+                          <a href="https://sourceforge.net/p/freecol/wiki/0.11.5%20Release%20Notes/"
 
-                                <!-- Here is the download button.
-                                     Move it to the new release! -->
-                                <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
+                             title="release notes">release notes</a>.
+                        </div>
+                        <div align="left">
+                          We this time you get to enjoy the new FreeCol
+                          release.&nbsp; Onward to 1.0.
+                          <br /><br />The FreeCol Team
+                        </div>
+                        <div align="left">&nbsp;</div>
+                        <!-- Here is the download button.
+                             Move it to the new release! -->
+                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
                                     <a href="../download.html">Download FreeCol 0.11.5</a>
-                                </em></strong></td></tr></tbody></table>
-                                <!-- End of download button -->
-                            </div>
-                        </td></tr></table>
+                        </em></strong></td></tr></tbody></table>
+                        <!-- End of download button -->
+                      </td></tr></table>
 
-                <span class="article_seperator">&nbsp;</span>
+                  <span class="article_seperator">&nbsp;</span>
 
                   <!-- 0.11.4 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
@@ -136,15 +150,15 @@
                         <div align="left">FreeCol 0.11.4</div>
                         <div align="left">&nbsp;</div>
                         <div align="left">
-                            FreeCol 0.11.4 was released on Friday, but found
-                            to generate broken maps. It has been withdrawn.
-                            0.11.5 will be released soon.
-                            <div align="left">&nbsp;</div>
+                          FreeCol 0.11.4 was released on Friday, but found
+                          to generate broken maps. It has been withdrawn.
+                          0.11.5 will be released soon.
+                          <div align="left">&nbsp;</div>
                         </div>
                   </td></tr></table>
-                  
-                  <span class="article_seperator">&nbsp;</span>
 
+                  <span class="article_seperator">&nbsp;</span>
+                  
                   <!-- 0.11.3 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
                         FreeCol 0.11.3 released
@@ -173,8 +187,6 @@
                           <br /><br />The FreeCol Team
                         </div>
                         <div align="left">&nbsp;</div>
-
-
                   </td></tr></table>
                   
                   <span class="article_seperator">&nbsp;</span>
diff --git a/www.freecol.org/news/releases.html b/www.freecol.org/news/releases.html
index 622845aae..09aff7b64 100644
--- a/www.freecol.org/news/releases.html
+++ b/www.freecol.org/news/releases.html
@@ -27,7 +27,11 @@
       </div>
       <div id="outer-800" >
         <div id="pathway">
-          <span class="pathway"><a href="../index.html" class="pathway">Home</a> <img src="../images/M_images/arrow.png" alt="arrow" /> <a href="../news/" class="pathway">News</a> <img src="../images/M_images/arrow.png" alt="arrow" />   Releases </span>
+          <span class="pathway">
+            <a href="../index.html" class="pathway">Home</a>
+            <img src="../images/M_images/arrow.png" alt="arrow" />
+            Releases
+          </span>
           <span class="pathway-right">
             <a href="../sitemap.html"><img src="../templates/freecol/images/sitemap.png" border="0" width="14" height="16" alt="SITEMAP" /></a>
           </span>
@@ -97,40 +101,50 @@
 
                   <!-- 0.11.5 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
-                    FreeCol 0.11.5 released
+                        FreeCol 0.11.5 released
                   </td></tr></table>
                   <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
-                    Monday, 3 August 2015
+                        Monday, 3 August 2015
                   </td></tr>
                     <tr>
                       <td valign="top" colspan="2">
                         <div align="left">FreeCol 0.11.3</div>
                         <div align="left">&nbsp;</div>
                         <div align="left">
-                          FreeCol 0.11.5 has been released to fix
-                          file corruption in 0.11.4. All users of
-                          FreeCol 0.11.4 are encouraged to upgrade
-                          as soon as possible.
-                          <div align="left">&nbsp;</div>
+                          FreeCol 0.11.5 has been released with one
+                          critical bug fix from the withdrawn 0.11.4.
+                          All 0.10.x and 0.11.x games should continue
+                          to work with 0.11.5, with the exception of
+                          games generated with 0.11.4 which are badly
+                          broken.  For more details on the changes
+                          since 0.11.3, see the                       
+                          <a href="https://sourceforge.net/p/freecol/wiki/0.11.5%20Release%20Notes/"
 
-                          <!-- Here is the download button.
-                               Move it to the new release! -->
-                          <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                            <a href="../download.html">Download FreeCol 0.11.5</a>
-                          </em></strong></td></tr></tbody></table>
-                          <!-- End of download button -->
+                             title="release notes">release notes</a>.
                         </div>
+                        <div align="left">
+                          We this time you get to enjoy the new FreeCol
+                          release.&nbsp; Onward to 1.0.
+                          <br /><br />The FreeCol Team
+                        </div>
+                        <div align="left">&nbsp;</div>
+                        <!-- Here is the download button.
+                             Move it to the new release! -->
+                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
+                                    <a href="../download.html">Download FreeCol 0.11.5</a>
+                        </em></strong></td></tr></tbody></table>
+                        <!-- End of download button -->
                       </td></tr></table>
 
                   <span class="article_seperator">&nbsp;</span>
 
                   <!-- 0.11.4 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
-                    FreeCol 0.11.4 released and withdrawn
+                        FreeCol 0.11.4 released and withdrawn
                   </td></tr></table>
                   <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
-                    Sunday, 2 August 2015
-                  </td></tr>
+                        Sunday, 2 August 2015
+                    </td></tr>
                     <tr>
                       <td valign="top" colspan="2">
                         <div align="left">FreeCol 0.11.4</div>
@@ -141,17 +155,17 @@
                           0.11.5 will be released soon.
                           <div align="left">&nbsp;</div>
                         </div>
-                      </td></tr></table>
+                  </td></tr></table>
 
                   <span class="article_seperator">&nbsp;</span>
-
+                  
                   <!-- 0.11.3 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
-                    FreeCol 0.11.3 released
+                        FreeCol 0.11.3 released
                   </td></tr></table>
                   <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
-                    Sunday, 8 March 2015
-                  </td></tr>
+                        Sunday, 8 March 2015
+                    </td></tr>
                     <tr>
                       <td valign="top" colspan="2">
                         <div align="left">FreeCol 0.11.3</div>
@@ -173,9 +187,7 @@
                           <br /><br />The FreeCol Team
                         </div>
                         <div align="left">&nbsp;</div>
-
-
-                      </td></tr></table>
+                  </td></tr></table>
                   
                   <span class="article_seperator">&nbsp;</span>
 
@@ -518,22 +530,23 @@
                   <span class="pagenav">&lt;&lt;&nbsp;Start</span>
                   <span class="pagenav">&lt;&nbsp;Prev</span>
                   <span class="pagenav">1</span>
-                  <a href="../news/releases/Page-2.html" class="pagenav"><strong>2</strong></a>
-                  <a href="../news/releases/Page-3.html" class="pagenav"><strong>3</strong></a> 
-                  <a href="../news/releases/Page-4.html" class="pagenav"><strong>4</strong></a> 
-                  <a href="../news/releases/Page-5.html" class="pagenav"><strong>5</strong></a> 
-                  <a href="../news/releases/Page-6.html" class="pagenav"><strong>6</strong></a> 
-                  <a href="../news/releases/Page-7.html" class="pagenav"><strong>7</strong></a> 
-                  <a href="../news/releases/Page-8.html" class="pagenav"><strong>8</strong></a> 
-                  <a href="../news/releases/Page-9.html" class="pagenav"><strong>9</strong></a> 
-                  <a href="../news/releases/Page-2.html" class="pagenav" title="Next">Next&nbsp;&gt;</a> 
-                  <a href="../news/releases/Page-9.html" class="pagenav" title="End">End&nbsp;&gt;&gt;</a>
+                  <a href="../news/Page-2.html" class="pagenav"><strong>2</strong></a>
+                  <a href="../news/Page-3.html" class="pagenav"><strong>3</strong></a>
+                  <a href="../news/Page-4.html" class="pagenav"><strong>4</strong></a>
+                  <a href="../news/Page-5.html" class="pagenav"><strong>5</strong></a>
+                  <a href="../news/Page-6.html" class="pagenav"><strong>6</strong></a>
+                  <a href="../news/Page-7.html" class="pagenav"><strong>7</strong></a> 
+                  <a href="../news/Page-8.html" class="pagenav"><strong>8</strong></a> 
+                  <a href="../news/Page-9.html" class="pagenav"><strong>9</strong></a>
+                  <a href="../news/Page-10.html" class="pagenav"><strong>10</strong></a>
+                  <a href="../news/Page-2.html" class="pagenav" title="Next">Next&nbsp;&gt;</a>
+                  <a href="../news/Page-13.html" class="pagenav" title="End">End&nbsp;&gt;&gt;</a>
                   <br /><br />
                 </td>
               </tr>
 
               <tr>
-                <td valign="top" align="center">Results 1 - 5 of 44</td>
+                <td valign="top" align="center">Results 1 - 5 of 63</td>
               </tr>
             </table>
 
@@ -556,4 +569,3 @@
     </div>
   </body>
 </html>
-<!-- 1419163623 -->
diff --git a/www.freecol.org/sitemap.html b/www.freecol.org/sitemap.html
index 449c29096..a3f2cdb13 100644
--- a/www.freecol.org/sitemap.html
+++ b/www.freecol.org/sitemap.html
@@ -63,8 +63,8 @@
                             <li><a href="index.html" title="Home">Home</a></li>
                             <li><a href="news/" title="News">News</a>
                                 <ul class="level_1">
-                                    <li><a href="news/freecol-0.11.5-released.html" title="FreeCol 0.11.3 released">FreeCol 0.11.5 released</a></li>
-                                    <li><a href="news/freecol-0.11.4-released.html" title="FreeCol 0.11.3 released">FreeCol 0.11.4 released and withdrawn</a></li>
+                                    <li><a href="news/freecol-0.11.5-released.html" title="FreeCol 0.11.5 released">FreeCol 0.11.5 released</a></li>
+                                    <li><a href="news/freecol-0.11.4-released.html" title="FreeCol 0.11.4 released">FreeCol 0.11.4 released and withdrawn</a></li>
                                     <li><a href="news/freecol-0.11.3-released.html" title="FreeCol 0.11.3 released">FreeCol 0.11.3 released</a></li>
                                     <li><a href="news/freecol-0.11.2-released.html" title="FreeCol 0.11.2 released">FreeCol 0.11.2 released</a></li>
                                     <li><a href="news/freecol-0.11.1-released.html" title="FreeCol 0.11.1 released">FreeCol 0.11.1 released</a></li>
diff --git a/www.freecol.org/status.html b/www.freecol.org/status.html
index 51f1af9a3..4f4495b15 100644
--- a/www.freecol.org/status.html
+++ b/www.freecol.org/status.html
@@ -75,7 +75,7 @@
                 <table class="contentpaneopen">
                     <tr>
                         <td valign="top" colspan="2">
-                            <p>The last version to be released was FreeCol 0.11.3.</p>
+                            <p>The last version to be released was FreeCol 0.11.5.</p>
                             <p>FreeCol is continuously developed. For more on the latest Freecol development progress, please visit the <a href="https://sourceforge.net/projects/freecol/" title="FreeCol on SourceForge">SourceForge Project page</a>.</p>
                         </td>
                     </tr>

From d88fef31e783bca92ff9300be39299f4dd8681c4 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 3 Aug 2015 16:34:22 +0930
Subject: [PATCH 047/323] Drop download button from 0.11.4 release page.

---
 www.freecol.org/news/freecol-0.11.4-released.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/www.freecol.org/news/freecol-0.11.4-released.html b/www.freecol.org/news/freecol-0.11.4-released.html
index 10245a311..624c1dddb 100644
--- a/www.freecol.org/news/freecol-0.11.4-released.html
+++ b/www.freecol.org/news/freecol-0.11.4-released.html
@@ -116,12 +116,6 @@
                     0.11.5 will be released soon.
                   </div>
                   <div align="left">&nbsp;</div>
-                  <!-- Here is the download button.
-                  Move it to the new release! -->
-                  <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                              <a href="../download.html">Download FreeCol 0.11.3</a>
-                  </em></strong></td></tr></tbody></table>
-                  <!-- End of download button -->
             </td></tr></table>
 
 		        <span class="article_seperator">&nbsp;</span>

From 7d25a091bed220345ced4fa475c00d3a48c5118f Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 3 Aug 2015 15:58:05 +0930
Subject: [PATCH 048/323] Bump version following release from stable.

---
 doc/version.sty                 | 2 +-
 src/net/sf/freecol/FreeCol.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/version.sty b/doc/version.sty
index 507b8dfe5..930d5707d 100644
--- a/doc/version.sty
+++ b/doc/version.sty
@@ -1,4 +1,4 @@
 %-*-LaTeX-*-
 % Trivial file to contain the version number definition, used by both
 % FreeCol.tex and developer.tex.
-\newcommand{\fcversion}{0.11.4}
+\newcommand{\fcversion}{0.11.5}
diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index aef00ed60..bc7ea1ff1 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -81,7 +81,7 @@ public final class FreeCol {
     private static final Logger logger = Logger.getLogger(FreeCol.class.getName());
 
     /** The FreeCol release version number. */
-    private static final String FREECOL_VERSION = "0.11.4";
+    private static final String FREECOL_VERSION = "0.11.5";
 
     /** The difficulty levels. */
     public static final String[] DIFFICULTIES = {

From 46f33494e45d6ccc2804839fd7cb4fc15df4b569 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 22 Jun 2015 09:51:59 +0930
Subject: [PATCH 049/323] Add destroyBuilding.

---
 src/net/sf/freecol/common/model/Colony.java   | 30 ++++++++++++++-----
 .../sf/freecol/server/model/ServerPlayer.java |  3 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index f0fa87887..2820b745a 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -572,16 +572,30 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @param building The <code>Building</code> to remove.
      * @return True if the building was removed.
      */
-    public boolean removeBuilding(final Building building) {
-        BuildingType buildingType = building.getType().getFirstLevel();
-        boolean result = buildingMap.remove(buildingType.getId()) != null;
-        if (result) {
-            removeFeatures(building.getType());
-            invalidateCache();
-        }
-        return result;
+    protected boolean removeBuilding(final Building building) {
+        final BuildingType buildingType = building.getType().getFirstLevel();
+        if (buildingMap.remove(buildingType.getId()) == null) return false;
+        removeFeatures(building.getType());
+        return true;
     }
 
+    /**
+     * Destroy an existing building in this colony.
+     *
+     * @param building The <code>Building</code> to destroy.
+     * @return True if the building was destroyed.
+     */
+    public boolean destroyBuilding(Building building) {
+        Tile copied = (building.getType().isDefenceType())
+            ? getTile().getTileToCache() : null;
+        if (!removeBuilding(building)) return false;
+        getTile().cacheUnseen(copied);
+        invalidateCache();
+        checkBuildQueueIntegrity(true);
+        return true;
+    }
+
+
     /**
      * Gets a building for producing a given type of goods.
      * 
diff --git a/src/net/sf/freecol/server/model/ServerPlayer.java b/src/net/sf/freecol/server/model/ServerPlayer.java
index d7ec32a6e..341036e6f 100644
--- a/src/net/sf/freecol/server/model/ServerPlayer.java
+++ b/src/net/sf/freecol/server/model/ServerPlayer.java
@@ -3797,8 +3797,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
         BuildingType type = building.getType();
         if (type.getUpgradesFrom() == null) {
             changed = colony.ejectUnits(building, building.getUnitList());//-til
-            colony.removeBuilding(building);//-til
-            colony.checkBuildQueueIntegrity(true);
+            colony.destroyBuilding(building);//-til
             changed |= building.getType().isDefenceType();
             cs.addRemove(See.only((ServerPlayer)colony.getOwner()), colony, 
                          building);//-vis: safe, buildings are ok

From 7c268e75e03836145a00e49638445110a0b361ac Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 30 Jul 2015 09:42:38 +0930
Subject: [PATCH 050/323] Drop some setters from FreeColDirectories.

---
 .../client/control/InGameController.java      |  4 ++--
 .../freecol/common/io/FreeColDirectories.java | 22 ++-----------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 580c0f629..8d8790cc9 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -3678,7 +3678,7 @@ public final class InGameController implements NetworkConstants {
         turnReportMessages.clear();
         gui.setActiveUnit(null);
         gui.removeInGameComponents();
-        FreeColDirectories.setSavegameFile(file);
+        FreeColDirectories.setSavegameFile(file.getPath());
         freeColClient.getConnectController().startSavedGame(file, null);
     }
 
@@ -4202,7 +4202,7 @@ public final class InGameController implements NetworkConstants {
             || !file.exists()
             || gui.confirm("saveConfirmationDialog.areYouSure.text",
                            "ok", "cancel")) {
-            FreeColDirectories.setSaveDirectory(file.getParentFile());
+            FreeColDirectories.setSavegameFile(file.getPath());
             return saveGame(file);
         }
         return false;
diff --git a/src/net/sf/freecol/common/io/FreeColDirectories.java b/src/net/sf/freecol/common/io/FreeColDirectories.java
index 418c2cdeb..9d4d5a3ce 100644
--- a/src/net/sf/freecol/common/io/FreeColDirectories.java
+++ b/src/net/sf/freecol/common/io/FreeColDirectories.java
@@ -810,15 +810,6 @@ public class FreeColDirectories {
         return saveDirectory;
     }
 
-    /**
-     * Set the directory where the saved games should be put.
-     *
-     * @param dir The new saved games directory.
-     */
-    public static void setSaveDirectory(File dir) {
-        saveDirectory = dir;
-    }
-
     /**
      * Gets the save game file.
      *
@@ -828,15 +819,6 @@ public class FreeColDirectories {
         return savegameFile;
     }
 
-    /**
-     * Sets the save game file.
-     *
-     * @param file The new save game file.
-     */
-    public static void setSavegameFile(File file) {
-        savegameFile = file;
-    }
-
     /**
      * Sets the save game file.
      *
@@ -849,10 +831,10 @@ public class FreeColDirectories {
             file = new File(getSaveDirectory(), path);
             if (!file.exists() || !file.isFile() || !file.canRead()) return false;
         }
-        setSavegameFile(file);
+        savegameFile = file;
         File parent = file.getParentFile();
         if (parent == null) parent = new File(".");
-        setSaveDirectory(parent);
+        saveDirectory = parent;
         deriveAutosaveDirectory();
         return true;
     }

From 23f01ea7c238492fd361ae7bd490272a28440fd9 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 3 Aug 2015 19:18:01 +0930
Subject: [PATCH 051/323] Restore roads to IndianSettlements, Fenyo reports
 Col1 had them.

---
 src/net/sf/freecol/common/model/Settlement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/common/model/Settlement.java b/src/net/sf/freecol/common/model/Settlement.java
index 938e1c7b8..a5eb7fdbc 100644
--- a/src/net/sf/freecol/common/model/Settlement.java
+++ b/src/net/sf/freecol/common/model/Settlement.java
@@ -233,7 +233,7 @@ public abstract class Settlement extends GoodsLocation
         for (Tile t : tiles) {
             t.changeOwnership(owner, this);//-vis(owner,this),-til
         }
-        if (this instanceof Colony && !tile.hasRoad()) {
+        if (!tile.hasRoad()) {
             TileImprovement road = tile.addRoad();
             road.setTurnsToComplete(0);
             road.setVirtual(true);

From c00398b9aa99a95ee38ba8bb1de50ad0e86929f6 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 3 Aug 2015 20:06:30 +0930
Subject: [PATCH 052/323] Improve colopedia school messages, BR#2881.

---
 data/strings/FreeColMessages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index b8bc97b81..14a88d1c7 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -2998,7 +2998,7 @@ colopedia.unit.offensivePower=Offensive Power:
 colopedia.unit.price=Price in Europe:
 colopedia.unit.productionBonus=Production {{plural:%number%|one=modifier|other=modifiers}}:
 colopedia.unit.requirements=Requirements:
-colopedia.unit.school=School required to train:
+colopedia.unit.school=May teach in:
 colopedia.unit.skill=Skill Level:
 
 

From 6a69a415a08be6fc1da229d9eab8b2e00b5fe58c Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 3 Aug 2015 20:28:13 +0930
Subject: [PATCH 053/323] Fix doubled goto, BR#2882.

---
 .../client/control/InGameController.java      | 93 +++++++++----------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 8d8790cc9..351ae2e1a 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -382,6 +382,32 @@ public final class InGameController implements NetworkConstants {
         return askSetDestination(unit, null);
     }
 
+    /**
+     * Embark onto a carrier.
+     *
+     * @param unit The <code>Unit</code> to embark.
+     * @param carrier The carrier <code>Unit</code> to board.
+     * @return True if boarding succeeded.
+     */
+    private boolean askEmbark(Unit unit, Unit carrier) {
+        // Proceed to board
+        ColonyWas colonyWas = (unit.getColony() != null)
+            ? new ColonyWas(unit.getColony()) : null;
+        EuropeWas europeWas = (unit.isInEurope())
+            ? new EuropeWas(unit.getOwner().getEurope()) : null;
+        UnitWas unitWas = new UnitWas(unit);
+        boolean ret = askServer().embark(unit, carrier, null)
+            && unit.getLocation() == carrier;
+        if (ret) {
+            freeColClient.getSoundController()
+                .playSound("sound.event.loadCargo");
+        }
+        unitWas.fireChanges();
+        if (colonyWas != null) colonyWas.fireChanges();
+        if (europeWas != null) europeWas.fireChanges();
+        return ret;
+    }
+    
     /**
      * A unit in Europe emigrates.
      *
@@ -1145,7 +1171,6 @@ public final class InGameController implements NetworkConstants {
      * @return True if the unit has completed the path and can move further.
      */
     private boolean movePath(Unit unit, PathNode path) {
-        // Traverse the path to the destination.
         for (; path != null; path = path.next) {
             if (unit.isAtLocation(path.getLocation())) continue;
 
@@ -1564,24 +1589,27 @@ public final class InGameController implements NetworkConstants {
      * @return True if the unit can move further.
      */
     private boolean moveMove(Unit unit, Direction direction) {
-        // If we are in a colony, or Europe, load sentries.
+        final ClientOptions options = freeColClient.getClientOptions();
         if (unit.canCarryUnits() && unit.hasSpaceLeft()
-            && (unit.getColony() != null || unit.isInEurope())) {
-            boolean boarded = false;
-            for (Unit sentry : unit.getLocation().getUnitList()) {
-                if (sentry.getState() == UnitState.SENTRY) {
-                    if (unit.canAdd(sentry)) {
-                        boarded |= boardShip(sentry, unit);
-                        logger.finest("Unit " + unit
-                            + " loaded sentry " + sentry);
-                    } else {
-                        logger.finest("Unit " + sentry
-                            + " is too big to board " + unit);
+            && options.getBoolean(ClientOptions.AUTOLOAD_SENTRIES)) {
+            // Autoload sentries if selected
+            List<Unit> waiting = (unit.getColony() != null)
+                ? unit.getTile().getUnitList()
+                : Collections.<Unit>emptyList();
+            for (Unit u : waiting) {
+                if (u.getState() != UnitState.SENTRY
+                    || !unit.couldCarry(u)) continue;
+                try {
+                    askEmbark(u, unit);
+                } finally {
+                    if (u.getLocation() != unit) {
+                        u.setState(UnitState.SKIPPED);
                     }
+                    continue;
                 }
             }
             // Boarding consumed this unit's moves.
-            if (boarded && unit.getMovesLeft() <= 0) return false;
+            if (unit.getMovesLeft() <= 0) return false;
         }
 
         // Ask the server
@@ -1598,7 +1626,6 @@ public final class InGameController implements NetworkConstants {
 
         // Perform a short pause on an active unit's last move if
         // the option is enabled.
-        final ClientOptions options = freeColClient.getClientOptions();
         if (unit.getMovesLeft() <= 0
             && options.getBoolean(ClientOptions.UNIT_LAST_MOVE_DELAY)) {
             gui.paintImmediatelyCanvasInItsBounds();
@@ -1616,22 +1643,6 @@ public final class InGameController implements NetworkConstants {
                     || unit.getDestination().getTile() == tile.getTile())) {
                 gui.showColonyPanel(colony, unit);
             }
-            // Autoload sentries if selected
-            if (options.getBoolean(ClientOptions.AUTOLOAD_SENTRIES)) {
-                for (Unit u : tile.getUnitList()) {
-                    if (u.getState() != UnitState.SENTRY) continue;
-                    if (unit.couldCarry(u)) {
-                        try {
-                            askServer().embark(u, unit, null);
-                        } finally {
-                            if (u.getLocation() != unit) {
-                                u.setState(UnitState.SKIPPED);
-                            }
-                            continue;
-                        }
-                    }
-                }
-            }
         }
         if (unit.getMovesLeft() <= 0) return false;
         displayModelMessages(false);
@@ -2639,23 +2650,11 @@ public final class InGameController implements NetworkConstants {
             || !Map.isSameLocation(unit.getLocation(), carrier.getLocation())
             ) return false;
 
-        // Proceed to board
-        ColonyWas colonyWas = (unit.getColony() != null)
-            ? new ColonyWas(unit.getColony()) : null;
-        EuropeWas europeWas = (unit.isInEurope())
-            ? new EuropeWas(unit.getOwner().getEurope()) : null;
-        UnitWas unitWas = new UnitWas(unit);
-        boolean ret = askServer().embark(unit, carrier, null)
-            && unit.getLocation() == carrier;
+        boolean ret = askEmbark(unit, carrier);
         if (ret) {
-            freeColClient.getSoundController()
-                .playSound("sound.event.loadCargo");
+            updateControls();
+            updateActiveUnit(null);
         }
-        unitWas.fireChanges();
-        if (colonyWas != null) colonyWas.fireChanges();
-        if (europeWas != null) europeWas.fireChanges();
-        updateControls();
-        updateActiveUnit(null);
         return ret;
     }
 
@@ -3770,7 +3769,7 @@ public final class InGameController implements NetworkConstants {
                 if (!u.isNaval()
                     && u.getState() == UnitState.SENTRY
                     && unit.canAdd(u)) {
-                    boardShip(u, unit);
+                    askEmbark(u, unit);
                 }
             }
         }

From ccf6424a886f21a354db863cb5fe9d2102d6cbaa Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 4 Aug 2015 00:06:37 +0200
Subject: [PATCH 054/323] Simplify InfoPanel mode changing and log inconsistent
 status

---
 src/net/sf/freecol/client/gui/panel/InfoPanel.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index 1bc5555f3..75d786ced 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -434,17 +434,14 @@ public final class InfoPanel extends FreeColPanel {
      * @return The panel mode.
      */
     private InfoPanelMode getMode() {
-        Player player;
         return (getFreeColClient().isMapEditor())
             ? InfoPanelMode.MAP
             : (getGUI().getViewMode() == GUI.VIEW_TERRAIN_MODE)
             ? InfoPanelMode.TILE
             : (unitInfoPanel.hasUnit())
             ? InfoPanelMode.UNIT
-            : ((player = getFreeColClient().getMyPlayer()) == null)
+            : (getFreeColClient().getMyPlayer() == null)
             ? InfoPanelMode.NONE
-            : player.hasNextActiveUnit()
-            ? InfoPanelMode.UNIT
             : InfoPanelMode.END;
     }
 
@@ -497,9 +494,9 @@ public final class InfoPanel extends FreeColPanel {
      */
     public void update() {
         InfoPanelMode newMode = getMode();
-        if(newMode == InfoPanelMode.UNIT && !unitInfoPanel.hasUnit()) {
-            unitInfoPanel.update(
-                getFreeColClient().getMyPlayer().getNextActiveUnit());
+        if(newMode == InfoPanelMode.END &&
+           getFreeColClient().getMyPlayer().hasNextActiveUnit()) {
+            logger.warning("Inconsistent InfoPanel status");
         }
         if (this.mode != newMode) {
             switch (this.mode = newMode) {

From 665985e791856d1a040e8f9775b2647fda25a848 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Tue, 4 Aug 2015 19:29:00 +0930
Subject: [PATCH 055/323] Couple of 0.11.3s still on website.

---
 www.freecol.org/news/index.html    | 2 +-
 www.freecol.org/news/releases.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www.freecol.org/news/index.html b/www.freecol.org/news/index.html
index caa1a7cd5..b947d7516 100644
--- a/www.freecol.org/news/index.html
+++ b/www.freecol.org/news/index.html
@@ -108,7 +108,7 @@
                   </td></tr>
                     <tr>
                       <td valign="top" colspan="2">
-                        <div align="left">FreeCol 0.11.3</div>
+                        <div align="left">FreeCol 0.11.5</div>
                         <div align="left">&nbsp;</div>
                         <div align="left">
                           FreeCol 0.11.5 has been released with one
diff --git a/www.freecol.org/news/releases.html b/www.freecol.org/news/releases.html
index 09aff7b64..b91712b3d 100644
--- a/www.freecol.org/news/releases.html
+++ b/www.freecol.org/news/releases.html
@@ -108,7 +108,7 @@
                   </td></tr>
                     <tr>
                       <td valign="top" colspan="2">
-                        <div align="left">FreeCol 0.11.3</div>
+                        <div align="left">FreeCol 0.11.5</div>
                         <div align="left">&nbsp;</div>
                         <div align="left">
                           FreeCol 0.11.5 has been released with one

From 339b4da2073636f95924f87eb1d64f2ea36f055c Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 3 Aug 2015 13:44:40 +0930
Subject: [PATCH 056/323] Remove reference to Joomla.

---
 www.freecol.org/create-new-article/documentation.html          | 3 +--
 www.freecol.org/create-new-article/news.html                   | 3 +--
 www.freecol.org/links/index.html                               | 1 -
 www.freecol.org/news/2-more-screenshots-added.html             | 1 -
 www.freecol.org/news/Page-10.html                              | 3 +--
 www.freecol.org/news/Page-11.html                              | 3 +--
 www.freecol.org/news/Page-12.html                              | 3 +--
 www.freecol.org/news/Page-13.html                              | 3 +--
 www.freecol.org/news/Page-2.html                               | 1 -
 www.freecol.org/news/Page-3.html                               | 3 +--
 www.freecol.org/news/Page-4.html                               | 3 +--
 www.freecol.org/news/Page-5.html                               | 3 +--
 www.freecol.org/news/Page-6.html                               | 3 +--
 www.freecol.org/news/Page-7.html                               | 3 +--
 www.freecol.org/news/Page-8.html                               | 3 +--
 www.freecol.org/news/Page-9.html                               | 3 +--
 www.freecol.org/news/background-images-and-illustrations.html  | 3 +--
 www.freecol.org/news/current-progress.html                     | 3 +--
 www.freecol.org/news/development.html                          | 3 +--
 www.freecol.org/news/development/Page-2.html                   | 1 -
 www.freecol.org/news/development/Page-3.html                   | 1 -
 www.freecol.org/news/donations.html                            | 3 +--
 www.freecol.org/news/freecol-0.1.0-released.html               | 3 +--
 www.freecol.org/news/freecol-0.10.0-alpha-released.html        | 1 -
 www.freecol.org/news/freecol-0.10.0-alpha2-released.html       | 3 +--
 www.freecol.org/news/freecol-0.10.0-released.html              | 3 +--
 www.freecol.org/news/freecol-0.10.1-released.html              | 3 +--
 www.freecol.org/news/freecol-0.10.2-released.html              | 3 +--
 www.freecol.org/news/freecol-0.10.3-released.html              | 1 -
 www.freecol.org/news/freecol-0.10.4-released.html              | 3 +--
 www.freecol.org/news/freecol-0.10.5-released.html              | 3 +--
 www.freecol.org/news/freecol-0.10.6-released.html              | 3 +--
 www.freecol.org/news/freecol-0.10.7-released.html              | 3 +--
 www.freecol.org/news/freecol-0.11.0-released.html              | 3 +--
 www.freecol.org/news/freecol-0.11.1-released.html              | 1 -
 www.freecol.org/news/freecol-0.11.2-released.html              | 1 -
 www.freecol.org/news/freecol-0.2.0-released.html               | 3 +--
 www.freecol.org/news/freecol-0.3.0-released.html               | 3 +--
 www.freecol.org/news/freecol-0.4.0-release-candidate.html      | 3 +--
 www.freecol.org/news/freecol-0.4.0-released.html               | 3 +--
 www.freecol.org/news/freecol-0.5.0-released.html               | 3 +--
 www.freecol.org/news/freecol-0.5.1-released.html               | 3 +--
 www.freecol.org/news/freecol-0.5.2-released.html               | 3 +--
 www.freecol.org/news/freecol-0.5.3-released.html               | 3 +--
 www.freecol.org/news/freecol-0.6.0-released.html               | 3 +--
 www.freecol.org/news/freecol-0.6.1-released.html               | 3 +--
 www.freecol.org/news/freecol-0.7.0-released.html               | 3 +--
 www.freecol.org/news/freecol-0.7.1-released.html               | 3 +--
 www.freecol.org/news/freecol-0.7.2-released.html               | 3 +--
 www.freecol.org/news/freecol-0.7.3-on-january-27th.html        | 3 +--
 www.freecol.org/news/freecol-0.7.3-released.html               | 3 +--
 www.freecol.org/news/freecol-0.7.4-released.html               | 3 +--
 www.freecol.org/news/freecol-0.8.0-alpha-released.html         | 3 +--
 www.freecol.org/news/freecol-0.8.0-alpha2-released.html        | 3 +--
 www.freecol.org/news/freecol-0.8.0-alpha3-released.html        | 3 +--
 www.freecol.org/news/freecol-0.8.0-released.html               | 3 +--
 www.freecol.org/news/freecol-0.8.1-released.html               | 3 +--
 www.freecol.org/news/freecol-0.8.2-released.html               | 3 +--
 www.freecol.org/news/freecol-0.8.3-released.html               | 3 +--
 www.freecol.org/news/freecol-0.8.4-released.html               | 1 -
 www.freecol.org/news/freecol-0.9.0-alpha-released.html         | 3 +--
 www.freecol.org/news/freecol-0.9.0-alpha2-released.html        | 3 +--
 www.freecol.org/news/freecol-0.9.0-released.html               | 3 +--
 www.freecol.org/news/freecol-0.9.1-released.html               | 3 +--
 www.freecol.org/news/freecol-0.9.2-released.html               | 1 -
 www.freecol.org/news/freecol-0.9.3-released.html               | 3 +--
 www.freecol.org/news/freecol-0.9.4-released.html               | 3 +--
 www.freecol.org/news/freecol-0.9.5-released.html               | 3 +--
 .../news/improvements-to-upgrade-and-downgrade-elements.html   | 3 +--
 www.freecol.org/news/intro-movie-and-music.html                | 3 +--
 www.freecol.org/news/new-colonization.html                     | 3 +--
 www.freecol.org/news/new-modifiers-available.html              | 3 +--
 www.freecol.org/news/new-website.html                          | 3 +--
 www.freecol.org/news/other.html                                | 3 +--
 www.freecol.org/news/production-depending-on-difficulty.html   | 3 +--
 www.freecol.org/news/project-member-leaving.html               | 3 +--
 www.freecol.org/news/releases/Page-2.html                      | 1 -
 www.freecol.org/news/releases/Page-3.html                      | 1 -
 www.freecol.org/news/releases/Page-4.html                      | 1 -
 www.freecol.org/news/releases/Page-5.html                      | 1 -
 www.freecol.org/news/releases/Page-6.html                      | 1 -
 www.freecol.org/news/releases/Page-7.html                      | 1 -
 www.freecol.org/news/releases/Page-8.html                      | 1 -
 www.freecol.org/news/releases/Page-9.html                      | 1 -
 .../news/sourceforge.net-community-choice-awards.html          | 3 +--
 www.freecol.org/news/start-of-the-freecol-project.html         | 3 +--
 www.freecol.org/news/status-update.html                        | 3 +--
 www.freecol.org/news/vote-for-freecol.html                     | 3 +--
 www.freecol.org/news/you-can-help-us.html                      | 3 +--
 www.freecol.org/roadmap.html                                   | 1 -
 www.freecol.org/screenshots.html                               | 1 -
 91 files changed, 70 insertions(+), 161 deletions(-)

diff --git a/www.freecol.org/create-new-article/documentation.html b/www.freecol.org/create-new-article/documentation.html
index 994028e12..fd3a1eead 100644
--- a/www.freecol.org/create-new-article/documentation.html
+++ b/www.freecol.org/create-new-article/documentation.html
@@ -7,7 +7,6 @@
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
         <base href="http://www.freecol.org/" />
         <link rel="shortcut icon" href="http://www.freecol.org/images/favicon.ico" />
@@ -75,4 +74,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163634 -->
\ No newline at end of file
+<!-- 1419163634 -->
diff --git a/www.freecol.org/create-new-article/news.html b/www.freecol.org/create-new-article/news.html
index 994028e12..fd3a1eead 100644
--- a/www.freecol.org/create-new-article/news.html
+++ b/www.freecol.org/create-new-article/news.html
@@ -7,7 +7,6 @@
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
         <base href="http://www.freecol.org/" />
         <link rel="shortcut icon" href="http://www.freecol.org/images/favicon.ico" />
@@ -75,4 +74,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163634 -->
\ No newline at end of file
+<!-- 1419163634 -->
diff --git a/www.freecol.org/links/index.html b/www.freecol.org/links/index.html
index 79ae34fcf..b537b06ef 100644
--- a/www.freecol.org/links/index.html
+++ b/www.freecol.org/links/index.html
@@ -10,7 +10,6 @@
     <meta name="description" content="FreeCol - a turn based strategy game"/>
     <meta name="keywords"
           content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose"/>
-    <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved."/>
     <meta name="robots" content="index, follow"/>
     <link rel="shortcut icon" href="../images/favicon.ico"/>
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css"/>
diff --git a/www.freecol.org/news/2-more-screenshots-added.html b/www.freecol.org/news/2-more-screenshots-added.html
index 10b6b9e2b..50fb40b3f 100644
--- a/www.freecol.org/news/2-more-screenshots-added.html
+++ b/www.freecol.org/news/2-more-screenshots-added.html
@@ -9,7 +9,6 @@
     <meta name="author" content="Administrator" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
     <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-    <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="../images/favicon.ico" />
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/news/Page-10.html b/www.freecol.org/news/Page-10.html
index e19aefa25..4da75baa7 100644
--- a/www.freecol.org/news/Page-10.html
+++ b/www.freecol.org/news/Page-10.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -274,4 +273,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163643 -->
\ No newline at end of file
+<!-- 1419163643 -->
diff --git a/www.freecol.org/news/Page-11.html b/www.freecol.org/news/Page-11.html
index 6497a9319..7d905e3b0 100644
--- a/www.freecol.org/news/Page-11.html
+++ b/www.freecol.org/news/Page-11.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -248,4 +247,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163743 -->
\ No newline at end of file
+<!-- 1419163743 -->
diff --git a/www.freecol.org/news/Page-12.html b/www.freecol.org/news/Page-12.html
index 541af9a67..1c170aa2f 100644
--- a/www.freecol.org/news/Page-12.html
+++ b/www.freecol.org/news/Page-12.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -253,4 +252,4 @@ development version of FreeCol is now entirely
         </div>
     </body>
 </html>
-<!-- 1419163745 -->
\ No newline at end of file
+<!-- 1419163745 -->
diff --git a/www.freecol.org/news/Page-13.html b/www.freecol.org/news/Page-13.html
index 68839aeaa..0ff4d1e20 100644
--- a/www.freecol.org/news/Page-13.html
+++ b/www.freecol.org/news/Page-13.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -193,4 +192,4 @@ implemented.			</td>
         </div>
     </body>
 </html>
-<!-- 1419163643 -->
\ No newline at end of file
+<!-- 1419163643 -->
diff --git a/www.freecol.org/news/Page-2.html b/www.freecol.org/news/Page-2.html
index b4c5db819..d81a5d140 100644
--- a/www.freecol.org/news/Page-2.html
+++ b/www.freecol.org/news/Page-2.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-3.html b/www.freecol.org/news/Page-3.html
index 254a0f736..55fcc3af1 100644
--- a/www.freecol.org/news/Page-3.html
+++ b/www.freecol.org/news/Page-3.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -259,4 +258,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163640 -->
\ No newline at end of file
+<!-- 1419163640 -->
diff --git a/www.freecol.org/news/Page-4.html b/www.freecol.org/news/Page-4.html
index 80147926c..a0d6ad927 100644
--- a/www.freecol.org/news/Page-4.html
+++ b/www.freecol.org/news/Page-4.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -262,4 +261,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163640 -->
\ No newline at end of file
+<!-- 1419163640 -->
diff --git a/www.freecol.org/news/Page-5.html b/www.freecol.org/news/Page-5.html
index 5abb138bd..e31da1f55 100644
--- a/www.freecol.org/news/Page-5.html
+++ b/www.freecol.org/news/Page-5.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
         <link rel="shortcut icon" href="../images/favicon.ico" />
         <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
@@ -267,4 +266,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163640 -->
\ No newline at end of file
+<!-- 1419163640 -->
diff --git a/www.freecol.org/news/Page-6.html b/www.freecol.org/news/Page-6.html
index de1b5ce5f..d74bebe5d 100644
--- a/www.freecol.org/news/Page-6.html
+++ b/www.freecol.org/news/Page-6.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -260,4 +259,4 @@ complete, church and blacksmith.</li>
         </div>
     </body>
 </html>
-<!-- 1419163641 -->
\ No newline at end of file
+<!-- 1419163641 -->
diff --git a/www.freecol.org/news/Page-7.html b/www.freecol.org/news/Page-7.html
index a57827e95..a6e9c5594 100644
--- a/www.freecol.org/news/Page-7.html
+++ b/www.freecol.org/news/Page-7.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -256,4 +255,4 @@ New features added by this release:
         </div>
     </body>
 </html>
-<!-- 1419163641 -->
\ No newline at end of file
+<!-- 1419163641 -->
diff --git a/www.freecol.org/news/Page-8.html b/www.freecol.org/news/Page-8.html
index f74b3ff74..9a2cb3f82 100644
--- a/www.freecol.org/news/Page-8.html
+++ b/www.freecol.org/news/Page-8.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -258,4 +257,4 @@ People who do not want to register at SourceForge.net can state their opinions u
         </div>
     </body>
 </html>
-<!-- 1419163642 -->
\ No newline at end of file
+<!-- 1419163642 -->
diff --git a/www.freecol.org/news/Page-9.html b/www.freecol.org/news/Page-9.html
index 54063d58d..f24ccc5ac 100644
--- a/www.freecol.org/news/Page-9.html
+++ b/www.freecol.org/news/Page-9.html
@@ -7,7 +7,6 @@
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -252,4 +251,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163642 -->
\ No newline at end of file
+<!-- 1419163642 -->
diff --git a/www.freecol.org/news/background-images-and-illustrations.html b/www.freecol.org/news/background-images-and-illustrations.html
index 30f5e24e1..dae33dd4b 100644
--- a/www.freecol.org/news/background-images-and-illustrations.html
+++ b/www.freecol.org/news/background-images-and-illustrations.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -160,4 +159,4 @@ maps contains
         </div>
     </body>
 </html>
-<!-- 1419163621 -->
\ No newline at end of file
+<!-- 1419163621 -->
diff --git a/www.freecol.org/news/current-progress.html b/www.freecol.org/news/current-progress.html
index c1a5a22c4..23c6aa30e 100644
--- a/www.freecol.org/news/current-progress.html
+++ b/www.freecol.org/news/current-progress.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -156,4 +155,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163619 -->
\ No newline at end of file
+<!-- 1419163619 -->
diff --git a/www.freecol.org/news/development.html b/www.freecol.org/news/development.html
index 9768f4074..49b5ddb6f 100644
--- a/www.freecol.org/news/development.html
+++ b/www.freecol.org/news/development.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Development</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -256,4 +255,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163624 -->
\ No newline at end of file
+<!-- 1419163624 -->
diff --git a/www.freecol.org/news/development/Page-2.html b/www.freecol.org/news/development/Page-2.html
index d66b5db40..e059df6fd 100644
--- a/www.freecol.org/news/development/Page-2.html
+++ b/www.freecol.org/news/development/Page-2.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Development</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
         <link rel="shortcut icon" href="../../images/favicon.ico" />
         <link href="../../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/news/development/Page-3.html b/www.freecol.org/news/development/Page-3.html
index af1fa9da4..dbe5c3e3a 100644
--- a/www.freecol.org/news/development/Page-3.html
+++ b/www.freecol.org/news/development/Page-3.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Development</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
         <link rel="shortcut icon" href="../../images/favicon.ico" />
         <link href="../../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/news/donations.html b/www.freecol.org/news/donations.html
index 08a237db6..6d9322a9b 100644
--- a/www.freecol.org/news/donations.html
+++ b/www.freecol.org/news/donations.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -159,4 +158,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163620 -->
\ No newline at end of file
+<!-- 1419163620 -->
diff --git a/www.freecol.org/news/freecol-0.1.0-released.html b/www.freecol.org/news/freecol-0.1.0-released.html
index 1384c6d76..78e22f8ac 100644
--- a/www.freecol.org/news/freecol-0.1.0-released.html
+++ b/www.freecol.org/news/freecol-0.1.0-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -148,4 +147,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163622 -->
\ No newline at end of file
+<!-- 1419163622 -->
diff --git a/www.freecol.org/news/freecol-0.10.0-alpha-released.html b/www.freecol.org/news/freecol-0.10.0-alpha-released.html
index 47a14682c..432d7f051 100644
--- a/www.freecol.org/news/freecol-0.10.0-alpha-released.html
+++ b/www.freecol.org/news/freecol-0.10.0-alpha-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.0-alpha2-released.html b/www.freecol.org/news/freecol-0.10.0-alpha2-released.html
index d8df5c8d4..0ed45af8a 100644
--- a/www.freecol.org/news/freecol-0.10.0-alpha2-released.html
+++ b/www.freecol.org/news/freecol-0.10.0-alpha2-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163604 -->
\ No newline at end of file
+<!-- 1419163604 -->
diff --git a/www.freecol.org/news/freecol-0.10.0-released.html b/www.freecol.org/news/freecol-0.10.0-released.html
index d1da6057b..473705531 100644
--- a/www.freecol.org/news/freecol-0.10.0-released.html
+++ b/www.freecol.org/news/freecol-0.10.0-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Doruk Fisek" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163604 -->
\ No newline at end of file
+<!-- 1419163604 -->
diff --git a/www.freecol.org/news/freecol-0.10.1-released.html b/www.freecol.org/news/freecol-0.10.1-released.html
index acbf2bd87..5aa1dd6b1 100644
--- a/www.freecol.org/news/freecol-0.10.1-released.html
+++ b/www.freecol.org/news/freecol-0.10.1-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163603 -->
\ No newline at end of file
+<!-- 1419163603 -->
diff --git a/www.freecol.org/news/freecol-0.10.2-released.html b/www.freecol.org/news/freecol-0.10.2-released.html
index 08755102a..45c608711 100644
--- a/www.freecol.org/news/freecol-0.10.2-released.html
+++ b/www.freecol.org/news/freecol-0.10.2-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Doruk Fisek" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163603 -->
\ No newline at end of file
+<!-- 1419163603 -->
diff --git a/www.freecol.org/news/freecol-0.10.3-released.html b/www.freecol.org/news/freecol-0.10.3-released.html
index 739eb363f..6e685f69a 100644
--- a/www.freecol.org/news/freecol-0.10.3-released.html
+++ b/www.freecol.org/news/freecol-0.10.3-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.4-released.html b/www.freecol.org/news/freecol-0.10.4-released.html
index de1f24616..b2333cc13 100644
--- a/www.freecol.org/news/freecol-0.10.4-released.html
+++ b/www.freecol.org/news/freecol-0.10.4-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163649 -->
\ No newline at end of file
+<!-- 1419163649 -->
diff --git a/www.freecol.org/news/freecol-0.10.5-released.html b/www.freecol.org/news/freecol-0.10.5-released.html
index 69481341c..66d903e57 100644
--- a/www.freecol.org/news/freecol-0.10.5-released.html
+++ b/www.freecol.org/news/freecol-0.10.5-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163601 -->
\ No newline at end of file
+<!-- 1419163601 -->
diff --git a/www.freecol.org/news/freecol-0.10.6-released.html b/www.freecol.org/news/freecol-0.10.6-released.html
index d078cd8bf..e8f7790c4 100644
--- a/www.freecol.org/news/freecol-0.10.6-released.html
+++ b/www.freecol.org/news/freecol-0.10.6-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163601 -->
\ No newline at end of file
+<!-- 1419163601 -->
diff --git a/www.freecol.org/news/freecol-0.10.7-released.html b/www.freecol.org/news/freecol-0.10.7-released.html
index b8275cf8d..2a0df5c07 100644
--- a/www.freecol.org/news/freecol-0.10.7-released.html
+++ b/www.freecol.org/news/freecol-0.10.7-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163600 -->
\ No newline at end of file
+<!-- 1419163600 -->
diff --git a/www.freecol.org/news/freecol-0.11.0-released.html b/www.freecol.org/news/freecol-0.11.0-released.html
index 8f0d8945d..82e80c36e 100644
--- a/www.freecol.org/news/freecol-0.11.0-released.html
+++ b/www.freecol.org/news/freecol-0.11.0-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163600 -->
\ No newline at end of file
+<!-- 1419163600 -->
diff --git a/www.freecol.org/news/freecol-0.11.1-released.html b/www.freecol.org/news/freecol-0.11.1-released.html
index 1b1ffd8e0..6301f7dc0 100644
--- a/www.freecol.org/news/freecol-0.11.1-released.html
+++ b/www.freecol.org/news/freecol-0.11.1-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.11.2-released.html b/www.freecol.org/news/freecol-0.11.2-released.html
index fd070467b..521a09607 100644
--- a/www.freecol.org/news/freecol-0.11.2-released.html
+++ b/www.freecol.org/news/freecol-0.11.2-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.2.0-released.html b/www.freecol.org/news/freecol-0.2.0-released.html
index 74932995f..e2cde4da4 100644
--- a/www.freecol.org/news/freecol-0.2.0-released.html
+++ b/www.freecol.org/news/freecol-0.2.0-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163621 -->
\ No newline at end of file
+<!-- 1419163621 -->
diff --git a/www.freecol.org/news/freecol-0.3.0-released.html b/www.freecol.org/news/freecol-0.3.0-released.html
index 731d5f57d..f7bb46f5c 100644
--- a/www.freecol.org/news/freecol-0.3.0-released.html
+++ b/www.freecol.org/news/freecol-0.3.0-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -159,4 +158,4 @@ added such as colonies, founding fathers, immigration, combat, trade, terrain im
         </div>
     </body>
 </html>
-<!-- 1419163620 -->
\ No newline at end of file
+<!-- 1419163620 -->
diff --git a/www.freecol.org/news/freecol-0.4.0-release-candidate.html b/www.freecol.org/news/freecol-0.4.0-release-candidate.html
index cf3010ed4..77e22a7e4 100644
--- a/www.freecol.org/news/freecol-0.4.0-release-candidate.html
+++ b/www.freecol.org/news/freecol-0.4.0-release-candidate.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -163,4 +162,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163620 -->
\ No newline at end of file
+<!-- 1419163620 -->
diff --git a/www.freecol.org/news/freecol-0.4.0-released.html b/www.freecol.org/news/freecol-0.4.0-released.html
index 7572bbebb..932b774b5 100644
--- a/www.freecol.org/news/freecol-0.4.0-released.html
+++ b/www.freecol.org/news/freecol-0.4.0-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -158,4 +157,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163620 -->
\ No newline at end of file
+<!-- 1419163620 -->
diff --git a/www.freecol.org/news/freecol-0.5.0-released.html b/www.freecol.org/news/freecol-0.5.0-released.html
index 61b6a0959..a9c490598 100644
--- a/www.freecol.org/news/freecol-0.5.0-released.html
+++ b/www.freecol.org/news/freecol-0.5.0-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -169,4 +168,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163618 -->
\ No newline at end of file
+<!-- 1419163618 -->
diff --git a/www.freecol.org/news/freecol-0.5.1-released.html b/www.freecol.org/news/freecol-0.5.1-released.html
index ff6faf30d..59961d054 100644
--- a/www.freecol.org/news/freecol-0.5.1-released.html
+++ b/www.freecol.org/news/freecol-0.5.1-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -162,4 +161,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163618 -->
\ No newline at end of file
+<!-- 1419163618 -->
diff --git a/www.freecol.org/news/freecol-0.5.2-released.html b/www.freecol.org/news/freecol-0.5.2-released.html
index 376e464f1..ab83c4f6a 100644
--- a/www.freecol.org/news/freecol-0.5.2-released.html
+++ b/www.freecol.org/news/freecol-0.5.2-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -162,4 +161,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163617 -->
\ No newline at end of file
+<!-- 1419163617 -->
diff --git a/www.freecol.org/news/freecol-0.5.3-released.html b/www.freecol.org/news/freecol-0.5.3-released.html
index d1505e480..25bd01cf1 100644
--- a/www.freecol.org/news/freecol-0.5.3-released.html
+++ b/www.freecol.org/news/freecol-0.5.3-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -162,4 +161,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163617 -->
\ No newline at end of file
+<!-- 1419163617 -->
diff --git a/www.freecol.org/news/freecol-0.6.0-released.html b/www.freecol.org/news/freecol-0.6.0-released.html
index 9703a5d44..a737bafcd 100644
--- a/www.freecol.org/news/freecol-0.6.0-released.html
+++ b/www.freecol.org/news/freecol-0.6.0-released.html
@@ -7,7 +7,6 @@
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -108,4 +107,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163615 -->
\ No newline at end of file
+<!-- 1419163615 -->
diff --git a/www.freecol.org/news/freecol-0.6.1-released.html b/www.freecol.org/news/freecol-0.6.1-released.html
index a2f516a88..d7f607dbc 100644
--- a/www.freecol.org/news/freecol-0.6.1-released.html
+++ b/www.freecol.org/news/freecol-0.6.1-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -161,4 +160,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163615 -->
\ No newline at end of file
+<!-- 1419163615 -->
diff --git a/www.freecol.org/news/freecol-0.7.0-released.html b/www.freecol.org/news/freecol-0.7.0-released.html
index 7385bd9ff..d0074edcc 100644
--- a/www.freecol.org/news/freecol-0.7.0-released.html
+++ b/www.freecol.org/news/freecol-0.7.0-released.html
@@ -7,7 +7,6 @@
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -74,4 +73,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163614 -->
\ No newline at end of file
+<!-- 1419163614 -->
diff --git a/www.freecol.org/news/freecol-0.7.1-released.html b/www.freecol.org/news/freecol-0.7.1-released.html
index 7385bd9ff..d0074edcc 100644
--- a/www.freecol.org/news/freecol-0.7.1-released.html
+++ b/www.freecol.org/news/freecol-0.7.1-released.html
@@ -7,7 +7,6 @@
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -74,4 +73,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163614 -->
\ No newline at end of file
+<!-- 1419163614 -->
diff --git a/www.freecol.org/news/freecol-0.7.2-released.html b/www.freecol.org/news/freecol-0.7.2-released.html
index 2080793ac..319df4845 100644
--- a/www.freecol.org/news/freecol-0.7.2-released.html
+++ b/www.freecol.org/news/freecol-0.7.2-released.html
@@ -7,7 +7,6 @@
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -74,4 +73,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163613 -->
\ No newline at end of file
+<!-- 1419163613 -->
diff --git a/www.freecol.org/news/freecol-0.7.3-on-january-27th.html b/www.freecol.org/news/freecol-0.7.3-on-january-27th.html
index cb1e8eed8..882adfb5a 100644
--- a/www.freecol.org/news/freecol-0.7.3-on-january-27th.html
+++ b/www.freecol.org/news/freecol-0.7.3-on-january-27th.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163612 -->
\ No newline at end of file
+<!-- 1419163612 -->
diff --git a/www.freecol.org/news/freecol-0.7.3-released.html b/www.freecol.org/news/freecol-0.7.3-released.html
index f2c435c8a..486d76935 100644
--- a/www.freecol.org/news/freecol-0.7.3-released.html
+++ b/www.freecol.org/news/freecol-0.7.3-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -159,4 +158,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163612 -->
\ No newline at end of file
+<!-- 1419163612 -->
diff --git a/www.freecol.org/news/freecol-0.7.4-released.html b/www.freecol.org/news/freecol-0.7.4-released.html
index 3487ee721..242559f02 100644
--- a/www.freecol.org/news/freecol-0.7.4-released.html
+++ b/www.freecol.org/news/freecol-0.7.4-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -162,4 +161,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163611 -->
\ No newline at end of file
+<!-- 1419163611 -->
diff --git a/www.freecol.org/news/freecol-0.8.0-alpha-released.html b/www.freecol.org/news/freecol-0.8.0-alpha-released.html
index 65e9254cb..fd0ba4400 100644
--- a/www.freecol.org/news/freecol-0.8.0-alpha-released.html
+++ b/www.freecol.org/news/freecol-0.8.0-alpha-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -165,4 +164,4 @@ New features added by this release:
         </div>
     </body>
 </html>
-<!-- 1419163611 -->
\ No newline at end of file
+<!-- 1419163611 -->
diff --git a/www.freecol.org/news/freecol-0.8.0-alpha2-released.html b/www.freecol.org/news/freecol-0.8.0-alpha2-released.html
index df8803981..62147956d 100644
--- a/www.freecol.org/news/freecol-0.8.0-alpha2-released.html
+++ b/www.freecol.org/news/freecol-0.8.0-alpha2-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -156,4 +155,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163611 -->
\ No newline at end of file
+<!-- 1419163611 -->
diff --git a/www.freecol.org/news/freecol-0.8.0-alpha3-released.html b/www.freecol.org/news/freecol-0.8.0-alpha3-released.html
index 3537dd70a..7a82d489f 100644
--- a/www.freecol.org/news/freecol-0.8.0-alpha3-released.html
+++ b/www.freecol.org/news/freecol-0.8.0-alpha3-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -156,4 +155,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163610 -->
\ No newline at end of file
+<!-- 1419163610 -->
diff --git a/www.freecol.org/news/freecol-0.8.0-released.html b/www.freecol.org/news/freecol-0.8.0-released.html
index d7650a2bd..e1865f5dd 100644
--- a/www.freecol.org/news/freecol-0.8.0-released.html
+++ b/www.freecol.org/news/freecol-0.8.0-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -179,4 +178,4 @@ complete, church and blacksmith.</li>
         </div>
     </body>
 </html>
-<!-- 1419163610 -->
\ No newline at end of file
+<!-- 1419163610 -->
diff --git a/www.freecol.org/news/freecol-0.8.1-released.html b/www.freecol.org/news/freecol-0.8.1-released.html
index 85ead95fc..917ca86f2 100644
--- a/www.freecol.org/news/freecol-0.8.1-released.html
+++ b/www.freecol.org/news/freecol-0.8.1-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -156,4 +155,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163609 -->
\ No newline at end of file
+<!-- 1419163609 -->
diff --git a/www.freecol.org/news/freecol-0.8.2-released.html b/www.freecol.org/news/freecol-0.8.2-released.html
index d7d7fbb75..40e154437 100644
--- a/www.freecol.org/news/freecol-0.8.2-released.html
+++ b/www.freecol.org/news/freecol-0.8.2-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -156,4 +155,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163609 -->
\ No newline at end of file
+<!-- 1419163609 -->
diff --git a/www.freecol.org/news/freecol-0.8.3-released.html b/www.freecol.org/news/freecol-0.8.3-released.html
index 7aa6e29d0..b2656403c 100644
--- a/www.freecol.org/news/freecol-0.8.3-released.html
+++ b/www.freecol.org/news/freecol-0.8.3-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -156,4 +155,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163609 -->
\ No newline at end of file
+<!-- 1419163609 -->
diff --git a/www.freecol.org/news/freecol-0.8.4-released.html b/www.freecol.org/news/freecol-0.8.4-released.html
index fe4ff7997..831fd7610 100644
--- a/www.freecol.org/news/freecol-0.8.4-released.html
+++ b/www.freecol.org/news/freecol-0.8.4-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.9.0-alpha-released.html b/www.freecol.org/news/freecol-0.9.0-alpha-released.html
index 989647709..683982970 100644
--- a/www.freecol.org/news/freecol-0.9.0-alpha-released.html
+++ b/www.freecol.org/news/freecol-0.9.0-alpha-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163607 -->
\ No newline at end of file
+<!-- 1419163607 -->
diff --git a/www.freecol.org/news/freecol-0.9.0-alpha2-released.html b/www.freecol.org/news/freecol-0.9.0-alpha2-released.html
index 0b8eaf462..e72bb6f20 100644
--- a/www.freecol.org/news/freecol-0.9.0-alpha2-released.html
+++ b/www.freecol.org/news/freecol-0.9.0-alpha2-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163607 -->
\ No newline at end of file
+<!-- 1419163607 -->
diff --git a/www.freecol.org/news/freecol-0.9.0-released.html b/www.freecol.org/news/freecol-0.9.0-released.html
index 1b9073728..be1b08155 100644
--- a/www.freecol.org/news/freecol-0.9.0-released.html
+++ b/www.freecol.org/news/freecol-0.9.0-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163607 -->
\ No newline at end of file
+<!-- 1419163607 -->
diff --git a/www.freecol.org/news/freecol-0.9.1-released.html b/www.freecol.org/news/freecol-0.9.1-released.html
index f083a38cf..283f381ed 100644
--- a/www.freecol.org/news/freecol-0.9.1-released.html
+++ b/www.freecol.org/news/freecol-0.9.1-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163606 -->
\ No newline at end of file
+<!-- 1419163606 -->
diff --git a/www.freecol.org/news/freecol-0.9.2-released.html b/www.freecol.org/news/freecol-0.9.2-released.html
index 6bddd37a5..dd87d00ab 100644
--- a/www.freecol.org/news/freecol-0.9.2-released.html
+++ b/www.freecol.org/news/freecol-0.9.2-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.9.3-released.html b/www.freecol.org/news/freecol-0.9.3-released.html
index 5a7a614ad..4aae885c5 100644
--- a/www.freecol.org/news/freecol-0.9.3-released.html
+++ b/www.freecol.org/news/freecol-0.9.3-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163605 -->
\ No newline at end of file
+<!-- 1419163605 -->
diff --git a/www.freecol.org/news/freecol-0.9.4-released.html b/www.freecol.org/news/freecol-0.9.4-released.html
index 9f8eb1198..e0eb2e4de 100644
--- a/www.freecol.org/news/freecol-0.9.4-released.html
+++ b/www.freecol.org/news/freecol-0.9.4-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163605 -->
\ No newline at end of file
+<!-- 1419163605 -->
diff --git a/www.freecol.org/news/freecol-0.9.5-released.html b/www.freecol.org/news/freecol-0.9.5-released.html
index c1269b873..afc374072 100644
--- a/www.freecol.org/news/freecol-0.9.5-released.html
+++ b/www.freecol.org/news/freecol-0.9.5-released.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163605 -->
\ No newline at end of file
+<!-- 1419163605 -->
diff --git a/www.freecol.org/news/improvements-to-upgrade-and-downgrade-elements.html b/www.freecol.org/news/improvements-to-upgrade-and-downgrade-elements.html
index 66531f9f9..0bb266ba1 100644
--- a/www.freecol.org/news/improvements-to-upgrade-and-downgrade-elements.html
+++ b/www.freecol.org/news/improvements-to-upgrade-and-downgrade-elements.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@ One of our users (Andron) wanted to know how to change the game rules in order t
         </div>
     </body>
 </html>
-<!-- 1419163608 -->
\ No newline at end of file
+<!-- 1419163608 -->
diff --git a/www.freecol.org/news/intro-movie-and-music.html b/www.freecol.org/news/intro-movie-and-music.html
index 7bc941ae3..26a6e5d1a 100644
--- a/www.freecol.org/news/intro-movie-and-music.html
+++ b/www.freecol.org/news/intro-movie-and-music.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -164,4 +163,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163616 -->
\ No newline at end of file
+<!-- 1419163616 -->
diff --git a/www.freecol.org/news/new-colonization.html b/www.freecol.org/news/new-colonization.html
index ce3924b41..c92e43b76 100644
--- a/www.freecol.org/news/new-colonization.html
+++ b/www.freecol.org/news/new-colonization.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -150,4 +149,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163612 -->
\ No newline at end of file
+<!-- 1419163612 -->
diff --git a/www.freecol.org/news/new-modifiers-available.html b/www.freecol.org/news/new-modifiers-available.html
index 835e93795..23c3996fa 100644
--- a/www.freecol.org/news/new-modifiers-available.html
+++ b/www.freecol.org/news/new-modifiers-available.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -153,4 +152,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163608 -->
\ No newline at end of file
+<!-- 1419163608 -->
diff --git a/www.freecol.org/news/new-website.html b/www.freecol.org/news/new-website.html
index 8a45338a1..66da81351 100644
--- a/www.freecol.org/news/new-website.html
+++ b/www.freecol.org/news/new-website.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -168,4 +167,4 @@ People who do not want to register at SourceForge.net can state their opinions u
         </div>
     </body>
 </html>
-<!-- 1419163613 -->
\ No newline at end of file
+<!-- 1419163613 -->
diff --git a/www.freecol.org/news/other.html b/www.freecol.org/news/other.html
index 34c5ca426..46c7fe531 100644
--- a/www.freecol.org/news/other.html
+++ b/www.freecol.org/news/other.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Other</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -223,4 +222,4 @@ People who do not want to register at SourceForge.net can state their opinions u
         </div>
     </body>
 </html>
-<!-- 1419163624 -->
\ No newline at end of file
+<!-- 1419163624 -->
diff --git a/www.freecol.org/news/production-depending-on-difficulty.html b/www.freecol.org/news/production-depending-on-difficulty.html
index fae1b74f0..fe7a978ed 100644
--- a/www.freecol.org/news/production-depending-on-difficulty.html
+++ b/www.freecol.org/news/production-depending-on-difficulty.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -148,4 +147,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163606 -->
\ No newline at end of file
+<!-- 1419163606 -->
diff --git a/www.freecol.org/news/project-member-leaving.html b/www.freecol.org/news/project-member-leaving.html
index 86f2576dc..31b5ca7f4 100644
--- a/www.freecol.org/news/project-member-leaving.html
+++ b/www.freecol.org/news/project-member-leaving.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -162,4 +161,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163618 -->
\ No newline at end of file
+<!-- 1419163618 -->
diff --git a/www.freecol.org/news/releases/Page-2.html b/www.freecol.org/news/releases/Page-2.html
index e650ef24c..2bd3b1dfe 100644
--- a/www.freecol.org/news/releases/Page-2.html
+++ b/www.freecol.org/news/releases/Page-2.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
         <link rel="shortcut icon" href="../../images/favicon.ico" />
         <link href="../../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/news/releases/Page-3.html b/www.freecol.org/news/releases/Page-3.html
index 40519e429..7ac3cb743 100644
--- a/www.freecol.org/news/releases/Page-3.html
+++ b/www.freecol.org/news/releases/Page-3.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-4.html b/www.freecol.org/news/releases/Page-4.html
index 551759e72..faac44d72 100644
--- a/www.freecol.org/news/releases/Page-4.html
+++ b/www.freecol.org/news/releases/Page-4.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-5.html b/www.freecol.org/news/releases/Page-5.html
index 37cd3b56e..018704051 100644
--- a/www.freecol.org/news/releases/Page-5.html
+++ b/www.freecol.org/news/releases/Page-5.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-6.html b/www.freecol.org/news/releases/Page-6.html
index aeea62ac8..b69a34c51 100644
--- a/www.freecol.org/news/releases/Page-6.html
+++ b/www.freecol.org/news/releases/Page-6.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-7.html b/www.freecol.org/news/releases/Page-7.html
index b8621610c..379eb1209 100644
--- a/www.freecol.org/news/releases/Page-7.html
+++ b/www.freecol.org/news/releases/Page-7.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-8.html b/www.freecol.org/news/releases/Page-8.html
index c5677e8d4..c220d3c21 100644
--- a/www.freecol.org/news/releases/Page-8.html
+++ b/www.freecol.org/news/releases/Page-8.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-9.html b/www.freecol.org/news/releases/Page-9.html
index cf5f24a49..6358dfe94 100644
--- a/www.freecol.org/news/releases/Page-9.html
+++ b/www.freecol.org/news/releases/Page-9.html
@@ -7,7 +7,6 @@
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/sourceforge.net-community-choice-awards.html b/www.freecol.org/news/sourceforge.net-community-choice-awards.html
index f394fd562..3acbf1f7d 100644
--- a/www.freecol.org/news/sourceforge.net-community-choice-awards.html
+++ b/www.freecol.org/news/sourceforge.net-community-choice-awards.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163615 -->
\ No newline at end of file
+<!-- 1419163615 -->
diff --git a/www.freecol.org/news/start-of-the-freecol-project.html b/www.freecol.org/news/start-of-the-freecol-project.html
index 363c91da0..82e0f986d 100644
--- a/www.freecol.org/news/start-of-the-freecol-project.html
+++ b/www.freecol.org/news/start-of-the-freecol-project.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -148,4 +147,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163623 -->
\ No newline at end of file
+<!-- 1419163623 -->
diff --git a/www.freecol.org/news/status-update.html b/www.freecol.org/news/status-update.html
index dd28b615b..7435b0a79 100644
--- a/www.freecol.org/news/status-update.html
+++ b/www.freecol.org/news/status-update.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -164,4 +163,4 @@ development version of FreeCol is now entirely
         </div>
     </body>
 </html>
-<!-- 1419163622 -->
\ No newline at end of file
+<!-- 1419163622 -->
diff --git a/www.freecol.org/news/vote-for-freecol.html b/www.freecol.org/news/vote-for-freecol.html
index 9e352b9f8..454a08b50 100644
--- a/www.freecol.org/news/vote-for-freecol.html
+++ b/www.freecol.org/news/vote-for-freecol.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -148,4 +147,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163614 -->
\ No newline at end of file
+<!-- 1419163614 -->
diff --git a/www.freecol.org/news/you-can-help-us.html b/www.freecol.org/news/you-can-help-us.html
index 4624c53fe..e3f25b8ff 100644
--- a/www.freecol.org/news/you-can-help-us.html
+++ b/www.freecol.org/news/you-can-help-us.html
@@ -9,7 +9,6 @@
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
         <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -155,4 +154,4 @@
         </div>
     </body>
 </html>
-<!-- 1419163606 -->
\ No newline at end of file
+<!-- 1419163606 -->
diff --git a/www.freecol.org/roadmap.html b/www.freecol.org/roadmap.html
index ee0588ec2..8313cd50a 100644
--- a/www.freecol.org/roadmap.html
+++ b/www.freecol.org/roadmap.html
@@ -9,7 +9,6 @@
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
     <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-    <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/screenshots.html b/www.freecol.org/screenshots.html
index 1074fdb7b..b6f839604 100644
--- a/www.freecol.org/screenshots.html
+++ b/www.freecol.org/screenshots.html
@@ -12,7 +12,6 @@
     <meta name="description" content="FreeCol - a turn based strategy game"/>
     <meta name="keywords"
           content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose"/>
-    <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved."/>
     <meta name="robots" content="index, follow"/>
     <link rel="shortcut icon" href="images/favicon.ico"/>
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css"/>

From ad8c543d6410e776d0c2b8bf73c3612080ebb9e1 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Tue, 4 Aug 2015 20:05:16 +0930
Subject: [PATCH 057/323] Clean up the nation resource keys, and drop those
 dots.

---
 data/strings/FreeColMessages.properties                     | 6 +++---
 src/net/sf/freecol/client/gui/ImageLibrary.java             | 2 +-
 src/net/sf/freecol/client/gui/panel/FirstContactDialog.java | 4 ++--
 src/net/sf/freecol/common/model/Player.java                 | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 14a88d1c7..cde666d27 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -3331,10 +3331,10 @@ findSettlementPanel.name=Find Settlement
 findSettlementPanel.settlement=%name%%capital% (%nation%)
 
 # FirstContactDialog
-firstContactDialog.meeting.natives=Meeting the natives...
+firstContactDialog.meeting.natives=Meeting the natives
 firstContactDialog.meeting.natives.tutorial=You meet natives. Send your Scouts to their settlements in order to learn more about them, and your Indentured Servants and Free Colonists in order to learn from them. Send your ships and Wagon Trains to their settlements if you wish to trade with them.
-firstContactDialog.meeting.AZTEC=The Aztec nation...
-firstContactDialog.meeting.INCA=The Inca empire...
+firstContactDialog.meeting.aztec=The Aztec nation
+firstContactDialog.meeting.inca=The Inca empire
 firstContactDialog.welcomeOffer.text=The %nation% welcome you. We are a glorious nation of %camps% %settlementType%. To celebrate our friendship, we generously offer you the land you now occupy as a gift. Will you accept our treaty and lie with us in peace as brothers?
 firstContactDialog.welcomeSimple.text=The %nation% welcome you. We are a glorious nation of %camps% %settlementType%. Will you accept our treaty and lie with us in peace as brothers?
 
diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index a1c4883bb..ad0f9c7cb 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -361,7 +361,7 @@ public final class ImageLibrary {
     public static BufferedImage getBuildingImage(BuildingType buildingType,
                                                  Player player, float scale) {
         String key = "image.buildingicon." + buildingType.getId()
-            + "." + player.getNationNameKey();
+            + "." + player.getNationResourceKey();
         if (!ResourceManager.hasImageResource(key)) {
             key = "image.buildingicon." + buildingType.getId();
         }
diff --git a/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java b/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
index 08bd079a6..b41414b86 100644
--- a/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
@@ -65,8 +65,8 @@ public class FirstContactDialog extends FreeColConfirmDialog {
         MigPanel panel
             = new MigPanel(new MigLayout("wrap 1", "[center]", "[]20"));
 
-        String headerKey = BASE_KEY + other.getNationNameKey();
-        String imageKey = IMAGE_BASE_KEY + other.getNationNameKey();
+        String headerKey = BASE_KEY + other.getNation().getSuffix();
+        String imageKey = IMAGE_BASE_KEY + other.getNationResourceKey();
         if (!Messages.containsKey(headerKey)) {
             headerKey = BASE_KEY + NATIVES_KEY;
             imageKey = IMAGE_BASE_KEY + NATIVES_KEY;
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 3b2973c7a..f2a150e13 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -675,11 +675,11 @@ public class Player extends FreeColGameObject implements Nameable {
     }
 
     /**
-     * Gets a name key for the nation name.
+     * Gets a resource key for the nation name.
      *
-     * @return A nation name key.
+     * @return A nation resource key.
      */
-    public String getNationNameKey() {
+    public String getNationResourceKey() {
         return lastPart(nationId, ".").toUpperCase(Locale.US);
     }
 

From c039176cc72aab976e8124bac8f90af4b6bdc0d5 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 4 Aug 2015 16:43:01 +0200
Subject: [PATCH 058/323] Reroute all direct calls to
 setActiveUnit/setSelectedTile in MapViewer through GUI, to hopefully fix
 BR#2806

---
 src/net/sf/freecol/client/gui/CanvasMouseListener.java |  2 +-
 src/net/sf/freecol/client/gui/GUI.java                 |  4 +++-
 src/net/sf/freecol/client/gui/MapViewer.java           |  8 ++++----
 src/net/sf/freecol/client/gui/SwingGUI.java            | 10 +++++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/CanvasMouseListener.java b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
index 367c29472..3359c3914 100644
--- a/src/net/sf/freecol/client/gui/CanvasMouseListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
@@ -219,6 +219,6 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
                 }
             }
         }
-        mapViewer.setSelectedTile(tile);
+        freeColClient.getGUI().setSelectedTile(tile);
     }
 }
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index d7685e79c..87aa7ed7f 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -322,8 +322,10 @@ public class GUI {
      * Set the active unit.
      *
      * @param unit The <code>Unit</code> to activate.
+     * @return true if the focus was set.
      */
-    public void setActiveUnit(Unit unit) {
+    public boolean setActiveUnit(Unit unit) {
+        return false;
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 977b7c718..11eac5e0e 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -299,12 +299,12 @@ public final class MapViewer {
 
         switch (viewMode) {
         case GUI.MOVE_UNITS_MODE:
-            if (getActiveUnit() == null) setActiveUnit(savedActiveUnit);
+            if (getActiveUnit() == null) gui.setActiveUnit(savedActiveUnit);
             savedActiveUnit = null;
             break;
         case GUI.VIEW_TERRAIN_MODE:
             savedActiveUnit = activeUnit;
-            setActiveUnit(null);
+            gui.setActiveUnit(null);
             break;
         default:
             break;
@@ -947,7 +947,7 @@ public final class MapViewer {
             freeColClient.updateActions();
         } else {
             updateCurrentPathForActiveUnit();
-            if (!setSelectedTile(tile)
+            if (!gui.setSelectedTile(tile)
                 || freeColClient.getClientOptions()
                 .getBoolean(ClientOptions.JUMP_TO_ACTIVE_UNIT)) {
                 setFocus(tile);
@@ -1085,7 +1085,7 @@ public final class MapViewer {
                 // select a unit on the selected tile
                 Unit unitInFront = findUnitInFront(newTile);
                 if (unitInFront != null) {
-                    ret = setActiveUnit(unitInFront);
+                    ret = gui.setActiveUnit(unitInFront);
                     updateCurrentPathForActiveUnit();
                 } else {
                     setFocus(newTile);
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 7fb8c8104..e6b07996f 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -586,15 +586,17 @@ public class SwingGUI extends GUI {
      * Set the active unit.
      *
      * @param unit The <code>Unit</code> to activate.
+     * @return true if the focus was set.
      */
     @Override
-    public void setActiveUnit(Unit unit) {
-        mapViewer.setActiveUnit(unit);
+    public boolean setActiveUnit(Unit unit) {
+        boolean result=mapViewer.setActiveUnit(unit);
         updateMapControls();
         if (unit != null && !freeColClient.getMyPlayer().owns(unit)) {
             canvas.refresh();
         }
         canvas.updateMenuBar();
+        return result;
     }
 
     /**
@@ -1691,7 +1693,9 @@ public class SwingGUI extends GUI {
 
     @Override
     public boolean setSelectedTile(Tile newTileToSelect) {
-        return mapViewer.setSelectedTile(newTileToSelect);
+        boolean result=mapViewer.setSelectedTile(newTileToSelect);
+        updateMapControls();
+        return result;
     }
 
     @Override

From 388e9deedc27fda63ce510bacc15c557bae116dd Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 5 Aug 2015 16:14:44 +0930
Subject: [PATCH 059/323] Treasure cash in doco clarification.

---
 doc/FreeCol.tex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/FreeCol.tex b/doc/FreeCol.tex
index 744cb00e5..fd98cc6ef 100644
--- a/doc/FreeCol.tex
+++ b/doc/FreeCol.tex
@@ -2677,9 +2677,9 @@ a colony with access to the sea, your \hyperlink{Monarch}{Monarch}
 will offer to ship it to Europe for a ``reasonable fee'', unless
 \hyperlink{Hernan Cortes}{Hern\'an Cort\'es} has joined the
 \hyperlink{Continental Congress}{Continental Congress}, in which case
-it will be shipped free of charge. If you have a
-\hyperlink{Galleon}{Galleon}, however, you can take the Treasure Train
-to Europe yourself.
+it will be shipped free of charge. However if you have a
+\hyperlink{Galleon}{Galleon}, you are expected to use it to take the
+Treasure Train to Europe yourself.
 
 The \Unit{Caravel}, the \Unit{Merchantman} and the \Unit{Galleon} are
 unarmed \hypertarget{Naval Units}{naval units}, with two, four or six

From 70efd7543e8a56af5e3b06d9f779e07266ba4ad6 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 5 Aug 2015 16:20:45 +0930
Subject: [PATCH 060/323] Sound helper in IGC.

---
 .../client/control/InGameController.java      | 92 ++++++++-----------
 1 file changed, 37 insertions(+), 55 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 351ae2e1a..3ec11aa99 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -236,6 +236,15 @@ public final class InGameController implements NetworkConstants {
         return freeColClient.askServer();
     }
 
+    /**
+     * Play a sound.
+     *
+     * @param soundKey The sound resource key.
+     */
+    private void sound(String soundKey) {
+        freeColClient.getSoundController().playSound(soundKey);
+    }
+    
     /**
      * Gets the specification for the current game.
      *
@@ -399,8 +408,7 @@ public final class InGameController implements NetworkConstants {
         boolean ret = askServer().embark(unit, carrier, null)
             && unit.getLocation() == carrier;
         if (ret) {
-            freeColClient.getSoundController()
-                .playSound("sound.event.loadCargo");
+            sound("sound.event.loadCargo");
         }
         unitWas.fireChanges();
         if (colonyWas != null) colonyWas.fireChanges();
@@ -1019,8 +1027,7 @@ public final class InGameController implements NetworkConstants {
         // Illegal moves
         case MOVE_NO_ACCESS_BEACHED:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 StringTemplate nation = getNationAt(unit.getTile(), direction);
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noAccessBeached")
@@ -1029,8 +1036,7 @@ public final class InGameController implements NetworkConstants {
             break;
         case MOVE_NO_ACCESS_CONTACT:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 StringTemplate nation = getNationAt(unit.getTile(), direction);
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noAccessContact")
@@ -1039,8 +1045,7 @@ public final class InGameController implements NetworkConstants {
             break;
         case MOVE_NO_ACCESS_GOODS:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 StringTemplate nation = getNationAt(unit.getTile(), direction);
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noAccessGoods")
@@ -1052,15 +1057,13 @@ public final class InGameController implements NetworkConstants {
         case MOVE_NO_ACCESS_LAND:
             if (!moveDisembark(unit, direction)) {
                 if (interactive) {
-                    freeColClient.getSoundController()
-                        .playSound("sound.event.illegalMove");
+                    sound("sound.event.illegalMove");
                 }
             }
             break;
         case MOVE_NO_ACCESS_MISSION_BAN:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 StringTemplate nation = getNationAt(unit.getTile(), direction);
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noAccessMissionBan")
@@ -1071,8 +1074,7 @@ public final class InGameController implements NetworkConstants {
             break;
         case MOVE_NO_ACCESS_SETTLEMENT:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 StringTemplate nation = getNationAt(unit.getTile(), direction);
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noAccessSettlement")
@@ -1083,8 +1085,7 @@ public final class InGameController implements NetworkConstants {
             break;
         case MOVE_NO_ACCESS_SKILL:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noAccessSkill")
                     .addStringTemplate("%unit%",
@@ -1093,8 +1094,7 @@ public final class InGameController implements NetworkConstants {
             break;
         case MOVE_NO_ACCESS_TRADE:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 StringTemplate nation = getNationAt(unit.getTile(), direction);
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noAccessTrade")
@@ -1103,8 +1103,7 @@ public final class InGameController implements NetworkConstants {
             break;
         case MOVE_NO_ACCESS_WAR:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 StringTemplate nation = getNationAt(unit.getTile(), direction);
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noAccessWar")
@@ -1113,8 +1112,7 @@ public final class InGameController implements NetworkConstants {
             break;
         case MOVE_NO_ACCESS_WATER:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noAccessWater")
                     .addStringTemplate("%unit%",
@@ -1123,8 +1121,7 @@ public final class InGameController implements NetworkConstants {
             break;
         case MOVE_NO_ATTACK_MARINE:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noAttackWater")
                     .addStringTemplate("%unit%",
@@ -1141,8 +1138,7 @@ public final class InGameController implements NetworkConstants {
             break;
         case MOVE_NO_TILE:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 gui.showInformationMessage(unit, StringTemplate
                     .template("move.noTile")
                     .addStringTemplate("%unit%",
@@ -1151,8 +1147,7 @@ public final class InGameController implements NetworkConstants {
             break;
         default:
             if (interactive || clearDestination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
             }
             result = false;
             break;
@@ -2118,8 +2113,7 @@ public final class InGameController implements NetworkConstants {
             if (askServer().missionary(unit, direction,
                     act == MissionaryAction.DENOUNCE_HERESY)
                 && settlement.hasMissionary(player)) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.missionEstablished");
+                sound("sound.event.missionEstablished");
                 player.invalidateCanSeeTiles();
                 displayModelMessages(false, false);
             }
@@ -2727,10 +2721,9 @@ public final class InGameController implements NetworkConstants {
         ret = ret && askServer().buildColony(name, unit)
             && tile.hasSettlement();
         if (ret) {
+            sound("sound.event.buildingComplete");
             player.invalidateCanSeeTiles();
             gui.showColonyPanel((Colony)tile.getSettlement(), unit);
-            freeColClient.getSoundController()
-                .playSound("sound.event.buildingComplete");
             // Check units present for treasure cash-in as they are now
             // at a colony.
             for (Unit u : tile.getUnitList()) checkCashInTreasureTrain(u);
@@ -2762,8 +2755,7 @@ public final class InGameController implements NetworkConstants {
         UnitWas unitWas = new UnitWas(carrier);
         boolean ret = askLoadGoods(europe, type, amount, carrier);
         if (ret) {
-            freeColClient.getSoundController()
-                .playSound("sound.event.loadCargo");
+            sound("sound.event.loadCargo");
             displayModelMessages(false, false);
         }
         europeWas.fireChanges();
@@ -2903,8 +2895,7 @@ public final class InGameController implements NetworkConstants {
         boolean ret = askServer().cashInTreasureTrain(unit)
             && unit.isDisposed();
         if (ret) {
-            freeColClient.getSoundController()
-                .playSound("sound.event.cashInTreasureTrain");
+            sound("sound.event.cashInTreasureTrain");
         }
         unitWas.fireChanges();
         updateControls();
@@ -3650,8 +3641,7 @@ public final class InGameController implements NetworkConstants {
         boolean ret = askLoadGoods(goods.getLocation(), goods.getType(),
                                    goods.getAmount(), carrier);
         if (ret) {
-            freeColClient.getSoundController()
-                .playSound("sound.event.loadCargo");
+            sound("sound.event.loadCargo");
         }
         if (colonyWas != null) colonyWas.fireChanges();
         if (sourceWas != null) sourceWas.fireChanges();
@@ -3741,20 +3731,17 @@ public final class InGameController implements NetworkConstants {
         // Sanity check current state.
         if (destination instanceof Europe) {
             if (unit.isInEurope()) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 return false;
             }
         } else if (destination instanceof Map) {
             if (unit.hasTile() && unit.getTile().getMap() == destination) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 return false;
             }
         } else if (destination instanceof Settlement) {
             if (unit.hasTile()) {
-                freeColClient.getSoundController()
-                    .playSound("sound.event.illegalMove");
+                sound("sound.event.illegalMove");
                 return false;
             }
         } else {
@@ -3941,8 +3928,7 @@ public final class InGameController implements NetworkConstants {
         final boolean alert = freeColClient.getClientOptions()
             .getBoolean(ClientOptions.AUDIO_ALERTS);
         if (alert) {
-            freeColClient.getSoundController()
-                .playSound("sound.event.alertSound");
+            sound("sound.event.alertSound");
         }
 
         Turn currTurn = game.getTurn();
@@ -4269,8 +4255,7 @@ public final class InGameController implements NetworkConstants {
         boolean ret = askUnloadGoods(goods.getType(), goods.getAmount(),
                                      carrier);
         if (ret) {
-            freeColClient.getSoundController()
-                .playSound("sound.event.sellCargo");
+            sound("sound.event.sellCargo");
             displayModelMessages(false, false);
         }
         europeWas.fireChanges();
@@ -4375,8 +4360,7 @@ public final class InGameController implements NetworkConstants {
 
             // GUI management.
             if (!freeColClient.isSinglePlayer()) {
-                freeColClient.getSoundController()
-                    .playSound("sound.anthem." + player.getNationId());
+                sound("sound.anthem." + player.getNationId());
             }
         }
         updateControls();
@@ -4484,8 +4468,7 @@ public final class InGameController implements NetworkConstants {
             return false;
         }
         if (player == first && old == Stance.UNCONTACTED) {
-            freeColClient.getSoundController()
-                .playSound("sound.event.meet." + second.getNationId());
+            sound("sound.event.meet." + second.getNationId());
         }
         return true;
     }
@@ -4627,9 +4610,8 @@ public final class InGameController implements NetworkConstants {
         UnitWas unitWas = new UnitWas(carrier);
         boolean ret = askUnloadGoods(goods.getType(), goods.getAmount(),
                                      carrier);
-        if (ret && !dump) {
-            freeColClient.getSoundController()
-                .playSound("sound.event.unloadCargo");
+        if (ret) {
+            if (!dump) sound("sound.event.unloadCargo");
         }
         if (colonyWas != null) colonyWas.fireChanges();
         unitWas.fireChanges();

From 0556594c3e8590da3bdbcec50456a7adff103b05 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 5 Aug 2015 16:28:20 +0930
Subject: [PATCH 061/323] Small cleanups in IGC.

---
 .../client/control/InGameController.java      | 37 ++++---------------
 .../client/gui/panel/StatisticsPanel.java     |  3 +-
 src/net/sf/freecol/common/model/Player.java   | 15 ++++++++
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 3ec11aa99..8451adab3 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -3350,17 +3350,6 @@ public final class InGameController implements NetworkConstants {
         return askServer().firstContact(player, other, tile, result);
     }
 
-    /**
-     * Retrieves client statistics.
-     *
-     * Called from StatisticsPanel
-     *
-     * @return A <code>Map</code> containing the client statistics.
-     */
-    public java.util.Map<String, String> getClientStatistics() {
-        return freeColClient.getGame().getStatistics();
-    }
-
     /**
      * Get the nation summary for a player.
      *
@@ -4315,6 +4304,8 @@ public final class InGameController implements NetworkConstants {
 
         final Game game = freeColClient.getGame();
         game.setCurrentPlayer(player);
+
+        Tile fallback = null;
         if (freeColClient.getMyPlayer().equals(player)) {
             if (FreeColDebugger.isInDebugMode(FreeColDebugger.DebugMode.DESYNC)
                 && DebugUtils.checkDesyncAction(freeColClient)) {
@@ -4322,16 +4313,16 @@ public final class InGameController implements NetworkConstants {
                 return false;
             }
 
+            // Save the game (if it isn't newly loaded)
+            if (freeColClient.getFreeColServer() != null
+                && game.getTurn().getNumber() > 0) autoSaveGame();
+
             // Get turn report out quickly before more message display occurs.
             player.removeDisplayedModelMessages();
             displayModelMessages(true, true);
 
             player.invalidateCanSeeTiles();
 
-            // Save the game (if it isn't newly loaded)
-            if (freeColClient.getFreeColServer() != null
-                && game.getTurn().getNumber() > 0) autoSaveGame();
-
             // Check for emigration.
             Europe europe = player.getEurope();
             if (player.hasAbility(Ability.SELECT_RECRUIT)) {
@@ -4343,20 +4334,8 @@ public final class InGameController implements NetworkConstants {
                 }
             }
             
-            try {
-                List<Settlement> settlements = player.getSettlements();
-                Tile defTile = ((settlements.isEmpty())
-                    ? player.getEntryLocation().getTile()
-                    : settlements.get(0).getTile()).getSafeTile(null, null);
-                player.resetIterators();
-                updateActiveUnit(defTile);
-            } catch (Exception e) {
-                // We end up here if there is a crash in things like the
-                // turn report.  These were hard to track down because we
-                // used to fail silently.  We now complain louder.
-                logger.log(Level.WARNING, "Client new turn failure for "
-                    + player, e);
-            }
+            player.resetIterators();
+            fallback = player.getFallbackTile();
 
             // GUI management.
             if (!freeColClient.isSinglePlayer()) {
diff --git a/src/net/sf/freecol/client/gui/panel/StatisticsPanel.java b/src/net/sf/freecol/client/gui/panel/StatisticsPanel.java
index 8a823361d..523e25007 100644
--- a/src/net/sf/freecol/client/gui/panel/StatisticsPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/StatisticsPanel.java
@@ -158,7 +158,8 @@ public final class StatisticsPanel extends FreeColPanel {
 
         // Retrieve the client and server data
         Map<String, String> serverStatistics = igc().getServerStatistics();
-        Map<String, String> clientStatistics = igc().getClientStatistics();
+        Map<String, String> clientStatistics = freeColClient.getGame()
+            .getStatistics();
 
         // Title
         JPanel header = new JPanel();
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index f2a150e13..304ae42db 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -2635,6 +2635,21 @@ public class Player extends FreeColGameObject implements Nameable {
         this.entryLocation = entryLocation;
     }
 
+    /**
+     * Get a default tile to display at the start of the player turn should
+     * there not be any active units.
+     *
+     * Favour the first settlement, followed by the entry tile.
+     * 
+     * @return A suitable <code>Tile</code>.
+     */
+    public Tile getFallbackTile() {
+        List<Settlement> settlements = getSettlements();
+        return (!settlements.isEmpty())
+            ? settlements.get(0).getTile()
+            : getEntryLocation().getTile();
+    }
+
     /**
      * Get the players high seas.
      *

From e817a322cfc7a04a76afbf71f5778c416894d3df Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 5 Aug 2015 15:16:32 +0200
Subject: [PATCH 062/323] Remove getCanvas dummy method in GUI

---
 src/net/sf/freecol/client/gui/GUI.java                | 4 ----
 src/net/sf/freecol/client/gui/MapViewer.java          | 5 ++---
 src/net/sf/freecol/client/gui/SwingGUI.java           | 1 -
 src/net/sf/freecol/client/gui/panel/DragListener.java | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 87aa7ed7f..36201ca2b 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -126,10 +126,6 @@ public class GUI {
         return freeColClient.getInGameController();
     }
 
-    public Canvas getCanvas() {
-        return null;
-    }
-
     public ImageLibrary getImageLibrary() {
         return imageLibrary;
     }
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 11eac5e0e..8e5372607 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -41,7 +41,6 @@ import java.awt.geom.Point2D;
 import java.awt.geom.RoundRectangle2D;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -153,7 +152,7 @@ public final class MapViewer {
 
     private final FreeColClient freeColClient;
 
-    private final GUI gui;
+    private final SwingGUI gui;
 
     private Dimension size;
 
@@ -256,7 +255,7 @@ public final class MapViewer {
      */
     MapViewer(FreeColClient freeColClient) {
         this.freeColClient = freeColClient;
-        this.gui = freeColClient.getGUI();
+        this.gui = (SwingGUI)freeColClient.getGUI();
         this.size = null;
 
         setImageLibraryAndUpdateData(new ImageLibrary());
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index e6b07996f..db44a4390 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -153,7 +153,6 @@ public class SwingGUI extends GUI {
 
     // Simple accessors
 
-    @Override
     public Canvas getCanvas() {
         return canvas;
     }
diff --git a/src/net/sf/freecol/client/gui/panel/DragListener.java b/src/net/sf/freecol/client/gui/panel/DragListener.java
index 2175ae25d..084292395 100644
--- a/src/net/sf/freecol/client/gui/panel/DragListener.java
+++ b/src/net/sf/freecol/client/gui/panel/DragListener.java
@@ -29,7 +29,7 @@ import javax.swing.JPopupMenu;
 import javax.swing.TransferHandler;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.model.Unit;
 
 
@@ -89,7 +89,7 @@ public final class DragListener extends MouseAdapter {
                 menu.remove(lastIdx);
             if (menu.getComponentCount() <= 0) return;
 
-            final GUI gui = freeColClient.getGUI();
+            final SwingGUI gui = (SwingGUI)freeColClient.getGUI();
             boolean windows = System.getProperty("os.name").startsWith("Windows");
             boolean small = Toolkit.getDefaultToolkit()
                 .getScreenSize().getHeight() < 768;

From 6f9a61f79d9437b2dec77b7e2f3f775d5a7f8b6f Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 5 Aug 2015 15:24:10 +0200
Subject: [PATCH 063/323] Remove getColonyTileMapViewer dummy method in GUI

---
 src/net/sf/freecol/client/gui/GUI.java                     | 4 ----
 src/net/sf/freecol/client/gui/SwingGUI.java                | 3 ---
 src/net/sf/freecol/client/gui/panel/ConstructionPanel.java | 4 +++-
 src/net/sf/freecol/client/gui/panel/UnitLabel.java         | 6 +++---
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 36201ca2b..b31a47d16 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -130,10 +130,6 @@ public class GUI {
         return imageLibrary;
     }
 
-    public MapViewer getColonyTileMapViewer() {
-        return null;
-    }
-
     public boolean isWindowed() {
         return true;
     }
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index db44a4390..393f47df4 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -26,7 +26,6 @@ import java.awt.Font;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.HeadlessException;
-import java.awt.Image;
 import java.awt.MouseInfo;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -62,7 +61,6 @@ import net.sf.freecol.client.gui.panel.CornerMapControls;
 import net.sf.freecol.client.gui.panel.DialogHandler;
 import net.sf.freecol.client.gui.panel.FreeColDialog;
 import net.sf.freecol.client.gui.panel.LabourData.UnitData;
-import net.sf.freecol.client.gui.panel.LoadingSavegameDialog;
 import net.sf.freecol.client.gui.panel.MapControls;
 import net.sf.freecol.client.gui.panel.Parameters;
 import net.sf.freecol.client.gui.panel.TradeRoutePanel;
@@ -157,7 +155,6 @@ public class SwingGUI extends GUI {
         return canvas;
     }
 
-    @Override
     public MapViewer getColonyTileMapViewer() {
         return colonyTileMapViewer;
     }
diff --git a/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java b/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
index 3e4924b94..f3ca02931 100644
--- a/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
@@ -35,12 +35,14 @@ import net.miginfocom.swing.MigLayout;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.FontLibrary;
 import net.sf.freecol.client.gui.ImageLibrary;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.AbstractGoods;
 import net.sf.freecol.common.model.BuildableType;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Turn;
+
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -132,7 +134,7 @@ public class ConstructionPanel extends MigPanel
 
     public void update(BuildableType buildable) {
         removeAll();
-        final ImageLibrary lib = freeColClient.getGUI()
+        final ImageLibrary lib = ((SwingGUI)freeColClient.getGUI())
             .getColonyTileMapViewer().getImageLibrary();
         final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.SMALLER, lib.getScalingFactor());
diff --git a/src/net/sf/freecol/client/gui/panel/UnitLabel.java b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
index 0f6a5cb7b..2fb1a2b05 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitLabel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
@@ -36,8 +36,8 @@ import javax.swing.JLabel;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
 import net.sf.freecol.client.gui.FontLibrary;
-import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.ImageLibrary;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.AbstractGoods;
@@ -83,7 +83,7 @@ public final class UnitLabel extends JLabel
 
     private final FreeColClient freeColClient;
 
-    private final GUI gui;
+    private final SwingGUI gui;
 
     private final Unit unit;
 
@@ -147,7 +147,7 @@ public final class UnitLabel extends JLabel
                      boolean isSmall, boolean ignoreLocation,
                      boolean useMapImageLibrary) {
         this.freeColClient = freeColClient;
-        this.gui = freeColClient.getGUI();
+        this.gui = (SwingGUI)freeColClient.getGUI();
         this.unit = unit;
 
         selected = false;

From 5f978b80b87ce8fac1bdfe148964bf4a4a46efe4 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 5 Aug 2015 16:30:02 +0200
Subject: [PATCH 064/323] Simplify MapViewer.changeViewMode()

---
 src/net/sf/freecol/client/gui/MapViewer.java | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 8e5372607..b30ab3403 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -168,8 +168,6 @@ public final class MapViewer {
     private Tile focus = null;
     private Unit activeUnit;
 
-    private Unit savedActiveUnit;
-
     /** The view mode in use. */
     private int viewMode = 0;
 
@@ -294,19 +292,7 @@ public final class MapViewer {
             logger.fine("Changed to " + ((newViewMode == GUI.MOVE_UNITS_MODE)
                     ? "Move Units" : "View Terrain") + " mode");
             viewMode = newViewMode;
-        }
-
-        switch (viewMode) {
-        case GUI.MOVE_UNITS_MODE:
-            if (getActiveUnit() == null) gui.setActiveUnit(savedActiveUnit);
-            savedActiveUnit = null;
-            break;
-        case GUI.VIEW_TERRAIN_MODE:
-            savedActiveUnit = activeUnit;
-            gui.setActiveUnit(null);
-            break;
-        default:
-            break;
+            gui.updateMapControls();
         }
     }
 

From fdc65e4cb68719a7eccde122e824dc05f3c21cf0 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 5 Aug 2015 23:29:37 +0200
Subject: [PATCH 065/323] Add cargo count to goods on carriers in InfoPanel,
 PF#44

---
 src/net/sf/freecol/client/gui/panel/InfoPanel.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index 75d786ced..bb9d7591f 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -310,7 +310,8 @@ public final class InfoPanel extends FreeColPanel {
                     JLabel label;
                     for (Goods goods : unit.getGoodsList()) {
                         icon = new ImageIcon(lib.getSmallIconImage(goods.getType()));
-                        label = new JLabel(icon);
+                        label = new JLabel(String.valueOf(goods.getAmount()),
+                                           icon, JLabel.RIGHT);
                         text = Messages.message(goods.getLabel(true));
                         label.setFont(font);
                         label.setToolTipText(text);

From 33733d48268a7f2df3e4755942175a0ca3c2385c Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 6 Aug 2015 18:09:06 +0200
Subject: [PATCH 066/323] Add ant targets for compiling developer.tex

---
 build.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 1fa1b87fb..9b6e72165 100644
--- a/build.xml
+++ b/build.xml
@@ -251,10 +251,11 @@
                addproperty="freecol.version" defaultvalue="git-${DSTAMP}" />
     </target>
 
-    <target name="prepareManual" depends="initDist,print-manual">
+    <target name="prepareManual" depends="initDist,print-manuals">
         <mkdir dir="${freecol.release.dir}/manual/${freecol.name}"/>
         <copy todir="${freecol.release.dir}/manual/${freecol.name}">
             <fileset dir="${freecol.doc.dir}" includes="FreeCol.pdf"/>
+            <fileset dir="${freecol.doc.dir}" includes="developer.pdf"/>
         </copy>
     </target>
 
@@ -706,6 +707,25 @@
         <property name="print.manual.is.up.to.date" value="true" />
     </target>
 
+    <target name="print-devmanual" unless="print.devmanual.is.up.to.date"
+            description="Creates the printable user guide.">
+        <delete file="doc/developer.ind" />
+        <exec executable="pdflatex" dir="doc" >
+            <arg file="doc/developer.tex"/>
+        </exec>
+        <exec executable="makeindex" dir="doc" >
+            <arg file="doc/developer.idx"/>
+        </exec>
+        <exec executable="pdflatex" dir="doc" >
+            <arg file="doc/developer.tex"/>
+        </exec>
+        <property name="print.devmanual.is.up.to.date" value="true" />
+    </target>
+
+    <target name="print-manuals" depends="print-manual,print-devmanual"
+            description="Creates the printable user and developer guides.">
+    </target>
+
     <target name="online-manual" unless="online.manual.is.up.to.date"
             description="Creates the online user guide.">
         <delete file="doc/FreeCol.ind" />
@@ -724,10 +744,40 @@
         <property name="online.manual.is.up.to.date" value="true" />
     </target>
 
+    <target name="online-devmanual" unless="online.devmanual.is.up.to.date"
+            description="Creates the online user guide.">
+        <delete file="doc/developer.ind" />
+        <exec executable="htlatex" dir="doc" >
+            <arg file="doc/developer.tex"/>
+        </exec>
+        <exec executable="tex" dir="doc">
+            <arg line="\def\filename{{developer}{idx}{4dx}{ind}} \input  idxmake.4ht" />
+        </exec>
+        <exec executable="makeindex" dir="doc" >
+            <arg file="doc/developer.4dx"/>
+        </exec>
+        <exec executable="htlatex" dir="doc" >
+            <arg file="doc/developer.tex"/>
+        </exec>
+        <property name="online.devmanual.is.up.to.date" value="true" />
+    </target>
+
+    <target name="online-manuals" depends="online-manual,online-devmanual"
+            description="Creates the online user and developer guides.">
+    </target>
+
     <target name="manual" depends="print-manual,online-manual"
             description="Creates the printable and online user guides.">
     </target>
 
+    <target name="devmanual" depends="print-devmanual,online-devmanual"
+            description="Creates the printable and online developer guides.">
+    </target>
+
+    <target name="manuals" depends="manual,devmanual"
+            description="Creates the printable and online user and developer guides.">
+    </target>
+
     <target name="fixTabsWindows">
         <fixcrlf srcdir="${freecol.src.dir}" tab="remove" tablength="4"
                  includes="**/*.java" eol="crlf"/>

From 1bd1805b948a2e83ff95de81e7f81dbd85ec88c1 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 7 Aug 2015 16:31:45 +0200
Subject: [PATCH 067/323] Remove redundant call to refresh

---
 src/net/sf/freecol/client/gui/SwingGUI.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 393f47df4..eb5825919 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -499,7 +499,6 @@ public class SwingGUI extends GUI {
         // Action should be disabled if there is no active unit, but make sure
         if (unit == null) return;
         canvas.stopGoto();
-        refresh();
     }
 
     /**

From 073b735e1251f2692383fcb5473b97197508cf7e Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 7 Aug 2015 16:42:05 +0200
Subject: [PATCH 068/323] Detangle setFocus(Immediately) in SwingGUI and
 MapViewer

---
 src/net/sf/freecol/client/gui/MapViewer.java | 28 +++++---------------
 src/net/sf/freecol/client/gui/SwingGUI.java  |  3 ++-
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index b30ab3403..50f5cacb4 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -332,7 +332,7 @@ public final class MapViewer {
      */
     void centerActiveUnit() {
         if (activeUnit != null && activeUnit.getTile() != null) {
-            setFocus(activeUnit.getTile());
+            gui.setFocus(activeUnit.getTile());
         }
     }
 
@@ -902,7 +902,7 @@ public final class MapViewer {
         }
 
         if (x == fx && y == fy) return false;
-        setFocus(freeColClient.getGame().getMap().getTile(x,y));
+        gui.setFocus(freeColClient.getGame().getMap().getTile(x,y));
         return true;
     }
 
@@ -935,7 +935,7 @@ public final class MapViewer {
             if (!gui.setSelectedTile(tile)
                 || freeColClient.getClientOptions()
                 .getBoolean(ClientOptions.JUMP_TO_ACTIVE_UNIT)) {
-                setFocus(tile);
+                gui.setFocus(tile);
                 return true;
             }
         }
@@ -961,20 +961,6 @@ public final class MapViewer {
      */
     void setFocus(Tile focus) {
         this.focus = focus;
-
-        gui.refresh();
-    }
-
-    /**
-     * Sets the focus of the map and repaints the screen immediately.
-     *
-     * @param focus The <code>Position</code> of the center tile of the
-     *     displayed map.
-     * @see #getFocus
-     */
-    void setFocusImmediately(Tile focus) {
-        this.focus = focus;
-
         forceReposition();
     }
 
@@ -1009,7 +995,7 @@ public final class MapViewer {
         final int tx = tile.getX(), ty = tile.getY(),
             width = rightColumn - leftColumn;
         int moveX = -1;
-        setFocus(tile);
+        gui.setFocus(tile);
         positionMap(tile);
         if (leftColumn <= 0) { // At left edge already
             if (tx <= width / 4) {
@@ -1035,7 +1021,7 @@ public final class MapViewer {
         }
         if (moveX >= 0) {
             Tile other = map.getTile(moveX, ty);
-            setFocus(other);
+            gui.setFocus(other);
             positionMap(other);
         }
         return where;
@@ -1073,7 +1059,7 @@ public final class MapViewer {
                     ret = gui.setActiveUnit(unitInFront);
                     updateCurrentPathForActiveUnit();
                 } else {
-                    setFocus(newTile);
+                    gui.setFocus(newTile);
                     ret = true;
                 }
             }
@@ -1087,7 +1073,7 @@ public final class MapViewer {
         // Check for refocus
         if (!onScreen(newTile)
             || freeColClient.getClientOptions().getBoolean(ClientOptions.ALWAYS_CENTER)) {
-            setFocus(newTile);
+            gui.setFocus(newTile);
             ret = true;
         } else {
             if (oldTile != null) {
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index eb5825919..6c1425f40 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1677,11 +1677,12 @@ public class SwingGUI extends GUI {
     @Override
     public void setFocus(Tile tileToFocus) {
         mapViewer.setFocus(tileToFocus);
+        canvas.refresh();
     }
 
     @Override
     public void setFocusImmediately(Tile tileToFocus) {
-        mapViewer.setFocusImmediately(tileToFocus);
+        mapViewer.setFocus(tileToFocus);
         Dimension size = canvas.getSize();
         canvas.paintImmediately(0, 0, size.width, size.height);
     }

From a9229aa586cf24c3cf20fb979d7b0664db30a50a Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 7 Aug 2015 17:28:16 +0200
Subject: [PATCH 069/323] Remove dead code in TerrainCursor

---
 src/net/sf/freecol/client/gui/SwingGUI.java   |  4 +--
 .../sf/freecol/client/gui/TerrainCursor.java  | 31 +++++--------------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 6c1425f40..d1e630b88 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1544,9 +1544,7 @@ public class SwingGUI extends GUI {
 
     @Override
     public void showTilePopUpAtSelectedTile() {
-        TerrainCursor cursor = mapViewer.getCursor();
-        canvas.showTilePopup(mapViewer.getSelectedTile(),
-            cursor.getCanvasX(), cursor.getCanvasY());
+        canvas.showTilePopup(mapViewer.getSelectedTile(), 0, 0);
     }
 
     @Override
diff --git a/src/net/sf/freecol/client/gui/TerrainCursor.java b/src/net/sf/freecol/client/gui/TerrainCursor.java
index c5ffce07f..de1870700 100644
--- a/src/net/sf/freecol/client/gui/TerrainCursor.java
+++ b/src/net/sf/freecol/client/gui/TerrainCursor.java
@@ -34,12 +34,10 @@ public class TerrainCursor implements ActionListener  {
     public static final int OFF = 0;
     public static final int ON = 1;
 
-    private int canvasX;
-    private int canvasY;
     private final Timer blinkTimer;
     private boolean active;
     private final EventListenerList listenerList;
-    
+
 
     /**
      * Creates a new <code>TerrainCursor</code> instance.
@@ -53,7 +51,7 @@ public class TerrainCursor implements ActionListener  {
         
         listenerList = new EventListenerList();
     }
-    
+
     /**
      * Returns whether this TerrainCursor is active.
      *
@@ -62,7 +60,7 @@ public class TerrainCursor implements ActionListener  {
     public boolean isActive() {
         return active;
     }
-    
+
     /**
      * Sets the active state of the TerrainCursor.
      *
@@ -71,43 +69,30 @@ public class TerrainCursor implements ActionListener  {
     public void setActive(boolean newState) {
         active = newState;
     }
-    
+
     public void startBlinking() {
         if (!blinkTimer.isRunning()) blinkTimer.start();
     }
-    
+
     public void stopBlinking() {
         if (blinkTimer.isRunning()) blinkTimer.stop();
     }
 
-    public void setCanvasPos(int x,int y) {
-        canvasX = x;
-        canvasY = y;
-    }
-    
-    public int getCanvasX() {
-        return canvasX;
-    }
-    
-    public int getCanvasY() {
-        return canvasY;
-    }
-    
     public void addActionListener(ActionListener listener) {
         listenerList.add(ActionListener.class, listener);
     }
-    
+
     public void removeActionListener(ActionListener listener) {
         listenerList.remove(ActionListener.class, listener);
     }
-    
+
     public void fireActionEvent(ActionEvent event) {
         for (ActionListener al
                  : listenerList.getListeners(ActionListener.class)) {
             al.actionPerformed(event);
         }
     }
-  
+
 
     // Interface ActionListener
 

From 8f9618aa152fc40fcdfa5085733e9f8b53c9046e Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 7 Aug 2015 17:42:44 +0200
Subject: [PATCH 070/323] Fix the TilePopup to be shown near the tile when
 using keyboard or menu

---
 src/net/sf/freecol/client/gui/MapViewer.java | 4 ++++
 src/net/sf/freecol/client/gui/SwingGUI.java  | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 50f5cacb4..8d8151824 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -806,6 +806,10 @@ public final class MapViewer {
         return new Point(x, y);
     }
 
+    int getTileWidth() {
+        return tileWidth;
+    }
+
     /**
      * Get the ratio of width/height of tiles on the map.
      *
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index d1e630b88..139f87e14 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1544,7 +1544,9 @@ public class SwingGUI extends GUI {
 
     @Override
     public void showTilePopUpAtSelectedTile() {
-        canvas.showTilePopup(mapViewer.getSelectedTile(), 0, 0);
+        Tile tile = mapViewer.getSelectedTile();
+        Point point = mapViewer.calculateTilePosition(tile);
+        canvas.showTilePopup(tile, point.x+mapViewer.getTileWidth(), point.y);
     }
 
     @Override

From 8d21822c976165c86e16521ae523ba41ccc01b5b Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 7 Aug 2015 18:04:56 +0200
Subject: [PATCH 071/323] Add static to MapViewer.createLabel

---
 src/net/sf/freecol/client/gui/MapViewer.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 8d8151824..55d0710be 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1238,8 +1238,8 @@ public final class MapViewer {
      * @param backgroundColor a <code>Color</code>
      * @return an <code>BufferedImage</code>
      */
-    private BufferedImage createLabel(Graphics2D g, String text, Font font,
-                              Color backgroundColor) {
+    private static BufferedImage createLabel(Graphics2D g, String text,
+                                             Font font, Color backgroundColor) {
         TextSpecification[] specs = new TextSpecification[1];
         specs[0] = new TextSpecification(text, font);
         return createLabel(g, specs, backgroundColor);
@@ -1254,8 +1254,9 @@ public final class MapViewer {
      * @param backgroundColor a <code>Color</code>
      * @return a <code>BufferedImage</code>
      */
-    private BufferedImage createLabel(Graphics2D g, TextSpecification[] textSpecs,
-                              Color backgroundColor) {
+    private static BufferedImage createLabel(Graphics2D g,
+                                             TextSpecification[] textSpecs,
+                                             Color backgroundColor) {
         int hPadding = 15;
         int vPadding = 10;
         int linePadding = 5;

From 1b3ade9f2680abad6ea0e27dbbee60bd2278fa7a Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 8 Aug 2015 12:08:02 +0930
Subject: [PATCH 072/323] Disable focus on attacker when animation is off,
 IR#115.

---
 .../sf/freecol/client/control/InGameInputHandler.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index 76c3e254e..d521e9b3d 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -495,8 +495,7 @@ public final class InGameInputHandler extends InputHandler {
      * @return Null.
      */
     private Element animateMove(Element element) {
-        FreeColClient freeColClient = getFreeColClient();
-        if (freeColClient.isHeadless()) return null;
+        final FreeColClient freeColClient = getFreeColClient();
         final Game game = getGame();
         final Player player = freeColClient.getMyPlayer();
 
@@ -516,7 +515,12 @@ public final class InGameInputHandler extends InputHandler {
                 + " missing unit:" + unitId);
             return null;
         }
-        final Unit unit = u;
+        // Note: we used to focus the map on the attacker even when
+        // animation is off as long as the center-active-unit option
+        // was set.  However IR#115 requested that if animation is off
+        // that we display nothing so as to speed up the other player
+        // moves as much as possible.
+        if (getGUI().getAnimationSpeed(u) <= 0) return null;
 
         String oldTileId = element.getAttribute("oldTile");
         if (oldTileId.isEmpty()) {
@@ -544,6 +548,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
+        final Unit unit = u;
         final boolean focus = unit != lastAnimatedUnit;
         lastAnimatedUnit = unit;
         invokeAndWait(new Runnable() {

From ee659b31d84816168568da2896d4f21840879ec9 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 8 Aug 2015 13:26:42 +0930
Subject: [PATCH 073/323] Suppress focus for attack animations as well.

---
 .../freecol/client/control/InGameInputHandler.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index d521e9b3d..03bb234e1 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -412,8 +412,7 @@ public final class InGameInputHandler extends InputHandler {
      * @return Null.
      */
     private Element animateAttack(Element element) {
-        FreeColClient freeColClient = getFreeColClient();
-        if (freeColClient.isHeadless()) return null;
+        final FreeColClient freeColClient = getFreeColClient();
         final Game game = getGame();
         final Player player = freeColClient.getMyPlayer();
         String str;
@@ -428,7 +427,12 @@ public final class InGameInputHandler extends InputHandler {
             throw new IllegalStateException("Attack animation for: "
                 + player.getId() + " omitted attacker: " + str);
         }
-        final Unit attacker = u;
+        // Note: we used to focus the map on the unit even when
+        // animation is off as long as the center-active-unit option
+        // was set.  However IR#115 requested that if animation is off
+        // that we display nothing so as to speed up the other player
+        // moves as much as possible.
+        if (getGUI().getAnimationSpeed(u) <= 0) return null;
 
         if ((str = element.getAttribute("defender")).isEmpty()) {
             throw new IllegalStateException("Attack animation for: "
@@ -465,7 +469,7 @@ public final class InGameInputHandler extends InputHandler {
             = Boolean.parseBoolean(element.getAttribute("success"));
 
         // All is well, do the animation.
-        // Use lastAnimatedUnit as a filter to avoid excessive refocussing.
+        final Unit attacker = u;
         final boolean focus = lastAnimatedUnit != attacker;
         lastAnimatedUnit = attacker;
         invokeAndWait(new Runnable() {
@@ -515,7 +519,7 @@ public final class InGameInputHandler extends InputHandler {
                 + " missing unit:" + unitId);
             return null;
         }
-        // Note: we used to focus the map on the attacker even when
+        // Note: we used to focus the map on the unit even when
         // animation is off as long as the center-active-unit option
         // was set.  However IR#115 requested that if animation is off
         // that we display nothing so as to speed up the other player

From 13a0f0399897f6172694ed1ac1327fdebbf059b1 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 8 Aug 2015 14:24:29 +0930
Subject: [PATCH 074/323] Move refocussing decisions from animation input
 handlers to GUI.

---
 .../client/control/InGameInputHandler.java    | 32 ++-----------------
 src/net/sf/freecol/client/gui/SwingGUI.java   | 19 +++++++++++
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index 03bb234e1..cc0956ed7 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -123,9 +123,6 @@ public final class InGameInputHandler extends InputHandler {
             }
         };
 
-    /** The unit last appearing in an animation. */
-    private Unit lastAnimatedUnit = null;
-
 
     /**
      * The constructor to use.
@@ -470,15 +467,9 @@ public final class InGameInputHandler extends InputHandler {
 
         // All is well, do the animation.
         final Unit attacker = u;
-        final boolean focus = lastAnimatedUnit != attacker;
-        lastAnimatedUnit = attacker;
         invokeAndWait(new Runnable() {
                 @Override
                 public void run() {
-                    if (focus || !getGUI().onScreen(attackerTile)
-                        || !getGUI().onScreen(defenderTile)) {
-                        getGUI().setFocusImmediately(attackerTile);
-                    }
                     getGUI().animateUnitAttack(attacker, defender,
                         attackerTile, defenderTile, success);
                     refreshCanvas(false);
@@ -553,30 +544,11 @@ public final class InGameInputHandler extends InputHandler {
         }
 
         final Unit unit = u;
-        final boolean focus = unit != lastAnimatedUnit;
-        lastAnimatedUnit = unit;
         invokeAndWait(new Runnable() {
                 @Override
                 public void run() {
-                    if (getGUI().getAnimationSpeed(unit) > 0) {
-                        // All is well, queue the animation.  Use
-                        // lastAnimatedUnit as a filter to avoid
-                        // excessive refocussing.
-                        if (focus || !getGUI().onScreen(oldTile)) {
-                            getGUI().setFocusImmediately(oldTile);
-                        }
-                        getGUI().animateUnitMove(unit, oldTile, newTile);
-                        refreshCanvas(false);
-                    } else {
-                        // Not animating, but if the centering
-                        // option is enabled at least refocus so
-                        // we can see the move happen.
-                        if (!getGUI().onScreen(oldTile)
-                            && getFreeColClient().getClientOptions()
-                            .getBoolean(ClientOptions.ALWAYS_CENTER)) {
-                            getGUI().setFocus(oldTile);
-                        }
-                    }
+                    getGUI().animateUnitMove(unit, oldTile, newTile);
+                    refreshCanvas(false);
                 }
             });
         return null;
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 139f87e14..2e7a178c0 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -605,6 +605,23 @@ public class SwingGUI extends GUI {
 
     // Animation handling
 
+    /**
+     * Require the given tile to be in the onScreen()-area.
+     * Account for the ALWAYS_CENTER client option.
+     *
+     * @param tile The <code>Tile</code> to check.
+     * @return True if the focus was set.
+     */
+    private boolean requireFocus(Tile tile) {
+        boolean required = freeColClient.getClientOptions()
+            .getBoolean(ClientOptions.ALWAYS_CENTER);
+        if ((required && tile != getFocus()) || !onScreen(tile)) {
+            setFocusImmediately(tile);
+            return true;
+        }
+        return false;
+    }
+        
     /**
      * Animate a unit attack.
      *
@@ -618,6 +635,7 @@ public class SwingGUI extends GUI {
     public void animateUnitAttack(Unit attacker, Unit defender,
                                   Tile attackerTile, Tile defenderTile,
                                   boolean success) {
+        requireFocus(attackerTile);
         Animations.unitAttack(this, attacker, defender,
                               attackerTile, defenderTile, success);
     }
@@ -631,6 +649,7 @@ public class SwingGUI extends GUI {
      */
     @Override
     public void animateUnitMove(Unit unit, Tile srcTile, Tile dstTile) {
+        requireFocus(srcTile);
         Animations.unitMove(this, unit, srcTile, dstTile);
     }
 

From eab912accf558cad29523c981b09ba95a6b1be44 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 8 Aug 2015 09:40:49 +0930
Subject: [PATCH 075/323] Do not change the selected tile when a unit moves.

---
 .../client/control/InGameController.java      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 8451adab3..678bd0a8a 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -1630,19 +1630,19 @@ public final class InGameController implements NetworkConstants {
         }
 
         // Update the active unit and GUI.
-        if (unit.isDisposed() || checkCashInTreasureTrain(unit)) return false;
-        if (tile.getColony() != null && unit.isCarrier()) {
-            final Colony colony = tile.getColony();
-            if (unit.getTradeRoute() == null
-                && (unit.getDestination() == null
-                    || unit.getDestination().getTile() == tile.getTile())) {
-                gui.showColonyPanel(colony, unit);
+        boolean ret = !unit.isDisposed() && !checkCashInTreasureTrain(unit);
+        if (ret) {
+            if (tile.getColony() != null && unit.isCarrier()) {
+                final Colony colony = tile.getColony();
+                if (unit.getTradeRoute() == null
+                    && Map.isSameLocation(tile, unit.getDestination())) {
+                    gui.showColonyPanel(colony, unit);
+                }
             }
+            ret = unit.getMovesLeft() > 0;
         }
-        if (unit.getMovesLeft() <= 0) return false;
         displayModelMessages(false);
-        if (!gui.onScreen(tile)) gui.setSelectedTile(tile);
-        return true;
+        return ret;
     }
 
     /**

From 3d90181e415844b82c22f24e09240335341c7533 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 8 Aug 2015 15:18:38 +0930
Subject: [PATCH 076/323] Client-side emigration is obfuscated, simplify.

---
 .../client/control/InGameController.java      | 87 +++++++++++--------
 .../client/control/InGameInputHandler.java    |  3 +-
 src/net/sf/freecol/client/gui/SwingGUI.java   |  7 +-
 3 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 678bd0a8a..ceca264b5 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -439,6 +439,36 @@ public final class InGameController implements NetworkConstants {
         return ret;
     }
 
+    /**
+     * Select all the units to emigrate from Europe.  If they are all
+     * the same they can be picked automatically, but otherwise use
+     * the emigration dialog.  Only to be called if the player is
+     * allowed to select the unit type (i.e. FoY or has Brewster).
+     *
+     * The server contains the count of available FoY-units, and
+     * maintains the immigration/immigrationRequired amounts, so this
+     * routine will fail harmlessly if it asks for too much.
+     *
+     * @param player The <code>Player</code> that owns the unit.
+     * @param n The number of units known to be eligible to emigrate.
+     * @param fountainOfYouth True if this migration if due to a FoY.
+     */
+    private void emigration(Player player, int n, boolean fountainOfYouth) {
+        final Europe europe = player.getEurope();
+        if (europe == null) return;
+
+        for (; n > 0 || player.checkEmigrate() ; n--) {
+            if (!allSame(europe.getRecruitables())) {
+                gui.showEmigrationDialog(player, n, fountainOfYouth);
+                return;
+            }
+            Unit u = askEmigrate(europe,
+                                 Europe.MigrationType.getDefaultSlot());
+            if (u == null) break; // Give up on failure, try again next turn
+            player.addModelMessage(player.getEmigrationMessage(u));
+        }
+    }
+   
     /**
      * Load some goods onto a carrier.
      *
@@ -3196,48 +3226,22 @@ public final class InGameController implements NetworkConstants {
     /**
      * Emigrate a unit from Europe.
      *
-     * Called from GUI.showEmigrationDialog
+     * Called from GUI.showEmigrationDialog.
      *
      * @param player The <code>Player</code> that owns the unit.
      * @param slot The slot to emigrate from, [0..RECRUIT_COUNT].
-     * @return True if a unit emigrated.
+     * @param n The number of remaining units known to be eligible to migrate.
+     * @param foY True if this migration is due to a fountain of youth event.
      */
-    public boolean emigrate(Player player, int slot) {
+    public void emigrate(Player player, int slot, int n, boolean foY) {
         if (player == null || !player.isColonial()
-            || !MigrationType.validMigrantSlot(slot)) return false;
+            || !MigrationType.validMigrantSlot(slot)) return;
 
-        return askEmigrate(player.getEurope(), slot) != null;
-    }
-
-    /**
-     * Loop through selecting (or not when all are the same) a new unit
-     * to emigrate from Europe.  Only to be called if the player is allowed
-     * to select the unit type (i.e. FoY or has Brewster).
-     *
-     * Called from GUI.showEmigrationDialog
-     *
-     * @param player The <code>Player</code> that owns the unit.
-     * @param n The number of units known to be eligible to emigrate.
-     * @param fountainOfYouth True if this migration if due to a FoY.
-     */
-    public void emigrationLoop(Player player, int n, boolean fountainOfYouth) {
-        final Europe europe = player.getEurope();
-        if (europe == null) return;
-
-        for (;;) {
-            if (n == 0 && player.checkEmigrate()) n = 1;
-            if (n <= 0) return;
-            if (!allSame(europe.getRecruitables())) break;
-            Unit u = askEmigrate(europe,
-                                 Europe.MigrationType.getDefaultSlot());
-            if (u != null) {
-                player.addModelMessage(player.getEmigrationMessage(u));
-            }
-            n--;
+        if (askEmigrate(player.getEurope(), slot) != null) {
+            emigration(player, n, foY);
         }
-        gui.showEmigrationDialog(player, n, fountainOfYouth);
     }
-    
+
     /**
      * End the turn command.
      *
@@ -3350,6 +3354,17 @@ public final class InGameController implements NetworkConstants {
         return askServer().firstContact(player, other, tile, result);
     }
 
+    /**
+     * Handle a fountain of youth event.
+     *
+     * Called from IGIH.fountainOfYouth.
+     *
+     * @param n The number of migrants available for selection.
+     */
+    public void fountainOfYouth(int n) {
+        gui.showEmigrationDialog(freeColClient.getMyPlayer(), n, true);
+    }
+
     /**
      * Get the nation summary for a player.
      *
@@ -4326,11 +4341,11 @@ public final class InGameController implements NetworkConstants {
             // Check for emigration.
             Europe europe = player.getEurope();
             if (player.hasAbility(Ability.SELECT_RECRUIT)) {
-                emigrationLoop(player, 0, false);
+                emigration(player, 0, false);
             } else {
                 while (player.checkEmigrate()) {
                     askEmigrate(europe,
-                                Europe.MigrationType.getUnspecificSlot());
+                        Europe.MigrationType.getUnspecificSlot());
                 }
             }
             
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index cc0956ed7..9156a4543 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -783,8 +783,7 @@ public final class InGameInputHandler extends InputHandler {
     private Element fountainOfYouth(Element element) {
         int n = getIntegerAttribute(element, "migrants");
         if (n > 0) {
-            getGUI().showEmigrationDialog(getFreeColClient().getMyPlayer(),
-                                          n, true);
+            igc().fountainOfYouth(n);
         } else {
             logger.warning("Invalid migrants attribute: "
                 + element.getAttribute("migrants"));
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 2e7a178c0..5d88e2c65 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1147,11 +1147,10 @@ public class SwingGUI extends GUI {
         canvas.showEmigrationDialog(player, fountainOfYouth,
             new DialogHandler<Integer>() {
                 @Override
-                public void handle(Integer value) {
-                    // Value should be a valid slot
+                public void handle(Integer value) { // Value is a valid slot
                     igc().emigrate(player,
-                        Europe.MigrationType.convertToMigrantSlot(value));
-                    igc().emigrationLoop(player, n-1, fountainOfYouth);
+                        Europe.MigrationType.convertToMigrantSlot(value),
+                        n-1, fountainOfYouth);
                 }
             });
     }

From d62411e92f759734546997b032c50e909b281de3 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 8 Aug 2015 22:40:55 +0930
Subject: [PATCH 077/323] Drop dutch ship alternative.

---
 data/strings/FreeColMessages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index cde666d27..46f1ee446 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -3710,7 +3710,7 @@ model.nation.dutch.ship.47=Koe
 model.nation.dutch.ship.48=Liefde
 model.nation.dutch.ship.49=Mackreel
 model.nation.dutch.ship.50=Maecht van Enckhuysen
-model.nation.dutch.ship.51=Malckmeyt or Melckmeyt
+model.nation.dutch.ship.51=Melckmeyt
 model.nation.dutch.ship.52=Margriet
 model.nation.dutch.ship.53=Meeuwken
 model.nation.dutch.ship.54=Merimin

From f6816f38cfd5b69be792994205c79bb07aa1cad9 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 8 Aug 2015 22:42:34 +0930
Subject: [PATCH 078/323] =?UTF-8?q?Forum=20discussion=20prefers=20just=20"?=
 =?UTF-8?q?Qu=C3=A9bec".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/strings/FreeColMessages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 46f1ee446..47611f521 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -4165,7 +4165,7 @@ model.nation.french.settlementName.classic.63=Port Menier
 model.nation.french.settlementName.classic.64=Portage la Prairie
 model.nation.french.settlementName.classic.65=St. Boniface
 
-model.nation.french.settlementName.freecol.0=Ville de Québec
+model.nation.french.settlementName.freecol.0=Québec
 #1541
 model.nation.french.settlementName.freecol.1=Charlesfort
 #1562

From d1b3bf6f2d252488764b553c19f30d536e7cab39 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 8 Aug 2015 20:52:55 +0200
Subject: [PATCH 079/323] Improve how UnitInfoPanel displays items on carriers,
 PF#44, fixing IR#157

It wraps after 5 columns now (carrier + 4 items).
Full stacks show as bigger icon without number now.
---
 .../freecol/client/gui/panel/InfoPanel.java   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index bb9d7591f..ad782545b 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -51,13 +51,13 @@ import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.AbstractGoods;
 import net.sf.freecol.common.model.Goods;
 import net.sf.freecol.common.model.GoodsContainer;
-import net.sf.freecol.common.model.Modifier;
+import net.sf.freecol.common.model.GoodsType;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Tile;
-import net.sf.freecol.common.model.TileImprovement;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.resources.ResourceManager;
+
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -234,7 +234,7 @@ public final class InfoPanel extends FreeColPanel {
          * Create a new unit information panel.
          */
         public UnitInfoPanel() {
-            super(new MigLayout("wrap 6, fill, gap 0 0", "", ""));
+            super(new MigLayout("wrap 5, fill, gap 0 0", "", ""));
 
             setSize(260, 130);
             setOpaque(false);
@@ -309,9 +309,17 @@ public final class InfoPanel extends FreeColPanel {
                     ImageIcon icon;
                     JLabel label;
                     for (Goods goods : unit.getGoodsList()) {
-                        icon = new ImageIcon(lib.getSmallIconImage(goods.getType()));
-                        label = new JLabel(String.valueOf(goods.getAmount()),
-                                           icon, JLabel.RIGHT);
+                        int amount = goods.getAmount();
+                        GoodsType gt = goods.getType();
+                        // FIXME: Get size of full stack from appropriate place.
+                        if(amount == 100) {
+                            icon = new ImageIcon(lib.getIconImage(gt));
+                            label = new JLabel(icon);
+                        } else {
+                            icon = new ImageIcon(lib.getSmallIconImage(gt));
+                            label = new JLabel(String.valueOf(amount),
+                                               icon, JLabel.RIGHT);
+                        }
                         text = Messages.message(goods.getLabel(true));
                         label.setFont(font);
                         label.setToolTipText(text);

From cbaad73f3f18fba98f76bed7eb9bfc598bf7e934 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 9 Aug 2015 10:10:55 +0930
Subject: [PATCH 080/323] Restore selection of next active unit at start of
 turn.

---
 src/net/sf/freecol/client/control/InGameController.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index ceca264b5..1a6e78a29 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -4351,13 +4351,14 @@ public final class InGameController implements NetworkConstants {
             
             player.resetIterators();
             fallback = player.getFallbackTile();
-
+            updateActiveUnit(fallback);
+            updateControls();
+            
             // GUI management.
             if (!freeColClient.isSinglePlayer()) {
                 sound("sound.anthem." + player.getNationId());
             }
         }
-        updateControls();
         return true;
     }
 

From 40cdcdfeef4bdbce5a852610b907c372034c6b4e Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 9 Aug 2015 16:08:49 +0930
Subject: [PATCH 081/323] Move invokeAndWait to FreeColClient and use in
 controller.

---
 src/net/sf/freecol/client/FreeColClient.java  | 19 +++++++++++++
 .../client/control/InGameController.java      | 10 +------
 .../client/control/InGameInputHandler.java    | 28 ++++---------------
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/net/sf/freecol/client/FreeColClient.java b/src/net/sf/freecol/client/FreeColClient.java
index 2f39342be..bd7e70350 100644
--- a/src/net/sf/freecol/client/FreeColClient.java
+++ b/src/net/sf/freecol/client/FreeColClient.java
@@ -23,6 +23,7 @@ import java.awt.Dimension;
 import java.io.File;
 import java.io.InputStream;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
@@ -229,6 +230,24 @@ public final class FreeColClient {
         }
     }
 
+    /**
+     * Wrapper for SwingUtilities.invokeAndWait that handles the case
+     * where we are already in the EDT.
+     *
+     * @param runnable A <code>Runnable</code> to run.
+     */
+    public void invokeAndWait(Runnable runnable) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            runnable.run();
+        } else {
+            try {
+                SwingUtilities.invokeAndWait(runnable);
+            } catch (InterruptedException|InvocationTargetException ex) {
+                logger.log(Level.WARNING, "Client GUI interaction", ex);
+            }
+        }
+    }
+
     /**
      * Starts the new <code>FreeColClient</code>, including the GUI.
      *
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 1a6e78a29..fa021c591 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -744,15 +744,7 @@ public final class InGameController implements NetworkConstants {
                     };
             }
             updateControls();
-            if (SwingUtilities.isEventDispatchThread()) {
-                uiTask.run();
-            } else {
-                try {
-                    SwingUtilities.invokeAndWait(uiTask);
-                } catch (InterruptedException|InvocationTargetException ex) {
-                    logger.log(Level.WARNING, "Message display", ex);
-                }
-            }
+            freeColClient.invokeAndWait(uiTask);
         }
         return !messages.isEmpty();
     }
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index 9156a4543..4267ec66d 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -143,22 +143,6 @@ public final class InGameInputHandler extends InputHandler {
         return getFreeColClient().getInGameController();
     }
 
-    /**
-     * Wrapper for SwingUtilities.invokeAndWait.  This has to handle the
-     * case where we are already in the EDT.
-     *
-     * @param runnable A <code>Runnable</code> to run.
-     */
-    private void invokeAndWait(Runnable runnable) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            runnable.run();
-        } else {
-            try {
-                SwingUtilities.invokeAndWait(runnable);
-            } catch (Exception e) {}
-        }
-    }
-
     /**
      * Refresh the canvas.
      *
@@ -467,7 +451,7 @@ public final class InGameInputHandler extends InputHandler {
 
         // All is well, do the animation.
         final Unit attacker = u;
-        invokeAndWait(new Runnable() {
+        freeColClient.invokeAndWait(new Runnable() {
                 @Override
                 public void run() {
                     getGUI().animateUnitAttack(attacker, defender,
@@ -544,7 +528,7 @@ public final class InGameInputHandler extends InputHandler {
         }
 
         final Unit unit = u;
-        invokeAndWait(new Runnable() {
+        freeColClient.invokeAndWait(new Runnable() {
                 @Override
                 public void run() {
                     getGUI().animateUnitMove(unit, oldTile, newTile);
@@ -603,7 +587,7 @@ public final class InGameInputHandler extends InputHandler {
      * @return Null.
      */
     private Element closeMenus() {
-        invokeAndWait(closeMenusRunnable);
+        getFreeColClient().invokeAndWait(closeMenusRunnable);
         return null;
     }
 
@@ -635,7 +619,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        invokeAndWait(new Runnable() {
+        getFreeColClient().invokeAndWait(new Runnable() {
                 @Override
                 public void run() {
                     message.setAgreement(igc().diplomacy(our, other,
@@ -849,7 +833,7 @@ public final class InGameInputHandler extends InputHandler {
             throw new IllegalArgumentException("Demand to anothers colony");
         }
 
-        invokeAndWait(new Runnable() {
+        getFreeColClient().invokeAndWait(new Runnable() {
                 @Override
                 public void run() {
                     boolean accepted = igc().indianDemand(unit, colony,
@@ -1036,7 +1020,7 @@ public final class InGameInputHandler extends InputHandler {
                 // Deselect the object if it is the current active unit.
                 Unit u = (Unit)fcgo;
                 if (u == getGUI().getActiveUnit()) {
-                    invokeAndWait(deselectActiveUnitRunnable);
+                    getFreeColClient().invokeAndWait(deselectActiveUnitRunnable);
                 }
                 // Temporary hack until we have real containers.
                 if (u != null && u.getOwner() != null) {

From 6cef1268d968de6c9730f90deab74764bff2d38d Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 9 Aug 2015 18:46:07 +0200
Subject: [PATCH 082/323] Hide ugly, misplaced black panel background before
 starting the video

---
 src/net/sf/freecol/client/gui/video/VideoComponent.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/video/VideoComponent.java b/src/net/sf/freecol/client/gui/video/VideoComponent.java
index 9eb3669f0..446cc27d2 100644
--- a/src/net/sf/freecol/client/gui/video/VideoComponent.java
+++ b/src/net/sf/freecol/client/gui/video/VideoComponent.java
@@ -27,11 +27,11 @@ import java.util.logging.Logger;
 import javax.swing.JPanel;
 import javax.swing.border.Border;
 
+import com.fluendo.player.Cortado;
+
 import net.sf.freecol.client.gui.panel.FreeColImageBorder;
 import net.sf.freecol.common.resources.Video;
 
-import com.fluendo.player.Cortado;
-
 
 /**
  * A component for playing video.
@@ -55,6 +55,7 @@ public class VideoComponent extends JPanel {
     public VideoComponent(Video video, boolean mute) {
         final String url = video.getURL().toExternalForm();
 
+        setOpaque(false);
         setBorder(createBorder());
         final Insets insets = getInsets();
 

From 3fe27a0b9bbfc1d6d2955635a2ce9d1ffcb93755 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 9 Aug 2015 19:30:32 +0200
Subject: [PATCH 083/323] Remove dead code in TileInfoPanel

---
 src/net/sf/freecol/client/gui/panel/InfoPanel.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index ad782545b..7bd4302dc 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -150,11 +150,6 @@ public final class InfoPanel extends FreeColPanel {
                 FontLibrary.FontSize.TINY, lib.getScalingFactor());
             if (tile != null && tile.getType() != null) {
                 final int width = getWidth() - SLACK;
-                List<AbstractGoods> production = tile.getType()
-                    .getPossibleProduction(true);
-                if (production.size() > PRODUCTION) {
-                    production = production.subList(0, PRODUCTION);
-                }
                 BufferedImage image = mapViewer.createTileImageWithBeachBorderAndItems(tile);
                 if (tile.isExplored()) {
                     String text = Messages.message(tile.getLabel());

From 4bddf4418d22bd710adacbda02847a38385b2053 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 10 Aug 2015 13:24:11 +0930
Subject: [PATCH 084/323] Move invokeLater to FreeColClient and use it in IGIH.

---
 src/net/sf/freecol/client/FreeColClient.java  | 14 +++++++++
 .../client/control/InGameInputHandler.java    | 30 +++++++++----------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/net/sf/freecol/client/FreeColClient.java b/src/net/sf/freecol/client/FreeColClient.java
index bd7e70350..dc24f5184 100644
--- a/src/net/sf/freecol/client/FreeColClient.java
+++ b/src/net/sf/freecol/client/FreeColClient.java
@@ -248,6 +248,20 @@ public final class FreeColClient {
         }
     }
 
+    /**
+     * Wrapper for SwingUtilities.invokeLater that handles the case
+     * where we are already in the EDT.
+     *
+     * @param runnable A <code>Runnable</code> to run.
+     */
+    public void invokeLater(Runnable runnable) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            runnable.run();
+        } else {
+            SwingUtilities.invokeLater(runnable);
+        }
+    }
+    
     /**
      * Starts the new <code>FreeColClient</code>, including the GUI.
      *
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index 4267ec66d..88b2b502e 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -24,8 +24,6 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.swing.SwingUtilities;
-
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.common.debug.FreeColDebugger;
@@ -73,8 +71,8 @@ import org.w3c.dom.NodeList;
  *
  * Usually delegate to the real handlers in InGameController, making
  * sure anything non-trivial that touches the GUI is doing so inside
- * the EDT.  Usually this is done with SwingUtilities.invokeLater, but
- * some messages demand a response which requires invokeAndWait.
+ * the EDT.  Usually this is done with invokeLater, but some messages
+ * demand a response which requires invokeAndWait.
  *
  * Note that the EDT often calls the controller, which queries the
  * server, which results in handling the reply here, still within the
@@ -149,7 +147,7 @@ public final class InGameInputHandler extends InputHandler {
      * @param focus If true, request the focus.
      */
     private void refreshCanvas(final boolean focus) {
-        SwingUtilities.invokeLater(new Runnable() {
+        getFreeColClient().invokeLater(new Runnable() {
                 @Override
                 public void run() {
                     getGUI().refresh();
@@ -306,7 +304,7 @@ public final class InGameInputHandler extends InputHandler {
         final FreeColClient fcc = getFreeColClient();
         if (Boolean.TRUE.toString().equals(element.getAttribute("flush"))
             && fcc.currentPlayerIsMyPlayer()) {
-            SwingUtilities.invokeLater(displayModelMessagesRunnable);
+            getFreeColClient().invokeLater(displayModelMessagesRunnable);
         }
         return reply;
     }
@@ -549,7 +547,7 @@ public final class InGameInputHandler extends InputHandler {
         final Game game = getGame();
         final ChatMessage chatMessage = new ChatMessage(game, element);
 
-        SwingUtilities.invokeLater(new Runnable() {
+        getFreeColClient().invokeLater(new Runnable() {
             @Override
             public void run() {
                 getGUI().displayChatMessage(chatMessage.getPlayer(game),
@@ -626,7 +624,7 @@ public final class InGameInputHandler extends InputHandler {
                                                          agreement));
                 }
             });
-        SwingUtilities.invokeLater(updateMenuBarRunnable);
+        getFreeColClient().invokeLater(updateMenuBarRunnable);
         return (message.getAgreement() == null) ? null
             : message.toXMLElement();
     }
@@ -671,7 +669,7 @@ public final class InGameInputHandler extends InputHandler {
         final String messageId = element.getAttribute("messageID");
         final String message = element.getAttribute("message");
 
-        SwingUtilities.invokeLater(new Runnable() {
+        getFreeColClient().invokeLater(new Runnable() {
                 @Override
                 public void run() {
                     getGUI().showErrorMessage(messageId, message);
@@ -792,7 +790,7 @@ public final class InGameInputHandler extends InputHandler {
             = "true".equalsIgnoreCase(element.getAttribute("highScore"));
 
         if (winner == freeColClient.getMyPlayer()) {
-            SwingUtilities.invokeLater(new Runnable() {
+            getFreeColClient().invokeLater(new Runnable() {
                     @Override
                     public void run() {
                         igc().displayHighScores(highScore);
@@ -952,7 +950,7 @@ public final class InGameInputHandler extends InputHandler {
     private Element newTurn(Element element) {
         final int n = getIntegerAttribute(element, "turn");
 
-        SwingUtilities.invokeLater(new Runnable() {
+        getFreeColClient().invokeLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().newTurn(n);
@@ -962,7 +960,7 @@ public final class InGameInputHandler extends InputHandler {
         igc().setCurrentPlayer(null);
         refreshCanvas(false);
 
-        SwingUtilities.invokeLater(updateMenuBarRunnable);
+        getFreeColClient().invokeLater(updateMenuBarRunnable);
         return null;
     }
 
@@ -976,7 +974,7 @@ public final class InGameInputHandler extends InputHandler {
     private Element reconnect(@SuppressWarnings("unused") Element element) {
         logger.finest("Entered reconnect.");
 
-        SwingUtilities.invokeLater(reconnectRunnable);
+        getFreeColClient().invokeLater(reconnectRunnable);
         return null;
     }
 
@@ -1085,7 +1083,7 @@ public final class InGameInputHandler extends InputHandler {
         final Player player = getGame()
             .getFreeColGameObject(element.getAttribute("player"),Player.class);
 
-        SwingUtilities.invokeLater(new Runnable() {
+        getFreeColClient().invokeLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().setDead(player);
@@ -1110,7 +1108,7 @@ public final class InGameInputHandler extends InputHandler {
         final Player p2 = game
             .getFreeColGameObject(element.getAttribute("second"),Player.class);
 
-        SwingUtilities.invokeLater(new Runnable() {
+        getFreeColClient().invokeLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().setStance(stance, p1, p2);
@@ -1154,7 +1152,7 @@ public final class InGameInputHandler extends InputHandler {
         // is closed.
         final Element fullElement = (Element)nodeList.item(0);
         final Element normalElement = (Element)nodeList.item(1);
-        SwingUtilities.invokeLater(new Runnable() {
+        getFreeColClient().invokeLater(new Runnable() {
                 @Override
                 public void run() {
                     tile.readFromXMLElement(fullElement);

From b2bdce8b354014ecfba940fff6711ad1eba4ffc0 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 10 Aug 2015 14:41:18 +0930
Subject: [PATCH 085/323] Let IGC.monarchAction do its gui updating.

---
 src/net/sf/freecol/client/control/InGameController.java | 1 +
 src/net/sf/freecol/client/gui/SwingGUI.java             | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index fa021c591..24bd079b1 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -3707,6 +3707,7 @@ public final class InGameController implements NetworkConstants {
         default:
             break;
         }
+        updateControls();
         return false;
     }
 
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 5d88e2c65..98ab308d5 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1321,7 +1321,6 @@ public class SwingGUI extends GUI {
                 @Override
                 public void handle(Boolean b) {
                     igc().monarchAction(action, b);
-                    canvas.updateMenuBar();
                 }
             });
     }

From cc8146e5def9e8de12257bbd655c7d1e9d3a6cbd Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 10 Aug 2015 14:47:48 +0930
Subject: [PATCH 086/323] Drop redundant update from DeclareIndependenceAction.

---
 .../sf/freecol/client/gui/action/DeclareIndependenceAction.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/action/DeclareIndependenceAction.java b/src/net/sf/freecol/client/gui/action/DeclareIndependenceAction.java
index cd6a5c4e0..3f3fd121d 100644
--- a/src/net/sf/freecol/client/gui/action/DeclareIndependenceAction.java
+++ b/src/net/sf/freecol/client/gui/action/DeclareIndependenceAction.java
@@ -65,6 +65,5 @@ public class DeclareIndependenceAction extends MapboardAction {
     @Override
     public void actionPerformed(ActionEvent e) {
         igc().declareIndependence();
-        update();
     }
 }

From 257da9d53f33feee889433701086748b4153c43f Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 10 Aug 2015 14:51:16 +0930
Subject: [PATCH 087/323] Messaging clean up in ChangeAction.

---
 .../sf/freecol/client/gui/action/ChangeAction.java   | 12 ++++++------
 .../sf/freecol/client/gui/action/FreeColAction.java  |  4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/action/ChangeAction.java b/src/net/sf/freecol/client/gui/action/ChangeAction.java
index a6815bbc9..b0944ec9e 100644
--- a/src/net/sf/freecol/client/gui/action/ChangeAction.java
+++ b/src/net/sf/freecol/client/gui/action/ChangeAction.java
@@ -70,14 +70,14 @@ public class ChangeAction extends UnitAction {
     public final void update() {
         super.update();
 
-        Unit unit = getGUI().getActiveUnit();
+        final Unit unit = getGUI().getActiveUnit();
         if (unit != null && unit.hasTile()) {
             if (unit.getColony() != null) {
-                putValue(NAME, Messages.message("changeAction.enterColony.name"));
+                putValue(NAME, Messages.getName("changeAction.enterColony"));
             } else if (unit.isOnCarrier()) {
-                putValue(NAME, Messages.message("changeAction.selectCarrier.name"));
+                putValue(NAME, Messages.getName("changeAction.selectCarrier"));
             } else {
-                putValue(NAME, Messages.message("changeAction.nextUnitOnTile.name"));
+                putValue(NAME, Messages.getName("changeAction.nextUnitOnTile"));
             }
         }
     }
@@ -90,8 +90,8 @@ public class ChangeAction extends UnitAction {
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        Unit unit = getGUI().getActiveUnit();
-        Tile tile = unit.getTile();
+        final Unit unit = getGUI().getActiveUnit();
+        final Tile tile = unit.getTile();
 
         if (tile.getColony() != null) {
             getGUI().showColonyPanel(tile.getColony(), unit);
diff --git a/src/net/sf/freecol/client/gui/action/FreeColAction.java b/src/net/sf/freecol/client/gui/action/FreeColAction.java
index 593088884..2ddf6717a 100644
--- a/src/net/sf/freecol/client/gui/action/FreeColAction.java
+++ b/src/net/sf/freecol/client/gui/action/FreeColAction.java
@@ -364,9 +364,7 @@ public abstract class FreeColAction extends AbstractAction
      */
     public void update() {
         boolean b = shouldBeEnabled();
-        if (isEnabled() != b) {
-            setEnabled(b);
-        }
+        if (isEnabled() != b) setEnabled(b);
     }
 
 

From 8f6ce780eb6af40a9f84a9c895c97df65598867f Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 10 Aug 2015 14:59:06 +0930
Subject: [PATCH 088/323] Always update the actions after loading from the
 spec.

---
 src/net/sf/freecol/client/control/ConnectController.java   | 1 -
 src/net/sf/freecol/client/control/PreGameInputHandler.java | 1 -
 src/net/sf/freecol/client/gui/action/ActionManager.java    | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
index c5ad4c2aa..6d9b3f6a6 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -296,7 +296,6 @@ public final class ConnectController {
         }
         freeColClient.setMyPlayer(player);
         freeColClient.addSpecificationActions(game.getSpecification());
-        freeColClient.updateActions();
         logger.info("FreeColClient logged in as " + user
             + "/" + player.getId());
 
diff --git a/src/net/sf/freecol/client/control/PreGameInputHandler.java b/src/net/sf/freecol/client/control/PreGameInputHandler.java
index bcf10a7cf..514389ad8 100644
--- a/src/net/sf/freecol/client/control/PreGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/PreGameInputHandler.java
@@ -339,7 +339,6 @@ public final class PreGameInputHandler extends InputHandler {
             Game game = fcc.getGame();
             game.readFromXMLElement((Element)children.item(0));
             fcc.addSpecificationActions(game.getSpecification());
-            fcc.updateActions();
         } else {
             logger.warning("Child node expected: " + element.getTagName());
         }
diff --git a/src/net/sf/freecol/client/gui/action/ActionManager.java b/src/net/sf/freecol/client/gui/action/ActionManager.java
index 4c16ab10f..52fef4079 100644
--- a/src/net/sf/freecol/client/gui/action/ActionManager.java
+++ b/src/net/sf/freecol/client/gui/action/ActionManager.java
@@ -175,6 +175,7 @@ public class ActionManager extends OptionGroup {
                 add(new ImprovementAction(freeColClient, type));
             }
         }
+        update();
     }
 
     /**

From c658f642f47f5e725bd276f52cd5d228cf8a2d46 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 10 Aug 2015 20:00:08 +0930
Subject: [PATCH 089/323] Move getAnimationSpeed up to FreeColClient.

---
 src/net/sf/freecol/client/FreeColClient.java    | 13 +++++++++++++
 .../client/control/InGameInputHandler.java      |  6 ++++--
 src/net/sf/freecol/client/gui/GUI.java          | 13 -------------
 src/net/sf/freecol/client/gui/SwingGUI.java     |  4 ++--
 .../client/gui/animation/Animations.java        | 14 +++++++-------
 .../gui/animation/UnitAttackAnimation.java      | 17 ++++++++++-------
 .../client/gui/animation/UnitMoveAnimation.java | 14 ++++++++------
 7 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/src/net/sf/freecol/client/FreeColClient.java b/src/net/sf/freecol/client/FreeColClient.java
index dc24f5184..d20c105e6 100644
--- a/src/net/sf/freecol/client/FreeColClient.java
+++ b/src/net/sf/freecol/client/FreeColClient.java
@@ -739,6 +739,19 @@ public final class FreeColClient {
             && player.equals(game.getCurrentPlayer());
     }
 
+    /**
+     * Common utility routine to retrieve animation speed.
+     *
+     * @param player The <code>Player</code> to be animated.
+     * @return The animation speed.
+     */
+    public int getAnimationSpeed(Player player) {
+        String key = (getMyPlayer() == player)
+            ? ClientOptions.MOVE_ANIMATION_SPEED
+            : ClientOptions.ENEMY_MOVE_ANIMATION_SPEED;
+        return getClientOptions().getInteger(key);
+    }
+
     /**
      * Get a list of the player colonies.
      *
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index 88b2b502e..4005dfd5a 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -411,7 +411,8 @@ public final class InGameInputHandler extends InputHandler {
         // was set.  However IR#115 requested that if animation is off
         // that we display nothing so as to speed up the other player
         // moves as much as possible.
-        if (getGUI().getAnimationSpeed(u) <= 0) return null;
+        if (getFreeColClient().getAnimationSpeed(u.getOwner()) <= 0)
+            return null;
 
         if ((str = element.getAttribute("defender")).isEmpty()) {
             throw new IllegalStateException("Attack animation for: "
@@ -497,7 +498,8 @@ public final class InGameInputHandler extends InputHandler {
         // was set.  However IR#115 requested that if animation is off
         // that we display nothing so as to speed up the other player
         // moves as much as possible.
-        if (getGUI().getAnimationSpeed(u) <= 0) return null;
+        if (getFreeColClient().getAnimationSpeed(u.getOwner()) <= 0)
+            return null;
 
         String oldTileId = element.getAttribute("oldTile");
         if (oldTileId.isEmpty()) {
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index b31a47d16..fa6aa4446 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -329,19 +329,6 @@ public class GUI {
 
     // Animation handling
 
-    /**
-     * Common utility routine to retrieve animation speed.
-     *
-     * @param unit The <code>Unit</code> to be animated.
-     * @return The animation speed.
-     */
-    public int getAnimationSpeed(Unit unit) {
-        String key = (freeColClient.getMyPlayer() == unit.getOwner())
-            ? ClientOptions.MOVE_ANIMATION_SPEED
-            : ClientOptions.ENEMY_MOVE_ANIMATION_SPEED;
-        return freeColClient.getClientOptions().getInteger(key);
-    }
-
     /**
      * Animate a unit attack.
      *
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 98ab308d5..c7b496d46 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -636,7 +636,7 @@ public class SwingGUI extends GUI {
                                   Tile attackerTile, Tile defenderTile,
                                   boolean success) {
         requireFocus(attackerTile);
-        Animations.unitAttack(this, attacker, defender,
+        Animations.unitAttack(freeColClient, attacker, defender,
                               attackerTile, defenderTile, success);
     }
 
@@ -650,7 +650,7 @@ public class SwingGUI extends GUI {
     @Override
     public void animateUnitMove(Unit unit, Tile srcTile, Tile dstTile) {
         requireFocus(srcTile);
-        Animations.unitMove(this, unit, srcTile, dstTile);
+        Animations.unitMove(freeColClient, unit, srcTile, dstTile);
     }
 
 
diff --git a/src/net/sf/freecol/client/gui/animation/Animations.java b/src/net/sf/freecol/client/gui/animation/Animations.java
index 87ec64c55..a07680881 100644
--- a/src/net/sf/freecol/client/gui/animation/Animations.java
+++ b/src/net/sf/freecol/client/gui/animation/Animations.java
@@ -19,7 +19,7 @@
 
 package net.sf.freecol.client.gui.animation;
 
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Unit;
 
@@ -32,32 +32,32 @@ public class Animations {
     /**
      * Animates a unit move.
      *
-     * @param gui The <code>GUI</code> to display on.
+     * @param freeColClient The enclosing <code>FreeColClient</code>.
      * @param unit The <code>Unit</code> to be animated.
      * @param source The source <code>Tile</code> for the unit.
      * @param destination The destination <code>Tile</code> for the unit.
      */
-    public static void unitMove(GUI gui, Unit unit,
+    public static void unitMove(FreeColClient freeColClient, Unit unit,
                                 Tile source, Tile destination) {
-        new UnitMoveAnimation(gui, unit, source, destination)
+        new UnitMoveAnimation(freeColClient, unit, source, destination)
             .animate();
     }
     
     /**
      * Animates a unit attack.
      * 
-     * @param gui The <code>GUI</code> to display on.
+     * @param freeColClient The enclosing <code>FreeColClient</code>.
      * @param attacker The <code>Unit</code> that is attacking.
      * @param defender The <code>Unit</code> that is defending.
      * @param attackerTile The <code>Tile</code> the attack comes from.
      * @param defenderTile The <code>Tile</code> the attack goes to.
      * @param success Did the attack succeed?
      */
-    public static void unitAttack(GUI gui,
+    public static void unitAttack(FreeColClient freeColClient,
                                   Unit attacker, Unit defender,
                                   Tile attackerTile, Tile defenderTile,
                                   boolean success) {
-        new UnitAttackAnimation(gui, attacker, defender,
+        new UnitAttackAnimation(freeColClient, attacker, defender,
                                 attackerTile, defenderTile, success)
             .animate();
     }
diff --git a/src/net/sf/freecol/client/gui/animation/UnitAttackAnimation.java b/src/net/sf/freecol/client/gui/animation/UnitAttackAnimation.java
index 198d755ce..7989e0a97 100644
--- a/src/net/sf/freecol/client/gui/animation/UnitAttackAnimation.java
+++ b/src/net/sf/freecol/client/gui/animation/UnitAttackAnimation.java
@@ -19,6 +19,7 @@
 
 package net.sf.freecol.client.gui.animation;
 
+import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.common.io.sza.SimpleZippedAnimation;
 import net.sf.freecol.common.model.Direction;
@@ -32,7 +33,7 @@ import net.sf.freecol.common.resources.ResourceManager;
  */
 final class UnitAttackAnimation {
 
-    private final GUI gui;
+    private final FreeColClient freeColClient;
     private final Unit attacker;
     private final Unit defender;
     private final Tile attackerTile;
@@ -43,17 +44,18 @@ final class UnitAttackAnimation {
     /**
      * Build a new attack animation.
      *
-     * @param gui The <code>GUI</code> to display on.
+     * @param freeColClient The enclosing <code>FreeColClient</code>.
      * @param attacker The <code>Unit</code> that is attacking.
      * @param defender The <code>Unit</code> that is defending.
      * @param attackerTile The <code>Tile</code> the attack comes from.
      * @param defenderTile The <code>Tile</code> the attack goes to.
      * @param success Does the attack succeed?
      */
-    public UnitAttackAnimation(GUI gui, Unit attacker, Unit defender,
+    public UnitAttackAnimation(FreeColClient freeColClient,
+                               Unit attacker, Unit defender,
                                Tile attackerTile, Tile defenderTile,
                                boolean success) {
-        this.gui = gui;
+        this.freeColClient = freeColClient;
         this.attacker = attacker;
         this.defender = defender;
         this.attackerTile = attackerTile;
@@ -90,7 +92,7 @@ final class UnitAttackAnimation {
      */
     private SimpleZippedAnimation getAnimation(Unit unit,
                                                Direction direction) {
-        float scale = gui.getMapScale();
+        float scale = freeColClient.getGUI().getMapScale();
         String roleStr = (unit.hasDefaultRole()) ? ""
             : "." + unit.getRoleSuffix();
         String startStr = "animation.unit." + unit.getType().getId() + roleStr
@@ -129,10 +131,11 @@ final class UnitAttackAnimation {
      * Do the animation.
      */
     public void animate() {
+        final GUI gui = freeColClient.getGUI();
         Direction direction = attackerTile.getDirection(defenderTile);
         SimpleZippedAnimation sza;
 
-        if (gui.getAnimationSpeed(attacker) > 0) {
+        if (freeColClient.getAnimationSpeed(attacker.getOwner()) > 0) {
             if ((sza = getAnimation(attacker, direction)) != null) {
                 new UnitImageAnimation(gui, attacker, attackerTile, sza, mirror)
                     .animate();
@@ -140,7 +143,7 @@ final class UnitAttackAnimation {
         }
 
         if (!success
-            && gui.getAnimationSpeed(defender) > 0) {
+            && freeColClient.getAnimationSpeed(defender.getOwner()) > 0) {
             direction = direction.getReverseDirection();
             if ((sza = getAnimation(defender, direction)) != null) {
                 new UnitImageAnimation(gui, defender, defenderTile, sza, mirror)
diff --git a/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java b/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
index 28e950934..ceadfb17d 100644
--- a/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
+++ b/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
@@ -24,6 +24,7 @@ import java.awt.Rectangle;
 
 import javax.swing.JLabel;
 
+import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.OutForAnimationCallback;
 import net.sf.freecol.common.model.Tile;
@@ -41,23 +42,22 @@ final class UnitMoveAnimation {
      */
     private static final int ANIMATION_DELAY = 33;
 
+    private final FreeColClient freeColClient;
     private final Unit unit;
     private final Tile sourceTile;
     private final Tile destinationTile;
 
-    private final GUI gui;
-
     /**
      * Constructor
      *
-     * @param gui The <code>GUI</code> to display on.
+     * @param freeColClient The enclosing <code>FreeColClient</code>.
      * @param unit The <code>Unit</code> to be animated.
      * @param sourceTile The <code>Tile</code> the unit is moving from.
      * @param destinationTile The <code>Tile</code> the unit is moving to.
      */
-    public UnitMoveAnimation(GUI gui, Unit unit,
+    public UnitMoveAnimation(FreeColClient freeColClient, Unit unit,
                              Tile sourceTile, Tile destinationTile) {
-        this.gui = gui;
+        this.freeColClient = freeColClient;
         this.unit = unit;
         this.sourceTile = sourceTile;
         this.destinationTile = destinationTile;
@@ -68,7 +68,9 @@ final class UnitMoveAnimation {
      * Do the animation.
      */
     public void animate() {
-        final int movementSpeed = gui.getAnimationSpeed(unit);
+        final int movementSpeed
+            = freeColClient.getAnimationSpeed(unit.getOwner());
+        final GUI gui = freeColClient.getGUI();
         final Point srcP = gui.getTilePosition(sourceTile);
         final Point dstP = gui.getTilePosition(destinationTile);
         

From f49895a25d58c33931fec82f7c2b1182aa8b1213 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 10 Aug 2015 20:54:38 +0930
Subject: [PATCH 090/323] Always add labels for empty fields in TileInfoPanel,
 IR#2839.

---
 .../freecol/client/gui/panel/InfoPanel.java   | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index 7bd4302dc..080810204 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -163,7 +163,9 @@ public final class InfoPanel extends FreeColPanel {
                     add(new JLabel(new ImageIcon(image)), "spany");
 
                     final Player owner = tile.getOwner();
-                    if (owner != null) {
+                    if (owner == null) {
+                        add(new JLabel(), "span " + PRODUCTION);
+                    } else {
                         StringTemplate t = owner.getNationName();
                         add(Utility.localizedLabel(t), "span " + PRODUCTION);
                     }
@@ -182,16 +184,21 @@ public final class InfoPanel extends FreeColPanel {
 
                     List<AbstractGoods> produce = tile.getType()
                         .getPossibleProduction(true);
-                    Collections.sort(produce,
-                                     AbstractGoods.abstractGoodsComparator);
-                    for (AbstractGoods goods : produce) {
-                        JLabel goodsLabel = new JLabel(
-                            String.valueOf(tile.getPotentialProduction(goods.getType(), null)),
-                            new ImageIcon(lib.getSmallIconImage(goods.getType())),
-                            JLabel.RIGHT);
-                        goodsLabel.setToolTipText(Messages.getName(goods.getType()));
-                        goodsLabel.setFont(font);
-                        add(goodsLabel);
+                    if (produce.isEmpty()) {
+                        add(new JLabel(), "span " + PRODUCTION);
+                    } else {
+                        Collections.sort(produce,
+                            AbstractGoods.abstractGoodsComparator);
+                        for (AbstractGoods ag : produce) {
+                            GoodsType type = ag.getType();
+                            int n = tile.getPotentialProduction(type, null);
+                            JLabel label = new JLabel(String.valueOf(n),
+                                new ImageIcon(lib.getSmallIconImage(type)),
+                                JLabel.RIGHT);
+                            label.setToolTipText(Messages.getName(type));
+                            label.setFont(font);
+                            add(label);
+                        }
                     }
                 } else {
                     add(Utility.localizedLabel("unexplored"),

From b6e27151d8a21e3183335f9a03e6c0ddc540fe30 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 11 Aug 2015 09:58:42 +0930
Subject: [PATCH 091/323] Suppress tile improvement bonus for unattended
 non-food production on built improvements.

---
 src/net/sf/freecol/common/model/TileImprovement.java |  7 ++++++-
 test/src/net/sf/freecol/common/model/TileTest.java   | 12 +++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/net/sf/freecol/common/model/TileImprovement.java b/src/net/sf/freecol/common/model/TileImprovement.java
index a7fcf172b..c276caf0d 100644
--- a/src/net/sf/freecol/common/model/TileImprovement.java
+++ b/src/net/sf/freecol/common/model/TileImprovement.java
@@ -489,7 +489,12 @@ public class TileImprovement extends TileItem implements Named {
     public List<Modifier> getProductionModifiers(GoodsType goodsType,
                                                  UnitType unitType) {
         if (goodsType != null) {
-            Modifier modifier = getProductionModifier(goodsType);
+            boolean disableUnattended = !isNatural()
+                && unitType == null                
+                && !goodsType.isFoodType()
+                && getSpecification().getBoolean(GameOptions.ONLY_NATURAL_IMPROVEMENTS);
+            Modifier modifier = (disableUnattended) ? null
+                : getProductionModifier(goodsType);
             if (modifier != null && isComplete()) {
                 List<Modifier> result = new ArrayList<>();
                 result.add(modifier);
diff --git a/test/src/net/sf/freecol/common/model/TileTest.java b/test/src/net/sf/freecol/common/model/TileTest.java
index 58651d48c..e850bf66f 100644
--- a/test/src/net/sf/freecol/common/model/TileTest.java
+++ b/test/src/net/sf/freecol/common/model/TileTest.java
@@ -465,12 +465,16 @@ public class TileTest extends FreeColTestCase {
         assertFalse(tile1.canProduce(lumber, null));
         assertFalse(hasBonusFrom(tile1.getProductionModifiers(lumber, null),
                                  river1.getType()));
-        // Hills can not produce sugar, but can produce ore.
+        // Hills can not produce sugar, but can produce ore.  They do not
+        // get a road bonus for unattended ore production, but do get if
+        // if attended.
         assertFalse(tile2.canProduce(sugar, null));
         assertFalse(hasBonusFrom(tile2.getProductionModifiers(sugar, null),
                                  road2.getType()));
         assertTrue(tile2.canProduce(ore, null));
-        assertTrue(hasBonusFrom(tile2.getProductionModifiers(ore, null),
+        assertFalse(hasBonusFrom(tile2.getProductionModifiers(ore, null),
+                                 road2.getType()));
+        assertTrue(hasBonusFrom(tile2.getProductionModifiers(ore, colonistType),
                                 road2.getType()));
 
         // Add a sugar resource, there should now be two sugar bonuses
@@ -510,7 +514,9 @@ public class TileTest extends FreeColTestCase {
             + (int)FeatureContainer.applyModifiers(0f, turn,
                 road2.getProductionModifiers(silver, null)));
         assertTrue(tile2.canProduce(silver, null));
-        assertTrue(hasBonusFrom(tile2.getProductionModifiers(silver, null),
+        assertFalse(hasBonusFrom(tile2.getProductionModifiers(silver, null),
+                                 road2.getType()));
+        assertTrue(hasBonusFrom(tile2.getProductionModifiers(silver, colonistType),
                                 road2.getType()));
         assertTrue(hasBonusFrom(tile2.getProductionModifiers(silver, null),
                                 mineralsResource));

From c62ae4a8e771850030d8e6e5546af9afb2a72a10 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 11 Aug 2015 10:45:21 +0930
Subject: [PATCH 092/323] Fix country labels, BR#2887.

---
 data/strings/FreeColMessages.properties       | 89 ++++++++++---------
 .../client/control/InGameController.java      | 16 ++--
 src/net/sf/freecol/client/gui/GUI.java        | 16 ++--
 src/net/sf/freecol/client/gui/MapViewer.java  |  2 +-
 .../sf/freecol/client/gui/menu/DebugMenu.java |  2 +-
 .../gui/panel/ConfirmDeclarationDialog.java   |  2 +-
 .../client/gui/panel/FindSettlementPanel.java |  2 +-
 .../client/gui/panel/FirstContactDialog.java  |  2 +-
 .../gui/panel/IndianSettlementPanel.java      |  2 +-
 .../freecol/client/gui/panel/InfoPanel.java   |  2 +-
 .../client/gui/panel/NegotiationDialog.java   |  6 +-
 .../gui/panel/ReportExplorationPanel.java     |  2 +-
 .../gui/panel/ReportForeignAffairPanel.java   |  4 +-
 .../gui/panel/ReportHighScoresPanel.java      |  2 +-
 .../client/gui/panel/ReportIndianPanel.java   |  2 +-
 .../client/gui/panel/ReportTurnPanel.java     |  2 +-
 .../freecol/client/gui/panel/TilePanel.java   |  2 +-
 .../sf/freecol/common/debug/DebugUtils.java   |  8 +-
 src/net/sf/freecol/common/i18n/Messages.java  |  2 +-
 src/net/sf/freecol/common/i18n/NameCache.java |  2 +-
 src/net/sf/freecol/common/model/Colony.java   |  2 +-
 .../freecol/common/model/DiplomaticTrade.java |  4 +-
 .../sf/freecol/common/model/HighScore.java    |  2 +-
 .../freecol/common/model/InciteTradeItem.java |  2 +-
 .../common/model/IndianSettlement.java        |  4 +-
 src/net/sf/freecol/common/model/Player.java   | 21 ++++-
 src/net/sf/freecol/common/model/Unit.java     |  2 +-
 .../server/control/InGameController.java      | 34 +++----
 .../server/generator/SimpleMapGenerator.java  |  2 +-
 .../sf/freecol/server/model/ServerColony.java |  2 +-
 .../sf/freecol/server/model/ServerGame.java   |  4 +-
 .../sf/freecol/server/model/ServerPlayer.java | 68 +++++++-------
 .../sf/freecol/server/model/ServerRegion.java |  2 +-
 .../sf/freecol/server/model/ServerUnit.java   |  6 +-
 34 files changed, 168 insertions(+), 154 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 47611f521..2a1d40545 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -132,6 +132,7 @@ cashInTreasureTrain=Cash in treasure train
 clearOrders=Clear orders
 colonists=Colonists
 colopedia=Colopedia
+countryName={{tag:country|%nation%}}
 difficulty=Difficulty
 docks=Docks
 dumpCargo=Dump cargo
@@ -2237,13 +2238,13 @@ model.colonyTile.claim=(claim %direction%)
 
 # common.model.DiplomaticTrade
 model.diplomaticTrade.receive.contact=Fraternal greetings from the glorious %nation% nation.
-model.diplomaticTrade.receive.diplomatic=Let us negotiate with the %nation%.
+model.diplomaticTrade.receive.diplomatic=Let us negotiate with {{tag:country|%nation%}}.
 model.diplomaticTrade.receive.trade=Let us consider the %nation% trade offer.
-model.diplomaticTrade.receive.tribute=The %nation% are demanding tribute of us!
+model.diplomaticTrade.receive.tribute={{tag:country|%nation%}} is demanding tribute of us!
 model.diplomaticTrade.send.contact=We have encountered members of the %nation% nation.
-model.diplomaticTrade.send.diplomatic=Let us consider our diplomatic situation with the %nation%.
-model.diplomaticTrade.send.trade=Let us propose a trade with the %nation% at %settlement%.
-model.diplomaticTrade.send.tribute=We demand tribute of the %nation% at %settlement%.
+model.diplomaticTrade.send.diplomatic=Let us consider our diplomatic situation with {{tag:country|%nation%}}.
+model.diplomaticTrade.send.trade=Let us propose a trade with {{tag:country|%nation%}} at %settlement%.
+model.diplomaticTrade.send.tribute=We demand tribute of {{tag:country|%nation%}} at %settlement%.
 
 # common.model.Direction
 model.direction.N.name=north
@@ -2257,25 +2258,25 @@ model.direction.NW.name=north-west
 
 # common.model.HistoryEvent
 model.historyEventType.abandonColony.description=You abandon the colony of %colony%.
-model.historyEventType.ceaseFire.description=Cease fire with %nation%.
-model.historyEventType.cityOfGold.description=The %nation% discover %city%, one of the Seven Cities of Gold, and a treasure of %treasure% gold.
-model.historyEventType.colonyConquered.description=Your colony %colony% is conquered by the %nation%.
-model.historyEventType.colonyDestroyed.description=Your colony %colony% is destroyed by the %nation%.
+model.historyEventType.ceaseFire.description=Cease fire with {{tag:country|%nation%}}.
+model.historyEventType.cityOfGold.description={{tag:country|%nation%}} discover %city%, one of the Seven Cities of Gold, and a treasure of %treasure% gold.
+model.historyEventType.colonyConquered.description=Your colony %colony% is conquered by {{tag:country|%nation%}}.
+model.historyEventType.colonyDestroyed.description=Your colony %colony% is destroyed by {{tag:country|%nation%}}.
 model.historyEventType.conquerColony.description=You conquer the %nation% colony of %colony%.
 model.historyEventType.declareIndependence.description=You declare independence from the Crown.
-model.historyEventType.declareWar.description=War declared with %nation%.
-model.historyEventType.destroyNation.description=The %nation% destroy the %nativeNation%.
-model.historyEventType.destroySettlement.description=You destroy %nation% settlement %settlement%.
+model.historyEventType.declareWar.description=War declared with {{tag:country|%nation%}}.
+model.historyEventType.destroyNation.description={{tag:country|%nation%}} destroys the %nativeNation%.
+model.historyEventType.destroySettlement.description=You destroy the %nation% settlement %settlement%.
 model.historyEventType.discoverNewWorld.description=You discover the New World.
-model.historyEventType.discoverRegion.description=The %nation% discover %region%.
-model.historyEventType.formAlliance.description=Alliance negotiated with %nation%.
+model.historyEventType.discoverRegion.description={{tag:country|%nation%}} discovers %region%.
+model.historyEventType.formAlliance.description=Alliance negotiated with {{tag:country|%nation%}}.
 model.historyEventType.foundColony.description=You establish the colony of %colony%.
 model.historyEventType.foundingFather.description=%father% joins the Continental Congress.
 model.historyEventType.independence.description=You achieve independence from the Crown.
-model.historyEventType.makePeace.description=Peace agreed with %nation%.
-model.historyEventType.meetNation.description=You meet the %nation%.
-model.historyEventType.nationDestroyed.description=The %nation% are no longer present in the New World.
-model.historyEventType.spanishSuccession.description=The %loserNation% cede all their colonies in the New World to the %nation%.
+model.historyEventType.makePeace.description=Peace agreed with {{tag:country|%nation%}}.
+model.historyEventType.meetNation.description=You meet the %nation% nation.
+model.historyEventType.nationDestroyed.description=The %nation% nation are no longer present in the New World.
+model.historyEventType.spanishSuccession.description={{tag:country|%loserNation%}} cede all their colonies in the New World to {{tag:country|%nation%}}.
 
 # common.model.IndianSettlement
 model.indianSettlement.mostHatedNone=None
@@ -2341,10 +2342,10 @@ model.messageType.warning.name=Warnings
 # optional .header.
 model.monarch.action.addToRef.text=The Crown has added %number% {{plural:%number%|%unit%}} to the Royal Expeditionary Force. Colonial leaders express concern.
 model.monarch.action.addToRef.no=Done
-model.monarch.action.declarePeace.text=We have graciously agreed to a peace treaty with the %nation%.
+model.monarch.action.declarePeace.text=We have graciously agreed to a peace treaty with {{tag:country|%nation%}}.
 model.monarch.action.declarePeace.no=Done
-model.monarch.action.declareWar.text=The insolence of the %nation% forces Us to declare war on them!
-model.monarch.action.declareWarSupported.text=The insolence of the %nation% forces Us to declare war on them!  To expedite this matter, our loyal troops (%force%) await your orders, and a further sum of %gold% has been added to your treasury. 
+model.monarch.action.declareWar.text=The insolence of {{tag:country|%nation%}} forces Us to declare war on them!
+model.monarch.action.declareWarSupported.text=The insolence of the {{tag:country|%nation%}} forces Us to declare war on them!  To expedite this matter, our loyal troops (%force%) await your orders, and a further sum of %gold% has been added to your treasury. 
 model.monarch.action.declareWar.no=Done
 model.monarch.action.displeasure.text=You dare to accept Our generous terms and yet evade payment? Such duplicity shall reap the bitter reward of Our displeasure.
 model.monarch.action.displeasure.no=Done
@@ -2409,7 +2410,7 @@ model.player.colonialIndependence=Only colonial players can declare independence
 model.player.forces=%nation% Forces
 model.player.independentMarket=Europe
 model.player.startGame=After months at sea, you have finally arrived off the coast of an unknown continent. Sail {{tag:%direction%|west=westward|east=eastward|default=into the wind}} in order to discover the New World and to claim it for the Crown.
-model.player.waitingFor=Waiting for: %nation%
+model.player.waitingFor=Waiting for: {{tag:country|%nation%}}
 
 # common.model.Region
 model.regionType.coast.name=Coast
@@ -2459,7 +2460,7 @@ model.tradeItem.gold.name=Gold
 model.tradeItem.gold.description=the sum of %amount% gold
 model.tradeItem.goods.name=Goods
 model.tradeItem.incite.name=Declare war against
-model.tradeItem.incite.description=war against the %nation%
+model.tradeItem.incite.description=war against {{tag:country|%nation%}}
 model.tradeItem.stance.name=Stance
 model.tradeItem.unit.name=Unit
 
@@ -2543,7 +2544,7 @@ model.colony.workersEvicted=At %colony%, your colonists can no longer work %loca
 model.colonyTile.resourceExhausted=Resource %resource% exhausted in %colony%
 
 # server.model.ServerGame
-model.game.spanishSuccession=Your Excellency, the War of Spanish Succession has ended in Europe. In the Treaty of Utrecht, the %loserNation% were forced to cede all colonies in the New World to the %nation%!
+model.game.spanishSuccession=Your Excellency, the War of Spanish Succession has ended in Europe. In the Treaty of Utrecht, {{tag:country|%loserNation%}} was forced to cede all colonies in the New World to {{tag:country|%nation%}}!
 
 # server.model.SIS
 model.indianSettlement.mission.denounced=Your missionary at %settlement% has been denounced and executed!
@@ -2556,7 +2557,7 @@ model.player.autoRecruit=Religious unrest in %europe% prompts %unit% to emigrate
 model.player.colonyGoodsParty.harbour=Your colonists in %colony% have thrown %amount% units of %goods% into the harbor in protest of this unfair taxation by the Crown!
 model.player.colonyGoodsParty.horses=Your colonists in %colony% have set %amount% horses free in protest of this unfair taxation by the Crown!
 model.player.colonyGoodsParty.landLocked=Your colonists in %colony% have burned %amount% units of %goods% in the market place in protest of this unfair taxation by the Crown!
-model.player.dead.european=Your Excellency, the %nation% have declared an unconditional withdrawal from New World affairs!
+model.player.dead.european=Your Excellency, {{tag:country|%nation%}} has declared an unconditional withdrawal from New World affairs!
 model.player.dead.native=Your Excellency, the %nation% have been destroyed.
 model.player.disaster.bankruptcy.start=You failed to pay for the upkeep of all buildings. Severe production penalties apply.
 model.player.disaster.bankruptcy.stop=Once again, you are able to pay for the upkeep of all buildings. Production penalties have been lifted.
@@ -2569,13 +2570,13 @@ model.player.ignoredTax=The Crown has raised the tax rate to %amount%% as previo
 model.player.interventionForceArrives=The promised Intervention Force arrives!
 model.player.soLDecrease=Sons of Liberty membership in your colonies has fallen to %newSoL% percent!
 model.player.soLIncrease=Sons of Liberty membership in your colonies has risen to %newSoL% percent!
-model.player.stance.alliance.declared=Your Excellency, the %nation% are in alliance with us!
+model.player.stance.alliance.declared=Your Excellency, the %nation% nation are in alliance with us!
 model.player.stance.alliance.others=Your Excellency, the %attacker% are in alliance with the %defender%.
-model.player.stance.ceaseFire.declared=Your Excellency, the %nation% have agreed to a cease fire with us!
+model.player.stance.ceaseFire.declared=Your Excellency, the %nation% nation have agreed to a cease fire with us!
 model.player.stance.ceaseFire.others=Your Excellency, the %attacker% have agreed to a cease fire with the %defender%.
-model.player.stance.peace.declared=Your Excellency, the %nation% are at peace with us!
+model.player.stance.peace.declared=Your Excellency, the %nation% nation are at peace with us!
 model.player.stance.peace.others=Your Excellency, the %attacker% are at peace with the %defender%.
-model.player.stance.war.declared=Bad news, your Excellency, the %nation% have declared war on us!
+model.player.stance.war.declared=Bad news, your Excellency, the %nation% nation have declared war on us!
 model.player.stance.war.others=Your Excellency, the %attacker% have declared war on the %defender%.
 
 #combat is in Player, but is given its own tag
@@ -2687,11 +2688,11 @@ buy.takeOffer=Accept the offer
 buy.text=The %nation% would like to sell their %goods% for %gold%:
 clearTradeRoute.text=Your %unit% is assigned to trade route %route%. Setting its destination will drop it from the trade route. Are you sure you want to do this?
 client.fullScreen=Full screen mode is not supported for this GraphicsDevice.\nFalling back to windowed mode.
-confirmHostile.alliance=You can not attack an allied nation! Do you really wish to break your alliance with the %nation% and declare war?
-confirmHostile.ceaseFire=You have signed a cease fire with the %nation%. Do you really wish to attack?
-confirmHostile.peace=You are at peace with the %nation%. Do you really wish to declare war?
+confirmHostile.alliance=You can not attack an allied nation! Do you really wish to break your alliance with {{tag:country|%nation%}} and declare war?
+confirmHostile.ceaseFire=You have signed a cease fire with {{tag:country|%nation%}}. Do you really wish to attack?
+confirmHostile.peace=You are at peace with {{tag:country|%nation%}}. Do you really wish to declare war?
 confirmHostile.yes=Yes, let slip the dogs of war!
-confirmTribute.broke=Our spies report that the %nation% are utterly broke.  Let us not waste our time with tribute demands.
+confirmTribute.broke=Our spies report that {{tag:country|%nation%}} is utterly broke.  Let us not waste our time with tribute demands.
 confirmTribute.european=The %nation% %danger%, and %finance%.  How much tribute should we demand of them?
 confirmTribute.happy=The %nation% at %settlement% are good friends to us, it is a pity to damage our comradeship.
 confirmTribute.no=Perhaps we had better not
@@ -2758,8 +2759,8 @@ defeated.text=You have been defeated! Would you like to:
 defeated.yes=Stay and Watch
 defeatedSinglePlayer.text=You have been defeated!\n\nTis now the very witching time of night, When churchyards yawn and hell itself breathes out contagion to this world, now could I drink hot blood! and do such bitter business, as the day would quake to look on.
 defeatedSinglePlayer.yes=Enter Revenge Mode
-diplomacy.offerAccepted=The %nation% have accepted your generous offer.
-diplomacy.offerRejected=The %nation% have rejected your generous offer.
+diplomacy.offerAccepted={{tag:country|%nation%}} has accepted your generous offer.
+diplomacy.offerRejected={{tag:country|%nation%}} has rejected your generous offer.
 disbandUnit.text=Are you sure you want to disband this unit?
 disbandUnit.yes=Disband
 disembark.text=Greetings sailor, do you wish to disembark?
@@ -2804,8 +2805,8 @@ move.noAccessGoods=The %nation% will not trade with an empty %unit%.
 move.noAccessMissionBan=The %nation% refuse all contact with your missionaries.
 move.noAccessSettlement=The %nation% do not allow our %unit% to enter their settlement.
 move.noAccessSkill=Our %unit% can not learn from the natives.
-move.noAccessTrade=We do not have authority to trade with other European nations such as the %nation%.
-move.noAccessWar=We can not trade with the %nation% while at war.
+move.noAccessTrade=We do not have authority to trade with other European nations such as {{tag:country|%nation%}}.
+move.noAccessWar=We can not trade with the %nation% nation while at war.
 move.noAccessWater=Our %unit% must land before entering the settlement.
 move.noAttackWater=Our %unit% must land before attacking.
 move.noTile=Our %unit% is not on the map!
@@ -2879,7 +2880,7 @@ server.wrongFreeColVersion=The client and server FreeCol versions do not match.
 
 # server.control.InGameController
 # And again, lots of messages with prefix chosen from use
-buildColony.others=The %nation% have founded the new colony of %colony% in %region%.
+buildColony.others={{tag:country|%nation%}} has founded the new colony of %colony% in %region%.
 cashInTreasureTrain.colonial=A treasure with %amount% gold has been landed in Europe. %cashInAmount% gold has been cashed in.
 cashInTreasureTrain.independent=A treasure of %amount% has been added to the national treasury.
 cashInTreasureTrain.otherColonial=A treasure of %amount% has been landed in Europe. The %nation% monarch is apparently pleased.
@@ -2888,7 +2889,7 @@ declareIndependence.announce=The %oldNation% colonies have declared independence
 declareIndependence.continentalArmyMuster=In support of your declaration of independence, %number% {{plural:%number%|%oldUnit%}} in %colony% {{plural:%number%|one=has|other=have}} been promoted to {{plural:%number%|%unit%}}!
 declareIndependence.interventionForce={{tag:country|%nation%}} solemnly pledges to dispatch an Intervention Force to support your legitimate struggle for independence, provided you generate %number% Freedom {{plural:%number%|one=Bell|other=Bells}} in order to prove your determination.
 declareIndependence.nativeSupport=The %nation% declare their contempt for %ruler% and the Royal Expeditionary Force, and promise to attack them at any opportunity.
-declareIndependence.nativeHostile=Our spies report that the Royal Expeditionary Force have established friendly relations with the %nation%.  Beware that they may be planning to attack!
+declareIndependence.nativeHostile=Our spies report that the Royal Expeditionary Force have established friendly relations with the %nation% nation.  Beware that they may be planning to attack!
 declareIndependence.resolution=This Day the Congress has passed the most important Resolution, that ever was taken in America.\n\nI am well aware of the Toil and Blood and Treasure, that it will cost Us to maintain this Declaration, and support and defend these States. Yet through all the Gloom I can see the Rays of ravishing Light and Glory. I can see that the End is more than worth all the Means. And that Posterity will triumph in that Days Transaction, even although We should rue it, which I trust in God We shall not.\n\nThe Royal Expeditionary Force will soon be upon us. Prepare our defences carefully while we raise voluntaires for a new Continental Army.
 declareIndependence.unitsSeized=In reaction to your declaration of independence, the Crown has seized the following units in Europe and at sea: %units%
 deliverGift.goods=The %player% deliver a gift of %amount% %type% to %settlement%.
@@ -3163,7 +3164,7 @@ report.trade.unitsSold=Units bought or sold
 # ReportTurnPanel
 report.turn.filter=Do not display this type of message (%type%)
 report.turn.ignore=Ignore this message (Colony: %colony%, Goods: %goods%)
-report.turn.playerNation=%player%'s %nation%
+report.turn.playerNation=%player%'s {{tag:country|%nation%}}
 
 
 # -14- Dialogs, Labels and Panels
@@ -3229,8 +3230,8 @@ confirmDeclarationDialog.areYouSure.no=Maybe Later
 confirmDeclarationDialog.areYouSure.text=Let us renounce the unjust tyranny of %monarch% and declare the independence of our colonies from the crown!
 confirmDeclarationDialog.areYouSure.yes=Liberty or Death!
 confirmDeclarationDialog.createFlag=and our enemies shall tremble at the sight of our defiant banner.
-confirmDeclarationDialog.defaultCountry=United States of %nation%
-confirmDeclarationDialog.defaultNation=Free %nation%
+confirmDeclarationDialog.defaultCountry=United States of {{tag:country|%nation%}}
+confirmDeclarationDialog.defaultNation=Free {{tag:country|%nation%}}
 confirmDeclarationDialog.enterCountry=Henceforth, our country shall be known as
 confirmDeclarationDialog.enterNation=and every citizen of our glorious nation shall be proud to be known as
 flag.background.FESSES=Fesses
@@ -3287,10 +3288,10 @@ negotiationDialog.add=Add
 negotiationDialog.cancel=Cancel
 negotiationDialog.clear=Clear
 negotiationDialog.contact.tutorial=You meet fellow Europeans. They will compete with you for land and riches, and may well wage war against you. But after Jan de Witt has joined the Continental Congress, you can trade with them.
-negotiationDialog.demand=The %nation% require of the %otherNation%
+negotiationDialog.demand={{tag:country|%nation%}} require of the {{tag:country|%otherNation%}}
 negotiationDialog.exchange=in return for
 negotiationDialog.goldAvailable=(%amount% gold available)
-negotiationDialog.offer=The %nation% offer the %otherNation%
+negotiationDialog.offer=The {{tag:country|%nation%}} offer the {{tag:country|%otherNation%}}
 negotiationDialog.send=Send
 negotiationDialog.title.contact=Meeting Fellow Europeans
 negotiationDialog.title.diplomatic=Diplomatic Negotiation
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 24bd079b1..0a56ab86d 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -304,7 +304,7 @@ public final class InGameController implements NetworkConstants {
         } else { // should not happen
             player = freeColClient.getGame().getUnknownEnemy();
         }
-        return player.getNationName();
+        return player.getNationLabel();
     }
 
     /**
@@ -558,7 +558,7 @@ public final class InGameController implements NetworkConstants {
         final String gid = Integer.toHexString(game.getUUID().hashCode());
         final Turn turn = game.getTurn();
         return (/* player.getName() + "_" */ gid
-            + "_" + Messages.message(player.getNationName())
+            + "_" + Messages.message(player.getNationLabel())
             + "_" + turn.getSaveGameSuffix())
             .replaceAll(" ", "_");
     }
@@ -1325,7 +1325,7 @@ public final class InGameController implements NetworkConstants {
         final Player other = colony.getOwner();
         if (other == player.getREFPlayer()) return false;
 
-        StringTemplate nation = other.getNationName();
+        StringTemplate nation = other.getNationLabel();
         ModelMessage m = null;
         TradeStatus status;
         while (dt != null) {
@@ -1761,7 +1761,7 @@ public final class InGameController implements NetworkConstants {
             } else if ("nothing".equals(result)) {
                 gui.showInformationMessage(settlement, StringTemplate
                     .template("scoutSettlement.speakNothing")
-                    .addStringTemplate("%nation%", player.getNationName()));
+                    .addStringTemplate("%nation%", player.getNationLabel()));
             } else {
                 logger.warning("Invalid result from askScoutSpeak: " + result);
             }
@@ -1837,7 +1837,7 @@ public final class InGameController implements NetworkConstants {
         StringTemplate baseTemplate = StringTemplate
             .template("tradeProposition.welcome")
             .addStringTemplate("%nation%",
-                settlement.getOwner().getNationName())
+                settlement.getOwner().getNationLabel())
             .addName("%settlement%", settlement.getName());
         StringTemplate template = baseTemplate;
         boolean[] results = askServer()
@@ -2143,7 +2143,7 @@ public final class InGameController implements NetworkConstants {
         case INCITE_INDIANS:
             List<ChoiceItem<Player>> choices = new ArrayList<>();
             for (Player p : freeColClient.getGame().getLiveEuropeanPlayers(player)) {
-                String label = Messages.message(p.getNationName());
+                String label = Messages.message(p.getCountryLabel());
                 choices.add(new ChoiceItem<>(label, p));
             }
             Player enemy = gui.getChoice(true, unit.getTile(),
@@ -3120,7 +3120,7 @@ public final class InGameController implements NetworkConstants {
                                      DiplomaticTrade agreement) {
         final Player player = freeColClient.getMyPlayer();
         final Player otherPlayer = agreement.getOtherPlayer(player);
-        StringTemplate t, nation = otherPlayer.getNationName();
+        StringTemplate t, nation = otherPlayer.getNationLabel();
 
         switch (agreement.getStatus()) {
         case ACCEPT_TRADE:
@@ -3485,7 +3485,7 @@ public final class InGameController implements NetworkConstants {
             .getInteger(ClientOptions.INDIAN_DEMAND_RESPONSE);
         boolean accepted;
         ModelMessage m = null;
-        String nation = Messages.message(unit.getOwner().getNationName());
+        String nation = Messages.message(unit.getOwner().getNationLabel());
         if (type == null) {
             switch (opt) {
             case ClientOptions.INDIAN_DEMAND_RESPONSE_ASK:
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index fa6aa4446..4dfdf6cc3 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -539,14 +539,14 @@ public class GUI {
         int gold = ns.getGold();
         if (gold == 0) {
             t = StringTemplate.template("confirmTribute.broke")
-                .addStringTemplate("%nation%", other.getNationName());
+                .addStringTemplate("%nation%", other.getNationLabel());
             showInformationMessage(t);
             return -1;
         }
 
         int fin = (gold <= 100) ? 0 : (gold <= 1000) ? 1 : 2;
         t = StringTemplate.template("confirmTribute.european")
-            .addStringTemplate("%nation%", other.getNationName())
+            .addStringTemplate("%nation%", other.getNationLabel())
             .addStringTemplate("%danger%",
                 StringTemplate.template("danger." + levels[mil]))
             .addStringTemplate("%finance%",
@@ -605,7 +605,7 @@ public class GUI {
         }
         return confirm(true, attacker.getTile(), StringTemplate
             .template(messageId)
-            .addStringTemplate("%nation%", enemy.getNationName()),
+            .addStringTemplate("%nation%", enemy.getNationLabel()),
             attacker, "confirmHostile.yes", "cancel");
     }
 
@@ -649,7 +649,7 @@ public class GUI {
             : "confirmTribute.normal";
         return (confirm(true, is.getTile(), StringTemplate.template(messageId)
                 .addName("%settlement%", is.getName())
-                .addStringTemplate("%nation%", other.getNationName()),
+                .addStringTemplate("%nation%", other.getNationLabel()),
                 attacker, "confirmTribute.yes", "confirmTribute.no"))
             ? 1 : -1;
     }
@@ -745,7 +745,7 @@ public class GUI {
     public BuyAction getBuyChoice(Unit unit, Settlement settlement,
                                   Goods goods, int gold, boolean canBuy) {
         StringTemplate template = StringTemplate.template("buy.text")
-            .addStringTemplate("%nation%", settlement.getOwner().getNationName())
+            .addStringTemplate("%nation%", settlement.getOwner().getNationLabel())
             .addStringTemplate("%goods%", goods.getLabel(true))
             .addAmount("%gold%", gold);
 
@@ -774,7 +774,7 @@ public class GUI {
         StringTemplate template;
         if (owner.hasContacted(player)) {
             template = StringTemplate.template("indianLand.text")
-                .addStringTemplate("%player%", owner.getNationName());
+                .addStringTemplate("%player%", owner.getNationLabel());
             StringTemplate pay = StringTemplate.template("indianLand.pay")
                 .addAmount("%amount%", price);
             choices.add(new ChoiceItem<>(Messages.message(pay),
@@ -943,7 +943,7 @@ public class GUI {
             .addName("\n\n")
             .addStringTemplate(StringTemplate
                 .template("scoutSettlement.greetings")
-                .addStringTemplate("%nation%", owner.getNationName())
+                .addStringTemplate("%nation%", owner.getNationLabel())
                 .addName("%settlement%", settlement.getName())
                 .addName("%number%", numberString)
                 .add("%settlementType%",
@@ -998,7 +998,7 @@ public class GUI {
                                     Goods goods, int gold) {
         StringTemplate goodsTemplate = goods.getLabel(true);
         StringTemplate template = StringTemplate.template("sell.text")
-            .addStringTemplate("%nation%", settlement.getOwner().getNationName())
+            .addStringTemplate("%nation%", settlement.getOwner().getNationLabel())
             .addStringTemplate("%goods%", goodsTemplate)
             .addAmount("%gold%", gold);
 
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 55d0710be..19e94a0ad 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1871,7 +1871,7 @@ public final class MapViewer {
             break;
         case ClientOptions.DISPLAY_TILE_TEXT_OWNERS:
             if (tile.getOwner() != null) {
-                text = Messages.message(tile.getOwner().getNationName());
+                text = Messages.message(tile.getOwner().getNationLabel());
             }
             break;
         case ClientOptions.DISPLAY_TILE_TEXT_REGIONS:
diff --git a/src/net/sf/freecol/client/gui/menu/DebugMenu.java b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
index d3d63aab3..2bc5647e0 100644
--- a/src/net/sf/freecol/client/gui/menu/DebugMenu.java
+++ b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
@@ -176,7 +176,7 @@ public class DebugMenu extends JMenu {
         cvpMenu.addSeparator();
         for (Player p : game.getLiveEuropeanPlayers(null)) {
             final JRadioButtonMenuItem cv2
-                = Utility.localizedRadioButtonMenuItem(p.getNationName(),
+                = Utility.localizedRadioButtonMenuItem(p.getNationLabel(),
                     FreeColDebugger.debugDisplayColonyValuePlayer() == p);
             cv2.setOpaque(false);
             //cv2.setMnemonic(KeyEvent.VK_C);
diff --git a/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java b/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java
index 74c5fd47e..84e4906a9 100644
--- a/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java
@@ -271,7 +271,7 @@ public class ConfirmDeclarationDialog extends FreeColDialog<List<String>>
 
         StringTemplate nation = StringTemplate
             .template("confirmDeclarationDialog.defaultNation")
-            .addStringTemplate("%nation%", player.getNationName());
+            .addStringTemplate("%nation%", player.getNationLabel());
         this.nationField = new JTextField(Messages.message(nation), 20);
 
         this.label = new JLabel();
diff --git a/src/net/sf/freecol/client/gui/panel/FindSettlementPanel.java b/src/net/sf/freecol/client/gui/panel/FindSettlementPanel.java
index 30a3d3aa2..1567521c7 100644
--- a/src/net/sf/freecol/client/gui/panel/FindSettlementPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/FindSettlementPanel.java
@@ -76,7 +76,7 @@ public final class FindSettlementPanel extends FreeColPanel
                 .addName("%name%", value.getName())
                 .addName("%capital%", ((value.isCapital()) ? "*" : ""))
                 .addStringTemplate("%nation%",
-                    value.getOwner().getNationName());
+                    value.getOwner().getNationLabel());
             label.setText(Messages.message(template));
             label.setIcon(new ImageIcon(ImageLibrary.getSettlementImage(value,
                     new Dimension(64, -1))));
diff --git a/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java b/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
index b41414b86..a901c1eb6 100644
--- a/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
@@ -89,7 +89,7 @@ public class FirstContactDialog extends FreeColConfirmDialog {
             .getSettlementTypeKey(true);
         JTextArea text = Utility.localizedTextArea(StringTemplate
             .template(messageId)
-            .addStringTemplate("%nation%", other.getNationName())
+            .addStringTemplate("%nation%", other.getNationLabel())
             .addName("%camps%", Integer.toString(settlementCount))
             .add("%settlementType%", type));
 
diff --git a/src/net/sf/freecol/client/gui/panel/IndianSettlementPanel.java b/src/net/sf/freecol/client/gui/panel/IndianSettlementPanel.java
index afd4b5c58..07b7f7009 100644
--- a/src/net/sf/freecol/client/gui/panel/IndianSettlementPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/IndianSettlementPanel.java
@@ -71,7 +71,7 @@ public final class IndianSettlementPanel extends FreeColPanel {
                 .template(settlement.isCapital()
                     ? "indianSettlementPanel.indianCapital"
                     : "indianSettlementPanel.indianSettlement")
-                .addStringTemplate("%nation%", indian.getNationName()));
+                .addStringTemplate("%nation%", indian.getNationLabel()));
         Tension tension = settlement.getAlarm(player);
         if (tension != null) text += " (" + Messages.getName(tension) + ")";
         if (settlement.worthScouting(player)) {
diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index 080810204..5883a5e76 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -166,7 +166,7 @@ public final class InfoPanel extends FreeColPanel {
                     if (owner == null) {
                         add(new JLabel(), "span " + PRODUCTION);
                     } else {
-                        StringTemplate t = owner.getNationName();
+                        StringTemplate t = owner.getNationLabel();
                         add(Utility.localizedLabel(t), "span " + PRODUCTION);
                     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java b/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
index 49c3555a8..d39e5c49e 100644
--- a/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
@@ -432,7 +432,7 @@ public final class NegotiationDialog extends FreeColDialog<DiplomaticTrade> {
                 Player value, int index, boolean isSelected,
                 boolean cellHasFocus) {
                 setText((value == null) ? ""
-                    : Messages.message(value.getNationName()));
+                    : Messages.message(value.getNationLabel()));
                 return this;
             }
         }
@@ -836,8 +836,8 @@ public final class NegotiationDialog extends FreeColDialog<DiplomaticTrade> {
         this.agreement = agreement;
         this.comment = comment;
 
-        StringTemplate nation = player.getNationName(),
-            otherNation = otherPlayer.getNationName();
+        StringTemplate nation = player.getNationLabel(),
+            otherNation = otherPlayer.getNationLabel();
         this.demand = StringTemplate.template("negotiationDialog.demand")
             .addStringTemplate("%nation%", nation)
             .addStringTemplate("%otherNation%", otherNation);
diff --git a/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java b/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java
index fefe8501a..871f63ee5 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java
@@ -106,7 +106,7 @@ public final class ReportExplorationPanel extends ReportPanel {
             reportPanel.add(Utility.localizedLabel(region.getDiscoveredIn()
                     .getLabel()));
             reportPanel.add(Utility.localizedLabel(region.getDiscoveredBy()
-                    .getNationName()));
+                    .getNationLabel()));
             reportPanel.add(new JLabel(String.valueOf(region.getScoreValue())));
         }
     }
diff --git a/src/net/sf/freecol/client/gui/panel/ReportForeignAffairPanel.java b/src/net/sf/freecol/client/gui/panel/ReportForeignAffairPanel.java
index 723f585df..853f896ac 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportForeignAffairPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportForeignAffairPanel.java
@@ -83,13 +83,13 @@ public final class ReportForeignAffairPanel extends ReportPanel {
             if (ns == null) continue;
 
             JPanel enemyPanel = new MigPanel(new MigLayout("gapy 0",
-                                               "[][]20[align right]0[]", ""));
+                                             "[][]20[align right]0[]", ""));
             enemyPanel.setOpaque(false);
             final Image coatOfArms = lib.getMiscIconImage(enemy.getNation());
             JLabel coatLabel = new JLabel(new ImageIcon(coatOfArms));
             enemyPanel.add(coatLabel, "spany, aligny top");
 
-            JLabel label = Utility.localizedLabel(enemy.getNationName());
+            JLabel label = Utility.localizedLabel(enemy.getCountryLabel());
             label.setFont(font);
             enemyPanel.add(label, "wrap 12");
 
diff --git a/src/net/sf/freecol/client/gui/panel/ReportHighScoresPanel.java b/src/net/sf/freecol/client/gui/panel/ReportHighScoresPanel.java
index dd1e2d4e6..4abd95646 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportHighScoresPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportHighScoresPanel.java
@@ -102,7 +102,7 @@ public final class ReportHighScoresPanel extends ReportPanel {
             reportPanel.add(Utility.localizedLabel("report.highScores.nation"),
                             "skip");
             reportPanel.add(Utility.localizedLabel((highScore.getIndependenceTurn() > 0)
-                    ? StringTemplate.name(highScore.getNationName())
+                    ? StringTemplate.name(highScore.getNationLabel())
                     : StringTemplate.key(highScore.getOldNationNameKey())));
 
             reportPanel.add(Utility.localizedLabel("report.highScores.nationType"),
diff --git a/src/net/sf/freecol/client/gui/panel/ReportIndianPanel.java b/src/net/sf/freecol/client/gui/panel/ReportIndianPanel.java
index 1cb2d9960..4b086369f 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportIndianPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportIndianPanel.java
@@ -103,7 +103,7 @@ public final class ReportIndianPanel extends ReportPanel {
             opponent.getNationType().getCapitalType(),
             lib.getScalingFactor())));
         reportPanel.add(villageLabel, "span, split 2");
-        JLabel headline = Utility.localizedLabel(opponent.getNationName());
+        JLabel headline = Utility.localizedLabel(opponent.getNationLabel());
         headline.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.SMALL, Font.BOLD, lib.getScalingFactor()));
         reportPanel.add(headline, "wrap 20, aligny center");
diff --git a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
index 7a0c24782..b424b0a54 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
@@ -259,7 +259,7 @@ public final class ReportTurnPanel extends ReportPanel {
             headline = Utility.localizedLabel(StringTemplate
                 .template("report.turn.playerNation")
                 .addName("%player%", player.getName())
-                .addStringTemplate("%nation%", player.getNationName()));
+                .addStringTemplate("%nation%", player.getNationLabel()));
         } else if (source instanceof Europe) {
             Europe europe = (Europe) source;
             JButton button = new JButton(Messages.getName(europe));
diff --git a/src/net/sf/freecol/client/gui/panel/TilePanel.java b/src/net/sf/freecol/client/gui/panel/TilePanel.java
index 9b1f968f5..8b8609667 100644
--- a/src/net/sf/freecol/client/gui/panel/TilePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TilePanel.java
@@ -101,7 +101,7 @@ public final class TilePanel extends FreeColPanel {
         }
 
         if (tile.getOwner() != null) {
-            StringTemplate ownerName = tile.getOwner().getNationName();
+            StringTemplate ownerName = tile.getOwner().getNationLabel();
             if (ownerName != null) {
                 add(Utility.localizedLabel("tilePanel.owner"));
                 add(Utility.localizedLabel(ownerName));
diff --git a/src/net/sf/freecol/common/debug/DebugUtils.java b/src/net/sf/freecol/common/debug/DebugUtils.java
index d50f57fcd..f5d87e122 100644
--- a/src/net/sf/freecol/common/debug/DebugUtils.java
+++ b/src/net/sf/freecol/common/debug/DebugUtils.java
@@ -472,7 +472,7 @@ public class DebugUtils {
 
         List<ChoiceItem<Player>> pcs = new ArrayList<>();
         for (Player p : game.getLiveEuropeanPlayers(colony.getOwner())) {
-            String msg = Messages.message(p.getNationName());
+            String msg = Messages.message(p.getNationLabel());
             pcs.add(new ChoiceItem<>(msg, p));
         }
         Collections.sort(pcs);
@@ -511,7 +511,7 @@ public class DebugUtils {
         List<ChoiceItem<Player>> pcs = new ArrayList<>();
         for (Player p : game.getLivePlayers(null)) {
             if (unit.getType().isAvailableTo(p)) {
-                String msg = Messages.message(p.getNationName());
+                String msg = Messages.message(p.getNationLabel());
                 pcs.add(new ChoiceItem<>(msg, p));
             }
         }
@@ -740,7 +740,7 @@ public class DebugUtils {
             units.put(Messages.message("sailingToEurope"), toEurope);
             units.put(Messages.getName(p.getEurope()), inEurope);
             units.put(Messages.message("sailingToAmerica"), toAmerica);
-            lb.add("\n==", Messages.message(p.getNationName()), "==\n");
+            lb.add("\n==", Messages.message(p.getNationLabel()), "==\n");
 
             for (Unit u : p.getEurope().getUnitList()) {
                 if (u.getDestination() instanceof Map) {
@@ -1105,7 +1105,7 @@ public class DebugUtils {
         Player mostHated = sis.getMostHated();
         for (Player p : sGame.getLiveEuropeanPlayers(null)) {
             Tension tension = sis.getAlarm(p);
-            lb.add(Messages.message(p.getNationName()),
+            lb.add(Messages.message(p.getNationLabel()),
                    " ", ((tension == null) ? "(none)"
                        : Integer.toString(tension.getValue())),
                    ((mostHated == p) ? " (most hated)" : ""),
diff --git a/src/net/sf/freecol/common/i18n/Messages.java b/src/net/sf/freecol/common/i18n/Messages.java
index a54fb3f57..c6123f53e 100644
--- a/src/net/sf/freecol/common/i18n/Messages.java
+++ b/src/net/sf/freecol/common/i18n/Messages.java
@@ -60,7 +60,7 @@ import net.sf.freecol.common.model.StringTemplate.TemplateType;
  * Properties class is unable to handle UTF-8 directly, this class
  * uses its own implementation.
  *
- * Te individual messages may include variables, which must be
+ * The individual messages may include variables, which must be
  * delimited by percent characters (e.g. "%nation%"), and will be
  * replaced when the message is formatted. Furthermore, the messages
  * may include choice formats consisting of a tag followed by a colon
diff --git a/src/net/sf/freecol/common/i18n/NameCache.java b/src/net/sf/freecol/common/i18n/NameCache.java
index 321846676..6a284eb42 100644
--- a/src/net/sf/freecol/common/i18n/NameCache.java
+++ b/src/net/sf/freecol/common/i18n/NameCache.java
@@ -423,7 +423,7 @@ public class NameCache {
         synchronized (regionNameLock) {
             index = regionIndex.get(prefix);
         }
-        StringTemplate nn = player.getNationName();
+        StringTemplate nn = player.getNationLabel();
         do {
             name = Messages.message(StringTemplate.label(" ")
                 .addStringTemplate(nn)
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 2820b745a..17c6b49c1 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -2809,7 +2809,7 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
     public StringTemplate getAlarmLevelLabel(Player player) {
         Stance stance = getOwner().getStance(player);
         return StringTemplate.template("model.colony." + stance.getKey())
-            .addStringTemplate("%nation%", getOwner().getNationName());
+            .addStringTemplate("%nation%", getOwner().getNationLabel());
     }
 
 
diff --git a/src/net/sf/freecol/common/model/DiplomaticTrade.java b/src/net/sf/freecol/common/model/DiplomaticTrade.java
index c28084082..0e056b385 100644
--- a/src/net/sf/freecol/common/model/DiplomaticTrade.java
+++ b/src/net/sf/freecol/common/model/DiplomaticTrade.java
@@ -207,7 +207,7 @@ public class DiplomaticTrade extends FreeColObject {
         return StringTemplate.template("model.diplomaticTrade.send."
             + getContext().getKey())
             .addStringTemplate("%nation%",
-                settlement.getOwner().getNationName())
+                settlement.getOwner().getNationLabel())
             .addStringTemplate("%settlement%",
                 settlement.getLocationLabelFor(player));
     }
@@ -222,7 +222,7 @@ public class DiplomaticTrade extends FreeColObject {
     public StringTemplate getReceiveMessage(Player player) {
         return StringTemplate.template("model.diplomaticTrade.receive."
             + getContext().getKey())
-            .addStringTemplate("%nation%", player.getNationName());
+            .addStringTemplate("%nation%", player.getNationLabel());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/HighScore.java b/src/net/sf/freecol/common/model/HighScore.java
index abd7eeb3e..80025305b 100644
--- a/src/net/sf/freecol/common/model/HighScore.java
+++ b/src/net/sf/freecol/common/model/HighScore.java
@@ -265,7 +265,7 @@ public class HighScore extends FreeColObject {
      *
      * @return The independent nation name.
      */
-    public final String getNationName() {
+    public final String getNationLabel() {
         return nationName;
     }
 
diff --git a/src/net/sf/freecol/common/model/InciteTradeItem.java b/src/net/sf/freecol/common/model/InciteTradeItem.java
index b3cde4c9b..f26a89471 100644
--- a/src/net/sf/freecol/common/model/InciteTradeItem.java
+++ b/src/net/sf/freecol/common/model/InciteTradeItem.java
@@ -90,7 +90,7 @@ public class InciteTradeItem extends TradeItem {
     @Override
     public StringTemplate getLabel() {
         return StringTemplate.template(Messages.descriptionKey("model.tradeItem.incite"))
-            .addStringTemplate("%nation%", victim.getNationName());
+            .addStringTemplate("%nation%", victim.getNationLabel());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/IndianSettlement.java b/src/net/sf/freecol/common/model/IndianSettlement.java
index 79ddd527d..4698a2c88 100644
--- a/src/net/sf/freecol/common/model/IndianSettlement.java
+++ b/src/net/sf/freecol/common/model/IndianSettlement.java
@@ -460,7 +460,7 @@ public class IndianSettlement extends Settlement implements TradeLocation {
         return (contacted)
             ? ((mostHated == null)
                 ? StringTemplate.key("model.indianSettlement.mostHatedNone")
-                : mostHated.getNationName())
+                : mostHated.getNationLabel())
             : StringTemplate.key("model.indianSettlement.mostHatedUnknown");
     }
             
@@ -1306,7 +1306,7 @@ public class IndianSettlement extends Settlement implements TradeLocation {
             ? "model.indianSettlement.tension.unknown"
             : "model.indianSettlement." + getAlarm(player).getKey();
         return StringTemplate.template(key)
-            .addStringTemplate("%nation%", getOwner().getNationName());
+            .addStringTemplate("%nation%", getOwner().getNationLabel());
     }
 
 
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 304ae42db..150a998df 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -597,7 +597,7 @@ public class Player extends FreeColGameObject implements Nameable {
         return StringTemplate.label("")
             .add(getRulerNameKey())
             .addName(" (")
-            .addStringTemplate(getNationName())
+            .addStringTemplate(getNationLabel())
             .addName(")");
     }
 
@@ -688,13 +688,26 @@ public class Player extends FreeColGameObject implements Nameable {
      *
      * @return A template for this nation name.
      */
-    public StringTemplate getNationName() {
+    public StringTemplate getNationLabel() {
         return (playerType == PlayerType.REBEL
                 || playerType == PlayerType.INDEPENDENT)
             ? StringTemplate.name(independentNationName)
             : StringTemplate.key(Messages.nameKey(nationId));
     }
 
+    /**
+     * Get a template for this players country.
+     *
+     * @return A template for this country.
+     */
+    public StringTemplate getCountryLabel() {
+        return (playerType == PlayerType.REBEL
+                || playerType == PlayerType.INDEPENDENT)
+            ? StringTemplate.name(independentNationName)
+            : StringTemplate.template("countryName")
+                .addStringTemplate("%nation%", getNationLabel());
+    }
+
     /**
      * Get a label indicating for the national forces.
      *
@@ -702,7 +715,7 @@ public class Player extends FreeColGameObject implements Nameable {
      */
     public StringTemplate getForcesLabel() {
         return StringTemplate.template("model.player.forces")
-            .addStringTemplate("%nation%", getNationName());
+            .addStringTemplate("%nation%", getNationLabel());
     }
 
     /**
@@ -712,7 +725,7 @@ public class Player extends FreeColGameObject implements Nameable {
      */
     public StringTemplate getWaitingLabel() {
         return StringTemplate.template("model.player.waitingFor")
-            .addStringTemplate("%nation%", getNationName());
+            .addStringTemplate("%nation%", getNationLabel());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index 6391b188b..cbfb2e70c 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -267,7 +267,7 @@ public class Unit extends GoodsLocation
     public StringTemplate getApparentOwnerName() {
         Player own = (hasAbility(Ability.PIRACY)) ? getGame().getUnknownEnemy()
             : owner;
-        return own.getNationName();
+        return own.getNationLabel();
     }
 
     /** What type of unit label do we want? */
diff --git a/src/net/sf/freecol/server/control/InGameController.java b/src/net/sf/freecol/server/control/InGameController.java
index 234f1b92a..cf4590a57 100644
--- a/src/net/sf/freecol/server/control/InGameController.java
+++ b/src/net/sf/freecol/server/control/InGameController.java
@@ -794,7 +794,7 @@ public final class InGameController extends Controller {
         cs.addMessage(See.only(independent),
             new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                 "giveIndependence.announce", independent)
-            .addStringTemplate("%ref%", serverPlayer.getNationName()));
+            .addStringTemplate("%ref%", serverPlayer.getNationLabel()));
 
         // Who surrenders?
         List<Unit> surrenderUnits = new ArrayList<>();
@@ -824,8 +824,8 @@ public final class InGameController extends Controller {
         cs.addMessage(See.all().except(independent),
             new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                 "giveIndependence.otherAnnounce", independent)
-                .addStringTemplate("%nation%", independent.getNationName())
-                .addStringTemplate("%ref%", serverPlayer.getNationName()));
+                .addStringTemplate("%nation%", independent.getNationLabel())
+                .addStringTemplate("%ref%", serverPlayer.getNationLabel()));
         cs.add(See.only(independent), independent);
 
         // Reveal the map on independence.
@@ -948,7 +948,7 @@ public final class InGameController extends Controller {
             cs.add(See.only(serverPlayer), ChangePriority.CHANGE_LATE,
                 new MonarchActionMessage(action, StringTemplate
                     .template(messageId)
-                    .addStringTemplate("%nation%", friend.getNationName()),
+                    .addStringTemplate("%nation%", friend.getNationLabel()),
                     monarchKey));
             break;
         case DECLARE_WAR:
@@ -978,7 +978,7 @@ public final class InGameController extends Controller {
                 new MonarchActionMessage(action, StringTemplate
                     .template((warSupport.isEmpty()) ? messageId
                         : "model.monarch.action.declareWarSupported.text")
-                        .addStringTemplate("%nation%", enemy.getNationName())
+                        .addStringTemplate("%nation%", enemy.getNationLabel())
                         .addStringTemplate("%force%",
                             AbstractUnit.getListLabel(", ", warSupport))
                         .addAmount("%gold%", warGold),
@@ -1137,7 +1137,7 @@ public final class InGameController extends Controller {
             new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                              messageId, serverPlayer)
                 .addAmount("%amount%", fullAmount)
-                .addStringTemplate("%nation%", serverPlayer.getNationName()));
+                .addStringTemplate("%nation%", serverPlayer.getNationLabel()));
 
         // Dispose of the unit, only visible to the owner.
         cs.add(See.only(serverPlayer), (FreeColGameObject)unit.getLocation());
@@ -1165,7 +1165,7 @@ public final class InGameController extends Controller {
         ChangeSet cs = new ChangeSet();
 
         // Cross the Rubicon
-        StringTemplate oldNation = serverPlayer.getNationName();
+        StringTemplate oldNation = serverPlayer.getNationLabel();
         serverPlayer.setIndependentNationName(nationName);
         serverPlayer.setNewLandName(countryName);
         serverPlayer.changePlayerType(PlayerType.REBEL);
@@ -1300,7 +1300,7 @@ public final class InGameController extends Controller {
             cs.addMessage(See.only(serverPlayer),
                 new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                                  "declareIndependence.nativeSupport", good)
-                    .addStringTemplate("%nation%", good.getNationName())
+                    .addStringTemplate("%nation%", good.getNationLabel())
                     .add("%ruler%", serverPlayer.getRulerNameKey())
                           );
             int delta;
@@ -1344,7 +1344,7 @@ public final class InGameController extends Controller {
                 cs.addMessage(See.only(serverPlayer),
                     new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                                      "declareIndependence.nativeHostile", bad)
-                        .addStringTemplate("%nation%", bad.getNationName()));
+                        .addStringTemplate("%nation%", bad.getNationLabel()));
                 if (delta != 0) bad.csModifyTension(serverPlayer, delta, cs);
                 Player.makeContact(bad, refPlayer);
                 bad.csModifyTension(refPlayer,
@@ -1367,7 +1367,7 @@ public final class InGameController extends Controller {
                              "declareIndependence.announce",
                              serverPlayer)
                 .addStringTemplate("%oldNation%", oldNation)
-                .addStringTemplate("%newNation%", serverPlayer.getNationName())
+                .addStringTemplate("%newNation%", serverPlayer.getNationLabel())
                 .add("%ruler%", serverPlayer.getRulerNameKey()));
         cs.add(See.only(serverPlayer), serverPlayer);
         serverPlayer.invalidateCanSeeTiles();//+vis(serverPlayer)
@@ -2272,15 +2272,15 @@ public final class InGameController extends Controller {
             new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                              "indianSettlement.mission.noDenounce",
                              serverPlayer, unit)
-                .addStringTemplate("%nation%", owner.getNationName()));
+                .addStringTemplate("%nation%", owner.getNationLabel()));
         cs.addMessage(See.only(enemy),
             new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                              "indianSettlement.mission.enemyDenounce",
                              enemy, settlement)
-                .addStringTemplate("%enemy%", serverPlayer.getNationName())
+                .addStringTemplate("%enemy%", serverPlayer.getNationLabel())
                 .addStringTemplate("%settlement%",
                     settlement.getLocationLabelFor(enemy))
-                .addStringTemplate("%nation%", owner.getNationName()));
+                .addStringTemplate("%nation%", owner.getNationLabel()));
         cs.add(See.perhaps().always(serverPlayer),
                (FreeColGameObject)unit.getLocation());
         cs.addRemove(See.perhaps().always(serverPlayer),
@@ -2332,7 +2332,7 @@ public final class InGameController extends Controller {
         }
 
         // Add the descriptive message.
-        final StringTemplate nation = settlement.getOwner().getNationName();
+        final StringTemplate nation = settlement.getOwner().getNationLabel();
         cs.addMessage(See.only(serverPlayer),
             new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                              "indianSettlement.mission." + tension.getKey(),
@@ -2383,7 +2383,7 @@ public final class InGameController extends Controller {
                 new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                                  "indianSettlement.inciteGoldFail",
                                  serverPlayer, settlement)
-                    .addStringTemplate("%player%", enemyPlayer.getNationName())
+                    .addStringTemplate("%player%", enemyPlayer.getNationLabel())
                     .addAmount("%amount%", goldToPay));
             cs.addAttribute(See.only(serverPlayer), "gold", "0");
             unit.setMovesLeft(0);
@@ -2617,7 +2617,7 @@ public final class InGameController extends Controller {
         ModelMessage m = new ModelMessage(ModelMessage.MessageType.GIFT_GOODS,
                                           "deliverGift.goods",
                                           settlement, goods.getType())
-            .addStringTemplate("%player%", serverPlayer.getNationName())
+            .addStringTemplate("%player%", serverPlayer.getNationLabel())
             .addNamed("%type%", goods)
             .addAmount("%amount%", goods.getAmount())
             .addName("%settlement%", settlement.getName());
@@ -2816,7 +2816,7 @@ public final class InGameController extends Controller {
             name = serverPlayer.getSettlementName(random);
         }
         if (serverPlayer.isEuropean()) {
-            StringTemplate nation = serverPlayer.getNationName();
+            StringTemplate nation = serverPlayer.getNationLabel();
             settlement = new ServerColony(game, serverPlayer, name, tile);
             for (Tile t : tile.getSurroundingTiles(settlement.getRadius())) {
                 t.cacheUnseen();//+til
diff --git a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
index a3536ee76..53c3f5916 100644
--- a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
+++ b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
@@ -975,7 +975,7 @@ public class SimpleMapGenerator implements MapGenerator {
         unitType = spec.getUnitType("model.unit.expertFarmer");
         Unit buildColonyUnit = new ServerUnit(game, colonyTile,
                                               player, unitType);
-        String colonyName = Messages.message(player.getNationName())
+        String colonyName = Messages.message(player.getNationLabel())
             + " " + Messages.message("Colony");
         Colony colony = new ServerColony(game, player, colonyName, colonyTile);
         player.addSettlement(colony);
diff --git a/src/net/sf/freecol/server/model/ServerColony.java b/src/net/sf/freecol/server/model/ServerColony.java
index 2e6b24a5b..57de3ab19 100644
--- a/src/net/sf/freecol/server/model/ServerColony.java
+++ b/src/net/sf/freecol/server/model/ServerColony.java
@@ -829,7 +829,7 @@ public class ServerColony extends Colony implements ServerModelObject {
             brave.setState(Unit.UnitState.ACTIVE);
             cs.addDisappear(newOwner, tile, brave);
             cs.add(See.only(newOwner), getTile());
-            StringTemplate nation = oldOwner.getNationName();
+            StringTemplate nation = oldOwner.getNationLabel();
             cs.addMessage(See.only(newOwner),
                 new ModelMessage(ModelMessage.MessageType.UNIT_ADDED,
                                 "model.colony.newConvert", brave)
diff --git a/src/net/sf/freecol/server/model/ServerGame.java b/src/net/sf/freecol/server/model/ServerGame.java
index c35fb1729..cf39c500f 100644
--- a/src/net/sf/freecol/server/model/ServerGame.java
+++ b/src/net/sf/freecol/server/model/ServerGame.java
@@ -435,8 +435,8 @@ public class ServerGame extends Game implements ServerModelObject {
             }
         }
 
-        StringTemplate loser = weakestAIPlayer.getNationName();
-        StringTemplate winner = strongestAIPlayer.getNationName();
+        StringTemplate loser = weakestAIPlayer.getNationLabel();
+        StringTemplate winner = strongestAIPlayer.getNationLabel();
         cs.addMessage(See.all(),
             new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                 "model.game.spanishSuccession",
diff --git a/src/net/sf/freecol/server/model/ServerPlayer.java b/src/net/sf/freecol/server/model/ServerPlayer.java
index 341036e6f..3412df5e2 100644
--- a/src/net/sf/freecol/server/model/ServerPlayer.java
+++ b/src/net/sf/freecol/server/model/ServerPlayer.java
@@ -696,12 +696,12 @@ public class ServerPlayer extends Player implements ServerModelObject {
                     ? "model.player.dead.european"
                     : "model.player.dead.native"),
                 this)
-            .addStringTemplate("%nation%", getNationName()));
+            .addStringTemplate("%nation%", getNationLabel()));
         Game game = getGame();
         cs.addGlobalHistory(game,
             new HistoryEvent(game.getTurn(),
                 HistoryEvent.HistoryEventType.NATION_DESTROYED, null)
-            .addStringTemplate("%nation%", getNationName()));
+            .addStringTemplate("%nation%", getNationLabel()));
         csKill(cs);
     }
 
@@ -1289,7 +1289,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
             }
             cs.addHistory(this, new HistoryEvent(getGame().getTurn(),
                     HistoryEvent.getEventTypeFromStance(stance), otherPlayer)
-                .addStringTemplate("%nation%", otherPlayer.getNationName()));
+                .addStringTemplate("%nation%", otherPlayer.getNationLabel()));
             logger.info("Stance modification " + getName()
                 + " " + old + " -> " + stance + " wrt " + otherPlayer.getName());
             this.addStanceChange(other);
@@ -1297,7 +1297,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
                 cs.addMessage(See.only(other),
                     new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                         stance.getStanceChangeKey(), this)
-                    .addStringTemplate("%nation%", getNationName()));
+                    .addStringTemplate("%nation%", getNationLabel()));
             }
             cs.addStance(See.only(this), this, stance, otherPlayer);
             cs.addStance(See.only(other), this, stance, otherPlayer);
@@ -1311,7 +1311,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
             }
             cs.addHistory(otherPlayer, new HistoryEvent(getGame().getTurn(),
                     HistoryEvent.getEventTypeFromStance(stance), this)
-                .addStringTemplate("%nation%", this.getNationName()));
+                .addStringTemplate("%nation%", this.getNationLabel()));
             logger.info("Stance modification " + otherPlayer.getName()
                 + " " + old + " -> " + stance
                 + " wrt " + getName() + " (symmetric)");
@@ -1320,7 +1320,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
                 cs.addMessage(See.only(this),
                     new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                         stance.getStanceChangeKey(), otherPlayer)
-                    .addStringTemplate("%nation%", otherPlayer.getNationName()));
+                    .addStringTemplate("%nation%", otherPlayer.getNationLabel()));
             }
             cs.addStance(See.only(this), otherPlayer, stance, this);
             cs.addStance(See.only(other), otherPlayer, stance, this);
@@ -1513,8 +1513,8 @@ public class ServerPlayer extends Player implements ServerModelObject {
                     cs.addMessage(See.only(sp),
                         new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                             sta.getOtherStanceChangeKey(), this)
-                        .addStringTemplate("%attacker%", getNationName())
-                        .addStringTemplate("%defender%", s.getNationName()));
+                        .addStringTemplate("%attacker%", getNationLabel())
+                        .addStringTemplate("%defender%", s.getNationLabel()));
                 }
             }
         }
@@ -2003,8 +2003,8 @@ public class ServerPlayer extends Player implements ServerModelObject {
                     cs.addMessage(See.only((ServerPlayer)enemy),
                         new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                                          key, settlement)
-                            .addStringTemplate("%nation%", getNationName())
-                            .addStringTemplate("%enemy%", enemy.getNationName())
+                            .addStringTemplate("%nation%", getNationLabel())
+                            .addStringTemplate("%enemy%", enemy.getNationLabel())
                             .addName("%settlement%", settlement.getName()));
                 }
             }
@@ -2846,9 +2846,9 @@ public class ServerPlayer extends Player implements ServerModelObject {
     private void csBurnMissions(Unit attacker, IndianSettlement settlement,
                                 ChangeSet cs) {
         ServerPlayer attackerPlayer = (ServerPlayer) attacker.getOwner();
-        StringTemplate attackerNation = attackerPlayer.getNationName();
+        StringTemplate attackerNation = attackerPlayer.getNationLabel();
         ServerPlayer nativePlayer = (ServerPlayer) settlement.getOwner();
-        StringTemplate nativeNation = nativePlayer.getNationName();
+        StringTemplate nativeNation = nativePlayer.getNationLabel();
 
         // Message only for the European player
         cs.addMessage(See.only(attackerPlayer),
@@ -2894,9 +2894,9 @@ public class ServerPlayer extends Player implements ServerModelObject {
                                  Random random, ChangeSet cs) {
         Game game = attacker.getGame();
         ServerPlayer attackerPlayer = (ServerPlayer) attacker.getOwner();
-        StringTemplate attackerNation = attackerPlayer.getNationName();
+        StringTemplate attackerNation = attackerPlayer.getNationLabel();
         ServerPlayer colonyPlayer = (ServerPlayer) colony.getOwner();
-        StringTemplate colonyNation = colonyPlayer.getNationName();
+        StringTemplate colonyNation = colonyPlayer.getNationLabel();
         Tile tile = colony.getTile();
         List<Unit> units = new ArrayList<>();
         units.addAll(colony.getUnitList());
@@ -2995,7 +2995,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
         final Specification spec = getGame().getSpecification();
         ServerPlayer attackerPlayer = (ServerPlayer)attacker.getOwner();
         ServerPlayer nativePlayer = (ServerPlayer)is.getOwner();
-        StringTemplate convertNation = nativePlayer.getNationName();
+        StringTemplate convertNation = nativePlayer.getNationLabel();
         List<Unit> units = is.getTile().getUnitList();
         if (units.isEmpty()) units.addAll(is.getUnitList());
         ServerUnit convert = (ServerUnit)getRandomMember(logger,
@@ -3053,7 +3053,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
             // makes sense for native players, and the message is
             // native specific.
             if (winnerPlayer.isIndian()) {
-                StringTemplate winnerNation = winnerPlayer.getNationName();
+                StringTemplate winnerNation = winnerPlayer.getNationLabel();
                 cs.addMessage(See.only(loserPlayer),
                               new ModelMessage(ModelMessage.MessageType.COMBAT_RESULT,
                                                "combat.equipmentCaptured",
@@ -3087,14 +3087,14 @@ public class ServerPlayer extends Player implements ServerModelObject {
      */
     private void csCaptureUnit(Unit winner, Unit loser, ChangeSet cs) {
         ServerPlayer loserPlayer = (ServerPlayer) loser.getOwner();
-        StringTemplate loserNation = loserPlayer.getNationName();
+        StringTemplate loserNation = loserPlayer.getNationLabel();
         StringTemplate loserLocation = loser.getLocation()
             .getLocationLabelFor(loserPlayer);
         StringTemplate oldName = loser.getLabel();
         String messageId = "combat.unitCaptured."
             + loser.getType().getSuffix();
         ServerPlayer winnerPlayer = (ServerPlayer) winner.getOwner();
-        StringTemplate winnerNation = winnerPlayer.getNationName();
+        StringTemplate winnerNation = winnerPlayer.getNationLabel();
         StringTemplate winnerLocation = winner.getLocation()
             .getLocationLabelFor(winnerPlayer);
 
@@ -3281,13 +3281,13 @@ public class ServerPlayer extends Player implements ServerModelObject {
             .addStringTemplate("%nation%", loserNation)
             .addStringTemplate("%oldName%", oldName)
             .addStringTemplate("%unit%", loser.getLabel())
-            .addStringTemplate("%enemyNation%", winnerPlayer.getNationName())
+            .addStringTemplate("%enemyNation%", winnerPlayer.getNationLabel())
             .addStringTemplate("%enemyUnit%", winner.getLabel())
             .addStringTemplate("%location%", winnerLocation));
         cs.addMessage(See.only(loserPlayer),
             new ModelMessage(ModelMessage.MessageType.COMBAT_RESULT,
                 messageId, "combat.unitDemoted", loser)
-            .addStringTemplate("%nation%", loserPlayer.getNationName())
+            .addStringTemplate("%nation%", loserPlayer.getNationLabel())
             .addStringTemplate("%oldName%", oldName)
             .addStringTemplate("%unit%", loser.getLabel())
             .addStringTemplate("%enemyNation%", winnerNation)
@@ -3309,7 +3309,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
         ServerPlayer attackerPlayer = (ServerPlayer) attacker.getOwner();
         StringTemplate attackerNation = attacker.getApparentOwnerName();
         ServerPlayer colonyPlayer = (ServerPlayer) colony.getOwner();
-        StringTemplate colonyNation = colonyPlayer.getNationName();
+        StringTemplate colonyNation = colonyPlayer.getNationLabel();
         int plunder = colony.getPlunder(attacker, random);
 
         // Handle history and messages before colony destruction.
@@ -3361,8 +3361,8 @@ public class ServerPlayer extends Player implements ServerModelObject {
         Tile tile = settlement.getTile();
         ServerPlayer attackerPlayer = (ServerPlayer) attacker.getOwner();
         ServerPlayer nativePlayer = (ServerPlayer) settlement.getOwner();
-        StringTemplate attackerNation = attackerPlayer.getNationName();
-        StringTemplate nativeNation = nativePlayer.getNationName();
+        StringTemplate attackerNation = attackerPlayer.getNationLabel();
+        StringTemplate nativeNation = nativePlayer.getNationLabel();
         String settlementName = settlement.getName();
         boolean capital = settlement.isCapital();
         int plunder = settlement.getPlunder(attacker, random);
@@ -3572,7 +3572,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
      */
     private void csLoseAutoEquip(Unit attacker, Unit defender, ChangeSet cs) {
         ServerPlayer defenderPlayer = (ServerPlayer) defender.getOwner();
-        StringTemplate defenderNation = defenderPlayer.getNationName();
+        StringTemplate defenderNation = defenderPlayer.getNationLabel();
         Settlement settlement = defender.getSettlement();
         StringTemplate defenderLocation = defender.getLocation()
             .getLocationLabelFor(defenderPlayer);
@@ -3592,7 +3592,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
             new ModelMessage(ModelMessage.MessageType.COMBAT_RESULT,
                 "combat.unitWinColony", attacker)
             .addStringTemplate("%location%", attackerLocation)
-            .addStringTemplate("%nation%", attackerPlayer.getNationName())
+            .addStringTemplate("%nation%", attackerPlayer.getNationLabel())
             .addStringTemplate("%unit%", attacker.getLabel())
             .addStringTemplate("%settlement%",
                 settlement.getLocationLabelFor(attackerPlayer))
@@ -3620,7 +3620,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
     private void csLoseEquip(Unit winner, Unit loser, ChangeSet cs) {
         final Specification spec = getSpecification();
         ServerPlayer loserPlayer = (ServerPlayer) loser.getOwner();
-        StringTemplate loserNation = loserPlayer.getNationName();
+        StringTemplate loserNation = loserPlayer.getNationLabel();
         StringTemplate loserLocation = loser.getLocation()
             .getLocationLabelFor(loserPlayer);
         StringTemplate oldName = loser.getLabel();
@@ -3655,7 +3655,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
             .addStringTemplate("%nation%", loserNation)
             .addStringTemplate("%oldName%", oldName)
             .addStringTemplate("%unit%", loser.getLabel())
-            .addStringTemplate("%enemyNation%", winnerPlayer.getNationName())
+            .addStringTemplate("%enemyNation%", winnerPlayer.getNationLabel())
             .addStringTemplate("%enemyUnit%", winner.getLabel())
             .addStringTemplate("%location%", winnerLocation));
         cs.addMessage(See.only(loserPlayer),
@@ -3715,7 +3715,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
         ServerPlayer attackerPlayer = (ServerPlayer) attacker.getOwner();
         StringTemplate attackerNation = attacker.getApparentOwnerName();
         ServerPlayer colonyPlayer = (ServerPlayer) colony.getOwner();
-        StringTemplate colonyNation = colonyPlayer.getNationName();
+        StringTemplate colonyNation = colonyPlayer.getNationLabel();
 
         // Collect the damagable buildings, ships, movable goods.
         List<Building> buildingList = colony.getBurnableBuildings();
@@ -3833,7 +3833,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
      */
     private void csPromoteUnit(Unit winner, ChangeSet cs) {
         ServerPlayer winnerPlayer = (ServerPlayer) winner.getOwner();
-        StringTemplate winnerNation = winnerPlayer.getNationName();
+        StringTemplate winnerNation = winnerPlayer.getNationLabel();
         StringTemplate oldName = winner.getLabel();
 
         UnitType type = winner.getTypeChange(ChangeType.PROMOTION,
@@ -3980,19 +3980,19 @@ public class ServerPlayer extends Player implements ServerModelObject {
                 messageId, "combat.unitSlaughtered", winner)
             .addStringTemplate("%nation%", loserNation)
             .addStringTemplate("%unit%", loser.getLabel())
-            .addStringTemplate("%enemyNation%", winnerPlayer.getNationName())
+            .addStringTemplate("%enemyNation%", winnerPlayer.getNationLabel())
             .addStringTemplate("%enemyUnit%", winner.getLabel())
             .addStringTemplate("%location%", winnerLocation));
         cs.addMessage(See.only(loserPlayer),
             new ModelMessage(ModelMessage.MessageType.COMBAT_RESULT,
                 messageId, "combat.unitSlaughtered", loser.getTile())
-            .addStringTemplate("%nation%", loserPlayer.getNationName())
+            .addStringTemplate("%nation%", loserPlayer.getNationLabel())
             .addStringTemplate("%unit%", loser.getLabel())
             .addStringTemplate("%enemyNation%", winnerNation)
             .addStringTemplate("%enemyUnit%", winner.getLabel())
             .addStringTemplate("%location%", loserLocation));
         if (loserPlayer.isIndian() && loserPlayer.checkForDeath() == IS_DEAD) {
-            StringTemplate nativeNation = loserPlayer.getNationName();
+            StringTemplate nativeNation = loserPlayer.getNationLabel();
             cs.addGlobalHistory(getGame(),
                 new HistoryEvent(getGame().getTurn(),
                     HistoryEvent.HistoryEventType.DESTROY_NATION, winnerPlayer)
@@ -4198,12 +4198,12 @@ public class ServerPlayer extends Player implements ServerModelObject {
             } else {
                 cs.addHistory(other, new HistoryEvent(turn,
                         HistoryEvent.HistoryEventType.MEET_NATION, other)
-                    .addStringTemplate("%nation%", getNationName()));
+                    .addStringTemplate("%nation%", getNationLabel()));
             }
         } else { // (serverPlayer.isEuropean)
             cs.addHistory(this, new HistoryEvent(turn,
                     HistoryEvent.HistoryEventType.MEET_NATION, other)
-                .addStringTemplate("%nation%", other.getNationName()));
+                .addStringTemplate("%nation%", other.getNationLabel()));
         }
 
         logger.finest("First contact between " + this.getId()
diff --git a/src/net/sf/freecol/server/model/ServerRegion.java b/src/net/sf/freecol/server/model/ServerRegion.java
index 5ac429456..557d77986 100644
--- a/src/net/sf/freecol/server/model/ServerRegion.java
+++ b/src/net/sf/freecol/server/model/ServerRegion.java
@@ -227,7 +227,7 @@ public class ServerRegion extends Region {
         for (Region r : discover(player, turn)) cs.add(See.all(), r);
         HistoryEvent h = new HistoryEvent(turn,
             HistoryEvent.HistoryEventType.DISCOVER_REGION, player)
-                .addStringTemplate("%nation%", player.getNationName())
+                .addStringTemplate("%nation%", player.getNationLabel())
                 .addName("%region%", newName);
         h.setScore(score);
         cs.addGlobalHistory(getGame(), h);
diff --git a/src/net/sf/freecol/server/model/ServerUnit.java b/src/net/sf/freecol/server/model/ServerUnit.java
index ee49ce51b..8c5010893 100644
--- a/src/net/sf/freecol/server/model/ServerUnit.java
+++ b/src/net/sf/freecol/server/model/ServerUnit.java
@@ -615,7 +615,7 @@ public class ServerUnit extends Unit implements ServerModelObject {
         cs.addMessage(See.only(serverPlayer),
             new ModelMessage(ModelMessage.MessageType.LOST_CITY_RUMOUR,
                 RumourType.BURIAL_GROUND.getDescriptionKey(), serverPlayer, this)
-            .addStringTemplate("%nation%", indianPlayer.getNationName()));
+            .addStringTemplate("%nation%", indianPlayer.getNationLabel()));
     }
 
     /**
@@ -772,7 +772,7 @@ public class ServerUnit extends Unit implements ServerModelObject {
                 cs.addGlobalHistory(game,
                     new HistoryEvent(game.getTurn(),
                         HistoryEvent.HistoryEventType.CITY_OF_GOLD, serverPlayer)
-                    .addStringTemplate("%nation%", serverPlayer.getNationName())
+                    .addStringTemplate("%nation%", serverPlayer.getNationLabel())
                     .addName("%city%", cityName)
                     .addAmount("%treasure%", treasureAmount));
                 break;
@@ -1032,7 +1032,7 @@ public class ServerUnit extends Unit implements ServerModelObject {
                         is.getTile().cacheUnseen(copied);//+til
                         cs.add(See.only(contactPlayer), is);
                         // First European contact with native settlement.
-                        StringTemplate nation = is.getOwner().getNationName();
+                        StringTemplate nation = is.getOwner().getNationLabel();
                         cs.addMessage(See.only(contactPlayer),
                             new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
                                              "model.unit.nativeSettlementContact",

From ea9038fffcff6dbc85b4e89ac79266ab15dc219f Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Wed, 12 Aug 2015 19:29:59 +0930
Subject: [PATCH 093/323] More use of country name, BR#2887.

---
 data/strings/FreeColMessages.properties                     | 6 +++---
 src/net/sf/freecol/client/control/ConnectController.java    | 5 ++++-
 src/net/sf/freecol/client/gui/MapViewer.java                | 2 +-
 src/net/sf/freecol/client/gui/menu/DebugMenu.java           | 2 +-
 .../sf/freecol/client/gui/panel/ReportExplorationPanel.java | 2 +-
 src/net/sf/freecol/common/debug/DebugUtils.java             | 6 +++---
 src/net/sf/freecol/common/model/IndianSettlement.java       | 2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 2a1d40545..d0ce53214 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -2660,7 +2660,7 @@ main.userDir.fail=FreeCol can not find suitable directories to save user data in
 
 # client: Client messages from FreeColClient, ConnectController and common.io.*
 client.baseData=Could not find base data directory %dir%.\n  The data files could not be found by FreeCol.\n  Please make sure they are present.\n  If FreeCol is looking in the wrong directory then\n  run the game with a command line parameter:\n  --freecol-data <data-directory>
-client.choicePlayer=Please choose a player:
+client.choicePlayer=Please choose a nation:
 client.classic=Failed to load resource mapping from rule set `classic'.
 client.debugConnect=You can not connect to an existing game in debug mode.
 client.ending=The game is ending.
@@ -3288,10 +3288,10 @@ negotiationDialog.add=Add
 negotiationDialog.cancel=Cancel
 negotiationDialog.clear=Clear
 negotiationDialog.contact.tutorial=You meet fellow Europeans. They will compete with you for land and riches, and may well wage war against you. But after Jan de Witt has joined the Continental Congress, you can trade with them.
-negotiationDialog.demand={{tag:country|%nation%}} require of the {{tag:country|%otherNation%}}
+negotiationDialog.demand={{tag:country|%nation%}} requires of {{tag:country|%otherNation%}}
 negotiationDialog.exchange=in return for
 negotiationDialog.goldAvailable=(%amount% gold available)
-negotiationDialog.offer=The {{tag:country|%nation%}} offer the {{tag:country|%otherNation%}}
+negotiationDialog.offer={{tag:country|%nation%}} offers {{tag:country|%otherNation%}}
 negotiationDialog.send=Send
 negotiationDialog.title.contact=Meeting Fellow Europeans
 negotiationDialog.title.diplomatic=Diplomatic Negotiation
diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
index 6d9b3f6a6..52f1ded57 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -416,7 +416,10 @@ public final class ConnectController {
 
             List<ChoiceItem<String>> choices = new ArrayList<>();
             for (String n : names) {
-                choices.add(new ChoiceItem<>(Messages.getName(n), n));
+                String nam = Messages.message(StringTemplate
+                    .template("countryName")
+                    .add("%nation%", Messages.nameKey(n)));
+                choices.add(new ChoiceItem<>(nam, n));
             }
             String choice = gui.getChoice(true, null,
                 Messages.message("client.choicePlayer"),
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 19e94a0ad..1182ebd11 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1871,7 +1871,7 @@ public final class MapViewer {
             break;
         case ClientOptions.DISPLAY_TILE_TEXT_OWNERS:
             if (tile.getOwner() != null) {
-                text = Messages.message(tile.getOwner().getNationLabel());
+                text = Messages.message(tile.getOwner().getCountryLabel());
             }
             break;
         case ClientOptions.DISPLAY_TILE_TEXT_REGIONS:
diff --git a/src/net/sf/freecol/client/gui/menu/DebugMenu.java b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
index 2bc5647e0..63d2f637c 100644
--- a/src/net/sf/freecol/client/gui/menu/DebugMenu.java
+++ b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
@@ -176,7 +176,7 @@ public class DebugMenu extends JMenu {
         cvpMenu.addSeparator();
         for (Player p : game.getLiveEuropeanPlayers(null)) {
             final JRadioButtonMenuItem cv2
-                = Utility.localizedRadioButtonMenuItem(p.getNationLabel(),
+                = Utility.localizedRadioButtonMenuItem(p.getCountryLabel(),
                     FreeColDebugger.debugDisplayColonyValuePlayer() == p);
             cv2.setOpaque(false);
             //cv2.setMnemonic(KeyEvent.VK_C);
diff --git a/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java b/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java
index 871f63ee5..548682359 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java
@@ -106,7 +106,7 @@ public final class ReportExplorationPanel extends ReportPanel {
             reportPanel.add(Utility.localizedLabel(region.getDiscoveredIn()
                     .getLabel()));
             reportPanel.add(Utility.localizedLabel(region.getDiscoveredBy()
-                    .getNationLabel()));
+                    .getCountryLabel()));
             reportPanel.add(new JLabel(String.valueOf(region.getScoreValue())));
         }
     }
diff --git a/src/net/sf/freecol/common/debug/DebugUtils.java b/src/net/sf/freecol/common/debug/DebugUtils.java
index f5d87e122..9f87c781e 100644
--- a/src/net/sf/freecol/common/debug/DebugUtils.java
+++ b/src/net/sf/freecol/common/debug/DebugUtils.java
@@ -472,7 +472,7 @@ public class DebugUtils {
 
         List<ChoiceItem<Player>> pcs = new ArrayList<>();
         for (Player p : game.getLiveEuropeanPlayers(colony.getOwner())) {
-            String msg = Messages.message(p.getNationLabel());
+            String msg = Messages.message(p.getCountryLabel());
             pcs.add(new ChoiceItem<>(msg, p));
         }
         Collections.sort(pcs);
@@ -511,7 +511,7 @@ public class DebugUtils {
         List<ChoiceItem<Player>> pcs = new ArrayList<>();
         for (Player p : game.getLivePlayers(null)) {
             if (unit.getType().isAvailableTo(p)) {
-                String msg = Messages.message(p.getNationLabel());
+                String msg = Messages.message(p.getCountryLabel());
                 pcs.add(new ChoiceItem<>(msg, p));
             }
         }
@@ -740,7 +740,7 @@ public class DebugUtils {
             units.put(Messages.message("sailingToEurope"), toEurope);
             units.put(Messages.getName(p.getEurope()), inEurope);
             units.put(Messages.message("sailingToAmerica"), toAmerica);
-            lb.add("\n==", Messages.message(p.getNationLabel()), "==\n");
+            lb.add("\n==", Messages.message(p.getCountryLabel()), "==\n");
 
             for (Unit u : p.getEurope().getUnitList()) {
                 if (u.getDestination() instanceof Map) {
diff --git a/src/net/sf/freecol/common/model/IndianSettlement.java b/src/net/sf/freecol/common/model/IndianSettlement.java
index 4698a2c88..11fb0d10f 100644
--- a/src/net/sf/freecol/common/model/IndianSettlement.java
+++ b/src/net/sf/freecol/common/model/IndianSettlement.java
@@ -460,7 +460,7 @@ public class IndianSettlement extends Settlement implements TradeLocation {
         return (contacted)
             ? ((mostHated == null)
                 ? StringTemplate.key("model.indianSettlement.mostHatedNone")
-                : mostHated.getNationLabel())
+                : mostHated.getCountryLabel())
             : StringTemplate.key("model.indianSettlement.mostHatedUnknown");
     }
             

From 1dc0277a7c9faad48878f458bd58d4460a424e6c Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Wed, 12 Aug 2015 20:10:57 +0930
Subject: [PATCH 094/323] Prevent path search fail from crashing map viewer,
 BR#2889.

---
 src/net/sf/freecol/client/gui/MapViewer.java | 25 +++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 1182ebd11..d94f21b81 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -46,6 +46,7 @@ import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.swing.ImageIcon;
@@ -61,6 +62,7 @@ import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.BuildableType;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.ColonyTile;
+import net.sf.freecol.common.model.FreeColGameObject;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.GameOptions;
 import net.sf.freecol.common.model.IndianSettlement;
@@ -319,12 +321,23 @@ public final class MapViewer {
      * Sets the path of the active unit to display it.
      */
     void updateCurrentPathForActiveUnit() {
-        setCurrentPath((activeUnit == null
-                || activeUnit.getDestination() == null
-                || Map.isSameLocation(activeUnit.getLocation(),
-                                      activeUnit.getDestination()))
-            ? null
-            : activeUnit.findPath(activeUnit.getDestination()));
+        PathNode path;
+        if (activeUnit == null
+            || activeUnit.getDestination() == null
+            || ((FreeColGameObject)activeUnit.getDestination()).isDisposed()
+            || Map.isSameLocation(activeUnit.getLocation(),
+                                  activeUnit.getDestination())) {
+            path = null;
+        } else {
+            try {
+                path = activeUnit.findPath(activeUnit.getDestination());
+            } catch (Exception e) {
+                logger.log(Level.WARNING, "Path fail", e);
+                path = null;
+                activeUnit.setDestination(null);
+            }
+        }
+        setCurrentPath(path);
     }
 
     /**

From b023e035cf9e9f1ea5388f95f45a6dbc6845074e Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 13 Aug 2015 13:59:33 +0930
Subject: [PATCH 095/323] git.16b2aa31 mistakenly dropped a bunch of messages,
 restore.

---
 data/strings/FreeColMessages.properties | 67 +++++++++++++++++--------
 1 file changed, 46 insertions(+), 21 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index d0ce53214..3bbb8bb0d 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -131,6 +131,7 @@ cargoOnCarrier=Cargo on carrier
 cashInTreasureTrain=Cash in treasure train
 clearOrders=Clear orders
 colonists=Colonists
+colonyCenter=colony center
 colopedia=Colopedia
 countryName={{tag:country|%nation%}}
 difficulty=Difficulty
@@ -217,6 +218,7 @@ cli.error.home.notDir=%string% is not a directory.
 cli.error.home.notExists=Directory %string% does not exist.
 cli.error.save=Can not read saved game %string%.
 cli.error.serverPort=%string% is not a valid port number.
+cli.error.splash=Splash file %name% not found.
 cli.error.timeout=%string% is too short (less than %minimum%).
 
 cli.advantages=set the type of ADVANTAGES (%advantages%)
@@ -246,6 +248,7 @@ cli.no-intro=skip the intro video
 cli.no-java-check=skip the java version check
 cli.no-memory-check=skip the memory check
 cli.no-sound=run FreeCol without sound
+cli.no-splash=skip the splash screen
 cli.private=start a private server (not published to the metaserver)
 cli.seed=provide a SEED for the pseudo-random number generator
 cli.server-name=specify a custom NAME for the server
@@ -1803,7 +1806,7 @@ model.improvement.road.occupationString=R
 
 # Limits
 model.limit.independence.coastalColonies.name=Coastal Colony Limit
-model.limit.independence.coastalColonies.description=You need at least %limit% coastal colonies in order to declare independence.
+model.limit.independence.coastalColonies.description=You need at least %limit% coastal {{plural:%limit%|one=colony|other=colonies}} in order to declare independence.
 model.limit.independence.rebels.name=Rebel Limit
 model.limit.independence.rebels.description=At least %limit%% of your colonists must support independence.
 model.limit.independence.year.name=Year Limit
@@ -2220,7 +2223,7 @@ model.colony.badGovernment=The government of %colony% is inefficient. Production
 model.colony.goodGovernment=Government efficiency has improved! Rebel sentiment in %colony% now equals or exceeds %number% percent.
 model.colony.governmentImproved1=The government of %colony% has improved, but is still inefficient. Production penalties still apply.
 model.colony.governmentImproved2=The government of %colony% has improved. Production penalties no longer apply.
-model.colony.insufficientProduction=%outputAmount% more %outputType% could be produced in %colony%, if only we had %inputAmount% more %inputType% surplus.
+model.colony.insufficientProduction=%outputAmount% more %outputType% could be produced in %colony%, if an extra %consumptionDeficit% were available.
 model.colony.lostGoodGovernment=Government efficiency has decreased! Rebel sentiment in %colony% no longer equals or exceeds %number% percent. Colony no longer gains any production bonus.
 model.colony.lostVeryGoodGovernment=Government efficiency has decreased! Rebel sentiment in %colony% no longer equals or exceeds %number% percent. Some production bonuses were lost.
 model.colony.minimumColonySize=%object% prevents reducing the population any further.
@@ -2527,6 +2530,7 @@ model.colony.colonyStarved=The last colonist in %colony% has starved, leaving th
 model.colony.customs.sale=The Customs House at %colony% sold: %data%.
 model.colony.customs.saleData=%amount% %goods% for %gold%
 model.colony.famineFeared=Famine feared in %colony%. Only %number% turns of food left.
+model.colony.starving=%colony% is starving.
 model.colony.newColonist=New colonist in %colony%.
 model.colony.newConvert=A new %nation% convert has arrived in %colony%.
 model.colony.notBuildingAnything=Nothing is being built in %colony%.
@@ -3034,40 +3038,60 @@ report.labour.workingAsOther=other
 # ReportColonyPanel
 # reuses colonyPanel.currentlyBuilding
 report.colony.arriving.description=%colony%: new %unit% {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.arriving.summary.description=The average number of turns before a new colonist arrives in the colonies of this continent
 report.colony.birth.description=Number of turns until a new colonist arrives or starves
 report.colony.explore.description=Number of tiles to Explore adjacent to this colony
 report.colony.explore.header=E
 report.colony.exploring.description=%colony% would benefit from exploring {{plural:%amount%|one=one tile|other=%amount% tiles}}
+report.colony.exploring.summary.description=Total number of colony tiles that would benefit from exploring for this continent.
 report.colony.grow.description=Number of units the colony can grow by without harming production
 report.colony.grow.header=+
 report.colony.growing.description=%colony% can grow by {{plural:%amount%|one=one unit|other=%amount% units}} without harming production
+report.colony.growing.summary.description=The total number of colonists that can join colonies of this continent without harming production
 report.colony.improve.description=Units that could improve production.
 report.colony.improve.header=Improve
-report.colony.improving.description=%colony%: To make %amount% more %goods%, replace %oldUnit% with %unit%
-report.colony.wanting.description=%colony%: To make %amount% more %goods%, add %unit%
+report.colony.improving.description=%colony% %location%: To make %amount% more %goods%, replace %oldUnit% with %unit%
+report.colony.improving.summary.description=Units (type and count) that would benefit colonies of this continent
 report.colony.making.blocking.description=%colony%: %amount% %goods% needed for %buildable% {{plural:%turns%|one=next turn|other=in %turns% turns}}
 report.colony.making.constructing.description=%colony%: %buildable% completes {{plural:%turns%|one=next turn|other=in %turns% turns}}
 report.colony.making.description=What this colony is making
 report.colony.making.educating.description=%colony%: %teacher% graduates {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.making.educationVacancy.description=%colony%: {{plural:%number%|one=one student place is|other=%number% student places are}} vacant
+report.colony.making.educating.summary.description=Units (type and count) expected to graduate from schools of this continent
 report.colony.making.header=Making
 report.colony.making.noconstruction.description=%colony%: No construction occurring
 report.colony.making.noteach.description=%colony%: %teacher% lacks a student
+report.colony.making.summary.description=The per turn %goods% deficit due to the unsatisfied building requirements of this continent
 report.colony.name.description=The list of colonies
 report.colony.name.header=Colony
-report.colony.plow.description=Number of colony tiles that would benefit from Plowing
-report.colony.plow.header=P
-report.colony.plowing.description=%colony% would benefit from plowing {{plural:%amount%|one=one tile|other=%amount% tiles}}
-report.colony.production.description=%colony%: net %goods% production = %amount%
-report.colony.production.export.description=%colony%: net %goods% production is %amount% (exporting above %export%)
+report.colony.name.summary.description=The region containing more of the above colonies of this continent
+report.colony.production.description=%colony%: %amount% %goods% are being produced
+report.colony.production.export.description=%colony%: %amount% %goods% are being produced (exporting above %export%)
 report.colony.production.header=Net %goods% production
-report.colony.production.high.description=%colony%: net %goods% production = %amount%, full {{plural:%turns%|one=next turn|other=in %turns% turns}}
-report.colony.production.low.description=%colony%: net %goods% production = %amount%, gone {{plural:%turns%|one=next turn|other=in %turns% turns}}
-report.colony.production.waste.description=%colony%: net %goods% production = %amount%, warehouse will overflow, %waste% will be wasted
-report.colony.road.description=Number of colony tiles that would benefit from Road building
-report.colony.road.header=R
-report.colony.roadBuilding.description=%colony% would benefit from building {{plural:%amount%|one=a road|other=%amount% roads}}
+report.colony.production.high.description=%colony%: %amount% %goods% are being produced, full {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.production.low.description=%colony%: %amount% %goods% are being consumed, gone {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.production.maxConsumption.description=%colony%: %amount% %goods% are being consumed (could consume %more% more)
+report.colony.production.maxProduction.description=%colony%: %amount% %goods% are being produced (could produce %more% more)
+report.colony.production.summary.description=The amount of goods being produced or consumed
+report.colony.production.waste.description=%colony%: %amount% %goods% are being produced, warehouse will overflow, %waste% will be wasted
+report.colony.tile.clearForest.description=%colony% would benefit from clearing {{plural:%amount%|one=one tile|other=%amount% tiles}}
+report.colony.tile.clearForest.specific.description=%colony% would benefit from clearing %location%
+report.colony.tile.clearForest.header=C
+report.colony.tile.clearForest.header.description=Number of colony tiles that would benefit from clearing.
+report.colony.tile.clearForest.summary.description=Total number of colony tiles that would benefit from clearing for this continent.
+report.colony.tile.plow.description=%colony% would benefit from plowing {{plural:%amount%|one=one tile|other=%amount% tiles}}
+report.colony.tile.plow.specific.description=%colony% would benefit from plowing %location%
+report.colony.tile.plow.header=P
+report.colony.tile.plow.header.description=Number of colony tiles that would benefit from plowing.
+report.colony.tile.plow.summary.description=Total number of colony tiles that would benefit from plowing for this continent.
+report.colony.tile.road.description=%colony% would benefit from building {{plural:%amount%|one=a road|other=%amount% roads}}
+report.colony.tile.road.specific.description=%colony% would benefit from building a road at %location%
+report.colony.tile.road.header=R
+report.colony.tile.road.header.description=Number of colony tiles that would benefit from road building.
+report.colony.tile.road.summary.description=Total number of colony tiles that would benefit from road building for this continent.
 report.colony.shrinking.description=%colony% must shrink by {{plural:%amount%|one=one unit|other=%amount% units}} to improve production
 report.colony.starving.description=%colony%: starvation {{plural:%turns%|one=next turn|other=in %turns% turns}}
+report.colony.wanting.description=%colony% %location%: To make %amount% more %goods%, add %unit%
 
 # ReportContinentalCongressPanel
 report.continentalCongress.available=Available
@@ -3140,15 +3164,15 @@ report.production.update=Update
 # ReportRequirementsPanel
 report.requirements.badAssignment=%colony% has a %expert% currently working as %expertWork%, while a %nonExpert% is working as %nonExpertWork%. Production would be greater if the colonists swapped jobs.
 report.requirements.canTrainExperts={{plural:2|%unit%}} can be trained at
-report.requirements.clearTile=%type% to the %direction% of %colony% would benefit from clearing.
-report.requirements.exploreTile=%type% to the %direction% of %colony% would benefit from exploration.
+report.requirements.exploreTile=%location% would benefit from exploration.
 report.requirements.met=All requirements are met.
 report.requirements.missingGoods=%colony% is producing %goods%, but requires more %input%.
 report.requirements.misusedExperts=There are {{plural:2|%unit%}} not working as %work% present at
 report.requirements.noExpert=%colony% is producing %goods%, but has no %unit%.
-report.requirements.plowCenter=%colony% would benefit from plowing its tile.
-report.requirements.plowTile=%type% to the %direction% of %colony% would benefit from plowing.
-report.requirements.roadTile=%type% to the %direction% of %colony% would benefit from road building.
+report.requirements.tile.clearForest=%location% would benefit from clearing.
+report.requirements.tile.plow=%location% would benefit from plowing.
+report.requirements.tile.road=%location% would benefit from road building.
+#report.requirements.tile.road.center can not happen
 report.requirements.severalExperts=Several {{plural:2|%unit%}} are present at
 report.requirements.surplus=A surplus of %goods% is being produced at
 
@@ -3156,7 +3180,8 @@ report.requirements.surplus=A surplus of %goods% is being produced at
 report.trade.afterTaxes=Income after taxes
 report.trade.beforeTaxes=Income before taxes
 report.trade.cargoUnits=Units in Cargo
-report.trade.hasCustomHouse=* This colony has a custom house; these goods are exported.
+report.trade.export=Exporting %goods% above %amount%
+report.trade.hasCustomHouse=* This colony has a custom house, and may export goods.
 report.trade.totalDelta=Total Production
 report.trade.totalUnits=Total Units
 report.trade.unitsSold=Units bought or sold

From 7f89b063b7cf8cd0d5a5fe84520b5682d00cc153 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 10 Aug 2015 17:10:14 +0930
Subject: [PATCH 096/323] Tighten client IGIH to not touch the GUI directly.

---
 .../client/control/InGameController.java      | 208 ++++++++++++-
 .../client/control/InGameInputHandler.java    | 289 +++++++++---------
 2 files changed, 351 insertions(+), 146 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 0a56ab86d..73f1c1488 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -2598,6 +2598,39 @@ public final class InGameController implements NetworkConstants {
         return ret;
     }
 
+    /**
+     * Animate an attack.
+     *
+     * Called from IGIH.animateAttack.
+     *
+     * @param attacker The attacking <code>Unit</code>.
+     * @param defender The defending <code>Unit</code>.
+     * @param attackerTile The <code>Tile</code> the attack originates from.
+     * @param defenderTile The <code>Tile</code> the defence takes place on.
+     * @param success True if the attack succeeds.
+     */
+    public void animateAttack(Unit attacker, Unit defender,
+                              Tile attackerTile, Tile defenderTile,
+                              boolean success) {
+        gui.animateUnitAttack(attacker, defender, attackerTile, defenderTile,
+                              success);
+        gui.refresh();
+    }
+
+    /**
+     * Animate a move.
+     *
+     * Called from IGIH.animateMove.
+     *
+     * @param unit The <code>Unit</code> that moves.
+     * @param oldTile The <code>Tile</code> the move begins at.
+     * @param newTile The <code>Tile</code> the move ends at.
+     */
+    public void animateMove(Unit unit, Tile oldTile, Tile newTile) {
+        gui.animateUnitMove(unit, oldTile, newTile);
+        gui.refresh();
+    }
+
     /**
      * Assigns a student to a teacher.
      *
@@ -2786,6 +2819,19 @@ public final class InGameController implements NetworkConstants {
         return ret;
     }
 
+    /**
+     * Chat with another player.
+     *
+     * Called from IGIH.chat.
+     *
+     * @param player The <code>Player</code> to chat with.
+     * @param message What to say.
+     * @param pri If true, the message is private.
+     */
+    public void chat(Player player, String message, boolean pri) {
+        gui.displayChatMessage(player, message, pri);
+    }
+
     /**
      * Changes the state of this <code>Unit</code>.
      *
@@ -2943,6 +2989,18 @@ public final class InGameController implements NetworkConstants {
         return askServer().chooseFoundingFather(ffs, ff);
     }
 
+    /**
+     * Choose a founding father from an offered list.
+     *
+     * Called from IGIH.chooseFoundingFather.
+     *
+     * @param ffs A list of <code>FoundingFather</code>s to choose from.
+     */
+    public void chooseFoundingFather(List<FoundingFather> ffs) {
+        if (ffs == null) return;
+        gui.showChooseFoundingFatherDialog(ffs);
+    }
+    
     /**
      * Claim a tile.
      *
@@ -3062,6 +3120,15 @@ public final class InGameController implements NetworkConstants {
         return ret;
     }
 
+    /**
+     * Close any open GUI menus.
+     *
+     * Called from IGIH.closeMenus.
+     */
+    public void closeMenus() {
+        gui.closeMenus();
+    }
+
     /**
      * Declares independence for the home country.
      *
@@ -3157,6 +3224,7 @@ public final class InGameController implements NetworkConstants {
             logger.warning("Bogus trade status: " + agreement.getStatus());
             break;
         }
+        updateControls();
         return null;
     }
 
@@ -3196,10 +3264,9 @@ public final class InGameController implements NetworkConstants {
      * @return True, the high scores were displayed.
      */
     public boolean displayHighScores(Boolean high) {
-        List<HighScore> scores = askServer().getHighScores();
         gui.showHighScoresPanel((high == null) ? null
             : (high) ? "highscores.yes" : "highscores.no",
-            scores);
+            askServer().getHighScores());
         return true;
     }
 
@@ -3312,6 +3379,20 @@ public final class InGameController implements NetworkConstants {
         return ret;
     }
 
+    /**
+     * Display an error.
+     *
+     * Called from IGIH.error.
+     *
+     * @param messageId The i18n-keyname of the error message to display.
+     * @param message An alternative (possibly non-i18n) message to
+     *     display if the resource specified by <code>messageId</code>
+     *     is unavailable.
+     */
+    public void error(String messageId, String message) {
+        gui.showErrorMessage(messageId, message);
+    }
+
     /**
      * Execute goto orders command.
      *
@@ -3346,6 +3427,21 @@ public final class InGameController implements NetworkConstants {
         return askServer().firstContact(player, other, tile, result);
     }
 
+    /**
+     * A player makes first contact with a native player.
+     *
+     * Called from IGIH.firstContact.
+     *
+     * @param player The <code>Player</code> making contact.
+     * @param other The native <code>Player</code> being contacted.
+     * @param tile An optional <code>Tile</code> to offer the player if
+     *     they have made a first landing.
+     * @param n The number of settlements claimed by the native player.
+     */
+    public void firstContact(Player player, Player other, Tile tile, int n) {
+        gui.showFirstContactDialog(player, other, tile, n);
+    }
+
     /**
      * Handle a fountain of youth event.
      *
@@ -3688,6 +3784,19 @@ public final class InGameController implements NetworkConstants {
         return ret;
     }
 
+    /**
+     * Loot some cargo.
+     *
+     * Called from IGIH.lootCargo.
+     *
+     * @param unit The <code>Unit</code> that is looting.
+     * @param goods A list of <code>Goods</code> to choose from.
+     * @param defenderId The identifier of the defender unit (may have sunk).
+     */
+    public void loot(Unit unit, List<Goods> goods, String defenderId) {
+        gui.showCaptureGoodsDialog(unit, goods, defenderId);
+    }
+    
     /**
      * Accept or reject a monarch action.
      *
@@ -3711,6 +3820,18 @@ public final class InGameController implements NetworkConstants {
         return false;
     }
 
+    /**
+     * Do a monarch interaction.
+     *
+     * @param action The <code>MonarchAction</code> to perform.
+     * @param template A <code>StringTemplate</code> describing the action.
+     * @param monarchKey A key for the monarch involved.
+     */
+    public void monarch(MonarchAction action, StringTemplate template,
+                        String monarchKey) {
+        gui.showMonarchDialog(action, template, monarchKey);
+    }
+
     /**
      * Moves the specified unit somewhere that requires crossing the
      * high seas.
@@ -3935,6 +4056,12 @@ public final class InGameController implements NetworkConstants {
                 .addStringTemplate("%year%", currTurn.getLabel())
                 .addAmount("%amount%", currTurn.getSeasonNumber()));
         }
+
+        // Get rid of the "Waiting for..."
+        game.setCurrentPlayer(null);
+        gui.refresh();
+        
+        updateControls();
         return true;
     }
 
@@ -4110,6 +4237,50 @@ public final class InGameController implements NetworkConstants {
         return newUnit != null;
     }
 
+    /**
+     * Remove game objects.
+     *
+     * Called from IGIH.remove().
+     *
+     * @param objects A list of <code>FreeColGameObject</code>s to remove.
+     * @param 
+     */
+    public void remove(List<FreeColGameObject> objects,
+                       FreeColGameObject divert) {
+        final Player player = freeColClient.getMyPlayer();
+        boolean visibilityChange = false;
+        for (FreeColGameObject fcgo : objects) {
+            if (divert != null) player.divertModelMessages(fcgo, divert);
+        
+            if (fcgo instanceof Settlement) {
+                Settlement settlement = (Settlement)fcgo;
+                if (settlement != null && settlement.getOwner() != null) {
+                    settlement.getOwner().removeSettlement(settlement);
+                }
+                visibilityChange = true;//-vis(player)
+                
+            } else if (fcgo instanceof Unit) {
+                // Deselect the object if it is the current active unit.
+                Unit u = (Unit)fcgo;
+                if (u == gui.getActiveUnit()) gui.setActiveUnit(null);
+
+                // Temporary hack until we have real containers.
+                if (u != null && u.getOwner() != null) {
+                    u.getOwner().removeUnit(u);
+                }
+                visibilityChange = true;//-vis(player)
+            }
+
+            // Do just the low level dispose that removes
+            // reference to this object in the client.  The other
+            // updates should have done the rest.
+            fcgo.disposeResources();
+        }
+        if (visibilityChange) player.invalidateCanSeeTiles();//+vis(player)
+
+        gui.refresh();
+    }
+        
     /**
      * Renames a <code>Nameable</code>.
      *
@@ -4352,6 +4523,11 @@ public final class InGameController implements NetworkConstants {
                 sound("sound.anthem." + player.getNationId());
             }
         }
+
+        // Update "Waiting for..."
+        gui.refresh();
+        if (!gui.isShowingSubPanel()) gui.requestFocusInWindow();
+        
         return true;
     }
 
@@ -4493,6 +4669,19 @@ public final class InGameController implements NetworkConstants {
         return true;
     }
 
+    /**
+     * Spy on a colony.
+     *
+     * Called from IGIH.spyResult.
+     *
+     * @param tile The <code>Tile</code> to find the colony on.
+     * @param recover A <code>Runnable</code> to restore the normal
+     *     player view of the tile when the spying colony panel is closed.
+     */
+    public void spyColony(Tile tile, Runnable recover) {
+        gui.showSpyColonyPanel(tile, recover);
+    }
+    
     /**
      * Trains a unit of a specified type in Europe.
      *
@@ -4626,6 +4815,7 @@ public final class InGameController implements NetworkConstants {
      *
      * Called from GUI.showVictoryDialog
      *
+     * @param quit If true, leave this game and start a new one.
      * @return True.
      */
     public boolean victory(Boolean quit) {
@@ -4636,7 +4826,19 @@ public final class InGameController implements NetworkConstants {
         }
         return true;
     }
-        
+
+    /**
+     * The player has won, show the high scores and victory dialog.
+     *
+     * Called from IGIH.gameEnded.
+     *
+     * @param score If "true", a new high score was reached.
+     */
+    public void victory(String score) {
+        displayHighScores("true".equalsIgnoreCase(score));
+        gui.showVictoryDialog();
+    }
+
     /**
      * Tell a unit to wait.
      *
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index 4005dfd5a..24c42d720 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -67,12 +67,11 @@ import org.w3c.dom.NodeList;
 
 
 /**
- * Handles the network messages that arrives while in the game.
+ * Handle the network messages that arrives while in the game.
  *
- * Usually delegate to the real handlers in InGameController, making
- * sure anything non-trivial that touches the GUI is doing so inside
- * the EDT.  Usually this is done with invokeLater, but some messages
- * demand a response which requires invokeAndWait.
+ * Delegate to the real handlers in InGameController which are allowed
+ * to touch the GUI.  Call IGC through invokeLater except for the messages
+ * that demand a response, which requires invokeAndWait.
  *
  * Note that the EDT often calls the controller, which queries the
  * server, which results in handling the reply here, still within the
@@ -82,8 +81,8 @@ import org.w3c.dom.NodeList;
  *
  * ...except for the special case of the animations.  These have to be
  * done in series but are sometimes in the EDT (our unit moves) and
- * sometimes not (other nation unit moves).  Hence the hack in the
- * local invokeAndWait wrapper.
+ * sometimes not (other nation unit moves).  Hence the hack
+ * FreeColClient.invokeAndWait.
  */
 public final class InGameInputHandler extends InputHandler {
 
@@ -93,13 +92,7 @@ public final class InGameInputHandler extends InputHandler {
     private final Runnable closeMenusRunnable = new Runnable() {
             @Override
             public void run() {
-                getGUI().closeMenus();
-            }
-        };
-    private final Runnable deselectActiveUnitRunnable = new Runnable() {
-            @Override
-            public void run() {
-                getGUI().setActiveUnit(null);
+                igc().closeMenus();
             }
         };
     private final Runnable displayModelMessagesRunnable = new Runnable() {
@@ -114,12 +107,6 @@ public final class InGameInputHandler extends InputHandler {
                 igc().reconnect();
             }
         };
-    private final Runnable updateMenuBarRunnable = new Runnable() {
-            @Override
-            public void run() {
-                getGUI().updateMenuBar();
-            }
-        };
 
 
     /**
@@ -141,30 +128,13 @@ public final class InGameInputHandler extends InputHandler {
         return getFreeColClient().getInGameController();
     }
 
-    /**
-     * Refresh the canvas.
-     *
-     * @param focus If true, request the focus.
-     */
-    private void refreshCanvas(final boolean focus) {
-        getFreeColClient().invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    getGUI().refresh();
-
-                    if (focus && !getGUI().isShowingSubPanel()) {
-                        getGUI().requestFocusInWindow();
-                    }
-                }
-            });
-    }
-
     /**
      * Get the integer value of an element attribute.
      *
      * @param element The <code>Element</code> to query.
      * @param attrib The attribute to use.
-     * @return The integer value of the attribute, or MIN_INT on failure.
+     * @return The integer value of the attribute, or
+     *     Integer.MIN_VALUE on failure.
      */
     private static int getIntegerAttribute(Element element, String attrib) {
         int n;
@@ -198,6 +168,7 @@ public final class InGameInputHandler extends InputHandler {
      * Sometimes units appear which the client does not know about,
      * and are passed in as the children of the parent element.
      * Worse, if their location is a Unit, that unit has to be passed in too.
+     * Pull a unit out of the children by id.
      *
      * @param game The <code>Game</code> to add the unit to.
      * @param element The <code>Element</code> to find a unit in.
@@ -211,7 +182,7 @@ public final class InGameInputHandler extends InputHandler {
         if (e != null) {
             u = new Unit(game, e);
             if (u.getLocation() == null) {
-                throw new IllegalStateException("Null location: " + u);
+                throw new RuntimeException("Null location: " + u);
             }
         }
         return u;
@@ -231,7 +202,7 @@ public final class InGameInputHandler extends InputHandler {
 
         Element reply;
         String type = element.getTagName();
-        logger.log(Level.FINEST, "Received message: " + type);
+        logger.log(Level.FINEST, "Received: " + type);
         switch (type) {
         case "disconnect":
             reply = disconnect(element); break; // Inherited
@@ -304,7 +275,7 @@ public final class InGameInputHandler extends InputHandler {
         final FreeColClient fcc = getFreeColClient();
         if (Boolean.TRUE.toString().equals(element.getAttribute("flush"))
             && fcc.currentPlayerIsMyPlayer()) {
-            getFreeColClient().invokeLater(displayModelMessagesRunnable);
+            fcc.invokeLater(displayModelMessagesRunnable);
         }
         return reply;
     }
@@ -358,7 +329,7 @@ public final class InGameInputHandler extends InputHandler {
     }
 
     /**
-     * Handles an "addPlayer"-message.
+     * Handle an "addPlayer"-message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -381,7 +352,7 @@ public final class InGameInputHandler extends InputHandler {
     }
 
     /**
-     * Handles an "animateAttack"-message.  This only performs animation, if
+     * Handle an "animateAttack"-message.  This only performs animation, if
      * required.  It does not actually perform any attacks.
      *
      * @param element An element (root element in a DOM-parsed XML
@@ -413,6 +384,7 @@ public final class InGameInputHandler extends InputHandler {
         // moves as much as possible.
         if (getFreeColClient().getAnimationSpeed(u.getOwner()) <= 0)
             return null;
+        final Unit attacker = u;
 
         if ((str = element.getAttribute("defender")).isEmpty()) {
             throw new IllegalStateException("Attack animation for: "
@@ -449,20 +421,18 @@ public final class InGameInputHandler extends InputHandler {
             = Boolean.parseBoolean(element.getAttribute("success"));
 
         // All is well, do the animation.
-        final Unit attacker = u;
-        freeColClient.invokeAndWait(new Runnable() {
+        getFreeColClient().invokeAndWait(new Runnable() {
                 @Override
                 public void run() {
-                    getGUI().animateUnitAttack(attacker, defender,
+                    igc().animateAttack(attacker, defender,
                         attackerTile, defenderTile, success);
-                    refreshCanvas(false);
                 }
             });
         return null;
     }
 
     /**
-     * Handles an "animateMove"-message.  This only performs
+     * Handle an "animateMove"-message.  This only performs
      * animation, if required.  It does not actually change unit
      * positions, which happens in an "update".
      *
@@ -500,6 +470,7 @@ public final class InGameInputHandler extends InputHandler {
         // moves as much as possible.
         if (getFreeColClient().getAnimationSpeed(u.getOwner()) <= 0)
             return null;
+        final Unit unit = u;
 
         String oldTileId = element.getAttribute("oldTile");
         if (oldTileId.isEmpty()) {
@@ -527,19 +498,17 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        final Unit unit = u;
-        freeColClient.invokeAndWait(new Runnable() {
+        getFreeColClient().invokeAndWait(new Runnable() {
                 @Override
                 public void run() {
-                    getGUI().animateUnitMove(unit, oldTile, newTile);
-                    refreshCanvas(false);
+                    igc().animateMove(unit, oldTile, newTile);
                 }
             });
         return null;
     }
 
     /**
-     * Handles a "chat"-message.
+     * Handle a "chat"-message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -550,18 +519,18 @@ public final class InGameInputHandler extends InputHandler {
         final ChatMessage chatMessage = new ChatMessage(game, element);
 
         getFreeColClient().invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                getGUI().displayChatMessage(chatMessage.getPlayer(game),
-                                            chatMessage.getMessage(),
-                                            chatMessage.isPrivate());
-            }
-        });
+                @Override
+                public void run() {
+                    igc().chat(chatMessage.getPlayer(game),
+                               chatMessage.getMessage(),
+                               chatMessage.isPrivate());
+                }
+            });
         return null;
     }
 
     /**
-     * Handles an "chooseFoundingFather"-request.
+     * Handle an "chooseFoundingFather"-request.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -572,7 +541,12 @@ public final class InGameInputHandler extends InputHandler {
             = new ChooseFoundingFatherMessage(getGame(), element);
         final List<FoundingFather> ffs = message.getFathers();
 
-        getGUI().showChooseFoundingFatherDialog(ffs);
+        getFreeColClient().invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    igc().chooseFoundingFather(ffs);
+                }
+            });
         return null;
     }
 
@@ -592,7 +566,7 @@ public final class InGameInputHandler extends InputHandler {
     }
 
     /**
-     * Handles a "diplomacy"-request.  If the message informs of an
+     * Handle a "diplomacy"-request.  If the message informs of an
      * acceptance or rejection then display the result and return
      * null.  If the message is a proposal, then ask the user about
      * it and return the response with appropriate response set.
@@ -626,7 +600,6 @@ public final class InGameInputHandler extends InputHandler {
                                                          agreement));
                 }
             });
-        getFreeColClient().invokeLater(updateMenuBarRunnable);
         return (message.getAgreement() == null) ? null
             : message.toXMLElement();
     }
@@ -661,7 +634,7 @@ public final class InGameInputHandler extends InputHandler {
     }
 
     /**
-     * Handles an "error"-message.
+     * Handle an "error"-message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -674,7 +647,7 @@ public final class InGameInputHandler extends InputHandler {
         getFreeColClient().invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    getGUI().showErrorMessage(messageId, message);
+                    igc().error(messageId, message);
                 }
             });
         return null;
@@ -751,9 +724,14 @@ public final class InGameInputHandler extends InputHandler {
             logger.warning("firstContact with bad tile: " + tile);
             return null;
         }
+        final int n = message.getSettlementCount();
 
-        getGUI().showFirstContactDialog(player, other, tile,
-                                        message.getSettlementCount());
+        getFreeColClient().invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    igc().firstContact(player, other, tile, n);
+                }
+            });
         return null;
     }
 
@@ -765,18 +743,24 @@ public final class InGameInputHandler extends InputHandler {
      * @return Null.
      */
     private Element fountainOfYouth(Element element) {
-        int n = getIntegerAttribute(element, "migrants");
-        if (n > 0) {
-            igc().fountainOfYouth(n);
-        } else {
+        final int n = getIntegerAttribute(element, "migrants");
+        if (n <= 0) {
             logger.warning("Invalid migrants attribute: "
                 + element.getAttribute("migrants"));
+            return null;
         }
+
+        getFreeColClient().invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    igc().fountainOfYouth(n);
+                }
+            });
         return null;
     }
 
     /**
-     * Handles a "gameEnded"-message.
+     * Handle a "gameEnded"-message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -788,23 +772,25 @@ public final class InGameInputHandler extends InputHandler {
         final Player winner
             = getGame().getFreeColGameObject(element.getAttribute("winner"),
                                              Player.class);
-        final boolean highScore
-            = "true".equalsIgnoreCase(element.getAttribute("highScore"));
+        if (winner == null) {
+            logger.warning("Invalid player for gameEnded");
+            return null;
+        }
+        final String highScore = element.getAttribute("highScore");
 
         if (winner == freeColClient.getMyPlayer()) {
             getFreeColClient().invokeLater(new Runnable() {
                     @Override
                     public void run() {
-                        igc().displayHighScores(highScore);
+                        igc().victory(highScore);
                     }
                 });
-            getGUI().showVictoryDialog();
         }
         return null;
     }
 
     /**
-     * Handles an "indianDemand"-request.
+     * Handle an "indianDemand"-request.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -816,14 +802,12 @@ public final class InGameInputHandler extends InputHandler {
         final Player player = getFreeColClient().getMyPlayer();
         final IndianDemandMessage message
             = new IndianDemandMessage(game, element);
-
         final Unit unit = message.getUnit(game);
         if (unit == null) {
             logger.warning("IndianDemand with null unit: "
                 + element.getAttribute("unit"));
             return null;
         }
-
         final Colony colony = message.getColony(game);
         if (colony == null) {
             logger.warning("IndianDemand with null colony: "
@@ -859,12 +843,17 @@ public final class InGameInputHandler extends InputHandler {
         final List<Goods> goods = message.getGoods();
         if (unit == null || goods == null) return null;
 
-        getGUI().showCaptureGoodsDialog(unit, goods, defenderId);
+        getFreeColClient().invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    igc().loot(unit, goods, defenderId);
+                }
+            });
         return null;
     }
 
     /**
-     * Handles a "monarchAction"-request.
+     * Handle a "monarchAction"-request.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -875,8 +864,13 @@ public final class InGameInputHandler extends InputHandler {
         final MonarchActionMessage message
             = new MonarchActionMessage(game, element);
 
-        getGUI().showMonarchDialog(message.getAction(), message.getTemplate(),
-                                   message.getMonarchKey());
+        getFreeColClient().invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    igc().monarch(message.getAction(), message.getTemplate(),
+                                  message.getMonarchKey());
+                }
+            });
         return null;
     }
 
@@ -918,7 +912,12 @@ public final class InGameInputHandler extends InputHandler {
         if (unit == null || defaultName == null 
             || !unit.hasTile()) return null;
 
-        igc().newLandName(defaultName, unit);
+        getFreeColClient().invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    igc().newLandName(defaultName, unit);
+                }
+            });
         return null;
     }
 
@@ -938,12 +937,17 @@ public final class InGameInputHandler extends InputHandler {
         final String defaultName = message.getNewRegionName();
         if (defaultName == null || region == null) return null;
 
-        igc().newRegionName(region, defaultName, tile, unit);
+        getFreeColClient().invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    igc().newRegionName(region, defaultName, tile, unit);
+                }
+            });
         return null;
     }
 
     /**
-     * Handles a "newTurn"-message.
+     * Handle a "newTurn"-message.
      *
      * @param element The element (root element in a DOM-parsed XML tree)
      *            that holds all the information.
@@ -951,6 +955,10 @@ public final class InGameInputHandler extends InputHandler {
      */
     private Element newTurn(Element element) {
         final int n = getIntegerAttribute(element, "turn");
+        if (n < 0) {
+            logger.warning("Invalid turn for newTurn");
+            return null;
+        }
 
         getFreeColClient().invokeLater(new Runnable() {
                 @Override
@@ -958,16 +966,11 @@ public final class InGameInputHandler extends InputHandler {
                     igc().newTurn(n);
                 }
             });
-
-        igc().setCurrentPlayer(null);
-        refreshCanvas(false);
-
-        getFreeColClient().invokeLater(updateMenuBarRunnable);
         return null;
     }
 
     /**
-     * Handles an "reconnect"-message.
+     * Handle an "reconnect"-message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -981,7 +984,7 @@ public final class InGameInputHandler extends InputHandler {
     }
 
     /**
-     * Handles a "remove"-message.
+     * Handle a "remove"-message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -989,11 +992,9 @@ public final class InGameInputHandler extends InputHandler {
      */
     private Element remove(Element element) {
         final Game game = getGame();
-        String ds = element.getAttribute("divert");
-        FreeColGameObject divert = game.getFreeColGameObject(ds);
-        Player player = getFreeColClient().getMyPlayer();
-        boolean visibilityChange = false;
-
+        final FreeColGameObject divert
+            = game.getFreeColGameObject(element.getAttribute("divert"));
+        final List<FreeColGameObject> objects = new ArrayList<>();
         NodeList nodeList = element.getChildNodes();
         for (int i = 0; i < nodeList.getLength(); i++) {
             Element e = (Element)nodeList.item(i);
@@ -1006,42 +1007,22 @@ public final class InGameInputHandler extends InputHandler {
                 // freeColGameObjects, before this remove is processed.
                 continue;
             }
-            if (divert != null) {
-                player.divertModelMessages(fcgo, divert);
-            }
-            if (fcgo instanceof Settlement) {
-                Settlement settlement = (Settlement)fcgo;
-                if (settlement != null && settlement.getOwner() != null) {
-                    settlement.getOwner().removeSettlement(settlement);
-                }
-                visibilityChange = true;//-vis(player)
-                
-            } else if (fcgo instanceof Unit) {
-                // Deselect the object if it is the current active unit.
-                Unit u = (Unit)fcgo;
-                if (u == getGUI().getActiveUnit()) {
-                    getFreeColClient().invokeAndWait(deselectActiveUnitRunnable);
-                }
-                // Temporary hack until we have real containers.
-                if (u != null && u.getOwner() != null) {
-                    u.getOwner().removeUnit(u);
-                }
-                visibilityChange = true;//-vis(player)
-            }
-
-            // Do just the low level dispose that removes
-            // reference to this object in the client.  The other
-            // updates should have done the rest.
-            fcgo.disposeResources();
+            objects.add(fcgo);
         }
-        if (visibilityChange) player.invalidateCanSeeTiles();//+vis(player)
 
-        refreshCanvas(false);
+        if (!objects.isEmpty()) {
+            getFreeColClient().invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        igc().remove(objects, divert);
+                    }
+                });
+        }
         return null;
     }
 
     /**
-     * Handles a "setAI"-message.
+     * Handle a "setAI"-message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -1057,25 +1038,32 @@ public final class InGameInputHandler extends InputHandler {
     }
 
     /**
-     * Handles a "setCurrentPlayer"-message.
+     * Handle a "setCurrentPlayer"-message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
      * @return Null.
      */
     private Element setCurrentPlayer(Element element) {
-        Player player
+        final Player player
             = getGame().getFreeColGameObject(element.getAttribute("player"),
                                              Player.class);
-        
-        igc().setCurrentPlayer(player);
+        if (player == null) {
+            logger.warning("Invalid player for setCurrentPlayer");
+            return null;
+        }
 
-        refreshCanvas(true);
+        getFreeColClient().invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    igc().setCurrentPlayer(player);
+                }
+            });
         return null;
     }
 
     /**
-     * Handles a "setDead"-message.
+     * Handle a "setDead"-message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -1084,6 +1072,10 @@ public final class InGameInputHandler extends InputHandler {
     private Element setDead(Element element) {
         final Player player = getGame()
             .getFreeColGameObject(element.getAttribute("player"),Player.class);
+        if (player == null) {
+            logger.warning("Invalid player for setDead");
+            return null;
+        }
 
         getFreeColClient().invokeLater(new Runnable() {
                 @Override
@@ -1095,7 +1087,7 @@ public final class InGameInputHandler extends InputHandler {
     }
 
     /**
-     * Handles a "setStance"-request.
+     * Handle a "setStance"-request.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -1105,10 +1097,22 @@ public final class InGameInputHandler extends InputHandler {
         final Game game = getGame();
         final Stance stance = Enum.valueOf(Stance.class,
                                            element.getAttribute("stance"));
+        if (stance == null) {
+            logger.warning("Invalid stance for setStance");
+            return null;
+        }
         final Player p1 = game
             .getFreeColGameObject(element.getAttribute("first"), Player.class);
+        if (p1 == null) {
+            logger.warning("Invalid player1 for setStance");
+            return null;
+        }
         final Player p2 = game
             .getFreeColGameObject(element.getAttribute("second"),Player.class);
+        if (p2 == null) {
+            logger.warning("Invalid player2 for setStance");
+            return null;
+        }
 
         getFreeColClient().invokeLater(new Runnable() {
                 @Override
@@ -1120,7 +1124,7 @@ public final class InGameInputHandler extends InputHandler {
     }
 
     /**
-     * Handles a "spyResult" message.
+     * Handle a "spyResult" message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -1154,12 +1158,12 @@ public final class InGameInputHandler extends InputHandler {
         // is closed.
         final Element fullElement = (Element)nodeList.item(0);
         final Element normalElement = (Element)nodeList.item(1);
+        tile.readFromXMLElement(fullElement);
         getFreeColClient().invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    tile.readFromXMLElement(fullElement);
-                    getGUI().showSpyColonyPanel(tile, new Runnable() {
-                        @Override
+                    igc().spyColony(tile, new Runnable() {
+                            @Override
                             public void run() {
                                 tile.readFromXMLElement(normalElement);
                             }
@@ -1170,7 +1174,7 @@ public final class InGameInputHandler extends InputHandler {
     }
 
     /**
-     * Handles an "update"-message.
+     * Handle an "update"-message.
      *
      * @param element The element (root element in a DOM-parsed XML
      *     tree) that holds all the information.
@@ -1198,7 +1202,6 @@ public final class InGameInputHandler extends InputHandler {
         }
         if (visibilityChange) player.invalidateCanSeeTiles();//+vis(player)
 
-        refreshCanvas(false);
         return null;
     }
 }

From 9279b63d01ef99381e4171c77bee4c4ff6b34641 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 13 Aug 2015 09:19:33 +0930
Subject: [PATCH 097/323] Fix VictoryDialog title.

---
 src/net/sf/freecol/client/gui/panel/VictoryDialog.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/panel/VictoryDialog.java b/src/net/sf/freecol/client/gui/panel/VictoryDialog.java
index d41e015cf..34d098b24 100644
--- a/src/net/sf/freecol/client/gui/panel/VictoryDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/VictoryDialog.java
@@ -47,7 +47,7 @@ public final class VictoryDialog extends FreeColConfirmDialog {
         super(freeColClient, frame);
 
         MigPanel panel = new MigPanel(new MigLayout("wrap 1", "", ""));
-        panel.add(Utility.localizedHeader(Messages.nameKey("victoryDialog"),
+        panel.add(Utility.localizedHeader(Messages.message("victory.text"),
                                           false),
                   "align center, wrap 20");
         Image image = ResourceManager.getImage("image.flavor.Victory");

From 5f533b6e065440e981c91a4c5888ff7be5b844dd Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 12 Aug 2015 09:01:58 +0930
Subject: [PATCH 098/323] Update jogg/jorbis jars.

---
 build.xml              |   4 ++--
 jars/jogg-0.0.17.jar   | Bin 0 -> 9718 bytes
 jars/jogg-0.0.7.jar    | Bin 6839 -> 0 bytes
 jars/jorbis-0.0.15.jar | Bin 58917 -> 0 bytes
 jars/jorbis-0.0.17.jar | Bin 0 -> 78890 bytes
 5 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 jars/jogg-0.0.17.jar
 delete mode 100644 jars/jogg-0.0.7.jar
 delete mode 100644 jars/jorbis-0.0.15.jar
 create mode 100644 jars/jorbis-0.0.17.jar

diff --git a/build.xml b/build.xml
index 9b6e72165..70b1426af 100644
--- a/build.xml
+++ b/build.xml
@@ -43,8 +43,8 @@
         <!-- Cortado Video Applet -->
         <pathelement location="${basedir}/${cortado.jar}"/>
         <!-- JOgg/JOrbis libraries -->
-        <pathelement location="${basedir}/jars/jogg-0.0.7.jar"/>
-        <pathelement location="${basedir}/jars/jorbis-0.0.15.jar"/>
+        <pathelement location="${basedir}/jars/jogg-0.0.17.jar"/>
+        <pathelement location="${basedir}/jars/jorbis-0.0.17.jar"/>
     </path>
     <path id="junit.classpath">
         <pathelement location="${basedir}/test/lib/junit.jar" />
diff --git a/jars/jogg-0.0.17.jar b/jars/jogg-0.0.17.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f614de47308c3f7721711ac0039fc16f47fddd8d
GIT binary patch
literal 9718
zcmaJ{1ymecw#9<GJHg%E-Q7J%;}+Z@2@u@f-QC^YHIT;Lf=h7uWZulYH<>s8_NuO1
zYn{Dst+Tps?K)>G$$~?mgMfiRgJ^#$;ySK~@e&0A0TFvU(BBSuaW!FjX$1*Jd0_=<
z32{|526>4q`SCG1S$c*U1X+5T$?>T=6{c^j8@rASGV*lN@-r@_5HMN?IQ@9ZG!}PQ
z<P`h)G+g^w7&}<xi69BqmyQ>Xpdd<bi^9IqgZyLBe@y=Q1@m_P_oDwh4B{;e@X?m>
ze@DRmGr|hsXk_O6{{$lcXQ0(bbMt>h|CyADtz}4aXb=#Sw^01Qi577&Gc$E$0N5Bg
zIZbHV+N){e_)f01d2yy8w0M0%u5BYzsx|_bM){KHE&bk5M~Vr?;*P3qgyB$Rm?iBi
zWT=q2O2fRvP7u-EmpI%oR+bDAT@#wEp>S4(3RZ<7hbN0q#T82_JR0WTWO9zK*1X&}
z$t-L?rKIrfuUutbWjbZ<`>cE2-Zy2nL2iIcK`8}gvS0%l&W*l&_#*Jd7n~Q&#tqh6
zY$Fd8-Y^O1npD$7`MIOnVDQFLNT5m>#sVx*s6ePfsI8m&3*TQZL5g+}`Z2~M3DP*-
zZcdMWtO1u>D(cz{gk7lBY{tVQcTw|NGD2cVsZYm^4uVhtP#An|+`_!+V>EY=QOE09
zqoZ0-St@xWJ<bX}(UUcLp&d1P6lvIIQ{Q6=<@cAGYklt(9+r}&9qS#fJ=x}ccBTz!
zmb0+&H>DQ+7o8c%oiN&6vuvMF5w+E3l4RitRuZ|6C+F)*#9}KgPf^=A({N=S^t(TB
zvc<}rTll8z+_9SEvevCx{)~|e)SNwPOLS9)#WgWZ@R4aTCGq%HGpZ+0Udt&>#=D}C
zxmyTeyZSNvjS-9C`dZ2?S#qop(Y$uW)AxA+JR~oqFsA>&Ue$mhjgY_&v*;x;2PG+4
z$Y4*(m8yZ8UX%8$I>k0#T)12efb3>0jr>!KP)yDf0gSd<EXRt<sray4iK9mFyYqWi
zzLlMFgso=_L}LUU|7NHogz1_0fqq(nx9?)aM!R3$2RaxaBYl?SkcB$N;fux{U1j;^
zW<!_6Bj$s;XtM=W+B;|d3cQx(woYxcV>Ov8DyUThbOIF2Qyb&_@l&M85!q?SJ0_Uk
z@zN=h=IyYuXHFV1&*es1nq~(+lZTJ+-tF|L2wZ7I3(lG}nT*;2PM!RhE321jD#^?G
zDFjw!i9%0uflWEaOLgb{-|D9Gi{RYfd1DcK*kjc|3K*mFxY2GaI5mIQJ5`&|N7ul3
zb``06mH-fcE%W_eKzRetCV!OFqr0NfBWsgCM$y_1cXdc3f`Rd>*~V}?OMZnC*03Pe
z*D!=)7hL{=>b-9?0Azhm+RQpHzPi_BTpEv8XoK`EFIaYg-n5IXAdWlI&i)Kik9S_o
z{oPU>-{8p3h3Kqk%(H@?WpgBJU?uP%pwPHhdNJkY>i)Z|m)6a=hCsu`-HBE(LgPnp
z!VCR@(^eAtiFCSpy5_GD$&F!haTln>k>BO>3($mZD1>z_TG|dQLdw#n63gltx*e3~
z$9SnAKW$3L9x4uB4dK=gn?jgX9_)E|9b+7=Vi3GTG)CdJ@|V)$v!L_DyY~$7x&9vI
z0Td>5UAkoFefh>!vBfy0>lMK@!x@q=%Y?n9`Mk=3N6U`W;&%y@S+wtFcWOE(haioh
z)FnyJ9?~`Cc;)xf2r@N%8b4%xMwt@~QGFLih?M4AL#`M+k}g(jcsXm5C^sK>K$Gmv
zrk*6{5@!)#<OGdnhMlggne0HAP~adl0`BDz9@CtUNW^#QPl?GK5m(u-uyO3yKL|nt
zEE}|=xFDpM`5+;iZWNz=;9pO6AK!~|JS1AKm1WxVz&Cq`iMT<6xCJY5&KkZ&zH^Ri
z{tPa8!9nN@uB3a5*{P-QqKlms32UvdZty;BbC4sg&3(*S8gp1wOL4R%1Ep$TWHYi%
zbT})Xol-~o6rF;EywNso?C#ETX@Z)Jlzfz+O}kc8(MUDFzYS2uuy|Bht(G}Sf=eB9
zELTP=7bc<bfl6g5P-aVX{2?l4L3RA+T)8I_t2IS(LKIVwfP%50Fp1#EjO3yheB2#+
zW`EHIAic&i4QfhWx{hyBgmbzuzIMBvfXJB@AX{S=Te65gG7@<-r@%fm**=w%KC8X~
zcf(K~iQ!!P#d449q<}6qxW<nRm2XqzTuSRJoDl|t`0VxdBMZhWY}BiI=ljVTx=#@c
z5d(hA2benvTe9D`WBZSj2hm9s8i=aZ>5eJ*&&FjQxauB{%5PQSfgh_O`GsA(w40}3
z+X67bPSVjVtkyok*PAIGl`FMfWmFN|3nC6mU7H-eI{K4T+yX!^z(#yxb1u*=JBM%A
z$V+e7;PzSXkPYIN9a3g4@XNa0k}ouI2G>o8KjeX|0|@Q}d;^F!#GjC>SOeC(ubM-$
zia|aoVfyO89;_{bc9ay)qg86qxoz&8<Xbu9vpgdOoS?WCuK8;qW?eW)RtA}mnDUru
zR`%1iJdyM6E-|SxJo29_=x`G|=+)0gWd;9m*z%e=7T;T$y0?0HXW-l=hTWBG)>UZM
zm1D-JT$dz$|53Z*)6kD6uf#OXbDZ{3lY8)l7gF{|H2!vpiI;HB3#{D%yl+QUrI4Q<
zt5RJs!=}gNxJ$5xWW_BSigs7Y+}t%rJd?)E<5xe`c6W?Wy<pw9Oe&T)-5GiMn|F*v
zh4Q5)K<Oq#X0#s(?24-3V5|Fvvuf-PVq8+YMztckfYV>5Svy^n{<J$}SuMLXbcop(
zsR4QDuiU}2lXaM9X_C=wj<Ft^94E)D$qeO|&Ao}@2c}slP9*CLRJB!#i~`R<a@J>c
ztR{1eMM`j=#jft3){AD0lT2lPC>!0WL739Os?ICC@|0)Kd7UUWP&|UKayy=*D*E6!
zUDFoRse3%K=bnDfNzB!w-<CXCFn0Mg;9GLlV8_sji#=VR395gFbN=87>0LO(YM7kB
z5AIvnXx@FDaw68pCw|RJ3XK06&-NvnLf&IIngY8tzK}$Xb|PJ=jV&QZbv8Ls8eW??
z*HpW|WkGL?&zjJolRZnzR2>CN3odwGgWVygAzBMCkKCt`j9o+0UyMP{P>YFTP0tO;
zDB8D#U|gdCA(b&olefF=0{x|X{uC%83ZfKuZ^A?a^zQ|Vk`ch#)cFsALLb$k(8q-S
z_3b~U8Y?npkb({T{DqDHMU<BK3$hwm4U<?Sv$BYlrlns$fSH*29E1;ji)X}9Fw4p3
z)%UgY6NsDxc5cu!2oxwqfCc%tv`SR!h13oHDd^_~l4<syB%*{5yc8S`-{|}5(F+-_
zM{Be3db2B767lp*D9RXMI^yOidk0rK?ayXx&93!3;#<AZYYi#At6fU2)%V2eEq+Wn
zT`&X!2ZNcEU2*nH(W}(cm)Rn)R*eC-)C>XA+g>Tw>YLbv2Jav?JkIY2tg9XIomY;r
zUBj7dn&)Fy)FJ^Ik`a(kb&S*Iaci5vk8(*Xrk=n@sQ=7Z?Bub7_?w7yd6RXxe<SIX
zjLc2{$d`}Wsw$p3`l~I63FjCXTmdne&|y$Ak{sOzB`7sPhBTB6M!%8w`!rKLFe6So
zR7ms~l4tOTSsZikt#?GugE}#ht~}diRWDEiM}pHO3r?J4B1U6<{QGO`{9R6`+_#yJ
zL!Y_?K$!xLP|@Mfb?Y~tyWEH%W`cz&0+ZeSLpW31!$O);+$Fo)P!B;V0?AF7dd>2{
z*0$eUCUO|COzi5U_@B+u1r3Vp>rYqQx9iN{uuT#x1##KeGjczYuWlfZr@<XXmSjzE
z2XmO5L9&SFX%Xyp4{g<%*stonZ%Yix%~>z6*m1Fzm`H+#sTDntm?vo!OpH*CFFY(Q
zrB^I99TL-;uaKExvoX+?V2-ewDL#Y?*qMNp&X6uKERm?lPqL-L>=K45J<w35$Dtr7
zF2{7{Kxq)y*RA}fL6vQmNNvZ3nKeD0a2;z_(o}XxUZ*6rPI6>~Sdx4@DGOsPLCc*Y
zJ7+dAdyN$8nrS20kY8EKl6w&AfOx_(NlKRIAEHq|5?rmFZ0k(YpR-CE819=75kAr!
z=zxPYJtl1AJ4ZfGm0xrz+p6IMn);zi&1ICMSSPXdgCaLd8rKNUq^Hp09Ua4LnDW5{
zOf-<$a<FD@ITf|qB`B{CaqY02w9zgXhg`lkO=C5mdln%C+#boMjxZJ!@3`=Nd>p{4
z8!FTJlNd~u>0Jzi_=>n<{Y29}LTc_y1BWkf9n=@I6au2A+o!7Hk5^u`w~K^c2g5={
zxaTwk#1fKWXo-X5IzvoCA)qWzuOb`G$glCoLS9K3K<3bKg?uvKz$^*>Xgr$%r{&iR
zw5aLkt=b2CjVof=afAm&hsqf5T{(q5>d8m4$H^V&A};M%y6-&uM5EE_POs5<Z1bwE
zyspA1-}Tj8r+FEBBi5>S5TH7YX7DiEH@i`u{L^%Z{KzN|$=CAXGJ3J?HqpGLqIOAF
z2G}|W;0d<?wUKSRvztwDEQhUjm2Ixy>3=qmRNA&AZyAm<m(Ta~TI*7l@k^3ANDMck
z5l?vp*xW*UyzCP1TaqF1hHb-`Vm%Q|d46sFqED8$^Gf*xg}mK?&r@^t(ABDKjpx$>
zPA(;>lqk=DJree)_}N5rStLF;kP9*ZMkx|JgM06BZ5+Hw9jX{bd&HY++6IMsR#a<{
zN@h5w69G*<{?J#j&qoU=I$*c1vC!!o=@oj-3JjH*iTa+-+q~r*l75E};RF@^Nq8=b
zQl{C8RRwXobB?sG+%ro2_VU34l261b_Rt3+_WALg^4{lRu-M8)woR_F;6N+%5jn*)
zT3co$4@mu>_GRiY=)q550^#AJGoQ#PZf#1lIg~zp8_~`%E%WyKb-LSo6|*3sgY>xh
z0u98df*|C(P3YC{ar*T!p<;wNrdCkSqMwK`xJ+K{_;-quaQ8`khC0X?m&M_GZ{blf
z7{%-iny58jf7^V>wujVL;6XqFFhD?v|7P=1b#^p0vQ>39a{kvIqzU63KabIQo8`kY
zG7j+~#KKyefNdtyy9Xhh>-YYBv=G>E?g$x9tk7`(NI->Oaq|~h<$4OO#B2#RD}Gbs
zs3Fh#u=+|D>!Zqs`K8i|<%?j$ht=EHxX-(6+)ig+w;gWlt7nf{_b)Y+!4|OmTZL5Y
zEeCW~uHfYu(`1Gj(>f64SkpA`iL>RqO>4=i^ISO#ibW;x^y*_cMl9;e?NH7EIr<ES
zWpp-iGaNYj#CazyDjPDOnlL9;pjxZK-=Ui|x?R93vF!cv42wSNgV~|m$9+zFw?eW(
z*=yBQvHlddIIqw;FW)pnn6kp)eHxu1hyiovtW@ORnylv%5;(z*P@@(ut;-%ak_UZK
zBF3_SZNBA^!f&0btCL(i&xNDtLZ-WoAg4`V^RTxtn2J!7=(_p&By-TDydjTVKqzf0
z9$<&Jk;ZNA$Zl?1^WbuU9``*RX$|l(bO?7#8lMevPgu8|LfK!|#s$)~aVT!0CUF5m
zp?;GDhYO*S#Uyx(W58P0u<JQ}Z(&c3JFdWDg@xj%Tns$miowDzg7Jrz0hXf1&<`D<
z8q5jRqguQzje>4Rqw)#8hWVy`K=i~6@<&B-v^3%Z7FBOm-SP$_rH=8H_~MoXYNh&Y
zftpTdTOXE23iVcw8K9O<31(3g+87=l8UeK`5qIpTR?-Lud?kg|qwEr7OL<vIFEp`O
z)gSHTnOb?*5C*y|YYeWgn&dpOKQFi^a=%v5B!mwwh&HLUo7mcjj*EsB_lnk8mIjrY
zsENz+IdjNgDWyzLCe6Up+)lSRX9n$!IF}r!Da_$JCk6RRJo2%rQatiI3nfmWRO<ot
z=r*#e4>6ZSbT)FrAoQr_;2_3PnKUEMeohlF^5{~zjU5o;tkPx&;qp0WeeMH0#j1`b
zMD}1x{rK7PTwfdjNbvXMzkbiZlf&(JV+1OQ6$5aFNxu+n%QQg&O4_I_p<3J0RTS&u
zRRui<W=^6M9hWbyWQJA+Q36IxY@B>@5qeM<bk0RJ=JqoJ^F<iWt~ZH^ySOnVq0Moa
zRaCL8qspk56Infsqa)Bc1~qU<p)pFxBZD1nf+?5N(6C#6pj8BqAxd-0W|%<t7V3YU
zcvAf-Lyj`DF^jD@!3I%-84(Az#lfhNp7B%u;=$#F;K&laQ~`Z}6H8DGX@p2bdh-z0
z8kN8*GFb)NsNnpb!ly9AJmn4yZHnW5LfI)1S>>vQBGY{9o<bs>x?RbLQQ`eGC@piC
z2qGqTUleN4v)*|#tGrHg6kQb6T37<2Mz<447&YGPLqdC)MaT##JRxp19$)#U5YZy!
z)Lyi>rO8(g1`Cl`oxK)}z18i$mn$my8~Z!x#a&-X;Kz48)DZjIr)(|Z${MLF{^fAP
zmEjwoL7$X-xzLFa3c_-jWG_>{Kj9{YA(!>^IiRbEv=Fuqvyf5+P_~Xxa#@tD<v1w5
z7D29>&gu)x4vaWANxMPmCqVM!OQ|l9j^>0V2-hXN{nS{YSaw8XW4gbp$)hPV7J?<s
zu?)B3&(in3!s>|A3X@xG409`t4@n7P2*(wGo2412PGFfaV}yC!p^srBwguQYQ@4~r
zGE@zCFM<RqclY){s=7l)wIpC2IW&X1-+u<x?UsVqqIl_H<W=$t4(+35g6mdpXs{Fy
zJi-hmrysyH1sbR*G-IP8E)AY*k<xt=1GNflTIi)XGOYV4^9inIXM6yh^Q>ngchuNH
z(Dy@&N94*e{GG(;fC8!5j&YJh4XsnnSa6E?7X6rem}4eg1gEX(uv&06nU%j>l5i)P
z&71<-`BIN66mb_yO+8Gmjq>GUa93ZzW^F=XzzV2jSb%|eWb~BcGyTF6PV>mRG@97B
z4Gw2M#^h<fkuf$gH7|@jL~Xus^p%fPpCJ)Kk2{rbYYVULg2^_l6MRP<{ccWnLrxm3
zxGA%IG3Iy8;KV_ArYgsvcf=158<?u2jiKio64QbDIw^(i<Bjv=zJ(_kjv1W6ZS5?$
zr;!DgTsM1ey$1_y7+RiC;mxs^AWh1cwvy-iqNE2p*f%`ivhbAV?L_?6!k3(QjgJtM
zTf;c!K9sM0)yCQoU@LsS#&aG_nmJh$3427II8nWBWIO;hb!S|R%q!83nj<5;C2;(r
zK8ei$gzl2k>i}H@H-0iaM_#1spz)GL&R*uBHc*4s%8@fv!lAGG`p}f1o4XJU<VBbZ
z3!2TB95;<<ET9%-1*Cj+wl3zdLfAY2rHR2n_cxUOR=AAL`Ck6iMe?%)5V$t?8f%Y}
zS;$IK8W>+_sU;S~>_d`ZfCc)zxq-A(kBG}7E!<5y-He3tNCkg|O%>G#R3x#=%9Xxm
zgS}Q}ixtc!5deSW3&TCfSGn^@_dyAKC0*-hoMA}zMCt(JY!B5Ov1WSADoJ_)tE}>0
zPTM%==ny*dyUcX#Mt1m|B$<`%loF+i5*mxPXAnV>mu`sA_fGWvZbWc23LL0JB6xVJ
z**koK2GGcmC3<Da{3u^^7qG~PRuH&6yKdGz?a$(-gxwA^_}%v3bn!1SzA0c@OB8HC
z=EkzUSX5>%TcT&#@Vhb9sZ}1dyvAwrusDQ3G@O1s5G(pp<lIGrNukWqixGMtkkZ_X
zow`Y+)|Y(_f8a=BEx1_!VYNk3N$XbII;Oc5i#F!DUL=?4ho)S|D*9+V*h)pN{Lb2@
zq*W)S2X;KKy~460sXF55JS{nNd+>*ZAR02i*0Q)nIN2j%+|&^bYybW`P!WhWm!Q+5
zLTV=cYz?>Mg{vcuRfDkUdeI;%km6NnEvQ@U>R0X6HEBR!E5SRe_0nY)7s)2`(n!0c
z)VwcAtvNrx;W@I_9<+eJv!KGz{9)I}OsR<x!}2{^sQA3pqAdO^-JVKf@&H_f*Mr-U
zFK_^GM>VBdV(!u_qw>jQtTXPUT1N%LMOO2e#Q$f=*vvz)fXLDlxc({Naz;?O=H=_R
zdx(Y~thlnTh0xDX69-Q13!Or+J|Rt`nijJLc|h+lV<&jUJ+%73PRX=`BKd<%UhO<x
zpoAAt_z@`GWr+2hS$BYOGtHYWPh`*F(<^$wN+@Gct6*@&#MAT6W}j7SAB7LGIbPBU
zCu-NJB|7Omr9E}XDO}baPI04xFUIYhtTTer2}^O)-y4%?kLq@-zfVi{3f?z->|Q$E
zH)LwN=?=^{$^0saFQ{t|?m{BD%)`BNZ$GR)rd<fH4?`z_wjrclENxO<hnsPJ@0`UJ
zh4DM)m5eQS)vQ&EM3_@WV<KS5RIf;Xz`>TXN}1e{;qbXW&XK^m#NP^EZS0cur5rXF
zUhX*&cI9R}ekd<W*+DAJf|gGKmu8S|Qb0oZ1bcUQn>4WmFR`x}&#w8<Mz)0uWvwes
z?=wFQSch^MxmBIm2@SXG7=CNR7~KiEKDuiH_cWx7HK#PNMTDkl{6JzmuTK5ZYkdW6
z=ERqXCZi)r;>S%7cmw1kGO+BqYB%v_27>xs>VQ!^)Pzw9=8oF1sj`0dn3iK@rp;<+
z+Y&OhXbn!hpTfL)M-DhREuyyYUE<v_t6yij9mbFj)0D&W=?}i3sTK^C;kHZB5@zKj
zMyNK&wwZ2|q|+t+iZ<`bu{?%`LsE4P#BAa`263`Dl2SV{dnPQXtCw}*i6nE2T|Bd`
zO^QiQ2Vo00_RJ1qpn`+&B%VC-+s-;_(ig}vaI0tqNR<$KKRqm^HQGPQCNDQfR@WBE
z(spzZY$rR1o$#CknFrP?0-mrqV}iLiEu??Loi^?m5K0k&>SKIq_;CmSzI}rpx`}Ac
zzB3)HJz;XgR&98hx>s}7y)(1$96@c6cV@s<`Q5sd>>Y(p=sitm!jF3noguH{gpWlP
z-cb7BOAKqW`t4DOm%^=4ZPXJ%2hyEEk(V9UEbEeIS4L#_&)3|7QbTvdWW9aq14y-5
zQRhtg2U4e^xq_k23ZyQdzB>E(nO}TtiTyN0duLg>owpM1;Fq->@x*7)!+7rUM6%w?
zc$M)4d$zCHbHVNlyPfyMqp=3EEALBm_`=*Zk#)uUgz%~kcoD)I{WKSPceZ5mqD8x{
zs5U!E`3&*Fq`8jh-IV1HLrFaOC@c_&mA*A~HblCh2XLZyPfxeF1dXcq*|29uZDfdR
zbnn8;@@5TxuZckfgEQIg9%B(?KRkS3_jB#1Ybg>XSqLrsl>8z8;d5~(>b)#aSXa*B
zQ^h^7aR+^CAVL!0?_q7R(e|$C2GP3-_;r{PWE)(!X>=&S+ey~U1W(Z>Oe}?bZs469
zy3+e>vT|w2mh%<VXmcDB!4SUaxS4%+M{A8sD-PV!MQQ`5S)A0gK?`lQd=HEEMESUS
ze44o(G_MGi%8Rc5tji!1AhCu(f`Ht=bq9(5?$yY{4)B*3qY4c#o4B{)%<A&lOv6_U
ztuM2Y-ytL@U3CcTy2XUDnIKujC?u8})<1;1xK@}5Fwx-tL<&(R&E@k;E-7IqLq|rS
z!Uc3|dQ%KyKM&mn4c<wqv1IJ8oLLtI2<p!|P4eHiPqpkXFLo(rg4vVX-5A2A%F$g4
z<(7cO)g<?zLQcR}8dZPux2_2<*@f3&YOeHS(_qmWFl6`V@@I!%sO`W^)ZHhZwleMr
zK>*X?Ns)yet{8(D?|Ey49oIsLrQ7j%Jv>0HXwxQ5-RN49Ts`}XK2uY4tZJ~>n(_uZ
zE@TUdOH%OfOrL_*GFfOZLr^s3vn=Ozl-Sg=Vx3GlyNGj6uabb0&Ue@{b!7w(@IUjn
zn1O1ZJWcF4dQix((dv3WR4hE*Akwx`FV0Bf^Us@;*U5yFu<~4HWMC3BEOBKGHSETg
z*dE1#lOGZ+%0=2&-)w=7N0l98DTB)CDS9{!r+7!Q)uHnkMf8#M>1)`%n>Y6{FEZAg
z^+>tY-*R7KxwjeBS?u#2YEpKgN=$dr{&;zlkCbE>DKtM|d~Sqk_Ne5ajiidBM!F-4
zO^k-;W6?)JRLE=&>7N2`XIL^Jw>oSHN3@*M8q%XNeqqF;T4#@A>YFp=XaeRNNxzhI
zd=^@HcF>>_KakJ7P<U!%7NkG;38oPNVUO;IrZ`KQJYoS0xF}f6QX(8ZeW*bI#{MMF
zm7}$!V>BJ!O~~ke^<%lOc_=<ige5M;fJ)P;T2sPSNe(>a93Cjm`)1b-L7K!~BPdN?
z_f~&%F89LT*s?17h}qj{@*fyIEzUa7Sjye;!w$j2*3l<Jn=~R}$yIG((^1n2-F$xA
z(#TpM2pPp<SPs_A>&z;mgNwm9DB{?aBHAJA#M96O^8F#%lgf9AT)3NFB$7q~5f4(2
z%FQVXSQxHnMV}*k4KV>&R|?rAA~`9<JnqRc0^tMR_LLNNF<QNTXNI14E^cMB+TA*X
z)Ec@%MhI~#$#E<so4K~x*`vK*I8+t7*_mq4)$8p<v;wI#rXzL4i@0>E10h}LBLHx_
zU5Lxmp}sakgm?~65l032C;o)<64O-SSMllDItjD-@(tS}#fG9Vk*`e7+Deu|sPT2y
zbnzjjEGO8KeIKOj2>T~S`F@tf9?uLfYcy1-^~273hL-g&E@RkCLwnqA9ev(IBJew<
zvB&9Uetqx{rc#mZf6|9iu0U+{IWO}U4r&Cq*yZuUxzn4dgk&{@WTW?iW{>pjmZNgo
zwrTai#%Pmc=6f*x`Jv5cBF4%}&4nwYF5|I?+!&3ib&g1e?EsWMyR2CcL8AL^>X~?a
zFZIsGj0%OxMj&ChY3w}`kt7&TklC0!8t6%NT+Z5Bepby-3a76wNh29<*p>1e>;-c2
z^s2&Xv#H_Pp@qQ?!u}E_?L3}g#dH_X{hD@R$=U9mBovSlfaHAqL76pUsF`7WdW}n&
zbdT{F0Qp%z4AW3>LT)gDP*ANZ3xEgh_0^fAxJx~IovB^ku2=ZhlAY7#Y$KG1@`Puy
zby9lC=;3IT`a3s{6PNl5rEgj(R>%!x1lf3v1-K3<!)DBtDSw287=u#thYth5OlRRN
zhg>hq@W+j!eYSVt^?i1E9SM2nF1-AW1Z<CP8<;E7DsCt)oTmc{$GKOe%}7yOzI>5T
z)lf*rM1;Mx?$|>Idl0MbQLA^6=Sc4GT^le<3W~5H{Js9>V$f5e+(61)AS14W5Zw?l
z%8-*WDPkDC`v)>+I?oHg;cf96G{%s}i(0NA(k)tijP+cq&OV0=eud!m^U`njDxMdq
z_)%!JutmFS?Zjmlh3OHjEPhS9^X{4qJ=z}hlOtSfaTV?cc7srtnBG)v7cuzVlq^w-
zyQFt=r-S>KFy1*I9u**72IU_1cP^E6I_%Jt(SC|Ruazf1Lpk44@%yfBvN}P`^+V?u
zzoL2W8n}P&-*sk}G4N-$O&h|Tq=gf}HidJB(lg%*y<)<O?a{KFQF6=Id0~%f1whlm
zoE42Q1l;l<Rar68t42_WU<OKdQCHQpw5Jt6LHg!Tbt~@tFt@s_s$cUhO1Obye^9i#
z4whMvrTqx;At$S-g3{tJQGl*29Z5FWe6*smi{BeiWqb@^jqv_Lldqb`-}_Z2Cr9Q0
z8rGkzlIGK;pNzjRfQS?G^9Cb8bkU7nO*`j`m0Iups1ZYZaq*+b3=Bk-hN<P#TY(Q0
zj1c_Kj?C{qnzu(8$Xjy;B>&5=*}n}ge{t3P!SKILF~4viAjlvm!Y*&;e>41luwN#b
zKgKUu`rGsm%gnD^{riP}nP&bNzYv{o(_e^xTWJ0_@Ry0^kMRq*|2F*#@Sm2N|IE<u
zrka1@^S@xcCF*zdUoAGj=lb{V*Pl#{Z*HRBnf}@f`<?0cuF#)M2XFcMZ>E3sh<@k!
zy}<h?k15iB^ZZx2_jkJAMbV#hpWp0Azu%VXe@Y}J*>`Vx3Iqi9?UM=y0wO{B>+1gi
DRw;#f

literal 0
HcmV?d00001

diff --git a/jars/jogg-0.0.7.jar b/jars/jogg-0.0.7.jar
deleted file mode 100644
index 1cbd1ad5682f167e62d3dc77f805e30e30e80581..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6839
zcmb7p1yEegw)J3v2@qTd2?QV9J%j-=xJ!WGE(5{cC0K9>PH^|&ZWCM+AV3%#f<v$b
z`NRL-yI<~i@4HoRcb%#}b$YMUXP@fcyVp{YM?ob7VEk_SxC&f=KMV*!1t>~uykL`6
zlHs@;1^`e1D)Q(U4<nHOdzi}q>P+~1#6O%BUnt4SNULkGE6SWHj*ckEv$0QM%d@eJ
zk51I9anAA}Hl5hz6j@~zr(DZWf$w+7n5<A!x0tUi7)Ulrw24y-wur$VTl9O@r%oqM
zNdJEpsHQ>DQorBvaQ!t4mM8!G2^7DdnmX8X*qAyQTexu8I9OV8NV-~Bm^-nX+8H}L
zk7+HdgER@B|BAQ6Ctk3-hAv<iP&XQ@zkPerM`!e5Rz^=vPghaTKE*7mCyvutFVHx5
zoU`+CYJ3NaXY_a)y|U3QQ|TT6f1c|fq%8i+Ow{rchOAcnh0*vb>&ScJdfD6kYI7nd
z2dNu3NfI~sGI$b)8aI=%S%OnK4wFWo?kWzUhQZ#)i&llI+D0A}i!eRiL<^9C0NzPF
zjl&Se_z4`u_yQ!ypa_(Bisyp+gCH8uNEZ@hi?6>eLDuDTvA<E6u}~TzpGd+`TqK03
zqi9f`EsJV=^|3lVd65|Q4u-ouHZUQCs5T9%F`5%Po>=O19Vtt6pkOQ4O=n)DfEKVW
z65B+%Rl>&ewv<!L&Akc1>nPf9DkF4(9X%Z1%@^}9(8XWAB<m7CESP1h4+*uh7`pge
zDUEq1sbo-VlGgktAYsWX0)Kh589X3Y8HOEovJYt7e`Y&x9q@=#-hBy|K96gE-za4;
zjV>chr=L?vnpRxGG;&kUp7>Xp9_B~k!$qR!&n>@kB@)#OXSCbRjeK4pWFv=?fX7F<
zv3ldMUasb1y&;Y3dCK;}G1`b!X^0b<nM|o$76|)v4D?~?+jEo(%TS5yPBMNpKBN-D
z^`tfG<MoDqE$mxeqVvavg$+Rwl)}%_FpF`PuWkCNsU-HcRAd5suFfqwdOBO(^9wC{
ziNl@Un~roku1f_Y*r~QdQGz8g>$+P$k-@$kj_dKPahj#H)?d^X!caWwO|Mw#cBF5g
zek+Aooj8)(Q;_VSTRYKlZ$g6?fDExhbs*b#&HjSKzWhg%mN%%GG@{7g5LAH@=}^S8
zWB;RB=VO_A7yz}H-6llHgWQO|{p1-&5U1ierFq{m0~plL?L*)w@yQNC_aSx({hr^2
ztb{ob{?z_BGuxwa;c5&_8Q7$=tBQL<B0(V2^g>oj0ChY!y}QF&j3b5n64ccu4R8=x
z6b+%DwV0?n#9Ad+3M24pqi`TDiN@)I1d}|U+Rq~(DL_J&k({K4)Fi)2FsCr~y&xC1
zPkU;U4kDj=-H_>I+suC~#D~2<$w-8Io52Z1j$jqVRuIa<dA#9?Ok)~HJXX(HRU#I`
z?`y?YX&R*SNrnIJL_mhuiFLUxih?;%QRkA@<b^siA-GZvx)72;a%v2<4yDbAJD2ps
zlGgn&&wv$w&Sqs07DC3wVG0t~^(&wRT^NIskza#(JuHsHs-U(a@75`yT--T4-2MYd
zA3vyCW=eW7%8Qv<nM9;GiHY9@HXT4o$!#_2(|bIdj35qph<;L_ygOHw-3wWVTEt+o
zmS`QC<qu*anCNsQyb;0q$`GRAFm_Nh(B4qec@dzP7B-sw@@@S-Wsr?_zr`|BbZzVU
zCv4?&Dh{c#t#~;XTdL)+u&@<-gDdrY8XUDwCgPohygaC0Zku6XJ0!J<*1Ge{o*DYU
zz*6v<@cl`ynvcbVDy6R{{OA1@=lPEA)`~*+yzsIacznKBpdi^mO6x1VJkX~|h)SdJ
z4n^-!DwIC8hT{^qsM%QNeM@+a1o&M@)}4s)IDFIGt|h!q(k=pAu38&##ZnO?kTaz1
zp}E^y-H<(mk>i)_U4G!HQLQuXm2P!WP`{mDlkFIathi>LZEbOA8QY#kSplg`B@UNO
zA$GenMz!Qx6=9?ZsUO2Jp{|moD3SC6NrEWmz*R+FUDh`}UYNb!j_)>Q=HHz{;$q;F
z?BaoQOR1m$yEByIrR(lBMlGRZ-XxL`eFH*g&z$F}mtZw^4ra<0ABo+GO`<ODFec``
zw@9LTggu-uX$gs;4Wab-PR+qm-px7vwyRwDl&h}zk&z?J#+olQK69>#YfA5HT++Ce
zX1!guAu);l8bhk;jeA*+*KgqZJg?}2_Ip_vsitecIA7#^^##q~)e_F+;2qu-=0on0
zs=r&WKm!2evHq{SzKXG_t+~s8?fPuvwXj}JLbS<W0laY`_>WC2!Ia;rC9ur%<kNJ7
zrIa}Ftl#2sL2oORpp-w6ZkhV!O>o3JQ+#sn9lHDh23!}DgOdY^QFuMihd1QYm{JO9
z8^l*IaK?xNwNM%F_{%DyT{KF`JATkbIaj?)N9iDF9V?e~?(s3)9}AlF%eKeJD*RRk
zh$Y2kh!B6vDm0XZm!_m%+gRVLU{LVMJU%j3P(7lDknN5M5d=mYM`Q?Tx>bsmTb|?1
zUQ}u*Zi;R2R`4L&^<O+MnWKD&iojmK#^~=%M}+ieRKS1Bh2;Mx7pfRrn*Uc!eAS0w
zGb)5)97?8eSH0pSens6a8UmooR@jT0$H;-GWg$Aaa6TIP`Q*erEy)s%V<gsBZkohT
zxk716;^t40Zjfy60-SPgZIIvVo>GpB9A$gw<aFKLT#-rOS!(Vu$wehWr#RNj-~7ny
zAA13N^2Ygn1`zhn(OF}VE7>PLW1U3_K^Lnu^xjNGajyNdOJ<vMJyv`MQP?+;6fXOg
zCL5WNwMoyg_c&afy4nL?Gj(KZe3o7>RPseFR75}N#Uz8=@_oZz44W0db?ixFFvyhG
zbz7u&;#D6~Q@rlnY$Shozy;1+n?DE>vs5HdbJjIugMDtbop)BW{SwT*5Jfjvw-h$j
zK$(!i_njDr@a&!WH~X>WXGk+?^jT&M-a{^j$rcK8&CBd#g6CelEVa9+k!i=t_b`=V
zi<u002)QYFqY<=E3(FR2q|%2Gn?M2DRDIls1u-t<-B5{B{o+WjVGC;H+2I-V&7bAn
z_u7@SALL&2mzX2gwT}vm1XbCxUL|gFr`~<zc?Aq)Szz8Tn5dc=i2rbEz--d)Juw5w
zrp6OzK30t{7F~IXhpp(AS%>N=)5+NM_=5aK^_s%u8kIKg6N#FaQzvVd!3$wAQqL<a
z-`$;?+y)JUKn2z7Hz6^*!>2zlT{c!RuO^<@e5vM^;cI@I?H$h4A?D;t8+abj0yZi_
zt@jTu)nLpEg4cMf8z^@#)-x+V@$jxyKJLtgXVlmC%>23`&dFS?0%IbT0e?*8I64Sc
zg!P>`>Hxzx9R)8ye$0al)X}~ust)@jNF6K1=+^-`d&4&-0lUaEZ8ag?31?9tLvVe>
zD8i6iPtq(*(yZ|goQQq6BhnAW@L=~8;7lxXa=?|}8$w?;G4+cnTuX4L1SX`;b;(*v
zx-<P4gtxgt?J}PxyP+y#YtJZGqc1>{%S3mO6Hs@SyRDKjMLX_vePSt2O@a!V!*mY`
zyc{Ydy<<DIk;<Ry@Vx;Rd+gcDIhLVCpiocdY<Hpv8SXqyPZj<#r#2!!1NvlI7F6n%
z>r~X6cG6y5jF51wlAiiph1!??lbFle2@S<XsdN?{OWzYKC2!;G^e2u#?G5t7BIH-F
z<P<{z0D2$&r$tEfZx*4ti<7yry}FCB%YUy$SFP8MAZ;S?^4HcMPrv@OuEN(-%V;2^
z7^(#!gHE>_WeF1E`jz${B{YBhGA-klrz4XvLq5$L5O}Jbd&4Aw&xnMQNMgY<V=U}z
z9)_On0SFTywLk=}23q!CA1)`)@LI{N2wg5YPl#P+9vSSq-`|e4N%1OlMaM&`q^S$j
zNFhK3@^Fo3z*)d!BVtbUW<YAxWEoeh)Y+sBG23MEhtFJ#0A6D~RQ<tz@T5WD1xo|H
z6}~vi6|0>#K=c>+Yqa(!&5y1q5NBLr9Do!gLsTE&v3WNrp!(^ob|2+^@KiFBFPn^E
zv4hdEV*fR<XjcqYb;b|M#Ln_~K6NmMV(M~Hx$4f6UyPl#6|b#p)0%YwCD3PlLbIIw
zT(0Agk7V!6;8lKhnO=HEwSu8rIkuFMdz+g3Hc7d`oSR0z_(~;6Kxg~q`AbaLZr<E1
z(_!q~WyGi#Y@z&2vhWJC@0*K#x&Uy3iOk;PT&PLdaGeOV9WSXQ^0DT+hKZjSCf`Nu
zepW_~?K_(S9GF;T{F_{@t&QlOXHFqP?_QUAu^-u`bjZ{j=&ezh;k9d%EM1>^o%YPH
zIKT|@M-jDZ2h*QI)t1FpC|Xp?HDm@iH?k{B%AG3M_;2lM3+`3rS+ezU#SLHEjXE(n
zri{2$yBRRVF0{@ar}Jm!a%DW3hT93F9S~+USd$zyS~J>BKo(!-^NYz(EV!Wd0j~}|
zEHiXi&s^^O;y-{R(D`q1XS|U(Xh*FjFpXi|Zkg{EegM1STs}yS07udhf3um`RWIC>
z9EmpI0WpGKaj^lp8KoIhQ0X!b$Mz-B{uXhxCJO<>?QBubRGDIU&Bb<r;nPiKVK|>(
zvp&IC>$X9<RjVS*d@aa(fwHvqEIGb54b!0XnrfzBEr0j*no{$5Ynw(Ho1^ntFr3Pu
ze*4oig#_B&mrcJb1{*Jh8miChyJStPL+s_d*s<SFgj<rETHWOYa(S8xO22cdj*b{~
zaA}*4v3%Z2gGDtn{=~8xYp{aqQurRd$#7+0d0FZ)cFXeI)DaBx9bM6pd6#0*F+DK2
zM*p=}Ikb<%BC>0gsyDopZj*``ViZonQ(R!CD|_AUuyQnl(&^Kaihk=6zM+E>x^Y#*
z5qou7!jWdFMwQAv4t~EAy)NpNc{Ukmc{f+EnfSF^WQsrZ)VAP0a&{Xv>xb{mKFEa3
z)bLr(t9(a<a~a4XmD)j1{F>q;bHYTIG+saNnQSn&Drw$P|5r2S%3?(>BALF>vp#*g
z;9l0^1^5ly(I;T#G|+d2<-9lPGh-@5m-u@dILm)8e;Bs;qt^WO$ctn*xK5!s)j)`G
z3<oHklM_+uzsY0&9mt=(vz2pxro6$oQ9+|znL#^cHperBpKUxo_N2&gKN|tquFk(^
z0{DCL47BkkJ@3oM($3SdljoV+5>)ztvwO<v;M@vncg8(-5kSaOOd5IOo3A@iAmPv$
z@g~kkd#Gya_Sb8Og5O$}>gIIsp4+#wA{RA^soW}07td<>u&Be%b9(iXplZc7gqJ4?
zW>MKaekCq-ODT0t(x7-jg;R<en!0ZmC||0%n(AzSknVx5z&=L?qdh0l)n`avQ}E(A
zf$>!E=@(O|W(?`f`VQ<1Q?<)o-QkvH3ulU<yT#&QDts~N$x=~RBKd1jpW6xR5m9&}
z^H!rZ!LN&^W-pnHM?Ze~@r|Q?&h2tuea3n}YRp{%;rCAM{pl+;{=}K1y0L_Miu)0K
ztOAaW#y;C3JgmWr*s-rdj{MA^dRz=~`KWl?1MOpCjMm57NY+yEod-tMMEBE%h?%0L
zw5zmic^qnO;~cNd7Qtyu7vlNtSuw=5kzdiH;VW#_<7`@^T8hhW&!$1D&myQz7Z6`X
z-((t}G4-V^KUz;zdVj*qm?vUk93zg9BFk}O9mEml8pIJ2iw+jCAFNcOHvJZXvx$!~
zKq(lIC_zIxNxxelRaRIfT@9^tmaCI0_y%X{p%4vqi!^H)h{Ym#Nk_lpyS{kmsw`LZ
z+(<NEqwC~VsRbU-vzokZ;!wz?^bZCp1G;Ehb*+BSBF89QtJXyQ!oYyL_HsKgw}Fz4
zQ`?o?cD0cavG;N7B->Zkh49LWysbA3QD(XO5?VTJCI<al)*{-B>V!pxxk(sN8u1{i
z)pS8DyN*6yPCmaa(okl6aMnr`G%9;M3S*_l4-yg_MNixF5g$*#441p>YVt|XN8Hjw
z>_rL4I&G27JtBD(D;UdYb8uDSRP>Xy;yGgD4Tap+MG^G$#Qt++gBZJ)u0EDNXY+Ca
zb`O<|=VOupj-ogk%w<f$&-ClY45rbW2EK&y9$nsMTvfwogOm{W-d2KmO6mpc$LnGK
zV&M*x{I<mr+Vo(5O0$U@lkfVYmM57QriEusnqQHcUf{_x>`+NxQR2s+^GOql!&igp
z{S{&=rg(C7paMh(l11V`yyV{LP4mtVMS1EX(YAApnp%PM6|5+1*GdD<O>I037R?5I
z5g7Mds}b1dGh3iJ#u*FRpX8Q3%942wg=aX9bG7)s`^hN=y{+QR6;eMUpRL45*%Y2B
z%fc6L`ngsxtqfnB)^=m6-@6;@vSHCrf7ghJ>0H_v@iTm~QKh_=>ZuZDoL-t5oga!a
z@<g+r6M0)p*uVFT&}N1JP07lc1_zdHKXbwFJMT}|bQQaih=vC{b3kTF1(#=-Z?+12
z%RJ}ssq$VSn0l3SFN-(m4L_QAcSvxl*3EL4T5vbEuZ|t3jd&C|`28}*(=pXhR=Qc_
zbdK#?UWiR@@^%Sz%L@J82=8rY7a9fsdv>>CoYNd+g(FF@*XQbjcc!~N&ZzTGNC8;e
z5UaF-3Erm%N6>qeha#p_hs4nBH^Uc?^Ph?s>VH?nc*0EoC}Ao!<Q;w!Yj;}*@DM@X
z#MzHo1tAG8OSAM0VOwYgn|K(qG#Jb#Jqr7^iM$`d-pHqq_?J&G->PKf$t`%OGsEyS
z&;n=Cyi<-*uJA&f4@aAAlIc@?s8+;|oR4l!j+A4O^!vS#``+`bC`b&tP(VClhOiRx
z6X(*}<GamA>v-X2*+Y_<qQq(KLmO-i4m__+oI=-Mo42{+OMT-z&JMh!FCm(9r~j10
zA<L=jm%sZ(6gbVDrP1W>PT!xN-8EO?O@x2>z0$2?)Wm7T8EoKOf8fmqJQ<TIq#Ulz
zApEfDIY*CGnFJDeEV5aocaA9%qg&}1GrmQ)vst-U*#V*(b(m|ql?D!PTu(4<Cd-7@
z*>1j`uzwu)eNy1EOfy!))hW&OpxmO5vHZuz(CWe<f|lG{{FOi{=^6`T!ld@uP5JDJ
z?nf4c-*l?f4S?%}dt8=Ol({aV-eag=aGF7hXNbm>HYz&MoPZhuA+RJRGv^*O3#}A4
zu}&T$FQ3!-`F@B|(9$HNu)bO1Ry4;s%cA43ZOPUKeml*!-+HcVZ0`&Q|C*54J4iX2
z;$4T;?>3IaWY_~QHipl{oktiYMno?iGYsuo+2o4Q(?g^%j=att;U7YWxhr)g)_AqP
zoesCFe>Z;%<HQZ`S4Y0LVhyr{WMf`KKfQ#AGc=Dn6Z`02F*4!Xhwgw2Vjwg?(ne~@
zI{&ct6I?lxGJDZT*AL4ifpiK++%AIBf%82zh3qbc1mv0Fl;l2`*eoXw`_D*MRuekj
zgpiITS0QQ_llC!$A)`cteo{+C4KiU#s3^(a?=9)KunG{YHLC>CX4C^(p%aAOyRi%Q
zk;8&?#jGS1iwiK^r!1^1V7nmQ<cO#mvT&Z|U<P-oK(g?%Jy(bTlVgH^Aq>C2Yul+M
zIyX5%j<qGWi;XY&8Yz8x)vIn`_A8PdO_>sxrig?RlWuN7NM2%{AA0$cV?snJD+~QP
zuIYz-b3s}a!>1fndG{$aufht;lH1_^n-{@C>|ce_b=dVzf;UQel->Z~hQ-`Uvh^DB
z1g^~V>Ele7R*$sE;L|7&n}zm5`INipU(4&y?d8{}ky8syOD}t$e0;@Lc}x5r=LD5+
z06`fNaBBS&`?6q0jF}Spy&{|Vx^+i>uc3k@Bz-^cd9Qj%RQqczjM4qIfrdLku~e@~
zQl&@0NOZ{n6PSh|+G>DFgogN;7gt%H2f8L6<73kh_oMq)(#$De{F+QC^TMIygAv8+
zU2jJc{eyOW=Do5-Cc<OFjaXJ}MX24z=&?@^uL|FW3WDg9S)+@I^lZ>0lae?-@wg~s
zo;DzOPFbDbWEAHuMk9*>LJe<e2u1DzUnDR1v1<~SaY#g){cmC`)zpN%9+P-;_|y7a
zlPQ4+CiqH@c8_U`C69hhGrIhIX_z42;epbB4PD=r%C64#py;%?L4Vkil7LrFWKaQs
zdGv=Z2??1H@Xu<+|40!JYQ;a>Kjeo8?c(pQf9eMhTE$-`_PhHJ*FThtKM@{uhCjKe
z2c6+B>-*jPPpZS;k^baw{u!y|_hItyNPjX}e<D5bJ%1iTANZcXY~pwL{uSwe*q^`S
z{Fw(Hj;w!~2Ijxw{L2CM?{I(q!-wSYmy!LB{okjh{?DmIMIP;U6aWD9-|hT2!&O20
HaQFWJPB-^O

diff --git a/jars/jorbis-0.0.15.jar b/jars/jorbis-0.0.15.jar
deleted file mode 100644
index 4cf51f90e043ca8b5bcda014da1ebc9f25b22ce8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 58917
zcma&OW3cAj)&<(VZQHhO+qP|+z4dInw{6?DZQC|_^Y;6Fr>^Rpb8k{BKa#a78M9Jj
zj)_D;8W;rS2gKj~%&m&)$Nz1E`~mVqR#ZihR#Hxk{%icl58xjP(%=yP%mDh=G==}T
z80GJb|8uddpq!+bsIm&3tk{F><b;egE!`ZfG%eNi<V=GS!y@zUkrSPiERCe>oNGA<
zWa=p<g#}2;G3Bcn8Tt{rI$BEMF&eeUG3kZnz0;l3&;NM}5aYlok-zu&XZ&AJvGxCg
zK=k*jvAr$5m9dkdnG3y@y_1opGrgdVjlHq3g`uS#ow1Ffv$L<<1l&(SgvvVlWu#0|
z97hIx0g`(4@Qn9MjY*TK(e$t#rv#4IANZtRxVSF!s#$WXu07ka<i9A_8F^TUNf5PQ
zw#SlSx{}b)`=AY<eX`DU+A)Ld?<<TkDhqj?Xr=3%bvBrk&AVx!s274104{qvm`7;8
zS+VR#lh<vtb7R1SzjKoE9=uV77f-nnfcSt^P>G047Jp0PEG&{%v-KUqxxJ6y{`|-I
z&?RPzC4WKf|5w<!{}#5;U)0wBLad_gj;xCEB}bNcR!AH&->4DQNRe8&D$th?R)JOt
zqD_e=7==Z)Ajx%QLPnBkbXWc4w^Gs#N$<M{s;<0zKQE5=LHh;fc#~FEvA$c$y3;b#
zo#p#{$?X5}Gy(R@@B>2}3mGa~J-*)(^bbdV>h2IG09{4KD8iMVDf8&4F~Zp++z_zG
zgRN)Q+PfTy^BfT&?V&3Av*zyJ6~K-Wf#aA~G(mI56ew<_8m<Z^-GF0XuVPl#&oFXE
zgZiMc>wC!|sR|kcq%Kg7soF1O7&u#%1oA9{Wyi{GzxY(2lI2dFbm`Hc!*;<L5az2W
zaCk-<!vVqw#h#@ZV6l|N3W~Bon_}BVgiy2ST4I^O+9LR64#I_XoK$><afqr}7zX~;
zCEsPjT3>?Igem_bvo2k=D%+q@&jY2-ThUHAGSPgoJRmB*WfN?48GNL%o!Z;I_)RLO
zpQ|PR)+EL$Ai!p$T(fYdY{`|juHn?l*<h$R-c@E>mAV`ax-e1nfHka8kcdLYV!}W&
zyU}fp1-GXN8+!l=s?M?)zcec#8#FRIm>*bywLO>su(t7z+_UX0*wgJS+4I%I6IJU2
z$Ko3lhe~GknH(R08GsSTz#Aw9$YaDX`;506!{qEa!xGc@_T7@w_v{DjTfc(sI6dF6
z_{8FayfwerZn{N-24p?F<!3j!mL%|Mr?bP(*rPYqe{WY6>z&8g(JNAyDV{I2AEgP7
z9CYI}^VVC~W^nS$Z&P-(vH8OC1qhf=p+}H*^%1LLoLIuxI$4e}2mP5f50Xt%G33d4
z;pe9gSMvPY#pP-3gLrDD4}>zyF_Nvha8XYP@kZemm1}FJU29armfD=%1-O7LaWw|m
zpluPsx7gchthByL1WYg=yNoc}^2w;ypmr5u=`$l)Cksm^Y`AAwa1AdO>%#IzE&u^v
zQSI!@4&Bhne7z_qs?}wRHcZ>%*}1oU5RTcx%bYMu_~)~H7Pp@kS?_<>p9;Oo3|u_y
z#l;5mAl=W!#fHcbUq9T%oyq<AFtL~k@gX`a@re<dRrO83#pG8L3ihCI#wH^EjFEs=
zI#w5<-vVq3(J(ItGBpBXPzRZ<!>WY4j>wTco^wdHeg`IkY-c<>X2M*7hl4uun<`xA
zhFV&Wx4JM#afX}(VmRV484Z>IpG;G_6$!C;-4wWwaJ6fo>W)mKj>cznLio7HThU<t
z8CxOKKApzV8nCN(jjhZp2>}TYN5vVn8E%>F5WOa@i_Pz#&@xIK<XU%<hkjvxc`>M2
z6G}J&*Ipet1Lrt#fDRg*2cvx6>4jsvgx8{q7E@;&8y0angiAt^z#a@@|Jb(}i`+3{
zuE2;BJ5s%b%0hBFX*1O%F=^KCc|UPdA<55td)v|$fw$${8W<?JpW%p$6K4{nhkFCK
z@*ufj_yhk#KySa<EZ9JP{HOu{Z@f$XZwcssDA&@?T-3wR*1^W~|D+;y?0={TVv+=|
zIXJLcG_!n3fkN@3s!#<q9OO(?Sy8Gfi-g>;UuS<ZPoT@X>jM<ucONsEy3%yzehS?`
zyhmuu8;L-GM3dS(r>m#orG=i{|MTG;|Hts1GZMO^<N!5fXT(ZE*q$q_{q3F;67p#M
z5fnZ-tBx#DxHQ+c$saWDZ8KY`5ta$}*Z!y&9Pe$@iOQJH7*5=qI!nC~R@@cWO^IEy
z?UlQq6M-?>m!AqFKohYpK9f%Iz?;i;gNiq&uOcHQHa!)4*<jMSClOa`=j8(GUM7MB
zd{-%?kSq1P0ez42K2z=XrZ^K7W>8eMT~=-;eYp|LK*FRuQ;Sjos)}jp_$XHl4G7_x
zR}!$Iz@)!1rGLJ^3`|z0nCPx`o970W15AP0tiaTEF&q?&8bh7ss??~M5I7QF&MU@g
z)~Qqi8g&{Dy(3b`>n(eO>~mvgG>9*2&t6qKOgL?C6_Pm|xo|Mq5riC%RRg#0mwxJO
z)v-}jmD#AvDV)A*9F$%FLB{NPA2CoGp#45ds>-!lN33F{X5rOG6spz`6_0_=oLLhr
z<zlGoiokD0Ye<v8TI~f6XbAr{wSjuXYb8dICSmch+lBU#9LVq$VCgYpHBC;Yok^4%
zH3X8Dy!VN=w*aFa@{&LV&QS8Guu}v}1nV|k5g-yAs03$%DNBiYEVoL7{)XFe-h&5a
zX=u$ek!Z$mH5FSdPzwSPvDg*=AaS@pm6M@g2rkWFzDU+~w?LP>j(riU69dI#KxGpm
z)h&-jcgSt?Yt9KL(+^8eC{iop=1MNU?;O-+f>^)VF2r5$+1Tlmd0P5&=rH~GVHl_x
zQ+_ke>P6jhwxUmZ&a2i%*Hz!E(LSKfX=GK+G&h@$3|C;`Nk{1qqowY*K;%H>i;}`C
z;(b#FMdB&uj%v@*Wi6F(pwo7cs#-L@P~F6Vn?=D5$-cTKtm$!KL0L-W>yAljV~v|Z
zGiuJFUe^}>*a&1@m34x1lEV!!cV}TLk9(DSucrRPu$ksGkrNWm_*QW&PxE#%EwC#(
z|0V&Iu!ZhM&`cx%M89`bti377?n`Jk^g%p`)-p$G#2q$c-{0CCom~gkSTzUss2{f@
zwvU()$?ZX7$}%gxJc7*;&n4*v><e4C{^JuSjMbq$AYgG9&j|SwM2dF~q$HbUjkPVD
zUpy3x!?)||3$vXGrDx=B#w|krbvv?Wj}i=q{i#Hgos*t(=E?Q*s&+3ec~6rIC;VP#
z!m~TzM4A5bSh9ssOe?H32HIO@m4yqDeD{pQ_0&)X#*y3a^W`4xi4}k>;iw+){Xdc|
zFP~xY82HBz$^S|n1pl5o>`hFC?Ct+0UzXIh9h6s4w^rKib-~e{7{r(`kiuxk>Lmmf
zJwpV5T(K_OXFGF;>PdRyOyf+Am4qZK3gxlpSqkGY5M(RRcqp@sLM1KUmPl;7xvs>`
z-cn8Grypy2vfRkd*H82y69dQWS-Vf#^v!RYUO2zD#A|vaMHJgD7O>8lDNL1dpEOYl
zSlBV`-e@afS6L*4*@_1`n{zT~<i%UZ9GS<h!D*lt1j(i!ETS@i<VV`lcFzdy$TUw4
z?Xqi6sa=9I$lEx_r_^b=#N-_xSU<O4B)>e|!ZIY)o?X?{O#IeN)~-uD4>0Yz4QJVH
zEzS<cS~PZAJRfm`x~*p&LwwHi5JP^;g+$3z$Kj7h873=P90`}r#mDTa@U7{eV&F}^
zz(%`XQjtIlm)RDaO)k&PePW~3lO?R($+%fm<|=GuUqPi&+NhnxoynVfnCcVej8QE5
z0H?i32fh!J6UzO}=ys%FS6PJ_(AvOLlQ6Z_m^xH)La@2&)En&;7+Jpi`jYVz)+S##
zdMNk<8Pd4SyRoq;%t)-3+~jt>#)n^X7T^DKLfc+$eQj(o#=ADW&UegZ-L$pLFrn{Z
zFj!hYBia;dCD=2ATI)q%{bS!HMKn*~qSL%Qy-Z=ElT0elN*_R6!c00tn=KvNAKyu#
z-lW2oI2e(h?AW|k^RWVWedqLeFK@20>S7Jk$mdPi%vp1{V9CKtjK~e`TOdfO5uUwY
zZq_!Cz#Wf)%e4-vg0n65cD&cd+?(Z!;BE|G=6?KZT=5H7ujM@C$4uc4ix%M*h5o#b
zvjw;<ac$f;BHl{{cHiwh*v7fMn}^|t-!7-%lV3pW<Y%Ixei9`(TvH1vt)6McI9$T!
zuv{k!;iB2*)A)`LP!}I{!u*E)Ozg4q#&A_fT{-hJIB!f>&Zmfc3I=%S9E~a6hqIt&
z7e$3a(%&hqUUsb>9Gvl&qh!v&xLdvhX(%Ji8Dp?0U|S@5KE|CtKtk_@LtsuY1BX1d
zB%Y6EO^Y<}&91f35>34NVIfW%eaO=Eh#N9~y648lw&5;k;y8c~de(I-7UGY3j$ArP
zx|2bd35sm#V+^{?9&{pJT4i>SnkG3ukrxC5f)2)X`c#3*+kk)b6D%iaU$6c?h(G)p
za{U&3TyPzr#R*Y%z&XbEC<4G;9!6bC!O1B^Q@LcN_yFVkrJx67-Gw)s#EU@X{X^sV
z2iZE880(wpYaC4BELzkx3BH(!v`|evl2_0<o_Dklb0Gi=O{d9R;yuKBhGCgEhE1tY
zco7Fumy8!dv_g-J7$J+afi3%awR!FnZ-Z;T7vfn#Ba75J(cU=?Ei|Lg5Pa?xJj2_V
zS2U-e`b+5uzpp$D+@gbgA1`cnHq_U#Nk*DT$n^TxAsSUfMT8FU_l|JDv!+wIklU;|
zFX4niNQ|E$#U_n`q^}M%B&||`ZJwOhY(W-KQS=w5x)oYsiln!)#mN{v*%^WUCdC3S
zAw>smHFVcCj-~5@3>i$G^g??iATV65`~!2ayH&L~nBFegQj~+DQqS=DI{HqKBoPx;
z%)YXw#Dc2dB)f;Hg|u<Il@#X1rsqyI_NlGBY}_%`D$hSc5^GZ3B89#>$uh$_l@Mly
zL4D9*^Ks~j3DoeH+9Jx#4~oUe_WpC-1?eRCV6sJ}BP&fyV^1juJWrnXUbWAShUv#)
z{9SMGote9=!55P5#zs7h?lQ=4bL@FVd|wUdDPdL=UZ`2EP9oxZ)9o-8)gyiKF0`1Q
zw!K$Z*$KJx`^LkcKfrx^=<UEW8fYrX7Ypm@q&2eXCYFv;a&4iZJ1nT(p|`lBc0#gi
zGiKsJ8E0wpF3!ISW(~FNotstK6c%D5XBPZ1L<16?2U{Q?q1*efQpyaI`B2qE-jG<0
zn-xmuWIH<{f;8KC!yci~iU%4<=vwEEP(Nm!1ta#L_qAaGLw%>kOtihFiZKqqcU6vB
z44x-X^XNUyK0xhC#lPQUO$%praC_1VhzQ^X9;0NWNe-nvc3gCCis`ruLwybMy9cMr
zslQZ;gGP;8OJyp0jn(&d9W|MPXhl~i%{uJpRksIpuZ>T*=`tP|+5GKoT1!sVg9mJ4
zZdX=)glh0m?GfmY<a62n%%N|UcN9)sWh__x&`Nwmi~gy^kxo-%<rOF2Dx92CT+3iA
zo2yGzxjL2tsi8S~tksF8u#ow}6&n<^$p%fmj=fTZA9!YMm-;l`HCtc~k)3VlA35Ex
z;V&d!nhZ&c#m=BH4cu^E1CIT4a6b#yF&4xr_Brx%WEHmMEoMiK_8t7WM2^JeY-ty#
z<O}KE&if9ARbWBNg32Lb$=E5B8*yFbh`?KcT4rU))jv>}wyU<vsvGn{m}W{96HYIW
z8#zpBOY@$6JsONBnD3|1Zukuce=Wgh$X&V8(UbLDpY<&8zUa+02R0PA<Id31ab&{2
z=YGZNCnyhr8?gb?r#irTth7CKb~g<V1%w1&h@cVchr5bkhaDZ~ZF(&h?KgDESS-Q2
z_xNG%4z_ip6J1=8v%^P>LIr?d$s2LeTa5C0$^PMBVPpMQM`EN`DF5F21`x_cSDjlP
zv@64M4g*$`Siu~|wX_8Vo{+v)dFM`P*ZG-8=Cem&b1&#+a8n*b4{Lvl<r7TR{#P|-
z@K4e_S1@!Vi{y1Pi=QirEo1#OD(qKDc!~He*^S@1x3!wzHX4pg+nB9Z?qlHnDiE%K
zpALZRXa=yoZb0&b3cPg_afyU7T@$qG>6Xxe6GkiqaXB6@C<^8|XL)R?cY&2Xdte~!
zN7-2^SNIuG)REj=DTHzPef4Zy)dxfzPz=N;4(*AdPR;}cwdDX556~essX}?-p>OT9
z>^zf`qB?n-LDPVmA&z1!p0o3GuQIV#xlfoY#)QUf@2A~6=}gtDeQyPXd;yrVD97c-
zD_F=~LgeM4_&SyCZTaUb4DEF~x3x}<7v!#6MUBF{SCyo92JQjkw1Ud;pTSKTel^kU
z7%~hLR5F<(?qe3vbw?WlcwI$Bpe>%G0?>4owmk=W_d}u0xSCAs`nLN{FWFPeL&lzb
zsN41&P7eylqvNfx#(OANj5AEDu-$IPnM6!RMnz9HO!JoqYTLXO`UJNdH|uyBaoT>B
z5Z>_G72zP%qke;?iJ#YEh7CA?C{|TZ`PC9C|FBz8K>Z@_UgRW-Tg$r&vs6-KytLl<
z?oQRZ^MdG`(9ST^8ppfR(<q>*g!&uGBke{1pQx~(PlzfS^2ZN5r2iHb;{OL}XKQO}
z=kmYNV6=+1I<h*-7a4Qn1c#M?F?28*z3M1IUTLFK9cno%RDM26Ar=@05QHQQWU^i(
zx>ZfHmUlsuw5IQF2)Gt$Yxz-?8?Ao3+Ri)i8@SX<HZw@0rv;t&jq`N(%}r+L_eVWM
zE)>6o2$%0_I2~C@nv3=7FLl<0X%B^}J(~Q^t%Hy=!5RSTsmc6_D8F+gD|qT)DvTGy
zARNHcQBIgrOasf5@>(>|GvPDKobsp-<3WzhQf;!9<$3_LbJ!$s?4t7pOxm8wGjdFn
zp3d{G8U4oNt{VKtlYz1i8CSm0D|DEowLOF6b)7389PXNb$w?^?CBC+q6A@oJ<IW|N
zGokLVsHjL9sk0Krl6SfPBC_x|W`ojP_uy$Ms(d1OTZV3xJ6k@n8c#A_BXOMgO+>c$
zX2c7*5(x{;Q0V;oXnkkCaNvCAX-n80*;U%-Clb&R?Z9y>CLZHKor5<QD@yEAL$%iS
z*5IbF)?6cIVl8p3nV)v_BV|TmTE2yz)8ZCN8HX(2jCti^aPZY1qc3-A|4|7&S$EEn
zT((x`yTUbhIUz|;=pzKYYw0xLvs(uuG-!5HFtAD$-U><~N$kc+zjH^T#A$2CsK&}h
z+q~y!4YH?2^oDs{Ie+%#6In6hBr`@>JBP2RuCw4cNt;vbI`E<bM3L-)2d;C)f`Xq*
zT-zh2xbJh9ec)Vwvs_%y`Eo!cHeQ=Gr3xb>ufYz>r3JuOHXDTp2yo1tM19|_sG*-K
zBZ8fk2T*(qj+qUufitAPUExT<ksqZ^hsVVLUfebcDWc<6<!22g=}27>)?EFWr>ZQ<
za(_Ci51`$=P^!4952WF{=kHjteFt3i%<pMeIEUulWx7XTt)eYlbunF4oxR4PC5=<L
z*(*=u<2uo&oBUPlY`X^3@NGRUd1R3-BWaTEp}LhSxS1G}o5d_A&8SS}9!V2|S7xm+
zpy;3Cd9)G1dNyRpD9s_0zM+rc$j<T^18w1@A_T_TAO$u?kFh-oS${XbnnAJVbfLLx
zUZFnC^2Q!w2K=fEW|h<qdrmh#9L;iR-s*Bgx+F^vOTb=2(upjZ^e`KgBC{aG9X9hq
ztvGFZ7B~n`REaWI6qeW&t%vTg>@r_!PbL9k#;6F^%s{TT-8R@jj}u8He+z6NG7yHP
z6?lWJMb)3g1s@~De;1zT(INE2W0D@PC)?YcgNZASY^66b$)oF~RnhT@#!0GBID?h}
zTnngq`-PMwk*oltFeFl&ZudajmnImmalJGZkh}&*$Zw}9uW`cX)RjJNzARG$bP7j@
ziR^a}0isge7Y!CP%^~e!)V!G;&U8)m=(k949BUzj3+Ss_f4Db8w5(6@mR)ECN}QI_
zs)>~(ziF1u_t1y+y1Qc>;Ze`Y{FJuYgNXCyb(<mtMV@ltC>9_<P`<w`D~*?L*uATl
zs9bXI1E}B@kAPWoK^8L<j@BeKsbJ;kO_MaqmxRMO=GYYSH?8GI;~FSZCn#~;P^OXe
zII@tR83LgxHr3DDK~>Wa;C?SJQaV*}1w{}+HBan#K=*mC&JIx*g<`8~4JmyCu}#aC
zD+!=_FG%}KIZvycX*wJI)rq`=8;8D3s<O;^L@Mc#8OQr*&Xi8rkzZmRoEf5EqSwE?
z&;uwdp}|nbD_z`_;#*DdW*+DD=@eOK1J%f9Z7JA%%wYUA(K4`t*e&`sdG^v_K`|jf
zq=PDx4AA5O!7&(Zo%tB`@dBg9!Qn%`(Yb?ZSEy`FQUaQcyZyjY8Cfm@dkj~AQi5EC
z%%muPW{WP#wl*6|dUOXC^<Gk}3?ZM&+OXnztJcqLnuzEe#RSpWQk}!wAu&?=)sij~
zLnzoxeT_k1f*8xc?)oxe4u(Y-qsrtdG*3Zm=$;9%?l38N4D*z*=l6jp1$ivrq_kNg
zEHYlaOR3S$F%fQaTy4jAx^CZ;@~|p)iMiGqL@U!gXY<E}I}sOPk9XA89(#fpPX%7B
zeF(s;Jo1q)e3q1?Lgf6S-A-Pb8Ha4-ZZ-`z_WQ-gB;eW3qhP97S9fNSGgziW(h@e9
zE$wI0%k5U3fTdY0Zp-ZyPlp`QMp(oB(p?*P?VVk^k7^N*ZC>mBgp8=A=ng7cYcNGj
zmPkiQA?4S)KI;$@&3U5fNxIVZOP8CsJY>=BiA_o*=$8H;x8<fw=w}7?<HrE>e{)-e
z|JH4Zm>U1hNeH@n{IBDpjhTY$Q$Prrv8eDncegeU51G&-=^q}S9zK7jvJ|Fv4PU8G
z(D3*HPg>lfo9SadJ!x|M?(P30YObnJXhL*DG}OTI3|Xp!wa?6Z91)p9nvN^$F!jE)
zlNaJh6C>1X`pBU5Xq#yb9FK<uf;TBsv{1=&mPks8zcWHLx3y;!Z6m%@+A-ly(dL6f
z0n7LID{Ag!{oaq^6Bk9sN;KChgRR5C{lrPK4mf7%%sJ>s7US3d$>$cr{!ncE3-IRe
z_|J7T(*I(D|3@}AMD4;K#}w6%jJboGJI#!Kj3f)~N=0FTP1dSB$WE)bky2zKl7$Uc
zabe0V!KOWJ?b>d=kO+lRParNZB07W(Q8$i?ttvxmU4cG~D1RUHE^_A+`M3T7=Zzhm
zERl~V{mFgiL-xj`^@@J_PlZ^2D+_UVgir+dT=Ag4<-jf<cb3OI{$D>~soH@htY$s%
z7jqx{G=xEKC}9n^Ls>*T-C0%ct}RQ&(vxCu6Cmdkmf{9##ZJZ3+@ewtQ44I&IS%~d
zqc<nQ#4)ZR^m_{T`L=J=9RoSxOJD0Fz*RG05=Mo8`iK^U`mp}0v0M$bL)Aa|+#?9*
z>o2h{_4rL6TlPw}gRkxw!J4CRXM*s4N9*>wae3tq<RLZW{>LLd-1v+8i`6@NU&OEv
zviA0cgT;Jxr$lofQ*XNd<YaZoQ7y}0ox_`J`X)o+?(;`B>@GOcV(<yx6j>}cQlT0o
zmcBRO{Vg*pxW3v9^2=6|J*`7FP^V+>7l>)-igf+B0?(OLY4w#Ab`*Xzd*QyF|G<|H
z+1WFDU1~e+-*}vh%TfLZ|6=@zGm=%X%e?h!k_=~+ofn6=l$=l4P<Dz!+mB_Y1c&*y
z!jtn?L_LVz&KUdya-_*%_C<!&(ZP2o*dRTAO<Y&xcjr4C&n7oa`Cloms?u%m`=27!
zdUA3&ZcfseY1t;tc}rIh$?XIf+?{!ZBcw&F6Q0}+X9?h}6KPYF^p2_e-}x~)`*^tM
z3}pvIa9|FSBQpxKj3E<Te$$63477#~5E)AsoSG9)PHH?^Zu^+jCz`x5sP0u=pPy>-
zOev`HH7BLKH3v}DOng757{r97$qr0u5>AVvG=0Zp*vyM4agtZuiGM9&&kR8xnd&4u
zOhj8{?watJ!p?4u#qo_qoA?LlOVw_GC#)4|IP)nd9hLs71SWz|^J!&2L#35$^$blJ
zgDG)VTPCdA_AqNS$=$Bk5*y9mkXL%5wWH_W5O)=Uzj<JS%hKIb=SfNzrn53zxp+nO
zqb2NY)Zo0YQ7BKD&yc27$YY)HmUrOt3sQIeKm&h$<UU8IW<+q;C07;iToFjpcUy79
z?HRd1dPHLvoSL_OiW&}k2gfPITX6A7ZrbU^=Om<8(sy;eN~m?cUP9T)Ghv&!+5M#u
zhYqw#0+jMsFM>Uxobm6a$M7G>;^K0Y9?*LTj_BV-#Pm3}ec;-ky@H#6*;ZG!II0HP
zmz;2+^te(lmJM7tM-7I~Q=R}cuC6d$klL^Z*wd#tg&%eBfW<a+wCSzR$nsaJd2mh0
z6E!QFVmY9-lBnZILFRp=+oTmDt05O%n{2;({sag2qe>Io+VxU4RbgA4QsSJ7x}oz1
zrs`aobT?PDHBnqeF+f}(72aqJA1uQ;ym$-@GNiOBVzJ0pR+weMxJF%sJ4%7@S2#ih
z4P7HbSgQ*eRQHCNiEnNGN|ZJ0h+LXFf0nYRhb=007uIH#p>rjVNYGS_o_eS$dimqo
z*^2V3J;|vpO64+x?5i5(ooHgl(idHjlvu1F{UHJ-eW7V$NOIQy_s4B3IXaNS<jK6p
zRIJrq|88e%@MxeFJiH#<mMpbpWF5_-X*`mYbHbL6Nrwjd9;gr(BZ)~+lkVcYZoY=e
z2ysKVNQ4**&6`%sLP<wdcOMJLX`#~&8vpS}R&X#Km#9UG#fxobpi2P%^JCsO4xhdW
z^-KIZ*7{Ahh~~y{nz@0T@bxAIyPTlqM1ju>$%iW_NO7K<9AT?B7S`2~cX8fAH&wAr
zK_FaSsy&t=mx$4qrO25ACUF)O7Y3s%)>2k6S4g^sLh}Tqohx3w&4p_`0~EuRs%uIu
zS+Ok>t8o%RRnx=+h^pZ56jZ&Q8z%b_<`HOTO~JGZlt+&fnst;@Le?*SdVU$FIag2(
zs4-i!fG1F&-bZwY226@wG{LuB%wUac;RmN~AU+v^KrQY3bU)_aC|J_7Xwr5Y^+QL#
z*dWn&w^4}bc*{#hp>a+YbXu3gIgQ|~lNGGIdS}s6S!r39%*wbZsGZkKY$M<6uKqp>
zv#`Ghu|F6v^BEL@D@nc5ib%gsrg}+jVnR%~GsUwonfjw^>gBN|46&ZF0*NAB#m=&X
zfDJQYq{UWYrlMxLDGQqw!1$4DX$&gPdV*uoZtF^Q+c(EkVi$^j$;TZN-C-bx{H)(0
ziFBRrT|RC0g!Rh!A*(y+rhMeGwQL9`+w^NAsiKt_4QZ2FizYJ#Z%lfsXjVK5B2=w?
zDNMnlO)Ni$q_MNnj}O|35}H)8lUU^Q&ze6npJV#SEt)0_T5V9FKD)4!aivmoMbs%t
zv%COnzUS+i1vb$Qydnqqr4_S{%HjrVz3dUUff^QSv{-cA+ibFUMeW0_akFJ={JVLM
zC}&l38A3WHry!`7ob{O>Sh}H@dsgj~<ff$x_Hmh;qXHbJnMT)(N{8YVax5N)iF%F>
zEoKF*vClK5B6%PmpSKN?dwh&e0&`RVke2Kc1JtVuco(G!0Q%LX1lQNgP5JB1pM%J@
zWKZ2@YgS(0e{FWe;oTcmD;SzqiK?+JBHxQTZ&Ghtr`IlKI~#6#Sx;`O`-5A%6oP-D
z?@w#Sz2i?P*>tMK-cay6j_hE0FCi{!*<SK*b;Ts7{D;}M{*O{EYA{rU2#v>u_N;w>
z(XKG=NMY#j|4|N)P0ynze@i)wu>Vat;QV{#;AHl%fWJ!1I}S(O^JXo}cZSd2+uQuv
z5xz^Vo%f7pV_*<5IocFiFw9BPBa`H^Yst&iJ=v5Hw>}z|fT2z@ASh2FEK5bR#Ho|6
zRK;ivs(dgh7)rs^K~aFJ5bFC#VGO^zFaj#6@b!eQr>4W)O)Ww8tM>9N`>Xx^V&~;F
z`>VU_#_nrshjIA1-Y>an)tk9;%r81(K&6vDa{p81gNv14V94HN4e>ccg+^(_9`UN>
z?8?3Ll>il=Xg##-6#`XSgj;Hekt#;{PVpf|J+dYP+@96n4)5di$e-~Wk6<!LeKMzH
zwTsd%r!Q*30}h*}!O!jKF#HIa`URWD?Gi7@bS8_lsU1&=fyB}4^Rj>%EV3p?bBH8L
zvNH31_02CR?P3C7Uv)`SVaE58MllgwO}?gjCkC>igFkq?1MfUYwY|k>KOi(^=9$sq
zd6l<5bT}`aSEgz(T=|7QNVeYJt+v|>Id=+=&uwPUxSpBy2dc>}VL6e}p_BhF)T*@s
zkwJgNH(Id2@Avt);*DgG>KyiC><nHdyj_Bh>xhM(z5lIKLtljPrMR&jq@J9W9k0X0
z48Ztk_Avmtq%fO?ZG;QWx<N8hw$3tgs@4{bd+@q>wQ90y)y?YKfLpoJy3TaDVHJ|f
z&a6el27SY_PT#Oa^HO)RVYQ|n7;QtgQIqOf;STSdSE9?kmYdcMo!g*xJv<a|v&C)y
z^4`FAXI<FbyW->-7f2>3X*qd@{)W5B=k2hYxU1=1{+9|yJYQ|6oSnmdp0i1#a0h&z
zqumpW0{h-(l<BPijMz6pcqJjsIEy5qH3ZRxZhQ99lb!BOyelMpV?PXAYzvbWu&dDw
zd+HsM^7nJSZ@V|WbUg-b(}^h>Gd;rtsaKjX;)*;>tY;EwU>o!$8LvBj<V4%XGfTCB
zMt$AA)IHSk?_#|%Jwr2L=H5dS22cMmYw%(ux(qSj(4rR%^+k(MyK+j)`lNKD4@zcD
z;3xD0JFa6h+!j3dtNG7rW)sJ2pDY0OiQ?ehrhMyd<!&4746p~lZ+UlZQB<vUP>H8w
zMHXIjUVg+Qt3<vHS>-M~sayMK$y`H?iOtMsBlV<t?dXiyr++AJ(D~H+*IPoa{w(Y>
z^uiQO+LUefS%z*4!wj?;`p`D9-|#M`oxRQHyAP3L@QSQat&np!FTQ)sWX2|+Q+QDp
zxtw=+tM<=@?!O7={e4Xf!s}ze<-`L|%IUT1gk#Gnt)8Ca1KdoG6DPf~1MRh0XywG*
zlBoaC)a^bpQQa}AvmVu6GT_oIzTQhus!+sfiuoj+2UtPZkk2*AG+PhH+B`?^QJPV2
z-^ciZRd28JLalJy!`AqMGuxe(-~1K_9a|e-$ai3B1{BZ_SZH=NpkNZ}i^n^f<jks|
zL5~`+TLAM7B;C!Kd<6-%;h>hT2CYbsZT-t&SoPY3jejIUPtdqFwN7cr$!6TA`~<LR
z?lTu$oi~Ln|4;^%U}0<T{A~oWRK+-VWjNMcN%;5*(6-C=Fo47eJISrUnQ`4x>X(IE
zL;vuZq_=q+!Z>V^&E6fe%a3)vH}f}?MV67&(75nSt0P>2$;AYw=be$p)zd++1ky*a
zw1T<SB0`M7AYrOEU&Nt#8^e(2!q&cEN4kO|cN8mg8JkM;Rnoxwio3ExJjo+gn)EEI
z<oijC8sC|YJX0_U{_#aw3mGG5n#h3*!Qs2l%m4vc0P;*N95jXP>H{s3uSR}>qo;Z7
zM1x%3BkgQH@npOkP0&W8odY<??IY>|)I_u!B_5dq1Y1xvr{h)jg+B}wA>+_-m=xy-
zL+SEpBx`^V>4TS9{gBAz$6%xF`)Hwga(>9v>i6SOxo$ZDb@Y2I(+_&|(e@Ync`Dl@
zT2@pt=`uFjsbSVgELTOtwwe8^zZU7G8B;!(L@^wciTdY^ks54jk)ui!qjE4}!`o_{
zH5i4N&Y}pe8ltNrwuiEj&~3K4GV5)6p{3%LXN(u7M>HJgZXg1K-YwTHSy74=@qI#V
zh%kL^Mk<P|B{L%_)_jI%2+Sr*BJWl{9;en5NO1|?Z9uHKG0%mK4O}BT)q)+K!=yYP
z@J2#Og7ZLA(MVtDW<Ig)MKW#+(bi33N~$ZLOCRfu7`Fx7a%b}J&K{~n;jg5lIYC=c
z2qi<X$7(jxH(??BO?c@}2=qhLP&nbMupG!|I6641o5Jt(qFX`JvznnTt?7-l2Q$ZN
zc8BU4q>e+yi>u%CYb9N4fHhYBJuTRlgI4F5HF0BcWbJCH_iEkqj)zCpjFK9yHxA#P
zCvjW;?9e)X{;+lMKQ#*c;cxtk{6iY&isF8Wc*7r$EPUj`YJrg|yUs}=qCG~pQr5;7
z=8h>Dc7~&994AY3-Nc#QL_>rXYm|Bo$en<o0x(Bwzq#F^<Kg8DzrJ12(NAFWt*l<3
z?t(u&@9l^8=08&)CsQ4k&kFKZdB@3b1I8)UI*%iQGw|yR{OFD&F_MwYb^!1DC;-*k
z$~e9nih9@-{X)lsg5eQ~8vVgL*bG~nE(8KUCV@@-dj1rS9K|23#qozoi=05Jk%$tI
zpQqf=vCuTMKsNLs7CBG?*(6DB9<HEX>vNr>ddXoq@CwTwsQ6yLP=9Eo{Ne{ieS5;d
zc+t&RQRG5;?b;kxVslsE`tj=>gkU|Gb_ll(Tfh}Xb$<7o#colJ_|btE6Ki>w9&FcN
zKJa9Dc)5=79UAhrKl-P%L9C;ofUbD|cbNT%5BYNp&|<5e$~Zu--Hun_^PO<@{js?>
zIk$?jo7STQ6j?$uMwc2|1;$c=%JW$~g-|+?93j2EUp=KJfkSEgMHpj7ds}8Y18T)4
z)mNqUPZ9ty;3-|b+23zelB$W^U<76UZpTtw${1wd_j~nfN?^#fbQR!~mAnyGe-*0Z
z+G97WOK+yY`T-!!Vx6+pu^d9Nh`ITNCiU&hcpw`=Y0rIbTUw%Ruo<6w337J8s0Uuk
z)$((E*xX<veU+~GrxiTb!s05J!h%t33v4dVFRR{lS-XxZ1k@@|A3>Xed)XdL0V0=N
zxuErX?F6iRsHdZMQeg7Brn*1&eRoar6_VL{s9aqJGY8NH$`97V{b3UsgemwOt2%8=
z4~_!Em>5G(imn@@>JNisDp<i!K8C&G_khPL_C2t1^7Z(IJ8siw5{%(5CAn_U7sMEG
zM!Nu1+zK4=^XTI*7K2Z$*;#hDg<vkIbEWZj0)yydNGI`E>^5UuhoY&xeSnTR{<5O>
zn5IUddnapcv24ZJ!7p|Nw!kER46CES_OgjY@NrM5dJO&{LHMg(mP%@tW|4<s2wB;J
zcsapb8%uY@ChlKd1TXJ5_ng@`9i{{m4`S*-Qx9h9w!1tqWp3T!k%13rTS20{+U{Vw
z1)e_%F&MZ|_$F|bKvV=&gV^)J$?WrNK;Jm9&I>;0qeH%*Hz4VUe9(;U=_Df{qM@}Y
zXD%95vNv?A;*|w9;)vLie5wT8PPEEV+5}l7=L!xhNcJc0rH|gEa)SgZc5P8QK5vG0
z;U4VVI%3B3%+N9fKJ#tUy%9}XF-K&%UFPKAqM0F56MWgBAvBTiN<+fdxQ>c(pmL#i
zGqw7Bv#xD@^#n+=*b!knFgMMpTr$dhWa-Q&^G^>rqfdU>eKTg;@BN9lisi-RS=f|P
z+~pxq`;K6Rav`QxR6R~J*T_)2nVeF-CB5;xulGvoBY{0nztGuH<&vHJ3e$!}O(?kI
z+)tv-Dts9seyFYw#PVgThYM?E&^N#&Elz(Uh;C18jMDaVw6m*5cAyYSix`uc-8yqQ
z2GWD5VB#T7L>idFf0qm*_p~#9h~y!DG24`d(KL)9=i&)CpfJ1zp?T8}0EGuAKA9u-
zDXM%jY>_M&V5KOsZh4x-c}(!kxOkwkn+^`^da_U7y08lc%A4YdSYqOctr4jC*rKR?
zYcM8l>g{1h)FDQUGcd!)j_!_E3R~%vRi@_bh@cb`D^W+qc}LDI_fntjstyJ8Y0prP
zLwKUtMJkc3q7AXOccK$*4OzH{^N|`#_;#s;_J?7;jVa^}Iti1S7GN=TK$l-;rEmof
z)hk`c?YRR7ZT4NOfQ2U+#z`(hGD)Zvll<sQNP`=}1YJra)K(myh06a`+3FCUB!Z2v
zrhQ)0DnPhKs;1T_mu-}@-r0!#w{@BlIIr912J{TEP4gatQ4!UY3rgU7aLz7ifih)s
zwlx-s2&6P>fCXL`wQj^ItR(ys$!>bBT3fbPG&+k(zWyx5*pKvBe(=LeW+(@D-2jS<
zO%uf@WKy05i6H8W(o-RMKnr7-F={=($P}keMB#)YL5fwthO%}guHH*F-~uDiwj4~)
zH{0&dJmUO3HI{WdA+XLF3v#?2;+0)x{8&Y*e0)3Btj+=~mO{!yMf|l_V~3<%O3WRL
z(Pj<>wnde_9mw@vHp77v`KB@Uxwh#rC^|%h`xx;k9o6cm@M^WtiS9NnwJnHMHkoee
z;zX1htQcLJlJRyS*;t-3m06Bje4D5y#^#0@SUi~*_(7K;L1mUWc#pZbW-30YW@=9n
z%p?*YaHF4N_`a!AVJ9~sGh>*GQNV&tzp=`A35-GXu4*wkk)I-tq*@$P3UHa2>?rFo
zsnd)IDhaOO80`_UdM1MGJp&cE1Mz&Iddj|6j72X$uiR2EG6r>$;?neQ*h*ZoV33t*
zhV$dO>vpH&IO$YqBsUUd5-Y?MrL8857GKyD21t@j2`C9}H`aOD{4F@nV!7^2Z29g@
zT)g1*pJy~Q<p*UXS+~-ir{~Hgg_UYb=B%2u_;tM|jhJs+DuXw4bx@647?q-#Rg~!m
z#M29L+w1w$K<C0Tes=>lyTW~L?bI^;oq352-#8^xEQlr4E7O@R)F)Rl9a(pS<EEVI
zx?<a*CnVV`ca?h&Yhu1&CC|>KD|Nj5L2nCDq&F(zDTn?AUp&Pn78}hJuFQE2ybVTb
zrrvI2DVGb|c2c)I*Vi_!xa03UF$4JMw(Vw<@C(k4EmQ{xn87Nlvz0*zQp2fX_~?k!
z1TdJOgsP{7<EpR7V1z}ix6)m7e+=I`dZUnqaRCG%c?u**fX3neIIGcb)!N=BcOy|S
z5@|XkH_uOB1U!yBwCq#rZ6>Soj%J;MEv(w8Bh{h@VlvTdl}8sn$&qO`!&+dN?=a}5
zsI?&L^AuG!>#W0whb$#a^I3_n83;q2p!Z|#U&?%!4&oz{^2%}K%80N!zp?GKw>NH{
zE*QrpSd9I=6M@{@_A;d6+z7&aX<Y>tx#mbjo30c)(1-ESM-J`cHVp~f$WUJ0D6N%r
z=(nwVba;4VDJRuGu}D`xzz)}<!Zwa&-Ic@%0>W%bCl6c05UnVTw3Wn&&e>?Fm<hP9
z7RkoeeG<yYE{Nim6y`H%?X{;fk^`I7l69`xRKW_#m<eq4Y$YwV5!5d8O$O|;Y*t0b
z09)}U!l+ie_ba{0Qrv@E_i<Yh2Z=`RS@*ex!dfRh1Qtqw7b7imd<u9aHjlQZx+mVc
zse#b`jQ}t1^E9+VD<D8Y1A&|L@PbHRTeGk1B?9vgw$Nc1)@I<<sMLpM@LmMS7Q+ll
zNb4Se>tCNdvTxgi3+j?N&uYncCSOhyHtbSBGm5Q{H62Kysye1QP6e&R*ZnKuUB^t2
zB}D?w<WN6hDAfK^hiVG7IM~$AIhW046>n#DrKC--kQRqT2X34<YPqD$b%B+Ft`jz5
z1c-fkOt?+E37Nc<gr(VS+EGiM(;+ayF?=r1M4WQ&a1VAcoCH3Jq%QXRyH>g}w(JT+
zBDcQrhUEDatdmX}yAMz2&ji({CYiV<#MXg1VrU>utHo&zl4g!Lv&PCN#jWt_lV|<K
z38i!6VdcTS0_3W%>Zbz|MQLCdNT%z2)(8R#fS(_Sv<FMNy`&UZva~?<%ms^`&&mg8
z>P+_mdH6~4WhrGF&641I0Ll4QxKHs(xQ{!M<>Sdnr_UdODCtl73;0Tw@TDED&a!GZ
znb}w>4k?|rDYsx7cJOI&2HVoi*>Hs+8lakQnElaS%J(w^N!Pc#tcFj-AHfy<iF0vA
z7@#6_>`jxcCzv_OTw?MJ8eK0psW3j+ioVjQq+T2-<zhL(H{dqMAeEYW-{M^k-A?C5
zdBezPvSA5hs<rJDHP!$zC4C|htbZCjg~j?6w2W|Itz)`GSP}C8LOXr{)sip+x|WU(
zylBAcY22!giC=#lZJ19#{zg$}xqvxU*X05r|Djmm^80$eEw2{(#WYQtNR8*9*p;ZN
zah|kA8jgL3IuYhKij$|>r=x_@ac}}|_8?#JZ$%bz7x~u}Ht^K4FAwr3DL2Y&u6h%)
z7#h+9@#KUv;uOttBDw~bBEK|E)ORLo^~{M%6-ym6)K7QrZ}5N0jg<|id#8UpWFr24
z9`T=RZ3O>5W9ICj>|*Hhua72*)T~`p)KS0ejwd(MCPMB<NrNX*ETBn{r6kaB<8P@5
zn0_M=&{7tXwxzX6lBG?`n3EY;`GS|mTB%kRQ?a7pqT1v!AxsQd)io`>l{Z=WuQusS
z;D0&Lrts^~r3`o7@TN@$L;81GZ#DGzKJ&d_HsGIZuYAAnyZ)%SivfgiR1+NyygLdF
z9mw#P?JHB^DL9Tc{Lx*FHIKAk>*=uBl@S;yxx<_}_UByayoAK(i=43x&Ng{|pz6-u
zkHji>$Rs7l^bH@9XM8tB)i-QXg#9VLXDOzC)K<gz?kZN|;Q<J>zhxL6u*AzYO=9Nr
zLEbU?{jj(33RiGr6+C^<cA|0PeGU1C;ROeNrs1{~@X)$D03EY;^WYG_##102MaPU~
z{s=5a&(z*O@W7L~zsHGJUH@1fVGSiBeX?B(WEvW{wviAnvn*o*pL$0qZ3DUU3@3{R
z;lADTz0GUOt@YAkLpoF&8CXIwD=~|=-O$yPW#((v9|do2l=eF?f|wCB(oH-e2=+6+
zaV^pIRKB>wI1S*CPrg>!%bgmfwN+;$7C?=PSy)#P<d!4a%A6=$Jf$b?6rbm^E@gsx
zI$2b8sla6@D#^itGBd1nmzqRIjN0i{oy1`@lt^hkKDemT7h^^0?X_=4PaDy)pm|y)
zF`FwUVN(QY+4VPOMrl!!tgpNzvS(f<7FHt?0`u)cNtPRN)@Nhm2ye>vU`k7lVz)IV
zdBlk(%^xcO;d))`s~GhvCQmC?R(Er`yk?J0g>__}+n8P7vKOsK!PTEp;MvZSfr|?e
z5Kp79D>$_!<vfFmDGUTPh4p-+VYVvb<oivqw1)*<8qUHth*Wn;CM96I^|QWts`)r(
zD6xwKwP}xw3dY_xHJj^MueKe?|4OEfcM$s61c1E87ipEZFjteNn6qS0NSbpji+K@4
zP7GW(2=i`lT4w8Ty@*tveu&_?TXA&j9$eCvQY<j*N$fZwbAi#1hzlIH5S2xX%lNpE
zhgs2DeGuv)Il_0Ten*VUFBTaCZ=fNLt!1%r2B}bcYeue}A72@h;wU@<euuohtB6~3
z`!>XUqB%l<#HBYR@7f7iamCrK@*f`f^bi;^6wBgC<!O9~6OkI3xdTM#pT3gLd_b|Q
zd}xi>-xkO0)W6bx#B6!Uj09EAMu){v5K(O}-+6xs4&l4H)D0Si50!>0!WZa?bw#~l
zJTZEC0D^303fJq+lBKMtReozt+Tf$=0g$PzT2^f7u^Fm?$H7xLU($4e(pC$Sx1J13
z#LA>L>-AZRvnZKumHf9ft36laH3~~Z%p9ZL#Hzw{-zO%LmK#~!lttbqMfxKivM)Ce
zvrVy+;pc>;rc4W%DT{`2Sd_~&@>A?3n3vLU<>pLwk5Rb+Nb$*%syRA~ZR&mVP95l$
z?A+&x(@^bAU?@0r?#E-9tUKpC>^oepM|Ao5+ZNc<CRKu8I)w|z4kT$<Y6z8Go{FuL
zzq8KDF}d(3PJ^1`_++GOA-E9%fx3gLyL|iZ1x39#gxyWS;Lk`i@K4RM8zk~qrVGFc
z_9>5olJNU+vfL!!afR^GUK;aqk{u+hq(#XMmMTip^LUcpq*sZ*uZc6}Nllg8(QTx*
z>=wl1nk~iVD`i=^sJCoc@JO#|TOoedfYJ*?w%6nl!J{k3hjM!$+MyfDXGEuCR3JqX
zT}pI<%Aq*si;zW_<Qr(BXrhTGi-wyj8fpI4Km(mXKdiys8oCdYrl>*{L2qR{%#EfP
zH@ee!FuJ=O<hPz)8`tahD7yD2V2C{3v99)7jvO-A{6hcgi~o*#uwHE4!HorMvIgh>
z1mLMlOc|EsWtRri@AJo34ps(8P0I1LO=}<d8sW68<&JOIKP07cE6|jo0jyd($~)i1
zRE88jjgb!k8#}1?$GM4<6*t&-RDhM+DA|tz)cd1aYJ=DOPIdcS5Be%8XBwo^`8V6`
zHESuMXCFXGh13T7zA}uyfz7@WoZXR669+xKg#Hh56x5PDB@2Z+m0G^oKYeeJ8VoVx
zJTOqL6QtFKgrVD{P+<wKpsL{X#__}yrfm#*La1qFZdKjELrSJja-*CjnIe*$sKpt@
z5#^JcF1(6HV|4h6N_?c5#Ll+kd&9r81bXjQFt_d`xnk1GXbY2Di;^iSNTnJFS+w&j
zX&I-IQ_ZXgi$Dff2gRmSzp;QkH?N_>anxq-H((t>e~ynOu!UL^6%~ol8EU?VDZuna
z4wG%eO>0N+TpM7!E9u;~PM|uS)c#W2GQAyg7*Unq2-9ZVtYl=nTgj!4J>sc^kmE`m
z87Hu;o-A0d#w$<cIk(}y2#3eIE{-gP_k^fn;;9g(qFlkeMt5k*V*@P$i(dkSeppl3
zwEQ)cY05%76kjm>#BvwBUB?VN_=RptZL#k476y;RZ(kz6AuCq8J*Plj#pgOCS<gz>
zQQmom)0mGimQHc3Z7Fw?({Cm}L9S0l9~ri_jN4mZ<vXg40{8ByEle2X6$wp_phFf-
z7vji|l03#K!B_Tr?4~aY@pRn#4Q+fATA}DK#YJbs6^CaaS-(&R=%ttgULE=v*YSf6
zpIX#RDXuZDX)<4g?TKOz)2We3o@M5ifY#_qTLU{}$BeX%!A-RNYg0SuwRUml@GUQ=
z-<?Ty2HAmx@+RPR#&d||11BZ!%Dvq-A%v$wE*+N@%alFL7O?B1;Zo?R6_GWQ9a-x-
zHx1NF8;9l3Z6uv?p{@o^HB;Tn&?A09T^!c_9fl|AIaZ!GHTk|rVw>SUYwW0OY6nGj
z3n#s|DDrIwx`az^RRaiwIn;%i*>TAON@u9LqgpG%))W*QsSC?4H`sG1!pw_x;rvGk
z6lxhtPA;X&-#T7#<`7jy963H%&K$EFl)Idbj#|t0Wl4&1lUm8O%M{CZKxU9NRJ+O=
zB9FcWspuSRoR*rg_USB`Fb)Bjc2peVGuVar0Njx34-P)U40G~N1BiU=R<*T&1&eb3
zkZR=ek+q7|qT%HPs1NO~tQs~=#OOI^&<f%ZdoNziBNo~+%p!SY%O#h(FU(fz=`~k<
zVbD1Z4Ufv(9%k)h6-O<^|1D8gWEkxd|7}Ya|F3PyWdBxhi5got|0B4>Z0zlw82-1(
z3pYmgpC1K;=o?1)AAmIs3UU8hg@DB7#;#aiNQGRGlt0i>LxKi(pio>$>hw{q(NlW*
z?Bf4HhS8`XN-x4MB4R<6cp6$KDOh^B5-hNFshctofq+-ldA^BYp<K-|(e_3&rOZyQ
z5?X+p*KE)c#Ksk@kybJKJ4u|J$r#>}F!@}E<LvR=C@KpnUuL_gb@YRzIaG!^6a&={
zveXllq9SItA)wfNB2mL9bnVElmnO^L1Bllb#{VDn>AQ%+(e@YW$=~sx)#v{YV=(>)
zV~pt81P4cFMXO#|P6nS9mN?Q;hlc=j{4PC{((5i)r!RZ^+Q$EZ45L+=kDiZDM8uLL
z`8cpzNTBj;EtG5bTs>hZ3K6TO=V}MhNU5HAq~n`>T$X`cJ}?)fpk2Eqh>a^$IjL$g
zK3;&FRu|fcAni(*>Eh+eI4lRLNOq&7W8#OjAzYj!90k<_ve*gqTUGpYO<<wnNRp;|
z;L?fRAX$#VFCd!_!2gdiY#j4s|G$kv`|sZjyMJ~5$(jBiq`hNwrQ6muTCr{0E4FRh
zwry4HR8%XrZB^`~V%tfjVymK?z0Y}Xd%xDs*|)Xtw$;|3^=m!7&oQ1c$LzBYV;6H*
zH+f?>Q>*_`0gnHr0u2A4vDZKO1Ma~97ttjp1_0DG*7L*{$Tv4dc+r1?0(GTik}{Ng
zIsTeF(fOB?1j7l0nNq!Svoe|4H=YZW*u}dee^3H$DiMjCT06Zo7HCrOI!J@x$0VB7
z4@r+Bv%~H?d16)-zlr@Y#;Y*{&}+NI<V1$ve*0y2uy~;HC+nQUs2ds-L7TOq#WY{i
z#zDddz|?VRrwN@1t_A*jpD0XdNK4}K%h9%|WbQ$0bcNcSWB2=96;RNYPwKPXpO5|c
zkE;am&%mfzed1#Ezi^@WA9bXX%v(>;ccb0zuTo-CfI$hns+!6s1p4#E{}&e@-m!yB
zR|^)_?d=yZqtN&e(hLqAj<wLWa|Y4st`&Jc5#v^3wOIGWWjRI|^+Hu|1?a)Gu~OGU
zz6Vi5Md+b-BiTBO*}m$+aGw0qf*5Euz&9Om<<3VmW+aTq(#MhEDlO^iCmY^`a&$|a
zoIxL=Hkra0P(c_iO4-o@`1QKrihNV4EWfzbor-~pthp-)pA6>Lzr8mc-S1xdJ|Fz~
zAE6=qkI?+@EK;mt@AkJwl9#uUmv_}}P7WxatYmX8-MUJSuH9eKL?KNk+XKI7BTun9
zZI(RguwpkCTt-czUXQJY9^F(_rd-~<NRH5ya$`Ijt%H7@DtH$W?Zwy67>IM}Z^>bO
z98NaEZ+Yo^)RlYbf8lG%@P4%F`UUqoJlumk+e$PyI)KVf${M?u*wva+RE|ZiK`uOf
zqZmcH!C)#1<sch-C@uO8m+x#m1gz7)7430n{?&^yd79}NkUVYOhLo$>()((S{tDL_
z*c0x|muGjqO&sv^*E)ybYwA?%<JCiGgSgLW(2wVuK<Z47k85D+d|;(AhbGj=tA@O<
z(2y`fK>XPVR=VF<x6#|v@wftCWUW(*=mh`ZYJmCxIiUyYb4GaWJ|1n$%@o<sUq=@;
zs~p~&9P!Wchp#5l`%jq3lHB(rYWN!0ZQ!~-W?CZBo~7XCrnJdF9Sgetxcicip09cZ
z19zqDltl6ZUWCj5b1Cs=e=<D8p-}7nP9L;9%B+cjG32-MV5{BTB`vdNEQz+}w&rZ6
zxE>3J<-nK{iH!bqGY{|EN-|~KV>@8yruKyH$mrFDA9=2oKII%DkJRa+Ld>x8&1#G8
z<%$HzDetnf@)_BgcK;gb5#vd3`UC|kKMgG1rv|F2G|x0g3at}ET;9U<g{=LF#oSib
z(lkU|VQzDEQ=42R4ZnoNG-?C7-60?ladpKQ$B;4q^iAvI+jrWwZQ}g%4_C*MN^;lL
zd@nrVR2j<`>^>$(+l5{JXFEk7E(zw-b`4`l;ZlUHZ*jkd%LF*#q%9NqTF?}-!8K~0
zZ)Q4f+to^Hzv~_U9*l5zGpY>D*dwsYIDO*CQF0a=QRXW*g;o5`HGDurxov!-Pq{tN
z6n{xpum|-jL@Bs%%@&X4-jk9YPgH*oBUkxUAD{f{6g{Sx#ut}+lGaxh%}r3s{m$Sg
zHo|8sSh%m9HS3INNnZ7XXLw1g$7)6->xiq*b){n8J4^FAI3DXdDc(TLtur?Fxb3T^
z+N<6Oqm%Lo<1={e$)|3zdY`kcXrCSNL6@>;;FM?YsVmgB2GKS=xvnA7iVY3T<VXIh
z9-nZfn3g665lvB(VCo*6MJ*EC)nS(Rc0uCCj#4OP9xe`Ue8~-2kqEwLA{i?Wdhy;3
zuo>tUvC4)L)x*0$I)_@3N~CmP3=o&pcOac32`@7)+;}1@_eCWW@4}G4okYn`my;}8
zFNXJ4L@U=F?pW-1Q?v1NeejBLe{qU+i!A`{*13z$>pfPZL>Y_v*`9ha7%$bGTk)MO
zDDjkc$$bWOOp==3GFD|vQOlXXnzxkFH8Ec-JeqP-VHLm%`a3LzAl^W|r5Fn`^*eI8
zcdaHE(&nt&8fZgHM<hef<(kx%PSXhl4Z8$ipCt~NV5OB+XsRq7VE7w-4lb>MV!-vu
zl2Zfh-Y*h##E3ClORC56@#sa?q`U^hmz-U(ra_P!n;3H%?scVuuZ!2a{Rd>FTH?7V
z=Xc`7v$^4zvo3$;;S00ZBP&Is60G0n6JF;4G78$;$i^EE$7a7z#}sVc-n>^lIKVB4
zeeqrESWCV5FiRO+5Wkr?Pl@x($5#%n1>dk~T!oJ(;Dx#A0pZixOEBLJBD)aQt5>Lq
zV^&6{dRrdZ?y`d*TWGVx<gz54ev+1=mO@X}mmR^gDIKV^dt&02GAJ5TP$`_kDr9P;
zN?l=}%}FO3^-fIR)s4$MIH%}t{K07})p~ANV1!W6X}|1MpnK$`c8yz#F;l{9fGYDL
zIfUnPi@!-YQT2x{W{rW}J7ZP*j-$r0Hs8o3m&g-C`^#eYzMQo!TpA-en)_*R0KAe0
zicUE@J4;f&M4Zwe72C2|dtog&-r5aN4n5Xawadjdx@O?LGsAa62+M;|dc^@DUnP94
zWy=MBRO1|B#ud7|(BG-ZKK*;AHOhS$;coD)u?2NmWADde1mw|mP@hbdc9+kN62(&V
zh!(|(G-@WF@nRXAr`Ch;34OZ82hLMD!>K3W9-F8@*lkI>LO3rUHLlUhfqKFFv+w#$
zT^tDW=#}p;(9&r&eN*sl9}PGvU)gW6?kwAamCI(1+RRC7m2Jm`q$u?;#(EWg7J79L
zPs%B$#GFDlr{CZuKs*vskuQgRA{Ne>g$70+AKb$64Z%(bItBkb2O46hx7?3eqB*~{
zn0K5My{{3euK1;U*gxNbcY{;p3a2pL<Oe2U!^aodFOuL>6BOxRlT9|5LXheuQ+Mq)
zkX_n!+;r>QGJb4QQyi*{Q8%Y-w?J&pTRpaiQgN12rB3V)CsEZ8V*=19&COIOam?*Z
zpwYf5`i@=Ub8ZMM!v}W>b2^vwScWRImdgzw3yeRo``%kEw@I2%5gIc$UumjRj%4b(
z&9mb4;2M=^3>vEp$%y=NPs7L>k#`~SDa+C@e7+4$K~NrJkVob~JPxQ=kV3kl4cJ_<
zBx#GPDUMh|&?Ke~OX-EP@{avA<lPjSLWiu5a35)=E3zQ$gd0yGmVGIq#@dur=ruVb
zCwBc4!^sL0Um$Gfo`$l`g|W}p+46e=OPmb|mNoruaaN{|m!w_b%#leD^u%J;z$7>p
z0>vE5HMRcWBNFH~WYAC81{Ync6zP43@CC7bd0?6r`q$0_)rp_H9ezKh%bo58!g#AQ
zS;SiVq;16(=B7q&RY(}~#MPA9C3VGJV+N=yG{*;xRLrBG)r!BIIO{4Mf{lmEKxt5j
zmMOKqjsJ*5yaOl@GEO4o@YO7`S&Fb(a_H=f?>nl>mdDp{8Q#FI4_jO9C#lhIuj}}G
z?QYY-Ar?kz`_Cd`m^W>ynJPk^hi3~TtFfPfqLwz>m}p`(Ewn_@o~qi=Imh%YZEef3
zy5H`Yr7F^&jdq1~IcKWbu9RXLU@@li<jyDP>kCXK+%x1dJgNK|(ha+RHyg{6GmpM4
zvvrKA93q)`MA30!wPi!9lW=Vsnyg$wG3bhCs2w<sS2<VLpvS2AQ7rTMqi|OZLv4(@
zeoSAkjv?I$488}}{f`1ti3T=Rr^#uvVatj{-%`v!3fd5HWX2eQ2@Dw_ON1G_>JI@0
z7!LuymwYWw*2`^#+_B$5ol^r*uD<rZWUGP%?9!YrPwZ;st4PxdQ1o6>e2OGoHaV-G
z-~PUT`g-N>sQ9_jBm2jV-anLP|K8ISr$Tw9s4tCNPG%h^dl(oPB`K->Ft%cKEQu&U
zry*gB%P*P$4<><04keXhrCv!e0tuEujwDb*Mpv_A)2A~r)EClRcE?!Jccy=y^0o|q
zg4w?HpH4kW-~QMLxNJYlNymS_Up)##W@ule^c`ciNVmk0b^(xWQ;v*X+sPZrnaP>x
zO}2$A8zu7}Hghx#I~|F%Q0g9{b1wo)SH*tdn^K@NN8?b$sz`*Qn5Qt8uv%!Dw`W;@
zUmk;Pu}C+km^L&|UUcEmWe!1>4V7OS)wxg~p_|;Tacy_c`OZWHnYDov4q~aH+ee?<
ziLuc#CG13plN!W(x=ZTh>Dz;|@zxRt?n%vrxk2Vo1Nm4Kw}5NC0(Oz1jn>z77lg6X
zJ@n4nw%m*B<Y+|=^|*xfC&YJTvwbI^25pgmK@jG`RF)9xacmX0Z8~-Zme6}0_DU;o
z1&Q!=3OuI@!nJqao(|)MeiTG;^a{mGA~pjyM|ue4O6(>FL{WY@x3AIdoqk8#dyn#p
z&94oa507-bukk+Kd1qCb?+f2c_X%vyK#gLrtKAIV4)-xGcn+(yW(eiDMv#R+D-xUE
zvtgcjoB^Cp>yKKYQ_d<utG;DhVZ1~Ej3((+3E>#7tuOQsNBnv81c8iJbdMH6OIKp>
zO$cioGc5|*uxs&KgfkEJg3xREtW?6h772OTPbJVz^S-<y@%U{pE>*fcLHK&Uur3We
z1mRf@nku4#6yV%_9b>owRj@9UIe7ua5rJQ`R=Vg&EUho?6B-+Ky+^Iv>M>n7w7NsH
zs#n!E-uIbCS2+U(4)E7*=?*#{VKEf>7QS$o+D-*)TAV@Ey3gWX?Nt%=WqPlHZ#me@
z^sYZPO79>jJb&pNz{Bh1b-uN}0&ekr>8!8+zN2pwfYnK7X#lkqZVL=*z1}z2*}Q4Q
z=v+6<2HElt0o&nkDx>n+*6l{=q$(f^esp`#+(G+z#r0c~7VV1=Rq0KAmJxXRk+TBP
z-TjRL(y(rw@(O{`2g46-d^n``E*h^7t8wbfcG5noA03n@h@t4^OYid26X=z_cQv}-
zx@Ildwtz3o6Cwf)*tYM$*$%I>cHmX^pFQ2H7*5`=+b1l+MC*?bfxq~XLV8YBX`f!E
zHWA)?J>mKUJ2Mep(K?901Iu4gUmFcGpx!B7Kz9s}UvXa%q@jAZ+n!9X9JN1ipIVbS
zUwyaV5MLtzia{Uz<FHpmAFm)+xjwz{AlFxB&{}bh!o+Xu<;bG|#W0~|^Lymqya!m&
zpEiIIy>*V!Buu-fv&hum#<1WPj4NM)C>{afz0s=EB1ZQwf+Bg&8%)r4>D<tu>%Q(0
zy;}$)Bu-Zdp}n(Y=fqC0?^DQJ?r~7Td&AYpO@3?eeRru#B227x@WJ{c($Ej`nP2*P
z=S-jx*8`w~(FmVGgDK#8f_Lm5m7y8R1JHu$5Vyhl7QcPU)mF>}!CRjU!gg8$86$SK
zsNDtH!b^C3PFa!p4BF6wOXrS6rR1JrM1cBqBq;%xmdHQlq=S`~WgQ}vausuely)k#
zk#RXJi9;#Xs=}3`0=YvgKAdSnfw5;0`55vsBuzf6u+Y^X#$2H-TD3tlEvX8kR<);q
zP((~@VmCK7d8Z9-9Fc7zZ@m6~U1;O+b61iq0oyO3tO7k~{rU>-5l*=g`pAgXoT6S@
zJJ6w2Z4#nwPj-l*m6@j`okgd#(6woXV7rT&L=jhi26BbGZlMH4yw*SeQ^12AWhjzI
zCtkm#s`Xq?=Qd*h_HqQV<_^ecvzTc@rhpg1fd!vC_kqXi2jsy+`8r7ZyJAl0hA|6l
z`+m>mm-eBKfZ&ajg4~H4pGG}maT#rKb@i(4CN1Z~JF6lwSZ<N%0}}P`?9D^po0FsI
zP6|?_hU`_esN%4B?CrLmP|(^)HDS$vmvweJ&;K-0ZzK&VP2_jk)1pa&jgT>h1!@A9
z!;6{jesfF1Vyj?8C8=Sh8c>N}5*AuuPSaed3d=r>(WT?iS0lvIR%a|)T3A=LRkch{
zR2<L0z}L{x#SDY;t*L#U9D9j>+xCq4p0a$0qpYpre!Uy07u6z6RkB)QVAVorQ!%oP
zxhw&OrESedKz=nM&Da*-48V+2pet2YDZ}Do&86R>>L$r_SiZVZNgJ;)ag8xejLGtG
z5?4QV$6Arvo$1fV(u%rRP%+@9!mW&YNGARGVA=n;sf*WYVnL0QudJc1ttwvhiQVbB
z#kyb|+WFY-4-@qk@HHup{?wl*s~bk@a83NAt0+mnn^|UeiNb6Km!-S2avKGiqZeNa
zbMz>CN5pr@uW}p3Gi%Xia2XwPi4tWv%rK9|!?}+=yrGQf)VAO~pyr+<(PYw)Y1Q7^
zOKAOh23Nxp?a=Q2ef{7Z(HrWU;ZR%hk=~@0QPu8`j+Gy}8X1TDh~Bk&w!l+-mo7WE
zQG^?T0829b8(Qu;z@_IX)PY1qr-*?yP#&>8iqkdIZ-#{P7G2k?VK>R=G5H|=A#g*>
zPgTXtAg{cpLCuj;P(yQZK_g{(=6tOp#<cmc`7ni|$jW!ORT7JdQ)4RMu83~$RGOQ!
zqN$)QTtde^8<QqiTy^+7<4014YZ&UAHhHdXR4PJPm|F)^WlgXLXuTD47s^iQ?RKln
zg^e{FUkar{hAM;jNKEH>8y+>#oFZ;#elGH0khjPaKWeJb1yCXBYP+heicuMtW6LpJ
zQ`p39&yk&9P{E=j;4cC5GR0B&+A7i!(+RRgm`!mSC?l(4rq}s>URqyVe6NZCmXQgC
zYOilW0S%|3f@ZU|N9&|>N2Yp!hDNfW*hgjh%z5@eb~)u{os3Xlk2gev{ui7>V7-_^
z4Xv@^LW&_#^{#FSyO`yl>aCb=SNMXiPCW}a8edf!=^teqN1ZN)f7%t96+9}CUsuY9
zM2p>oJ!NdpnsrABL_U%;CZagU9Y8}v*!FMUNUdXqL$-LsK=d+bq**PK5rCy(vw7MX
z;+_l{YBA$->=oR~E9CevvaHLxMK-(4^7JF{8O_@0*T{`F?!tp&A#G;)Nr`8n?FvQC
z)!!$Yo@81qW^*d-Dw=z2T!j-23>}jz5Ku#Yu{Zk}IDW5CXBSmg9rxeZL`2Eq&}BbI
zLG+KXv*ODaZsd#sq5T$rx%SHi!+HjwMrfsUK1`bWGvxGKrMa@{rRR8jNYSNe(bC{p
z_UWuXbeaRVUmEueLmHw(ykYx*&3s-%)dPmf>X*grxb@!9#A;J!3Lgfl_>GoJWw~&d
zc7+AQoXq8Khk!&`i^U{)LfN1KJ_emKs{?IRh-FA)R~6rijV+x<g`!65;+(TOFHPEZ
zT!@y8)Jt@0`6G!FPPWK(yNco-o49WwQd^GdHAR&9IhwC;;D0cLP9cA*<Sc;+L3F1O
zdk>W58l~2qGVFBJojme3gaiz?VO6=|>{{&ZB?&j<#56oJsKDN`b=WwfBQ7FVIB$7Z
z-YmKiJ06cy>9vXy*)#q2<^1xE*wuIM*DDKhPdm9fwm7fK8dMR&n&mB?uj<N+ystRV
zCdr>kg|$V7e6GpsD7_9byf=-k>lfLx)dHx5fVDwLg$2>1`Ko?~{F4BA4_q3)YVT{N
zV#LyWYW$itcFD%kS<6xekJQRVw>G^@@e&6s4$Lm@Z{=$@Cj=_)S9}qu!mx=YKz+!Z
zSdI?Wro|Uty&m`14q;gbO#AkF{Z7dSS^23-MW78!YoPs%N`^QlXS1g2UdK#Fahnwo
zy}ZP!7Hz{QFm#hEOJABOPf_yEUD3Bp0pn6`{b>FERe(<d4e+-GR4KQ8lEdu#9OMab
z(OQ9YAg`DsMjVnJp~)>Iywe6xK59FVwo5!tuZAPWs8hn-+J3Qx)&Wy$&LX+4vI1Dr
zve;H;7rpGTWIJE3QLb5Bal<E1&v>(dV^fg<9MPcEKK8yZPePA9=owOQwT%Qfr%q%{
z=FW6cKkYy=?4)_zlLtG@6H|rto*bMEA3?PbIZP1aGoYVH$rGO&J$obFL{eCxLGMY-
z(Oy!R?Q<k8B)cM8OIwirGudT`p1lM^7iLElzW_!$WF3$*QkE%JQG-64;>~iG;I71{
z1MhuJ%`T`&@|z9MOXA`<bd+#bdm7E+$&^Cg=zz(=0~c*<a~PPeQfgs2-VX#*8{wl*
z2bFfOLd(vgbf{O64a~W=c7|auBDY7EP~dPo8ff1vS^J}EM<HsK7;}*r&QRoF9oGc$
zr$k9LCX152+C8|R4>w0dn_<gLY9pts+?-Q=C5FxR)l1?HMS;!5gL{AiESD-|PCC>;
z%a)r}nIm`GN}y+`?1*@o(3yrHnZIC-47Zq=KAlkghLVSapNq^sAV;FxlBlSn{8S9#
zoTgaX?UzEPILr4WGQS-{X)_+uAKAqv{RQs9e?(CLRfn`ZsCu=<H)4L&Kktvu?HcI(
zoyQA0Zy!_3_Rji6&%9QX`1lD<JhvA_E^RwvC7a>`k*PqPxZXVK5+NJCyvo2>H%RCT
za9CMMGo;xsQ1savWmf6PSVRl;YBFfqDs4810ooPpH`w`Q>~0Z1jia;$i}Okharf-`
z-Qv!8#J_35Zr1RMb2j|wh{ecge*~%5K+=}w`{1RA<Ud}uwDQ;i=LjEZIqXb5Yf=L4
zy*VHJ4vQn@&B-qF<&#yWIG-ARRHUzyyi=;qke8o5^SRg`8^uyoqBs;>gt56f=$4DT
z%T6a!47B(Y9WjDh3$7N!FZezwes76dyD<F0P9DD|wT=7QtNAu-E%ER@%wOCv5!w2e
zqeEWZ#EhMGM)nPB`}bGw5FbglA2N#^?U%^~r8cEqGml>&V%sBmxYbmXtp*Ar@VK*j
z=zmA6%c4l`JrCUBP21UUBP+6Fz6(;<&&H>OaKYu1NEMzIPkapvioK_|WYtAtKhfJ(
zi0b}%`KLdGUXYwe_u%&uQDVua&k|ONB+dLKD+YF*W&p^};WLE9#1tcw@#QNh>yH~a
zzzS6l@noofl*O53lTly+1{AXWZ_2e<QMWt^xnX=0Sf8l!-()5ExoPnrq$UYvMv*I!
z17aAiQTEQn^#q8dEhBwmREQ)NI~ap<ok?k7qEQ4+*!5(HR37~(gHv7@*Qof?o#>J%
zj03ZS3|!$W7`Ks|PJnveUueENTqcV6if3VHk*WJ)CL9W+55tvF44vUCP;im{*E%MG
z0P=^Cu|W{7u;0VwVn_;PHd<m6eI^B1vXKG+ia*RE@J1=vgDfV{rDy|OA!#v(gF#%$
zT+p>-h{LdZ$XVi@pmb51CK%4t8fX!_c6&~-D3V49*R)j>@q;{j)LEkVajsFOPK3-z
zM`$B^_k(_VLiiDIQTx}Bd*FIvS&=bO$xblWHhMChkf|teR}y>8T8e<d!@)5xG-uc?
zxvXfq$ayD<dT2)y%>C*?)Xq4q=vFi`FDT~d%1CoBDrcS=%BfyR6Yd(4slkrO<=xFe
z*v<$pxJwF+JslH_8ZwQ2pFKM}@?j^iddN$%rM<U79>1?#P@JeoCTPxt4y02fP*KbK
z7JHx@B6^X!QJhAs&L{$6da+1HSToajexc?x0zVtziA>v3h%C!TsI-9l9KcK`-toz{
z5OWBDu?Ey!lXeKthK=YBEr)?pZHJLffaeY&Q2hyhJo^bSZnH5y_w_|<X~z}dxqA!n
z+=l}^?gRjRuf>7QPpIQOe(C1?-TiZswGDQ?V1UP6Vc^R(@;I1RnmHMvv338l7RT->
z0BJ8*i(?-TpnD|`tbW3jW$m84LGB*7Vd@^gfhIKfM&CB|hW}R27k}Bv7erKNH-Mzw
zvM&kXy)p$-U84a@uT+8APnJOaC!F#5C+=~FSGaLPzNs7d93yW`#fGyXMy-e4RKWDE
zp?1zlt(HM=t@gwIwwA%5qn1H`Ph)57c0*_Ihmki%k16-p?MD1TRY1fQ+qf~`fD8D?
z*bVM`%%S@$=XmZF6p-@@FrN8DHm>_b1Z=&g0(xFq0zI#>fQ3(V<Gw5XE^>*%_x|EC
zOGxPHgMac#5vqu2P_+a#iW2Y9#51%6)r->ar=y$d0!pOlPLHCS>fgl^J(l*P-Rg3b
z%vesP#Y^e}@<-K{7%|d^|7ePrGzJt)nZ4;G!k%uUuZG{_iC0twYMSXTIby8F-xEdK
zP5;Rz&92&}V+pxWA!XH8q+^M>k0s@;dsj^)(EcbMRjB&VFtc1DLidI_)fPAS`KOSS
z(e&*bX-D0A(P&MTAYB9ADP#26)SpUH-?|pAn_N_WG{M0SxWA5Jjq0U_!#<l?t)Eu@
z|NXH3KReS%xI38sect%5GwEVgd)a;^^Z*Bi((#{L^ygi@!8#A_b5O}aN@~zS&_fxS
z6LvA&r=H?O!36<Ag0wu3I>OwAR!lh&zEj>gt}U*H21Gd^cE<9;_;4(k<^Y;Vryo_s
z(P7|_b)=@>g<EuUj&cc@Czc=NFIDU_x{aZ1=5MF7TPi&DRF80QMXPq&6zay2$EtIg
zq<jrFN!wT^;KC<20_NK|7J$1P3j?<$=8$WeT@s@79(L<D>;?p<ZJYfn41+CaYX%=T
z22?g78RX6LOwB4U6{y%j#rMuUdBRNwvr4(4=ekSjqU!L;B&@fqKe#u;(fignasut9
zdzfE+a?4}rr#qpoi%OR7kV{!aH=Jwfd+ZN!;y((W#*GCJJh7ucl539(HiK7Dc~b_7
zli<^dFyl!GP!AK&-}C)YVW{EDFA=0-ny#IHpx=3V!PX03Qy!Z|u27SZ#X4++Y@!B%
z!<&j3Mfc;6FfllRCWDr4IsYM;Peb8~iR}galA?}(R?NiT6nHl)RKzZmAVewO60J}x
zmK2K`qV-G&<Gq6Xi)XDjUzK!_FJFc~eUbk=&t(7kO!<>%d1EK1Pe=8CG3~FSFWYZ~
z&F`3*$x7D<XoP31hFg9sf@>5~f&~{2Hmk9>o3fuc{)lD>{hMhY4ti=!EXJc<|0&lg
zZ$SY8!!3{nr70mH<-x>A6-fMOR1PP=UZ^l`Ww&GdubudOm+hs_dOO=7o6v@H2vJ+o
zZ8`nw#vN*SkxiHCtE8aHoO|pix=UrMD|P!pCw=)e$M*2jCVTgipYbOdH|H};%}URc
zZ1U~Q?C|_br0T{e4B(lk5X*73Jj#3{w^HXM($(D89r?H?KXFSD37AL%3ci_v{}8CN
ziq2P($3F3Q#S9V~&pz%8WvBz9SMPeQQIB;DCDhm|yrODLjWVTt_;ZEN*#xe3jEab5
zkUTC&)Xq?${Qgk-9Vw#TG#c;0QNBiD7FvGGy@H0Z69i~6*%(%c<t`9U8!?D|kp=7!
zWAeQw@`}^W3FQP1NaXrLEa!$?3Xoygg8kiO?vB1$)BWUX`g8ip{|#3v=C0Oe?*CSB
ze^<5r<O)4tD{G3Lu4CoRM3b%T`<?w<M6?ifbf{3M*_0<sv;427Z47_pq(2~UWxwrY
zlo;~+ya=~kbB?lZ4L;f02EjMc43Bk3!6Qv#5h2`6L3wbJ4Ucq(F<rr|A0X!LG}l<`
zbQ@0q7#u$os>~BiI(^SLPniU|thU^B1jPSD9?Jk8=dgsT9Q#7<Zqzshmy|5yAgXAx
zR~OPCOjgix9^x+R-<O&;S7bFKgz#3B#y3@WUy))caarO#Y~Sq4EJzHrjGdE=o);`m
zbYzS#3exJ&6Q9&s8xf2-aWSSBnMi?8oJ}rGA9Ir9w%itRV}#2o*;*p#)<P{XU^2QM
z<B!Q#4tyF!-Hr(!4rMtaPo5xrteB+rk`Jtns#<6f#v_?X76y+L2B%{WqnJj1T&POT
z>8Bj8&E<I043hsTSJp`<<&YnR9(d8Ovm{0S%0=(X6{1aalyK!t2q(aR=maw^P-FBx
zRJqE3-QqXD*S5g{f@zo%Qoab5NH_5vG9~61RzH8_V8Jt%RDk}@-<db?6(RlmC(9=P
z7?H&PH6qol?f-}3zrs-oJ0L#ulj6pSh9(C3QSsJf208FPY9>&WByP^ttjr1P9=adM
z(SI|%8Jm}drH`MJ>YDTIk^jigue%eBdS6Ne)Efi}6p_MdG$t~iIBzuJYBF)F%beOR
zBZD`Ieo_^|utl%dQsLmw!t6z49&)`2Pf6fd?{|d@oF}^0TC`Yo`%xzi8=Vum@Aiv0
zqn!M*%YKKgn?}T%rQ!L$GI<Je*<p1W(NgwY;T<~NSz`7pHL?y!$_~wAZHJZJHC0kS
zN`zC)=ST5puiUz9lcGuRm|dCHgBz`+nDj1{@BhFbmMvAZR3a2M;E}Uur(ekbj%R!)
zJ73_v7s{!!@^~_$iA=!0sU%7zY4yX#&nhJ*9!q%7>?fN4ke*pCum*!wH)$hZ(=N1$
zNkAD^JTg*L`wFF^h2#vDNm3GpX#}}Wa^Yu+*+KHFPO_i;A<!-+63Sro$}zIJUDN5D
z`)P@F&lvIw;;&?y!3wQn|4H4=KL+T3b|jH@uyFiW7X7a2?T4p{l5@1VD03=bu#%|z
zEVZep4j4i7Fj*r<h$ARX8?29VL55d1_qHFO4I^K7z8paRsjX5&uCz|iMuELnQjeNZ
zh)+R6uapM?x(gi!3IU4_dsvn3{nC_Vj}!2^>&<#=apceI_)GV>e3?)X;S0N6KBNJ*
zbFTw71+&Cn04h?#6MB?lvRA?&2`W<J6MWPFtsij788w&e+8c@w{@bUkF2!vm7-2{u
zF06wB7cs&J8~O&{#aG7O{m&nAW_rP>q<M?`@VVsI&~Vv$v7}#6qZpH)V56v{{nSOB
zRl->B4xpnNY5n5jc_kyV3Kx!`C%7?k=8P!1j%2(t2A8G%LIye2y}}jxx*YpjrTroX
zKZi@i4|<Nh5)$0|BTNlwLq!uMJd3V%2?+&=t$iDNL=(AI4R%T-)+2|;g6W@D^D+pT
zWHO1!o&N)eVK9@25FkBVdv;~Z+i4ZCy|UYS@RUtpFt_t~1%>fGYNW8P5a_xe9(RtH
z!NKWh*{d_Nj2=U&8f0Z-Nxb1Gm7JXHi}M@3t=ax1oB&UEZIp9R=pJbhH9Ma?Bsg9I
z@*$i4{hYpfG7i;1&~!)0cOKZ%V!xsM_4@b9(%F8ASw=P9+O;%7vp&5pXUn;WC;=1d
zm=YiwCZsFKY5{s5#Dz401zE?ET0EmikdPA<{+Icg6#z9FvY#7ecZFEoDtlMUNs+}Z
zq|bQolqOLN3&({Vc|=?~jMQxH$3VRnD28vpRQQiSW2J7xCce~cIr#nJg;a0XLZryX
zO0)G8*f9$a5NJUcYW75oV)n94yi3u-w#*16kEP*zk!!*gUR7<TvW7;)N_dE3zBcPT
zFR@0jAq3zeVzzo%ySS1R9<cJFcE_NlD_P0Rtcs`)vGrU;T86X<un?KZ4rJk|uzr&h
zXot@^R*HzTcqU~QVo<S800(j~_+P_l;V5Tu&#GO}1y~(cXnSK^A-h84@%Q>z(cvnm
zI8r%>y!AzH3=9W@B2WVoUmPpz1aXnTAD=|MU_)4@)!_O0o8#U#HziEYT{<Q82cvmu
zWe~+xyR<@zdX}NxaH5bsltQScb=ihUQOGiMc*(qZOITI-+R328fxfW=C#9WFE-KXd
zPF1CdhO_e`CHxq-#mH(%ArLu--10^~<)%vz1Dz5)ok&}?qWD|+1IQbB193&0;GCyU
zaMrC!9(dNR$sSPFo=F_=mu5RT_gijla9hQq*gS4hLJ_cxr&m-@jfl0qhHg?xN3}ei
zuz~X=;=|kSPf)L_5dkdk#REON>;#a%kA0!HiLH~1&c)+E@E7vG`T2f|55=ShKQD$K
zew+vr;FuDD9o-!Z35s4&XZx?XQO-WIz=VayAp*v>d1zJLEh4^7;iFe1Qk(JgTe`Y&
zq+SI;Ka|_$Ol4t1JoXD@Pg;ue=qVyiS`P8x_i~!US($>kCQ|q9ml&3L<8M{uHL~+`
zgzEn^3gD=t$YAk_1vlVyop+!?6mmBYzgr^4(9lFp%`Z{cgf$TjQ9r$cc_N=m8S9~?
zo7d*9OnaZx_?}R0;b3?24N@2En#)nTfO_ur+)MpgLXavWtpG1VH#TCNHF?&m|8@hL
zVm1COe3W~vd0M0}or|v=@Nq$DA_7Pli%hfJwe$8mSktDfn>3U6D~1nzZ-tGtlA}_E
z_}vkz7gB5Lf)Wz<3?1S6t4a;{=-aDZ!i(QqISVN|TeFg9<b4)o)xZmkOl!d%+t`T>
z;4FvMrJceEv?P`e`v%uK$DP75F|D6BZf3kVKf5v~;%P}1hh98SbW3%c6rHDhA_4}o
zXHOjxh3sF9@hx4v50G^_xmGngPu-{iL1dfL1^mz?!~;U3u#`Pa6m6!<0dm-)e2<z+
zS>E_xRHu%4we|?f7OgaN9{`tDq2t#_Sy+MK^g$|KbZ%clT4x!_y?ED_4_5+aB0ZEC
z!=~^9k<V-J*M&NGM=pdrJazo6q9-HEk1cT%*$oH$AolFLC5CX(=mO%NGLSt~s%YvT
zV%&wQLQFR4G+q;~?<EqU1TFo##8+BjUpS1n8P0e^{Y&ev@kTUXQ?BnfNk2BP2)nye
zYk9g+0>qR9zR(kOvj*hutW}uyR-`1afupO{!z4(JlB1(?pwhzd!a%{qiIKo`{q&xs
zNn-_ZB|3y+e#&zfO62O*ppftFoOtI?_t$_yU2)bYuI2@It%wg+8}=KB{hoh<pXrw#
zl2{`EenG}W<nQ7wPrxAKt&bZW4yVP9J7k*7=u|f6L)iMozXg`CRKqCCR?7s#DkYLj
z-6jD^con4$Jli96f{cIxN0gBOm@X?Z&(HD97pPt?yjx%VdqEHO8@(G1wk}5%Q);k9
zdnA1du3dx?ijP}r^#y!eC@>sWb%3*xITax;%rqIx>$nK=9+_*Fb-CDN$9#a+wcJW0
zUcTE*1MYVtUBxpowU**nFm(e<b6kepol^QWB$+<0A7>lQD{EPn*0KQm@?!b{NjUP=
z%7W(BIC$=nG^%gH2sJUz>}0lC56sm2&g><o@NTuSNTXycsMc)-MtZndX_u2mz#NGQ
zuYox<&^*64a6pkymat!2R*6e&?*^@oVo*eM@T0ut$stv5;|n(6(YbIcGrZz0y>Rf*
zlw#V{B6Czv#M9BDMfq0}${DRrd2{(qMSFR)e1P2;&6SF-(M!|y)-_Ld+Vp}g;!U?0
z1RcrLuk7#hR?t;zmM!braJh?aNJl%as^jU%XW)JGSM4yl*?(p>+#==Urzfwuz1A<7
zd^utgaG!{W(=(D{P<(k>$50MobFJ<H6LtfFDIv)+mFY@s!72<+Ks1Foi{1?YdM3Ul
z_lWkWq(uZbqjnY>AEm;aT|1X^jtdmL^U~8`nz^$@1U;4|vvV+vI3@KEs3r4m(WA<Q
zytti9))0Pa|HyZzpA5Q~RJfp2)~XkJ&a2>XyNDy&r>vXYTtlH)ibK+54CzYb!F%XR
zS*1o4%=ojt`c20wioG&t&&$tpmGO!z;0xw*h;E=KrK^>Ib+e$wegW9~o3|`VIa>@J
zIDjp?q>VAwLC7F)T3{WHAGQGL=x@+bqk;Q$w3)A84SSmZ!1J{i{Gry13e?=)&S0x@
zUsG6H9;M?dgESA*Es3sj9argcHA2_;Vcx!lgBM1((V%iE7uzq=YFFv$5g$BGUwJ<@
zL;c%f)!<St9(klaWq`5^oC{OPCVv~Yq)VYH^ZIusl9P-WE^E89IPQ{b@=KRhxA2+G
zR-x16s@zQYbufI0|ANV;@T&yM>BaTWJHogvvYC|dID@Fjrde5X>pwJwhq@-#vh?=p
z#U#Fj5f<#GV?YYiO+0$sH!VnT-q^(wq(gs$7j$H?AQvo86#E~5l8wP_zVReR6)TwV
zHEQ&7hxFwlMw`6hV?%j4CwpMulxi98Ens%Wr8W=a`tDAVM&M%@-^M$>f4mwzT1x1a
z0afm!+aws6m3{;hT@B9Frf$F-Nh<8YFeGIX&Uq-e--v$M#In=L?pw`WmOLaMnYhc{
z_)uZ}U}JEZ<;*Q`xP|S9{}A)*7){kBJ1uF+#;%R-`jWPmn`DvA>P0wPkee;OxY$pP
zD7&I`l#`vBnkdb$cum~-lnz#c#*NY45oEWV_>TQoJMJ48!&Dc%E-<4dEkMiqDW*cL
z+uEMS!lxMkhWeq3+2=_ng<G1b*lPjaUR=hGpsOgf?!ad}%WS1MkQvirt{)RNp6Wh{
zR&%bsjJms)=uV$~tYh(GuI?5EaUAhcTaZv6AN^~gl_u`i4K`bpq1eaY^7vzl;B>Z6
zBV}o<f7%}Z=ZTzuRp0+xBLC^8tkD0Ln{tXsK4vv694Zz=SlBWYF#{X3@!?clrSH0k
zj#Y#nLw72isYoQ!jwsHE4;Jh8*w|~<W$pmhSKV0CP%fgpkQnGx6p2uV_0BqQ9b}P8
zec{O1mQx)^@naubnbu@x<!7+`?K9hf&i6*X5KZm#$?+1m$Iz+CJ8=en7XxyxA?;vr
z(SG&e<_ea|R0VZA`F7P9i!nt!3tveoy0?-=2~N6uy9!d*Hef=2XnfI+-yqfRmfNm7
zIKDYvKP8XJDL_KY%V2_+aHa%=8`=1WiJ-UEonJx!+N<oJ1yF2#ZX$_4_bdOsnehLC
z*1uJ2_Q~rCXv*l}ADc9Hz34420x;1gyu=Xb-y${8tAq1~D2K6GdcTI)M@+~GcRq-B
z?rES=VT%*>QeA<_b>3hsG_T2rL`eS$JT>&K_D@@VySW{({6aQ5G8;68ZPNCWWymG&
z&<7lB0)9LWx@3P)W_Oay!8p8d9pI_e0PxhlsGn$<sNb+mx70TBM(z_0(h}fpY+}kC
zXMl~Y5;9q%@$S~XxwXi*vu>)lt+4XpNFH|<A#^h*WY9qM2fdb`zqj8mu?QN@(56Wv
zq!3ZG`lU4ls9qDNtsOS-Uad?wAMsW=U6!aY@a^x~HEG|06XPV9W?Uf*ODuTqUv1D^
zyN5?epi9+QT~f7bM<;)^x14;4@fd3~)QRw4{VXr;Dz;nB?k(AjMHe%=9lw{g>6KTo
zb1uB1#=-tsR9vH2&n+OJRP|olZEBQp-(_EJc&eKEHI<~V;|i{mRKAMfIxdGbG3VnG
z;60#oUHhBs8yt^<k<f@VP!$jYC{0{2HWJFS9HJ@V)X;OCRCMIJXgDu!WIL4WbKYPk
z7@5ToRu~~AJeJCr9YGFv&oag_mUeYWF^@IRa<$~<8DR-x0C|3#dY3x%;M*>k#$eT7
z-q>Y@!5#}#Ony_O&HP!ITcZu7pP(_P;3k}xsRzw};EVKZdhmky9H7EO@RYBqwktiP
z8XXdS_k&ih+(-2ASYORc!dZ;D`a}X_1bt-jN&9e`MnP?KIjbA{{EAduaV#PdDV85v
z^x=F2EEJw5J;Ow+KK=>j9)vV}!ils({z3%z68RW7`{s4=9eMLipy&O5pT1(ccuhsL
zDPiX$jl>I~4-Ps<|7sz)lp>0d&ERuD)Dwa`G+GaCBN2*kXT;OS)eJ8ixD|0|lQHJ%
zBO#A=Ty=@GcC&HIZbr4Ku4ePv0s{{X)-k~mKvaU}Lk6u&rThIp8%r8o3b{ZJWzj5r
zn0pgDFL4z;FNy|C>Q~|y$uvnYd~*&cD~lFzE8`YOEAtizE7KMzE202Z{wv47BC078
z2MP4EX(IsfPZ34_9~(D+<)44IQvZF`Pd?!@0|}vrO+ys5pi@J?f8;gHFaVH@Vx#C#
z<9In4<Y?%DcZ~MTf3z54qnHK0BAI8wsk$X`Z}YRZ9&y~h-CjfN!22WMwy2k_7_XYI
znyy-M8y(l<({iae$tg9gQa2^X3W)}v@P#)X^-jBp92?+UwG;h_!4#Q<+vB3w<9BBb
z<kQ`%kbY2EK%mN@2qKavY}hz-^7lqwOa54j53SC5Nz64w{z+Bp8TwP5&jX@!!QH*e
zR8*1xfj}NJq<Cn~;<(OjmiUa<*-Acp;lafgx0Fn<F+34#dqtWQ5&?R6A)ujJNUq62
zQgwN37L74K%2RcyMi`2b*?Ov^h-5X%PPS(3J^pT!Th=6o2+~+pZMi>rr}!C>MK@IO
z9D!n<Db0K=`XJh@*-9<i<Q^lYxmk{I^q^ZhOA24|bBwZBmPnRRpy9{g>26t+(o6O;
z)sg>WYvw<9)&3^u(`)}<?HT&`4#a*Yc=6hx7NspZG%}_HA|Zerd}JKIJduoba)p?h
zA0`?q7*Vez$y{)8rKzrD!*=cwTraLEkv%*gJbx^77xDZaz9k>YOwNv`O4tvUR#H-U
z`LRWcCG+>pt}LuDH4S%873oHbCaiI^{Kk1>HX$SdV@kIv73G_iI<?fG&bqGX`##)I
z>7TV(=6V!o*hPs<X@%w=AUyK;3y1H=Z>#oF91p?f+a9XpKKoUKdA^0af43GFB}PA5
zKiA*E=l8$o{Qtf}|J^|T_X?#?=ujA7LJtpo%t6khZ#q<Hho1>zVkQX{5;+MS?Cn1w
zcQ}|?QQjjph{+cbiG<q8M{YUn`|z9!j6XO1c=vz%($-s!gw#REv%=coc+fkVpIDz*
z$PvHJMPelZI1K(O2Xi7v4xZhV5)&Mg(#vR7-nOTr2A*?IMq>yQ96h8${=I-^zIZKW
zYm>Q{yB1wI2Il*`r>fTs&LmuBbA@;cFbuJPd%E4a^H*>sp8x&oGpq2v0VSXpvjxm;
z7H)>KA!zao7@25t{0tdaq&cC5v$Q4cgc;5?ZB}%;p9zK{=2=o+<}4@fRJqi^2(@W_
zzn0+o{72)b)d2=Hz9zvk{xZQmGSFX=Kl-rO`S)ug#jNafO?zP>??RO;`!jgDn`6%#
zg$){i2h7Q^75%J}-H&jf>B~S)OyFPX;!KdNiuZFxF8t#Q_|vK7KMW9;QT%I;xVV?8
zxs#i<<G-hf+bhY-4lrQ{Y<bw)o|nA1`MB)lf8Ot|_EPGM+!4n1s?z6GX`<1`f2U`p
zqkaN=RW>n!7{VESNjM_o8+#cU$NNfl*1jS%KMaHelZRTz)%9s=o~xg2o+Z<w;@iJT
zG5S+TlkdS`!JL0&SiH+(_Grvu$=R^8%7-n_-?l=2_aS5XO&S#o{OIOK+kVWxKa&5M
z7q*e6ByOlNIiVIVhB2u&ZBvx`R!k}N6a^Me{;lgd;}YyG-;_n@zz1!$vif%+_rwAd
zX#K!VEF);iw-5tJDM2}T#cUl|X=8uA;G7<K9S6U0C?@qU*s+Gj8$hP@W{eZGX3aX8
z6?M?uzc3A-wKV?tL@e?jG5ya)jojyS&;MNl+ADs-DTM5wyigUTT-c(KA1Qg>cdma;
z3LO^ADa>cTtcJ?jK@$GXh@_(Q8|g|iDtW~ea;tO1@5&+|pl9hzjT0`3kfG6MJt8=W
z84nQ-N(J5!OVh_1M-81nW>--m@?Fo*foD9{iDSMdp}l6I0N7snYqcY5Ev$ocN<G;&
zn5o#}O#<5^c1mWFwNKun@egpvP)`8W$Mb?B&iSiof1WGVumEa*S>c$*$5tr0rYuEV
zL+y=mPU(+f?m+CTBLwi4S+TZVs{!6f-K`;m@w35nY(L~%luDG>mZVtCylc+RQjAx{
zJApNXf88&wAZv}k_(ad>{||cqE(y&O^kwmc(Zjcs%btHzIyC9@*y{G+mc^u+D2pM3
z28+l#bV4Vaajar{x_QXIwEB<)M+){5QRF1Y`pkm82pqxRc1L8F9=%9@SziH=ew&6k
zsH43RKd2n#Ol-zqa$O-tKWW|{UOlc|a|B(4E+#{xDvzH3akBjzAW4ASIk=+Mil@A>
z6bO^<+K!F;BDvZ+khBP9kM_oc)uCKfsL*N+K=Qv8h&4<nm-o__8`a;wsu^aFKqT$|
zDLt+S*#%TL#=VQRmylM95p~_*9KJYno>5<}5aT3+8I_$W%Z9H0u`u@<yGOlAW!Bog
z3}Y%;QjL?pxHdov<V#U{V4~TJQ4=dsq6ED4ybPwr%sK>btAb(Nsc*n2Wb$vy)c-_E
zKf<ClMub2Ye(F_)+`6iQFPE0wuHWN2<eC&H{}#_0-}uCKkd=8vfE7M*H6l2Gm)gF5
zn4TtB;h9$v_@vY+KFoZ|rE!lGx*w1B!Bp|RH4Oo)QHkO@IZZl?oWtj_^E1OkK?8kH
zL_<F5H2cTb-ha;ce+9(<S(CUY%KjA+BOj*QjMYo6_LIu|*q0cLBKb<nVx0%X>ulvw
zlObkwcc$K`d`}>+N_%d}6;^m!0jm>^ERBssxsI1#6!O0(3Riyh0Eq~#!h)w4X>^3l
zxyVSYE53l7?Txz6afH&uKSyTCfreRQkq*t@|2CxskRE9y92UM3v%>b*<b(4Eye0<l
zJJG8)D7SFq7Rykq4ys5w6yR#tvt~`)#u)R-8)gm%&v9NiP0wCdJPdNeREyiBih7>C
zE+`&6u(b0g^YrM*_}QliW?E&{n+TwmNsc1WtIBzMgwGygj*tR9$oT{;-#4xay!-MC
z_kFvAWeHs{UbuF`-#-F8hMz-W?t93>!ZEs)@`mYR@GTSxA%;k0q7PHPr!1zhSJBqw
z*R;hW3_)^WwANL(h3F6QH&YpG&^MO5NcoRtcLp1zg#SJJM_wc4So)J1`~OR7{?C`O
zztZQ+SO__bqCPwA%kG;5O%UjO2z6dGI!sjX@Zzcf6dteTs=|8=Y*aAPP9d^ysVu}^
z(fr0myoJT(>B~M^FGjq-o72wj%m7M$=A?=^w!Dctq_<v76M~Dnq&8Zt_YHX_AbtE4
zPoxwbBWM`B6xDqld7}hFb?jRJ4`Z}cxn@9ac%T%2nb_8Cmig;RF=pI?UH{m}MmI;p
zk8CEh)0_){SiU?O4(npkiF$=~p<IN{NoK#it@26eg+0gk8ZVH$$Lm*h^VpY;6|$_i
zcqZfV!(XAs449<UgLb%l678|Nv331{(C|+lyFx@*Iej@p-Qq-*kWgBzpKynW@@_ZX
z1FKu<FR;nGvyz;*oyOd<#yw{;^LPKYK7)UV)yDrsd*vT<+kd{G^;aOcJN>Krvj=+X
zshi`DOw%FhaqQmUtEI?6Bo2ka{S3JDUd6(={+iTAQW-p|E<C^CIyTF)KJk;yc8*22
zXb7{tbQ05bY{8|fyvi=irG(jbxN6Kh2aEiK_5J#=yXPgxck1%3tLN6|_i`$KMoAnp
z+N*dK_Gxmu?s3}Vkna4OSS)q;+4l^{)jNKq5oVd4=BZt;a2S`NF#P^*qy9E-;?$n8
z8K@9FU^mvmTr75itO!3bR?i#psJMBmFoWMJWW&A8mr>vhXu|EQpD;)67Gi_-y<0+D
zK!@;DmOrl9c@AuXI#g?L*2Og>_u)kVF%<?dDC^1@RH|_WqQOfNDM5S$#cWH{fVfd%
z8sgaJget+hu|b%!k0K$yx%MmmpL45(*|9@nGK(#!hL7ld;sK3LSe0B1C>H8-c&Tk7
zqA$nIlMus<^96lvT+et+-GuF5Vp)$ggPrZhNSL;sYOt^we+>uKdmc+O5&rnV$MzIV
z`7-=R-ZQBF_lhx-h1_BvHP;gl_Vq(V-|y^pTs_S-o!)x|UzWBOz6*q!{#=3`zvT}c
zu3oDnW8T2oDb+Rah6u*nD<rR{Qoh$h!gp_^?a_hOyQ@k5S8T!nVkE(g2%@=xZ>PIZ
zk9818ne{8cAxQcbo6k`K=enK9n2b?FF{aln+MPz2jM+mmR@W{%opqRu^+PfC*A2S(
zUx$>n@S}&WweVAh61DMjhM0Bm%Z6rk@EeAlb@4lgbbI$Ejjmhjyh5}()d5><n2tm-
zoJm8vKldihuQ?jM2DCew4{x&^bv4LFONol?ugxwg6MP@|KyK=#rHMW7Yr&sK4<m#x
z_!MU^+P)CC##jnF#H@ney#M4#(Dg+4(tc=3l<+85=<P`$4drdAj6OPf*#mO(kfBb@
zX<aI`^(PIyy}khX0MZ|4^qy!7`UaRy^i{8w80BE?8gi69>RYg$KY{&hCYY>n&CN{&
zXuv3_!5HWX{K4)1uSVdsj)1Lq)nPqwM2FC}z3Q+5IIhEB%UyL?_vt%}XuDcve#;ai
zXnx(QZ8N%U(EuFNDX9Rlh5Yx2VM(v5UCXupm)Yc4Mlw5<El!nr9k5Ra()PHjxDhy|
z!((e*Ra_4o*1@$cuPSZ;{?wthrKu_|!-lH11>NsTo}Mk_7s80f-Uq80i1_x^R^5iX
zjr2UT&-<WS$*G2?87wQ2=vj1lR+Cd`c#^(@*!1clEFs`b2(+kHg0o0+F*msB(eNhX
zQ*O>6x`r&tRz$eH4W+W2@=N3-fzCndc_(Zvq2ZSbO_3PU2HY5x0T;-a?PXN(K^pIr
z$lMs#ve4X*6c4HBYWQ&FQUmAzhqHGKk}O)HMyGAt)3$B9t8HW2wr$(?v~7FZ=Co~_
zUthd<@kQKwU&Q-S73b{SRS{Kra!2m9GuImU?Mx6l@Vj+q^j<d-2lBS$q3Ry~txvY5
zrX=v^#+KTArsbqh99;ZUKqa>a@UI81HKb(G`_D{lmv~*x)Tw|hw~%Jhlb!CL(wlI=
zoR1t`ppo70puhZogQVkh1nKH29bcGPdE<Zgre+@F9i~Auxew6)6!#IYsR=R<6o}!_
z0CQLga{Ot;-<7OuerHxF4yJjp`}fEcrI<~DtTBi4TU6UfT54DZS5JdY!>k~T)zwkj
zQpM5IU1dIii(X2<c;?+VlcEt{={6W$o29yQ;{C!fheO`Xf5SLGxZJ>Sv*>2o1RW##
zuHEC|^yurUqf%0+;Y)#xvZt}AmF?|`JrY$@A~a`ZLrDK<y}rNT9g1f<ljfUjoz%k_
zAXC(l5^Z2Dusm3e1M%?*E_7$l#=_o+Ep!(VPK&X?=xUukW5s%zLe}ER2F3VN*T~@m
zHwmM4=q$mzcr@59>R1Dy+@<_{xZ7~FXy9hiGX*5R?g+%wIsgwrA`ws^V~s}1h^2&K
zXsSnh%6b`1zL&o)J&QfPpN6D7*WJUw9L^E3s?t_Q*p^%5VCgAtsH@FO*$;-PGocp+
zhjTD0qZndFdxY(<lyJ`+G3*?dkk4?`DG{s!2t@aa_$Q<<vr^{(a>e#*1c$}0IHofz
ztJdcQb+gtq=2@#R9U7-Ku_ZSFGq64_!DfxZoU^ST87rkX{Ce@^x7<B0W}DbETYX3^
z!4|wG7-F_eYb?iCVVAz+6O->yCLBrfTk0RmM~h%OYUD1uyd=O~IJ2dn%`s=zI?I2#
zs#`uTUxgGF+`Z{1rFpaTG7tYwf4W!gttHLsv`CcT+~@V!BONcd&SG@~8o(}>su2+U
zvA9{adTju<^X~)RsdGBO{TCo9+}JfA!)cb5`e&v1iVa}FW)<+y%5Gp8Xnvr!=jN)<
z`f(Zt1Nsg97#AkN8xX=_Y$65pry~5Yq_0NwhCd$3zzqou<zR`y4fG5d9*Nf&voHge
zk&xa{oI7(cBS6Bs?0(j<!xKIBK^kI;A;0bF8}dgHh3p~jI%5LPV;Kj}7*jZY?1h2Y
zQ`jTI6N_!z8Ir{OgdcV@MCA$-X7I<14j;tCm5drv803&4f*<;|%OFDtKcc(~DMLJL
z#5L=WH3;g2j4~^V8xC%dDrJalf}F@0nHI1*s60VfVnD};cNd10Cg)@bG#eZ&0umX9
zERMnq0;$0fk``?g&Z#alF=Ri;LqmAD=Vl0$F(^bsif({q&m#LXrZ0T3PF<E}7$<Dc
z4!I7LI&9CLX?BouP%%r2X25(9iX)o?i8}m%BhU>*6^Yz{wGP-aEU_+y1MDnJsV;{D
z&J?+HkH(Oc4bfDexDMJBrJ^oeJ<u_%X+@?|n7t1F2-$R(XO|{R&Z-yPkhmGybPw1N
zg^pyZ4<~%GHSBnJXt3?O#v7lGaB8G@5M5i$YUp4PtTmt&Q4QI4P-RfmjoF^Dnrt)3
zGECZz)}FGOm~KETY}}sL9_(|p5^`2`7yM2G?mVy+tTo=!j(T~Ut-6n_y6-|eaIzfS
z^*8o<nT1_ydEZ7k_|tD}D+Sh8wMG4k@;>kH`wDEHJd0Yu;<lhl;6*t&w=x{QBI`<-
z#dU3YA8|RjuPUpX@}mCthiy~>N4||}tSbYokR%vvo+%DDpdBmYbUD8;<mw_zSBIF#
zhWHK&0BvrnZEmt{Zn|x5f^91`+MU0(JBzeCE44cdv~lI>){<dj9d@d;)yINk9d61U
zZZaHh+8u5}9BxV+?B(0sB6aSS$=F=dwy7NRiLb2_E8b&9ReYBBsR)?b#;($}4+hB8
zUcyFI_$(ZfW4~{o0M)nl-?RL`hYTE&<ubGnl)h&Oe-Fif4_P}Te;GO?Pp4@g#D32t
z|2EZpzm&es>7y#2>-$u>tZid@-)8!6v)Z5xk2vA;8gYm2Z#_qF-#yr=@Ao6vZUro_
z3Z~XPrsvSH?OdwBD`oI6MJ#P)EUy}-)*_~7LF4PfZ`o<8z^~u1bQQ2Z-!=uT_e!Q`
zQR8d9<h~lJz=|w?Iu>|Ai~yw>QG^&l3|-tHI={pjFmf&l3|x~SI;;JOExx$ylm67s
zlm6I=lm6WGlK@>qHk~+AJsrCo60ka99nc0*oomM3QW!q*cjrC`Nk6)05~u|*0#aV*
zK2ym!x@QKcC9qsF7oBT+<N_EzIe84PyyNz56jEgjucG@ouw2S6=e|%W0-ftJ<PsP@
z)z{O2>13bwuwy&C)g2GJ(6it0%fejR;)#8JF<-D||6--P+|!-xh5qrQ5b=M(fH?mV
zd6Ka+`gbC%ByB}3is+qvk`v1t-bI)lE{V$q1?1cB@tnR>_=BiEtkJAay$Y39aaXQ$
zw9*Ko21*S+o<npDjO5XTuB{3+{1>r0A)Pj&-EKrs>rWf)R>SgP7Y@JT%ZzHDhf@{j
zm$#mtSMXlePTT=B8Z9@f5JnnqiCyzero*!yqSre9@oMd;W*!1HH%~ILS+JMk5m?Fo
zmg~ykBhV<ZLTU!buBA=tpeEVkS=yirS?4ERgR1%CZYqW)E2uDMO;6xM%Z{pzOR8Yw
z`WDcAt&7*@UN^^{=GEiIC$_U>8`0j;b-E3@sv1*iV3btXCIoH>(B=Z^?t}@_Jf<KL
zCKXE?H7?+~xy-ALbuZ7o4IK8DdQ=0Ql9Og}5*HE0u}y~^12O&AuY-=XK_j}7JRP1`
z3~iaa<-Ig###js;?V+gPg2+_FR`uQjzfbzvhmQ;arb=98=t-$F*&Q*~_3C(=4$ZQS
zkKc1;4N~P{Z}H(&>CYJNvc(<3pPmFx?Ot6eI)z1&9>TqOqPGQV#KG~|F_of`V*vsY
z-G`8rf5;pW2p#l{to8__n7?aW`VSqzB^c%68S4|x+aCUSi6&5LlDDEGSXrY@qPXQ`
z&zHzaYdP~*f<NX{HgYbXeZ?oN-JaJsv;FEa+qn8lN(dpK2pqtlEv9UF5A1zZexHAn
zz!E(Iz3Ft>JrEW*Bi}gtLi5$PYsQ+MvK&8(qmT?tP#4l#JAd$f3d=)7>@CtpS~s=Z
zp84#ajxVW1XiOI0I)B1-fHhZcSpJHi_&jPw4rUBAMd?)%hw5M3na%DP@sF?|Hnz<1
zV0d<vr=K6F_5lJ5JvVKm&sUv4`E8)YFrV8P8)`i52xk%M^qd1d9+<dZkPtf9Q~WD~
z=fO*Ji5N0lHC(P_pVMkrqJnI>wKv~Kzad}UrfJ#<U1gBhRJ-O&TB^E;a;;6ks>l^z
z4)%d=2K9RIc>Nqp+2#@!-ZVpn`zS0Ien*Wy)FgriA$l^;v9-`3pOAn^QG{L0#mk;i
zTNAoM90QXd|3IfdQFsM`VJG2ZiDK+{lys3kIAxu^Y5wf1Z32Z*F1mnAkgW#o$xM{m
z*TIm}Dw#Mm0v7^gIv-inKD+C4x{}Tpzl=nER)&T^;jOAO{twQl+p&fUSE}(WpJ3cF
z8*fwDMZ4aCe;W^LK-v)^%TH&Q{z%U{7!r=l8Fa3K%ZDDE=3|0?06v&i+^~t?hftFL
z^AL*gKgYJCiMf-WfziJsoHeGyre6S2^y<16%HB^v0vdZPC?I%2A;SqWJO-UMQt(>|
zr&r|BRDn?88t8>0X?3x7F3XXXn|N~T!U2q7Pz%qv^ZEGIjWp>N$)AiZik78NKj}_x
zyq~cJPwH7(3l~ebbuDP<7~gIAEh2&9?eOL)mNWl0vAX}qv>A#A*+$vQ`2&}deY>6*
z1S@Z4p;dk~VWZ(k#iA-X4y)F1{^*Q&xGgAfHFSCHG|Jm<#<QR{27d&|O=2sdO@!9e
z;1GE|H(mUhGKA^OX!OoM{~c&TVvy<Y-_G$rQGoxl@;UxL5I}s7?Ysc$NKf^}ili00
zy+_(yO3LlHc|H_mC2W{b<TuP6Af=K@)FeA6u+BnPhr_6B9$JorOilA!hlv@9@fzai
zC&(Zy2oCp-4sdzU_2|{+)8>(9yXVu%a%k+2Lpx$16r(v_*Jo+qy|lPPTWNk2j#x?i
zp5?RfHwZsS=(;!5XL5Xb!K~6KBc*j`|4?&$I;z&9?fM@lJFiA+e)6b!^x)A9x7f4g
zYFitqh#g9n3k4m(BHSHP`-bxQDpmNGmEwIK?k%fC<|~#%tjo^J5jJ&cI*WGTDFM{j
z)%~h*iwuDpaLaZ&h0-h74m{%n=)GfoE>raET^31qfhJ|>hbjGdK$KgS?rrVMZW*4+
zx9sEbehpuOf%=xIX2rNc&SNKDE{xJGn0!qbXa3?gg=0s_z1AWyO%%9sPNs!y>grIR
zehC-1c)Lwv)Lwim%2!A1?0V<0P6cbQ&D1d3`q1VcD1K9+uwrH=MIo;sod_S$VFjOa
zG}E1-*VSKaRATlv^5~jzZ3@?u`Qe3PgmhdM5a|lxW$)9jgmeVuz)I;}>u-I(+UWQl
zk#Ui2CYhY4Br_BR3-wxdY25cw^cX};(?;iV5|Oi=Am&qKwTkaj6ds`FTjSWk6}e>)
z>R6<4pSlwYKd>9T)l;Z^?XkU6i_KFEuzVKD)gX*I1*l2C8rSF*s#9BQU{)C?F`56$
ziaCj?4=c;o4l>yyo^1n3K7b~sd^&*MRH=PoD{lP}%t>lWwNPV|NHeLowt$EkouG5t
zHCi`#78%9S@o<$cbBU)qW|k=q;T@fCOHJqU0giqOC*6ANPUQJ~aK8qBhWkf&!=SW+
zx_twN+W$YA1O9I;w^+^7OUoJUYjZPmoyTUbaYH8)ZpCe_3a};ynI@aWOO^e%zPgn&
zAc_UhVP%e-;ADgX#u|X&704A57$fQB2XEHVR>w&oBdY8baP<Up^RR>P)sS=dwt-Vm
z`#?<a_Okyz_2xSDlD+k^!S`@wL=F^mgMd&iIu^ZbkR+JVhZ$(k-b`F*6biwm$mP;*
zKFO43HxQi_!-E0_&dyA6N^zsP#5j6Jhu7iW6}<Swurj_qY16o^%Dx%U!qhq`ynkWS
zxMMBTo!!UHBZ53F5<Ke4)H?7z9JMj(-xXQs+VJ+|cCEWUl(RLm{ed6x0TSgM*B8nI
zs#tkzFwEC);>z3_+9$s8jLA2(!Z&<rT${VGHL^mEiEFp#!;@ze5gv%U5{NrWILtR%
zj&SnZqZT`Nx4>I-#MH@4)n8L;t5N_<d7G|?OpMI2aFxX#B^(GWr|ZOU(}a~&LVWtb
zaf0Nc&WcYjOF|BDGey0HxQ%)>5pX!{xl7DFSLV<Id=w!=r_`O1<xKatQa~%20MMYr
zn7x@Y8Xcd#>RydkA%%C_lQ^;OV06^3>{DPWUY>?a{dE2ZL!7BNXR)~7j#ESSi9HT(
z4*tx1<P%(rB|?>&M5%E)L+q`#2Ha<A0hi!PgOigjg)Ra$E0OcW?%^H&h}jl3Cuj6R
z3PW1C*N!-py5VJEN~~-yos((x-7Sde9QW5;6Hzi6gpoc<2wW%r8EoYUIEXzs4r9@t
z0Z8n&BQza{YpJsn?pb265E=XCUwJ{)O+|)lcU-n>3Vh~kjwLF{EWCVwb6Bi21BOUK
zu*j(g4u*7Toz!#*9FBlOXms`^%xxc*YcO0TJ0GKDz=@)XQ^Gs$2nx8YT{}6JS9~8O
z?&1w8h@QzVHSRP{-D0nr{X}o#1ovcTP2ItA`a5`{oI#bpEt6YDUrVj(NDG`7#5CqJ
zon!Y%IXj{G_FL44UmrsHJJRx}hN^o^U+n5FIk-<mF4i-r<wwA3&#!Ch_qASI%r{!g
zkE!0PwiG}(5Qy*g{2TG-uWhmS)!w`3NPmoLH87ZI+P+tX>Zh&iZ!M_vJi#(Ou2pv_
zGfEbg<{IMQX6nK`qwe9-aE5pq3U#inrlx>xEl$FaVfU|#fcXOoKup{SG9ZTOA)J+y
z$52QkNFmA8HeS&->YFtg1+Mci@3P(<aWZ|HoJOOb?}nJ7?}^u|Dt*0gjHpRoFEv{O
zW$wX5NjA}WG@P8Pe3Wv!y1N{qHRq<P1bQNhGI9FQuqL0P_@yaz+r>8f5-Abdg}jwY
zmHgTOnA~B)DsQn&c!6VaGr41%Q_2dU?7|d61ILaf-UWksoh)XmPY^%lQ`x6pK-k<%
zt1Ro#h{Yl*eBX^XeSgWZv{_DOGhs4m3{{LV8@D)E57vP~O42z&r6}$kn93~I)WV@9
zhRvpK?M+A&$6!OzguX+uc?SJnv&8Y&@p|@X^r0(C!ZyDLTV_3p?U=Q>o8);jY3iJO
ziW;daYBlS@8!Bv97ULIxw|#04Zf=s4p?o){s`7nE<@;BG6l^WOYg^hx^6>GQU|)d9
zfGxx_ByUbfqG)-|rldbC&EKfv`&9>8Z)mRV-50RW!V&4pd!KMto2vT=B&Ye<O%96I
zm|E#s5llpFAJ8!eV{ibhGB`HKNMW3>ZLi7rpm-12D`m6U_&bpYZIOiJ%t%h^lG`#%
z7UKoSeU<oj1ZP0Z3}tIgu0Q!9ELXefHXK*LlsP8(cBX$%j#)K1Fl&J^col1bH8_k#
z5NBYpg>ua<B=Z`87uT6_sV^<F?x#^so)LCc$tNZ{Sd%#oo6gQ3hP(F?n{XnX4H~X#
zCs7moZbUl$K$x_SK_@Nn$vJ(&N&T`DvOt(%J3<`o!SzT$tTAF7IE*EDY8pOMt5a(M
zHOVeZ$>CD%cD?tt{E2QI0@Z<d)D#vC3>Umsa5p~G8SG(RzvNluhVpXSaCwLeBpx9k
zbLcj%NZh%<!Y)+VgsJB22iszqlX)Q!29m{sf@q7rb7l;K=!`omp%%3lc*U-~43g&Z
z!a6hS5#geNb)SJY32rmg8GikeHMa{h>r*G<6SO^dxF~GEDMujmnzFTA`TV@g@`fL~
zh7LP?^lMD}703F5Z5K{EWl^`c8I<$<l=m8dnW5Y+m_?ITfpcLpC%95N+Cs$&&i+=@
zm3F>cgy$5}{?(K*yTpi}jwSo8ObNH-&L@qjE|5W{^iNzlQ)HM!YXM~mI&v}B0s!ok
zTVGnJUS2J%iXO&3odwBCd)GjfV?MTWqoJP&Wp~V+DYTX3IZBsPrA1J@ODI&iwNsZ+
zy#_G}S}hBOXYu_q?!347zN`s=t~04L`qvB)uizvsvF>UimQDZG*m*R6J$z5c*Fr6M
zQqHjPr6#IVgl)tml$YBVAt9eTTtUqEbZgF%E#{Y+Sn!5WAjhI|1f@NxB)u)?=4Q1h
zzqpj=z9V0lLj}Em&+0T}sN1c@>x57U{^FE|?`|6{k=i*TCQ^UG)a|k&BsU<JX5!K4
zhNc@{ZqIsJ(GTeX$aVd_t0a?q;_$2V@KfW4VqXPC+%XmVLA5Rc;I?Hmj|0CI$(9Mv
z+=U>0dZ5{<TRudsJA^8zG=i&CxX{#LX3Bb6vx}V`$!~>?Ag{tf$KST6uQG26A^m%d
zFH?pfnDTTx7FO*&;-ux9phi4iCD5-@Fp(vDh*gU!#1MN)rd>FwAll&;p^h1=g&sHj
z#hQucj|nSwo_?SY^Ngp8bZvU-(j)p6F9f2w?Ll$2@dd3gjis%*Egnv}VKPZb(eEzj
zAUEFVMUBR7nuof4DFH^1TZ+rd=R=t-Z$~JFD(b2Qqe++50wDKiptoy~+v|^b{W}^}
zo3fhOM2l~EaOt4fLkSuI+77A4N^H*H#XbQBhDg?AlOd~S*c_CTkzm1}$d*VWD0zEr
z>e0<}B(TkCRqXfR8zz=lG5JyzhRqq(Wo;PckkD;?4p-6v7^1o<SK<qyLkD-){7OsD
zdO`>c{C(D^5mY>Aq8ddTYdsR4c9(jQ#q}`6P0Kx^ogeoPd3-TImL8w~JS0p|Z&*b9
zW^vU1pDd35xqlDv%jn;V;?BwdD;yQXoQLj>hicak3^}%Ns7A20L0RmUVg!^mmN>+)
zyv7tMQq=J0o|v<>1f#hyF%>Xs2LYjEj=r)(!*Bv9`9f8dMHu!eyDNWgh!|zoJC}<=
z|8F|aPTTHuc4ph0En7JP9$>${TB{%Zlz4{M5s0P1+d`cd0@%7rM}2QlEY#;UF!o~E
z%LreN=Jp;UE7Q=7BZsy?khfWahB?`V6mXj}+W@GA{-Fb<3UjC;QmD#cG4HPAiWa&f
z3xd>@^%~#&BYOwd$*F7;U(e$pfu?D`f;=woab$|7;pD_dld8itG$=3X#`Fw5OIB$d
zV5ry!p=wp4+IGr8=iTYb#br%L<Uc5hsgzFn3M4sD#AV^e2FlP)iq(|<sx~Y&M;W4;
zfJ&Mw8mOt<X|!sO;oc_0{3eg4h00V5<h1H>rVlc;6qz(XNtBp=B$ODa8=}r%{RSKb
zeF0FB*C|laLbw4KGH$wIEnr^aVX1v=JD^!f`mHmqY)Z5&jt5IJO|ug<Rnu9eNytGJ
zZPDv8v}!#}j)Z!&P)c^wPJGMd^1e<S1%*SSqKcDET%4o9!(5{eO<cw?vw1_fBl?(D
zar!}V2x3sNaN8XDN8r~Sl2j{QAfX-^uMVuNCl;r@i{hS-M%Ah(g-ZF^$kjEmsy|$I
z@g>3`14B>YpI>2Kjy74P`;#z!ehA<MNp49FHmwO8L8ueSR#e)l?OL5#5p{bLEMS_E
z;5-R_IY2~-ctHT);_g}TR4>$P3kDmvMMOlhEI_^(SG#VT?9x%}{iaT~f}MDF5f<*M
z_kQ35wKW9|KL0`I)Fn>ktr)J>j1xpf!;M+V7l^Pi#nB$b#X5Jnnb0=t55_JaZ1giz
zLE+K*h(8W(ks~BXjOV=c0-xcQRoy-j&AnHLdI(@Mwtm{%!Gtizv*6Fj!q^zRG+EO(
z_;X<9kQU!bD8cfx<c&O-u`vl6+&kBB`!JZ#L<3gWjs}XBew9AljN{YY8-nO#6mS)@
zRv;Ipd8#yGVB(kX^jr9wB6-fpgQlR!w=}6+oCH|vLJN|#Guc(^GQjI6ab(&P7%w$8
zLM?4|>p8kwuxd-|@OociKU_Kl*R{V9PqtWgNxVo;0>HWz!n)R~Tq-0fRB_S4WSO#Q
zI`CVo2AAIv7#UpN(zQoelsZB?X@5>X!F2fOE7hncGz^h5=lt-QkCFG3En>Ia{OKpx
zUt4$;{N5irK#7>7<Ft*CZUeT_uL=Y!$^vXN;#@r2*94l+N9=R)l&~v1(G#c{E@?%^
z;u7GJiuN(9#nii?9Wj@Vu(_?Ogvx(6=sV5d2C0t#e_H_aF^S!Rtd>kqiF5G}CVM0b
z(&6(IrIVBkjB%uag_8Y;&&A4o4M+N%!zkt9^?yxz?EYf^<|L+ScA<2<mO<ED=Qb(c
z=puA%0Er!$Rj$`sH#93>1>lR6pt?(-4~cPI6Nk8=7CKGjqPA_0C*rRG62-{xlVU^<
zT_DPpFaZjxR9+n6vwQ_a*}qBr-nbBP{*I6-v=}|gFXA`HkCFX}Xe1Mkf_;gS&?};H
z%6A$`nNgitw{q=qsHDTjoNyQjm%z;LxmE4(w6|c(;^D{knPxnRrPqaSTDcq^*%%Q*
zhhu8#vxE4&#{W_N#SsfzS=I`PhEWVYenJRbNuf`b8*{<<!g9&DP<N3XkzQV6&3#x^
z1{y#NvT*EUK@%=WPO)khdw3D=<@8(XBa{ynZEXPOQGK&{JZIJ!2fy)toubhywv~;X
z#z1|2ROFWY%KjDO9~)hD6IDaOZww3idpZ8^rK$w~5yz5ubpJ=m?!Rzq<HQrid3n^4
zY1)<Oq#?9*(UfMP#9?%3A_}u&o9&Rlp%c~_E5U3sD3~{rUO)7D5xz^W_CTKHW1jYN
z8nf+8Z{IfV<gO-1=X$<;K7jmiy(IcctjM;3tqAdd;uDR9iHBK>fZbr;fZm|qz~122
z1+Iv83UrEe3U!Kg3Z4^g4sYwgZZcyY>VEhERWO7t(IgT?5*;?<jl`nhmF{S|44~YF
z>)W)3E}nK9HG?zPY&NZXSSwknpmT@mz+Ji<LQJ2iTVFO0!c%5NF8nzgx}b+8A{YnB
z*Ii&ZUlg6J5%-L2l+Ozd6yl&zK;*A=lLlP@0R-ZEINQDC!P9NMb)iGw+sQ*h^c^IA
zDiwq>oMM3B-Gf-<6UZYNeUNH$%*v4jqe#w#&K>5$-PL;j!g?-1wU5c99dM%gYr?SG
z^O+Y>&B_I5o82eR)j-adNLy+GwW>3&sE@~n+6u)CJwbGcco)V(6!?b-9WgQtS4h+>
zj7LZu6;X5$*$_)XsPd<(K}cWHN#kP4>OpfUTeeNpPI<?reX$WY>~Q9LSjAiCo#aLt
z8|{4H+3r~m>ep{`dzn7bUi)ybbgy8qWG_HvzkMJNpsiJOt6`t>mWLBC71yw@)#&4Y
zD(VnZnZW9hQ<-Qx{|dY)dW-Cyu1!=Er#9+(%(wK%)mwa!a1)oImE2@YWHPA7#20vc
z*jL<FK*U1ALj5#JS(%CqEmcZ_v{<YNwJd4j_d?o2>q5|ic^R{!Y4Ma~_7}Xv`jvAQ
zGK9;-@xnigc4u~5jHSNu7w-QFum0D^@*kB%|9ULF<;TB^rxCLNbD(qRW0?`sv9u8H
zKtJguB;u+1%2Knm_k<K{6%2`PG_vA2u7SKz4UNik5UHa__OLG2K3_kdLG3~eA`nBN
zVvuoB{xC2J&7cM)metD@C?{)kD6CoNF6=h@OiuLYpeUL~tJ13!S_&l{y|5CxFF8<V
z69?(KM$?`;QzTvbYqf}3B_~GPpvgtjLo2mP%SMqi+qf8CtwgK|_nW;>v({TNof$xM
z1nuOOl{HEC=Osm>#?GxrX1bRp4?qI-;7DL1ahXv+La+3e9HHt=cO_pMjo-0>cY?#>
z!}jNF-Hb50%5DkTK393;R-Shg1U5Z@{3F0~HnF)szQfn|e?qZ8|6_pv-=%NKs#<n9
zYFM93p7YhJ%?JBMDR|^A`DF=zT*{MZSIA}t0Vom~h{Dp0gDF)_g(4|IB;=GN`F?+s
zwAz%cY!o1W&-}<&H!sP@a{CF}$=G=_2+PdlTp~BYz_alFwW<SQ*v9-2^>vqfx7B^8
zH+4E~+wB3<`=feQ1U`+!EFX-Z_C^rb@RA{MBn{WVA!#(!>V6M1k#W;!h0MW^md|j<
zo~JJ$Hp6XB3>Siih@gQXCYJdLifn{dMn8d5k_o+p!J23sXL=acBt2`}I%ZUotdwS-
z5ks&~42d*S$ZJkyRR~Na^ZY11%fumMRAcx$DO@i7xiLV3QmHzJGNl2!@#f|x5IQPe
zn^0||Pyk@#n<e{%)__l2JaJD6_Ax3<&RohI_#$KAa{XsP(zcz;%dDM)-OZsrE4>Up
zhh}OD{xUl^{bp>y%6bCBYhZT&t0KA7A-OLwIDPl^(2^J_%BxOdGlu<+O_MTOg;~Yc
zEn6b=glNDrn=RUCGKtrgNL&?KB$4}W!wZifj#G&ychnAjelqW35~Ea(HJq2P`)k`}
ztc|zs%wKz_QLS3O+_gssVJ?_8UiU%2+5w>(ptsk}Oq)tSHJ6aYP0X&7MXy|@Ay#r%
z&xy<9*BC%MiQ+v`v0s0;Ne6Lcw>by~k=r*9&lh<I&o{DvCxf2G6IdCjz_Y8*pJ?jt
zi4>dWHr0orZU8v|*uyPo+zP)F^%@;a#q$aV<e1*7#JsaY=#8-BehYds-B?3x^|^!5
z?m^&n`qhVDaj6d`1YYgD!Ta>8^8dOePSJ6YA20^<Hi+}j>lf|{Hf&;NR~z$m)XhIN
z2E4EIp}i0G{dAdKm_bZ`E(_$+b-HGLU+<G{J>ABT@d?-CbR*cT$+Nsj?w5e}Sb~0<
z#wY;+1A9$k&!nc1|ILw^5sN^XO?gyanN^gb*io+QzsAg@MK_h|09IZ-S(saK7!eHJ
z6w8yFFnO-rd16SYRc2zsi!A!gl3O7UVrERA*u{Nlv4MqIrrPSe-|U(#32V!>&VsO0
zsYozwEXAjq%;7K{Mh%GW-#Mzwnmz)-<=q1yUI#X(?hj-Ipd82y-PLrxR5@pY!W9S6
zXJ!`8MA1WTc$jv=o0gMH6f5%#EMnqq@QtNU+=!S<wk6hFpUC8#M=@Nerj*A$><|6D
z;=u7NS9~~Z%`&E{zb@ra!{r%+A1PPP;{@)=A7wmf80_%csb-HJO#1awve7VQDR>i6
zObM2K*0lt>K2nj#-FBHM`*HegQA&-HPSZ5EM8d0ob~3(9j*a>Jn(tnFAw33hO^chC
z%I6Alk5x)@7le#a=<CsQ{EOY*UK3680k1~jh4sA$;-*@_3x`TZQ*YyiyOF1)U9;R5
z%fj=>SwdFt0G766EOQVCh`>A+v9#R-Z^X<J%6l8!Y7e@(IG}1_p;16DC(9_4Ypow7
zu~|rqHCDELEub1Q+h|c$S5c=h2CniP(ntVYn*r4Tva0#k!;KsR0nF6{51SO^xugAv
zOf$y|td5X2zZlcU666%`n<&z{9w?Aqtd`LoC0+{2y=8+Ey-h6Qa<)B;&7er#D$9F~
zR2WJdQ`{q{@AygL+Dqp6i)7YzA20u@3qSta6Oxxe+=Z^ND&#l@l+#wNx~y75Jl0kp
zew|dC0nH%cfFF6SY5VYM*z-M;n)KMLkoB+JBJP|Gk!;Hq<{VVOsTeY7nLiv9Z&Oq>
zTv!l7oj(97yI_4@pmbV7{sbHu${Q=(*r|=|1i9yg)rq}U!?}u!=W7i;^>0&fS6E>`
zdOS5l@MK*|orZe<XBBTr`z)7Yemhx#DLu_=w<IxbfuIEiIfyuVK|~mINAvA6m^4xf
ztfrPbA*8QD8isA&5qLAtR_{^}9TD99Ykd{6X71^la}-LzZ=NJo_vM|Y*zI&=*~%E8
zh~51SRZY!cN20U2N4kT?FsO26nf&C_=TtB)q~?1~tuoSkhPQhtgx45|nqYB8tI_xe
z(W{{xfyQu9uBylJ)|NfI<r~?D@&$?8RF>aoSCU2`Rd5+|&vDtcsdWYv8DVqk$lBZ#
zicttoWELqlOJf*TDAq)5WyYd3SIs?9Z#ECw!ymjg27hhsa;+vf@a9OGlwODXtGx<i
z8c}T$`|qtAUnXd0eXyzkG@rw?`GaQ4zo$>1V{22ce>*YK>|Cf1e=Ns4?GbG{K(%`;
zK9LjAT%g?CtGmU05=RR6_{KHVlJN49+lo0JW~Djpb=Ijyo5}vJqp_*nJFib1J^Vr|
zEqj;~#tV=6i;1*`+>VS#i9U>#VOMR$4b-95Ma6P4r?~@9;0$?210bAkr8G=6Kq+co
z8@mY(+jVT;Y7fe5c|61s<Ro_EplO?f6HaLWq|8gHYs+e=1imgok5R%@Fy}iA|As1b
z?<v=o?P*jF$ahJ<$-H+O*Y2Vql3pRru9WmB&`G0-hdPSRwMyTB!jhPA8atmGPQbq3
zRx}~b(nz)DPPc*=O<HHD$j)kTi=9xv=W?kwu@c-XUE2{cFKBA6|09>SpR=7Lx?*5!
zeX#RWp;z}D#>9x=fwyNLVH6_DCRM^rd0e#dar~(uS3YVKL*ck7*%#UfsV<u`p^QDQ
z9h;-^1;cII4h9Zq+8~rmF|;d>LT9aQr@A=V*EO{LP0ji3c>Yg&fV0tt&RXzjyugRv
zhJgZs&c}>RQmzKq{KpA2*+<Vm@(FWNf*N4RA3sbG{?~@#f94baZe2-M7?lDMMD)HO
znU}<M6_2*;B&ADlMeGZM03-ZK0sh_SkXQtV$ILv3g?9BR5|h*EHX9fL!QYE;!@K~E
zg&_|Lld-H*bL#wXcC<V~{==NaaQisC0K*&UeuTlVPjz@7a~IQOX1R#^!x@}5ea#fo
z+5@ex7lGH=qyl=t(4pg;Q?;t{TzIS8y_^JRNo<3f;Go&^vCMkWy2aum$)e!=C}OC}
zi%RZdju)+5P-y(iivCctR{&HY1_{JIib>`wJft!!Ool7Xf_2BkM~G|0c?WVC11*LT
zWG{_@A)GQ~HdhTC8OAprD`c}K9r_4Pk7GYlKBCV`j+)m}O>&w3S!zW##$Y>@rR%HJ
zxx8Z`_5D$%pjd0N$two$7djt6^R;GV9|?Kpgg`5QmS{kryzz|qSI|znXDv=+A&Qs)
zLOzH={|YVFYZG@+<5^w_%!c43nTiOcT4QCk@eA7SP2A`_z-c=3HF)X}(5>FOJ+W`{
ze0wppka?VuO-y(1cl{8$&HWFjhKnx=g?=Z9f!`_jf8PcEPp2~dE8k957?&ClK;<>c
z7#vpCVqIKP+i2p;P#g@Vr9%x0$fIaI5i(>>2?r>WDcE1hwazDJ+BoI!_9I*yy@NUz
z0D*~KGYzyk5}01@y*%7N31Bf}E5nk;i<J-zV2d$eYrvvupc#QmWxLa8lg339^9BsI
z+bRJ+%p8@Xw?LH-O{QFB$VO^~=AS&j`+*&PYdhmDvf-T#GI6IYv$eqEu0dN)9*Pw%
zAf8Nc=kp+nNPo%LvVr=?_>ibXo&6z{W9SeDF(H_j;;gnP-hMIgZ`*)(F2hjN8VZV$
zlsQQYk&XL$F_uyI7}p?_@Lg>5L=Rd(bIi{|!OUG`+FC!HfN>R;rEL*oxQ*1f--_17
zliNq@X`)=8uv{+SB!8;7iIVptLPriKsXoR9&6r^V4i|90#NP+cW%|MEVmb?<k>?WG
zZEyk)RfaKA#DF=n5dWN4EioR!vHWKrIYhDBPhRN=nh{mF+ru+_8@YZVQ%{{`AL0+=
z{6C#o=>;3)`t3x~|LMg4to!*7$$4`l;qT^Kq5pU5qzbUZQ9-_(?M$DYUWpGHiJ*nT
z!3iX_wn7$ww2B<`)t4}=2cnO}*so)0-v5(88!Mdmb3YFNFRhqGkx=kcpxnfg5mh-~
zpJD|DqMX8Jz2&htSW}(OGmoS4#OLl;dQiX0{Ksq8WzC!S2J@}j*VldS4+c;ipW|Th
zj~S5IS9x4g`=~*C<OULaV*7wWg71c_n^ssylsz9e;6sW>Ig*_Ff!rO+wM_Cm`d@s2
zT`VTYM$Ncs169rRQv<uNKblGTrl#UPCtJTB1#|-gz*9gS@*AoAS&02jRL(U=*W!Bh
znyJQJ>a^EtNv|j7SIgT>_*+6g$2@GBl>4$DwEL+3lId01W}rF2RUWZbJ^(5bT9!zz
zZ*(w3YSc|8*J>SICWYb#XT6-A-AMJAQ_pvjEv)Mr8F^Gj)nJz5Cz(fdmW@iX>0^HW
z))8r-AcF9vzqP+yg<Uw5-7hK4@sbH>4!1BK7&bhdxGf<?A>MsniQoH$t)7296+Mm1
z8Scp>kr$IfMamsX0!Ma8qK}d$79bqR%zVfEZtHV+9O1r(OP85^u(LXZMr|9r-Z@~j
zJn>EmRlvT`)5*ir-PZVPQ4IM{eY=MJMt{I%AYDW0<SjTouy>Ld)=MA0wd(UX+d577
z_g9xHB#$i`*PHxN(xXxXyj==&VkE-JlH<qcb+!GS5Z%PANP=0yI?rI@h;D{|5)=#l
zn<p3QgWNLU2k$y_DvKOQf=rS?qR5cfmjFL5zhD4N=KQBW5If09op28|d;nBEL<NsZ
zesPD;ElqaWNu9hw%n-b`cQX^mYmV(gF=vIKMzwB#I~rAb=H+kWu6IsVvQ>uGIW}uS
z7g}VXqKM|CC`sxfO@rUC=7Yv<c9x7xfmn4pYe87%;7=yf4w7XlG#tHie6JsCH-h!g
zf0yW46o()1`n#2m1@lpa$b)5}zW95AszdcL4}4l-rb#)%ED>;p-Y$6`dCj&uMr4J5
zus*`OUXG|hHU())`oPYG?mF5L@cfJ+XA}|7?lY2OTKmC?W%)xI-%LNK4?B+xt{6yj
zP9A3)fUODQB{}f-hj0D(vY!BoJ*b$Dh#Wb?b;0BKs<Jx5We>b{*}nKsh(N=kXM7yT
zJRDk5wn0*A*e<wokPGKnRN|Tzm+pgCDhe8$9$5M@^AtlFKZ;vKYB#W{q{u|o3<>i^
zdDsVR5?IzMPDH>Etm;n&<-apA26ZeImI?V-(1+&5@B1cl5Ol@Aq^ONbYBNv9;F5jl
zsQ`^UwvuhtHp#ThUmS7HHG;ZjWI2~&Tr+J)G3?^L!f)jvo<(1R6M86k*W2^aa#{Eg
zx?-Wdsd;YA6e2K>(DGN8V<XTR>aXs+=3;qQhVMZB;(_y|OWquWZ*#C$fMR*^NOLjQ
zFhrrBY>jY&LTC@z>KCr?2dOP0!A6r<@jk;?3JPEBq78`9XSTb_I-#|u)aeDBP_wx0
zrf@lt?$vC(it3ifIv6*;1#GX8;T|<4qhHMY@C>e9uzSh}ga-E|akKJlo51@rBdh(D
zfx-Yw_h!-O<v%3BU$W}sFM9C%tpr+sn#=R9k@%h&U5kXwv#QbKvQ%+p@%ks1(4cPY
zJdiF&+Sf%s1DMlg3<iYcSVfM2Hn-+I+kFvu;X6at9~>?lH<Fj(OknPT9qF#|QW_>>
zzS@rz>Ml!jO!4@vZN?i$IdrH5Qct(N<=OxU_V~ND7w-Zc_FhmoA#b26m%J?^RnOx;
zyT8TNfx#Z;gM1ALj9cY5LbRIm_vU_sFyR<!q?^!TMxu}GDm2SaET#Xt)?`34J;F1K
zOzZ}ia-u%0_Hs5KS$!#>lbo753Md-r*cxQBpWL|GLBhmHbVu}kyaAztLu5P$K*p(7
zOJ(1G%N+>jV$+|V=!o$t5$MyRe^Z#E(<4O|c22elh#8v$WIgfRAUi6P3oXqF7)_o-
zrcB?FzSx}LE7!X*6)>1tqCdy;MBlNRBC(+5Ox-YuK2bu@X-k^g)tEZz(3b7(S|Q-a
zao|z+S$y(yAb+hZhq{9|LHVV7A?YzEHmBXNGQTikn|$vxo@LKRZ`^f~pRo>~Ju%({
zUj6h|<$9h1R<&;WoepZFF7AjwHqL|NFR8itMK=yT4WLVcuZW+K^nW+pn(1vXF85)?
zL_KEb9Cx(By>aKk7$+a<S6&&`605fMju3fJ;=qj7BC<?Hi5ea49(}&%^bUQIfnI*B
z2=(*M;KgL~@~`5>WbyJZ;>F~`Vbf>jlHD=={wO7XgZM;0r}&B8o!rt*uYXN|2s9tu
zAgN}4))BTSLitsuHVE_dPksgjHZtTT@E<?czFCa^d%E+@$o(HE0scYz`fp-}<oLdC
z>X2^{=wbmNBrws1L~(|A>>5`5xVSid9<$CkGpW@C^y7r$ZE5$J#Bd0L-cTl4V-<<<
zKC;BsbM`NO=D)GiEv`SDarfgyI0Jd{(D2@1PaKzB17X0cG&_tWbR+mmS?bOS2PB*J
zG#tk<H9mV=FWuMSCt_%aLrkT|p<v};!NrUYIkYqKxp?m|`c0ghWFFVcW*_nDbn!1l
zjG}^mw!Cq)96C9mr~|PtJGB>xPW(2v%B>{k^tF>5l8;&CT(?$ez?5(e@@o8*n~%?~
zX+&~vpnb(AspC6!khJ-H&Oc{U@wdF`PJ(dqM~IZN$63q^<$ys_qe(ZOBCcTJ7J&~I
z^eqv2wyfwFO(&-hm?x03r0Na;I(ir5pf-O7{Q%Ltc(5VBz5FY1R7L%{`<)R$lW9{U
zE}Dc&_1g#PLb49;oUU$x>FuBFA$|=T<Fel=%;Wz|Vc7noV^nSb!POvUZe>iOWNd6{
zU}$A5X=CT?q~zpaY+(Jb>@-;U?3+Ld@l&>=xRC}822#}qEJ<;uzzu@lFK@^r9FXz5
zC&eKs_`;^ali~IU8J}N|7tq%+0t#jL_w_gP%PJk3bsyj{lh?63{bg$6^7H-S0>Tf*
z4R=IxVt6Ka99C`3KKY`FqIzUD1P7KK>k#u0%Z72?q;<e9)qpUfm_ik_zxqb%r^*VG
zE)M7XC@=H5b7{Rio%FO8BP}O+o=TQ8Wn85r&A{d#v}DUQoW|w0{goUhD;1_nJffyD
zz&uVa5++qrwv<hU%!!K4xc#>_w%RQqj#YKNX|Y7vB)#Ae@K?D7Y%YCofJ~aibTpOu
zjliNo6F!E%hjP4}Nzxhhi87r!+WAz-goz$;v{U;R4r%7}UE-m2rV3N~;;2eOC!vbq
z8ji($?9bSeBI8-`WF}gpNg|#2`UAH)^4gV%9UI30o*JU+`=WyCx|UX@Dz55;hg<sA
zw4}cehNO6uGAGBvJuxKhU_ljy5M96@;(!QY{9{bP41**C8FBmyE__2Faeu;b4f<V0
z)L2lH7|U(9_=W5ETNh_>1(;$5q+^?t#k*$O4bt&zo)e@Kf!(cqxU0lrL{KuO$v_L<
zcFbu*do_EoOY-Q_N$8UJywTd@(in5<6KGgmSC&&53~y0^G@Da80}OTy;L>AG(CE$u
z56xU~J*eAayO1T2MyYu!k!JP|g!t?=VG8O;#3`~SUXku^T|Wj1l9D6D8<^;(0@I$t
zix(%wzv4+=58H(8tmUjSPhon|^Y=4San{p5qOBp1a<r|5KrQU@m`0b%aCNHtb$;vO
ze9=~+a`>2)gqt!1Bdg%N=L93A2t5_~dlyG!ubeV0ze3^1monSZ3tO`%*GI*;hrJ1A
z2=?KGHhl$H-jOnvyg)r3v|5;MZ2!)u4ZrBGWPic{g>g{=dbR^uI!QmR@T!vsWDs*9
zErR=<MFV=ehtp20?nhX(2f`0U#_w^-{|1Y$gZTUt_7B-67(V=tB8cy0?!PZ_ME@U=
z^slI?(uC1gUQYj-n&`S~)y{DkiSiR*0f$H$BnvcTDF}ck!n{E;B8Ih7Ks7mL5V4-O
zz?Mm5xk_vN30PQ@!A~QrifSfn+OW26>9B6Fe(KtA`o4IYU2c9mB|iV+ewq@-`!FVW
z_sMeXzVbTq%)Ro$_;}^c{Q^d!Mb}$6hGHC%j*Vn$p;-Q74ur-t;T$Oyy^dZoMqAE0
zN3-qGl2)qFoi^PIXHzFoNMv6Ko;OU3?ja&js8O&)d%A8IFV--G8>>Fy*d@kik5XeZ
zH#lh+uGJ}C*tUzF;#q+q9EZhry{R}%Ym^clr8Tu}%~PqrE|t75_dpA~F*QJy!Z|{l
z!BURlc<$}+oB0u;P|cIEa>sy{+4?X)7@@{7@&TI`!*OLZPK>rdrSO5LbqE}P4YMWQ
z9tUgvkA8=i6GJG##vWoi)BSkg00u!T-2|Q>eSoO>rZ&5&RSAWAQ0IIi`+V@}c6fv5
zd^bNb)W!tyPz7P$`d7P7)Y(D)G>i&h_~Gu-2LF-4#xJx>ram@Q(1c;|RciWTmqOGn
ztUff<-HjlSu>{8;K~<G@YMTP#>AIHxKpH_9g2i6Ga|>pkuXmt}$15%rq0Q#2TXf`C
zs2j(`fcIGN0Q%*CjXnRgk&I7JvX5V1?Dch?rAmwQnxs>jc7>I$%}tyZ4~>~>sre<$
z6KqEQpKG&DW_;!W;edO262svo*bs5C2_(Ty*0Yvo+hf>`MH-19(1V(AF|pkp2`?=-
zy9FnQcF0?&Z>s0xQ>)G0U!Rn2lS`AZk*MqI-6;kT+cDNUv;gbuN!ckPLAu^aJX+W;
z;y-X^-r||-@7bd3oo#LAv;(2}NCUJ0t-s9-yKw--wbrue9fVcT{6}j5@{Qo}MA%~t
z?O!go8hB@>TV0&CcJm7lJDbgkKM0UxM*Gc&liB$(E@E8-pS1|=);c(+`s;lYs{nu{
z8;dk6{EDf+6-<+@{(_HShI2}l=>%`@eem8+{IOZ(GU~6!3%D(mYJ#vOQ&D|RSnN6w
zkkl=(E0MQ1@d*w;RY6(iIr2Y9!RW@;U9<VGU0ro{zMVd{PEVJwQ-SfDQ*InK0pVO6
zh^wJL+N<W(IbC+W@Tud(+{GtW1l$;qlm9~2u&r~mn2EWJJTV;R0119(r$&T7z(xsd
zeI7fI9iu7dMCt>a%>G0TrfT7KD54*Go7gr^p9kc7*XI3pWkCngP?Lg_FOsk1)1GBU
zj2-FkQjb7iV&`G88h}@A-<2YepfBm%ZiU#Sn$F)|i{F6-AWTdMHh3_sbs&IN{{<%k
zxk>&O*F>x9vlD^F4m;QFw#)o!3>OtpHVNS|x%2$P2C_gYk-42)E%Z6av<2&GSN>-K
zE6mO_PmKFAzN6hrl)nLhTIqmUWsnE)3LE|^#E+9zEv*9zXIv{ikOV&_{b^<JvjUO%
z!Ya-5ak%5Pu<m0=T`%Q}m$j;@DnIVmitVuHlR&9mE>@uE1*_V4kR?g))XZWNMR0RU
z)b+N$nC!rpSj@e}jl5g#s<U~_fq3YogxaAPnj}X6X0bw9<vAY903#OSH5F!zsOMxn
zl3Rl-!BMp$aaX~bvIReL9OEe3k!oZszYRP*bUPjUtdO=u@I#wPyPurDayy32sXv=n
zh4}tw*aA9hf3zpEFc%C}qnZwgYIcabi<5Y$2S-b1-Sua+8w);uqg4RBZg(M@R3rjy
z`s!P&3qGG=`k8^E<)|d|M(3>n^kP4Sq^$=0gXV=2dOwkzZ9oT3`1p=7c@Vm8*P2;g
z!vL+Bjm@0Q2IVRWUbrh<l+y$3`K8b-F66*CG&vZZ7TkM8ZuVT8F)K`s!rtNG<|L$$
zkchZU_Gf}m{=B;f2>VsJvqmZXT&mM6nNqS&p~K0&&MV6P(&AZ)tgn=BNTgSCIhgaH
zxbv&yD~uq!j${KsmKG%N@EsTMgTP0m^s7J*ro8*s&JsfIL=%FQ`5e1~L#e{h#ES*J
zOw)<E<Dh27;@6nT66e;zkkf;iFMsLpoJo0%*oYCQn^w1e+MI>pT%Y*e5!YhkNjVHT
zLf~EV*J8Su2vet5TyI^B5I0o}0+5)`=ue$e_7j-)XAW;YjJ<o|?9Jhb&y-KuQi7SS
z!k-6JD(z|duSQPF7>St2Pj1iNul2J01q1^T)Cl%{GehKqj+pADM}*S2801c`Xo2KI
z<n;V0Qykf!e%(Iq(8i`&vc3|&Me}OvpUZBo5_*d#1Sh#puMp^tQpYwolscWgb11u_
zOCagj1oyc#c!!_NACYw0=kd06g!~5U1oJJ<ukhgZ5qS5=%4qbFYEF!#vS+(0Y#;M7
z@8}3yKcGIc;N0PIP-<YZb)c`AcN^L{K;nFadzOY8B~I^^Oum@$H+Om|gq$P4E#!Qq
zk<-jucRZba1DQOCN>Dp9!6+af)E~&khDTHAI;i1>I$r+fbPUm2ZcYkPTO)TqRqtYb
z)4w#tr*%6$0;n9j7*1mRD!x1&6n?eRO>aQ7_74oy^H+>7QfT|v&t>CuyDjwp1hcFz
z(#pxcUhVSOVQ2;-+-c6E45+Kde}kq}b=+C`7Ccl<;eNrth!uT_mp3XoAK_W2S_$Tz
z2QgbxT4()(kXTB-<~pNEwGOTk3yd>v3PJSl@h2!YX83?P<&EnPM9;5%eUk1GTtSs)
zk?R|MI<?ZVv!+(_4x^nv$9bF+(fX=M+z2s)05@?)gxYp6to)SE)U&j*$6HS6#6a^y
z3Va6hycQGk`dJT-2<E@M+D@w(x7rg`Vv68-NBUX(70M0NYrz_ISyw~zOJsj-#4d0!
zn|0M}5YE+@aU+8f9>qduXF=-|$E8jV@^LA!iUVMMjMVFok_;X#F{&p|(TQgB{UP~Z
zUMMGyYpq1*ul1dJWN0cTukSCR_Jr;2_K_j(?xYs)Ie7gMx^PaoJThW-J+HAo&kId~
zd}&}lIks<T+<>p^Xxxym$?La|e(>jl5kPnm!SF#nCu&?%_U4WS=>5q06QBqBu8985
zw5?XZP1#%8u&oB<%LU^DcYUUDZTiEP4TcZIjSEH=m@gA7cOZ;i$|teVHja6doKvsX
zv=PQ(IFs0vhuh&Zg17K_{Kb+jYD9R-jd=eZE_0gQ`g5!PrPFwt;@#mhhPUt{jyVH{
zv(Ud+9VGiEM);^F#T3=S=u>%{Cfv_41K0m<f89PM$y^c31;_>DQ6>>X8g9JPe6DU{
z3yDMcRf8(6M5ykD2kioKA*XmZ+MjDjMsaiudc=N=U#`I=DJh3^uRpSpLa<^D%Ra{>
zaMGFdlVnmOsfbBNlFGC|>_F7vB^f5#VndXwT3S&wpiwM!E4gSabzwRGoC<p0=GNe{
z5F+o{=Jj`0ED>1jtafF0s2-TuR6@vSwDqx0?+t;)+LvtzxWyTjzP3CgYTA*P4i_8o
zY@ZIKDvf<2?G0O&YGj42q++smPX1~1RI<8`o*LQgohsR%`QNB`IlI=ixjot5rCe(N
zr?E2uhpOuXIEI85E%q&ueGMU^CQ+27jA87WcWhZ_5LpVPH}Wcm5``=YQTAPy$QZjK
zOZE_o?1p^T`{^|^&G^1E&zU*%Jad2df6o8jGxwhRU!a!)AA!3&8DBr{{9`t}*<ZbQ
z!OA)tt`*&a@~B-tGp-<I&8A)IUX~gg?0Xbf$C2-Dqi!&+w$3wd9Eb!Li-Gm%*kw&T
z7dc)sz0`7!bnL-si_^`#jY;A;Uafw7!9pW8(J?;uL5iJ&jlqd7IwWg_JR&_x-cC}L
z?Gy*ZkhWIYKHacTYtm`v@hK*MlVn_MW#d7}VGlbaF&eD!>x5$;`dHFcE_%|Ho-k-y
zmF<kRb2umg^;lK@lkeG8)-Xm^CW(oDm5X6A9Q1$Yo%H)M`6gBdj$4am2Zh|Ao}nr@
z(|1X@(c%=!UOd%Y_(9!f;%qTzM>@xXjK5<rdzH_`OFpEFBUZodR;!tF(2=ess1l2?
zXjSh7<D-sd4aPf^R!74YCLVS8npg&2egG{U;uyy*M0sQm2Rzg9zr$#$70pR=p6kaU
zg(lItiG(C;r3l7>^Uz?i8E?g*rZTPu#{`TD2aQ|Z5@l_&hkoZ3tm6vzg;9iCgPa!B
zRj1AGwav;Z<RU0Bs_Stx_IY;ySbqQ6{>a{zRZgB1o1b6|-B%yezu!3*r(%q!LT*_V
z3`{HbJD>(S+E?_}K4>A@H8EymixLM0D8ZH`Ivw<X_UrVo_B{pb2Qj63L7ny6_R%Ho
zQ=q8`VSgEu7#+eM5;KBzjEB`yYnx6#&Ughc{W8yE2IsT!HW#r?JN_)CgtF>6xVe!B
z9XV5(KX0G=>Ne{&w>#yJxv$hqQ1Y0r3m07KRPikdcybom7~ra#qi7=G{G>M?%rO_$
z8wLp$P#Sd8H4s|<$eG=%hdo+r)PTwy&QK1rzXOuv%D(Y;`7u>}sRNbm!s`0dlm*xK
zWi<=2dEGmp{q<H@s3i0P$DEwxt>CK0!jD(8J-U^OLFz^2&U(dPB%MdDG44Y-Rk}qs
zb7kuo+zLj~_VDp0tSKt?{$Z?=!kx9m`(Tm>MJMJqbuadLQ>M^7ZP-&|#&p|N>qOJG
z()z|%@yX5RUa-=`0;)xDqxX-GInyQDmvzin+ugG;kmgs3k54GD=(1I{gNs}8jWfP#
z4-@#dl6x~qx~jXxJJl$=zwrDY?Ce%(#XCpnAjUc3nG!Os?a<76X?p{z0OoR!6!5&S
z_4RiPbLj4A!+bZIXI1suPuMSX6wdm^-D<9xNS!b63{lnY1HB#eK~S#4dX;bwyqK^S
zSsfiSX!t}*=TV8R1EO}~$E}fOZ;{D$GA|1ZgPpTHrJtqowoPWwI@}yVwXu~`Up*<x
zAlFE>@_p>Wv8jr_S9XUR{gs%@EQ?x4Ra;eLTEOmg8kau(9DLs>G>Q`{bIg~Y(Dci@
z9G;N;i2Z3&_CD#)cg}d}w<(8>nKL!5PR2|=o88Et(fQ8#t&;XeA|?F$zOc^%t$bSj
zvxbO}4q<+ra0;AfG{r{laEh|jGdAA{{S&9oWA}aFTog{Pdx1H({P8Y#*YO<L@(^4d
zR-a1U^T~SjOSw}4EicbJHM%Pz^fq_eAm1=oO5>vJ>>1CJB_CvMa~Y>9SRWSZL_fzw
zHFS<)Xw(ey=J8Yn>YfA#DwKZu%Z5n{v`##&@y{2>c{9>jW7X0lo0N;9FAB^We^qWW
zGKX^7Y4D1$^QnIPFvebUPO#>UowR3ePh}_k{JinhqAwfl?bM2!%C{+n*HKpoH0g6g
zMj_wJrH=YWdLmwiR)?K{pGCt8H)Q#hQFo%#Ua>dUPD7UqE50BHZFBmH)jv%mpsw-{
zFc9V~&i5bN^W)+ShAu)B^uj<^DbKZ1uLgNkU5QPppc8*(5Mh{PHH^v6=|C$N91H{<
zJZ~#YQJSQBc+3UDV|ZXV(Jv$Q-DG)8VxPI7sx0%?>^nBtwK7DZkX(Xh;jq-bcrC{Q
zAN{5{!%L|@_~)&LX2gv`C9-AZGh^>t`YhdyN}Da3EtN1(4Zm)oV$IQ7&*+tD!U~y=
z_cC@!XPubzpW@4fW~A2Un;2;G+e9kV6x}ys#oljvkYp}x(dOFuP^KOWowG1;JV@{N
zc|*FPP_STA@9Xktw-EPGQP%sur>XFuA5Ha1Oc|Db8BUQ<@3{D^p?>i-HZkw8G5OT4
z<TqTr`<24QY7DZ*e9FEi-4fKs2}V3i21V$?itPCkB=RDnVK4aT(H3VzJWgrQwlAl3
zJIvq`lGnS|L9Gu@hwBTLeW?Cp3DVmUo1f4-YwNd!Sh|DTwD4)Y)RTtN?qSt-FI@?&
zh=}Q+^*v(tP%LR&(e-C1Y~3cmBWqblhA)_XI9y{!leru8*+IfA{;I(3THD-DKiM4K
zuwe6iN-kIFjm|B3?WfPA+Lzrhe9`Y`XGSNC$#NfULgAWf=Z1#j7VG!WE&r3NuA-Ux
zZ;Wm`=2d_!$KyKu#LSEvfxpvkOu21#9L)mg{mQ0VbL@?^g|!@0$s-tL)gKwnpQF8I
z?cT;);DW{tyxF9s#8hi+<&tmsv9r=xgB;bnUA)yn)R?gbYHZ0C>s&Es71K|4w-HzQ
z>4qaibNzQgEiW(j%*jvYGh=ijPpWpSn+2>rj4g879H@bx&Jl61Hju8%`#buIL2#sE
z%ArAq6r**tgzhaHog*92FYq6XtV_1RHMbj9+uQ5o<yoWTPgB)64OKeBXjVe_N-|vA
z{Cb1IYSTE8nT1sa9B6+WBh6p5$yxe|LAP?=u3J-Pp9v^o<<zuSQ?LSqN;iBqD3Rwi
z-sJR5P=RJ>JU^K`h}K>j>Gb3CTlEvL9;z-uZRi-TOC+tN_UKG8^i*ugDWvP>`(WY}
zK2F*^7qpwC{KPz>w&1&A=>k%yYA8u*N7#qpScVS^zkdW%%0K3RPLX#rq<%1O^O9Sn
z4q{^-lOpImt+3#c@$`^o(x<g${vXZ3YnBc4+Lfjsb5k8v92b5()9m`v3{7a{Enszn
zouGYH{@Gm3j1fKRy>%s;xu+e4MeDbeTWlUM$ikE&GuswV1zE4pAr`GO6vyb)EZ*@>
ziC6M_(k`G}R$de`oJ*=uyY1Vmbb6+^xer|gdE@d`+`%dek#JQkqJAhueA@JhZXPQv
z5jSpo(@1=+?$W0*?24_~1$o@^a!R)AL(xJ_*VhuGvoTmxG&PWeq*1(8)4TE7NC9Mk
zB?mTRnP;z%d6_D(x%eFRhVgxklbm;@ZFn%U!awga#<>S>TC1QTNRAr2*^{ofxf!vD
z{i_<_q7C}OCx`}S1jZ327AIl|U6^pkTn$7oajh4RhO_9(4jSCwP+Lv!ZVC^oHXIul
zOCR-7({uj@8fc*|37v9#{hm`&uT9bJ^)awiK+fgdx&%A4q+)29YYlF3PJK;_h9SJ>
zxyFkN5-Kc`b-c75tH*{xr%g<*d9QYswuycXKsK4&lhwJuaacZqTY^pN4Umr5N9<@o
z+@bWCQ$h4Y*~-!^S_2}QRm?v^*=aA{9~qLgd(BdMCTv7#$WYwKTOs-Ed{V3-`tHMM
zQ7XU3dXcn(na3G)e7^Z38K62vmsiKwtbcq^8>oiCQ)@({OHE9{RSk!p55~0AaOI_H
z%xxJ+JGHV&S-3k-Esln|b47DK?pQKQoem$lE(60ft`0)qQsoNFBUKI^rVHJ?se}D1
zDi@`VerMRqqHn>bUo|Z-zGe~s+4gP{H;r#v2eX6bN4QDMjSEjFOAl3T8kJIGTiOG&
zo6N_ikxqB7^ac2RPUCXF7H3s79R+cp8Wj05vLZIJ^+Y87FTNKd_kMD3+t<WhVN_OU
zrJ!IJ-(HQSq++39q1X?+ro3Ls0ZXtHz(Vamg^q%Hr}gVYR}%u3($>?G`HA^`Q)+n7
z{d2%Cw=2u9E&lmb1K$7LR2QtLt)*!Qk=E71-}wNrbA}hTT`z#&jsSIgF?hGs0!_H9
zvy3AgX=Cdl<M_|h6&bLTlPg@q-p0Y@ze~f!ymhpqy&}+u99jyB?dNB^r4)Fq^E>Y>
zfZMUuCq^Ybm+ktp9bpAPiR^NKmMXBO{X6O(selxzn%*|fZcaNv<cXm*>Sx8n0aq6n
z!1Iuw0O|z<Y9aw8u!te1d089{a0G;@1)d{r`y%X?%YZsa(VU$TE<5gv#IO`bip%)`
z;X6=|?vjAkejrfF@33<SI3OI@)0?y=77Lc&PXI&L#YjORM1W%e94pD;_8h#dJjC!M
zFmR!OI<}oNcZ=pRl1QX2nZ9PmT^$kx)NuYcHC$IBNkX}8TPTrHs(%-YatR>J1W<){
zg#ucWXGqaB;r6I)8h#XVVr@9NC+U)AE`k3ibH~7um}$3a)LsclwE|Qrpzanb4U$Zk
z9S!RtY>)_)hpvqW+@7?yT|F0Z)c|h|sFJ%}pv4VL4!>(#^A{Ro50LHmAaBh1yXpg~
z5(HGW9kzG3C~A@-?=`6S$*u`m?RsQcWCjyIp)%p=^4x|bi!fO>v2O5l{tE8)5om?N
z$>DYay^z)jetKC#pdx}CaL3<<G!Q@ODL;XPJa*)OyE$r!`-`8%iSS(RwkJi~b@U@9
z;U_pE{0lMiAV=EkAi+=XLdXmD+>=M<K*7&Q0!&kQ<%2gl9$^R{;vVCt_u$9lQBWXn
zkR|?`*MyjcpPzzIzU#i^XoQYg#6<k;48T;4SE&6-5lLpbAco>6Eg)2jNdPJ6whP`~
zYQ~S4Psoe8xhIc|n(@QD6Aq(8AUWRNYQ_&`PDrE<CP&;`G57%?3FklLZF0n40nv%|
zfggZwJCNFL35X!c`V~-;7=$0Ijc_70jUovmj9y2K!;hRrD3>>yG;Sx{8!-q!NCf|G
z?||0HN2EY|D-++(nQ*>)lt_~HZ<q;Ux$s?62`~Bt(nygAyrhX?_}-a>u#$8#uwCC)
zVi>+_2H}W-GDyMpK3MU60tjh_xqHyaoSyi`>4Y><;G*~U3zQw%cDxFRdx~$sM|j0I
zTR@6N%DkPJiEn#Gc<aJmL5hiI2uO^=H@?|6R@*JFD@mdLAJaABec<0x63(CN)qC&b
Y*X0EbaOXlnAp^YbG6AW4y0^dm2YmIqNdN!<

diff --git a/jars/jorbis-0.0.17.jar b/jars/jorbis-0.0.17.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b345106c9805306274f3b14652699b818b5900e5
GIT binary patch
literal 78890
zcmaHRV{mS5(`9mE+qP}nwr$%wv2EK<?)b#EZJQ_NJRfGJ-l_MSAHA>svFhqwy{pz<
z4MiCcP*k8_K#)LM0p*-mwTV6=KtMpE{}}2&CMTvUL?<OL&LAfwFC{LfqDn6({#R~l
zQdWkJejZMSj(TQlwpp2RiDmEDnO<6sR!VN(tqK%M^9*YUCxhDZ6@!fYw1k@T6a(!D
zgDedw)#kzZ-WeE3@t>g3|6C9BpF#iA`R@nRKj;4m`ai=!|ACn}*fIRi2$=sySerN-
znY;dffXM#}w03YdwsQGT{Qpf05v-sy1sD(z!auKv_iypSwhksX^d`1OE-rp*mmVl;
zh(FuBo!hR3irCutr2xn>Dt5(&isM2sno2m-C{##9_D#7?vUNRnsYXi5sN0v#hw(v-
z9>>Q$s|l_m-=koHF9zOk2+iTlZ8~-BDXz>+9u|)i4~vtVuczDm8=$qgY9v=evi;vN
znDEk=QG_9=4Dd``v?iDmnlH%7#eZ-UonS{Za}1Nr2c^i%*SxdZ%uI6vsYzgB(~D(Y
z$+>nCEvRM}G%<G=#;AkU4rz0bzrfO>XftJL;VmXPA;SNr5R;~osglY<g4)$evgY1U
zSg&gZo(N4-laH`TOsAq8s`KZcRUbKbF47=U#z01penmpa60-sHI3&P?#cWhD5?pE0
zX)3$|C3lpjrG?sRk>3y?m(m_x(6*PxXc&cfR=zpnli8#r{m6XUYtq~%$WCF<_>$Qs
z0DAN|!(3cRG@5CL4AywvN6~CNaEp|;=$5fx277VEA#U~2E&g+iPavtr>K<_w>%Xkh
z65`$2OE+#d=;pngPy2ou)fQC4t5K~8p(V&9n|sMJV5NA=*$Rz^QO4=tTuVxOW-=n^
zph+x#z{w+@(`at2*EzWft2N*xtH!zZ261wOsnhFwgJs``1eM>h0xLTLLxI&BD)(2*
z(jO#+tfKyjn}psm+{~7(+oJ<>IK%_HeQ?G>4iW43@iZ8KfaW(nMkm*kZDsaC=7Z)p
zZVDbBt=XJ8Lh-FC$S$4D@ST}t;M_}x?ipCc{lWp;HI^>0GP>UefuTJlp@6Q+RKT5z
zyTo30eJbX8a%9pqS(wtYhp32dvaSl1vi>di;5ABlsh>|=cf~=&XhfTF29fBELDjy>
z8OXhf#;nyc1d@GosP$sEe`TumQl^0SlqB8gYQTIBk3kbToWx7s;!F40Z^mR&9Vd-Z
zNA?9NOXYl_2Vitj=eA3OxzKCYMo5t|gSy0`8I06*8E@~y1hEn?jIAuI#K3e>YGFB+
z%D$zJY&B9&NDEzmrzuOzYM$(|Fqbs^G9EkiLU~0y?+@3J(;jD}a1F0sZ&`zL3or55
zABiK~ICEJM+U@jyUu1LY^>HQAl^?u(pyS`Y_-mi<@b}F<e=(xVH+=S7zT*>XcjxkN
zF8}WF10ty2GM{LEX=*ItuOXhpHo}8`1H=kq%--0!dmTs(C6wD5;foycYgFQUtEDNy
z9;q8(UI|w`QVj8kxY7bVIZ#u&{&hjc1JL4GzKV8*=-(mT$j^zwdv6fyn^cGvFAH0)
zwYZ!I)*eK%l3?%mLASHIhz4?sC0&-L>;yWbo`=Bg;6Y$Xq(P0iKJ&6pn2Lx+nL$?)
z3oz8*MXYQ?FFx}Z%DB;SHFE(_U+FUid1{4NwAsR(j=>mtx6aDf_E5g3);d*|5e|7H
z&`oTv3dN04l#%mPwlTBU^~T4%9g#!i8+r;|!M4y%amwr(jZtqG;x+TtmPTHBXtlWh
ze4|%YMX{cD@KhW1MpQT(-6vo^!t)8`{A2X<iZ6P<PNX~{+VotA7LqUoR$&cB-whQw
zv7c>Ydu&*BJ<g;xb$fq4QW58GsgA<D%6)38DIQ7KlT5a%hsjqNgGYbt`pE#uc!G4w
zn!!Z214h_C#jHdmtSO@v9TXKzR^DR@Nv_abIbp%De9#tWTyu_C#gEGb#qn){)tIAf
zsP`bUTVbJHj}JfMI{^hD0_RVsr?r8eEHjaA?Ub#`?)Dxu7v@OGjEvD0Yh<^XVuFBW
zmhN!1mx`xf44uCret`djy8kc3D*Y|#%l?Pe)ggg^DE=+OidY(1*<0CLh<O^>Iog{2
zZ?4@`!7)Sq@!N08cBMgtPDMX!m4sWhR7<g;L$zg`vql74a!;l;5^2KmNdHx<-SVXE
zz`)Nr^STE!%P60bn90u*7Z8T<4YyI5*9=7#ipqS%v&+@%GIOiT{xKT7djsr=zY8%J
z4Ga|w{K|MV$|$bM&9HCQqYG(>YEsiNw(10h0*u@LJ4WO6&rlkqOfs|nG0OzJ3Uk@I
zb0(XH=^ye#H!LRg=`l}{k(wBeFHaa3=94$wgnM?K-NbwPd<`?*LzP1yCoHJAtdzn@
zO;bPVfh16o0`D<KI1kYR;w2^;MJ{tPx4^6lql-nF^>+JN%X?TW>gFsXXx1?FBCG38
z^chQYYFrn)L0Pz_!}*MAvb1tQPI$Sy;@7Xhj22^xN2p*CTpXPu%p=C0GBX#f?sO0;
z$V05alaN%na+KEAv#`Z9JdT{Z8jl7VlLh27G}DA*7^KQw6Q-WDIhQ)4OlaC8(m&;W
zVa0vJQ9+kuP`JAaUarGqq;5KUqC-=)?bch4c&jTdHCYX^>6#Z(YW>tJs5OV+G8|yq
z%Q30U$l7I~H)l{YxX#?(Xn*1nINh=eSkgWq>C@*|sOm4Uwfuey2Sn)LK9K+mj5bV_
zpdcz%Mw%-(Cs*yyYcJz219XMYCbw4f1D~M=-M5%!VO{2%nz5U)ASqul^C5E{1=1R&
zNqmMR`c7YD+H3dV`Agl}U4t$CM~oHaXsyaBEpXvYZ0h9GX79n^jJWb#D2wbAp%-=1
zjlc|=D*JEC6Hjcnohs6?wq-kHbYC^vCqo112rKX1G(03<;M!#Gy;W@!eis1yN8f_V
z6Kuu!`H(7haqLdsv!Y49i5$NGK(Tc^bopf5{u*<j?uDT}vlE}N*(7LVQrl=^#ySF^
zw_9cW>J{_&cHfz;t9VA+VmjhY0^3KGc5>TZRA(03T7=2eY&vr6$-%rQmeKvD;!qGO
z8NEkgFbc!zP`O~~yVQlm;%(0e6A*#(7Sz%`a{RF<H$WkBIa5TWJxBodTS^oDjup0~
zx+Y#QrTfFh-Gtu{H~h+L2jb|K3361nCPrB2=S?lk%0<btt`CewYCE14;>5h>X3g9N
z+LJEy8xVy>;XA)RPm2TI#e(~qNn7Tq&T1~U!q!NI_Hg|)d?wIe?{T|@cq?8Z)E)yh
z5$9)o1d8n;dOBvJTsA8r><iKybShAL>{RFVGB<*ja>M_ur-uJXh_)iG^(S`NQT7*m
z@d|BZ@mdGFk)9$=759KT#sK&5Vn0~I;s->m-3j(n!0Z{K<f08u<DO%D?kwkwMxG}T
zQjFJkJYZ8;(WjS$rttL^r2>~jH%&ZP$;;zgTu^_{G!)fVct+7f6ag?|E&h6PV{S|@
zDg~X<68|yo#Ah~Adl4i9&Ze%E^YAr3?Cp`WZb7h^lLxu;3f2@w@ymYzAaBh5ZYFg@
zDGDx;&$7mtZoy!fleMst<&f%(<=+w$@b3fiA0TvR4Cy^v{ss~eHWUTy|G_LzH$cT0
zf_)$6rBA}3O!g&!Lw-+Df?}BXA=Y*w2s-(unD-vn$^HI+`AytO<&_l}2<Y@5qyG2&
z=3r_j?BHNSDr#o(k1OQn`QH?$C?_*0h?<i=GP1NZ;!yhpGG3_82)%<UL?c{yCUk#b
zg`y!Riz20b@8E^lA1u(<6(Hf8t$wGh<!*6ueYLs%_38fu)DW(QLN=vVV6xL!6lf+)
zg@G^Bb%W?yHV<U{t8&65?*`T|y|(B_mh$vP=)|#Q{wX;R=e@FhdYe(Io6u!*JeF5J
zDctWF57a4v0C^?r2aBV=y;nIzn<L^_tM_#LF)7)x)H(4{#UKw{S~XzSHvB+Jv%+{m
z7!D4E2GrsaZ6@+D6TkBAguveIK(p*x(lm1lvi0IZoVdqjwp;O?OQ5}SVOgSWg!`v_
z#=zzdR|Jdl6=>85T@&jfl1RJCev?{&=0GcWnse9|1RH^Wal;#|Wv8GUHP1?aaze)7
zkHDbxAnk>i$4n#`EwI49{#&@d<8Iesfq;}TfPe`9zq$Xfj4x~Wxaygu{#<Xl+;r5l
z79O+8*$W$3WpD9f!|000$XF3!mcSL(@@m`KCuOt7lRLUBg4g`U1V$4(((_sZ(oc=5
zkgHJc=cus3HJB=>GlF7i&S7gdKcAvCx3u#)ZR>S;xR{&xJlA{iz3uM(y8ilj-q}@<
z_rDYaIyDLaot!%%L=ytu7^o2KLdVl~4dY6SD}dQXa`!mbj7RU@xLzzWh~DOAM;sA`
zy*R)DxD}&gUBg=?F5fhu`?%igli?^m`?Q?RPdh9$X1Ba11p6V;e>J$<D;4RGw8IfN
zId%odLl2~v@PP9yVj#pr8c&0OoKKB>FU=`>OCp|Kt<xo#2PWf>nR~m+a)Zj$ondZu
zH?@%@Urf|p;Y|TvU~9LM<jj1y*^?H-`uls>j=Ct81#)g~u_mCQTREVFJEu+ad5d$+
z4|CULx#={&;dv=K)Z`;2dxYQjLis@W*4<JXs@_3<$zVW7)tzBUI^geY=grv4wY<2H
zX5gPOsvN6LH@|s!)Ne6vEvL@ZRNAk&WlkBI$M@B3?393n^2$r>mMy{YlZ=`Sp`EI-
zIXG~m)F<?&bZTq5y_Zf;cXFPb8_v$ns9KauIBE+?8QQAf8oEmR`0x%??kIBeOfTo_
z>bB(C&Q86Us0K-pMQG%H`+}mxb5gY!&SR0WTL3l|t^XF(E%|GHi0>~|!)GaV6$|7Z
zL@Zk&A}g_7_GXPmR<(G@N43>lFbpbiiMyA-FYvs;n{$UxiEml(96KPQW@l>MRaaH{
zw*kf2V&TrXmSlUQVumKmT==N?C^NnP{#%*SOKJeiRuQ|e%R1Dc9L+N)SUuuMaTB#K
z4H!`jy}-OsBoHB?kJzWSjoklgCk}ftRD&g0U02vkX4<Mf%3nBGY^MmD-P^(BuipLu
zNS<}ty$Zs<90p>#@4aKTRz;-Vo-}ypK$x_nuMXcKR^jpD4wAf<6kI(nE!9~Yn*~@G
z_?XG~ICKWD<owJ4?SF08<q<99<DbpkJopB8b1WvyU8<GzKRR2eT!YlS!?{#X6p-}^
zIaKB6s-EIIgiT({axcH(A7Y{UaG0{d=?^!K-Sx!|RtDP6PFv|2)cP>ga0hR%QjQ8r
z>m7dnbXn`PhIi@keFbl8ik^1HF!k+AED8lc^_JDj$=PIOp>wd&jW-Dz^?BDt5}t}A
zm|hBluKhwM%?l^h7wm7DC1Hf8QPOoKWrqK-$wB$EI;Ta8(WDzhjNK-xZ<b$h&!yLw
z33M5?F+>D<_(WSP;&||c0x8#mAm6ySS6DP#yw+!3bH83<m>pY%!nOiBU;}bVEs2LE
zVin6?biA>tHor2*jh&$Toj-|?)l4<{Mhdo~#DTF-TQh3BLemgv!Md3%sCk4*y{0p%
zw&PAf8mqhvnv`ba#WQRpM}y6w(~)*#=2Xvta^DFxRL1eB>WpRVNibui7dbg?9uqf;
zw5K1v))A59>9g$Or8thvhDMK|kpV!d)4OcWsZ68MYD;=ImUgf_mR1($bg8E>6_7&c
z_n&VWMI=KpsTN#t!o$<bE68z465`Nw1aj{e(woRE;8K{Z7;OFwiv}5Qxb&3JN0AKM
zN?1@|N$J{W=U8ej7IHI`6nUy!T$$V9#wI?#mAnnp>!QP&Iqt>CSQ+6S_|=|OzAImS
zBZ$kxCPPH20&2)3wAz1oRZ_R0yF5H^e`Vsw^YKzJYgq?Tco;DW)s(`k8-i==>KMt{
zuKEh{V9IBsIPVige)K>|+-#9zD3*7^Wwu3#Z<)1Z-_N#WpP~KTU|r1lh{_I@)N0eU
zlJV%(Sz^wo=Z(FY3Ja#%EAI2QTEXJ8gl=G=YU;>JS=Fff{X``nJ=-UxW56!F->yM)
z)b^9OtMGa*=bN!x``P(wx8UQu5&JVi?o45jA6P=4(lj+kD#Gf4Ziabcwk9&#oW5fm
zVq-smz7=#?86$s^(ftbf9$9SUo6=nD8Rv8}+79Eu?D~b}F}eN<SlVY<2$`Lb-(n!~
zROAo&0(V+1e&sY4&AAk!<i&9UcTR1vh^f+oCWm700qOts^U~TenJ!lZ%QcWfDe{+;
zwBh>)q)v;Pq-iIku#pU$KEFH~v-r{nnanea+c)dbpkQ-cDS{z;QGGyp)-`OgN3IQO
zXWo4Ge#nch$Qs2v`XS0cHTnUd_84zuQ?#Uff6nE5FOv6)bQsAytE_VvCNbDF0rxH*
z@7Xg1r-3V&A?t;EnCPE4d1{_x$#&B4Ni8z58WC8(nC%;!gg2lpJ6Fs*+vkEw_e!1|
z=dh3cM=<{{FW*G;(4fpo2_EE0CF<>o0sZ%Kc%#L7<zQZBal{PvGpe!+tb3ktHweXd
z2KC#DUuuyx={la~qzk%TT_sP*0aQ+@)3Hm1p+lX`a{cnYm#ysH)x#(v?JRyx=I_hh
zuQ1+#J5QS$`qQ=?(7%(Ht0#&>>XBATtH<%j0kQ{Fes+RPlLk#MG~j&(C}07jzh7Ts
zWa^ptUg461c9V`TVd;9yU;IE;=Nn7z6qZ&AJa@lSJ<fJxc24^E$G4XI$+a-ys|m9!
zEf8R8^RkB+<RcmCuE&3_u?|MxTJE|AL9^yaanq2di4Z3AIh9!f){;<6bL1i&pEg`u
zoY`d)bFX)qW!Cv(&(`qOyJ%Xsm8QTPoV6q5)bOt;YOe&8LjlYsUl{w(=!?leWfwa|
zU9SXTfMU!cCh~cS%$x5_s!J&S=48-asLvG6_e{_j>U2VHTruUDJ5p!V$X~rm9NUbI
zJ<AevGDGqDht)7EVmNf%kx~o|hOp_cR4F($0k~@3m@c$kWuJ`FIJr?l6o_<A(lrnS
zVkJXXfUP}l4V4f{orM#)$>UxvCciN?*hoZkD&#^!r4Z7v=2FCHGkA3=B>E&{+mz-x
z(b@HZ4m;*u+%sHFZyDTOE6G4i3s3ugCeZlIkBQUZ_*BZqqHr%_C6yUodMh<v6GrF!
z#DR}tzZ$@+MGFNJ^D!;$tgX9_hz5-xp`U^dvn8YRx^32oN*V_@nfznmS45HqfGs>@
zU+VyN%Ji?uYL>cm(sNjf3Km*LN+_oWdST`hyH<>iDOG1FGD#C`+l2EL)iNxF%zeeu
zN0iZqGF3C2AFi6J>{*3VzD_ywjq=YNbFMaoo1pr<&tIrxhD(#Cigz6>yGKVw_OMb>
z*M{1{8Mw}sx-j~@`LgNUooDgcksn240UozJ=4rNLU+)jn!%ZJ0`dG~w_u87gnTTMp
zDdqG`z%_Qjq0vHh;Ec@D8Bf6p;>5@suOS`*#l>0e#Aqf4Ik_TJ9I=}l1Ig457Z`*^
z`|UA#zP1FPZiuiJf(E^KsO=DQM+ma6G{T~2Mfa>E@?3NH<J+mpX+!|hx8|Q$NmG?i
zNz>->nL`uKgo4YZvp3G0O1EooFv0sGCRAmz=N^gnZ5KEC{@sHO>>&J6u$DR%hwTT*
zwDveRpwO0;IPdCOvT(7Sz1@qNHt{vSXgd~`izAme4c+XUK-ee@mTY#~=Z=1mcV@@-
zQ(0w(Z1&sWRw*i+@*Db6JQ1*t*oryS+8wx?X8Vrm-jrSqqib}LFX?R;m5nYv1Neo3
zL)~$SNwo|bod&^H<>1W*)w=SN4aYoyNsH^>qMHG<h3M)M1Rhfk_i>>2BXL-#8}c%4
zk1@G+4f_!hS+6|PADN>UwGNQ*WBEUX9{Xl*oZsU7fxC@gVOy~RjyJo<_$HYyN}k9}
z5Swolof?!CgUU>&n9%Vm?QKfaduL`MN`5+Y_kA;`z4@8}F(b##V)pR5ufNdsCnZjb
z<lgyp4R5)TJM3})a?D<(*0lO^oT{0HH+r_{S@+hsKVig~jKj8h?#i}#X5apZEC#Ee
zV$w6TtUHS=@euIte?_d$N4dh)h>IQ2ZOCzR4av~4AT4f8WdxR(?C{OXHm}DIaQi8k
zLFH7`&6hD*)+atNrg7&UQr4M)BVvnGun)zRb|Zl)C>q$fe0k@+Si{8aU;IAt%R=rj
z(&Gu^=6J*urhZT!n1+i-91Y!KP@SC%b<DM5?3g$X(62rZJq**fX6ts`YJiwxSdkCD
z(DJjI`~s|i09Jx2Q^OU>5KLmPM!nx~*~f}O7Y<$B6$t4dAWN98k|~_hc|#S(7pJm&
z1;by&c<E;MXq*vI9%y@}*>=<G4^JQ9KGn(Z$j^U5UtZ{p7*o<QiF!zo-s+}OZ>2JQ
z4XBSHnuPr+q23Z}($kNfy~J846pp!{H;*h9NCIfE>TnVbuz~cWyu8ZTg~V~?q<Bdm
z>Ww6lpWBI>goKA<1fM^P9V12;P$*Gm&?2XDEjArku;}-A43-;EXkt!LXicgA;JzCC
zYgr^h8EyXepLUxs0uT_v|4<g$*_qk9{#R8Lt6`(4`hxbe-R(i3Ti;%QBSv_D<1R$o
z<JHn{-35g}k_OHe2&3zS<i2XAF)X@BULv<Z&Lma5Z0+09$l}Jm2DxFGAzLn2mI*lj
z2=<$L6d_>oll@?dqx#DAssHUNkP`YgAlK#l^q%Lm_s>s$+X!&YFd1I8(R(8mgv=aS
ziH>A^oL7VE%=4>KX)%V684tQ(KEa18CS&L$1S6q|E+>j`lJN6KA~INTljLPP0ahkn
z!nzPqxafMq6#V3slR#cVDAiF!1OC&Yl$I|Mgu#%Ca2`4{t<UV(m5gu??a?|=9?aew
zP!DpS28d^WJO<h;4?L-|UZW6Lo*vxuLevYXGW0JxJ3O5txlL>|N+qyn4vK?dE0#Qa
zmJgORZYCzDl<Z6)n&tUiOw5J@t13m0$T+SWafx2ETe;g7H5C!Vs9BE}WCJ@|e3@01
zCP0l`U@O<WiIR{Btv#CscxTNLd~<a^PgX<X<kh(nBDLKW3qnTfm-(NzCbrzDVILdO
z4V}(vp^^1kt7adA<V-;5S4E)?>Xl@6H?+Dr(oCH^g@BxV78N#P!Hpi=d{gcp^MDa)
zI4aG=>6oAG34b$In(}(pn+WF89E$^~&ccEQK%%+ovs?KT-}yw3sDp!<i1{o&jhf0x
zg*AL~&nmM|Mzkn-u9`7UM~!RjnST(y>x&NgVE&>_>E@Q|6wS1Cl6=~<`~m61`ZatB
z%1n;qNmXmtu3Ys_)>uhrZ7q{j(f)-N88+<FVKO+oadMz`4U1wpH3-9gM&R_?!RREo
zet$K16`7wRW57uZT&AV~ANw8KAMuD4thHEoq;Ei=I4g{m5@HS&`3pYB9U(rm<1Yh_
zJ1?d~P<d?5PzTJ{kPIhi9oQP7)S!>1@SQ#@B%5J(FtC>fNjkO8IBd?~)h|w)y&OwE
z2KziDXQ8b>l+6y%Z|FOQOF5#d>5SH$)q?0z^iKyXmg6LiM?0VaDw+LB-<lfP-3G{X
zmD<z!Zq*z+hfXpY`ODJ)u#Ca5LVy^UwpC`z*<%ANTv;u!aldToRN;+i(j2^kL``ui
zd6pRswc7zpvQ$=G!NCtTB!`1?N|3uwXd1EiaC?Q|M&&Q6v*1e2jidqhHRr3AMd&|z
zaU!<3^R!mZcXfv93wf@tnZc?@GM$?}^gOXeWhC=LZ2FT}Pdh1CvyVFCpcoUunp5aq
zSzo&ddIkNN^nH8n2@V6?zg+lE@oo2FG{Xc_6Ivt&Ht;WPzj<dMy%rRl)TR>K!#I55
zCeX64ftB;SJ2C)9Np2v^lQ&xp5AeLjih~!FfCgsh+Z027)&(`l0_0{ZC;nQs5=>pP
z$;zQYCJJ1v;9KlZm7-3+hP0wfPLul%;(*X}0z*z;w5+zjcA#0DD!XENu+|;aAFGv(
zy0%ST_7~GRXYkQ=>atC$F~adNHn|)i%i5xJb4z3GwgzsXFaY)abSu+8WLq;zm#75W
zE~QUVc&3f5_%4zh3m0;*R&3}@Q<LpF{hqa@+i;)0VfJlv@$R-_2pUkn=pqpZR%u`A
z(x(G15YeB)>91aOcf1$g-Eh<beG3mSdz1Ogs6D{NU)bg>wjFOSk`r$nVSAVlWiif0
zyP_MiB>+U0&8uitO8=46>5=7cJ?K}?8^z1$X!-&!-9P5t=tTG69$|pLkfDG*kkdpO
z5rw%cU$5>Fka}FtT#(ys5C=&Zui1fWeSGy)859TWbc*T90}QwZF0VVTtVM7uXD`o?
zMr#R79;|M?slWCcPn2Dz5UqoNX}AF&2>fG{8r2lA!1xTm&{Mg(>*%vM!eN5A3X?H{
zOknLvb9?v9*}uk4u3fQhMK&2a23K4V^~}UlbahoLs@{940F3(1-w(gIo5?jj;Keu?
z>-E&N%Uvj&^K2kvVSUa|!Y9T`vS|`Tut`wgA*1|U8wtQL`=o~=zd^Tg4Dpp)ZM^1g
z2;=L{Wh0cGvU|LaLLH~^4mV~S#cDM&5sB4mNVNS#t7nC50vVX`Ym%p+$QcYX52XSb
zj=JMM<cZrTOXdd;CI_>O%a775sL3w1Qu~1G;2)|)GQ<Q=_8Fn?Ip>{0k2$3Y1*Goy
z#qRh;6!DGr@|*1#ezOb3e0;5ukNlMo3>Cw#oC(k5+k`M9*{9%1C+<&TnyRPao`%L5
z{55;*n5c^XAr?aJ6Fs7c=<b<=y;z1h=ziX~R9ccdESKBDbM9J8(yk99mz=~K3P9(<
zCqjY(i0ABuu<Dyb96}(;pW0a5LRYFZu8SZ9Vr2Zrz)DZgm^6u*rnzdUH>S#ef&MeH
zz%Rd+XV{-_YAcVlRSvboBD#G!^{r+8iJRoBfpD*dcT(*gb2@qtu0Zc}y6J1&YclFg
z?;8}nz@u3)wkx5TXR{iGBlfve`}2ilz{nUDns{622rGsgH9G9JPMHQ58Qx8loLr%H
z8I^;m7I`VAcFWD{Jx?t$wO)Ee)+)TbgY(SDNFd58ZoUujR27lMHsY;wbVq|>oH*!;
zWA@F@{i4g;HGJD4_1rZ_>J7HP8NL%C{+4KsZw9?olg_+t)$8Y31H;{=cc$y%^96Zn
zE~m3LW}tyersanU*cqCiM4Cy5R!$Rp9ieSYFV^fgD#h-IG80yBKs^GeN@|f>pc=WE
zU%oNjzwuiT+!<u&&wV3A-sd;c2h6OVW3V2l+s^bF`+aBee~z?r0hO5qveJxkFt6^(
zw;j`J*udoOfs@6AN?$e%%ze2$i2eD%<QAs|=*-fwhwUOuwlNa)ng9jNV!sFbX~ntv
z$2(`QP}xRb-`E}7Q)E-nNm7g96Wq3&d*own-^7>jtc&A~hqu$X(<70<Fi2;+xK)Iz
zRk6sPJH<@3sN7R{e_LR`r+3|k%BOZw$aTsiLT(zppiQJ(P)2*rWG`_>_QNe2)ILyQ
z5i7cd`5f62_HgKx4e&+AOhsJmuDSonV}66gJ6-knYC8Y4#&YbvVV3&yPV}wJ)sB)c
zY8r*d$Z-as5d?E6Wf)k+53}@!&=#&K-?*-&yMJT+t6s{`642TCXKRK0pN$c+f2)`N
zt8@P^1IknlA77Oxw4Xd52N#D0nZK3}n~=hY3Fz;0#7HWJihY6TibB-x)K*!ofvk~I
zQNLv|SNK#_9kaEObisI1D+T57mJd*T<xav7eD__shvBv@0;Y&sd3v+&sMXp6Zf;+A
zdR=->{T?P|x_Nwna)KG`GUD6Oph(pKYlJ41Q8q(fnQ)Vh!ow}>mJ!vOR>5*L0<A(A
zmu~Dw5pJn)@Qrn?{bVcoYY7x9Z0tve-b7o}{2ZEZe^qe&!}2#Vzc7N_i(j`&_RR~e
zYx}yzC_B^$TcO+4o&LxTayQnkI(D_cm4+Euy|#q$)J!>-M|Ig!ieyK1*>S=+!Ql*f
z$ERv>L~WD9y+jQ<umYn0`eC!fjMHJ?v>D@bhxGTNt?(Bd2*DvlUaJdz=DzaUW;z$#
zQo*B-f>#rf;v?OAsbY4^Ioe{R-6E2^L(h+b)~aZ3P<{Hyib#v4M~y;h6Jl#+LDoVd
zTcY=q$GOqL!S!<rRn-z}l7|r&9+?K|s{Z+1ARE2HQs2#u3N>S8RR=S2`f)iRtCaOs
z2uaji(dyk8P}$3S70;SBD>EXJI3i8NX{o<Jpvk;R!1AW{sXr_~Lt~MQGR}4M=ybwq
zmBS#P8a1ivTJ0%3oNRkMB*<wJW~UDz!-vcxK$g~93<hqs7-0@@p~a;|iE^VII;Qq^
zy&6yn`L&p#2+)O`iW<^RvQ?SerCrM-Kf-Tw8)*_`OoJ68;m+%Crp{Zu=XFQf3bb^2
zI}qI3O`tWvwKFYGllXNdoAiXhe>?*^yLIx^+dZ~BcJ!$-9!S=2`V;M`N2$b5vw(Q*
z5ah)~x3PsA(=caMz9XkF#Eg!b<E@1j2c8Cb`*P+9oPOzv#BlDZ72;DKr*Q{?S8rS&
zCjk9m^NLcq1e;yXk1gv-JYO<O5DoU_q`-Vp3FG~VG`lq-uAoPm$*9MGqU57Jn%}6f
z$1->MtJqhZ7eCe~qc{&{U=cBjA}J3ud=SNs6RS_<R^c7%819c0rdLx2WnhB9mDPa@
z<IDrG{nQ8gGs>U8*}{?Eni6&=P4dou-sl-Zcdt4ZBJ%+9fe5R4&p%{okEHDx#82O^
z4>3W^@&6=q1=Gs3t_dsA+sGDV6^UmDF&4s$fa&@nd{82BF)4DNdq<q3f4&z(^k|n$
zJB?zlT3dMEd)}3+waVm#B`?n7J}>U2QSb`h@yq9z+_xktCjEXFLSHV~v~J-c!)rpp
zY(#{6#mf@i%l)-Pdra3x*`YGgmxeDbb5l4^N9(iiKzp&h%kONF$Ph<S(U4+a-k?<T
zBjH4Jq!4EKCkjuM(cQbsxLHR<2{`)2d#=3YdyhZGhXh5I@R3UaMADZqS0tu#@!~<a
zeMTUt7m?dO$_*zgbnxKqoh}d=<Pu$J+3z7??Ar%krAt{mQZ3E$ao-Q3%ww`in9AZ$
zKtM4zsBpYpM~1xqMN4A7F1pknK+Hn1kt&=E2yE9Gk=!*E@0&iWM~b5Te<As~6H<$`
zhOg3y7lxuOVboPsb=YX+5a>~^f}%s4>mntFVHL%)#dKZ=wiS%biPfOB=#XMuY{ZIA
z3M_)eA|eg77VXT5Veuh_wz4qmh8`rFs4^hQ>ZIEO5ntes%*?&j{4q8P(Am$c1hZJ2
zrWBs1h{+X0^ce6c4VHHov{Mg8>9@IK*h7LJ@p7cMa`LsAvwHT8^i_EkskGCY$du;W
zMspP`?Cu2PqP^_BE%-*{9q}=0Q5LmA?8XEaPOjL8@kYgr1I<}DR*03}TFlAD$U|ue
zN&j&616;?)`YEfYp+mgl1_x)u-#*h4Ud{S~gFLb<FCQ<3KQn?9C%YEC$n={>TmxJ0
z!|q7FwPg<={X=yFX%=g=`9<3M9YU`Yszx7eL%MJt2AG`1Fj6kyO=oxDWu&03IRK%0
z4Kp`kv8z{H+jCxcM=G6(gE(Cb)j04woPKHc?Vib(CYikd%vx%3-e9)1F`#|b*R!V`
zLz^@hoVXK$HhC&aP|DwIO}5!h5~Q%Nrf&>$a96HojFuM;F_n!?%N@PtB6XyUDw?3m
zvDT+H;bp>o@&0y%mF_8J)T=VWD(u6yk%c1JvxO#-TP=aFf$e6FzBVaiP79K^P>Q(e
zY*n>W&N#-8&zU*IB_=P&NlZD|Z9vy=H?%bZx6d`uycAK_mXDZX<&OxAFi$kdyp%DG
zKCh}RW{KeWF?c-Mz4b&udbQ<}5Ff=}v167oqqLHOWJ9S+><-(vpp^1=UAbYxw{@4}
z9ou*9SFDj-VT}`SQ|eeMoBrJ_Uh*i+QPRe<ozYL;r<LDbuZuz*>7dKyqzJvIcQ|pZ
z<CNVKfj(`VgSz4;&swYLRc7y%XdLYz$4@pKm7TkTmvy!w)=Re8Qg2HeKuDor8n)nY
z$ZvSV4cig789MzVyO$fLBAOZnM<JoM6lp_E;+~K=E=2y0#s4{Z)a?3*XA0)4vK(fs
zZY5`=4Oj2pMiP1s(_I(4cHKIO)}uSvf|tBeh*bx#>3KQLLemGRz_a1JkkcQ$W^|tT
z^VZbXN6GlGf#iCM&4ni3qttL#)8duUc!cgysC1^g+=hi6Fg<8ZuNB*S&;ZO{JohxX
zyfbi}VTCEa-}!bTu4RhK4M@E_!4XfZY_v*TwWQlC0c55&8S|Jk73XxYK4dAk_tj!~
zQR$9(33L@Jpet4Mz@QITdp!2^6<%Jy^=vptZ8)1-)2N8*8h3MKU{*`3WYGO$FBdnp
ztdm?7!;>I)Ue?nkIS7Cn4ZuOgr}Lr|ME_aVir!2RyR<@SA(7!H4WN5r)<X`K<R-ZE
zL_}i>V3LV3%XCho79;vW!wG|q8R0C;35LRqujItQxU<KfG0`HxW`c^&#O`<1jkT`n
zvt40Nf10+4#W3Nc7s7FIID+a3wKyc<MeFihx;{#Lfvp>`Uov5kxfMbEKpG5>I3)Zb
z;Rz{yg`V^jrl$a-84tW1>!YR~vc?W-VTEm*qui1<X^a~&;*;yUR*mGbq`oQ1Y|lP1
z1flEWQ;m*wC1Y3O+n|d1pbVn}{CZim<`rB$B<jS{vEsuollx~O#4Cl}1jlaJ-5WJ`
zDR%TstHcuFXWIvk?-AX7UgC50%;o#X1#(tW{VM6oQ$8zZTN#!?isrs*DXM!x&Qni2
zoTG&O51HM7zZJ_)V(WpP70ymF_k9ll1)@anRnQxsK&pNZ#fpGG_4$zHTn{&ee<XbY
z<F)+J;Zve@uc7A9#*6a(sPS{tg<a|aH0hXH`A9}8xt_3ES7QCac;T4xcucBkay3cB
zo~-;&p6-MA$@Wwef^yH6NbvDCtEhjXe7ZrQ(F6a(n8O0r!zQaRzaYu6f>nxdg!rU^
zO5~QzFtlY%(Y&TuxiVS$M2axAMp%*tS1@%daaKjj0%>UwInAL})j=_JX;hgLyHI*j
zQGB$7a-(D@K}nJP^&sw<RZ!ILC~ve+j#eSD;wW-7qEwm)l<n~Su{V2mG?|DoQ9M>o
zAApi0D6$z|pit*NFKm}<Y5RDaKS*^HV+Z`;VmQwJr-33CK<ijK#2M7<s9}xmlml~S
ziAv2C6#8jkT2{i5{CwSSi*Doxn0kfk%6LTslNv8f4jPgt*Kh2nrw<bIuMra8a}K6W
z4-Qb*B1ql}FJk_jyWz=wcxdbgHs&}&jFN0*CPPZ~56r&`WMnfwLD7Gf_nvitfN=l4
zKz26&?`|SM7s?P-Y{kF6s?#S)mN~h2!R6?L9BL@o927xOR7-5Ci11fdG$L_2k#i;C
zO$0;~<xX^wQ0!_`P(egn4Mfw<Wn-tl=kDo6XU$Q-^0o^oQS#Sek;<~#)BBT8{f>_s
z+m~G4diRqN5GP{RVj<#4nGi5;d6ZKXCx32~^*_pvZM6Cz#FZ0?yu!E$n^WpZPFaJZ
z+PI0jtfHr~ic<`&ys8IVZK<kA9_`6^$bC2apn>SX$7yZJM;|3V0r8+=`oISS8#W{C
zck?+5I8kkj*~sJj#yk0iNwNe<$!s={i@437a7n;=EnRdLqUYrnmMhA<rQBb6hiw8O
zz)Bv|V5N42$Idxjm4<-l$Q4#?_yXJ)glxe)$q6eW&2A%$xdP8kjF#J?wtPixwiI7p
z=f?XY`cf<FT<sS{ygDHBP^Z$t_F6Yxlu};xiJ(}#<vnxJ`dr9cM8@PY=1cPR+k`wG
zpCuC<j*_haBWPaIgjI5DdCl~Lzo_2Ml63sf*Jy?OJ45A<U`UQ=@81ApS8iea*pU&Q
z-R-rF_WbE(JjpGMwt%YxAmwh9576nr#^`hUHtvJ8bpd&sWN-Mo{PPVKzt0>N?Thl*
zyh7Pz_9%PIC0(B06_{hi{ZL}cXJM!m??PB_uYF6*!_Z*E3=HpTbAmG)!D5Uukz@?>
z3S&r3{WA!^ZbwMmi_m??1`POMBz??+_xEb!0&4N<d6K0wO3nosiGIkC&v&k7aE{fs
zCH7W$`@BVE4wD^2GWZ|^C{|DN>#OtN(PcJ;>hii8(bcsL^<#-Amy=2^JT^mAwv*`$
zIb{q*SD=#l@Fk$9c-BT6<uK{^g@HOLq^_IOm9K5@-#Q2Y8v(yD>fee|8lkEr%Nu<k
zKpb;m1BBFWT`GK@jH(?ahZX6SqwrgxvRjbG!JU-lL0tsm1dU*<!{O_`&Vq{TljzK`
zptNL2&&Bxg6|5Ts@Q#@TB6?9?^@01-LlOuad=(DlW#35<iyXm_T?&LZ-og{Ua}~IP
z$AV+Tr4LfI%-P$4PGIpwt<vcQ2X~~N;0Na6$v$+*1Kd|teS}Eeq&oCc7=-H5hQL$V
zLe>d3oH4_e7cj}B7><*JHIE5sd+Kun)6nB{xzYpZI&#0Qo@Ieq=T8aWbHwv?iq9z*
zW7)?xAj4z{OuaUQ;=MCqC1+)6G}M^eD*Gpry;g-gjW^<k=Lyv(3MvxwoS0XMk?rVW
zbIV3JpLWmK_aux;$62v#gMVSASiu#IOjM<46@^6!9Tr)w?cDp9mc=Fm7h<wj`ry|e
z6*{E~gOA#QDp<Z<MU2$q8gCe84m?Qz<!(Z0V>S(A-Q3HP&MaJpZEET`PS(%dHZ=<~
zJ&~1}u<azu*Ewg_J82W@F4@N}8Yc?$os_HPDzXrToqmw%O|dh~3~Qq|&IqgIkP!6>
zlqK1>mUS9Om()?)uFUPJ;=ZuB#@jTDOJP%oU$5^riJb!cnTPGPw%_%0GRFUb3s?5S
z?6^caaxE4Ft0EYglf?%S+1G@=XiNbaQL4uFSNM?&yjO&wn3K(wY-UX~KO@b6NHzq{
zfwdSk)f7in;sm1)QZXW1>N8VB2nYdh&%Du8Sk0z%vn`yuXJj2bbbUc#glQeL^@Km^
zt7gRbhA$uFnft|4h{hkrvWIf;iAPJyh0)K@fC-ipdG3h*ZUhx(NR>9gwFZ%9M3xh+
zb_anAu7nGGy06rLOEK`qnfq?uAG#*}7;OYb9|(pSDs$(nS?Y^+8?*(l%ozg?TdDwh
z^;<~tJ6!TwzoRDjVX_AjEm8#Y**(FIXK`QuEQ)9BSVbVcJ(VnxDSV1ZG(GBKX4bXB
zkwNwAS=fw4G<>9xTE5J93eQp8L>0m<q1iQDOPd35mG_#WVoBwkyzDqZMQvdkdi9A-
zji6>57{j-CZatx*k>FtfmFcKPn|m=7fleKc)RipRbdD5FWjR<_CY6@XoT6!I<~*4o
z-VR5MI%sSZI#p4Xuv67(-9^P>BPvo;->7XKVoiC{t?FG29=g6rR4W%L7I`X{3b#P#
z5VOmE-olKA;0=9@lPP4Ra9%X>V3S7wq==)7J#9K)v#mr>EC~-?Db+1*Qy^g$6;@^5
zCbEX7Htm)OkSFy)tl+^W$&)^>Pw1guEIyiL=Bt{QO!qGhjgOdO^&y?Nt%<ux5tsi-
zwGIyfbi_?lXkirzVbLZ#>v+ov4^uZKGEez#YQjlVn-Q1RPfD39XIlOBA!4%9xqbl8
zDrrdo=1?}>0Tr?=KK8<!UY&O2+!8)NBj<#-FBWy>AuHmcdfO6{I#o!qT~RT9V<AiF
zqO!96&0<871M|`cEzM11#8O)1Gmdr>TulXR7y7YJM=cNtvFGE7h{YSS?ud|e2Z=sV
zyauy!2;`ZgJi)$&kT(>(PsRHyZ^XoiCl7LVud*RndD4KYg*W<dMF0}71J7z@!j6!Q
z5jwSj`*+*d_WiDrwmJme<@$JWq-J5Xo}(7T+X25l$HOzlXsKOVSCzlKzg!oNzPP>&
zxLR|9l>cSAyIh`_O<XtPd<d<giXu^S)dg{=^#x5yK7BNGse%sY_yjx5G;!8<LaU;A
z@@|Hhd7*QhEt?6eEl;Rl{C4##rT@|MGwno8!h?x{B%Pr@_1CksixDsA9bDbOI67E<
zQ7NU2xiu+OW4@?OdGE-?%91pu_26Z(maMrJzw@W%v%QBJ0FQh7-obzubO8_Hr4n)M
zR<sEs5am|~lX)jAH;W55^3>FSd|l3|2jeMTfZy5B)VU-hj4SbaaGw$Rv@eSwiV67C
z=ZIuvrp-jBq@r4E;x98>mU?<*XL@XseQ2~&wKA!{7+tn8sGEgXGsTbDLM$cpmKRgT
z&3$?7%|o!8L<}xVxELA3ZuT;<YfCedw$ICu_l2SfGaDYOT|_b}T^|Jrn$C37wNYlN
zz?9#1@gxvUzC=F8wO0wLC@#HbIQ={VH$l^hge@l1BPWuDG`^uzL~gj1P1m1Q8*!{9
z$lF5V9t-HPqdXVfAB6_*V_;_Tl6L+nB=oTqm;g%wkUQwo&s9q!Z#-YXA!Hv8faeRs
zu4}i5?sF3`@JB}Kgl}W}s>JkxpEe9(ANLh9Z87f1SQ;xG<(lmdOBW$urRqINc~QfW
z##gTL6i1q4SK0av{#)4USnCz|8~mq);!9HD6~pN>^O@mi#J>RsqCcPk+rQ9n+@2SO
z`wl$n?`XpQ;@G_x>MOPND?0WolJ}jB>|lTi_u|~-XU2HYnMwEjEHzU&+^DWQs<b=t
zNwfBAp4=!<Hkd)P7p8GE;}p6HQWs?Oda33B{iw1#TUz5~1BXty-x}XqI$zw^dNk+n
z?)c*?otiyZ2qy&i6D`eQvYXMtwe0i*V0UL86|%OXnRA-wKv8I&5+p66qnlXT?|4Wj
zJBZ`gx{mW+L97G%R}eCOZZ+;mhDR(s9!qAvRTmlok_8Tug?#q|qm9THmXCFu14)Aq
zVn4N#0L`U{;WQ3gwUC;J1j_>P{9hC4Ues3TZ#Xs5T2dB>v$xCrGkigmW*Cabd~p|)
zZoBeNZ>j;JPh=_KI>OIT#(`?<H&7MR0rEyTN6Ln$ie+P!RdFW?i+<yDRAV^JV_ygf
z$|uWnWd>Dry$bKp8-$pwrv8e_Zvf_#<mwX%KiAdKd0OgxxEAdW*WN1?N0zM<=l(<{
z`VP@N9BZ|%56-S;Q+hl~W?XgVU1qix+&O(?Yt~>fIdKIRF_8piglksHinH;u-1;2+
zF1hn6?RmGd3t1D38taXGfJaR;S=<Kl>WHe|q2#G_vLX-pj4zoyzY6k*X#V@=1i2h?
zAHYn<V$v&-&M3IaB6P}z`0rz3xqSm!+75e7+&{AY@0qOlLKdk$A^ClWX}9HXq)l)d
zN)XjB<D}IILOvQw5!EosU)-QcF+yZHL?Z6g#XAX$HZMvK%C3>EBKt{Q9LavEk2ZGa
z>1zx5sLALn*LoWnk}@TgB>-WjdkTqQT5RLqN>}MR9bBGdA?upobhjO?B`V0kLj46n
z#8iZ)Vnpi#b(2&+7s4ZCb`>#~ETnHt)=8--luEzi9DzR;Zd|8Z2hk779ZG0Pl#v6>
zHCYwKC|unN%A^=ln&$kSiTKv8Y|_}WzowD3V;~fZMcF1S@9CK!L?_0EfSH{VXmO|k
z1596G3HE`OK-U=@lNHbsgO(qa65z!`tTGi0sBlX8CV_b7S|w|=k&k7a7|W%hL+u0T
zv=zg)O`_nE4ZmTN42872eAu$Pr<IXy3E8C8iZP(nt>I%HiTi~~H8aY(1i@<uOvjg8
z%2hMFB}0NNg=A^Th@R4v9gF~TH*TcOcCEA*<t=^|v`$o3&mPmJ6!hUfiqq#Q)W(Sf
z)1%bsBD7BPDQ2c3Das@tp_uogVcewqRdE*JR>|f#3FHjc#2r#)#-jRr?V?JwRQ8i$
zf6)fJj6L8>=}Jlzay+0KCn)%nlFsYx16EJEa!Zspkvm6S9|Q^O%<!l(>Tj4+d6Jr`
zJYW<4Jm(~P4K_ktD<C)@P^zlc)}2$!BEVIRc0>w>Rl;t@`_HsaJk202%k!A#$Vg)N
zrYrMmg(n&IC6Z&Np9F`nzSXg|icl5?J?CVPyWBv!`_S&pCLS|4_fL@TGn=)Kq_L@>
zFL46rNG+a=_7r^SSrQD!F5hh57}`=g8Pt%7?~#YPm`Y*=$re;K&=Sg^jtNu4*!jo;
zu90>c9F9F)OMPWWFQp{3ikD#L59OXpWU&<ECsO*eLX=Jt07g2)za)AGGHwd_eC$#O
zt7dPUDz9X^l2=me)VikF1-ona=AQF!qHei{K~n&KV}M5Y6T-q5(oPv6_aV<hNsI{b
z;Zt1!H3Le3TP|eyk$Fbs_%M=tkA{S}Y>Pup&9G4+)c9~2%TZ6Z<<&#ab|i)0o9C3?
z9P+>AI1}UQDdv&fkntoa1}0gbJ#wHO_NngZ@zewcuwSul_Wzmn>sjz!GvdreFET>l
zF#TR^1j=qenCbgoi#hhhjvLKvk9bc*-uBWArg6mA53KdX%M0W<@U<NU^Q533k`r|!
zpdYFAB<GK@*jMpnzgA0UjFi#BoHZ_OPk0*i0x0mstL;0pqt04{?|}gfx)boiG3N8!
zz_LRynkzk_Y=%;8!SyH152#my(i=lPxpcy+*WWzBx<KnozAn^kS@fs#`fS#At*-Do
zPel%%xOV!!BW>0L?!;&A$?XksX8YWD5gbl{|Ab=f)&4<f{rl~S!!Ww}Ciy2gew4?H
zZ)X@|Zf(6i?+5s2ilM}Zei-L9wLNn8clMi|YW?WPEBMyH?cm3oNqee5EW+LCz0fx_
z|IqGG_#4D4<PR*t@$R0<uREvx(Qq;T9R}z-DWw>NNM>K{$NuXg+<c^uLwF~~Z#CSw
z*{I@sE+=AshKoC}`3Qz6b6=^ck#sSbZ@HYn`Y5v3tafYz43D{|?boukkRL>yJGy(q
z9y<JCk70ISg{!{Y12kWQKam6xFLxyOX#TYB`xHeW0*jpfby%;VX@LgT{GZY=d#f9S
zpW--TtG$D{8~5!Z*}nxWlkf7i`MxWr`|<%=uMBql-!*jQ@5UFsxIe{uvAvcyj%}@J
zg)1W&?l6ZN-sFH-*~J^P&Syv#z-gs_s26}kE2}kmM8F7ZBYmpcZ_syRcB=kspvldY
z%bR<0`LAXkzOgbxsk^|*B8`?}y)ls=B+Mm}dI7-*^b=E!q(C0pC5l$0KQztar6xmn
z;?qjDmVqDsWjTY{*AvV-kRKXOg~9N|6Wh|R_{;VP_+@~x+Pimaeoy3e{q8LM9D!-t
zHziJ$g9*}?lzYNAElyeQNZ6%AbMO<wI?+4EmExC=d&V~kPT{RF$rHSLd;dC8Sb8io
zDbE6>VR7vK73HC+JAf%ZmWjUXdvcv=q~%KUP@H|GJr&PlOY9M6ozVoQn*GM&FgAP*
zYNYr|)C4Enkav(AJHUhj%b`hXMBcsWo+{hccd!gopt%x%M*hB}S%q)CW(38sB~MxX
z6l>yw&qOQOf;#&oa~PYi*0%FhcI8NG#N2a+B1>isb=I1F-i0pvSZna4%0&8vM{yfi
zVt~+1H!8oFJHQJxx7W?h#x$nGpywvPu*YAn|5ukO5zpD(5*S3tQN8QSh>)M%3L1#)
zFySXo#GcGJP?x!4f^s-2?5_{g-?_d1yF9^qj@HyHt|E}N7UqT*V8R;Ku7e3&KPo(~
zDiQb_MCCL*f=Q6$4&2X(L`!7BLms2>&E0E-JvMBeWJ5m-1l-;98*Px^c^gJm@5bHX
z!j^oK&Ano2(`Qyum&>)ZT?!<yUvN#f1vcQAK8a_{hR+{;rr_Zo@qw3^P~fz6BKrZu
zf$Kj>oUVOH+ZKX9Ntg}xSxhaE+Oty?$6;&^5T2dS;Y-Ph#LP|z;Ty?9?bW)wa!4^h
zX1c~6n66eKuQXSF%#<H+&NBK{4WMV-U2w9gSOqGo*W-JA_NHNVVsp$YcE3<)9SyW$
z&wJ3J@}>V5VebGWN)WASwr$(CZQHhO+qP}nwr$<Eaog5yZNGW5v-@7`&O~HYL`GCZ
zRpiOc%Jb*R@0jgNwl2BM8ldNF#h%cmB529a0`R()<H?KUt8~Yy!2El5A(FctTO&_J
z_}L=mZv{DyBev{q-t)c}yIbl3*u_CHN=PNFX-PPNtYp9JS}_&Fo=e13vTs-l7AlL*
z5=>L~Dse9}4M9<n^Bpu}(d2ucQ(>8?DFdTco@fE1p4}_x+w2|obK$4L`pdi(w$5=)
zecl|)N6&RFhY#;7Rq{vSu0xEv9M=u$rv~f8+O4X|bhA~VBu__CuX2FmC0p;K_X%yn
zCcFWQs{ZXc!N1MOt@OzX?k)}sokH*Y`~2cxP02@_K$<Ww?>XlRW%EdE!fD0dZ7ylW
zSQUL1DdB%p)6>*OI6fva;gXs*9YsY&JY&=2k)ejd@LTTvXseCBuT+_4{?*g8vQ~v`
z6LjfXp(|BY#aM0bKDh%eJ%DJsbO5=uAuMeWJvNMQ>zW8A=E9KLK)~xt6-H+PqiKVL
zS2`HO-vCGJo(y@p@YU;~4yfG_b;i{DUTsKrX6Zw@HmKXPbiuebtUdE}0r4BDcbMH+
zeTIJq;IFjaBEJy7hu0Q_Jb9hk(3&@5DK=y=3@#h!yFsbfYdiR@#|y96aOUjBg*S3J
z@^(Uz*Yod8+VIMox*J1n2bkA+J0fg{O0Q^m;%x^}ul#y4Y)7d#fIWCuFV}-#vX{_T
z`dGl5l6-l9ZidXq2OuVPj1jnNNx+x+N}Tps*fKW&y`b23V|r#{Vu+M~(z%>0KGG!A
z4L3Ydkc&G}oW(~L4b>NoQMqgaz4WgL+4tGFWO{dE0&~OErdpsf^;88H)Afvp(U(ff
z$ttTGwaP-R$TTgD3RCTj^V-Pw4ePmNjJNR;EurYxCLcB(DrKM!TCk|80b!>N6zQYQ
zZsN=s(REH@iF+@qlC@(I`=f`Q7PuO#yCUYryhsg<%lIK#%>HGeju25>uBY={soTfm
zSghk|#l{d1Pw-h*MO3>gY)hO^q9L)W%4xFiwIPOTcGb2I-&KlW)P_5CZG&NX1Myr*
zP8i4w!g*s2*>I;co9`>M1q+>7Lgk+AgS_zMOy~t9Z$vYs_JXipnPv=rgEg;HHzf2z
zNpDy?0D9x9HS`Zly@2VA?S@dV^B3gyg1$Dj8)AEd=NaD){kh_uF{(Gj^Tv<fm|hR}
zl{k1rRBMu_4B;zA_=h9jK<_~Ffpod9zCO}7*15u-?`s`CMiQEluzwwM=5(KI)vXND
zH)qf=r@-*DYtPy<JSi?dn0V9WK=p3Hh$*hjmt|KBYbn*k7Qu)jB``<<y(E)!$`O9a
z0401}y$RvhT+vB~)bcf|UaBC1O}G{K*Mw?B&ad=(%4}gqeJ+u(_r+Bg=G}t)OXgfT
zbskJkAJgg4I4ruX1wY;u>axOQDs6))d3#*kS`>^{AnJ>RTKxdxk!6~gw~!6TK$yT?
zyjhbaT+~^UC7!dQ5~@{=V`<qdk;XqR3Sza~C1Q9D<$`vLjGBZ=(xl23t;>o`gN;pG
zNG?4%k$BcNm)KByM<S4NRzY_}Mb(%@p)vr@&Bo(O0Fu2M7CX&!T+wc+A(IEkPAxD&
z{FT}#Q&?f)iVa0@ppT#4k|Tjfr{Hj5*h0|hR6x`B6*e-$GnH+4z^^FcJ(K8kFJaV8
zknRIMWSw4N!cACzDoL1Q-~h*v#+)J4+2RmLs}n4`6K=XgP_YSH?ZHK3mU$m44^sV+
zMq}950s3{=D-TxN1CD3H*^oQ^4rxAIy#uoT5uj%>_>K*J(3=Ma{|@La51r^pG-Ecp
zF(7^aH?A7|fr%&TbqKPDUGBuUA@Fr{*@NHa;LDK}KLGn(z$Y{P$X(~K--Gn#l#lGq
zfV;^oXc3Tfe-D{AC8ji|G(ZBC;I(AK*mNWG<ib0ZPD8OFHm;DawGYLnm*Q{OdWEzc
zVi|4Ak+i2L&Yc^ks8HM{sHxUQobf16n@VRYa6gT6Zwv*wX4|7^)DB&C%Lw3gD%S!}
zy^vAXsF|j*QnDB}cl_9(gB=AGz;+G@(qkzJ$>}guC}$*F*u{IFBouS`5YzHhY$2oi
zA`vq5;0}sE+yisA3G_IfZG@3h$~)4O>4ug0IEpljWUCybIeDQ8_J-j}g<W+85ceM%
zh5M>0F(@h12#J9;4kV^wlxxJws<8;kmNwpp?FE_mQ8^qGD=GFCq+upcj{Oj`9BCYQ
zE3o8+0y96Q0IuQp$>BlXj*-9uGYUwsi?Ya`5<_NBj*=lAK!!6iKnD2u`j$H2s?oJG
z5^w(*$od4n>DdE6^Qq4{IRRNsv!wUv<ZQ=&YRQN0*aYD+ICeI2PVGR=g-oM9qDt#J
zx5R;)B!hfl9Fe;j5Cmroobn(D7Csan9-z!mg1bjUf_DdsLvUeyKM0upaG?-<F!4J?
zhQRm`FF%f%WATAZ9~7OD_z>%N3ytacAno(K?zdY5V16*R2jc@iKD4%nBLi%F@yWj)
zZ{YP|@b9+=$b5KwXXFFwpCWH*@&Wj7B7gVE4Y~3|lJa9neVE`*mG2bzP{$vX9iaG8
z%OA0FX006o>xW5u@aB(TJs9)FAgd7Tk7R$r1cA2?W@dNG8v1<6u_w*zGJ3OGZ#ZoU
z_~U7J%Nw3Op|oe_4bbmCZAtV7)$c-XxcVb&_oFqr`IBr9&FjLSHZSUZA-$97P4I7=
zSLA&$m!CR#hl+Yb^G9EAPJ9vchu{y;S0Ei~wzNRr;+jH6@;%UM)ifGVp1MPf*DM~L
zQo)rNN}IE{Q4qQ1dZL_<6&ME1`;zFt`|j$P%<0r2VtX+X{V@{&cB&)-8UAg~wax&z
z!ujVf_mBmdc(r~8?CCvcU{%_au4#(CaMvf|90amo;8p4i*IiT7p-_jJmqkJ!*<ZLS
z7X1Gqx|jq21?8DO!)l{K;d`N7r$TLB6`PuNm-Dwj*c>atw56OCTp=}(f^MTMl@#mo
ziOIScN_!qZc`gk~b2gCrGv71owZC(|!V#M(G0Fg>!%(7nP(pU7WB|~eaL(kDpfw4d
zvTY!gNvaJ%jRG<|Qw|<;$<Nt3WNZmk2cX9AnuJg{!hShZq03OBEXbp}(m||>Zh@vE
z2x>=&n+j|q@PpcPt_b$EQS}PEw8pZfWBq%Dg!D{u@ZSh`kSl_kQ~=U!)e;=Gxiea)
zDv(!%xl+c4We7E-F<30xfx0#~e+CjyFUp`B<n_i@wHJ8a;FaUfu=v9nQQDgO1V`PA
z`*)2-`{1Ch&TDsf)tj%?>xnYL(n*&^U(m7GP|3_asY|qJfJ)9F&4>z(a|*>>jj@uw
z&M0vwSz*z3xn#3J61`NbB!xO@w2De@h=z4DOU;wGmx-vftteDBnZ^>8BV+QD!>mc=
z6m@eGEvd<jA5<1+UkLew(&8|H#KH(KQ*g8Yk;X+JO2_sMdW%2^x+LhMlRy$w@u`DC
za!IKjG0?0sT2*CY(&pKks#!hc1u&6M<+ZG<CgF*afKf=YW741yc2K#u#p~IQ?IXjK
zM2C}gN~M?`Qr#>~+-p1}S&&IwB6AnfHiCLHg{qkyQUQfl3e74C$kWTjv1NTw*6cPg
z+b3HlJtW&jCbb-A?4Zsec|*CXB1O^ih^!g8V=}~lR5Pc?{VWRD_~^|M8)D}#h)d57
zXF+m6V|xXH8)4R`0e4uXYn&DAW;DuWSDKOJOf0g4F}Id3`I<^42vpbHMrZw;qk$};
zN2`b)6xr*@!I*c|(NL^zgQfJVX?$eY2;_JMn4`k0J*Br309jy{?uIeB$*+TNz@^P8
znR<k!KZZkP^MPC`v^6m@RFX%M%vdkUPv8-E`fSEpPmQwXB2<y;7S1VoRp;!7i`*;^
zXNwW(3{*_7$r4QZqh(n2P$P%oE8LoV_qw9?*IV>YW)*X6S2^7~I{YNY*BESn($l}W
zB(n4Vbu{kta!}>me6-KDB(8oJ38p(I@uipiF;av)?L;X*$dY^M!D)3txc(TnrfR~8
z`XDer*qQx5LpFZ6GiUxGr9QAa1NGt3@30P>`qJ6!*au*K$SwD5T&jC8?f2UIa(>h{
zhu1D$eX(+X+J})p;XLy8B+0M3|AzQ-=hppMp8Pl8QrMfy){MQ+-G}%+$v)WsW+viC
zZ}rJ1bEM4>z9(OPU8^yMUx56Iwz<t0@_{TH!XGvKZtTI~kK;eyegOGN&ymR===v#X
zb1ZMj?4QNfyJflj0aLfneHZ^(?}6-(w)O7Zk@t`N9{mom>z45wiEmPW%=~TdPV<{8
zcTIoz&)el2m_PE~;m-j4oAw){KX(7g?E>Vt?$!P+<DC1F**oy*5q^`-HzM^uelyZH
z<mD{C>DRk?O_2Xw*d4t_i2r2RWBq#Jr!`xW|1jBu{RYi9E_b&7JRM=y>Sz9y);F>C
zw7*e1QhxW_R!ibHdw2S+(d(oBdaw`s))@DCGSE6S(1vwTV>_rhcc=kAWUMc#%S$f9
zdi>BZmk5?QQLZ&nuy;thd4$XjvL=uETL<MQ4^5M&ed2I<q>f+D#1X5|Lnl%GJUSV_
zG{_siNP@lyOLa)NK50NbqNq<T#i?yk$R3f@yO-h^d$iss;$k*G;lDfFB7A?{r!)L0
zz)xky1b@n@_x7To9|Ed(c_V~9QZQ)3Dv`)_c^rX1;EJ9R911Zg!Xt@8NX8-}IMTiS
z=))r@j5;fk!J^2DIfQViXHml=PK-i2A}iFR2Zv6MAstdNNY>|bvqmlJf`90jeCs3i
z4rv`@JkmLQ$;P7WM;s5q8Rb5S;{Gs=a?q;dRD+Is)C%MjJR^}?r5Xjf6=YPvqLW*O
zM@nuY9-3ThFluHKm02*4s?>_+6w#LSk&0lWx^9LR>1k79wM>f?yR~N2)gsDnYB^@D
zk(pVwM{92K8nv~l&Me{~JGYXLoNu}<7WI;xTGmIYUBfztz4T?&`;wqp<VS^W(i<h_
z(V|`Uj%5Bra17(q$*GM;k$x%`iRM$ASsITv{U>>-<J%N*Q6BO5WNFmNC!SM3kB<J=
zJR17h^pNO_r%_0sl5UM2IsLDCMCw1*LnYr>jnX|Ly5(E+^vn6E)qmWFP+!`PrQgXN
zQa_?KOdT4AC6Om#@}G+n$ks5Fb_~Bkw#EFb!6UL`enqnwWNVnkBeP=~j?s*Y+g38A
zmtGh7gf|SQ5!|tAj_Hj8pBo(7+qOBxY#8WKv16r&ct=!?lO1w4Y<38*Sl5SqM{td!
zZ^<2d>jZ6B+M~c@a`y$}#CQ)Tk+pd|j`iduY#vf0#(7Hj=<@vcA?5`hOU?lvQ_cw<
zo6JHsuQ5pT9%E6sc~<x8^O1*|^OT32^0gkj%LICNIy8DuHYI(uho<wxBCqIOubB5$
zXPWo!t{G3yp~zeW84s%Fhv6TQ{pR}xj91Kiw=3CsKj`qM4-$alfZNz{Ma;n~5;6LM
z2uYYFLB%fOAid^cGWTm-_vR!ovjyH_>*T>rDvt}WxJtu{+x939_%KR9tA4R!=T~vz
z)%*&J#Dq*eeQ*@FWjKxn^LbGqN{1MC>KtKmQ7h#^Gp@htN%``karuj@JkWYMNU*XI
zXHvnSxADS9e-^~&vxp0{LXyz$Gj1^Mvjp#pZYM)0NH9vDS^$pl8nQWn&6qIKgh1a>
z!Z6(!M+sQGk-6qXk${(EUQDGBzxqT5l3!+&pk2Gl??*bsi{6!iRFVFu8Q9~5z37C^
z<Vi2W!dM;Z?(Sl^faB(AMc{FVEH1C?U)x3Ppa&n`n6>*dPTc-h{@^uz_e(VX<X<bZ
zUsaTjog4qb>AJV3kZBE-28`Opp7`#chN~2rkohtWmb2d8O`(vvhtBE!v@7XWllYWu
zqGM~?`G=_>Mc9&;1?Yvfj=A#&D3=ZswDW#G{c|gFZ%ut;O~m9yB@+KCS7Yv0qP)1s
zFb1mYdmiAJ84UU4^t{Q-T|sF;*S-{bf_S5!pggc$jvH~EJ94J?3O~!z;cp?<d*rj?
zJ6`#1v_n%RU+RUodKr|(!h$_<nVLsNO-r(DwrOu%k$7EXhl+<LpO|?uZ&69#_jR%3
z{jYUFK9Q28rr}2|x2k!2Q@vQAw)1*HdyxX;n$I#s=2xEidPHG)F-MQxs=?B)Fwe-%
zZv=hVB&=tazmPs{)bx68Wu&;VWvq-;z26<(0cyg9dZ8nWC2i)@Y@}4GuPPBY>%QB`
zKzN6;zJlu<*n3NO;ubI*l`7N3LnpkpuWDqn9l2eEis|sKka7QRD-Rx-p-cA)U8$}@
z#o@rb`@n<&Mz9A&zYS3D0p~O#hy2F}G6If(hA)VJ&j^E%KZJ76DTAy(AahUJ5>aoE
z_=c4hWxxLe)#;T6Rz%Q&ymxGb#Nw&w94S?Vv53KsumW;zBNAE-PxFPX1_&x>WAh2!
z_Q%TD)bs#e0#&4CVc%V1r5kw#B<PFjN*l}#?NnBC)kK|lD$py5_?c+@LUm3>m#T_T
zbu|V1nb4gs)GCCBnZUk;1ydx4Fs2C`8K!su!fYcL^rdJ7LoH)~>Z4)I&xSb?H;aNf
zl((#Lo)E_ggM4N`M^ncEBpqiM)w#j}N7Xe}`_yrslBXfST@HLeXkb5P-r&_VFIlnO
z11PFCshZGmM&57gP#>Ot)3=XEQ+||$i`X-1F-Ej__ccIHV$bySM<UZi<PWKU|51Bu
zeA)}I{M|o!xtlb6T1qDKoUm)U;U-ktY{6-`FdA`~To;lOS@9yS6A7Ji+{kl5@h5vM
z`_10+QQWZrn$ABeicLyMInvoZG~KA!e5q{x|AV6X{}A*lSx}gseyOL-X#andBN1l@
zWfw!2|B22kRfqIYSw;Q6&1Qcz3sY=^Axtn7PXYuCE}7~>g+&r5A`p=zW2T=BnVex@
zMm$og4lOE5ZR;rLU@2M=LQNo`D{vjv-P*L$wK};pvbJsgvRS40n)jy12Kn&4{^;vG
z%kiG$ecf)};hy(@z7qr}KWxB%U$-E*7N*y+-scM3V|M5bbcU^Yn(={OGdD;!PqTkR
zUmf9XzT$kl_x&7Teq{F6Qu|&ApY0fo$97CkV8>oJ+DGFDGb(nlL$#^S&)Ev;*%`nk
zax2Fdwh6?CTqAOJhwPMX=r-*T54&di)Clu7eT$5^x-%sAqgwan+m6=_x_&|4BHrR5
zaPr;}&ylZC!+e2sF2;v9>W7Elh{8`hKqSORy$Ub@2lbX|7zh2xG?1TYkPquNwMadX
zJm9M=NLQz&R91LImCMMMGILHevC|}3G`VP=^6DR*G&NN{qsi^9F#0|$J#nVcI4wF$
z3CfQ-F^xW@)tl4QC&83tF+bX9334;kG29=rsB#n%W<jo;m9>yCwL08@G@aaBQ316#
zrZQU_an=M?=h~cTY)a~WCDKcsEoDmNS}rV-&5X&Mp#%w;%IGYUS&B*ASWlT4U5@O?
zEJTu3du2>U&x%ypyi!@@TrC`DP;PCFl)(MP?mp6dT1vu+rPweF&*-N|l4K*9af!}a
z0oKlDS!d0dq(J$)x=5$mcG9EU+l+s;MygO9A?(Ivx+=_XdN8GFNtY<~y*EW|Hn&#7
z$mgnSb~X??8JY+YCDmj%bd(Looc_htw^b%mOqQxG3sNwJ*UOQ<oh8g~>he%3^pB6?
zc{U?4GaKQDNib9{cQGJM$v~4Ib7sZ}C^|G<Vf(YR=55GhNoQqM!^nIlVuh4*kCu8*
zod%qvkQgnZo-V!wCyfpZ6)HLo{W@ht_9t@V)TD0L#7kx4Avm6z{!o9oG}D(mb(KVE
zarOS#@g<*FhsuPQ;SS}o(3x<Va#e)eM-(Z2s;M|;W<i)oJCXG^j%?=F0jZZ@H7z>*
z?8x~D@!Vk1O=KRAJ_EKG3I(hY3p!M*0FEdQq`GQ==UVG{c?Qda+sEX=9@x;Z+E)OW
zFWeq@1ndcb1ym`>3B$+L4Fw#xqKOxE2JDGQ2kHQ!j|Q9t>>;`Y$K{U%vJhbkP`}p#
z;2)<4(g=G1@S_~&<X{g_4N{#%NHpw(p)3LR!0l(cy9C%x$Yj4y3fu#^L)(Sh$2IJa
z-iyLa2Xn}SSRud?fKdd#1-;|$nfCxupv6(<C^KjcT7^<0*T^+^4qAnF3&bJ$;Se;t
z<I+{Zn_OisZB9b>TI@OW<n@wXiX2P=ntGvdu%n|}j3HNYr9tgawc2<aE&C1gy1Fu8
z>&jJnhOUtkXF^PSnaI0P8^VoutK8L7f>vc@wo2XkTlCW>wzP;{8&8sKCiH@Gx%GP0
zs6IhCP07+aPGWJ^M9w0%bnek4m*q^Nn`$lR%;a(v^)5SU;n`g=uc^{1VyGeC?Vgxt
z72S?q-E7EYRqe&)>}@LZ)%A$8br<D*5vWU5Uc{NrjD1ozWkNK&sM4iLsN-@~)Pz@t
zVF`2QnmM0sPq7DVUIYULEn&$K{Uns)z7Q=ze<KDgEipZg)NT+e+&n_lF;ke%ea8b{
zHy{PA#`W|L*E0}UjiYfgU<EFQGtty+FcVk?Y>lgNHsA%`WUiSII}>yTi)J#a?EuS!
zHp9hWE{H!r^*!!Liw{<OKm^8v?uS5i#RpJ}N*Cxwy?xN@&>i7TMN=c<Fg*B7*D-tV
zrr?Dxbvw4)efI=6>xKS53j3_rf0ppmormo~Q5^IF{BfthFjfJAbH)bY3>Ai9tto=J
z;{kN064jUsB*C7Dz@2e|+anCSa|Aag0QhEiaEuOm=ksyXY|6#)S^RjP73NWV7U3N)
z@N0E1f9x9)DO|{nN^b^7j0gpJ>y(HsP}=ru3K|LF`z#K^RPcbRA03RWmMwREZe2eX
z$AunxVbOBK`>MO0pq>g4UDVIK=k?4huEn*2Z-%TEF`rrr+8Kb^j&9fF3ei%+gT!QB
zs-VB*y*;^JybQRvt<(eirmGMfZGpiwJul7X;7t7B%<bZeqsfw+1Ku?TV{|5cVip@?
zXU1EPb;qu{!#X=6@5D~`aC3IVZQ~ak=l6~DtkUnyx=_L=KLFB?gmoh0F%qIXmmS_V
z85ROwsbLhPeB&P2vYt5qwF)Z#j2X%L%zsSBC0N7$$a+{@t{ybj{>8`ZM)&+cv>62`
zi<&OQ7w992mA)OwFpD?Xj{;XTVD3szT8cL&ScP$l-3uR#llaKFnb`;}aHkH5J5QQ(
z`fGS&!P%QlMt%Qm7r7VP<XMMF*b6%EW(5`cdnk1=*CPBwalJE=xYWNkWw$tGS5}H&
zDt)(@?u$bApJLZqXNJ8piBTai#!^%vPbvZ}M<i5O7~UX4n5jmnXi5Szk4n=o`9k}0
z7vdE+Of4qmr1)==T1;Ddyp>=AwOBYujL(Yk?StU@s#Gn`Sjd*Fg{Wc%lV~kPTT|Hk
zVpKydNj<1C#8{Zri;+&H+|zLZU!O{r2}cX~QSePt!|WLcVa0M?<cpkqr<<F~9NrqF
z11<F#*VEv0O|dM-sDDbb1Mq1BUD^TJ+5+0tu27}6BYB$<z1=Xfjbwe3+3v|qxWyp9
zLps&KjulxOHS%j!?0TVFu_$lE$13uAsosd)GucZ8e8dmz$7;Dph^UjmWoWP#pCN?2
zCGlMg8(4UYq=#O1RC>$1ho*LrdW%#~)#zQ88|XQ#kFFFbTwpsae&aD*E1>{_ov?pU
z5L*bOS;HOOaQoGR@mIH}mVuc^jWxcU=1oTnNl%c1j;z;=2k}7xIbv;G<mDqnC2F#*
zf)(fN&2ex^*1OwDHEQp>O>RK@#^BzdOBZm@44pgM90&INf$2-^kM-l6wh4qg=&t!Z
z{|x!)?P7kfAJTUO<r}hDvm&Jrw)*<VC9$PBy_i;1Lqz|#oR+OHb0w158Cyx*;b<9j
zG<&fAzT4l><<XVHp$w8j3|))NcA=7pR1~{G4YQKkpiJJ8sjDO*YzcSD-T3925pQug
zezB&Ua$a4e-1ZL?Mb=d0<u!3FM%9Y*5;F)>Ti)aqnnE)u*6bCWLNjIcN`4`yn^W4B
zwfpo1mkej3>CWYDoW`Be(9c;2%|AtWE1s^Mx-X>^&&*EPXyLRoFH)@0>#7&9Ufgh;
zi*?(Se4M5W+J{tkoj6Yf^47(meNnD@cpsjPM&Zv0!Kv^Ms2uE195<IXB(;?*>vP){
zd+QP|?AgE35zDSqx%;JCJ1we$y(?!_&)~eD@4;fw*a^0p3+PYk`TU7^S>!4HMzb52
zpDnl71^M@QYpPYsV`!f9ToY<hGG+PfdqK#fi+d%*?ZrYvOqxgq6l8&!G&qTyMw~-L
zk@1%U_U$*7@7fFOEq%UAEcIE7bxb%(AkbZz4sAK?Gk^9lb-UKeX;}A>QINPXe~fzl
z$JC$CeE56^#g(x074#qSexlf4(mSL&8zj#=G&>!$nby;LJS5)lY95YUQ3niNfxc_J
zj*wU3#Z~-M>mODSP*sXo09eCRG+>pIRSL7Jg{&w!saF+J)rM7=&!<-{T2qzWD~MW^
zQL8^zHJ*d8%6C<fSM^sZFO2Ix%eho>6_Z<mT&vhra?4`X%B`0n&MG1|GcROng;Fi6
zSA=LQr&^z_65X1$igt>rT0T~wt^r$>yd_kv;;SE9%U7wYA8Cbt*kqKORj|b>=NbM%
zi^MTB`+(K4+~Jz~7ck3FU$N`$66;T4pOnlq96ERWb}X192rz->(OMFn@MpQ<uAqAR
zT!*ZcK9CkrQsex=in`|=^PGLs=-R07X$|UY>KrKQ$m=VlQbeCJA<;$Y(S_`Gp~9+B
zi6JA^_{b_iWtAZ=Mf$(Cf2Z4WZxi`}_eR0Sb3$3fFHHaL)BYvD09T(D+uC1q(}J~N
zpl&Xij{6$%N-b+*?SW&0sH|xP{!xA^pR3;dF>_JLzp$yn%T%!D)U!SBKK*Z8RFg4H
z8Ma>@?dI=A`~P`fN6g0F-id)k)Y!uLKOBeuto|ns$n}3<X%T#v>(^P@?z`2Xi9oGE
zmxI|yr5hC}y%c&pHcP5yC7K%~FK-_Rg24R)_@#1W?S<SkJwMEL=jP_-Z~w3dK(|y=
z7;T9`a-+S_v_Py1$R1}eC8sEO;2};8>d==E3I{zGjmnTk3AB@qYOSd@S!THX3t8h(
zV5Wy^@tEw9u;iENHLOXw(Qmq-k{P<nTDYl8%jH9q0;ZF;h#3~yoi*=Ui64sRG~%!5
zgga(nDQW9*#ET4d*f-b_#05u#gCwt>a<>bz%!-tuqb&U9-;YTWxe%mTTKSw|UG3E%
zso(9zpClkg=`I^Tts-|AA*Q`|neJ3INDFPnscvwt!F17GW@R?2E*|{*aE<}G8?eLu
z0r1SH=rPZVeMK!MO+07ML~Q{5AvU>4<hBU%{oh<RTX*g&#oxw91_A(}{NEWs($38O
zzc&7~+>ihY@9?ltrP5s}MN}fFk&vVdxg#MYB;;b~SZuW=<>r#xM9Z5#T|^|KUjV*o
z53OzoVRE+fO|El3e}DcSK%Ik@2;2wNL&fNoz+hpJaad0RvNlr#qOjb<gqea2ojG4V
z^3nIUOHqQ!2w6K!sKG(D(9EGiRHnJqPJ~`=!>VybJnaE?9qBs@lMbOQIZId`LX*2}
zRUb0PBCK$6ub$htNHWYw2pMI3?m%C0T$|5vnK<IJAWexWeC|4BEmIer{}I;I0;`Hc
zks-1+R2Gc+rB{pCph^uz>gTORF+s!0z>%TFvYnUC=AFl#(ROy7ttiZf8;^mlt|iNP
zmnWBJpbaoo!W}A_vWhZIX+^0-FmM-My$~L8b%9ieY)v!_Z^34#MvyCC!uj8S>0Kf(
zyo)y^u9AaviYC5B-6)d=@Uh3?aZy}x0sn1aH17*J{$?ow$oN0mMdp{+{QtI#uad4b
zkRk$a@#$$>sb-mGR%se$3urIuGXX@<iZG&x{AJtPrr$)}zkV--!UFt-_^8u5F+L0E
zVNPc6(_e3SxBm839>Ba}1VL0TETks{7t`=qw3NV5UMNxkPCOW)38WE{aoPoDwz-uK
z9e*@Gkg`xF0b6dXR=e&p7a=9=2t#jn$!G5l@}%r$(@Olc#ZCUYLvQ+NwXx;tkE>il
zP2JpQYC_)P;?+e><cpq6{|IxFGdgM&^fIG&dWeo`-_>0nLS?5s7~!so_8;GFQxA8o
z>BA_W%NO3AifkfHEO#9DmcTNCP*_mQD`X{R_eulUOC&gm(ayeXo5$Cd<8u;1vx>A+
zo@(~mxWd<OZPR}<!>9-3%<|Ddd(|W9bVi7b5%PKaOCYE;;2l9G0aw5hBq7Fg5yY`D
zzgtDhel&z*D$f=WRdEPaegvNkLM9QR?E-nQVhs^>2*q5@v~?j3v8rPv%^Yrt26(14
zK>yuvZ#PTGumAuP7ytlx|C<5zpHo<=2CPTQYO3Gu4Er8C|6T~dI};27NC}2e7|22f
z*~4-`V{w6OA;l=FSrX)X=1fU4NQJhWx~N9GXruPlKjoCabltVmg=8#HRNpI`U3S*3
zKee{D)wZi`A3WW@Z8TZF^Iv4iAV{tAU}xL?&hwpT+pjs!{Qd7Q#PNU~2>tLzux=m=
z0l8>yp!=ia!5w)1w7v2W8??vvA)mDg{m4$j3CCgw-IM{m9h?EZ>*fcy!4zY$fJxdW
z|L}p{Ncc#Hzl7{iow5^v1-Ikmv#SrjK`TG;O~081w*%+1s;Sd1`JGq6)px$Fj{NPC
z&gV0$S1;M;F|E9Ybvh5qsq^H1%-TAw%x0<U=k<`A@7@WhM4UlyP@K~3Iey5CyMa5v
z^&t)kZc=xBoi>F9pN_r(CV>S%k-s;Dbj;wgtMR_xuBhQ=x`kZ6qdlt}M!4_lh59JO
zf09DMX+N`t7E5Psd3z&wRgAf^XH}`!?`6nRwUgzZo=Ut>f-ajj<`P>Cc$TwpF+G-f
zccAiUW1&t-uQOkEQ*)^GTO<cHl5Hg^Wi<cfN$PI=NtHQaBTKTJ!`O*Dl?&B)?}{6V
z6H(<#+|YAXZ6aRX*6y$4+)`a#%#m(+QFAqEx39PQYi%ogav`ecAx!^TEAL{>*kf#U
zHQmv)mKML4Dc$y}GRa7u?osEI7bB*)>543=y|w&{xL4tiEPHNg`_?H${<|p0Z*(w?
z7N^A_*0GqhYcmYa=K~tAu-g&Q_jJCcprP@dCqf0H<y^V4=7uLSm}#+GhKToPtl;LX
zRik!edrqXz6iJ+|q<J<MdA+UFQThlZ>kwr<ZzFN)S;6I5pUgpVdq|yz$HY)zFh9LX
zrSO~{@exm#jmR%kX!u9ICnwu|J!{&nm1UtlCbG77qxSs9%!(47eRTAPjohTKlfFH;
zPP0}Wi+te<>`%~Q0d}>suzekGbFZE>jNQb`NtSZ#HIh1Ex_e~9W(SV?`Wt~q-6Odw
z1J(o^nB(u8ZD9@!vE%nUVv&X9pgdJ3jD_&VDG|RyV#)7O2C131-ABfj-!{1`v06vR
zn2F9WIYtp0?rUKB2#>Rc^2VImzH#TZ-{7(LlA3j*`<w1<5Bvtl-0zBF)9;FgK$EMm
z@~3Tl)aO2VM{IrY`3ZV#J`wnv?u@bd2bJ0UqS9?YVfe`}Y(9bN*WXGro~W_=$Ew-%
zhV5-W)mFacCN4dO#o+9zW-_h-pnh3b7t<`4rlFb1<mr&;;!V*)_Zt(+6uBAtgiMeH
z<SK-fU4mz!=fzZPZ6{6KJ1N)Gr&>xpT~Yb9jR}gAEzE!D$lj)ouyVxaWa%bF>YAws
zsSHWGx{|MZYsmRtNR&P?(ZDWJD}63Egm6tylEp-Osku@u5=}7E2Oh61&Rk{G06i|~
z#H5sBZY}%urZffMwU#5Vb!HR<vW|T(cZG8lvPLP~oGna(a4);ECy!)027skQOTJmG
zjfl!~l~^wBo+EeJxQbRoBNhAH7PZ(ScR}RQElyFdk69zCA0S7pW=Xr0F!kEHa#Y#3
za(TvKi$U#$Dtt=Xd1=d~%-f@}&zClCRsNNPJe4lLXH#u8**TF&`q@fO7P=?6(kbiu
zG$oHdlX_`yc9Xf~@GxBYNX=^NkyJ9{#VcDG7XuKb{Aq0^7yZe5jk{=RTcMMBW;6HX
zuva%y$7{V$^pP#hm_FOa>dQp&mnkV3{ba0nGQ;&oz5Cm0FsfciwL-u%&hqNDMASze
z_-J6j4kY!W7g_!A0oHM9oUP*nwM$KH49pPqHGYtsr>T>3s~MWtzdrK{1lm`yXw-OF
z%ZMW!_C=9;o?uL~$m0#;>hZ?P884o14k=XfSo!KBGYBMd&-a2x6b9|UIAwWGl-B^H
zy-wDEflt&9JFnfbB9zP(tBK=}fvp3r65$pJ`kEi$&RpAGAEO$zc}D>A66HEi^F;F^
zv-61l2Gl5pg}~MZOGJUk0B4xCKJV70G0#?VeHAW`i)(D&YF$QsR@F1>Zfw=p?g1bg
zZW8@6@Yq-kie6K4a2Nql#elm?F|35uALGJ#@ea5cfz`5vX<H#oZ*Dh0+JQ{%z&;+{
zpw(@HHN$Lynw}FVKKd8KaahcU<TeA|5$AZunP)78OFsr($2?D<k;Bp|7qzvB%ocZq
z<;4d$Lyt2ciL~#D0LOh2OQiA%3^7s*ID@c6WuoOM;$l$Gkoh&$!0crJ!OYwW_Q83O
z6B9=yvwiIL?YRLzJ=W<W(^qr6zh0S5G$!s#IK$amb^y|%FdSjUHWn|9(~sO?6_5Xm
z9ivqYcRixABz?$ae$14@RAt6ghsIQ9h50u$Hz-!ble}(BPG=ate3m07{t!cvb%g1g
z<ScL0bu$rtfP1FCE+AAEt**@>Hgpyb8o$(<*2YjJcM$5?d^bb?!k^DU&4~oCy#eGb
z)nNDYD_5AKzZnGjbpCc-KPc2|T_?z?js>4X2|`TyR_ehWx9!wacb0%<osKUMsxx==
zQoLAEN3+uSj>MiwO*4ozxT20n3xOk<NU#B<AvbY15VOUTZz(31ZqD8qq*JPB(|z0Z
zs;1dTCjU%#!|UDJ&%G`8vy~v#JbO|t?(Ck=18wj5-@=wI-@Nn_8FJR9x+m1AtJn&L
zK*^l=J{_usl*?*HoTox7rdQ9jMP(z7bG`BP?1YGcy?CvE2scNFX;Wap!*;b51a;<>
zdMax6WstlY%)lc|RH>)Tip=Hs3e*nbj~ASATszru2$b}(vru6fFCo#LYn29H0JNyV
z1SE~78amYK=5AI4^4uf(XbwZ>u*vt=`g@p#gf!GNA?&=P&T%Kab1$o?T%rSqmpP(4
z+IjBczB0U%y#)a4meo*rI6fw|b!WFM+6Ut>s<*A{h}@K2?LYOKl0_w5Yka(KF&VZr
zOI{%<Q`PCHH{CPX10!LTHCe(~InSK*6Hy`16+1mi1z(}|?$y|()1zB8GaCll%nn4u
z?U9_G@OyXW=4ZXJJwCk)T9`C>B>H?I{Fme-fS;YX`DDBibBC1tFZcszj?v8eMqfDh
z1MuIq>>*yx7&=3YcM3eXDuR0@1Y9NPUv+86eyzbaMEHtWjvBXvXr9INm06CWqc=7g
z+_I*GxFa^O#!xM=1`~-BMI2y5$<%U0Pi#c!>m}O6Oy&%7-6IwocME5ZGnS!Y8u43#
z_!46bv>Hf_r=P>WCInp&{RtZxocg*fa0gX$F}#7B+=k4&e;)d|oN@lrj&oJ?6c@ZA
z-^cl*JOwrj;=2UpdEW;iy9mbD#|PUmz;9GcB1B}_0bp!JJo?<0Xqw}V$)MYv8h>RV
zu|h|D4{M;Li3>NCJVT?zAAN<eSnp_T_p!K%uWD?kO`YCX_^OsYWccz~bwR+gh|U&U
zvE1s%bC&26-ry14fMu{~<T>Q5duN<HA*RhE%gmC$`+20CKRcR4Hela@EWV@gO~ZGA
zztz5)ntcnlkw<iyzx%#2<&Dp8_#@LJc<&vQ_EnTM<wmBj2>HmX9(`DG`js%Qh2Cvt
zT<S62YTcpXIlpH^Q`3oT@`BFDrkm|@gv|2AE-*}|`x`-G3F=N9JD*FQP6U{!#}edk
zTZG(sf;|(jH*QPu)po7nuVzppA3{*h(lZ{<CMNhVP`@qFI4y=5-xtyDj%0Ib$NSdw
z%7p*K!2N(u-%!t7^dC20|DoxwZ#@1+%YNhZqTM3do#>b8u_wI2I>frYyV?-C=E+}`
ztAU<1FRd{y?K#c?dKb6*Yi8*bY|d^h6LfaC(dQC7e-A11duA~o%$8se?761aa=p80
z<{r^qvAG6>nrh0&cGbtK=7MJdrB%!<#+KOGyQk$7^s6IT_pu0Y9D-FeIL?q=)OH76
zTEG89Z*Cqu1dDpwOd4SacT)$u>KR?chO{8o>Y(NZVeZ1jHnGJ^Ogio@o9J6YG3nJ5
z(psZ=(^IX@ON=@$B#Vg95cV8+yS-z^;=nYj!h|Gc<w1Km6S0x$6wOv;`tS0`au54{
ze@66o_Uk|L-P50jlpoB;yM7<AT)~*WehEsQGM;}Y$qHm#kw@{A{BBhMZp?&xBc0kQ
zv0Ew_?iEI4=an)O%MK#4<H%JY^OWI(%2D`Lm>$BS_vBzp+E!^yD=cWqOsx8|iqR{c
zRa&UkSgi8Ir+9DS?<jOj=gE!4nZNA!J%e)wSW1UV$qqCIdwI_ES>`%GSvk07gWhTm
zA;$1L9yk25+fSSJ2T8RHYvSBf>qlGcAuGU>paooa!?d{S4DB^)D8=V+V@6NW>}YhH
zaqzJQkqIPL<A=4@G?nh2`n>1X5uW1;rx~SahrlWU(k)Xf#<Xe-wJIu|IUHBmtxFB!
z(OlBI-cU{>lt;LFR+`DM2d~x@zP{`e%hMBfHQ==i`$@3A;=xQXFxGGQ{|a<Dd!R~V
z|Mi3a4+0V6e-(%r|EoZh?Ke`^7`xZ1g+Qr6jR9&Om2On1^i<%12%mkuMpmM^Uh?ez
zpNWg`N$1Mg3%h4}e3|Xd&CkwWFR=$ewNOzS&I=-FvANl@U{DLi9%RoIrwn-EF{F&j
z&XyARf_c|`sE|ho>|~=_N`6^=47T}<Ea5`3UlJC4bDt9D1TtTKH7R`kB&(_!Asej1
z)y+C?pCbxaike~n7-WujY_KH0CW14F=7O^<2|o%6S4U%)Bj!7y(W~jK)|(sW9a?I9
zKE!@ETg{yWF|B@pZwMqyZbo@zXXkm8cj7%CF806^Q80xIjlFDWyn(=3mWX8AQ?xP7
zHZ&$1fyl?J1m~G`k&R7QS0H)0aEFRuId+oa8*a#JUUizq`fOT$aVdWyHP;8~6qQ;6
zY+3%h5`n$G63+LV7LNt|f2$BNlKd})=>KkgWoZQ*RTSP^)&-emfyW;XpJ8(h2;dMB
zDWn90g+)S<umVV`7Z_MeCT3aLSCXQw8l5he$uTN+KPufuBN<J)W*5uOmMJE!6TayE
zUfydIzl<u*vpnxx@7pKe9r-+d9~c9)ZbS+XRbh5L<$JDZ)UaxpYM4JNFwFgv4P``i
zh~=6!)*W%Mal1wy*#}_5vSG4e?ijnK9`T0J2fkp+qGAM1i8{MoZCP@4&=Dm9UrEXi
zyv_Tz8J$U`34@^xmXxg-a?V3<-m8b3UI~AZ7hYzI%)QxY(JU$=Z01}j3E3^rBnaBt
zu6bJ1joVWksfms_+Rs0wN^4SO^|VvzPj~`1eaD}j+N2A!*nh$H8lq0UGN4MOLu}Jn
zP_;y$&%3(j<1Y_xgRT56ahFNfw$Oh~eg8DM+b@Q>np%40sTQ0nEvRbhs4r@(pgz^#
z+ilz|qzJfET^=KQZxnSNk-p>@jkzIDbB<HW=@-;RyA8gaf_fQ|x5wHpAk%SfxyTt$
z(P^klzsIQRurqVE<-W{ZU86elFFXZROelTGEfy6a9knLbH2XK0qPyV)uB~fW&G#6S
zIhh%<H)d@#H{rc6EXh@7w5HkaHr4suki4FI{PG(!hEELkl*u!3q?TSz65P1yo=gf2
zP}AQwY1GFN!dzn*VwgrS#t{B64ld%*{pAR)h_b~+b90Fyt~z2Nb0xtj!zklqA9e^c
zOmjBp<QjLtQv^KPgQr~ZOnUWqDTmjYFH&bPLW@2Hl$RsG`?#G+`bn0Gvn|Ny%eC`5
z-&%}BM*!8OrHs^D@*Q{KKMyqaN=U%N`7Fi+<w1I|m}pF})B}tU|3Ws*8$)p*I<8D8
zAMVRcm=EE>UYig5r!#Su2^(CWhvGlvLVx^3B&wfqIwR(@9Uj3S5QFU-&w{V&IBZY{
z*GXoQ`o_KTFJdHCRL)|m)Z&wmC?0-s2#3`Q-}2mB$;a*KsoDT79fDjDJc3wcq}~Fl
zzfhWIG~f-__z-?3f}fE*kXp$g^{q>VLEc)6Abz5x$VhN>8puOT7!1vklcirQTNx|Z
zaWD+D8`Va&LH?fiVx0^!Ha22Ff?nl8CD^J`D7n=l1+hg6R#7t?uu^#(NsscDo<^lO
ziiv+*c~7WQP@Wu5KtB_sKi&)fSwwXTBzW-^7E3~{xke49n8sRTO{HW?iB{UQZ=3-R
zvDBr+JPcY!j5hU#lBG-kEkO)FRs<`ZbyTB-s2mm_%sDxp?9>c@c7~QuD?{72g{l4B
z!r1P0ac=vdIJk3JoZLA*zAloUT0Q09d`e8hvOtinShvkUq0LC6%}}k)Sklcv*6pC|
zN-S?ZmG@2J<<NK|Uj7(>FE#i#N#L6f+>teBP`DEc{{%+f1mh>g_<b@Dt`2qX9nR%o
zDP4rQ3n7v^5c0GHqBV;TsALb|C+L6u4J0p&%9H&{p)<h$he_yv$)W#q68e=x<&gzZ
zc$vS7qzknLKv6&`C8C=Y09mmjEo;_TjDQYCMVe@pyIi}0o3)?p-vwl1?!n)RV_wrl
zeHw0tIi1btc*&jJ{l5Rb01uG0HA@tj5Jo$Jy>@CCJ7BC~vSCnR@}NxMtyqWOy1ia}
z02R?OsI3ZObPBrc|MN{H=*JDzsgNy+gX`Uw@I_0w)m&dYO}75FiNka)lc}Jyu08^t
z;=W;NEgbrzE_xvnt|;LcC~(>$uNhu$;&p1;Ai3nVu*Rxy-7GlxOrTJ9(QQ~!VO+Vm
z#9O|_WXJ8)waL=E(3yZ%-<6j%E;-&&Xyt{&JmiQz?XuOu%O)j`OHWe=Jp<=TlKsR?
ze^+z{<V-zmS_&L!qKZ!$=o4J`*|zr^kAKVNyD8ZgOC(j(FtxetyR5_-FE2*F`KRk9
zGkf?qCcGiw1f~rHEnKgu@OgZCQA1r6?r7r7fEfjY41+8Yy<ubTerJDu!`4le`d|Ln
zUUEKO*$_`}E=_N=qs;IS#b0_wQbxA*>0o~DQ=u7TM)@%wQQuG9=y$Ifb_eHy_Cqha
z)2*4dS!XPhz%bYJBy`K?K&#!#6!m$+DSg7}m+0Fy&LqZiBf0cz+*6quV*Lu~0tt?2
zmJPLpRBeh0+nEV*jf8l`B>BHCkkgK8u}L78(?MUL+0briHq_q-??{xI!KC_x^!mn9
zYm*<ao!i*k#-S=axRT8}qcF9|Bk%!x|FyHt=|BKT|E@Xyqr*}B|4X=xBr?usmM;2+
z#>W41xsfpYA6p`!^C%@iqE$siQAAAwGBg<OSnMPuSSz7pwV7#vTPbXo(ShSmhB7*D
z0DLL;aB-2?W=v<@{?5$K{eAp=fH?;Y(I`}$C5^?!RmEckvRg1$T3EQ0IVNIBS$R^q
zv#wOcGzBQ>OoWpWgAy~F{$M+^B=dIL1rnvVA;#0rM0_$d^f5N<ZC-vDV!6&$T@JwP
zohB7*=;^q;OeNh10t_f0b_90h#@ZtA+b@(!-SFgz#9nnS5B=<NJl{jGHHJF^kl<Vw
zFwdgb*k2xh$>g^kF`9mCj;J6+R-Qd^qB90lcxm&&i7)3~LXsB<vK~xNL}L|;@5?Ng
zK)IwR1n6`fH5scjlxL{1qCiJcM~jLoJAT>H5B0~4T%<M#?2}c(#j?HH<Msx%?iTfr
zS+q+rHLG?M`egFMY%gc^1^R~Q-UI(_5jeVi-BJ3RIT45Kf2*ng&mmu`0q&79y2eND
z-Db9IrfDEa6ycIYD$pe9#ttbfM1mlMDlEAH3nGN1L=l7n2s#R+VL>HAP(-1Nh=7<_
zhE9Xh>n1RI*&2W<`k4QC4W@9g`{V!3Gx?EcX?~i`X-X#kz1|59faKT@%54yc2tA7s
zBnrd_{jX7@gb~OXR0?DaG6tQZbsvPLxj}_4ms%vtVoa)r$*2|4nx>#(dxk;MplJXl
zuo9>pS_V0T&LMmNhIwv8(<~>}J&I*K!r3&+6RijOwoL$K?hoJ$5H#I@cgde#rVXKU
zul$x>doz!KuDqQzIo*DJlQNNQCwfvXEf31YwJS2I7|ne7NL#s8MWeG=UrNSV<^ZJT
zo4SIL!s?FIb`Nk;HCYUy$maYE`N-E0y`mA)mJlR$I=aFUS9<rtky&_ig+uAt&KrkG
zO(`DE%ikOKqG;rvd2KO?4o7~{4F7E@$#ZRBl2Ms#Q3=~+$GWE$6KU!Bx1^-zMlpq@
zMPPW64=25nlIo>&3XAszZ%WJljBZNHTkm;F%MyEh(%KGxLJ}LgOKHi@nU?aB;Td>}
zOVfv<6xZdIoaA0O3^6(yzX081BaTz0x<84!On>RIm9lf3PA+qI!t{q2YiCoDSfaIs
zG=HbhTJdq!rv-SY8N64D4z$~7g7v*~>ao`OrbL}9v3at!vky|In?09Ao$y{h=^shl
zq{|ug_v5aHOE9T1yVevNy;oGy>e4ex&a!tyDLZFoc9*tN#im!ow0}7?<;R5P9r}w0
z`IMaxi=Zhy+<wHQ^cp?kN$B&HWyh&y^OT;tIOy!UGbP76%H>KAg}D9-50PIwJdZ0z
zQhf@~(4_{=y(va{jUh@aA<-#FzJmgkwpgf2QbXgyl%w1ax>D!OMvSE}n$CerQ8zbI
zl&Qc|6sB$WxKf%7c08ptea~`In)iO-QkveAGL+eR*wU2U-X0Vu3o$P#PDZ;_Qk+Nr
z@k(?fxy34P2hvik@Yk}HRpuO}Vz=|9D{JO$%2q?n%#^EJWob$u$NgfJ!oLwpR*LnU
zDO#3z(v{6}#HDn97o(KW$N9x7sq=EhDy{YDi&kW#(-bdm78s;>SDG`F<W0hqE;6&b
z6fWN9`^eaFqDk8~D#_cevIK7aimxSiKdW(fB9rwC*v+>uPwte*hHeXQ;*q!``pMly
zev~D6ui3$OqI2|-ydEY1AL}tb`a0F?esguQ-`jP#_de2g!e_Q6eS}!@b;|ocfOO9D
z8<N1+;0xk4f6G3I`0_^aERrG~Tl${qJdiwn=JMp>8c!s@s{(q0`ESJYgwn^8%#T=7
zPcmO7W*%qy`;mL1<#tKrp#n2cHoNJ#KiFI>r15mC<&n(~7Dw@n$FmU5pO0%NoPE|x
z9*1&XPFVkIi0e`ONK0bhbSC%Ih8KAt6M-YEH+KW{WM;=Dy4^45C$>L$az4(@@W|<D
zrix2+|2`0(=>Dt8?y26gDZSfTS)b^BB>y<kJw2ZbPiLq)e(RgqQ~ubN`0BHwA{Ct2
zub5@|0VEae^<*p+4F_M?vc|qEZkfyHk+{UuE>qAlBe_Fi>u^paMeQ<Q+!AH4rL<Yo
zhf87meUX{c_IK_*rS0>KFQskGhq}~u+dXi}jnludC3x61#jOXQn&TQn&~gvgGkS@T
zG=53;RkrM@0#cW<cY_>W$*cO&ma=!*i@em^#$DN~><pq5-tDFMDM&wwvbV^Nu5{k&
z3!rp9UrY2nIxM&B=_H)L;EDBCujDBfUZ&tFw_im0-yk+#+0zkX&C{~7EX7xMr)3J@
z1%PSBXKD)KsxhP~%hqNhlh!q_6lSg!n{wDkFl|a=q~8?AlP--Zip@_f6V-!1^I@=<
zP6&dZ^Wu8dMUa*M?b5@;)EvZGO%s#9>HJbq6%{}D*(k*6Rn=kA#UiMvC`8)T!^1tS
zF0H2N=m~7-osletuBHOp*e$il08L0k-ic{VZ;h9Qpk-`6F%yl6uW++hJYE7bg>{39
z3BkIT`PnfHj;@a8|3%n4MpqhTTf>z~#rBD9+qP}nIB^9P+h)afDz;C|ij9g<vGJyF
z_x;g5`hMTf=NV)F*=wym_MU6bxdi%_OxebL!{CLWM^9snE>n|J)JjQ@R+|VTh4{yP
ze*}l0C9?Q^WWt2JkM%)>6zhp%K#1?5?5>%|(Wa}-lqX}&QkObq_mr(B>8lCk|86Z9
z3*0?X*c%&;KAtZuX<arvM)5Tcs`#$g69_9GlNy-{xFS|?;B%AL7P78&_tQ|;)>2uJ
z7I=HE_~?cu6_}{}LvIpNSW{f5sXj!+4K?jXaXM^x@zk+tt8f>NLbzWvrmL@a{1C^m
zvjcr^dlqvhoTq4Hjw!!*2G*ygXTaT-H|Oya|43QKfbAWJcI@=$(hCl2J$t&$7{wE9
z<*OZi+Xq(6$9S!Q&7iqmPs%$>ZjZC8_;+b-_URP{*&j7I-EbmtA6vKIyVfkRnK6jj
zxU{L)NdFdbU~yj8WOj-d3;%9{r>QNcyMACm5k)|Fj8b*gnT;U`&U)`o7An=yd>xM*
z2i9O{8fkJU($)+PS3S1Q^AXp{7&Qse3s?`a&)HUEEE)flyGq7bin?Ws#L&6IK8u{W
z^-6j#z0(8!pmpfAtbW9EZ`zdzkY{<Z2%!I}TkMb}wFYD$jKRnq##&~oZUs-%z7k)j
zM$9oE($}&a+|clWdC&p^Hf;ves#`TvJHQO<cLkKMDyVP+NUPIHvIu-*?iP|Utl>nh
zyf+p;*yox$-#rXqJQMu*eS$$t_s=~XdiQ$47E2xvwj3Ofydp`b>C_^2o9uF0{ia9)
zWX&|H;@{QXtfes+msOONwDnc=`|AP1f^EOVN){UGBlANI9q1C%r!}gstPDrL5n#tx
z+Q3#aV8J#?p}4n^D=qHt*GJ6;XU?72It<32B&y^z7B%|7zYsS4=3}|naR6|E)3YfT
z_xKMWNvrMlv7ptGnyJ8uoSuDzEM0OKVIw71ZwDCn`Gde_4|DtXWqL4?amE%auE%UX
z_AT}Xai;VNDX-JgQq!JfLDBT+;0@9AZ7R?igQrnXiaUB=?c}YkozB~@VHN1*Yty(M
zb<M+StkDrH$1_F`8Rx1<+c(@;k^ee8V*EbWRN_yiWQ;ep^Xjq#<!VqhtE)SA^vFyl
z9{OXxDxCCM>p;oZ!?{BYiZO&3p{D6;rX)R;4{eS*1N;Zs9j=^@CAL|O7Ck({oLJ$)
zt)pMxP3;iTSrRMfm`P{wd!TkXdM)rDM5O$FM(wr)#AY*yhK~b=Su%2<x~9y3WfdvG
z;TO#radOA#IdVe6H5nnuFzo4}EiUvFBGltj_h3evg(s|ySZ)ie>~fUm?B}(@lN2vb
zn3x#}G;GNAfvB61>8mk2%A-Eb2Ysr?^;oB`^EsBBtr5s`siGTj-Tl>dv!EHY+pXYg
zHqEiB5h~peIz}9tU3^uQ^Bc16o)kK|g<r5T?}M_M&Qtlbztu-q3nAI}emf^ZT@6Cm
zC4$^-`x7j7^lgI(>{n~{Krx?GAgYrv0@;9^R6xjf=x{GMZbpmC3&Vx)m-d0I8E^$*
z#z#Dd(A<2^SFj8KWY;WY*9=&T5ob;lqt@xu<AlVS!ytjgnf0K7&&-JA#=GW>;VyXz
z>?>?_o7S|2(UYp?IaDu-Z$cW9C+j^TKxia253FjjIIPtQEBMpq6~+Y@FO+NZ@bX-U
zCvDcj70`$fjm5DX1MD2y;dY0`T=~+EBZdWhFRv6VL1;+Q>iuE8r-GO3$F+Ybl@LR!
zz$g<4aVS&A)yn^slYO2phzezL{c{fIOp5FjMjp;!>>82t-F`ymg7Sc8bG8AA?iq-|
zT~!F`$+<?2TT~<HtztJf#d^3${Uu#(6QQg5{v5f&w?ivcxx{uk<Gp@WlH)9pRdB;0
zvN~i+<#T^;pMWOXJKwoY)@XajARU$zpT_Nm8&`6EgN|HRW!%W#wANi$5N%ghzdT<F
z--khuKtREpMd5wZH)hhEM{W%n2RGu1_FpsN)7?Q&J?NE6M=IPV7zqo@|B@3-;tAtZ
zhxA%U2<nvvz!{3b=osNi^m;}IGB1A%HKmgqyjO~VQJQqu3Tk753F|Y%gZgwskQ?IN
zcF!JlyJ>whNDq)Tq7XoAV9&ybZ1!?TOtJ{iunV^f$XpTenK9Fs$A{e6$_opqWE;1~
zVY}}AG9QhVw?b|;0J5KfI%`3)fH>1^$r@MgWVMLZPuTF#U4QnBHFFqXP%;_iXqoK`
z`-P9g9UXA)>HyVYLD?4+1)~ML{PR^=m^WJSKqWkg-jkONQH=Eh?|7!cXl$0pr*epz
z187Kp+mxk`*&+Vi+Vs7(aOKzznO@-#Cw%c+nzWSd6biaM=Hh)Orfc&zw?z@tFd!~l
zeHJ)>6Nr(Klc%WOx-RUu17f4!kG8HhHg3;44!=5GrEy9X>}NJYrII43chdKy848Pq
zl#e+)5Y->#g(}3=dgul==0)RZyb5WK)OPE{6=Qf~Vy@a8PLt*-b7IZ1Df1NT^O`z;
za49RdkW)RBd*}pPVp1i-9ar&H((^_3y!3us;(3BTT<qgt&dgODN*xlF2>YvbZ78o0
z-ePWS(^jJ>)S<;Qy)E({fZE4Vi1=WxIMw3~qfqY^P0U}l>%-LdKVnzoL}=(j><$9z
zvb!uGyhrzx;1zqn9nfeEFniO#jPu;5@Oa|n1lrf-nBMDnhO8kvqx->e^hr)w8q@j=
zRQvU6ka>a)7(+FiTzu(Z#=YM*^33o(z`#RzsYAXuh3O0}c0#V)Mpg(U<-(8M@$pQ0
zJEZR<+yseVA~J;RwL&UvQ*cG_?w}I{dR!rRB5egfT#-J0Q5*<+<Zk)E73j;|R#mtd
z7J+xtxaqh<)}Jn?+LmYm)H9ZXv5COBlapH91bo2KGX|t=jNbDa!YTbRyXSYOul7N~
z6OM&(9>=A}Y~Y^JL9!>lUabJby`CVq8a_GC6y*&>+5WpR^!jZ4u{}9N3`MD~=|B%T
z$u|vTKJ4*$iHrh&_ik})O^*T(+Q<a{6mCD^crD)g&Vabv@cS7>l7W8WHf{}WOdfF+
zGG^UN0Z_lT4cQV9azF-SqAtbP9&=SI6lLy1xe7=Bs3|f72JHcO7^wp_A?Gs>)0qBz
zj2$G|BPc)6O=JM*;z|6ZO39fVX#sbbN6kxkHyDMzbshp9HF@4Q*12OegqtPDqtPTv
zlhLkJtLho^Xtr*&N3&xWh2W2_h@%T4(YF!vnPD7}XGAuHI@=`);H|eW51bqS$s%SL
zA1HNM8o_V^uU)l^8}R^~B_POLJ8Ow^SzZgF`6acUb6oxQNz;Dm4e&be0LQ&fn#fBM
zVJnp(9G(nymaDVtY@hXXi!vCmox*oY8n3dC-Z<NXHaYM#PFT3HT)J{&N-mL-O7w+k
z2%`_8@lM}p$I+20W$#tLSIVW01~-6?!px-@zC4`Lf<%#fV(ZeWn4sI55{|(D3bJmQ
z*XXQ3Th32BV{>cPGHR(q1rS>-*l29~BjA-^%2Yjv{|)~l`0M;_5bHTNzn+Ww6|#CI
zWp~@7TY7O|(k`{FEC>b995!S47wtv>g;sRFQk2GWZwu&<`}u4i{>K;69i}a!I1^H?
zn3x?r%NsvqwpV{<t6nYm0bC_xm$PtsCIa27-y}F)%c-gkR2IN<rRafSCa}{wR)GPe
zgtR)^i(xXp3I44?Grpm?IK|l@LsQ6i{|zpNTX<$83n{XDm^PRO5fx_MB1(7o(f;gs
zJG`=?;<P+zem^N99QfIblGm(ih@gBtj4vc2;2v7BvOnWV<r&2EYH!r@DS}D0Amdo9
zcR<g%6!BAjml#m>yzhwiD55Fdviz1%H*SXsPNSSj$Uhtr26TgrO;IQ@y4iy`C1N@0
zHJJE0K!<aZoHuRo?r(@z_^lrtH!%wgNTDkC%5O4Ez~*avqmeDAr%PTd&dYqGZ8qbf
zwMU3_s2Je4!Ck5DyXa8Qi7*DOFQZyz_C@jqb$nkKKdkayxsVV#Pjbw8BeyH|bQ<TP
z;@IW_(IqQ6*7E3O&$FLZ(wN`BR9S_qTr2JVIcGX<w3R*5(xd|7G>=)`&+6?^xYNGG
z1=$-m*ur4y7-J09qXRGqM$U{C-i@MK`C4WWt!g*o`}Ol(s_ovVog&=UVqPDeo#b#5
zh@`rMfo(c3SdGMw!Snsa8|aypZId4Dv}+u(g`C@f&E|S!kaiP9Y?uaDKuaY&Y8_s?
z3B=lv*a%1lFt*bCrSi!_cc5ii+DG>1SGX&8Pvp`*(REAiDgP#)qzzCfnx)G@&VT?L
z)~3-9+`q7!mhyM6YH%+N<$oZmAc8nx&KlcR?=*%fMk4?pHgO2xUl$)~sRTw)eC7fQ
zZTlXyf6NYm`?XMX0TQI6!?*hXR3=HX1NlDZQw>^iGIRt32DC2DU4ZbvbS22_0ub+&
zR@C5D>1TboQ~0Nsnm6lkaA2NV(Z}wOV5?1s^4-y7{Rs3lKTc9KFX=mtwqL>tkZ$_p
z>gu}@<)0kpz&`qT{gOT20e@e0XArgm-aYX`cVGY^lznlfdFWgFE&VTeO`oP5SElxw
zyaD++gbNn)3@_gU_|HZmH#3p$Wc2g8tBFzNxGHvf@I&8LH!$FFAG_PvnDk0{4iG6Z
z(s=c1cU{78lUY4lmEFeh9aLc221pSqSPPZijM>U-qAgNJtdymr^T&p))JLO@X+oIw
zidiJ6I8BSLnIxzg3stP6IZ~#UrOcUD)j2_+3SLvRg`oQKlhGrkE<jd!7IvY!BM6W(
z3aET$+RXa}$g0!@=$3Uyb5_`aQY#4e<SPVCX;TK4br6i~3Z1dnDgvU<=ZQe~HcX~a
z?7{VgIAeg)P-al2?&kxR%aqa$*EDd<^sGvP$z7QgyQ4xmI>Ls{G;z$*wfrl{OnoH1
zAQGUO5;t4@8cm=+ainev_&u)$a#in7&j&HPtL|ZURH}doY`&T*s)LqgQ&=~vXaL@o
z5z!eHiS=<6CKD<P(Jf^-pl%yf)8@>HWkq@8v)U4tgR(Vjs50y5HXEKjAvdT!BK9C)
zUFIm4*rW+wg#|03st3zv#Q_tdrVF;C>J8v#UO$?2ej}Q6!3U&l1GZ=7hGg2^{^=Y+
zZ$_u~z>Hb`g6(?(Ceh;+U#~@Pf>(&i8mle~kewHe-kTqY-diAzE<RBP!PronX6S&l
zYEoG>$}pnQ7Gyv&cL38Auk3mq{ywcj4Q2(EN^HtX9T4@2G^pGLVej0Aevhpw7T8{4
z+9}FE#3fp7nO&YUg+CR?b{9Qk*Cc$Ta91^hcb7e**Q9Kfvr6Wgwo2#PvP!~cXpf<j
z*9@~!*bKK(nS-TMW`NwTc#hm|*hO{gze;_Zw@Th9b&jc1Wq_(va1YI2WPs_Vb&laB
z)<tq#wo2Kk)<x4OcaEh~V}PcUj|g3@1{Fe}8Wv2T85WYGBpIwxz7(QS$r)_3AQ+sZ
zCK<9=W-4O4kR@_DuPfqqVxM0+&nt4e0L(94fXTO<m(E8xNuFsq(a%4e_ZGoj5Deic
ze+c2IL<(*$LkelGhzo8mj|*w8R1D71%!TdBQ-C{HvJ5s*vkY;sm=1O?pAK=aWDGV?
zISjrpV+=9S_&{B)>_+txf77+febzZrzl)jqaaTQKd%~L!e$qK3>?V8^|7>tn_bhxA
z{;YiDc9%4Rdt#aIS7sO-TM;EPJYOr~Sg{qnsgf4FsnG-1Rrrp~Q*#ocu#6n6xQZO2
zxWXj%sE>ORywyMq^YJ^>Yv;k<3i-V^RAL9o-U{`7B-COj&fW^;eK0h?KX-M8#%DFu
zxZlzaz~HkOiqfCE!ld%(f-3>zXDmwYGZo6Q!)U)O^=Qb^2<K-$0P6o}Hb&d2wO>|y
z#Kq+a?rAb+-T7+=p!eAfW$wqa1JJ&9Avhwx_k~V|_%#~C?c~~d7G6$s*ipYmAvmIT
zTMcOR_pH`6T{?2uk@}2=+K2eH81wE3+ASNjZf161@VxE|N5XN{$1cv<3V>K!{w!HY
zDpUg356mtG-6FY#y=NtiE&V^h{=MV!Rruul)Mv*9^OI*l{NFn+ZVsmZBXjr{Z(h}2
zc1;QWheH;J{h7~->+h$F^+gyQ{2x(|`APmWT~fn&=oHqS)aA^Y4rp)syHLiz-u&On
zcG_Ch(@RWE1J)0n{&G*>WdB*u?dg8|QWsMZf~q0c$y9GcT-%?939Cg-8m38Mz?v>h
z7R>iLST|GgvO9S3JO_u`L2Jf)w&H;EQZwcRh~zcKqv(KtI>};$2k`<2u|X%s6M{vQ
z_6&mF=i%<rs?&lNTD6NEn;Djp2J7{L%^mBC*;^Pq_#LT`U}>?tv?ahEr`k+oGeN|`
z%j+;1vmiUPwI#adu1#ywE7S{kWiQ2QZX{_|x3PdfuS`WWq2<vz>W**O-NdrP{N%L)
zJ@JP*d^mG%^r-K^(1g@AXV&C<Y#C!8ka?UVGu|uQo*{>~>_=+;z27ap=Gw+pVV{~d
zLV`?gM}B7hY)9XkQVK?NUO&@I7?^qb6qh<>)<9e{4b^}NpvQ4qs{mJ}KvwKSp;(En
zU<>w~ufQrN9tCr;rkBBWm#SL4tIg_*DF6zZ@=|LLP0l8}Uo~bLl8e6=n{SCLiaX{;
zi>L$@^DkM;@j-=U%_V-D#XHW^0Y<dM?^cO`0+T(|17FJVMh29FIv?<VPljKjM2iuh
z$w2(s>m~g^lR@6t$;sNm@}KG8tMX4V5_mC$n6QsvJVOG6+fEHAq;~KdAq;3R-Ad*s
zN62TlV!tOE4lU-NS|lqUbjl3wB;Lau7t4#zF2Sy^%b}TJ(d-bXur%L`>QhBwabYXq
z+j3_A^7eQ0TPoFNl`Q?{DRI;aSiE{|W}S%@G0utR;tA^9gQi?Ims;Xr#4hsv8_SBG
z6}w$(Ts!#&S9q=>c7kh>wo{jy=SfGW=;$7upWhZ**VN!1mKE@xWWBa(V5PmjL`ukw
zPTChV8kjWq!K3`W<}hJZK5?}#Zwofs{}e4-;b;tIpYr(+UG9x;*e?L44UBYJZnm;;
zBx&e6;S4xOqRg5Le?!(E---AQ<_)0ZH9h04{Et6kKdF3ejY!Anh{E_p_qQ}ytKRtu
zbL}zmh-AllPUF>{HCW!b+SSDJ_1Q*aNmLsvky-lX-cUYg=wVu=>=~(lEnx;n##D|3
zV(tSDnF#m#0a*3uQH*}lO9{ekV{>pSn#Yz!wFJaX1o2Pjg>&s9>HQ~A{~pQg+LY18
z&q&(;e@0Tp+{N0=?O&E4zN+@NtDl8k0}@l!+|cN#&RVGcx!jlOcB?yx^b<PJ+n5>x
zg@$=kij9Jt;=OhbDMb1O{Js#RP>?LI3f?xo)5(9hzq#f2V*{K^Ts$;7G5A+-3rk}D
zqk;s@AUHOv3^th))egTXXiwD^`EnB})VamJ70uktv;CNsbm>%AwHTWVG#wH*Mzlyb
ze0>T(`Uy}6T@K+ph3c(2Keian9d5R5wn&re9fQ($Oq=-UEZa>^r<9&H34sHeABO<M
zl!jimw$jk2!Cvie92LyPjd;I(`FwsxjMeF<{n7`S+sf6l89uZ<L;u#ak=Iwm8Bb#7
zpYp~OXGS;iLiE;sq=QYQvjlZfBb>0+G_tO-gP7Mh92(Ya@S6a0>;nc4B8%(2te(GN
z4|6^&^@ojpFcs@2mDXFeLc82v=I*VNuFR6ITrhP<ROBmtq0QTWuxzN|$Q+5NWd5K@
zX5&tb431{H+rd2Jah~{1Eisn(g>Q(}|B~CCgwBYwAIlSar;_|)$1VAFQuKs}Kj^YD
z+(XJW(S?k+1-UVnNivd5`LyUDUP{K6bEL{S?U)XgqVD5AW)#=)P*wk<eBVF2=S2T!
z`Knpl|108dDr+(WLdg7UB@r<Ti?Ury_w^WTB;DdZWvIv}5IWzesifDFi>yhkcl{!e
z0t*PYB_op5AlBI8`Nz*PTrAx0Z%*&Pdx>pW#O!326O|GYhAarM?PSYX!t?pJJv8A{
z9L8^<B26LNF=%250ryI?B-3Ze!sNRN=PNtRqRpGF7RU;(-cw3;D+E2^kdR0`?K>)B
zo->mI0}fsLM{(`DCkBdbY@fj2iC>U`qP0Zo5IFlH8mVKlr;cLz-bBOe@o|!ZTIlIZ
zk$YB&JCBc5nAgYxwZh?iCJ%MyNm9$#slRq(CRC-jcn=)A(Xfeje-ofY+slF)=Q3*?
z?^QcHbTn<VnJ4fvE~fGRG!sHlES)_r9{!+g!Yaj#51XiC_RWK@ObWZ|`vHb(0g%}v
zhi3O;CE=$$p)8qUcpnWXY51SgU7vzmRu!R}p`qxj_%dNkKtxxNy!{muO|RcMaGy}G
z&xWM?p0X<lZ`V=TQ}Te~CG>0(F8H3+c~5{{X9<RN`4RHpYxlvzSh@}I%NOa-F?#=f
zlHNb~e*ZjvQ#9c|eSDhUmoivulakE7!VnV+{mC#(B#J13eIycM+ecy8QI2L;=qH1h
zv)DC54PS&xS=6b%*HJ>DCti3i_$nhp8@Gt129Yn|<z4M-rE6<%TWjFmMwQsHC}2qe
zL$+RP*j=?`;GOGN+jXzwZNU9@Cj13UDF956;Hm&1h<;rbKOD@*@CSxi5q5?6kEBQr
z>Mzw122OW4Kb;X)k$dRls{$-<1PVdSJ4yq-C|^jl;){pfFNipD$<L~cKSB@TDP(*%
zg}@AukHx{uJx6=foTTOlM1C;*F(<Bt{=Q&z9f&JwHb*KF+kTaaJN(CVcpq)pd}r_L
zek*Pd6O(>34}LA&chQk7kxl2lv}<C57o=C25kJ`Px^_L7*Rf?i3AJyFy?>qN$NxMO
zbki38g-I0*zm){{>wo$BXZq_7c)(?V(4!F1>rf050$ndD!K?b?*7{>dz|f;qvY+Rr
zA%V|XA0@$S3qas*I~VdDiW0h<ef;!LeJZEJ^FI6OCKa_T)83^Zq1lrN)sO(X1q$ES
z*Y^~rgo~j<o5y=){RF4p4R!qve^yJhEGBP39hGmq@-$6@F<bL^dyg_O?XCiXon1Cr
z*wl}ME<>|YEv%R!yDQxihpxKJfUU&>g7zZTsEQsv<}xs*5<EeQX@YRZG{7@HpFMb&
zWTB;{8PYWPHkcryIhZ8i@=KhP>rYPr!j9G6YV*vUFho+zp<P4`s<<OeBZ~`2l)j)n
zvwzkq8bXn78B=G0fx}XitzAP;ca0|lo28+f9T~0>8MH`m72PbS`x^kqHdI=z9FVSo
zZym{CR+`ZX&uB>a*Uo(20Oj18^z@U+@A|DI1U%uunjOJ5Fb3#;4-37vru6IFflBRO
zDzbQ4v?S&?ft-9<L`EQgz8oH`ojo5i68n^KYswi7m1kB2_IJ@qt@TA}UNcQnz%g`a
zVRc{g7vgGmOn8o(*u`N@*6@XFarJ0QV>@^#9UboO29X4%SCzoRJSXljweE4KRw8s5
z1{+6fXizHTrvdovP>kpn01@)>RR!C8Z#5)9!<(y^e{L-F8F`N=ni>%OtL?jvxwon+
z6Gub5;%cMsxhmf5B6dXW0aepNEh3}_gemb<ePkf<JvZg*9BTBSWlqzhi2(!PaOg>=
z10_EGE{GZO$3)gd2eC4u)=@g{$M`X7+#(2DnU%O9&q*j&OGCO$JI0tdSi-)Me-Tgx
zD=pUPOjgX&H~0w(Mri0+7N9L<wF(#2?nt0<Mz}UewS+f*enq)fO5t81h)mTT+V5ty
zPKp8CC`?3Fl@3ADXt_HsXr-4S5v^JZSx0+ig+DP!lGvQnkC4SVN2M9iPR;In;70D~
z60*pz<Cg|;u(fE5#HGZf(A|PxKNub5S?VITd2cjOBoKTBzke-8b`I<5qR0qjP?yS#
zcNJ!_Ig;D^%{m(9FO9v+BQhd2mh5Yu!6w6T&2Q(d+ALkT0+&@kT7);o4y=|N%V%~N
zW3{G}3;>NTbKx+O<;MG3V5&8T^;Z^Ed_TkC9w@r8`bu25)xd*_!~tcR4acS|L3#C)
zdP-4k4qMMK>ZVxeml^uu+Cm}*4aaQAxsP&n!9~d^g?xUwsNK4Z0YiXgSX~AG+(=rJ
zI{B}8{)7{(8*W5(MMzKCC+pov<E`SVz=rXn<e2q*EbTG!q=d?`HqZ3c?8`mI7;LXb
znK4?Z5t@e1sn(rE<s8<qm|oOM^v~)Pf6_y#>-x^EPeL>qJC4>6Xj5*&P#KAGfC>K_
zXo0BvE$ocFf`vT<+(!h|u4Ja}`g22=3xmX7epV~0xI-5eDr2rfp|hKKhQipPX?kmA
z1{+BSpS5m`X6+)deeA@Bn>tO3gbVki@XlUz5vyZLW(oouYIw7a0W(qJFI}Am@S3JS
ztaW^Rm-ymgN{MS#kAhxjsLU+96Ptsl^P+Rd^qH}GZ&&FGbLxxH(nZ5~n{R@pPFSap
z)%s!P0k2EAVm>#Zwh>W`k*cb4@cXO#?TxA}sxuJdM5t9~)A*6*bP0au)L4q%gc}P1
z{4A!b7AFr%+Yu*^v!VML{$qydXHm_#sgg{`uJI7Dy1`ZWWFg1lX0hkQ;+h>n%lD2+
zUc2t8gH!t{d&Mi<Gq=_!>K{qfTXv@{%g>OyAMMp!HmB<-7>A(J$Ck4@$Ke)?9?>iG
zO_UbB5|4U!&c7MyhRTgtYJb)pZ-r<J2)KfeM6yNnMAk+4L^?&_iK#^<NVfK&;#Y$j
zH)xDLrF+}Cw7s53>BG5tu!O0kaI{?Ov@2d1gqI6ce@yB33+WCEJHz9yPz8AUJ(9L5
zmbdl9V+o2LYVGUvV?Q1Ah37Kq{k$L$v57aBZRKVO9@}?J4*;S~xDf>BFH-gsIO9hW
zo4)~li2@~!(HSms+Kdu3JrDEE^gVL>X+w$Q*Dg_8Wj_R4_S33gB^o{_0e9}E{r-E{
z^y-|FD;2t*M)KqP+Yjp0tz`!}Ba2vS-r$7PnJA!4oySdVWamDAx2`?8eD?Li(UyCq
zYpRug98j)yuWTs3k1q?2H7*GVOSwBV!MOJ=dwjGd9F4KJGXsrrVsx=D!kzb~gS(Fd
zXycoUX3Kfgm96!{y&3jc6brod3-Nw@*wTMh{cGS8{&Gd#ybZUm_~~Cy`dWx{T>6+c
zZ#lvTfz|M8to?53q;o=*Gt7w0i==QVJsu&b^ygv!VYib2BMU}%d)~cnv``K$Dd<?*
zT16!@JGtaiZ8HC5qpJGTxRx-l=yXka%!kBfykY)ur3O*%w=DgDd-{)`lt*iiB)29N
z%>(tM*ypkdQ;kuDT|WyqViG(7rdQA<yUOp@Zvcy3U^j}Q35>hbf#6V@Go_?8*02NT
z@C7yoGbbLY;IO;`CMRX!HoOz^qh#40vG?$E6F-0!1{lscah7K`$x(y>Bk2ECI#%|&
zN{t3RtkaiDs|_opNrw97p}<Pk1RR%rDx<~IJgv*Q#H_RFm#oIrdZ?N<w<=Ar>_q_k
zQ8UznB`Z=dBd3UOs^b)D#?QltC(l_N@-&Bi^W@&ErXKoAvI{MOEf`1*mC9)IFsPk1
z<}ZfL>uhj=l0;@}kG~*tB`<Q>kD8z`y6r-yZFk0-KLu6WH)NOf+j!yAS*>dv-E%tT
zd{Et=;&{w&qC|gIADtm`i61s`<mx}y=!Gy2^{3hHutILLqCRRlAq=J^mQizbTQ`k)
zBKlyfJkde73ysuWnL`WcpX9S2HGZyv51F>!8LzuM2EROp@p;BRJe8Z*!QFcLpCuJe
zy2yB6`z%E-@q1mVcVWL`JtFM(X7GP9?y5AX%}<=~^VS#9I|=ldw7Qt`bruTyRUWp#
zcHut3?2BkfP@n@xmj$4&Vg?q$+9O}^FX=vhtxvyQe2H|5r`=Ix#ueO?dBNNIIBcUO
z_@m&NPDmwqi1W&_w4&LH*g2N62dx=isAp|xI?h}&{PfqYrp|Gjv@=5S5>s=9^i}oV
z-g##!Imp9`<cBE6BmE@kueHEtF@|T{;x-a`A7MF$Uy0*3csrb5zV{`uy-6<ACDJpo
zKuPX4nip8^9OIRu7Z&AF?d!n%Hw7C=f!}kNZ3hEbt7h4YGP9*uN$MS6C>yc=%vX#Q
zSCh3YN)c2Cb*@6PH1bl3cf`q^!^kY;6tLN2JvF9LiF(IKSk?ZPI+wryo+V-XS2fl>
z(HWm723Vv_z<E?3D}r;_8V=&E$@3X@&fIPdq2T41Lm%c`IaHu=wxj4Vg~Q-&o?}xd
zP1}CG0#PH&@0T!7@rsP9W}|(u%a7(3{vMUV!CLhO=DwwBff%u{{0^4|d?H*<3&e-Q
zE={Db2=pdCSRef?7%iUkUievWQBy=QrV{b=uOAZeHk2<;kNTgu+YK(F+>LEwFX$eI
z+L;(6JyKq9+T&9SJH~zU8Pd7iOV^j0<#n`EZ(!~eRHt>mKX5IGF3(x6_z3tt&q1jj
z?m3t@^(GqVm8h9NG<db~+dMuP-R}ge?ju(BD37|pyQ1*1fm2M15$MOlWDAI^MX+QB
zEvSXCyOMXy8iITqzvx<_v|BN^Tf-0(7B5SW*JpJHc4eP1&Mt7tEp1b=mk(gaB>&br
z2faDuNF?zSln!UeP%eZLNHyR6Ty#OOeQOtUiv6&jI3MEc5#_nV>v1(6XYiI@r64aJ
zm9~~q*}Z=?Rck}b%$axXE_a!KYut=C_hA(_ZY_tf_7VMc#1mZ#fTfOgwiza$51_T;
zPgSPGIra)Zg3M`R2Q%nMy$M=l-ne*x|H_D<X;>`x*~aBr0oE!(mDmiw>}HPE)D+RS
zOo;R>Ko-kPV$Yzf^ZtRTY2<10G)KzJvY);qJEXu(wNdA5Y4>xu$ZKo6*CXZTT#-}5
z-Dxwt$jxH5VrU5<=}})jZyObHT=2}{GnD_Ky6zK1;R2R>syM&oydl6|iCDRicoGt{
z0E=PNbk+bKyEt~{{bz1w(x<WIa&|LPZ#7(6?@Q@#d!I&JAoE7V_gnmVC*i8X4ixjY
zpWR^ydVs%qliBAFyV9v1E(v@>y4($fgSfZIShLlSy!OM=ClpX`{&UC1nS;(K{1O<q
zT>1)%GbCP#-7>sXa)Jf8%gq7qbM}q08<D6*IlHzTGF{H9Pbs=A=(J7CDcP1tyTmUQ
zc=eUD?C$J3S`%0=ChxgBEi}sYYz6dAmbY#fPHIx%59(YE+0O$~TV-f)hLuhNs}De6
z>Z3l7#wqI3oeDWy#IaU{pS2(KLM`W0)9{-y+qt9w{vTw4u<~0znO4K(-%(|GX-?Q(
z(KKEdH^<OnH)X390=KH^gJ~aZe0ut<&yV6&9ap}b&GiZM2xq$lmgjb?f932rF9yDD
zuJofsc_}v_MQM(~`7yp%W64U)-)B**mK490xUMx;ZLy7V(EsI>7g%E(V!1OJsxi}c
zf&n~3kp5M8hv!!W`_@U?Jr|WSZFF(bcac7F3q|9O^g;OVPhP>!i{?L{hy~>*dhy?p
zi+?<M<sHrbg<P=5%FBKt7ol6nns#=pC(6it6;Kbm%AL?6eQ`m%z8)RaxJesz8#=Gr
zIp2`pzxX9{MI85DPE5QYvI_PXZhc_@rWeF%2YwF(@7GE(=s76XL$MN;YFVUz<LF)r
zjUOV~;CaY@{+lGT*yLu1udi*n$DZ%!buR)~e<VL`;60rfC{dx{lU2Va^S#c>o2<6a
zwA*p^o1Tgi=^ljvNx?|2Y8K20A1I>>P<3GP;u>!P#HlxA_$vC3!qILYeT`-gkmaL!
zDDWS2P$><KE?nFu>?j6q6lWx96<5_y2BTL7ZvTUbfA4SDr~A1(RG-)m<$uL?WE7oE
ztX;%CP0gKLtsNcyC5%wkmHjG={vO-XBtP0|$;nQ|YGdd#c0^1oRYX9SKdelNt?gm%
z5%aFW2n+G%|3i(f0WxHvmpkm~;AP5wQ_x`Z%e>NJeQ;H1cI=m5%74`LRBQ4K7TN8r
zmdVKUE}$*kTlZks+B<kCm6DJhms3xf$4{AD`UlbpNyHR_$vag=>V9nz2jjTsqG{;#
z?=B@Nr}4H_*~*ZqS|hBGvdUQ?L^mHo+bU^(?Xp+QCg?$rOm^7h(%&)QyL((t+K)>n
z3&kLVZWDi65li>IKrV1u05XTt+YKv;ecp0{Ri+8B2XY1o_)M*66YG@%;-9Bpz+>vJ
zK4nz>JBGe3@5jXqSyyM=WToY=6pP9tY8Sc}h!96wsmv6PV1va8IO@;p5y@s`*aHjL
zM=Mxl#hQYU$teA?ii*Cow$RUvPbairA6UO7<x}@V&6R{t<k4F!iz9lYO1})T=KgyI
zzo9Q<F?|{^o1y$)LWzIqquiYS85aB0?|LcfIKx|{NP4Y$JI|eEWf@;-qTs@Rx%@RY
zR1?CKUq?p95UYVL+s~1W&Ct%&&ajZzu}E!RE_kqSP-j&guP^B;DYwY{WigQr%sB*$
zc)gu|*u3$c=KuTj^YC@5&GG#&cdapibm3b^q=u<|#XKWvDUHLXWvv1NQ+pZ9h>kHJ
zUR=Lbd#cPIYb|RJuqVv;!I0%dl&-`Fb^A*baPVbDR`nskAQ2P73mA@ddsn*w=cW7v
zF$0&=5a7@TfNtj|BfRbW;x{92>EZ97$ByAD+DkCQYMBec@9Ri@bW*q`q<HrnnA2Fy
zc?1KopGPYIKx}UufoQj~#F`1AL~*^q63Anno`N`E{eU}4*4EBL+vYoJWuFcrcs-|@
zNr+(ExXkbfxafE#JDS;N^yjb~@<){6hFbkN^cH%t^9XpEOO|r_V7kI}@?$T+SU>DG
z0J}ho+WPh|zU2Y+z{<_Mz1i}It@Urmi>#Aln<H22lKndTg*atwfcL5y+WM2E;a88U
zn;%XOBU%tOQBYZZch3o8PWHabSb7jWAmL}+`{5m?J!sCj%OKMAeQ1yS>*-ED|Fp2{
z>pTO3&2h%-Yuc_?XGX<=akT5}`A$A*M#ZIZw1;01j9K-|sY8(T%{KMcQRljy$e4@~
zLs6zzEZUt$n2bM%qO7i*bvo-X8S96l?5}?5>V1ilH3llvF~kjp{AxAB#G2k^(a}?i
zlC=dU&@;3Qg|v9WX?0@LZDL|NB1g4E4rPIM&rPo+etF7jcec@OT3|YIMRAt=h&=UX
zY5==6eVA+ZY?LHD>hdN8dz%UVHq-H<5%6QX|1HnMSH5`T3EzJ+Kj%vqzYXnCM<rt5
zW^)JOQFYIAK({IE-I@;{#_f3sxUi$wq4`Y9V$HX%SuSv|0a2XW$rOmZr7T(DT5m_<
zqb&C>I4^r!z9V+ijXcd^L1?c9_C|3>*W>_$W79C795aDhGXZnRYtQ!YRr~d+!#WJM
zZB_ffQpa@=ZMm!V>rw}FIBZv{%o|cCbuewU*C+lsX1ubgX1=loHNh{kkU>_pX}dHW
zSWHf4MzLerGA!y<6*r_#>G0SdR~6T%f^=|ft*eTErH<*)*p^on*QNIBz}iw*kvF7H
z=&;z1R*~1Il9|Knu0db4C<sccc7&0j3#=mP4aed`Esg!T+KzN`2)x~^4HbGGW9230
z-}U7!>U!(<lIp1c&RK-8T>nKy5sv_|ymAJ-9NaQHAlW0QNp!3N9E-?YNso*ymv0^|
zQ8R5{=sGWoK+5akI3m9B*$10UoL~bgqBKVUBEt3p03D&+;tLB?nyZZfW1AE!B;u;h
z6wP<j2_;eUmWLD_jh!iVs3Ye$!&zmU&w55liEkJqDeV2DDnH5gj(Fw{#UrrB`vv_d
zv#F7^0`~Yd3-1{mU*}K|g8u@~KI)fgmrz<K$~UhGX`XLzf*;7P-4)<J(Yn%OYo%Rz
z+FSS`c+U4?TtkQCA%C{MqaLAb{k~%NkpUbTmsScRl|Q1o-b&&gNo7gm`sNK3xSR|5
z%j=g$*Q}85tDDNmNW|glstYJ%SH!a`s=CO!sg6IMfEIZOb>1<?>OK~gvGpnTsYzSw
zJbk_&I|?4ezNPFO(b1BMWnQ(Rfeend)wIrBp04*5-!HWfzL|5?rb>^|(o$#U+`XiU
zQx)oF5p1ml7Iry)7dAG4c(@^#)qHjf7r@8gJFea@)IMFBt=}6G?(qv?d7V4WI?-Jp
zyNrk=sHHN>Id*HrG(E{WiPSxupP#HPtFa~<(m1ttxb?J9O)KlP(y8%(E`gZ5SuLu$
z=I?fxU8mKDZHw{+`AlaYYoGg$=~mcUVyREt6V3>BHP^o_+&e3tzOJ@+dM$zvD?Kc>
z4d7H@sqw0%j%i3(Ra+|9iJrfnVAIzl<UFz8P1f80#Is3{bSv|eAR!G(C^xYVd3vai
zS&(Nnm9@b+vC)lwcQuy$UGWV&pGE?KBN<1en!$#u$r|uXP_fH%JW!6mRTFnq6j$Wl
zul|O*_CoG9msI}KS-odo;hfE;)WfEu?EGSWaem5*kW*FQ4L%4f*z2-<c`5IFa*g;P
zJ|A%gtJt|XDKYGwMsdHzW0KhiA#WONrzIF5&;Uom*^Y$M?Yl?vvdQLx<`-lQB$==(
zTiIe(iSNrQTdu<<58VLBl480>r!NWY<~iNk3av%!u7Ym=0)F?{%Y6vqx!}BoRB+%)
zAjD{wNi@Y_OH6xSfI-FhZ%!$e44?Om&5N7}w41{2S$)+%Vx_=4N8l`dSaDd!^NzNC
zaSgKWfY;q77~r$|c7J6k(%^Ipyw}BCsxw?n8EzP7<ow;LI}do0Jaid_R=H1PxQ#5J
zm9>-o9LY@InpJ;YXILCp*oazZYhBC;nWFJ*>||Yx@UuAOeYv`E?l?@UF<<(27}?~D
zJLPIU6f?3nDn3BwEV3(HcsUCY?HjJp8M=({f{Id0p1B+c2z-m!V2)k}ABf;*4g^Gk
zhj%#<)pH_}-1kZCvIE4=qGktenM0S6pwM3SkWB!H<e_^^Cf`7)P)2w_B1B5Weoqs!
zSR#oXDHApdWK*UDE<jSaC{qR(x@!0UQwku;dXP(w5>XP1nP6iOr7VJ!IVjyfV^C~@
zgu<AE8QUeCI$c(7h|dJ)0PT0Z|53k40j?wpdn|>;H&hlNJTqKW_==X?L?5aNLoE4$
zF*P&ccsPWX0^K0&E)||6Ud&#E=_QW|iUJX)DS7=jO4Q+9G81YAiqsu+6K(}^4I>O7
zo&ss?u+6TUmT0zr)1XYYLUy>@pfpzy7q%s8={DW2S{0>+F*p!sibBJbv>x&h*|t7{
z3!i_GCtEf<;3k|EC;-IdKs&7uS@y3UTxs=R4u^|yaYCtwsipL~gxuBBlgkd14Zi_W
z*JG!l=sI!NV`w5{ZOiP6bSAVyYogQ+FAU;3Apn_c$Qk;w!exQ@K<xL3R=lM&4R=<J
z?a5+AK=%}r0+_=#V7;Gtd4#z&#k4NM)G2Fl+dZPsBBBp7q7NT6s2VkhmmG494AMgy
z{vs8yPRhK@z}%{7QYUIsr)uJqJ7|<Pxcwud4;(c}P!^sb8E}^RNpJ=5kuiH}nbc{T
zTtW}`3NyU^%-A&{?C?z1KeNP&tB)F983F?WmGt<C8FJ9E6eFTahlYrOSJADW8hU(`
z3^`a>VM9YGz#R;%)YeNhEXHuStX5BDy-qR)15B*i@TkJwU3K6UPR9`q1xI7XHWg9=
zRS$#m57C0x60s-xh->DEYhc9n8tOh8>b?ir7$y1GUzub@>10LO<Y}qott6@*Mr8q7
z<@YGDr);q&@QCX$)cqcrWWhu#KRV@iv4Yofu_xAu>qFFiMzS$O=j1C|8WDfif<2)(
z+@)>Xn!c?z$So&??i3s!O7_RF`R!blpufeCABi}xMC^~sHckdMmr3*6mgRjtpMMi@
z^x|<|N!VMd*dNtxoTP0o4a@sJiXhY4AWK+Up-WWsAXMFUSklMBPK{``WzxseWQ}PU
ztkcU|Gj~d^DQyF$-t8vUz|5x9+?_3HczRyt#NF*n3RIr6Xu|O`Y0~L4$3_X{haRN-
z%O6SVvmzZ6g;cN9cbPD@$o1ui(xl_dA30z+FbpXbRIhyJCe?iM^U5D3nB|8wWx~rJ
z6^<Qfy4AeWBOOz6N_K6@=hb{_Z&}nmvrfY~mcUo_knCLe%O>5-vQDX3jvmjaC6JzR
zg+5q)?Ic2`fu<#n8TIRqW%aQ+nB)4o*M9$g*N#1B#vy?C@}=R^7X|mfzJ=tR{v`~z
zSJSmiG6($Vz87pdMa28@V{8$I_o!K65l9u%$3>q)E=n~3u3*j|Q|)?Ax50*kHYkod
znOqj%`;$E~Q!2ZTc_{oU@hGH)LIN!Yi(=DL99kv!@7l7G_Wj4!N7vt%&eB6)@4cxs
zL-6HbeFHkt8L<v5hHw03eFN7`o6Apd^SQ|$QpzLanx&l%@wG7q1)R1W3NlGJ!SZ&@
zC@4-y2pA9=59Bw6_!(xz0%~U?f8Zh#(D3;~@=enGX|vFfyL==dqR&a&5==Oa>8s=5
zth{f^8-?7qq!`|g9<509x$qRtsLLl}$>R_)t_vkquT1oMf3qOthu_~fOO&57f|7<G
zhKG}@BdWiuM;(k_^?$o6`Q;eHA}f)=3~`IOi>;<;@%t*!pR>K=<8szl5|Mz5E@igN
z^&%-J@~Pto-99Ca@#g!hCviq>?8s|Xcm1DdIUkaXprD1Xl^2HHNaOYWVJUUK%b^T}
z8l$y3^G`GW=K^fTO%eD4uBN3(lb%Yw?>(fUsAUO#Jio5i>tn$q<akEC^uQ;UWa_Y{
zhvBHT`~79qY?aM5=!x%#qXv?5J!_PbPjVIss>s8}rCPF(T-4@S<=tvjN=L(*gnOrJ
z-F0Ad*zGlmS8Mv*{?M$m&XiE2X*Do$34OsK@F%y;mTcFUNlKGo2eZGVHO&H%+N~ZG
zX$!<nMTVPa84qxr$Y||p**Bx?nr4+NQJ~aQAOP!MI}97-ha>gr{QfSj=Z9aU-Up!8
zs2W=Z<wu0?A7NNB_WnimwnJi97hY3E$+|^;(;Omifw#mZpXbq-;SfbFA%SNOl+N11
z;~5bzV*^<B=}o8BDQ8OZ`3T}CYKh8DmST3i(C^2FeceBTG&Vh~mjfePtS@uEEw|Cp
z&L}q>o)&XepLdY#8FXk<J5)$OAQ};H>kmWtV@%5119MuJ(IOvC6#a8KkpHM(;7lBz
zA0UJd!xy-h9DS87#AuLrfR4DMpMy0M_i*`*VOLrYgyIuWdWo+rc=b-3(?{ru$;nJ5
zcZQJyAaU%4t{9W+Wl^5?6V~q{!!lRvbE#E=R?*iCJ^azU*b~ekyt8%LF-SiTt?BD#
zwoi`<jX1jc1cstMa}2|^<PPEGL6lcwMjqXJ{F*`Dyd=GPYs?|==O|<ORUVgY@>j0l
zOVgLyaw8#GYJSI!+tQ~dZLM3BnT9{=1mtYePE;nNK~~&`#K-Zh)bn|7M@y^VV%`Va
z`UTcVnvekVW^Q-tX>#gcN5C4;Hy9cdUYMhSD6a6d<;x_yL)xMPbOTT&SB!LL?2=m6
zX?{wZW=Vt_T#SnER~*Me>BgA?uoyVomK0k`&3T8)p8=a1oZxX)6&i#&;zM&6^oNT9
zV6L5g`rb(hKcXH=hR*GGsauv3x3wSNJDMC_?l*~DUSV{E*jTIP)i~J9aBx{8%DL5Y
z+8Uu*lRI2|2t>xe#_=aR&tApwR;^@`sS;{*lqHbGkiD(YwWwuvS3V@qC{!2KZ!C(8
zS7x%drK29nFflVKFB6&_^l7Vuy@fWN98hx;2z$8A;8#p=c?CYCQ<RElCeM&dhHToA
zV#tV1css0n50eQwG%KHb;@KiDpjJy9uN{knkjkaa5j;QL{K++*zz*+46)q&r-b~MW
zDY<(84qsAhp0E}%$IuB-ex!{)Vq_1&Cumx;4?}cDpSG4z7$HooIk}M9?Q#6EaNQJ+
za*D`W9x`aIc(nic4@2^y0<Jl$Prg{?Cl&PnI96T$7r#)Eb;MOif4|`4OS+04X8x%l
zaw;G~sGwrkQVbFjCn}fFl9@}E$d6AoJ6krUh#g+ugC<UfEI&ak=lup3-&wEa9$@1Z
zFo;+$Y!Wbk4Ng_b(Ee3;qRmu^+^FV&ujl4?(`D-6<)H`c@~gpId_NEZZO)eb#u8zA
zCz#De*sEZNOd*03Dk#9y1qoT0<emrSJ;FN~*>YsJ?sq56zz`XhDs0K8il(U;72E|7
z-Ih0txFONHyU42^x-4G16H?0(o-v9cG6jK)&VJY>;a1<EU(=kr;rx@tt7}6KE~rVS
zv`N%~q~WA0Ri;?I^bc3(Oe;=%N;O0a_6|n2@+Du8`)8MjMtyh>{lupu<8A|Ab69v8
zUW0sj>M12v7tZC!42}0W9x=L^+n;z%Cyin5?4@!>ELZgSr7Mz_$PrdDZpE4l4i1;J
z@gGg7EYOvRShrL4AH;}()e1?%<=@VER&M8_S*0NkR7pw+S_hNLfL(aWI6GBX&0$g|
z@}2{|&X=4@W64|t;Y-WbJ%VKHBrke*K?gHSHq}Pnrm4JKkO3udGjEshi1E!MXjYkD
ztxu$q!RCsvt-qfTEN_$<Wt-8#=7dIC0<EAiIEY<j4oU`Z&n19jbY-bFqxyJwX>=(c
zPXeFlyxJn}tIeph{*T%`@w@^3)Su1scEmY}Q9N&<{3b(=FW(p`1_P}#QWuA$*N9MA
z9Vu-Dh+QwFPDM3)%wfCwL}gRm1qWQeB^Sr|<+&EX>MorJ|GcynP``Bwr=(K3&$TE-
zUy;aIx<jE&rygSQfRnCgvLRQs!Mf47b{X_)6}ynalC<AT0-tHVc<ms1f>T$LpL?fj
z>!??V&6x901rhiu5yJEjdxjjN$r$|ojk6+C9XDIRY+gQJa{9gf0b`TksFPpgb-b@|
z^F7X^Q2L75N0{`>FC{BU$%J8)IZ7u?OQ#$<9d(}CndYgPUsJO+47=ufg;E$;D2Z>x
z<^mwP3#EHiy?#wkaKpl2$9n(2&~M-jdz5rLV4H)aRol#){f?~?4SreFo?%14pD{a-
zS-l;0s0>-+DfA{u8~($KJ9|tU4ltnHnRKRis8O(3(sH8eZD`U^HneXPOo?BC@3C@=
zo5R$gWic;1p-PMoq~xCL9jo~OQ@{V<Y7?^8&76N?z^0!?`rk)3{EM2)^goVp|NHU3
zL|uEu-$v;C9`GQU;r6S7EFLF0Z1H20*U&4t*<k2EM=|jr{qK<a&%bVmMy9X9nVCU^
z+i@(Lyt*a@%SDIlF5b@5H*<u7JwKqF2)kI=*5{dmn$>8(;s@w{ZGq5$X#Z+UUX@lS
zOf_V^)gs9p&<taKIIk%9-60zpHf((cbxE^_J~$%)D^$6LCLwZT?{?SrJ9_T^T@_jh
z=`?~u?5^0T(_6vL8l|5MuMu}jb~~_CvbB3JxSQRT#5-PVfa#>8zR5OD;_S@+*WUo#
z)=|;Vo~R$F30wq7%cl{15{p|_TE3+@E8FoGSjrWS{##5_Z#9Z32Jdb;g)zma7c}#3
zb=n$O$%A8coGz{&My!NZ1~&mi2TfO?6DY3L<s<#`+z9y~u;n8SUafI|1z7c11s~DE
zCxC5RE2xIJC4O@~s};J=4FJQ(7#V;gXh;Ck?|Fe-u%|8GL*y7?aYOBXst0UAW)kV`
zokTae5@ehn65YVTTEtw+^9~1F1Nw)eDOq#IT9a{0Zwg*Bpsw6lo0%u~(UPsP+*U=C
z?q^FZnU1+HW@+u_z&afAQt0>C83WUKDWqAX>7*&7iKKC)QQt`S5h#x7*?7cKHjQ&O
z3xy@EW}&L$CtcD&Sq7kuE8z8CFf<Q;!+*ao!-g;}{{GCHrvLxE`3Fe-A9<5Ft*|D9
z4C;v?rT_`SzR7|YvC&IgF^6rIc?m}bCu4p?NyD1~X%Cdt<A47t^Sz3oLWchq>{&_O
zl2ZY<f~<LQYii2TeVFy-^dT<y%Vr;KZ@(>+ELWX!18}4c9i-o<Wb+I>x_b?VDqo69
zidEaxMjs>`_3k$c@iE#%2(ra|G9oHmGc}bU;XZdM4mK&9TsHrzSwd<(E<z&;{2jM9
z4X=A{5$CsKkSp1;`Ms3#H5r<c$T5+)(p0pVuh?}%jA{j6VOJB<CRtwg9GhFOOgX93
z@Bb0@O;MIb*|J%wO53(=XQgf1wr$(CZQHhO+p5&d9^Lo7(LMT(_i;Y<&-qv}*WPQc
zh#4UR9UM1P%Lr)|TOl;r^DuII&DENhmr#~C?CFN%!#+$#aI!;R%NTrAeft(#zG=-$
zCRA>WLBv(~Jz3%+uM}<aVp5*^_QDW<_B*)ioS@cO3YwQ0ddGBJ)Dt5ZJFd~SM22!&
ziA&ORE_PitV-V|XxOH_XJAz?*olT!jb=FAhr0m^phw5wRXvkx$$3j`Dq=!4F<b$ex
zy_X}(=r9i#vqD&_5?yP?k#Ir37`E2T5fV0vr{ADJ=63Ov(Gt@uI(`n@3N@mg&X69%
zs1t9iWR1uE5m5T`7E|?;(_RPqA->yfs-EVJ((vdO0_KclN?BIO?-<1l`}IFW|E}^C
z=2TDs05U%|Pyd~J`}czQiH`J4T!R1Zx!KsVd6`Iod<Dz!m8D6DmFfrl1xR5ps1OGS
zh!Yr|F-1Z})M3ZEXWpc~uwS+6j_2<yJ_s2LOchG79WJ6V*Srp7Q6b-yO+5=R-D%^Z
zWoz)Xa@g`<yq%H8YGb_J`KHa){9p%A5F{l+OfyHf5Yzy#2WK=po;wvZq?)f+21A-`
zrh1)!Hv;9o?;kC}tT{X=gRVKf3jxi0a3>CZ#r35*K<ld6cd0_(n%>7u^Vr`+qZx96
zzL|^YRsiW`i<m%(zFCPV=HPWFLE<yCi;^{piQbU}-4Ru{q4r6E?V`(U(VftTfo)-j
zYH)#8xdKjQkPIEUHKqST*P7BNjLKn)YmkA~k<$lM`NcPkqkmibqn8sJP$t3A8)&X0
z&Wd!Rzi@`;bd($@xNOw1SS`~_@ula+(srz_DI!KQry{OrK!Ok~W_rt?`=b~Sy;q~M
zWV(y+OOAZk{El^{Dd;={kV!*B13#A*R<Qq$yeQeVQI>5mVQ^~}2}UFxXe#ifI;(rO
zWmRSV5Ry4rafur0Rf80ajRaJnZ+SsX&AZPHu$g?%T|R-G8x3O8)S?<v(D?mawXOmm
z0c;XBUJ20ni<P;qc1VDehCpc9R_@Eur?t&6k9Xg~lv)ifdJ&|6SfPNLxvG1)HxS9<
ze$#Lu5J{u3o;Qo>Z7pVA`fPKA>9Tlp;g;=)q=*=Ofu9R-;of7FZpfI_o`oe@(%Qll
zOz@B$+X`P|Z!sJBnJD`lN}aBe4K6G`B|?Eba}(*AR{SVN99jm9jr4DZKK-IazZJYs
zF2N|gL`;bcy#xju><MORza-F7s!?umpXDUJ5Bh2VDTwsv@v<GVKte*2($%N)^Wi1)
zEmAhiEmSu1EtWBuVU{NX(2PN}A1YdBC_7-=j-u8a%KZ!s%WtU8KrcYIGIk2KE$Gfj
z6=2Xp<22+@(2EVxnF`mbUYk|O9-~`M&>92WqA0&l$<Ds#4=_}8SHv2$SMHflzmu=g
zcpLgRmIR-EC?Fr>TU1b=At>mde+}qCcTF+*idMt;(%a?k{87gwbB^xjNP3UTy@j^%
z7~j&Oc=z{`zApBfOg^#8`1I{cd~Edkpm7drc0gkpyHGSCgGSqGen(gXMc6L((qplf
zYJ>T8ljkeS(4dCPLT64u*n7Yj#%M><7a~RL+$2Way=TqWi>qndySD;5E)Mbed2?^E
z`}vhs%Y0DXpO;T{qxkus?a;f3l~k#zZ+vf<BWvxMYG9WYk6)P=QAHv1X(jKV=?PX&
zM#Q1$0KLU$YI1g+MCQcK8qnv=BQ{8Wfs0|PeFV7g$7}&F&orx&!igqi43#~m*0Wv3
z8qY*-?6g-B!zJYG>_@z&k0B@5F(Mjka3!y^B~V%)OcHre55Gp+DQieLqQ5Vp-ZN82
zfEE}AF7)(@%org`QGS7tmdNL?L#(C<`e%kde~gR6_yqHAF7q$d+j%!K_s%gOAWn4;
zC$h7bFs}+i_)F~x)1oKnsL7^L9Un;S-qV^|Ypf$hHY11-?N*fd?eNDZWD~cjNfR#|
zd>vX=|HPDry~Js%j-=s2)0q6S;~~#~;e{jM8;RE~<>?HJRsSjw{$rN!L@fBHWtqyS
zoQUszcsn%?aB1fx?k#%e_VlJ8p|Ywf(K}K@C_C%pTTMx$@2_SRybjs=AL^JtIqQkg
zF%8k#*TmgmZ9hH`0u&I_19;|>6lFV23N50<@E;<yMObHbi3U=Zg`^3&3Eq#n{JVht
z)4}{`vpu%I1@l&ciXhGNeoXoOviuAvs~|N+=}=+(f%FEX(N=>jxr9IWtq;T8({m!$
zQ<Ygik&^$aFXFeL^Y^%YXIQa)p1#$u4vNgi3Li|uXU&dVb?kP=RyrkZY&p;1oH}&G
zDqq`fM6~O+URjHf&bts6K&FieDl^1o;ki5Ix%i(hfH3ksUhzk(7pJ8cvg(q?d`ece
zPL8E!(4!i(MV?uEkh*8A6OKA;aLnyEqIg)i(j*|MN^HXmbu#rjy0;u4wVBrU{>jER
zY}W@=OZH8Jd-Xdb@awau4*?0jy_8jm0XNhDWC!=tE0zWvuvllFv-4z_$!v$<c%$(_
zR^-5yLUPQTwb~)rn$fNi;PnqW{DdFnhyObe&_|Z{EiXAJI$kT6$XKv9g4U=@MKi=!
z+3Q*<$gYeyVw@T5#g>H;%4myZ5^gDpGK5Acd_YAHauVu5&U!L&TQLG3q%bgq;fZn1
z^vb+wk^9`@2j~Or!4O&n52>HmgHtZqHWNWMd&JVrz2yx1*Uhr|3T?0M)II7Jrj?6A
z=3aA7eNtSXyne}qJxq4uvY5+f4m5ETImV2ZWCn>Ve4ou>3|!&L*?xZl{0L_WXTyIA
zjS89J0rWAczlf-EXlPsFQsj+My!xfU$t=8ZlT^0NP8_1A_NnkxF@f-yAb}=EOvRM!
ztsz#q6Dh&2w8W+nVCx>#KT1{n7UH~E887g{4%}J@7<2S0!|akD^LajH%R-euYDeCD
zf4x*qgQkEH%$+q@p6GH54KG?Zl3$bs-)&3Q6itSUkE)TsAhLuaS1$DU%76OB?l6+z
zKGp@fo?GY;u;yx?rqHGLtZoiX!~6;94*W<xPTiQ%3I{#X4F@Kuifqrt#!4w|YoL$K
zY+i3&Wg*G7vY6AD72D;<gb<{c4m+~4MAmAAtgdKFSX)y^@b11kYR0XyH7ZU+Lmvbu
zI$bJV(`avK(m6kS<zQHzD1!@2B*Q75B4RfZy^F^T(}f{mLmw?+GB#r})`C7UtMyEL
zW`*?;Mh%fR05U~ksmtHomh-3=qP;>z?xUtpQB%TmMQ+e0SECJ~W!HF9_`w2fJ7S{_
zyy6z%dXOdE4bb9D;gIGpfvSiOz(v`MjzH9xuxB`odCv_ZC`%aCCawD(A3Yo_I4lkd
zVVzoJzcM{|Oep#)iE*C7<ghS3DyQLf<R4>JQ2FcC_Bj=-A{l%;v}eNF5*Go~w?JDM
zWGD<lG~#svCN(p|nqs1HKt<jxpG&Bi%3H^^EX^&>s{U>80?mXJYb^RG+G2kl?PH>4
za7lM?NkiN8l`5xwN1L{aTEz2)(fvI;wQCk#!#qLf11RquqOa6xSWUpDA@);0+ft+U
zvJt_8LJx$c#d{{2mm)>i2`Kq1I;RR*%x!q(J(kX8CZ!!l3;olEQM^g(^X77xLbX!$
zqU55Cv*LyAMnCN`CPwb6cJ3^|FS`!uTXPGCkWTak)j&JgD-F-z?jvUi#VUHb_w7{_
zZcEC<OIM<$1)EyM$wg&G!DfTgEK3~ma+c>8qav2seClh)8EGgjX|hR56~^iw>9N;z
zoy=FDW<HDV9*z^g*8=Hsh#RmIW>QEr$zcsDOazn-5Gg}5B(<Xwh~t^!JsTpu6gX%G
ztZrk|65^aE)Lk7I+(!4BG9%5kC&os{EK9F@ks?Z)lkFKUOsk2QIccBR!@Byy`8_(k
zI}ct##>i!}2|(N-x-+J^hd5rg4Y5l|9A%HClhP{OUv$$sqlhUAd%q0*)WCmHT9MHR
z7+y+}a<dvX($_3rF+|M=EioYBI`(F%o-{JdR|d%xUcWE>K3Eb=oRGGI)fyr#Ygm^+
zJ|cHF$Sy9whw6Hr*~8+JY55D%UQ9c$afh&!;q@4QSwis$dOe)s8frdL;To~K;hJ(j
z62kUJ=lMqVi4D(kmDaJ7)c&>`Edq9s2@8o?P$yJI5Qqnv&yxh@z`>5VJNM*M!j2Or
z%!!Skd)Gw&cXSwQ=#ACiVO}ytJJnUB5?eB_z~V#j5(d>%aX(Q7@u0j&<g;<bxS~wL
z`XtD}vPo30B+$45L80n;%|r4lB9|!H#Ed~WqbRg;OQeBBYW>!Gh`Acb82dj+l)r__
z>@{Z#XokzX2HBWpB2_}d?3)B7Wl87Rq%!lA!^F<9Ff77GNT-vRuBD-Pr9)}nQ;pXK
zUlF{Znwa?ugu!rV+(hIA0%y^919|TFQ&9zeMo>fH)luR?=o>Mm?VtukeT|~^GxHy(
zxg#qD>J!y#Ziy^H$#F*`MRt`_xgxbi4paV+&F#R(eljhoIblw7v`yg%p1~!H&GF;^
zc85PMl<~(!s9s>heuen=J~Z3b!mIs<vw8dJHvaoyo0Oq}<G+M!%3ijLD#+hkTQAQC
zR~v?`V^b2U^Zr#ymVj&X&vk(^LB+b@lAxALk`vd)i1D$8cHm-$1o|gQii(BJ=e>~y
z#^<`9{?Sr>$zfH><!o2Gy{exBbxlnNBc)0grAQ55*BbGbc$W9mT_>44KjCaH(`_$V
zIquE~y;-Y<xfm|M_;w`(F68=@_5HqKg*M#byhBxr_r^lXZ*}V}Jgu)=*qABHWJ?%A
z%jOrbfZ{#Vcxp9O1$nqPF9$$?`o1&9zq)8!EZ9%hb-PVcd`r57dQ;BOCtYC3rSYGg
z3*R}yiiaB<1mpDdm0zG9p{kK@Y07$Hjxp`k^v7Esp&YHZR&vfJZ$wQJlZth*k}Z{M
zZ=d@dN3NG2aa1N$TRlZ|OgLzFZ^n;87T%~#B-S<7HITSs@zudUL%{?8Hed&Ey0{$w
z=6DB|L~TmzaYt^b<8GndnOmDL$OP30(_GHL5zlaiwWhBFqeqNDRtx1ogj}=)Vo7h+
zh*Muot(7H|Ew)VmI}g;6uD%ekMWUYgg(GC$KSh!r3s-tQ`o#L=e7K+$Al238S!`mH
za8C-C*0h~`cBM!_t5dW7Is7*Y>z*4(d^v7IqP@k$*G}wM!w7@|fVHVfMFjLLI&u{o
z-ItT5okHg_nulkT0NDD-5`-($uIkk+)KzgnZ3mcZ0r5sb5xg^{5lVZW!?YDvZ*%6&
z%2me>eg+N|8qt*t=iw!bnIw0}AhT!@!JUi68MK??Rm{Nzj*H<JAx_4h(GFpa4!Yu(
zB1<WA_3`DRV|$)6!jqTvU+B9O2W)6Q7=QWEXFC*>z($7cz0pr`HoQQOL^cx3t#OnL
zTT2tx8|7o1VvZckn-s&U7Hx84u&f*a_XYR<&_|2<`ZczqbX#nmIV?ZSR4DDWPGl{I
zGBjR>CN}|HYtBTk^3_<07MvPZtiZTgDS#HSyF)o$lSKiI=#IydOvME_kJ7izUob5f
z=DAG7p5UXi)mo*m$TKuf(Sxz0*MttkKuhNGAI%*c-@#1)sP@y;h#+IISq#ck8RW6-
zITOVaX+<1W9&pxzxX>@K+*2hGE_%XJ-a#0p)I!wgF&EbgFX|<=23f5QGU^kvfIWw-
z26hZNH-`SUi&-6V<7Ekx*$vpIdlH$Wh}NV0^!N4$u@sn%akqQ=tr_e9f@6pNB3;)P
z_=-Co7^)Slt-A(loM$aIVgk{&T&2j<Kz!i<V&#d^I;NKD!m|p~JT`BZ>H?2h>F+Dy
zS(YspA3MF6I1<sIAHxNG(}_`2zgE6DMbU?EwYaQxReGgRV6*sa;oNKSyT}@IvKdP3
zn~moZO+mtF7Cam@S(bwSFgYQw2%!s!C|onYrNRm{F*P7}jA|I%R5}#dmjC>#^4@7_
z?6XMP+BBzadPFm@UY4i2m8TnBNBzQDv3&bBN7(4$@#hW1Zd{hJcuLMmHDEa2>D)$@
z(rpK|0%}-mC^uwI{4Odi4zN;+%)^)%$ub^`jBaj`Sd5GhtsythAP;(y3PMViS?`bd
z$QC?8Zqgbv`P|Pq$#yH3ZFR-Pg{v#YGm6PPL?L5<&A>IxshX|!{D)PJTkuhSA!ZA0
zR|h6W4_5lXz%{x4gg(>(tseyHfI#@x##3{!R%bI1-;NR{6#2E#G?;LCU+;MY{|=vv
zz<GaR9}gzN&QqByY$hy$jez9V?G6hEIpNjc^;b+7>RqcVxDL|E9q}E570rI?2Ip@$
zRap()g>*}B-sGu|nZ}V0Q&=Q4mtA)NSzQm2YL&!w)E@`G54acTdvi+Xh-Bjys$A1l
zc9$8eth1G33k}>6)qqD*MP?`BDdB9>JS3249WwNoA;DrR6gcNd%1QDDleC4fmVRP(
z8wGUOnbOJm^h_VS7D<s!)5WlhiRgnU4)l42g66WZSX$=(@kPfL26RV3;li?*=z~P6
zh5`l(DJ!34811Lj%2d15O8fC*S2T|+bG538*-^H?m_|%}WUcUPcm)es0nYjS^p=z=
z8tft)cmc{qN^=%s72z9r6-MkOx$*vz84v^$s{ZC+97~%sawsiKhHOTd(t(~91`cil
z7FKU4E-lPX*VOw;m>CQ9DVrAkhKm!IqGOqTf@qS78|UK6v2*p|QikzK4e65g=E?)u
z>O(H@;*TU1Rpa}a*JJ9$<>_tZ>!9eyD(XtgQp5EO$Vy$CHs~3P@dC<L!{yf$;hM2j
zNv(M4PHM@NcJFO@dy9?&kg$s<*D7yu_sq$MEAW6Z#$0_0-<VX3h^E5{AHMG>EPI@%
z{VsRpnS&{I5F>X;-Teo<8<r<G2T<7qu(yC`5vhg(-?6CM53kU~HhUtkoZgWxw}>pS
z?0Z8J`B1z@1v#iuuk5tFDQlZGp)tGuqI;;FAJcdD9c0hD@o2+Dw0$aTw>=23dn@~T
zT!cIUJK=<`Qe5FHLkF)}Y|*Skh_792K`n!7AABEBK1e--IfIz54X&6z@G7?|GGIOr
zs;(Ojm|uHh`#C>>TG1!JJ|+?dGP1p1V?5Y2edTsPnLU_7=ii@d+jSs6yd$)0RNz`(
zQU==nl5N&LjX!AbLAtl@-}E#IB4?dAh+~p7x%SlyR8E-ldp5SHXuo;?{hRNu6<Xc;
zqgmhj(QDxTSFMJugWLa`XE#dNkYA8R3SJ3b=O-6I?js}^fshKNCZ(h>Eegc~hUX(q
z2v%I54>pq*ew^mK>3n4Fw9T}`!tD*Q*QE3)GU7M+>!s$i#@XR>y5rOH1@H%9TPP1U
zySX2E6fPS+8C<O&Vvk)f>DIqiSe4Wgjs=_+TqDq`pRyljk6AC}Hn<km?-Q&O8IECd
zz~C1FC7!2l+Aui`e2L|T_NICrWONd3tLxU4&V@8}3TOS){MsaUrTX+<AAxmJAGWQ^
zmaW!iUlXPBnyq-N0H>Bgxr|xaQ4C=EGouMVb&<SkjzT%B%OYx--ycZOF<rU|zKJ@c
zM7mtY+ajOfzn44PIiDLV-`dc?>U5%@K;O@DHN-S|1DMm9x$w8}7{7Az8tMe0N!Htl
z+-UA*;3+Y29UGLn>m1!>=|3jvB-+h1-a36*ZtmU{*tANKHbH((860rF+SD83s<xh(
z=jm51jk8y@TOCHzfge?%P_!GZlouzF%c5-9N;f2RW|3i#3PYjn>Oo!i%0dN$69&rl
zqv>VBkxIgmfP?$<%YrKaN5v8qf-MB1_fzRb)4>V={*~&eM4Bp(b4kkAnnK13iXqI6
zfGNa6PkI@5uQpAif!ejngZ1$Vc)bp(_)}wXd2xw(nQ^Jn8m`^47La+M^2jxbqZd>E
z!wz4vz0=g>?7GEg=~7xIaStu8zPNhDpCEapa}Q)2&D5Q&y}Wr8uEBD#?qTL&fw=<X
z@v}inb`SaZhqipceEX7=8JEQ_f|S)N3YH6%D^XA^ksv3Sr<}*0C!WWjC!fc)lR1f<
z*DKz*aAo+8jB=koWh;SsSPw*d)b4m+Is<rM4@o1gnm}|&7}!Xxu0cp=tS-?!7aEAT
zT^2;<{CF;sTJADB--2+yo?msJvif`YuY{Uza$JI_9mcEdCVc;U(dSE8Ta*0|E>l0h
z|F!7<LACsgn)^vp2ck#HT&Y>IYI@pG55m!ay&lTg7b2rVLPnzHHd;}1*&wOU(7H8o
zL*RM^`jFd~Ak#(yqJ1D?OhdhYd;0pdixk3Be(KJ4J4+b54*{OUfd4pLrwweD8CC`^
zpCu%Qvw29HmwwLZZ_^lW7nj69x=4~R7P`wVL60~LS02rpBz=#opp;4)-OMjABAhtS
zkiE<%qo_}_N{_bfuv+A;TgEM&*hzsBH+e0{bdr$X1pha{2L~mXrN3uM2xUS}zotnQ
z(}J5*Oo&{4wU;FC-NfGso?{txGRPgOx<GLl)JyR-1t6v(nB&r%4YX2sDKDmYU^%`<
zZ%Ypodz(^|3oVfPIvOpk&iez@{V2HhieN0P7sfedxf(NUry2jogU0O}^WPWQ8!9An
z_-BDne%>zsoelk$z0E(_(EoY(*OJHWNH6|D8t!R;+_0ja2LaK9LsC%-pO2!y12mvJ
z#X!gp!?5Wz?-0l;%Ci1D@~W<F`4dm`%aiON&A62zwRq>o(`4Gwefs0;;Q-Z_6m6~6
zZpAM^3wvvUVb)$}0*Kl}Js8CkG6pOnPPC9<mOPJoF>qEYyfa%Y2`*DjRk1$4jRM>`
zA?E(We>a(6da1CoU+`A`0`cbhyht$_Igd~=DM;t3KUFJr3S))*f{ff4OR#LRkfxGn
z!k&)6GHb{UMe=}vtH$3<Td*E#J4{~MoStL9-9&!uoL$f4wWt3xCNL<$lK^bOL_Unw
z2_<Y_0Iev~Zu`UuKB8{X_{@H0kLd%Uy)~#iLJF(>RBvdgJQ=g~OkZlEy%|%r4i4_Q
z`pd7cjAMotTILM5LeMTg*r+Vz_$(oSNm1;UB|SWKWDe&X=C2B_FQ=yq%ueIPO_Q)6
z@xVp!L~u5~%cAX4?7MlZajW$`W_ossNniBq)*#9QiwLUe9T3*rZ->}#Z0a4(ud~Uy
zXAfX(s#8IeXrX~<@>-~lo%9&%2J3<STXIVd;TY{)8QMCDn%xDom@{VF#sMX2>u3Ch
zJuQ}JJAnU8Dk2)f6w3T52)zH5=KP-;Ao|DN`=5vZp~okFyl{}X7ZwYvs+M2gwVJAQ
zHCq)l$-wyKWbGD~h_cQXnaI-?zwPn;A$faa5N@Ez6=z8#r@0+wGCfQfbarra0HWn)
z2KtqMsabNCvaK47j@M$dubPl)%Q;deT0RZM<>iIa0#+x=LNx{BI&DScJ~;0?=dUJ=
zV~0`>P|BcH(%jJ3QU=%I#2~6$RRr>yXLxqt0&632D|9Y@3_K8+hdGQVNaejCIS@Cd
z>p3;D)Ib(>D>sN0Ik+DO{cbmvcqL-iI&zN_=PJv<c*WFjG1y+hULQ+POe*N1gt40E
zNy?L)Mq?>22yFVzVX#FuU?>p0-@fxC=sDBnYYgEc$NM}~v{=Zb>ae;;+Zjqsg<9ud
z9)L0M6}n(E+Z^(>VWYlmY~4E`@-ln@#*2RS^bVt{wDooW?QS_AG(NvYF^49A^OszA
zQ<r{7J{<8ULvuK>&ukJcQ|iHiJV)k@KRg0s!pIA65G@M15}{hIF$$_nvBCQmRM|)5
zc*%76%))|tqv!*)4(chLQHe2e%}=0Cs1@?#KV(Ymc;bU3Ka*B_NdFsO`R~Xksdza4
zgRlItx83-Bo``Vu3lapAmlPGH+g&FKMTWzGn#ULvL0UCr)ze#x>HwG3QNk3Yrf8}H
zYf=PCDmN8E$W^_Y!*MUKTF=I@@^JrqjoVz(^t4Jy#_!|MLllczH8$qyaFdnB>2l2K
zV580L_6p{^#%5W7FhQk>EC`dl(TcGG=28`V5y%AIracPHqO4mKtHcnwPBfK2had=L
zhly<3G;3S{H^mpf#79&s+}gw+&sQlR&L%L=*LWZdiH>e)<(R85>W*#=S1&h;8qnyT
z5TwSp8L44ezDaS&g0B<bv=P)H@Z7!7pF-_O&h}Kc{FroSNwAEbV-{TIYV6IBJ~iBc
z#ZtInAyb1=mFdPu(8QBHHmuSt!ibGIpO)(1QdU-`tv5NIzGs2caF~-IO3ZO=ud3Xg
z3GuK{*UIlLK!Dtn@1W(t)j+kLc^KKky<V@ZC#*J*e)`wci6Py*LVLZFWP4t2Wj0=0
zrK^}2(dw#HJHgtbB70?R9b;xOtZQ=^=A1gL8Iw^G*5y*Ntr;Z|dU=wGw0_C{c#axo
zCo`KE9V`f$P)#G&sssr8u3gSqy?<dDnw6uUhlD(XYST!Mu`dtKa%%8^5|JrCS0pq%
zb34iIvq6SbRBu^ydRn4bV>x<PN@1b@@85fONEeOPk^Zhm&RChCbQ$yVOtlu!MH3(X
zr($;lJh~F%wcl7B^jm3WVYHH9lJ@WLYQ*C(kPrMp4<R?Rv@B1Ok({p(&8n?4eV?wq
zeae=0w@Uc15O3+RHG~Fxm@qi~EWcqP*P<gW8wUDV>!$h%VY-R^Q}p)MSa}*eu`UN&
z(lma@gkKx*w+|&r!8q%+1l;V}fo}KVSjvr>mAl+(P1fHA29Vw*26VZu_c7)_apTYE
zCkLdp`l373!p^X-#^C(!V%y!#jm3ax3%ucc#X_3|FX$+fW$?7qGbt~U(G@)MUW{p7
zh4l#X&wEosV}(GGY*A&)=Qcxofa>>}x@#5`=erX%5UJLMuo@*AWYj_T8$`GpRJauK
zYnE(p;EvPRTAR;9zz%Z^m!dH}&WLg&#k3JC(O-);&3Npo8_;SiCyX=X6(w3|JfLR$
z^F*pXpGA&Cji($RMztnJsMpQAUu@fz=E}sfkMmT#>!nXc>5-=AHt-#0+e~Sp)wso7
z7J?-;=5|zCl{IFVvld?*JO`vjO0S+3W_)0+89qaE5k|Z`*M2!~!hPeoog&DotWe0^
z#m7*u%l8Jz?!mu*M9o;>OI962Qg(6!>qR##Ik-RUCDY!eruSirouOV`+do(@x54pn
z*s6cgKv__iS{RyT&g7P`Dx2d^xl^;vN=3~m^*{wmm!@JxoCCvNTckV&Qb_aGG!?MV
zPbN5;bYJoMB*hEX6cgDmBup0Kh|no6oHJ~qX~ztNqnhbfzfXLqxfkY2Y4X^sK=%az
zb%MG3vAqgl6Zi6R=jRW=E;Cr-RX-m!@d|FPqcm9a8KV2{QqU^@9@V-+nHZoUXaZ|_
zkHUV1JU3e&+A>k{oXKHWX=cMZJPrdBl_oX0&-pG1cZj62kL93?TTF*`q6bx+kG3E?
zyt76&qN%7yUp_bLt2LwBM5hT}?I{0_BD_meZNrD1@qpDl#lgiFrLGP&;DeB&UaD{o
zY)t-bcbM}h`fn^`?&*+M-i7~4;B`!P+YI4}`Y>n9GUl_gc<R0T9{beaziKz-+OI~t
zH<+pnU}$;1>`to|{%B=LVWB<o@Dm%+o>w(U<ln;^gx>IazD+)6VVKQrBy=KC-eRo7
zVE_Tg7~1E;QpbSE+@n5Fd1rd+)Uq?rl#<s9r5N?rOy6+NJe+WM%&C9e$weM^b$N#M
zei`_n8+69{sSWP9QyENV*s>RF`7%}a{&*U?*m^TQG$pmIj@?*Oom4q6!|Y;gQ%bp}
zy}2Q>?o#vE`wZRPz%i$h3EdK*P>KzKODc`fSJT1^-BW+Xmi<m}4$FwkG{QQeXQXBX
zJ66AWAWN)_EPHYz@RlKhGj{ZlLwZ(v-p%|mgvGqlj)Z=9eYERByI~+vW$pqC@!|%1
z(d8e^r+TZS)zzmB=Z?#TNw;HF-*N=5AZTt5dl3~4X*Q^XIqS7n<sjO4&Q<;Gbo$%5
zfOOwfB&1!g+N#ExWxIK6EAWDO-R@!c=Dwo5NDC(5TUjOcF|T`y)xzQdKM||H?d3&Z
zezgRsYcfkM!w`!S+tyN^RryqRkfl>jTA2Tyx`=Sumr!sWWPLf$kSHZb6I&hofSz9f
z=`?NH3EO>(t&#DPGb#+bk_``rS6$AR1*vX$7=fHvbt1{BvJ1(Ada7g~YSI&hQq4!K
z^5h0|Gd!v_0j%ve>mJWnNnMsxTSSA*0n111hYZ;}X!|XyW&e&^%}A}<n{5lkJ`Qs-
z?F6~!j^aKKGvrG}#GS8tV3j%gNp-;{MRzZ-KuRx9knt)CkA;}hOaonxZ+-2bpNvMd
zg`(+)#YTf$csWwpJn8&QixIjFAv9bQuPtWF=qN_cik-#{s}GIGo+0O2<~!)4a5v>y
z4vkdz*r}G<Wta_avU2Dkfy-ui5n)h|HikXK{V<_>$86{LIM1va2NgF14pww>R~Uup
z+Q_STRNHND$ve@Lqt?uabsYz!HyQ^)R7b*@+jd`9GotC|O!ti;DAtV4D$AdsM2HLt
zZ&se!K5W%R8>{L&6L;8RoZb?Gpmw?wxmPX^tpyIeilX+~;yR!F<B@vHX4fIay2c`h
zj=F`W&Z?bL5(f%tjtUhah~J7$O33Jh5`5gn;}rq&Bol@qcl_Z`sTj)|QdV-Ur)0;b
zH!zZ5s7m4Hd9Ni|K&iqv#jelhH7|2}5hoqhm^;?j^@(Q=bJYN5e{Q|*xo5V2x$=gc
z6>d%L&>ZgD9b3RoA33!9Q!=}TZ=IMGf1*?EO}MdV6P~^xuD^qA2LwLpY17O+6nz6~
zY{OS~k2=2~nCSFb0Kaa$!h26O?Hnk5L@<urDIAT=EV8@)jN@Q-mhUJ!+&Vasd*>w|
zq?}`PR;}VGq4daQxk_zCs<=U7E5GdLu7~r2Zze_MD>xR<_Ui*ZPJkSI;BQYw8PoZM
zhhP%r1&d48dJ%$`;Tzxo77Lx!4eLZq9rgCQrZYG;i8bvL8#FB6LksuvQ=p1!$iShX
z-{f9iN6`Lry=BYE$QF!{AXNp@|EsJ?myN8+cw%%>U6jO=U)5qB-^wh?GE&~cGJz_m
zzQ9&A=Cso~&=CjHjCUNWe`x&Bx^q+|5nz)tbf=;UyOjR<-6EuELx<C7omQfVLkA*+
zu*H1y1=c2PsXDIIF0^xsVax^OC`bwKflsR!qpnccIK1u$9Vb6UIVmf>)?2a?2ui1)
z*|8okfFrNhmoge!`kpByenLpSnX-tPKVMRV?6)un&#VOBxPo82><=_?-!=r_+yviV
z!!Nw85V*BHI0g~C(J-Ea!QOx_4OQC{NZgZ5T*I1|1l1m?St&}sXt4V&gJ&HSfiFn~
zR7oZN<2A#(sTeV^i*4c=!=D`d{)Zn6>^Q*&61vQ)x@`Opzx@nv|AHqXWFLg2q6bgK
z%v!>^u_y>EhqU$Q6uo-xfY?z60exs2YLm=kdu@@yFvcit#IX)^{xUYL7@iu>Y4YK;
zr=(!NVGlg>m=TTd^vvtOEd?J{Ld;X5CrQXDCb`4Oh=g<#5vRj;<qg&;qqAw`I``Du
z#SMmNoj!Wsyb$Oj%Bj!$=HTid{Z86UGQJSz$?9_--?ITRj-@?p!FZ+p_ug8$$V|`h
zr<DTw>8<~}Ch%Wp?0*G6CdvM|0L#L0rzC4sA$dCa#R)RW;qddpqoSdv$HwN8=x^52
zS(O!cnvWZtMCa&U3`1k8V4!;Y_U!4TzNR8L8tCtLrL{4d9A~qqrNoq&0I*Yy!@(!w
z;}Pj8_hSL=G;BD#<nV<K&7cnolo-<ojyrE~TsJ{Ya4$rW;Ky%WYgmWmYgSrvP*+*E
z|20yn;H=hjX$&YfV1YPl-(G1d-tL~4j%+t_hFmhQQ>Pe`fD$jN$cQ5Rbmu2i$;`G;
z7ut|WRH!gmaaU%!q6gmn4XcX-2_?~E;`Q>SG&$=VA^9xw_{=NhkzU6ifv|^-i*5#Z
z<(CiEH7S4qtNVgPCmDBQK*!Gl?KbZ&u+zC-9ecvBEl<4U6LC~qDt?CVPo4zJCQ&x8
zY=l?WF{6?Mn@7Y7j*7d730`n#8KdiT$t@&DmRP1*Ko#!PE@r9w8+=k$1Yn<&&0vr9
zHGqhK&RDklKe`}^kwY-0AB0~1(eVD)d)0p-#PHAl_6H&Hfgglg#H=?~)hnP&W$(hO
zVu};@i}(5Y$P_^+t=nUXqT(B+h{WDOz5+Sz7Nl6Kk^TYEK5Zxm_)-*}>&f)RW*cLO
z+o!AdFIge!;7~DiKn6R>p*W-6j${K64=DaT*J(VQR;vX3g<7nK)|~~Z8_9)^z(Hyg
zU3VU#CH?_hk8&&5b)($%>Jp9a_8q4v=_)-7AgL?!=_L33jbivk^{N5oF6~Oj!VEuS
z$LPijJAt;dXYK*6#(p9%^S{a+Hp=39AxK2GNX7I6bl)D!E>}7+M!|<dM<EVJIhkSf
zC}vUw{fLCb!nxG4iKH|9h6nJMet^NiYB+vw^F)VsWirtGIw;O;T0xZa-1ZLn{Sqy^
z0z@`!nBLt%uh>L-jcrX;qB5aT`FVOPN29@t$+5+feGtav+PxIZqRV0=`Ds6(Oo)SH
zWQBK^^!x`T3<PhHb>IL1rm#N&w*M6p1xGzcGXsGi8yo)rd-><2;^mmIg#OJvmeDDe
zo-CW5+#I&ZpJ!!Ukq_S_=qFExM3GO1*KC$CpBS6Sax`G3R|%BWzX`*Tc0D?q7N&Gp
zuu6VDy;huYV2Lxc$<^-mcsW_qc9nA_+0Oscar4eXeZHP>!t=6ya=`QA=KUh3&HK_n
z0YEe03~QV>7wsg0;!z7oxkbj8Kv03CcE!h7t+0t9RIOrIMZijCUqEodMa1f6%eYJl
zgt_QgkiMNiO2XWwWJmqX?O58Xe9}bs?I^g!pMl*lJaW~sqw-E{x-y4f>oV8^Q7D%?
z5`VVsS}C(DHW;6=pcUq-qprJA`ZJm6G2h{?4>;1CTy;mJ(%j@Yh;UZgXLS)nLZ04G
zRYcod#hYvy^8~gzTy7?)(^6cdcQ&;GZl6*Z?`39P8A0;bz}ZRJ!ec3a$^0DEmHI4s
zC@NyvehS8~fhIe$gpkYDXo<tGnP{nRLDC|e)S%+MrFqERCbXHjHUCL)qXkTyGGkpq
z!=huuqaf>S{d)0uswv`~lhdF}MTI_dv&l@nD*RbheEO@fEZJtrEew7B*))IVRuo&r
zg8=2~=;)C&s_WHiT*GK-7*x9kM!GXAOp%HEdmd#WS$R#ii9eRLj$==t!m`plw@XmO
zlC)+_ZcTTR+d|>9>#8oem17nPhYs6Dg^xzMsCm&*q(!8w73smr(Y+2`OFMCopLQHM
zEsC9EU)#|j0u|Z32*aT>wW8H6T#-V)XjG|HU8FyvN}Q=o6#LjCjz0!<WA<VQVX<P1
zhjw1K*62h_-$tXe=J_MRZLVf9*&qIOk=z1t?(lg1xcOSOLyk+6_TyZV?h(7|uCcsq
zd{{VXv7gqXgC1Mvc6>i<(fHvwHLO#Nw<7<HhJ<W=n8~cGu9V_5dlAN{zPr0To6v@L
zsX{TTY#dz1kag;5IKgb&06Y)e^=&T;!<W28c)OBbS@of9nQaDxvZ`(zqXPOZ4a|<_
z6~hgaX1~*TyfgVBqGXcRFN08FB57i@414di)EnoX3BB(KG~cRFh2H?ikFJ_-=!&v!
zKOeh<8)3ZV%{V)dTk#W%DQ9LMYdF1`F89>{%-$B%9ID)D5i5WZ=p|Q*;Q$v6L1b^1
zppUS10B4y$-5A|&-J%g@MUittic@bSu&8$7=9UweFKGvT`LjKT0W}cNyGmfp0nJbP
z^N%X#ViM!P(HJeHp{>hk_2xP$*PE0KZz|Ur>9W{~H=n)KC=zpwd8oJLa4d3J8r?Co
z6C+tB!jW6KO(}5-M*>F7!!mC3wn9>vzBk}`LLc|0OAly>m8hAkr%`fSCe_IjhhxMP
zb2Q>|;?zi)Pn?kqRYo|i$@xRSI;h+EEJcQvUKIXolL48W@TOlnyre=fDa^Z`@LLNk
zI*MXfBmqCh-lh8TGy#$>Jxwn|@}<499HCuLBqimVc=~G(#)=;Gw@t76W~lULAP!4p
zR_4_Z=w?t9TcE}*8Ot91y^Ng?np|fvOQ-Z1Yc0qPo?p-H(QE97$>JC4PJ$c{KE_`|
zjuC>(SUl%(uFLocy9~`R&O;0+QN)$%5uUZs&w9k2<eCG{deogHzD?5KcB<DSFGqTt
zv;wYwvik$<F+`4}K18?s3GaDu5@PH$r){xD5Lqy#SDCm1Kq5VP08Qjb<j-wm@)W1_
zqC-8SA+Za{W=+_NlTL@;q9HOYpe6>7;^crW^#Lp?YBMJ%Nby1Nbh@wbTPtMr+pS7D
z3VV+*gO#nWp)tkmSEHpx15*um4vgzQ2E-{U{pGY_lqla6vh~=Y=LlO#H1cTGDUI-z
z^Jx(>8_g9>Wi70xdkt=%jR{|Rrq8dxzBz&qJBGWLG14A$mZH#Ngn9$>Xe-~E#3-L@
z19pv{rs%GiVL1lrUe|K79!-SrltL2sgY^(8sp7?I6K@d}bD(f`vy#wVj>qiTi_4ce
zplq7pzv%3*;=n^QVdLc^a;p9yjN!5VT>3l71|1rU_8E{d*dj3S?K2*HD^`KLsY(SW
zj}4~|MUzbel*9(4&_mbga(GL(^yp%~635(Q<Xr01bxR{s_Y73ICV;s{Ab<bfKZ-%?
z-FPLLtHr%RVD%Y(xy892cz2Cu7zvHW_Z)=yM4LHK=nU=IBmTgyvHxU(fAILonE&3p
zJ}ES@MfpbVOI@{-wx_27!3v-{V5l3joHMLGl_zJPCvuyoVl?bR676^;CJ(9?2scVe
z9Q{Oy#g)G(os2(V5Xnx4K+ij_z>-mTw<=5K6%*Y~z<B#Z6W23dbRVZ_t!v5-xIjyV
zIRJ%Dm?#`~fE8o_)qf`GPjf@%GMe&WaNxX$4yVOJOqb!<c51ycDYsn}@G@?Lqa45~
zq{_}_EgQB`qfKw+V-EaAm}*xmtx+m;S^m1na6v7*-bANb-sCI<%AEA4KowWG+T0*o
zWS0yZA~n-Pc9_u?2BJuNyxU*zkRfL!|4(v(EQZ@9vL~2we*BFz^xK3X^LbI)j&}8k
z`QAI}g>6D5Yd)>7LuB~L?qO1l{_*1`qwwC6k%m*9QoO=?qXP9Pi9O`oD~5ivy0_od
zo_P?3=@ou5r^tvLx#E^SFo=Xw&F*S!)uF<4MdR4{_lb()H=oj{6DW<;Yx5D6t-0P7
zj`N$=@m3X{;gg`5%xYEn_D%I#ORs{U&sX?0yOq#%Gsrpo7&l<oXhW}B<(t%sw~9ra
zNt6!l6~sjVjrMWFpu6#h9~4KiYe(AlW%*P_but<b6_7h6cU!oo0#_ReS6i|Byhenk
zMWhW7EgFxvW@T0^;@alb(F(mNsptGq=a8D;R;y^dY5bKcA!lvaXTFkio|d&hxR*i6
zW^|YR@9U&r&p-KYs2;1B-F}Fhykc((m*h30JRic(2QBub+i@MYX`4}UZ6V-1crfgu
zADd#6mxTQ=@OmLp9H)HQHknHovv$yyELz+!2Om;LhnkV>hz`+4H1^3LMwllKF55VK
zjMJ&b=ajvfLfKKHX*TazAjzR*@VD=q1kc6|!=S6dOiN=|PDkt^xPhEKwbh>Q@%KQ4
zWE8!U^NE1d{r5oK{(nZifkcXa6Z)MwH~#(LL`?>L27d9p2)nFGuCR%?EM;*+lBBgi
zBpppSNF|OzgcoS#&!)>a#*eWJnEw#d%{oFsss9_sQbWW`S6kCf#LKq(u+wd0Cg#1@
z3(sa^Q<KAeVy(mX+p8f;^VV?LEDw-NZa>k4PAZ!iDMz3V3NzaAmLz<wL+e~6@TkoH
zODXLn8CN&9h@z7Eh35?<@iWmeZO`ECKZmA`wr1U&e$L>eKco}(e?9d5BX5E3pNH_E
zxIXFrKS)A5v-A8ya!Bxza)_uyrObm`QIJGZqOz!PtVHR}(qegzqGoRtsO=1Pd%s`h
zhFN<7&BCOvCl9C6JWix~e0X{Qb|EMrLTfYp;-Nek62V1Rs&9f>fq|R;ivH;|qD}nM
zef0N{2Sc6dG&MN{+0Jks2=K(b!bVzhit#i1S@)?7`<yxhx~UsGRl4*^t)^s&a3s%f
z`m=B}2ivmLr>@t2M18?!_59$Ds55v3t(}{=jd{4h*)&*DC(bdX>dbCoFtZX-_V49B
zIp9!Wwwn#3u`~YK6DbqgfxuFHwem|Ux9I3KhE~BkQEsCe((0n^n*t@aizqEETV?>0
zD6sDza%+wuFvWdN;lmA2)aXCG-&4HkLE5K-D!<tfe-Z`&?qRs_0t%R@aq{bPC+8T%
zcLy1qBh>>ou{K814EXV%nt`)(m-P&OAtmr3CxuJ}?JCOOqMKj%ND3h9dPFPPN;@dJ
zYVDh|T}w)Z_xyWj8};SgsQH5z@K0y^-!-U8j%Jqsgv%<HTc-a<jIy&K^9KS1xoB_@
z9?MdHlZb`{BN8{Pw85&X5NuJ`jzRhZ990Dsl@#%}k1y}Y;8ds$B_HCI*iGBXf!B50
z%hSUfNH0Y=`snBdof8spqx&pmzSFNZbxssnmVN~tydK2Ik1oEIr}vQP4LxCS4!wx#
z^-^ZwNaI7-laA@3*7D&c<at0^tVaSrNk*(kZXd?bin9W;Q>vCMN>WIW@;_sc9nKpU
zoF;KwFz?p3W+T*q#+!yNnc5TEE*ssbdhiG%QM|-&O1DVYD5oG@?T^5Bqfx%oN)qu5
z@{NzJP7z>X-DE3O8fXIeR7dVt-jCXDy2|2?#Qxw0g>#PP3UqOKesPb##Ly(Aq;h{7
zn5NBgnhHdoewk>5;f;{Vw1ESGR0~b&9f#ydzpjD%WTb??HH^&~56N3gpYL3@@H)&e
zQYaY1%l0who~&$=gb5Rjdi}>_v-J*18voA@DhCAsVEM1RNZIBe?v}!4mPSMhMn)ET
z`j$pw*0xTL3Xb+hdRG79a20>VL%MKZUo2*((7)y2Z+qp)g{ZS<!jXo=k%u|h&Vvy9
zZJ-Oqq~t|#d(m-wDRp`=yKIHeBd1>hcoGk+F(9LQg`8R6Z(823u5<oL?K`N73k<wL
zJ?{f*pmN%VJsCl(FlkQU1!Yhft8VJkPvrONM-N${xTsEAv{J@CMxp`+6fqw(#kFjH
z2n?t>RkTPd{Qbh7NLB$!EbpKIanGP{-c!6k>TSq`$Z|r_9D#)*Rb{#404efMN#^CD
zwrw<QU;0QFI}7+ozo=66_GVX<TV7<IsPo4JG->Dv`O<N=PZLGvm)|0uh=V;}LO$bW
zP`11`wC<rdqOJ{13I37N&#M;kG$cIc8|O^bFN>l^SdxFWD-kAjvAW6NX~pr0aU|^;
zh2q5^h;9@E?dz^hL1Z2E(yiQJHkIa^uUFFw03cRiY;%xO-DjMO>3|06*|cd_v}xmI
zIA+`1k*{R@1nMd{Uu2WFnVDNU0G7A{aKPm2i~tlnKI-TA-a1~6{PO$CQZDg(mAPTr
zxMNs4AqkhR!kKj}l0#l?sZyckh<=1<-g}=nA%Nrvrkm6c94d`QxV~`pJ>Wo5J50SW
z%gl@XCTm_Xb3@hOL}cs4)bk6w{C?4U$BaLon(l@!+}Q-B<}?!NxXR~t=q6sV2RzeD
z<;m-M^ddgXJBz>E+vCrTxdcwk#>wVg%X);;jr9x}RrkfvAGTM(gloGIJsbp$Z__pc
zGQTF3myv#?*qP(&u0aysin}C)TU0At$~cubsnwy@Rm>WI=TIO!CgWyWD;=ck0-wij
zvk_&9{n{K)(C^{E9f%TSTLzyu8<t{@4Ff{e@0|l<6Xpqe%!YG)6$SFxpB-X3MH|+b
zHDrs1<9O`;^|_UT*0>4E9ehy5f~c`^8F_%y@)NDu?=)mLvu?Y#tXdPylgnF<+Q;h|
znEU}O^oDiq#W>?28DB*($4a;^KTjPaAKhY8?%{BNz8z@Jub|SRD`E>sI>v#dO&+*`
zpkwesiR4_aq>sn7MPgYMrGT>_x7`=2K!CoZmqg^1DYtJhcig|hu=qzN^Mlf{bUT><
zJQJEcXCR6$_^XU*;iC6H=EmEUUXvd1004410RRa8KfCguJFv+E+;efM>6^XB$eS@?
zOx&1Xlpo;_SVAD4Ie}grFd$K&kTN`xWIr$<e%KgrUU)vB`4&Ykb!hlv`Z6eTknetX
z?o(59^ZK*eliG^;MT5Cj5}@0TgHMknC|Ki7&u+<!%S_wJw#W6_P1a-5K@6{u;K}_>
zrz0k+J6VW`s^%f_7O1eeL-SBUr{P+v0~ODTgf=GI%)UPDkV6>2i3ZoYgqY?z2;K00
zoi)x$kvG@&1nMnt#6)M}@DYkkqicK$sBK;b<ss*q#2J^6y8=}<g@%gztm0Vuf}wTO
zZt+ApBQUE%uiCsOS?d}}nNQmZ1d~X5TfJ4@&_gFvJY<&L{G|0sPVR}vELH3=ftq6;
z6Y9jF5DM+{yeds1q0W90dFP-+(!8oB;goz|5HKnN9g%L;kW+m>L&U&+Rf=&N6J?<p
zTsnW6JefviqH&V#-09KMCeghm3VZWtZ_#|C_yUOo;k*TEd~9qZgmn~Cid*lIdS6w;
zD<{8g8<Pr{dl!=m#FEmyWh`?wignVax{%b0s6*ALO94{`@Ftbx3iud;-lh95o7m%y
z`OQ^Av6erqZg0ljLjeI>6jLvSZBpsf)sWjwXMvU#OdEx5TdwW_Q5^#5HyR&6Z`LX7
zoPiIVAe-b<TGikZSHzC_(1+=}RHk=ZlAp(c0~P#DQG4UX$<L#iq84n8>0>Hui%8a4
zt7zsHkS+9XB+^-|2J4yQ5tON|@#Nn64hkAXi%4m>=9aJ*`ZSW)?8wLq=EsVYOGbA%
zuKS&9fDW*l^ak<07`tf?79=T3Gi9?w;i;Owl*ZC1r)&uzrstF9%&wCp)u~!?EMmLR
zyP~^eMi1pD5c?D%x%Pi6&HZW|!6-~7X%#}BcGch*ji<AC9h}{cu=uq1@Fpfmq=v?k
z8$jIH6*BQoR3@_(*d2m%yMf%;5+;tN$}`DZow^)MlB6<~^Hx<aCPC`k?T4B8w1y9x
zPR7qb8bDKx@<dCk+Pa!(CJ$@0(bW+t%uQ*+=X%kwN~h$Y1ik4C7c_NtP@(}!_2&nq
zCQ=)XZR6y$Ryx~FjkGLEdE^`G-QMo=*)P)1j|KVT=uqe}G1Ha#{F1pbxvk)jN5FyP
z5=*Ez*Wt`9e}v1jH7!NfP6n-JZiYd+%S?1dv>bLB%j>}`w;DTK!eHmA4DSS~tDWvn
zt>g^D+I7Vzz}-fB?Z-xY7+8+z(y@vw+v^bZ={PKZ<^m9&@x#}HMGKh~Luh1Byag&W
zuv8I?8>Ex`;`L*Y8ku92jd7u*%`MJ~%7*CQbIENit2ICXS5||IgGXJ-sAiT`4NAqV
z7H1nhCvV>*hXt|1$?Mwl$hiu<oUB@%s;jzPFXdXy-Aje~LdQ{d4DM(KZIQcgf?O$<
zmxDA2pl>NmnQCMrR28+^J-dfG@S~6RM59dMf@4{+{)Qtel&Qg6TY|Uv$8=KYk!qKw
z_gfG$Q|BG+>i^j$mroD!qgSf;C$KhyuCWVUkP+bOL~!#ZhxP|w5i&o|(4d8EqKTNx
z<g6(#FRz!cQp1g2tOC%;Gul(mv=H7tvpj_=ZYaHfjHEIa2bp<h$r~Qtt`h%}X_nuw
z5*XJL*Tz;yu4bQ;Jjl@Kmty9YHk+HM)eJKCU(T;yH`s8B+LNuAhgFQ5onO~PwYCVb
zy-*JOjpioKUo2p>JOL;!<Ym@fE-%fgeoC-6EL{BMwE!Jrg4sWhZUy#ELe_nOSFcV-
zw3jCp)j}Q&Z%M_bN%;Y|eEDdOap@a_$T6;r0%Kwct)+};79EIjW#IQahOHyuUKm3;
z#9(Bv$2v_vXO+6pS!EKX(`_*jXVH+4-2MGfw`M%eh|u!>6i>NDcRb%5p8x1}A%vRt
z6l;kQ`ZA-D)wih9)H-63sc~tMg{p?{(F%-jJUA6}lNQ!~s7FX#hBq-PBnMv`=F+3l
zg*H{_|1@?MP*pBnA4f^)l9UE136<{dZj?q!q`O0DknV;<N=TP<D<a*U2M~~y=6kqT
zF7M@{>l@bL8Df63XU`KH*53bZga2wfIa8r+3Fc`*+i{?jCtAh}qVs#TX_R1b#|;xj
z&(M^tRo8vV^v`U9Vf+2~`!8|k)&xPJ?xKx;tErFq;5mODgL&7av%_-+_Mh>BLY)O4
zUv_m89zI)6;i!3??V3S?{^pQgHG!-$X%O#yc@@htW=cpFm<~#n2sZpluJ#aup~&j#
z(ZvkO!#4dG8BX@{*eX^gdJMsz?dI!?$QLD{9xW)uB}r@5JQviaJX=fCJkCkT$45_Q
z78hZmjXthr=73Fzc!g3=j&x5xg!1r*UPyWD^c(HZ!dbYr^AK%6JP`%k6Y&Q6ro^s5
zJNJuf52#9cDN>3L?d<T(Fd!XQBe?9`;{oeyHgz8DMCJ%1jffWac_h8jD}mX_OdVu!
zwN*R3jAvr#|H5;E@3xuw%^*=Q$z%tE$6dkRBQO;UYiqBh-TXU!=Q*s~Vy1RC?gjN+
z@fs_SGXWA2`Z!lB?7VRh7G1*kMWbVOBHnKdM@Pc!XS(rw2~5S_5w*)y4E*+I&x{0e
z?_UIK@9cQM;dE*dT_!cJ$&W8r`!n(ng?)Ap(mvQ>I9BC}89o{vI1@=2%@Rk?e<ibH
z#cQJ01d-`E{7{iSX=9P~-4CGtV#m1~*E=3zdoXiWd<AVdy)57O$V1cgk^_fet6t6i
z3D@{!jdJ1T0pc!$)#SW{@FW`<ZOnRm_UvuE$0g9y{`sma8BHxIMRJls`78*hG%oqF
zi}VVOA_*?NaS0AI=}Jl!n+FH^dL==)lI`-*I1Hv{G2itoeU;n6G5KxXIQ132qrE?w
zLn3yjD!zUh8P^nqXXc!o6Qhrx>?1c3Kjyb_5nAqSsDBmwCUu~)h`N+?%Gc7uf@Cmg
zuNSraTX}+mlWA^V{nIJZtk(t51*Spo(oM-esf<a3r-xQ}7t4i%KS#=2Kbhcs7%xxI
z7fDH9CMN#8#-Un8uOjL3^X>AiA_cz9T7QkR9!qH(qy}F)R}^c*idr1F*UExH$(31K
zmIGF~70l&DMK#dSii{&VZ%}X)$6+N*sME1|xj`}5f>FzqNU4~LzD&%;=Ee~(NE=`W
zXEO3<sHVnT<4dXQ+^t3n;pS;3$Lzg5DJ&G}m;21B1CcW?%0tXWfiwX6?0vT;UVpDD
z$Qd-q*$0kBh_2Xkb^3EI5Zi%X+t8mlVJ=AKPW9%9?lthjY(bnY;v7+W68U?1z*j$q
znSnfN#yKKsLg{RBxyOqR$qVnOjrfVkQWen^;s@}Pr{!Xr>)jB`z9*z+dE3u>v6X?|
z!#sx4@DoD&hOP(er_W(UWaPC$$Omr2>Z`H6Cymx4PG65nsdKkCda;KCPck0MYY!0^
z?=?Li;B|CQ^sfrzr`Peo<KlZX^fMBROX#Ep^3``rMICG%gpV$~PJIU%_*JQ{;0^}F
zEwb5r5@WIfT<541bcicNX-jL(_ebie3|wO>gBDQa8-1wrV7o4Dn{^Xj^a*<*(<I7|
z37>Ns?<3-J3qgJ~6p=8*Hn_)&no9pU1~&_4g?!THQ<h<Efcjd;pi4K1ky(x`s~-wp
z{@uW^1MT|~0^dqNX-242nR<nwTsq3j9_{@L2|_&CJS89YG84G3S)>UlJ$eNnp~moZ
zVh8RQU}ZcUGoUy$X^{yj$Gg-Fbbl8k&nZ%==gQf!ecv3r!$JQO<T)(gf%cdgllrup
zP!(7+=)$<)MMxQ|p0_;%B}Q#um-VwknFAt@9%5Ys^cN!CT9WqIfuYXI>^UTuZqu>g
zOHOI%Jp|&}D7{t-KHig=+%WGY;YoKGlEQRqTU_ZJyLHdJwrPm(f}f1~Q{%igmo+0f
zkhtgFVp~tue&{}4O_>y~$*&8Aksj^LWUVF^O!o`kCU(dRFHcwWZ3e3&v;|AKxvEf(
z><$uhAZUy~3Qc1xS54ClJuhkl!vtGEwKMyxjxGo#f*(yttq$6;4I%|@K&(v@Gd3|J
zd?P(T2^K2w_a2zHe^MR2T6NK)R_Pw*OAlwbouk{LfW1sN_Cagw-CImK^l8NIX@LM+
zTEuM^wFk<1Wdl`g6^^6J>?vjrk*u(^hzQZt#QZ1hlUwA9ibh|zGv+g*lB3Wy{7D*1
zsDrsV!S@?W-umkFA`3fvdbelKPVpCk7L(m=C>!uOIH@#a>Kewr$K$tXG>(t=ySXSe
zm!&`Ro~}jhT10Dlj@AU*;=6}hjez#Claw!(gi+S3mIf`%s3m)q6qUhqjZOrjh##Uz
zxX+C5qnTfFv9MePQZqrSZB*%)L)5}CocaV>u0UkV$b)A_y0U1kFuJ8u7#Hb7LDmY?
zyiW$k#Itjr#MyYlN6UF4n@x_N+cRq0L1XjqkqL2#<J;#!1|>xpL~lW&3nI()54vZL
zeFwX<fLU3)1&-s^r6$BxtbZz_s;r8ahKcP`)u4efQ0ElU=3t3G8j*fnB~1(E<7<Q<
zaeH>(nZo-R@!f0<+)5By^#*FbDyf_(Drl5Ms#w$?OFfumgRN#B;yl=VEN%0VHqHVb
z^>i3N%KbzBX~rcrZ=6|@8qgR^TWD)-gx4{RPK@J^#%e((bXcA`CLUJe3{yl$>sGcW
zwJB2(ZOG`ZRM8@Z^x}vx=)zcQJ9)N6aAeJ?sL?tt$(X5xv%>A}8-x-_<S~v=(etun
zO6a5f=VuSrc209&<(028Oe@Xw*E8ezb56gmxu<yelajCat+#tsi7jtP$Ed~$l%5>5
zk{V6dlsW+u)E9pV$n1K~K24^__D>TzTw-QE6mK^vP&DI;nVFMUzap==5Ho%oKHw`T
zwc1zbU+n=B_s<#xyMfmsYoVSpL#2<9y<;K4)O-Njh}Y{xFlB>KV8i*{h7#%=!{3=<
zOV1B%YJ7kX-g()>;r+udsv%8ZqIflYn~ee=4qqEYAn5qc9#-yAlo3u}a?5i8et`ir
z2`+&NdAz0uFZMWp+LX*rK^-m9?{(ZK&r$l-Y&)WB2SQ@O1v<5BaRtj&881qscC`BA
z&13L<{HTlMWLb$T;={s44{D9M1UjL+A~5##s%AGQq*V_PW9a05AVSyG=6)Jm{7GzW
z+lSK#n;_BN6A;HP4p*Biu+hVSTH8H&iZcOTc@HRWHg6?2+qNReIM`dT`#cdbsY81K
zH>!#v6zR>D*kO*>Mu^v|MKj07k?3Yi*g0q{lVO!4^>8Ybe(8cKbkKyvs86pK^rAOI
zgix$7NqU3buV`LlqU|kMgixw#0lwy8vjHqhR&tW)&pk_L&$s);tAp<JX^@E6D?m*l
z(SbczmUC~>ep6TE`sUSvm#&2Mt*f-lD+*IqG@kHuC!BSmVT2BdPTm-y3LeOaYy#O-
z=-8H&3HR<H5c5=thKr!)5S^1tkIO11n=iZPD`-BwH0jr>nBLpUS#vJ=vW;%c>K5Y>
zw=1`fxKn2@$6~2?UUbHOq;jkYy_>w^U|{CG@y`1*vxcxe2x^=p;XaljTbo}ldS4Gv
zU*0k*grI#&xGZgp+=beaVPtpG({bU6sMFy>$3O-;EzZZN5BRWP0ZI)NODvz3WV`f3
zWca}JuN?`Kl@6D9kb~z%xjrhB=i_5CvtaLI@`D(BRRxw;YA}m&LU|he<6OADPknml
z^B8?;@|R4QQjPl1Q^XIr5MUUwVHi;YQ)MTe?rkmyfvL5Gco*CEX^S#>e>^)OW5|(p
zgm&wtU3;n3&cRw5l*s0j=tNv)8OE?IP_$s<7@}|{W=)jyK#pr?{1Rl+ElU01J@>mQ
z8X6DNel)C3tZzI5f)w$cF|3!tF|3mE^kNX-I^#7byPqLP7`IWP50YfpAoNLMN@0IR
z$k4KBckG4`5Bc=|$pv!z&T>?*Y9Fc=impapT-$)c%A<Dk%JYhr6Y{V}mQmW9xo*y(
z+_fQ;pRx!so!1EaT}x=EGedDKu;F4dO&cXY(-aPF3qa31*ukqN3~>@F4s#B0i|uXZ
z8>t1LNjbD)vP9#onNzWD5XQaj#9;iC{$vP<ix`;G!KPCqZpI(Oan-;~)t;-W1!u%X
z7PpND6qB%OONzU4%Uo#Ub+IlivG&6?;Fio|;eDx6VD|`pyko`~K&SL|5|zw6N7xm%
zXW`Tzi8D9ZVIbNSWxA)%7-3ejYVUlXY>V&7(bLWOR8lNk4hr^i&VWz#6Va&}(X&Kk
z)T22OISxHw0trqMW}?t_H<Tv=tyLl*Rt^?;|Aov3TnzL%Hs{b-0ZAIdCLv6BrG~{E
zg_Y$Evco|EB^N-DJv=Vo5!V2L_kI9(V1g;p@{YUMI&lVAp9y2Q#ixr2dk4ez0dJnn
z=3^cS?0lQ9jnvi?*8-}?oaLiGb(4bHWa^A}?w|5_`P&6BNjlTccva`4^1_<BrJx@{
z!~Y11YWAb{3vW3xK%+7}B%IhLA;h8KUBFqfo#fWC+D(y=^ofX;%bb=D#oEeDKv!gg
zuwFx+pyS$kj_IxTI(q)(&EYzhSacn^{g?&aqy~bB!5sRN@+aN(0;sW2QV$c1k;CQ*
z;F?awCS|l-*EzfTHVrZpt0A*z>!~&L)+4CTN6dF&r5<*138$mmWWqlEKB&_)CHp0$
z7ZG#G+2~_ak*_@sUnK+I_)uBB+XAL57O5oGtRU8zu8)pGA68<lIzO&gsa0pm9w3=J
zSSHd1(u^qJ#<%-^nvPddNM_1A9JK!q3fi-<)fc*2A!q}iQcby5o|wN$C{2ZBnYF5Q
zQM%o<e#qpY+AAQrn+95e$rgATRaCdyvM?RNxbD+U?aqoId-z!&yWxE%BK7kSqBvvU
zJ=E5<)9#bFh@f9>Bon%PYybK&cUlb??P~@l6Kj3&_J@R6tx?zgmvr$nLkeKJLL#?<
ztO3dw9vm44O_tBba}2B^RGLgC;0SXc?#OLw5auO!E|%-1cwW5PbWKSQSy7+BNy!OW
z%$ji2%938dD)eSGi99wmgSY6<-rambF`KEpQ~!c_w)m@D3S+dwdx<xf3v6z(3iVID
zLNn#`U+rJOZOx)4Hl&MMwJ{Cayn}fpYVe?{nU1w+wc!X_@-d^5@*>ndwYqHYCWp)h
z3_FU>l5E0kz5Z!?nt@KkF^-sTL%}JpXp+V8abLLecA@i*A!7|9N4`86Y=cQ|i2Gri
z!$7FKzAw4CvG#e)F};X=g3H=;k6QjE-#s%Dq<;Erv<Xt0eyl;LeM(bF;{=trT^JeA
zFX-q-)^lZEiqMubGMgS?_Qwn^Pry&4G4~xz&`@+kmA-F*dM{T=iF~O;0Fx;5%Bj6(
zPX#753$)2ZdW1+3ji=7p6>I*=p+6s4;_EX9dA(Ya3VwZiwfP=}Y83xAUKLpWQCoRf
z^(<c+D&{HGJ+!j{6HMu}fPPp{Yl)Vf1gph2>5hfb5fv<WX%&i<mA<<bw3a<zOhA<>
zA}08`YIO+`6{c288^#%x53<$`6EZZ5-$#m=D}BeRi}*};0@0~wO2fg?YmjbO@vWk-
z-zLGW$dO%@`Sa`wHyrtJ3O7yCWB$3dk^s#*+^J~+o=p|Ys%V7@x~0)db}x0=m~-+<
zXF2rAZ(Qt*3{FaxlPJt|$^CsB5d`HfdN$!_I*UD%8~*1DIv4J*^bHVVGjh4UIEi)B
zu^`y4er>lfBmj+o5hNQp!cZbCXjxFr`vSzIVgz@Ay6mSRT4gl8JYuJ40`jmjm3|TB
zup~eIjH?eBU!7Bhj2z0>*n4Kb4(+$yv`Q!>@HQD=gLBA{&n=La@poHokxrw`Geo16
zmzW}O+g(c)JcTMk%!znS8QJho8N=BcP4)Bg%NeQY%jpf^e{`HwJo=n6!FpNs&-E!o
z_M+CTZ70QTY?Q>`q>-x(m&(5jI!y4D8yA5rI#KCG;x7yuVVQOf8<`$35w!_-HSv8;
z(wf~!5@&TE_spHhZPi??Du<|D%boS%!G3Y|ON0CPM8fpU_%3;z6<S$6sBinU{E8d-
zwKl65%Vy<atSu`KQ=>lAi~CFv>FisyjLv5JOw^StxuEczqfLX{q#TS>2h2CW?WY}L
zJM*7D3O|v|DsW%gc}zf7buSgi`Q3uw2?95&sh*O$DyOW$GUc+e)AUPphf`$H-U!%O
zrh||5?t7mT71uu3zU(+q!HKVjm8bAMlvNv+ml%CNkJ>q3Kg|S#FWom@Ldvase?5T>
z$MftE{84fH$oL}fMFYkQ-%1w$nCS>sgICTS{*i~n($*XFyX#oTcB}?q!p|f1OhTcm
zrwJgJNK~|?92ui;g}sw2uU<k~^^RbD_U0Zl?R$U~4g3v8wywDu*OzK@*fu6f{oOz|
zDmmS{dk8WrH%Fego;Pc4Evg75t!y6=&uhEJ8SCK&dtjl^GYmUXSrgGV+9e}3zvgWY
z#P_G#jE-L)AgUN)Cikck9^oN3c+b%ixjytP7WknI(Gb`)nmf1?{n_2GnC|1F0NaO@
zyUP+ahx{L-2~^SO{3HCJ&~iscRB{EtWh5vQT+@A~a?&U%ZQ9gF_=40YYVbha?M9vy
zm^ExU)Y))n+>ilE;p4YH>Uc+clV{KwBxI0N0Z%t8rQs@}$RxVQ$P>^T0xPFOXqiF&
zujTSN#$GU>_Q(~7p)Pl%>V=f~a33Scxcaeq3?vX@zWoG)vEPdk+n=nyOEt^M@FhOh
z3f)Qcr)hudH%eY)4-)kg;9q+-REnvhZx4={q_p{34}{sy^r&)uB@ULW0}C_4X2k5A
z5ekPGvL4q*zu2$X=XT>Z>o3mUJYlwtb*G!ov`}dYBnzc%XKmT|B2sR6j5M3K*U0}S
z`c=6yezA;_o)AUM=D0njQyFAOUa2=!h{0mn7Rc*fdT}oed@PQDQ;y=Ey@Ra>1e*qF
zC}x)WF8#bpeFnNklZ#sk!wD+h516S*`+-tV&N;gj0e<<2KK=*Zr9^@l-d<3r$LQ5i
z2Wd%5vMqLB@WrUC9Qt&e-Y02BJQ72${s_?#=(fJKAxx4XR_g$Dp8K7}jQ4=*OIh<_
zz}Op#poU(gg=Aw8c0<FM0hf59Bwc!gIgw`QiKfh&WYto(=7%kkqSLP3y1=ZdpU3h_
zGimgEU(N}gR<!A%>Zp~+@$w6DmF;Y2(G=m`C9*ySPl^w2dm5a1M%YeC?i2W%bDHG3
zV{0s$)ATtg23!czjBaO2oQo<UIaXc}KUpTpA13mR{+?xcF8|`gb|%sZf33JjaOJve
z-}K3#ZR!Q$=5T5z<jLNClzW`kkamVPm|@WL<QrJ}e0Bf*h2%-*1)f{}rEf!@c24mD
zE12jcQR?L7n>7oYqzmNEjcx0M3qq8k*;W1%ST3Q<cL)cvHENg7Lx(S06c4^Rrd+Ty
zj9h+}JYaClx}YfTzwFpJD0YgxaA**|^tBjlR33RDdj4J>9-k-mLnAfsao6ySjv(Qi
z<#s=qM-;_YQKjL+&w?$)M16NYaLk7NB=mrIAj%DOukBsf6x7n!hL5o@&0d2}o*2D6
zBGr~(w&f?-vb?O7A0=6cxanF>5&ZCJHd)zpJ8h}%;WRNWsunPmujcxSXsG9Yew^K7
z=_>G6_EWSAB%}3tVuA_f;6&ma={;3!w<^`?$YoYY%Y0n(ciJcvcvhH<u0yl_Ic32@
zG>j3(pm3>7MBb3+_nF4UGSx*qUg&@Z+neZ^VHE1Z3x#lHix!7ck&sGz_~XCfCgBz~
zl^a8|y!jUJFisv~pnyj_HdV@*MGV%uQt$+4H~LjU7|VzvmP3OsrT+to0)t95q?d;J
zXc2qX-)&LpC7&y0DHn^xuI>w=`wq=Wm08V?f#gr;0w@Ztc$SzG5Hq8m=s%&rS)>}q
zLD{3qOc!B)h>KCON>0N{lY76~L?kOBG<JWH32qmcyrp|yV-<&$eYgvn<?^`e^}SPm
zK4o_W+7RbBqOCmTBi+ObKQp{yw*c7YfN#7VT#T%#3&GG)dKyCU9i({1L!Ql9QAR^v
z-4B)CF!AMu1hNP9NF7$oJ=-HDJhQM;8KyK+rnFQU#x^RPD?myTZc^uDdx_9n1Yxw%
zJPu=7`5?&*#)vhk3%5Jfn>`81Qo{KwTV4vQc{CBaQ?B%CL=LOC9qx}b{2;peu|mf|
z9)<oPd<^MDC8mSyPH`q-Q6lB_ozqHF+5JAu&Qm0hv%m$YMux%EK1U*_CB^T8(~Uu-
zyBd0H1WOXxNbTazR;9e-+mq4=2Md@UfxPal%GoYw)R_Z|XVhe8-IAgirS&G!`Q||w
z=K<oX)1ot=4}lorfe>b6(kcVK3vI5AE}4nv0T-aGs;|>=-Wl1Z`p+g#IggCL`5Jzv
z6O&UJp=W`ztEgvY3DzlILL1|$sZP~OT9;Km^9)*&pQBPPu{32s=vK9x6}2+<2_SF6
zH)gHrhsQr}iaHIPT*)wcazHu5f*t2*(>}1^j<4uL)IJ<Spg~kt_eRNicWdm(qlTfE
zu&x4Kc(!gZwX{;vMQNWlBco9)U?%l!d%NIpExNJQ6NxPWELZ2=`1Zx6$M><i<OxoD
z(dcQn`tj+UQkU8d#`dhbrFAXd!R<ZD0&uWO^m<KN72hK;rhh!gmJfkwBX~zfOB}n^
z3pwJ8V=z|-M${`VpI1Make;P@sq#p!;(n9Q+qp0OOiM_PQ_3bJHVn%BJ^2rW*Uz-F
zDmoa}@D^3e2OUG)jn5JY8Qp>U)}tnkJ22dSC9(W_`8zJoUmYW7p3Y>T1XrzLEE1f2
zK4Rd|`y>fO@03nDhL(l=bc)-#hmA{Q9k7EI%FMIU-I3~;z4JgDDuJSd^V8IkMZ?fh
z(kPzCGHoz}W7!Uc$Lvwy_S1_Ff{xL%upNgPqqDcE%nkF}IJ3JJ{Cij{uEvj6WrNKx
z;GZ7Fb-yUhGg-?nT2Am~nPRFy%a-K)R$gvBSg4!``pQyUA#CW4)q#{YE;UfZ99e<?
z71Qj)xNO~^)UbWLdtoc0vCCJcP3pc+5EH6BUK1OJm4`*~nQq1_uT$gSmKXQvI_I-%
zpu`<Jdz8tMCdLT)bau5)NtaQ{pJ)7_G(2XXk7G(qel6g>Crh=u2xy{`wn6Tq4Q(SX
z6#y}j)IJKm<@s`MZv$I3ecLha5#}ginZtKqGQ`B@HJE=sAH{#v3?nKYSwTnm_yfwR
z>IYhmii?jP4sNkzadV9%I0c+Xv#Y0<2eqh2Y39cUN8|$4xfxyapLnzivw2+gVxE7K
zcXD<l0x45Q#&|MOF=z(b`U}!HSz2O4JA0IdV+%a%3^RBi!c&vQfB$&>QdceQLZ%l%
z1KqnDE8`LfWV&~s5E2vOJ_H<ux<?M%_rh=&K_FN{2zUVs1%EXl-V6fdb=8#?R^q1<
zml0u*=9du{5mr>9mlpY(0RPu-UJ?H4{Q3l>ll*F^5S#pVK>r`YpN0VyT>fWR642MT
zFavVDu1vjqB0x~#e?~O?8u41+TG!C_j|0)K$3a|Kxccvbum6hL`ZfN>M<j@R)|7xC
z6bi7stDwp22J*rNTy<sYuZe$+7kFc#|4S?9w!7u`Kuw9ja#i5|u8Vwwaspz>{)-Yc
z)-^FVF*g!+)HSnw^Q)ZnZK#Nq;t>;I$tv)oxh4Wfke52(r#qm(GJ42`4D^96zn$aX
z;V`$k>=*C1#{uz6g<n$p*JzN}F!0^qbMK}JQUw|A0n2s;@{O)khOQgP>pSk<G&3^;
z^I!U!w@r&v=Y2T?oEndT{iL`i0Y{M6BeJ_-f3Nh9UPL$G<`V*HRUf|mJJj-;3i9Hn
zzY}R~_#5N$m@uF11D=15^>?z{4XIA~PLhq~RjSo*cK20>x)ckrvlGDUN;v4cfxI?#
z@1lvkv9PdaBp22<wz-1-{pH<TV&=g4T^_(<0MVt?*IeKT@-o-|1Nut;>`&OTIRPtc
z02}uoER4Y)uvaQKf5aYb4PYQaKy=~!U9<YyV31d%;qS3`uY7fvCWaL-@xM+*w*4*Z
z>A#)&E1C56sfj-}<i`VC;!J>a?7y8F2HX(;d)554<fng?!1=p-x5bft?Xr&nhxS0;
z#y)iZ1NI-M{>Iu~4LAr%z!6tys%ww_bqaX9{t0ViXkx3atN*KR;cXwZPi<Cb0e6i@
zk8f`khWqcScQ5=t|GHBzU?CRZQ<8sKxF3Bd%g$W?FGt>uD-|Rj2>@^;fFFTd#Xk*r
z7a8|E+^>ovcLS4(qr1xipxJ+bU*dlU{FUr_H}E3|RpFI|7r>Sf|6||PRoRsIJK$B+
z{@t{nhPvW4$Pf_XK=}Ao1o?FXdHE&ZMY|C<yuGQspSCKOfZ>#YZN%3Y;0W?^F8Ccu
z8hF0kZP%fvcJoVsL<Ou8xa<DYKwe3OchMwduOh029rX<?ZA~o9?}pwkYky4zd2tor
z1--gDu8Z8?UheI(oj0u9+B;d-MLchVZWpS%0bMrU3A!#@cN=uOpw<m2t@SR@bs?NP
z%4^+5->$iIgC1-DBl^mN*Yn)HC$|gs+@KFT|AfAqc3YJDhNd%gC+#1J?%PYgE%kXr
zQkuGp^e^Gh+pyabiZ?Lv+26pfJa_jRZ%YN<z>4PXg8jOi+$9`%+s@mfb2sS5g+HRN
zti7J+ZmVw#o!y|bfxE_kpL>6%-IjE?p~3(71MN3Yx!dvsH?)GCKhS=O5!`m-?acWb
z8t>j+w7c@?Z!>QvX5BEE&hKLWPny<k)a{(18`RRpU8tK3qT8g~c`i33XNY@uZ0Y|e
o>*e+wx1;uN=0Jt|^BmWwAvEyL2?Bx<_~-|obAlAWLj~gh0GZ6INdN!<

literal 0
HcmV?d00001


From f59fa33455c2919b62e514f289b68df6059ab5ef Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 13 Aug 2015 19:37:59 +0930
Subject: [PATCH 099/323] Fix milkmaid image loading and correct description.

---
 data/mods/example/FreeColMessages.properties | 2 +-
 data/mods/example/resources.properties       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/mods/example/FreeColMessages.properties b/data/mods/example/FreeColMessages.properties
index 2c4fdae25..2deea49e1 100644
--- a/data/mods/example/FreeColMessages.properties
+++ b/data/mods/example/FreeColMessages.properties
@@ -1,2 +1,2 @@
 mod.example.name=Example Mod
-mod.example.shortDescription=This mod changes the picture of the Expert Farmer into a Milkmaid.
+mod.example.shortDescription=This mod adds an alternate version of the Expert Farmer.
diff --git a/data/mods/example/resources.properties b/data/mods/example/resources.properties
index 0887756e5..79f16bac9 100644
--- a/data/mods/example/resources.properties
+++ b/data/mods/example/resources.properties
@@ -1,6 +1,6 @@
-image.unit.model.unit.expertFarmer=milkmaid.png
+#image.unit.model.unit.expertFarmer=milkmaid.png
 
-#image.unit.model.unit.milkmaid=resources/images/units/milkmaid.png
+image.unit.model.unit.milkmaid=milkmaid.png
 #image.unit.model.unit.milkmaid.scout=resources/images/units/scout/scout.png
 #image.unit.model.unit.milkmaid.pioneer=resources/images/units/pioneer/pioneer.png
 #image.unit.model.unit.milkmaid.soldier=resources/images/units/soldier/soldier.png

From 8acfc1b8105085d09180092de80cdc238b052711 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 13 Aug 2015 20:09:48 +0930
Subject: [PATCH 100/323] Enable RCCP summaries.

---
 .../sf/freecol/client/gui/panel/ReportCompactColonyPanel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index 7ed5b806c..98d097b2f 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -468,7 +468,7 @@ public final class ReportCompactColonyPanel extends ReportPanel
     }
 
     private JLabel newLabel(String h, ImageIcon i, Color c, StringTemplate t) {
-        h = (h != null && Messages.containsKey(h)) ? Messages.message(h) : "";
+        if (h != null && Messages.containsKey(h)) h = Messages.message(h);
         JLabel l = newLabel(h, i, c);
         if (t != null) Utility.localizeToolTip(l, t);
         return l;
@@ -1030,7 +1030,7 @@ public final class ReportCompactColonyPanel extends ReportPanel
             ImageIcon icon
                 = new ImageIcon(this.lib.getTinyUnitImage(e.getKey(), false));
             result.add(newLabel(Integer.toString(e.getValue()), icon,
-                                                 cPlain, t));
+                                cPlain, t));
             if (++n >= maxSize) break;
         }
         

From 7f42f9f4a7b85346b8573bcd4e505fa94819f427 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 13 Aug 2015 20:13:54 +0930
Subject: [PATCH 101/323] Check/fix integrity of unit destinations, better fix
 for BR#2889.

---
 src/net/sf/freecol/common/model/Unit.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index cbfb2e70c..820786c37 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -4062,6 +4062,20 @@ public class Unit extends GoodsLocation
                 result = -1;
             }
         }
+        if (this.destination != null) {
+            if (((FreeColGameObject)this.destination).isUninitialized()) {
+                if (fix) {
+                    this.destination = null;
+                    logger.warning("Cleared uninitialized destination for: "
+                        + getId());
+                    result = Math.min(result, 0);
+                } else {
+                    logger.warning("Uninitialized destination for: "
+                        + getId());
+                    result = -1;
+                }
+            }
+        }
         return result;
     }
 

From 7d171986926077779fff074a1d7a95a31dfb00c6 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 13 Aug 2015 20:29:39 +0930
Subject: [PATCH 102/323] Another try at the country name in the initial list,
 BR#2887.

---
 src/net/sf/freecol/client/gui/panel/PlayersTable.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/PlayersTable.java b/src/net/sf/freecol/client/gui/panel/PlayersTable.java
index d37d95ef9..22a97f96b 100644
--- a/src/net/sf/freecol/client/gui/panel/PlayersTable.java
+++ b/src/net/sf/freecol/client/gui/panel/PlayersTable.java
@@ -319,9 +319,10 @@ public final class PlayersTable extends JTable {
             Object value, boolean isSelected, boolean hasFocus,
             int row, int column) {
             Nation nation = (Nation) value;
-            setText(Messages.getName(nation));
-            setIcon(new ImageIcon(
-                gui.getImageLibrary().getSmallerMiscIconImage(nation)));
+            setText(Messages.message(StringTemplate.template("countryName")
+                    .add("%nation%", Messages.nameKey(nation.getId()))));
+            setIcon(new ImageIcon(gui.getImageLibrary()
+                    .getSmallerMiscIconImage(nation)));
             return this;
         }
     }

From f96e944152752dfe1c139f27ce7c7b2b5744d80a Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 13 Aug 2015 16:59:33 +0200
Subject: [PATCH 103/323] Update NetBeans project to find the updated
 jogg/jorbis from git.5f533b6e

---
 config/nbproject/project.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/nbproject/project.xml b/config/nbproject/project.xml
index 40ca97582..1dcd50be9 100644
--- a/config/nbproject/project.xml
+++ b/config/nbproject/project.xml
@@ -97,7 +97,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">jars/commons-cli-1.1.jar;jars/cortado-0.6.0.jar;jars/jogg-0.0.7.jar;jars/jorbis-0.0.15.jar;jars/miglayout-core-4.2.jar;jars/miglayout-swing-4.2.jar</classpath>
+                <classpath mode="compile">jars/commons-cli-1.1.jar;jars/cortado-0.6.0.jar;jars/jogg-0.0.17.jar;jars/jorbis-0.0.17.jar;jars/miglayout-core-4.2.jar;jars/miglayout-swing-4.2.jar</classpath>
                 <built-to>build</built-to>
                 <built-to>.</built-to>
                 <javadoc-built-to>doc</javadoc-built-to>

From 3384faeac412629e3089f1e29a87fd6493e4bde4 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 13 Aug 2015 19:45:27 +0200
Subject: [PATCH 104/323] Prevent NPE when opening colony advisor panel

---
 .../sf/freecol/common/model/Occupation.java   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Occupation.java b/src/net/sf/freecol/common/model/Occupation.java
index 66a417040..cb2d8a742 100644
--- a/src/net/sf/freecol/common/model/Occupation.java
+++ b/src/net/sf/freecol/common/model/Occupation.java
@@ -99,26 +99,26 @@ public class Occupation {
         final Colony colony = wl.getColony();
         for (ProductionType pt : productionTypes) {
             lb.add("\n      try=", pt);
-            for (GoodsType gt : workTypes) {
-                if (pt.getOutput(gt) == null) continue;
-                int minInput = FreeColObject.INFINITY;
-                List<AbstractGoods> inputs = pt.getInputs();
-                if (pt != null) {
+            if (pt != null) {
+                for (GoodsType gt : workTypes) {
+                    if (pt.getOutput(gt) == null) continue;
+                    int minInput = FreeColObject.INFINITY;
+                    List<AbstractGoods> inputs = pt.getInputs();
                     for (AbstractGoods ag : inputs) {
                         int input = Math.max(colony.getGoodsCount(ag.getType()),
                             colony.getNetProductionOf(ag.getType()));
                         minInput = Math.min(minInput, input);
                     }
-                }
-                int potential = wl.getPotentialProduction(gt, unitType);
-                int amount = Math.min(minInput, potential);
-                lb.add(" ", gt.getSuffix(), "=", amount, "/", minInput,
-                    "/", potential, ((bestAmount < amount) ? "!" : ""));
-                if (bestAmount < amount) {
-                    bestAmount = amount;
-                    this.workLocation = wl;
-                    this.productionType = pt;
-                    this.workType = gt;
+                    int potential = wl.getPotentialProduction(gt, unitType);
+                    int amount = Math.min(minInput, potential);
+                    lb.add(" ", gt.getSuffix(), "=", amount, "/", minInput,
+                        "/", potential, ((bestAmount < amount) ? "!" : ""));
+                    if (bestAmount < amount) {
+                        bestAmount = amount;
+                        this.workLocation = wl;
+                        this.productionType = pt;
+                        this.workType = gt;
+                    }
                 }
             }
         }

From c4ec37a2ab5d051d596268395f270c8584d5f90e Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 13 Aug 2015 19:39:07 +0200
Subject: [PATCH 105/323] Add methods creating a compatible font for a string
 and check most header font uses

---
 .../sf/freecol/client/gui/FontLibrary.java    | 57 +++++++++++++++++++
 .../client/gui/panel/BuildQueuePanel.java     |  6 +-
 .../client/gui/panel/BuildingDetailPanel.java |  4 +-
 .../freecol/client/gui/panel/ColonyPanel.java |  1 +
 .../client/gui/panel/ConceptDetailPanel.java  |  6 +-
 .../freecol/client/gui/panel/EventPanel.java  |  4 +-
 .../client/gui/panel/FatherDetailPanel.java   | 13 +++--
 .../client/gui/panel/FirstContactDialog.java  |  6 +-
 .../client/gui/panel/GoodsDetailPanel.java    |  4 +-
 .../gui/panel/LoadingSavegameDialog.java      |  6 +-
 .../client/gui/panel/MonarchDialog.java       |  1 +
 .../client/gui/panel/NationDetailPanel.java   |  4 +-
 .../gui/panel/NationTypeDetailPanel.java      |  8 +--
 .../gui/panel/ReportHighScoresPanel.java      |  6 +-
 .../gui/panel/ReportRequirementsPanel.java    |  8 +--
 .../client/gui/panel/ReportTurnPanel.java     | 21 +++++--
 .../gui/panel/ResourcesDetailPanel.java       |  4 +-
 .../client/gui/panel/TerrainDetailPanel.java  |  4 +-
 .../client/gui/panel/UnitDetailPanel.java     |  4 +-
 .../sf/freecol/client/gui/panel/Utility.java  | 38 ++++++++++++-
 20 files changed, 147 insertions(+), 58 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/FontLibrary.java b/src/net/sf/freecol/client/gui/FontLibrary.java
index 163dfe273..ca6f76ac5 100644
--- a/src/net/sf/freecol/client/gui/FontLibrary.java
+++ b/src/net/sf/freecol/client/gui/FontLibrary.java
@@ -137,6 +137,18 @@ public class FontLibrary {
         return createFont(fontType, fontSize, style, scaleFactor);
     }
 
+    public Font createCompatibleScaledFont(String string, FontType fontType,
+                                           FontSize fontSize) {
+        return createCompatibleFont(string, fontType, fontSize, Font.PLAIN,
+                                    scaleFactor);
+    }
+
+    public Font createCompatibleScaledFont(String string, FontType fontType,
+                                           FontSize fontSize, int style) {
+        return createCompatibleFont(string, fontType, fontSize, style,
+                                    scaleFactor);
+    }
+
     public static Font createFont(FontType fontType, FontSize fontSize) {
         return createFont(fontType, fontSize, Font.PLAIN, 1f);
     }
@@ -163,6 +175,23 @@ public class FontLibrary {
         return createFont(fontType, fontSize, Font.PLAIN, scaleFactor);
     }
 
+    public static Font createCompatibleFont(String string, FontType fontType,
+                                            FontSize fontSize) {
+        return createCompatibleFont(string, fontType, fontSize, Font.PLAIN, 1f);
+    }
+
+    public static Font createCompatibleFont(String string, FontType fontType,
+                                            FontSize fontSize, int style) {
+        return createCompatibleFont(string, fontType, fontSize, style, 1f);
+    }
+
+    public static Font createCompatibleFont(String string, FontType fontType,
+                                            FontSize fontSize,
+                                            float scaleFactor) {
+        return createCompatibleFont(string, fontType, fontSize, Font.PLAIN,
+                                    scaleFactor);
+    }
+
     /**
      * Create a scaled <code>Font</code> where the scale factor is provided
      * explicitly in the parameter.
@@ -219,4 +248,32 @@ public class FontLibrary {
         return font;
     }
 
+    /**
+     * Create a scaled <code>Font</code> which can display all characters
+     * inside the given text string.
+     * This is mostly necessary for the header font. Thats because the currently
+     * used ShadowedBlack is missing support for CJK and others. Even some
+     * special glyphs for European languages like the triple-dot are missing.
+     * 
+     * @param string The text to find a compatible font for.
+     * @param fontType How the font should look like.
+     * @param fontSize Its relative size.
+     * @param style The font style for choosing plain, bold or italic.
+     * @param scaleFactor The applied scale factor.
+     * @return The created Font.
+     */
+    public static Font createCompatibleFont(String string, FontType fontType,
+                                            FontSize fontSize,
+                                            int style, float scaleFactor) {
+        // FIXME: Inline createFont calls, add private helper methods
+        //        for common code and simplify everything.
+        // TODO: Consider testing the normal font for compatibility and try
+        //       some or all other available fonts for complete/longest match:
+        //       header/simple->main->normal->simple/header->emergency
+        Font font = createFont(fontType, fontSize, style, scaleFactor);
+        if(font.canDisplayUpTo(string) == -1 || fontType==FontType.NORMAL)
+            return font;
+        return createFont(FontType.NORMAL, fontSize, style, scaleFactor);
+    }
+
 }
diff --git a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
index 1395a6884..37335114a 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
@@ -578,9 +578,9 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
                 getImageLibrary().getScalingFactor());
         
         // Create the components
-        JLabel header = Utility.localizedLabel("buildQueuePanel.buildQueue");
-        header.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.BIG));
+        JLabel header = Utility.localizedHeaderLabel(
+            "buildQueuePanel.buildQueue",
+            SwingConstants.LEADING, FontLibrary.FontSize.BIG);
         
         // JLabel SubHeads
         JLabel bqpUnits = Utility.localizedLabel("buildQueuePanel.units");
diff --git a/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java b/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java
index 3e398f080..d6e185709 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java
@@ -139,9 +139,7 @@ public class BuildingDetailPanel
         BuildingType buildingType = getSpecification().getBuildingType(id);
         panel.setLayout(new MigLayout("wrap 7, gapx 20", "", ""));
 
-        JLabel name = Utility.localizedLabel(buildingType);
-        name.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        JLabel name = Utility.localizedHeaderLabel(buildingType, FontLibrary.FontSize.SMALL);
         panel.add(name, "span, align center, wrap 40");
 
         // Requires - prerequisites to build
diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 092480df5..2e6b9b414 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -274,6 +274,7 @@ public final class ColonyPanel extends PortPanel
         selectedUnitLabel = null;
 
         // Make the colony label
+        // TODO: Check font compatibility for all contained strings
         this.nameBox.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
             FontLibrary.FontSize.SMALL, getImageLibrary().getScalingFactor()));
         if (editable) {
diff --git a/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java b/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java
index 598da6f62..873a5afbe 100644
--- a/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java
@@ -30,6 +30,7 @@ import java.util.List;
 import javax.swing.JEditorPane;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import javax.swing.tree.DefaultMutableTreeNode;
 
 import net.miginfocom.swing.MigLayout;
@@ -127,9 +128,8 @@ public class ConceptDetailPanel extends FreeColPanel
 
         panel.setLayout(new MigLayout("wrap 1, center"));
 
-        JLabel header = Utility.localizedLabel(Messages.nameKey(id));
-        header.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        JLabel header = Utility.localizedHeaderLabel(Messages.nameKey(id),
+            SwingConstants.LEADING, FontLibrary.FontSize.SMALL);
         panel.add(header, "align center, wrap 20");
 
         JEditorPane editorPane = new JEditorPane("text/html", Messages.getDescription(id)) {
diff --git a/src/net/sf/freecol/client/gui/panel/EventPanel.java b/src/net/sf/freecol/client/gui/panel/EventPanel.java
index b853aa6c2..911c2f339 100644
--- a/src/net/sf/freecol/client/gui/panel/EventPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/EventPanel.java
@@ -52,8 +52,8 @@ public final class EventPanel extends FreeColPanel {
         super(freeColClient, new MigLayout("wrap 1", "[center]", "[]20"));
 
         JLabel headerLabel = new JLabel(header);
-        headerLabel.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.MEDIUM));
+        headerLabel.setFont(FontLibrary.createCompatibleFont(header,
+            FontLibrary.FontType.HEADER, FontLibrary.FontSize.MEDIUM));
 
         JLabel imageLabel
             = new JLabel(new ImageIcon(ResourceManager.getImage(key)));
diff --git a/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java b/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java
index a03967eb2..773c6cdfd 100644
--- a/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java
@@ -29,6 +29,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
+import javax.swing.SwingConstants;
 import javax.swing.tree.DefaultMutableTreeNode;
 
 import net.miginfocom.swing.MigLayout;
@@ -114,9 +115,8 @@ public class FatherDetailPanel
         } catch (IllegalArgumentException e) {
             // this is not a founding father
             panel.setLayout(new MigLayout("wrap 1, align center", "align center"));
-            JLabel header = Utility.localizedLabel(Messages.nameKey(id));
-            header.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-                FontLibrary.FontSize.SMALL));
+            JLabel header = Utility.localizedHeaderLabel(Messages.nameKey(id),
+                SwingConstants.LEADING, FontLibrary.FontSize.SMALL);
             panel.add(header, "align center, wrap 20");
             if (getId().equals(id)) {
                 panel.add(Utility.localizedTextArea("colopedia.foundingFather.description", 40));
@@ -139,9 +139,10 @@ public class FatherDetailPanel
 
         String name = Messages.getName(father);
         String type = Messages.message(father.getTypeKey());
-        JLabel header = new JLabel(name + " (" + type + ")");
-        header.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        String text = name + " (" + type + ")";
+        JLabel header = new JLabel(text);
+        header.setFont(FontLibrary.createCompatibleFont(text,
+            FontLibrary.FontType.HEADER, FontLibrary.FontSize.SMALL));
 
         Image image = ImageLibrary.getFoundingFatherImage(father, false);
         JLabel label = new JLabel(new ImageIcon(image));
diff --git a/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java b/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
index a901c1eb6..7dc0dd309 100644
--- a/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
@@ -23,6 +23,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JTextArea;
+import javax.swing.SwingConstants;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -71,9 +72,8 @@ public class FirstContactDialog extends FreeColConfirmDialog {
             headerKey = BASE_KEY + NATIVES_KEY;
             imageKey = IMAGE_BASE_KEY + NATIVES_KEY;
         }
-        JLabel header = Utility.localizedLabel(headerKey);
-        header.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.MEDIUM));
+        JLabel header = Utility.localizedHeaderLabel(headerKey,
+            SwingConstants.LEADING, FontLibrary.FontSize.MEDIUM);
         JLabel image
             = new JLabel(new ImageIcon(ResourceManager.getImage(imageKey)));
 
diff --git a/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java b/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java
index 2cd3ce340..295e03b8b 100644
--- a/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java
@@ -90,9 +90,7 @@ public class GoodsDetailPanel extends ColopediaGameObjectTypePanel<GoodsType> {
         GoodsType type = getSpecification().getGoodsType(id);
         panel.setLayout(new MigLayout("wrap 4", "[]20[]"));
 
-        JLabel name = Utility.localizedLabel(type);
-        name.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        JLabel name = Utility.localizedHeaderLabel(type, FontLibrary.FontSize.SMALL);
         panel.add(name, "span, align center, wrap 40");
 
         if (type.isFarmed()) {
diff --git a/src/net/sf/freecol/client/gui/panel/LoadingSavegameDialog.java b/src/net/sf/freecol/client/gui/panel/LoadingSavegameDialog.java
index a648d0681..6744e2ab1 100644
--- a/src/net/sf/freecol/client/gui/panel/LoadingSavegameDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/LoadingSavegameDialog.java
@@ -71,9 +71,9 @@ public final class LoadingSavegameDialog extends FreeColConfirmDialog {
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
         panel.setOpaque(false);
 
-        JLabel header = Utility.localizedLabel(Messages.nameKey("loadingSavegameDialog"), JLabel.CENTER);
-        header.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.MEDIUM));
+        JLabel header = Utility.localizedHeaderLabel(
+            Messages.nameKey("loadingSavegameDialog"), JLabel.CENTER,
+            FontLibrary.FontSize.MEDIUM);
         header.setBorder(Utility.blankBorder(20, 0, 0, 0));
 
         JPanel p1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
diff --git a/src/net/sf/freecol/client/gui/panel/MonarchDialog.java b/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
index f2a5329c8..8cf5c4940 100644
--- a/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
@@ -78,6 +78,7 @@ public final class MonarchDialog extends FreeColDialog<Boolean> {
             hdrKey = "monarchDialog.default";
         }
         JTextArea header = Utility.localizedTextArea(hdrKey);
+        // TODO: Check font compatibility for contained text, when possible.
         header.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
             FontLibrary.FontSize.MEDIUM));
 
diff --git a/src/net/sf/freecol/client/gui/panel/NationDetailPanel.java b/src/net/sf/freecol/client/gui/panel/NationDetailPanel.java
index ebcc7c97c..f65cd1051 100644
--- a/src/net/sf/freecol/client/gui/panel/NationDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/NationDetailPanel.java
@@ -92,9 +92,7 @@ public class NationDetailPanel extends ColopediaGameObjectTypePanel<Nation> {
 
         panel.setLayout(new MigLayout("wrap 3, fillx, gapx 20", "", ""));
 
-        JLabel name = Utility.localizedLabel(nation);
-        name.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        JLabel name = Utility.localizedHeaderLabel(nation, FontLibrary.FontSize.SMALL);
         panel.add(name, "span, align center, wrap 40");
 
         JLabel artLabel = new JLabel(new ImageIcon(ImageLibrary.getMonarchImage(nation)));
diff --git a/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java b/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java
index 3ca5c1ca1..b0f55feea 100644
--- a/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java
@@ -128,9 +128,7 @@ public class NationTypeDetailPanel
 
         panel.setLayout(new MigLayout("wrap 2, gapx 20"));
 
-        JLabel label = Utility.localizedLabel(nationType);
-        label.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        JLabel label = Utility.localizedHeaderLabel(nationType, FontLibrary.FontSize.SMALL);
         panel.add(label, "span, align center, wrap 40");
 
         label = Utility.localizedLabel("colopedia.nationType.units");
@@ -184,9 +182,7 @@ public class NationTypeDetailPanel
 
         panel.setLayout(new MigLayout("wrap 2, gapx 20", "", ""));
 
-        JLabel name = Utility.localizedLabel(nationType);
-        name.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        JLabel name = Utility.localizedHeaderLabel(nationType, FontLibrary.FontSize.SMALL);
         panel.add(name, "span, align center, wrap 40");
 
         panel.add(Utility.localizedLabel("colopedia.nationType.aggressionLevel"));
diff --git a/src/net/sf/freecol/client/gui/panel/ReportHighScoresPanel.java b/src/net/sf/freecol/client/gui/panel/ReportHighScoresPanel.java
index 4abd95646..268462af0 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportHighScoresPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportHighScoresPanel.java
@@ -24,6 +24,8 @@ import java.text.DateFormat;
 import java.util.List;
 
 import javax.swing.JLabel;
+import javax.swing.SwingConstants;
+
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
@@ -72,8 +74,8 @@ public final class ReportHighScoresPanel extends ReportPanel {
             StringTemplate template = StringTemplate.template(messageId)
                 .addName("%name%", highScore.getPlayerName())
                 .addName("%nation%", highScore.getNewLandName());
-            JLabel headline = Utility.localizedLabel(template);
-            headline.setFont(font);
+            JLabel headline = Utility.localizedHeaderLabel(template,
+                SwingConstants.LEADING, FontLibrary.FontSize.SMALL);
             reportPanel.add(headline,
                             "span, wrap 10");
 
diff --git a/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java b/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
index 517233053..5e630e8d3 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
@@ -386,11 +386,11 @@ public final class ReportRequirementsPanel extends ReportPanel {
     }
 
     private JButton createColonyButton(Colony colony, String info, boolean headline) {
-        JButton button = Utility.getLinkButton(colony.getName() + info, null,
-            colony.getId());
+        String text = colony.getName() + info;
+        JButton button = Utility.getLinkButton(text, null, colony.getId());
         if (headline) {
-            button.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-                FontLibrary.FontSize.SMALL));
+            button.setFont(FontLibrary.createCompatibleFont(text,
+                FontLibrary.FontType.HEADER, FontLibrary.FontSize.SMALL));
         }
         button.addActionListener(this);
         return button;
diff --git a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
index b424b0a54..874161578 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
@@ -38,6 +38,7 @@ import javax.swing.JTextPane;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
+
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.ClientOptions;
@@ -130,9 +131,8 @@ public final class ReportTurnPanel extends ReportPanel {
             case ClientOptions.MESSAGES_GROUP_BY_TYPE:
                 if (message.getMessageType() != type) {
                     type = message.getMessageType();
-                    JLabel headline = Utility.localizedLabel(message.getMessageType());
-                    headline.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-                        FontLibrary.FontSize.SMALL));
+                    JLabel headline = Utility.localizedHeaderLabel(
+                        message.getMessageType(), FontLibrary.FontSize.SMALL);
                     reportPanel.add(headline, "newline 20, skip, span");
                 }
                 break;
@@ -297,8 +297,19 @@ public final class ReportTurnPanel extends ReportPanel {
             headline = new JLabel(source.toString());
         }
 
-        headline.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        // FIXME: Get text before putting it inside and remove type testing.
+        String text;
+        if(headline instanceof JLabel)
+            text = ((JLabel)headline).getText();
+        else if(headline instanceof JButton)
+            text = ((JButton)headline).getText();
+        else {
+            text = "";
+            logger.warning("Unknown JComponent");
+        }
+
+        headline.setFont(FontLibrary.createCompatibleFont(text,
+            FontLibrary.FontType.HEADER, FontLibrary.FontSize.SMALL));
         headline.setOpaque(false);
         headline.setForeground(Utility.LINK_COLOR);
         headline.setBorder(Utility.blankBorder(5, 0, 0, 0));
diff --git a/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java b/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java
index 4a7b302fb..a4716d0a2 100644
--- a/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java
@@ -88,9 +88,7 @@ public class ResourcesDetailPanel
         ResourceType type = getSpecification().getResourceType(id);
         panel.setLayout(new MigLayout("wrap 2", "[]20[]"));
 
-        JLabel name = Utility.localizedLabel(type);
-        name.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        JLabel name = Utility.localizedHeaderLabel(type, FontLibrary.FontSize.SMALL);
         panel.add(name, "span, align center, wrap 40");
 
         panel.add(Utility.localizedLabel("colopedia.resource.bonusProduction"));
diff --git a/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java b/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
index 394b830f9..c205429ff 100644
--- a/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
@@ -113,9 +113,7 @@ public class TerrainDetailPanel
             defenseBonus = ModifierFormat.getModifierAsString(defenceModifiers.iterator().next());
         }
 
-        JLabel nameLabel = Utility.localizedLabel(tileType);
-        nameLabel.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        JLabel nameLabel = Utility.localizedHeaderLabel(tileType, FontLibrary.FontSize.SMALL);
         panel.add(nameLabel, "span, align center");
 
         panel.add(Utility.localizedLabel("colopedia.terrain.terrainImage"), "spany 3");
diff --git a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
index 219104224..0b2c326c7 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
@@ -112,9 +112,7 @@ public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
         UnitType type = getSpecification().getUnitType(id);
         panel.setLayout(new MigLayout("wrap 4", "[]20[]40[]20[]"));
 
-        JLabel name = Utility.localizedLabel(type);
-        name.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL));
+        JLabel name = Utility.localizedHeaderLabel(type, FontLibrary.FontSize.SMALL);
         panel.add(name, "span, align center, wrap 40");
 
         panel.add(Utility.localizedLabel("colopedia.unit.offensivePower"));
diff --git a/src/net/sf/freecol/client/gui/panel/Utility.java b/src/net/sf/freecol/client/gui/panel/Utility.java
index 5fddf4f9c..dfbf234fa 100644
--- a/src/net/sf/freecol/client/gui/panel/Utility.java
+++ b/src/net/sf/freecol/client/gui/panel/Utility.java
@@ -371,13 +371,45 @@ public final class Utility {
      * @return A suitable <code>JLabel</code>.
      */
     public static JLabel localizedHeader(String key, boolean small) {
-        JLabel header = new JLabel(Messages.message(key), JLabel.CENTER);
-        header.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            (small) ? FontLibrary.FontSize.SMALL : FontLibrary.FontSize.BIG));
+        JLabel header = localizedHeaderLabel(key, SwingConstants.CENTER,
+            (small ? FontLibrary.FontSize.SMALL : FontLibrary.FontSize.BIG));
         header.setBorder(BorderFactory.createEmptyBorder(20, 0, 20, 0));
         return header;
     }
 
+    /**
+     * Gets a label containing a localized message using the header font.
+     *
+     * @param key The message key to use.
+     * @param alignment The alignment.
+     * @param size The font size.
+     * @return A suitable <code>JLabel</code>.
+     */
+    public static JLabel localizedHeaderLabel(String key, int alignment,
+                                              FontLibrary.FontSize size) {
+        String text = Messages.message(key);
+        JLabel header = new JLabel(text, alignment);
+        header.setFont(FontLibrary.createCompatibleFont(
+            text, FontLibrary.FontType.HEADER, size));
+        return header;
+    }
+
+    public static JLabel localizedHeaderLabel(StringTemplate template,
+                                              int alignment,
+                                              FontLibrary.FontSize size) {
+        String text = Messages.message(template);
+        JLabel header = new JLabel(text, alignment);
+        header.setFont(FontLibrary.createCompatibleFont(
+            text, FontLibrary.FontType.HEADER, size));
+        return header;
+    }
+
+    public static JLabel localizedHeaderLabel(Named named,
+                                              FontLibrary.FontSize size) {
+        return localizedHeaderLabel(named.getNameKey(),
+                                    SwingConstants.LEADING, size);
+    }
+
     /**
      * Get a JLabel with Messages.message(key) as text.
      *

From d7c00dbdeafc2a265745a768d8fab55fb5ab94b5 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 12 Aug 2015 09:40:43 +0930
Subject: [PATCH 106/323] Mitigate production label creation failure, BR#2886.

---
 .../client/gui/panel/BuildingToolTip.java     | 62 ++++++++++---------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/BuildingToolTip.java b/src/net/sf/freecol/client/gui/panel/BuildingToolTip.java
index fc799398c..ecb873ef5 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildingToolTip.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildingToolTip.java
@@ -90,38 +90,42 @@ public class BuildingToolTip extends JToolTip {
         add(buildingName, "span");
 
         ProductionInfo info = building.getProductionInfo();
-        if (info == null || info.getProduction().isEmpty()) {
+        AbstractGoods production
+            = (info == null || info.getProduction().isEmpty()) ? null
+            : info.getProduction().get(0);
+        AbstractGoods consumption
+            = (info == null || info.getConsumption().isEmpty()) ? null
+            : info.getConsumption().get(0);
+        if (production == null || production.getAmount() <= 0) {
             add(new JLabel(), "span");
         } else {
-            AbstractGoods production = info.getProduction().get(0);
+            AbstractGoods maxProduction = (info == null
+                || info.getMaximumProduction().isEmpty()) ? null
+                : info.getMaximumProduction().get(0);
             ProductionLabel productionOutput
                 = new ProductionLabel(freeColClient, production,
-                    ((info.getMaximumProduction().isEmpty())
-                        ? production
-                        : info.getMaximumProduction().get(0))
-                    .getAmount());
-            if (info.getConsumption().isEmpty()) {
+                    ((maxProduction == null) ? production
+                        : maxProduction).getAmount());
+            if (consumption == null) {
                 add(productionOutput, "span");
+            } else if (consumption.getAmount() > 0) {
+                AbstractGoods maxConsumption = (info == null
+                    || info.getMaximumConsumption().isEmpty()) ? null
+                    : info.getMaximumConsumption().get(0);
+                ProductionLabel productionInput
+                    = new ProductionLabel(freeColClient, consumption,
+                        ((maxConsumption == null) ? consumption
+                            : maxConsumption).getAmount());
+                add(productionInput, "span, split 3");
+                add(arrow);
+                add(productionOutput);
             } else {
-                AbstractGoods consumption = info.getConsumption().get(0);
-                if (consumption.getAmount() > 0) {
-                    ProductionLabel productionInput
-                        = new ProductionLabel(freeColClient, consumption,
-                            ((info.getMaximumConsumption().isEmpty())
-                                ? consumption
-                                : info.getMaximumConsumption().get(0))
-                            .getAmount());
-                    add(productionInput, "span, split 3");
-                    add(arrow);
-                    add(productionOutput);
-                } else {
-                    add(new JLabel(new ImageIcon(
-                            lib.getIconImage(consumption.getType()))),
-                        "span, split 3");
-                    add(arrow);
-                    add(new JLabel(new ImageIcon(
-                            lib.getIconImage(production.getType()))));
-                }
+                add(new JLabel(new ImageIcon(lib
+                            .getIconImage(consumption.getType()))),
+                    "span, split 3");
+                add(arrow);
+                add(new JLabel(new ImageIcon(lib
+                            .getIconImage(production.getType()))));
             }
         }
 
@@ -129,11 +133,11 @@ public class BuildingToolTip extends JToolTip {
 
         for (Unit unit : building.getUnitList()) {
             UnitLabel unitLabel = new UnitLabel(freeColClient, unit, false);
-            int production = building.getUnitProduction(unit, output);
-            if (production > 0) {
+            int amount = building.getUnitProduction(unit, output);
+            if (amount > 0) {
                 add(unitLabel);
                 JLabel pLabel = new ProductionLabel(freeColClient,
-                    new AbstractGoods(output, production));
+                    new AbstractGoods(output, amount));
                 add(pLabel, "split 2");
                 add(new JLabel());
             } else if (building.canTeach() && unit.getStudent() != null) {

From 51899fdd4399db3b79f403d284e03b73b716dd50 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 14 Aug 2015 16:05:57 +0930
Subject: [PATCH 107/323] Another try to auto-select active unit in unit
 display panels, IR#22.

---
 src/net/sf/freecol/client/gui/panel/UnitPanel.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/net/sf/freecol/client/gui/panel/UnitPanel.java b/src/net/sf/freecol/client/gui/panel/UnitPanel.java
index 50c4c18d8..9135213c9 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitPanel.java
@@ -66,6 +66,8 @@ public abstract class UnitPanel extends MigPanel
         cleanup();
         addPropertyChangeListeners();
         update();
+        Unit active = portPanel.getGUI().getActiveUnit();
+        if (active != null) setSelectedUnit(active);
     }
 
     /**

From 2311075d4741f612625b4fd8704f9eaaba3a3c4c Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 14 Aug 2015 16:12:04 +0930
Subject: [PATCH 108/323] Revert country name on tiles.

---
 src/net/sf/freecol/client/gui/MapViewer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index d94f21b81..53ae1b5be 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1884,7 +1884,7 @@ public final class MapViewer {
             break;
         case ClientOptions.DISPLAY_TILE_TEXT_OWNERS:
             if (tile.getOwner() != null) {
-                text = Messages.message(tile.getOwner().getCountryLabel());
+                text = Messages.message(tile.getOwner().getNationLabel());
             }
             break;
         case ClientOptions.DISPLAY_TILE_TEXT_REGIONS:

From c84f855b4e5aeb9d0d009df7f6525d4a0392a131 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 14 Aug 2015 16:20:31 +0930
Subject: [PATCH 109/323] More minor clean up in IGC.

---
 .../client/control/InGameController.java      | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 73f1c1488..77ffac7ad 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -261,13 +261,11 @@ public final class InGameController implements NetworkConstants {
      * @return True if it is our turn.
      */
     private boolean requireOurTurn() {
-        if (!freeColClient.currentPlayerIsMyPlayer()) {
-            if (freeColClient.isInGame()) {
-                gui.showInformationMessage("info.notYourTurn");
-            }
-            return false;
+        if (freeColClient.currentPlayerIsMyPlayer()) return true;
+        if (freeColClient.isInGame()) {
+            gui.showInformationMessage("info.notYourTurn");
         }
-        return true;
+        return false;
     }
 
     /**
@@ -355,8 +353,7 @@ public final class InGameController implements NetworkConstants {
         if (price < 0) { // not for sale
             return false;
         } else if (price > 0) { // for sale
-            ClaimAction act = gui.getClaimChoice(tile, player, price,
-                                                     owner);
+            ClaimAction act = gui.getClaimChoice(tile, player, price, owner);
             if (act == null) return false; // Cancelled
             switch (act) {
             case ACCEPT: // accepted price
@@ -370,7 +367,6 @@ public final class InGameController implements NetworkConstants {
             }
         } // else price == 0 and we can just proceed to claim
 
-        // Ask the server
         return askServer().claimTile(tile, claimant, price)
             && player.owns(tile);
     }
@@ -380,15 +376,18 @@ public final class InGameController implements NetworkConstants {
      * to null.
      *
      * @param unit The <code>Unit</code> to clear the destination for.
-     * @return True if the unit has no destination.
+     * @return True if the unit now has no destination or trade route.
      */
     private boolean askClearGotoOrders(Unit unit) {
         if (!askAssignTradeRoute(unit, null)) return false;
 
         if (unit.getDestination() == null) return true;
 
-        gui.clearGotoPath();
-        return askSetDestination(unit, null);
+        if (askSetDestination(unit, null)) {
+            gui.clearGotoPath();
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -1174,10 +1173,9 @@ public final class InGameController implements NetworkConstants {
             result = false;
             break;
         }
-        if (clearDestination && !unit.isDisposed()) {
-            askClearGotoOrders(unit);
-        }
-        return result;
+        if (unit.isDisposed()) return false;
+        if (clearDestination) askClearGotoOrders(unit);
+        return true;
     }
 
     /**
@@ -2720,7 +2718,7 @@ public final class InGameController implements NetworkConstants {
 
         // Check unit, which must be on the map and able to build.
         if (unit == null) return false;
-        Tile tile = unit.getTile();
+        final Tile tile = unit.getTile();
         if (tile == null) return false;
         if (!unit.canBuildColony()) {
             gui.showInformationMessage(unit, StringTemplate
@@ -3495,8 +3493,9 @@ public final class InGameController implements NetworkConstants {
      * @return a <code>List</code> value
      */
     public List<AbstractUnit> getREFUnits() {
-        return (!requireOurTurn()) ? Collections.<AbstractUnit>emptyList()
-            : askServer().getREFUnits();
+        if (!requireOurTurn()) return Collections.<AbstractUnit>emptyList();
+        
+        return askServer().getREFUnits();
     }
 
     /**
@@ -3671,7 +3670,7 @@ public final class InGameController implements NetworkConstants {
         }
         if (m != null) {
             player.addModelMessage(m);
-            displayModelMessages(false, false);
+            displayModelMessages(false);
         }
         return accepted;
     }
@@ -3959,7 +3958,7 @@ public final class InGameController implements NetworkConstants {
                            null);
 
         // Add tutorial message.
-        String key = FreeColActionUI.getHumanKeyStrokeText(freeColClient
+        final String key = FreeColActionUI.getHumanKeyStrokeText(freeColClient
             .getActionManager().getFreeColAction("buildColonyAction")
             .getAccelerator());
         player.addModelMessage(new ModelMessage(ModelMessage.MessageType.TUTORIAL,
@@ -3992,6 +3991,8 @@ public final class InGameController implements NetworkConstants {
     /**
      * Ask the player to name the new land.
      *
+     * Called from IGIH.newLandName.
+     *
      * @param defaultName The default name to use.
      * @param unit The <code>Unit</code> that has landed.
      */
@@ -4002,6 +4003,8 @@ public final class InGameController implements NetworkConstants {
     /**
      * Ask the player to name a new region.
      *
+     * Called from IGIH.newRegionName.
+     *
      * @param region The <code>Region</code> to name.
      * @param defaultName The default name to use.
      * @param tile The <code>Tile</code> the unit landed at.
@@ -4045,11 +4048,9 @@ public final class InGameController implements NetworkConstants {
 
         final boolean alert = freeColClient.getClientOptions()
             .getBoolean(ClientOptions.AUDIO_ALERTS);
-        if (alert) {
-            sound("sound.event.alertSound");
-        }
+        if (alert) sound("sound.event.alertSound");
 
-        Turn currTurn = game.getTurn();
+        final Turn currTurn = game.getTurn();
         if (currTurn.isFirstSeasonTurn()) {
             player.addModelMessage(new ModelMessage(MessageType.WARNING,
                                                     "twoTurnsPerYear", player)
@@ -4727,9 +4728,9 @@ public final class InGameController implements NetworkConstants {
         if (!requireOurTurn() || unit == null
             || !unit.isCarrier()) return false;
 
+        final boolean inEurope = unit.isInEurope();
+        final Colony colony = unit.getColony();
         boolean ret = true;
-        boolean inEurope = unit.isInEurope();
-        Colony colony = unit.getColony();
         if (colony != null) { // In colony, unload units and goods.
             for (Unit u : unit.getUnitList()) {
                 ret = leaveShip(u) && ret;
@@ -4737,7 +4738,7 @@ public final class InGameController implements NetworkConstants {
             for (Goods goods : unit.getGoodsList()) {
                 ret = unloadCargo(goods, false) && ret;
             }
-        } else if (unit.isInEurope()) { // In Europe, unload non-boycotted goods
+        } else if (inEurope) { // In Europe, unload non-boycotted goods
             Player player = freeColClient.getMyPlayer();
             for (Goods goods : unit.getCompactGoodsList()) {
                 if (player.canTrade(goods.getType())) {
@@ -4748,7 +4749,7 @@ public final class InGameController implements NetworkConstants {
                 gui.showDumpCargoDialog(unit);
                 return false;
             }
-        } else { // Dump goods, units dislike jumping overboard
+        } else { // Dump goods, however units dislike jumping overboard
             for (Goods goods : unit.getGoodsList()) {
                 ret = unloadCargo(goods, false) && ret;
             }

From f026207330d18ec1be049e8af4641735244ef704 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 14 Aug 2015 20:19:17 +0930
Subject: [PATCH 110/323] Tighten port panel unit selection.

---
 src/net/sf/freecol/client/gui/panel/UnitPanel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/panel/UnitPanel.java b/src/net/sf/freecol/client/gui/panel/UnitPanel.java
index 9135213c9..caa5f3299 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitPanel.java
@@ -67,7 +67,7 @@ public abstract class UnitPanel extends MigPanel
         addPropertyChangeListeners();
         update();
         Unit active = portPanel.getGUI().getActiveUnit();
-        if (active != null) setSelectedUnit(active);
+        if (active != null && active.isCarrier()) setSelectedUnit(active);
     }
 
     /**

From 792014fcfb2dda646523089aa6155fe571ab398c Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 14 Aug 2015 16:56:20 +0200
Subject: [PATCH 111/323] Clean up and remove unnecessary method overloads in
 Utility

---
 .../client/gui/panel/ReportTradePanel.java    |  2 +-
 .../sf/freecol/client/gui/panel/Utility.java  | 65 ++++++-------------
 2 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java b/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
index 14c44023a..f2f15f7b8 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
@@ -223,7 +223,7 @@ public final class ReportTradePanel extends ReportPanel {
     }
 
     private JLabel createLeftLabel(String key) {
-        JLabel result = Utility.localizedLabel(key, JLabel.LEADING);
+        JLabel result = Utility.localizedLabel(key);
         result.setBorder(Utility.LEFTCELLBORDER);
         return result;
     }
diff --git a/src/net/sf/freecol/client/gui/panel/Utility.java b/src/net/sf/freecol/client/gui/panel/Utility.java
index dfbf234fa..07a43d212 100644
--- a/src/net/sf/freecol/client/gui/panel/Utility.java
+++ b/src/net/sf/freecol/client/gui/panel/Utility.java
@@ -233,7 +233,14 @@ public final class Utility {
      * @return The default <code>JTextPane</code> to use.
      */
     public static JTextPane getDefaultTextPane() {
-        return getDefaultTextPane(null);
+        DefaultStyledDocument document
+            = new DefaultStyledDocument(STYLE_CONTEXT);
+
+        JTextPane textPane = new JTextPane(document);
+        textPane.setOpaque(false);
+        textPane.setEditable(false);
+        textPane.setLogicalStyle(STYLE_CONTEXT.getStyle("regular"));
+        return textPane;
     }
 
     /**
@@ -243,14 +250,7 @@ public final class Utility {
      * @return A suitable <code>JTextPane</code>.
      */
     public static JTextPane getDefaultTextPane(String text) {
-        DefaultStyledDocument document
-            = new DefaultStyledDocument(STYLE_CONTEXT);
-
-        JTextPane textPane = new JTextPane(document);
-        textPane.setOpaque(false);
-        textPane.setEditable(false);
-        textPane.setLogicalStyle(STYLE_CONTEXT.getStyle("regular"));
-
+        JTextPane textPane = getDefaultTextPane();
         textPane.setText(text);
         return textPane;
     }
@@ -353,16 +353,6 @@ public final class Utility {
         return new JCheckBoxMenuItem(Messages.message(key), value);
     }
 
-    /**
-     * Get a JLabel with a named object.
-     *
-     * @param named The <code>Named</code> to use.
-     * @return The <code>JLabel</code>.
-     */
-    public static JLabel localizedLabel(Named named) {
-        return localizedLabel(named.getNameKey());
-    }
-
     /**
      * Gets a default header for panels containing a localized message.
      *
@@ -410,6 +400,16 @@ public final class Utility {
                                     SwingConstants.LEADING, size);
     }
 
+    /**
+     * Get a JLabel with a named object.
+     *
+     * @param named The <code>Named</code> to use.
+     * @return The <code>JLabel</code>.
+     */
+    public static JLabel localizedLabel(Named named) {
+        return localizedLabel(named.getNameKey());
+    }
+
     /**
      * Get a JLabel with Messages.message(key) as text.
      *
@@ -417,30 +417,7 @@ public final class Utility {
      * @return The <code>JLabel</code>.
      */
     public static JLabel localizedLabel(String key) {
-        return localizedLabel(key, SwingConstants.LEADING);
-    }
-
-    /**
-     * Get a JLabel with Messages.message(key) as text.
-     *
-     * @param key The key to use.
-     * @param alignment The alignment.
-     * @return The <code>JLabel</code>.
-     */
-    public static JLabel localizedLabel(String key, int alignment) {
-        return localizedLabel(key, null, alignment);
-    }
-
-    /**
-     * Get a JLabel with Messages.message(key) as text.
-     *
-     * @param key The key to use.
-     * @param icon The icon to use.
-     * @param alignment The alignment.
-     * @return The <code>JLabel</code>.
-     */
-    public static JLabel localizedLabel(String key, Icon icon, int alignment) {
-        return localizedLabel(StringTemplate.key(key), icon, alignment);
+        return localizedLabel(StringTemplate.key(key));
     }
 
     /**
@@ -450,7 +427,7 @@ public final class Utility {
      * @return The <code>JLabel</code>.
      */
     public static JLabel localizedLabel(StringTemplate template) {
-        return localizedLabel(template, null, SwingConstants.LEADING);
+        return new JLabel(Messages.message(template));
     }
 
     /**

From 9b46bfcf07d503daf0665f1e1f16ccfac534854b Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 22 Aug 2015 18:49:03 +0200
Subject: [PATCH 112/323] Move unused ttf font files

---
 {data/base => unused}/resources/fonts/Imperator.ttf | Bin
 .../resources/fonts/LiberationSerif-Bold.ttf        | Bin
 .../resources/fonts/LiberationSerif-BoldItalic.ttf  | Bin
 .../resources/fonts/LiberationSerif-Italic.ttf      | Bin
 .../resources/fonts/LiberationSerif-Regular.ttf     | Bin
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename {data/base => unused}/resources/fonts/Imperator.ttf (100%)
 rename {data/base => unused}/resources/fonts/LiberationSerif-Bold.ttf (100%)
 rename {data/base => unused}/resources/fonts/LiberationSerif-BoldItalic.ttf (100%)
 rename {data/base => unused}/resources/fonts/LiberationSerif-Italic.ttf (100%)
 rename {data/base => unused}/resources/fonts/LiberationSerif-Regular.ttf (100%)

diff --git a/data/base/resources/fonts/Imperator.ttf b/unused/resources/fonts/Imperator.ttf
similarity index 100%
rename from data/base/resources/fonts/Imperator.ttf
rename to unused/resources/fonts/Imperator.ttf
diff --git a/data/base/resources/fonts/LiberationSerif-Bold.ttf b/unused/resources/fonts/LiberationSerif-Bold.ttf
similarity index 100%
rename from data/base/resources/fonts/LiberationSerif-Bold.ttf
rename to unused/resources/fonts/LiberationSerif-Bold.ttf
diff --git a/data/base/resources/fonts/LiberationSerif-BoldItalic.ttf b/unused/resources/fonts/LiberationSerif-BoldItalic.ttf
similarity index 100%
rename from data/base/resources/fonts/LiberationSerif-BoldItalic.ttf
rename to unused/resources/fonts/LiberationSerif-BoldItalic.ttf
diff --git a/data/base/resources/fonts/LiberationSerif-Italic.ttf b/unused/resources/fonts/LiberationSerif-Italic.ttf
similarity index 100%
rename from data/base/resources/fonts/LiberationSerif-Italic.ttf
rename to unused/resources/fonts/LiberationSerif-Italic.ttf
diff --git a/data/base/resources/fonts/LiberationSerif-Regular.ttf b/unused/resources/fonts/LiberationSerif-Regular.ttf
similarity index 100%
rename from data/base/resources/fonts/LiberationSerif-Regular.ttf
rename to unused/resources/fonts/LiberationSerif-Regular.ttf

From 2a727b62d7f6efd7721db8265d057c2d243da779 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 22 Aug 2015 19:30:06 +0200
Subject: [PATCH 113/323] Add helper methods to FontLibrary

---
 .../sf/freecol/client/gui/FontLibrary.java    | 79 +++++++++++--------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/FontLibrary.java b/src/net/sf/freecol/client/gui/FontLibrary.java
index ca6f76ac5..ae3ab09a6 100644
--- a/src/net/sf/freecol/client/gui/FontLibrary.java
+++ b/src/net/sf/freecol/client/gui/FontLibrary.java
@@ -208,42 +208,11 @@ public class FontLibrary {
      */
     public static Font createFont(FontType fontType, FontSize fontSize,
                                   int style, float scaleFactor) {
-        String fontName;
-        switch(fontType) {
-            default:
-                logger.warning("Unknown FontType");
-            case NORMAL:
-                fontName = (mainFont != null) ? null : "normal";
-                break;
-            case SIMPLE:
-                fontName = "simple";
-                break;
-            case HEADER:
-                fontName = "header";
-        }
-        float pixelSize;
-        switch(fontSize) {
-            default:
-                logger.warning("Unknown FontSize");
-            case TINY:
-                pixelSize = 12f;
-                break;
-            case SMALLER:
-                pixelSize = 16f;
-                break;
-            case SMALL:
-                pixelSize = 24f;
-                break;
-            case MEDIUM:
-                pixelSize = 36f;
-                break;
-            case BIG:
-                pixelSize = 48f;
-        }
-        float scaledSize = pixelSize * scaleFactor;
-        Font font = (fontName == null)
+        float scaledSize = calcScaledSize(fontSize, scaleFactor);
+        String fontKey = getFontKey(fontType);
+        Font font = (fontKey == null)
             ? mainFont
-            : ResourceManager.getFont("font." + fontName);
+            : ResourceManager.getFont(fontKey);
         font = font.deriveFont(style, scaledSize);
         return font;
     }
@@ -276,4 +245,44 @@ public class FontLibrary {
         return createFont(FontType.NORMAL, fontSize, style, scaleFactor);
     }
 
+    private static float calcScaledSize(FontSize fontSize, float scaleFactor) {
+        float pixelSize;
+        switch(fontSize) {
+            default:
+                logger.warning("Unknown FontSize");
+            case TINY:
+                pixelSize = 12f;
+                break;
+            case SMALLER:
+                pixelSize = 16f;
+                break;
+            case SMALL:
+                pixelSize = 24f;
+                break;
+            case MEDIUM:
+                pixelSize = 36f;
+                break;
+            case BIG:
+                pixelSize = 48f;
+        }
+        return pixelSize * scaleFactor;
+    }
+
+    private static String getFontKey(FontType fontType) {
+        String fontName;
+        switch(fontType) {
+            default:
+                logger.warning("Unknown FontType");
+            case NORMAL:
+                fontName = (mainFont != null) ? null : "font.normal";
+                break;
+            case SIMPLE:
+                fontName = "font.simple";
+                break;
+            case HEADER:
+                fontName = "font.header";
+        }
+        return fontName;
+    }
+
 }

From 174b4a61588b55a8fa5d8bd011abe152a74df9f9 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 22 Aug 2015 19:53:50 +0200
Subject: [PATCH 114/323] Improve FontLibrary.createCompatibleFont method

---
 .../sf/freecol/client/gui/FontLibrary.java    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/FontLibrary.java b/src/net/sf/freecol/client/gui/FontLibrary.java
index ae3ab09a6..ab055c5b0 100644
--- a/src/net/sf/freecol/client/gui/FontLibrary.java
+++ b/src/net/sf/freecol/client/gui/FontLibrary.java
@@ -234,15 +234,25 @@ public class FontLibrary {
     public static Font createCompatibleFont(String string, FontType fontType,
                                             FontSize fontSize,
                                             int style, float scaleFactor) {
-        // FIXME: Inline createFont calls, add private helper methods
-        //        for common code and simplify everything.
         // TODO: Consider testing the normal font for compatibility and try
         //       some or all other available fonts for complete/longest match:
         //       header/simple->main->normal->simple/header->emergency
-        Font font = createFont(fontType, fontSize, style, scaleFactor);
-        if(font.canDisplayUpTo(string) == -1 || fontType==FontType.NORMAL)
-            return font;
-        return createFont(FontType.NORMAL, fontSize, style, scaleFactor);
+        float scaledSize = calcScaledSize(fontSize, scaleFactor);
+        String fontKey = getFontKey(fontType);
+        Font font = null;
+        if(fontType != FontType.NORMAL) {
+            font = ResourceManager.getFont(fontKey);
+            if(font.canDisplayUpTo(string) != -1)
+                font = null;
+        }
+        if(font == null) {
+            fontKey = getFontKey(FontType.NORMAL);
+            font = (fontKey == null)
+                ? mainFont
+                : ResourceManager.getFont(fontKey);
+        }
+        font = font.deriveFont(style, scaledSize);
+        return font;
     }
 
     private static float calcScaledSize(FontSize fontSize, float scaleFactor) {

From 2fe3be62e6ddc9a0897356c42be65ece7ad7ea57 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 22 Aug 2015 21:26:04 +0200
Subject: [PATCH 115/323] Correctly check font compatibility in colopedia

---
 .../sf/freecol/client/gui/panel/FatherDetailPanel.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java b/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java
index 773c6cdfd..1baf4b53a 100644
--- a/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java
@@ -115,14 +115,16 @@ public class FatherDetailPanel
         } catch (IllegalArgumentException e) {
             // this is not a founding father
             panel.setLayout(new MigLayout("wrap 1, align center", "align center"));
-            JLabel header = Utility.localizedHeaderLabel(Messages.nameKey(id),
-                SwingConstants.LEADING, FontLibrary.FontSize.SMALL);
-            panel.add(header, "align center, wrap 20");
             if (getId().equals(id)) {
+                JLabel header = Utility.localizedHeaderLabel(Messages.nameKey(id),
+                    SwingConstants.LEADING, FontLibrary.FontSize.SMALL);
+                panel.add(header, "align center, wrap 20");
                 panel.add(Utility.localizedTextArea("colopedia.foundingFather.description", 40));
             } else {
+                JLabel header = Utility.localizedHeaderLabel(Messages.message(id),
+                    SwingConstants.LEADING, FontLibrary.FontSize.SMALL);
+                panel.add(header, "align center, wrap 20");
                 Image image = ResourceManager.getImage("image.flavor." + id);
-                header.setText(Messages.message(id));
                 panel.add(new JLabel(new ImageIcon(image)));
             }
         }

From 91a3903eda0d5e58de2bea26ade45f6542031b14 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 22 Aug 2015 22:07:55 +0200
Subject: [PATCH 116/323] Check header font compatibility in MonarchDialog

---
 src/net/sf/freecol/client/gui/panel/MonarchDialog.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/MonarchDialog.java b/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
index 8cf5c4940..5d1ba68b1 100644
--- a/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
@@ -26,7 +26,9 @@ import java.util.List;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JTextArea;
+import javax.swing.SwingConstants;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -77,10 +79,8 @@ public final class MonarchDialog extends FreeColDialog<Boolean> {
         if (!Messages.containsKey(hdrKey)) {
             hdrKey = "monarchDialog.default";
         }
-        JTextArea header = Utility.localizedTextArea(hdrKey);
-        // TODO: Check font compatibility for contained text, when possible.
-        header.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.MEDIUM));
+        JLabel header = Utility.localizedHeaderLabel(hdrKey,
+            SwingConstants.LEADING, FontLibrary.FontSize.MEDIUM);
 
         MigPanel panel = new MigPanel(new MigLayout("wrap 2, insets 10",
                                                     "[]20[]"));

From 759e73edc1d71313a5c19700452766d9b49c033f Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 22 Aug 2015 23:11:55 +0200
Subject: [PATCH 117/323] Check colony names for compatibility with the header
 font

---
 .../freecol/client/gui/panel/ColonyPanel.java  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 2e6b9b414..c4a809949 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -274,16 +274,28 @@ public final class ColonyPanel extends PortPanel
         selectedUnitLabel = null;
 
         // Make the colony label
-        // TODO: Check font compatibility for all contained strings
-        this.nameBox.setFont(FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL, getImageLibrary().getScalingFactor()));
+        Font nameBoxFont = FontLibrary.createFont(FontLibrary.FontType.HEADER,
+            FontLibrary.FontSize.SMALL, getImageLibrary().getScalingFactor());
+        boolean incompatibleFont = false;
         if (editable) {
             for (Colony c : freeColClient.getMySortedColonies()) {
                 this.nameBox.addItem(c);
+                if(!incompatibleFont &&
+                    nameBoxFont.canDisplayUpTo(c.getName()) != -1) {
+                    incompatibleFont = true;
+                }
             }
         } else { // When spying, only add the given colony.
             this.nameBox.addItem(colony);
+            if(nameBoxFont.canDisplayUpTo(colony.getName()) != -1)
+                incompatibleFont = true;
         }
+        if(incompatibleFont) {
+            nameBoxFont = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
+                FontLibrary.FontSize.SMALL,
+                getImageLibrary().getScalingFactor());
+        }
+        this.nameBox.setFont(nameBoxFont);
         this.nameBox.setSelectedItem(colony);
         this.nameBox.getInputMap().put(KeyStroke.getKeyStroke("LEFT"),
                                        "selectPrevious2");

From b9f2bc5c62c19e6ed33174009168cf2132e75315 Mon Sep 17 00:00:00 2001
From: calebrw <calebrw@gmail.com>
Date: Sat, 22 Aug 2015 21:21:43 -0500
Subject: [PATCH 118/323] Website Head tag cleanup

This update to the website focuses primarily on cleaning up each page's head tag to correct two spelling mistakes.

Additionally, the news pages of several releases have been updated to match the content on the index.
---
 www.freecol.org/about.html                    |   5 +-
 www.freecol.org/art-colonies.html             |   2 +-
 www.freecol.org/art-goods.html                |   2 +-
 www.freecol.org/art-units.html                |   2 +-
 www.freecol.org/community.html                |   2 +-
 www.freecol.org/contact.html                  |   2 +-
 .../create-new-article/documentation.html     |   2 +-
 www.freecol.org/create-new-article/news.html  |   2 +-
 .../documentation/freecol-user-manual.html    |   2 +-
 www.freecol.org/documentation/git.html        |   2 +-
 www.freecol.org/documentation/index.html      |   2 +-
 www.freecol.org/documentation/javadoc.html    |   2 +-
 .../subversion-repository-layout.html         |   2 +-
 www.freecol.org/documentation/subversion.html |   2 +-
 .../documentation/trackers-use.html           |   2 +-
 www.freecol.org/download.html                 |   2 +-
 www.freecol.org/history.html                  |   9 +-
 www.freecol.org/how-to-contribute.html        |   2 +-
 www.freecol.org/index.html                    |   2 +-
 www.freecol.org/links/index.html              |   2 +-
 www.freecol.org/more-screenshots.html         |   2 +-
 .../news/2-more-screenshots-added.html        |  31 +-
 www.freecol.org/news/Page-10.html             |   2 +-
 www.freecol.org/news/Page-11.html             |   2 +-
 www.freecol.org/news/Page-12.html             |   2 +-
 www.freecol.org/news/Page-13.html             |   2 +-
 www.freecol.org/news/Page-2.html              |   2 +-
 www.freecol.org/news/Page-3.html              |   2 +-
 www.freecol.org/news/Page-4.html              |   2 +-
 www.freecol.org/news/Page-5.html              |   2 +-
 www.freecol.org/news/Page-6.html              |   2 +-
 www.freecol.org/news/Page-7.html              |   2 +-
 www.freecol.org/news/Page-8.html              |   2 +-
 www.freecol.org/news/Page-9.html              |   2 +-
 .../background-images-and-illustrations.html  | 264 ++++++++--------
 www.freecol.org/news/current-progress.html    |   2 +-
 www.freecol.org/news/development.html         |   2 +-
 www.freecol.org/news/development/Page-2.html  |   2 +-
 www.freecol.org/news/development/Page-3.html  |   2 +-
 www.freecol.org/news/donations.html           |   2 +-
 .../news/freecol-0.1.0-released.html          |   2 +-
 .../news/freecol-0.10.0-alpha-released.html   |   2 +-
 .../news/freecol-0.10.0-alpha2-released.html  |   2 +-
 .../news/freecol-0.10.0-released.html         |   2 +-
 .../news/freecol-0.10.1-released.html         |   2 +-
 .../news/freecol-0.10.2-released.html         |   2 +-
 .../news/freecol-0.10.3-released.html         |   2 +-
 .../news/freecol-0.10.4-released.html         |   2 +-
 .../news/freecol-0.10.5-released.html         |   2 +-
 .../news/freecol-0.10.6-released.html         |   2 +-
 .../news/freecol-0.10.7-released.html         |   2 +-
 .../news/freecol-0.11.0-released.html         |   2 +-
 .../news/freecol-0.11.1-released.html         | 275 +++++++++--------
 .../news/freecol-0.11.2-released.html         | 270 +++++++++--------
 .../news/freecol-0.11.3-released.html         | 283 +++++++++---------
 .../news/freecol-0.11.4-released.html         |   2 +-
 .../news/freecol-0.11.5-released.html         |  26 +-
 .../news/freecol-0.2.0-released.html          |   2 +-
 .../news/freecol-0.3.0-released.html          |   2 +-
 .../news/freecol-0.4.0-release-candidate.html |   2 +-
 .../news/freecol-0.4.0-released.html          |   2 +-
 .../news/freecol-0.5.0-released.html          |   2 +-
 .../news/freecol-0.5.1-released.html          |   2 +-
 .../news/freecol-0.5.2-released.html          |   2 +-
 .../news/freecol-0.5.3-released.html          |   2 +-
 .../news/freecol-0.6.0-released.html          |   2 +-
 .../news/freecol-0.6.1-released.html          |   2 +-
 .../news/freecol-0.7.0-released.html          |   2 +-
 .../news/freecol-0.7.1-released.html          |   2 +-
 .../news/freecol-0.7.2-released.html          |   2 +-
 .../news/freecol-0.7.3-on-january-27th.html   |   2 +-
 .../news/freecol-0.7.3-released.html          |   2 +-
 .../news/freecol-0.7.4-released.html          |   2 +-
 .../news/freecol-0.8.0-alpha-released.html    |   2 +-
 .../news/freecol-0.8.0-alpha2-released.html   |   2 +-
 .../news/freecol-0.8.0-alpha3-released.html   |   2 +-
 .../news/freecol-0.8.0-released.html          |   2 +-
 .../news/freecol-0.8.1-released.html          |   2 +-
 .../news/freecol-0.8.2-released.html          |   2 +-
 .../news/freecol-0.8.3-released.html          |   2 +-
 .../news/freecol-0.8.4-released.html          |   2 +-
 .../news/freecol-0.9.0-alpha-released.html    |   2 +-
 .../news/freecol-0.9.0-alpha2-released.html   |   2 +-
 .../news/freecol-0.9.0-released.html          |   2 +-
 .../news/freecol-0.9.1-released.html          |   2 +-
 .../news/freecol-0.9.2-released.html          |   2 +-
 .../news/freecol-0.9.3-released.html          |   2 +-
 .../news/freecol-0.9.4-released.html          |   2 +-
 .../news/freecol-0.9.5-released.html          |   2 +-
 ...nts-to-upgrade-and-downgrade-elements.html |   2 +-
 www.freecol.org/news/index.html               |  15 +-
 .../news/intro-movie-and-music.html           |   2 +-
 www.freecol.org/news/new-colonization.html    |   2 +-
 .../news/new-modifiers-available.html         |   2 +-
 www.freecol.org/news/new-website.html         |   2 +-
 www.freecol.org/news/other.html               |   2 +-
 .../production-depending-on-difficulty.html   |   2 +-
 .../news/project-member-leaving.html          |   2 +-
 www.freecol.org/news/releases.html            |   2 +-
 www.freecol.org/news/releases/Page-2.html     |   2 +-
 www.freecol.org/news/releases/Page-3.html     |   2 +-
 www.freecol.org/news/releases/Page-4.html     |   2 +-
 www.freecol.org/news/releases/Page-5.html     |   2 +-
 www.freecol.org/news/releases/Page-6.html     |   2 +-
 www.freecol.org/news/releases/Page-7.html     |   2 +-
 www.freecol.org/news/releases/Page-8.html     |   2 +-
 www.freecol.org/news/releases/Page-9.html     |   2 +-
 ...urceforge.net-community-choice-awards.html |   2 +-
 .../news/start-of-the-freecol-project.html    |   2 +-
 www.freecol.org/news/status-update.html       |   2 +-
 www.freecol.org/news/vote-for-freecol.html    |   2 +-
 www.freecol.org/news/you-can-help-us.html     |   2 +-
 www.freecol.org/roadmap.html                  |   2 +-
 www.freecol.org/screenshots.html              |   2 +-
 www.freecol.org/sitemap.html                  |   2 +-
 www.freecol.org/status.html                   |   5 +-
 www.freecol.org/team-and-credits.html         |   2 +-
 117 files changed, 681 insertions(+), 716 deletions(-)

diff --git a/www.freecol.org/about.html b/www.freecol.org/about.html
index 9fdb2f873..011f53676 100644
--- a/www.freecol.org/about.html
+++ b/www.freecol.org/about.html
@@ -8,7 +8,7 @@
     <meta name="title" content="About FreeCol" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
@@ -76,7 +76,8 @@
                             <p align="justify"> The FreeCol team aims to create an Open Source version of Colonization (released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>). At first we&#39;ll try to make an exact clone of Colonization. The visuals will be brought up to date with more recent standards but will remain clean, simple and functional. Certain new &#39;features&#39; will be implemented but the gameplay and the rules will be exactly the same as the original game. Examples of modern features are: an isometric map and multiplayer support.<br /><br />
                                 <img src="images/about_freecol.png" alt="A Colony with a Fort." hspace="20" align="right" /> This clone will be developed incrementally and result in <em>FreeCol 1.0.0 which will be an almost exact Colonization clone</em>. Incremental development basically means that we&#39;ll add features one at a time. This allows us to have a running program at all times and also to release an unfinished but working game once in a while.<br /><br />
                                 Once FreeCol 1.0.0 is finished we&#39;ll start working towards FreeCol 2.0.0. <em>FreeCol 2 will go beyond the original Colonization</em> and will have many new features, it will be an implementation of our (and our users&#39;) image of what Colonization 2 would have been.<br /><br />
-                                You can read more on the <a href="history.html">history of FreeCol</a>. </p>  <br /><p align="justify">[<a href="http://science.webhostinggeeks.com/o-freecolu">Serbo-Croation translation</a> contributed by Jovana Milutinovich.] <br />  <a name="original" title="original" id="original"></a></p>
+                                You can read more on the <a href="history.html">history of FreeCol</a>. </p>
+                            <p align="justify">[<a href="http://science.webhostinggeeks.com/o-freecolu">Serbo-Croation translation</a> contributed by Jovana Milutinovich.] <br />  <a name="original" title="original" id="original"></a></p>
                             <h3>The Original Colonization</h3> <p align="justify"> The original Colonization was released in 1994 by Microprose. <em>Colonization</em> is heavily based on <em>Civilization</em> which is generally considered to be the best turn-based strategy game for the PC in the history of mankind.<br /><br />
                             In Civilization the objective was to build a nation that could stand the test of times and that could also do one of the following: conquer the world or be the first to launch a spaceship. In Colonization things are bit different ...<br /><br />
                             A Colonization game starts in 1492 and <em>the objective is to colonize America</em>. You begin the game with one vessel and two colonists.<br /><br />
diff --git a/www.freecol.org/art-colonies.html b/www.freecol.org/art-colonies.html
index 78e36f2f7..0bd35c545 100644
--- a/www.freecol.org/art-colonies.html
+++ b/www.freecol.org/art-colonies.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Colonies" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/art-goods.html b/www.freecol.org/art-goods.html
index 8750184c3..a8b96133f 100644
--- a/www.freecol.org/art-goods.html
+++ b/www.freecol.org/art-goods.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Goods" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/art-units.html b/www.freecol.org/art-units.html
index 1310ec794..8bd3c8e88 100644
--- a/www.freecol.org/art-units.html
+++ b/www.freecol.org/art-units.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Units" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/community.html b/www.freecol.org/community.html
index 6f08ac243..67404eb9a 100644
--- a/www.freecol.org/community.html
+++ b/www.freecol.org/community.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Community" />
     <meta name="author" content="Stian Grenborgen" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/contact.html b/www.freecol.org/contact.html
index f7d205116..dbe43d0c9 100644
--- a/www.freecol.org/contact.html
+++ b/www.freecol.org/contact.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Contact Information" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/create-new-article/documentation.html b/www.freecol.org/create-new-article/documentation.html
index fd3a1eead..aa0dc855e 100644
--- a/www.freecol.org/create-new-article/documentation.html
+++ b/www.freecol.org/create-new-article/documentation.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="http://www.freecol.org/component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
         <base href="http://www.freecol.org/" />
         <link rel="shortcut icon" href="http://www.freecol.org/images/favicon.ico" />
diff --git a/www.freecol.org/create-new-article/news.html b/www.freecol.org/create-new-article/news.html
index fd3a1eead..aa0dc855e 100644
--- a/www.freecol.org/create-new-article/news.html
+++ b/www.freecol.org/create-new-article/news.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="http://www.freecol.org/component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
         <base href="http://www.freecol.org/" />
         <link rel="shortcut icon" href="http://www.freecol.org/images/favicon.ico" />
diff --git a/www.freecol.org/documentation/freecol-user-manual.html b/www.freecol.org/documentation/freecol-user-manual.html
index 3278ed04c..fedc9d4c2 100644
--- a/www.freecol.org/documentation/freecol-user-manual.html
+++ b/www.freecol.org/documentation/freecol-user-manual.html
@@ -8,7 +8,7 @@
     <meta name="title" content="FreeCol User Manual" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose, help, manual, guide, how to, how-to, howto" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose, help, manual, guide, how to, how-to, howto" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="../images/favicon.ico" />
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/documentation/git.html b/www.freecol.org/documentation/git.html
index 574e87161..a1971fa32 100644
--- a/www.freecol.org/documentation/git.html
+++ b/www.freecol.org/documentation/git.html
@@ -11,7 +11,7 @@
     <meta name="author" content="FreeCol Team"/>
     <meta name="description" content="FreeCol - a turn based strategy game"/>
     <meta name="keywords"
-          content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose"/>
+          content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose"/>
     <meta name="robots" content="index, follow"/>
     <link rel="shortcut icon" href="../images/favicon.ico"/>
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css"/>
diff --git a/www.freecol.org/documentation/index.html b/www.freecol.org/documentation/index.html
index ded01eeff..df4cc9969 100644
--- a/www.freecol.org/documentation/index.html
+++ b/www.freecol.org/documentation/index.html
@@ -7,7 +7,7 @@
     <title>FreeCol - Documentation</title>
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="../images/favicon.ico" />
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/documentation/javadoc.html b/www.freecol.org/documentation/javadoc.html
index 2026b334f..d4483dadd 100644
--- a/www.freecol.org/documentation/javadoc.html
+++ b/www.freecol.org/documentation/javadoc.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Javadoc" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="../images/favicon.ico" />
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/documentation/subversion-repository-layout.html b/www.freecol.org/documentation/subversion-repository-layout.html
index 527a4a49b..6bef6a5c9 100644
--- a/www.freecol.org/documentation/subversion-repository-layout.html
+++ b/www.freecol.org/documentation/subversion-repository-layout.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Subversion Repository Layout" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="../images/favicon.ico" />
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/documentation/subversion.html b/www.freecol.org/documentation/subversion.html
index 309c39743..e2b19aae7 100644
--- a/www.freecol.org/documentation/subversion.html
+++ b/www.freecol.org/documentation/subversion.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Subversion Usage" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="../images/favicon.ico" />
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/documentation/trackers-use.html b/www.freecol.org/documentation/trackers-use.html
index de78bd8f0..1346684ed 100644
--- a/www.freecol.org/documentation/trackers-use.html
+++ b/www.freecol.org/documentation/trackers-use.html
@@ -11,7 +11,7 @@
     <meta name="author" content="FreeCol Team"/>
     <meta name="description" content="FreeCol - a turn based strategy game"/>
     <meta name="keywords"
-          content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose"/>
+          content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose"/>
     <meta name="robots" content="index, follow"/>
     <link rel="shortcut icon" href="../images/favicon.ico"/>
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css"/>
diff --git a/www.freecol.org/download.html b/www.freecol.org/download.html
index 694354d15..68527a470 100644
--- a/www.freecol.org/download.html
+++ b/www.freecol.org/download.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Download" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/history.html b/www.freecol.org/history.html
index 76f33b590..e969cfde4 100644
--- a/www.freecol.org/history.html
+++ b/www.freecol.org/history.html
@@ -10,7 +10,7 @@
     <meta name="author" content="Stian Grenborgen"/>
     <meta name="description" content="FreeCol - a turn based strategy game"/>
     <meta name="keywords"
-          content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose"/>
+          content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose"/>
     <meta name="robots" content="index, follow"/>
     <link rel="shortcut icon" href="images/favicon.ico"/>
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css"/>
@@ -103,18 +103,18 @@
                 <table class="contentpaneopen">
                     <tr>
                         <td valign="top" colspan="2">
-                            <P align="justify">
+                            <p align="justify">
                                 <A name="about"></A>FreeCol evolved from a pure C/C++ project into a pure Java project.
                                 The first
                                 official release of FreeCol was, however, already using Java for the client.
-                                FreeCol has been fully Java based since early 2003.
+                                FreeCol has been fully Java-based since early 2003.
                                 <br/><br/>
                                 The game has been developed incrementally without any formal design document. Developers
                                 have been working on the features they have chosen for themselves, but major changes
                                 have been discussed on the mailing lists first. Naturally, the discussions on the
                                 mailing lists have been exceedingly important in order to coordinate our efforts in a
                                 common direction.
-                            </P>
+                            </p>
 
                             <br/>
 
@@ -130,7 +130,6 @@
                                 codebase for the second time. This time we are working towards making the game more
                                 modifiable.
                             </p>
-                            <br/>
 
                             <h3>Old Releases</h3>
                             <a href="history.html#freecol-0.1.0" class="cLink">FreeCol 0.1.0</a> - <em>Server written in
diff --git a/www.freecol.org/how-to-contribute.html b/www.freecol.org/how-to-contribute.html
index 306fdad3a..3606260b2 100644
--- a/www.freecol.org/how-to-contribute.html
+++ b/www.freecol.org/how-to-contribute.html
@@ -8,7 +8,7 @@
     <meta name="title" content="How to Contribute" />
     <meta name="author" content="The FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/index.html b/www.freecol.org/index.html
index 025ff5cd2..0be563f45 100644
--- a/www.freecol.org/index.html
+++ b/www.freecol.org/index.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Home</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
         <link rel="shortcut icon" href="images/favicon.ico" />
         <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/links/index.html b/www.freecol.org/links/index.html
index b537b06ef..b0616ab64 100644
--- a/www.freecol.org/links/index.html
+++ b/www.freecol.org/links/index.html
@@ -9,7 +9,7 @@
     <title>FreeCol - Web Links</title>
     <meta name="description" content="FreeCol - a turn based strategy game"/>
     <meta name="keywords"
-          content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose"/>
+          content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose"/>
     <meta name="robots" content="index, follow"/>
     <link rel="shortcut icon" href="../images/favicon.ico"/>
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css"/>
diff --git a/www.freecol.org/more-screenshots.html b/www.freecol.org/more-screenshots.html
index db019da93..7d7c35438 100644
--- a/www.freecol.org/more-screenshots.html
+++ b/www.freecol.org/more-screenshots.html
@@ -8,7 +8,7 @@
     <meta name="title" content="More Screenshots" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/news/2-more-screenshots-added.html b/www.freecol.org/news/2-more-screenshots-added.html
index 50fb40b3f..034c55f4d 100644
--- a/www.freecol.org/news/2-more-screenshots-added.html
+++ b/www.freecol.org/news/2-more-screenshots-added.html
@@ -8,7 +8,7 @@
     <meta name="title" content="2 More Screenshots Added" />
     <meta name="author" content="Administrator" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="../images/favicon.ico" />
     <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
@@ -57,35 +57,6 @@
                     </div>
                 </div>
             </div>
-            <div class="module">
-                <div>
-                    <div>
-                        <div>
-                            <h3>Syndicate</h3><div class="syndicate">
-                            <div align="center">
-                                <a href="../component/option,com_rss/feed,RSS0.91/no_html,1/">
-                                    <img src="../images/M_images/rss091.gif"  alt="RSS 0.91" name="RSS091" align="middle" border="0" /></a>
-                            </div>
-                            <div align="center">
-                                <a href="../component/option,com_rss/feed,RSS1.0/no_html,1/">
-                                    <img src="../images/M_images/rss10.gif"  alt="RSS 1.0" name="RSS10" align="middle" border="0" /></a>
-                            </div>
-                            <div align="center">
-                                <a href="../component/option,com_rss/feed,RSS2.0/no_html,1/">
-                                    <img src="../images/M_images/rss20.gif"  alt="RSS 2.0" name="RSS20" align="middle" border="0" /></a>
-                            </div>
-                            <div align="center">
-                                <a href="../component/option,com_rss/feed,ATOM0.3/no_html,1/">
-                                    <img src="../images/M_images/atom03.gif"  alt="ATOM 0.3" name="ATOM03" align="middle" border="0" /></a>
-                            </div>
-                            <div align="center">
-                                <a href="../component/option,com_rss/feed,OPML/no_html,1/">
-                                    <img src="../images/M_images/opml.png"  alt="OPML" name="OPML" align="middle" border="0" /></a>
-                            </div>
-                        </div>					</div>
-                    </div>
-                </div>
-            </div>
         </div>
         <div id="maincol-wide-800" >
             <div class="clr"></div>
diff --git a/www.freecol.org/news/Page-10.html b/www.freecol.org/news/Page-10.html
index 4da75baa7..837155b3e 100644
--- a/www.freecol.org/news/Page-10.html
+++ b/www.freecol.org/news/Page-10.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-11.html b/www.freecol.org/news/Page-11.html
index 7d905e3b0..13fe49725 100644
--- a/www.freecol.org/news/Page-11.html
+++ b/www.freecol.org/news/Page-11.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-12.html b/www.freecol.org/news/Page-12.html
index 1c170aa2f..adbc3c18f 100644
--- a/www.freecol.org/news/Page-12.html
+++ b/www.freecol.org/news/Page-12.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-13.html b/www.freecol.org/news/Page-13.html
index 0ff4d1e20..65d359089 100644
--- a/www.freecol.org/news/Page-13.html
+++ b/www.freecol.org/news/Page-13.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-2.html b/www.freecol.org/news/Page-2.html
index d81a5d140..8dc2f0f2a 100644
--- a/www.freecol.org/news/Page-2.html
+++ b/www.freecol.org/news/Page-2.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-3.html b/www.freecol.org/news/Page-3.html
index 55fcc3af1..9e9d2c773 100644
--- a/www.freecol.org/news/Page-3.html
+++ b/www.freecol.org/news/Page-3.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-4.html b/www.freecol.org/news/Page-4.html
index a0d6ad927..8bc394fa0 100644
--- a/www.freecol.org/news/Page-4.html
+++ b/www.freecol.org/news/Page-4.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-5.html b/www.freecol.org/news/Page-5.html
index e31da1f55..88806b0d9 100644
--- a/www.freecol.org/news/Page-5.html
+++ b/www.freecol.org/news/Page-5.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
         <link rel="shortcut icon" href="../images/favicon.ico" />
         <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/news/Page-6.html b/www.freecol.org/news/Page-6.html
index d74bebe5d..4db2a9867 100644
--- a/www.freecol.org/news/Page-6.html
+++ b/www.freecol.org/news/Page-6.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-7.html b/www.freecol.org/news/Page-7.html
index a6e9c5594..92a0ce006 100644
--- a/www.freecol.org/news/Page-7.html
+++ b/www.freecol.org/news/Page-7.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-8.html b/www.freecol.org/news/Page-8.html
index 9a2cb3f82..137ec31b8 100644
--- a/www.freecol.org/news/Page-8.html
+++ b/www.freecol.org/news/Page-8.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/Page-9.html b/www.freecol.org/news/Page-9.html
index f24ccc5ac..d903c6388 100644
--- a/www.freecol.org/news/Page-9.html
+++ b/www.freecol.org/news/Page-9.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - News</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/background-images-and-illustrations.html b/www.freecol.org/news/background-images-and-illustrations.html
index dae33dd4b..57f5175fd 100644
--- a/www.freecol.org/news/background-images-and-illustrations.html
+++ b/www.freecol.org/news/background-images-and-illustrations.html
@@ -1,162 +1,132 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-        <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
-        <title>FreeCol - Background images and illustrations</title>
-        <meta name="title" content="Background images and illustrations" />
-        <meta name="author" content="Stian Grenborgen" />
-        <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="robots" content="index, follow" />
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
+    <title>FreeCol - Background images and illustrations</title>
+    <meta name="title" content="Background images and illustrations" />
+    <meta name="author" content="Stian Grenborgen" />
+    <meta name="description" content="FreeCol - a turn based strategy game" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
+    <meta name="robots" content="index, follow" />
 
-        <link rel="shortcut icon" href="../images/favicon.ico" />
-        <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
-        <link href="../templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
-    </head>
-    <body>
+    <link rel="shortcut icon" href="../images/favicon.ico" />
+    <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
+    <link href="../templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
 
-        <div id="pagewidth-800" >
-            <div id="header" >
-                <div id="top-top">
-                    <div id="topmenu">
-                    </div>
-                </div>
-                <div class="clr"></div>
-                <div id="top-bottom">
-                    <a href="index.html"><img src="../templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
-                </div>
+<div id="pagewidth-800" >
+    <div id="header" >
+        <div id="top-top">
+            <div id="topmenu">
             </div>
-            <div id="outer-800" >
-                <div id="pathway">
-                    <span class="pathway"><a href="../index.html" class="pathway">Home</a> <img src="../images/M_images/arrow.png" alt="arrow" /> <a href="../news/" class="pathway">News</a> <img src="../images/M_images/arrow.png" alt="arrow" />   Background images and illustrations </span>
+        </div>
+        <div class="clr"></div>
+        <div id="top-bottom">
+            <a href="index.html"><img src="../templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
+        </div>
+    </div>
+    <div id="outer-800" >
+        <div id="pathway">
+            <span class="pathway"><a href="../index.html" class="pathway">Home</a> <img src="../images/M_images/arrow.png" alt="arrow" /> <a href="../news/" class="pathway">News</a> <img src="../images/M_images/arrow.png" alt="arrow" />   Background images and illustrations </span>
                     <span class="pathway-right">
                         <a href="../sitemap.html"><img src="../templates/freecol/images/sitemap.png" border="0" width="14" height="16" alt="SITEMAP" /></a>
 
                     </span>
-                </div>
-                <div id="leftcol">
-                    <a name="menu"></a>
-		<div class="module">
-			<div>
-				<div>
-					<div>
-						<h3>Main Menu</h3>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr align="left"><td><a href="../index.html" class="mainlevel" >Home</a></td></tr>
-<tr align="left"><td><a href="../news/" class="mainlevel" id="active_menu">News</a>
+        </div>
+        <div id="leftcol">
+            <a name="menu"></a>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Main Menu</h3>
+                            <table width="100%" border="0" cellpadding="0" cellspacing="0">
+                                <tr align="left"><td><a href="../index.html" class="mainlevel" >Home</a></td></tr>
+                                <tr align="left"><td><a href="../news/" class="mainlevel" id="active_menu">News</a>
 
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/releases.html" class="sublevel" >Releases</a></div>
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/development.html" class="sublevel" >Development</a></div>
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/other.html" class="sublevel" >Other</a></div>
-</td></tr>
-<tr align="left"><td><a href="../about.html" class="mainlevel" >About FreeCol</a></td></tr>
-<tr align="left"><td><a href="../documentation/" class="mainlevel" >Documentation</a></td></tr>
-<tr align="left"><td><a href="../screenshots.html" class="mainlevel" >Screenshots</a></td></tr>
-<tr align="left"><td><a href="../download.html" class="mainlevel" >Download</a></td></tr>
-<tr align="left"><td><a href="../community.html" class="mainlevel" >Community</a></td></tr>
-</table>					</div>
-				</div>
-			</div>
-		</div>
-				<div class="module">
-			<div>
-				<div>
-					<div>
-						<h3>Syndicate</h3><div class="syndicate">
-			<div align="center">
-			<a href="../component/option,com_rss/feed,RSS0.91/no_html,1/">
-				<img src="../images/M_images/rss091.gif"  alt="RSS 0.91" name="RSS091" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,RSS1.0/no_html,1/">
-				<img src="../images/M_images/rss10.gif"  alt="RSS 1.0" name="RSS10" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,RSS2.0/no_html,1/">
-				<img src="../images/M_images/rss20.gif"  alt="RSS 2.0" name="RSS20" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,ATOM0.3/no_html,1/">
-				<img src="../images/M_images/atom03.gif"  alt="ATOM 0.3" name="ATOM03" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,OPML/no_html,1/">
-				<img src="../images/M_images/opml.png"  alt="OPML" name="OPML" align="middle" border="0" /></a>
-		</div>
-		</div>					</div>
-				</div>
-			</div>
-		</div>
-		                </div>
-                <div id="maincol-wide-800" >
-                    <div class="clr"></div>
-                    <div class="content">
-                        <a name="content"></a>
-                                				<table class="contentpaneopen">
-			<tr>
-								<td class="contentheading" width="100%">
-					Background images and illustrations									</td>
-								<td align="right" width="100%" class="buttonheading">
-					<a href="../index2.php?option=com_content&amp;task=view&amp;id=47&amp;pop=1&amp;page=0&amp;Itemid=39" target="_blank" onclick="window.open('../index2.php?option=com_content&amp;task=view&amp;id=47&amp;pop=1&amp;page=0&amp;Itemid=39','win2','status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no'); return false;" title="Print">
-						<img src="../images/M_images/printButton.png"  alt="Print" name="Print" align="middle" border="0" /></a>
-				</td>
-							</tr>
-			</table>
-			
-		<table class="contentpaneopen">
-					<tr>
-				<td valign="top" colspan="2" class="createdate">
-					Friday, 20 February 2004				</td>
-			</tr>
-					<tr>
-			<td valign="top" colspan="2">
-				            We have got permission to use graphics from the
-            <A class=cLink href="http://www.davidrumsey.com">David
-Rumsey Map Collection</A>.
-            This collection has over 8,800 maps on-line. Many of these
-maps contains
-            illustrations we may later use in the game.
-
-			</td>
-		</tr>
-				</table>
-
-		<span class="article_seperator">&nbsp;</span>
-
-					<table align="center" style="margin-top: 25px;">
-			<tr>
-									<th class="pagenav_prev">
-						<a href="../news/current-progress.html">
-							&lt; Prev</a>
-					</th>
-										<td width="50">&nbsp;
-
-					</td>
-										<th class="pagenav_next">
-						<a href="../news/status-update.html">
-							Next &gt;</a>
-					</th>
-								</tr>
-			</table>
-						<div class="back_button">
-				<a href='javascript:history.go(-1)'>
-					[ Back ]</a>
-			</div>
-			                    </div>
-                </div>
-                <div class="clr"></div>
-            </div>
-            <div id="sflogo">
-                <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
-            </div>
-            <div id="footer-800" >
-                <div align="center" class="footer-copyright">
-                    &copy; 2002-2015 FreeCol - <a href="../contact.html">Contact Us</a>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/releases.html" class="sublevel" >Releases</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/development.html" class="sublevel" >Development</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/other.html" class="sublevel" >Other</a></div>
+                                </td></tr>
+                                <tr align="left"><td><a href="../about.html" class="mainlevel" >About FreeCol</a></td></tr>
+                                <tr align="left"><td><a href="../documentation/" class="mainlevel" >Documentation</a></td></tr>
+                                <tr align="left"><td><a href="../screenshots.html" class="mainlevel" >Screenshots</a></td></tr>
+                                <tr align="left"><td><a href="../download.html" class="mainlevel" >Download</a></td></tr>
+                                <tr align="left"><td><a href="../community.html" class="mainlevel" >Community</a></td></tr>
+                            </table>					</div>
+                    </div>
                 </div>
             </div>
         </div>
-    </body>
+        <div id="maincol-wide-800" >
+            <div class="clr"></div>
+            <div class="content">
+                <a name="content"></a>
+                <table class="contentpaneopen">
+                    <tr>
+                        <td class="contentheading" width="100%">
+                            Background images and illustrations									</td>
+                        <td align="right" width="100%" class="buttonheading">
+                            <a href="../index2.php?option=com_content&amp;task=view&amp;id=47&amp;pop=1&amp;page=0&amp;Itemid=39" target="_blank" onclick="window.open('../index2.php?option=com_content&amp;task=view&amp;id=47&amp;pop=1&amp;page=0&amp;Itemid=39','win2','status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no'); return false;" title="Print">
+                                <img src="../images/M_images/printButton.png"  alt="Print" name="Print" align="middle" border="0" /></a>
+                        </td>
+                    </tr>
+                </table>
+
+                <table class="contentpaneopen">
+                    <tr>
+                        <td valign="top" colspan="2" class="createdate">
+                            Friday, 20 February 2004				</td>
+                    </tr>
+                    <tr>
+                        <td valign="top" colspan="2">
+                            We have got permission to use graphics from the
+                            <A class=cLink href="http://www.davidrumsey.com">David
+                                Rumsey Map Collection</A>.
+                            This collection has over 8,800 maps on-line. Many of these
+                            maps contains
+                            illustrations we may later use in the game.
+
+                        </td>
+                    </tr>
+                </table>
+
+                <span class="article_seperator">&nbsp;</span>
+
+                <table align="center" style="margin-top: 25px;">
+                    <tr>
+                        <th class="pagenav_prev">
+                            <a href="../news/current-progress.html">
+                                &lt; Prev</a>
+                        </th>
+                        <td width="50">&nbsp;
+
+                        </td>
+                        <th class="pagenav_next">
+                            <a href="../news/status-update.html">
+                                Next &gt;</a>
+                        </th>
+                    </tr>
+                </table>
+                <div class="back_button">
+                    <a href='javascript:history.go(-1)'>
+                        [ Back ]</a>
+                </div>
+            </div>
+        </div>
+        <div class="clr"></div>
+    </div>
+    <div id="sflogo">
+        <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
+    </div>
+    <div id="footer-800" >
+        <div align="center" class="footer-copyright">
+            &copy; 2002-2015 FreeCol - <a href="../contact.html">Contact Us</a>
+        </div>
+    </div>
+</div>
+</body>
 </html>
-<!-- 1419163621 -->
diff --git a/www.freecol.org/news/current-progress.html b/www.freecol.org/news/current-progress.html
index 23c6aa30e..febc4e245 100644
--- a/www.freecol.org/news/current-progress.html
+++ b/www.freecol.org/news/current-progress.html
@@ -8,7 +8,7 @@
         <meta name="title" content="Current progress" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/development.html b/www.freecol.org/news/development.html
index 49b5ddb6f..9cf4fbc55 100644
--- a/www.freecol.org/news/development.html
+++ b/www.freecol.org/news/development.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Development</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/development/Page-2.html b/www.freecol.org/news/development/Page-2.html
index e059df6fd..d9edfa563 100644
--- a/www.freecol.org/news/development/Page-2.html
+++ b/www.freecol.org/news/development/Page-2.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Development</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
         <link rel="shortcut icon" href="../../images/favicon.ico" />
         <link href="../../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/news/development/Page-3.html b/www.freecol.org/news/development/Page-3.html
index dbe5c3e3a..1f64e6aa6 100644
--- a/www.freecol.org/news/development/Page-3.html
+++ b/www.freecol.org/news/development/Page-3.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Development</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
         <link rel="shortcut icon" href="../../images/favicon.ico" />
         <link href="../../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/news/donations.html b/www.freecol.org/news/donations.html
index 6d9322a9b..9cb169a29 100644
--- a/www.freecol.org/news/donations.html
+++ b/www.freecol.org/news/donations.html
@@ -8,7 +8,7 @@
         <meta name="title" content="Donations" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.1.0-released.html b/www.freecol.org/news/freecol-0.1.0-released.html
index 78e22f8ac..c9b8e5fc9 100644
--- a/www.freecol.org/news/freecol-0.1.0-released.html
+++ b/www.freecol.org/news/freecol-0.1.0-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.1.0 Released" />
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.0-alpha-released.html b/www.freecol.org/news/freecol-0.10.0-alpha-released.html
index 432d7f051..a118f2aa0 100644
--- a/www.freecol.org/news/freecol-0.10.0-alpha-released.html
+++ b/www.freecol.org/news/freecol-0.10.0-alpha-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.10.0-alpha released" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.0-alpha2-released.html b/www.freecol.org/news/freecol-0.10.0-alpha2-released.html
index 0ed45af8a..36d4e043a 100644
--- a/www.freecol.org/news/freecol-0.10.0-alpha2-released.html
+++ b/www.freecol.org/news/freecol-0.10.0-alpha2-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.10.0-alpha2 released" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.0-released.html b/www.freecol.org/news/freecol-0.10.0-released.html
index 473705531..7dff34215 100644
--- a/www.freecol.org/news/freecol-0.10.0-released.html
+++ b/www.freecol.org/news/freecol-0.10.0-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.10.0 released" />
         <meta name="author" content="Doruk Fisek" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.1-released.html b/www.freecol.org/news/freecol-0.10.1-released.html
index 5aa1dd6b1..64bc38e83 100644
--- a/www.freecol.org/news/freecol-0.10.1-released.html
+++ b/www.freecol.org/news/freecol-0.10.1-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.10.1 released" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.2-released.html b/www.freecol.org/news/freecol-0.10.2-released.html
index 45c608711..f5739dfb6 100644
--- a/www.freecol.org/news/freecol-0.10.2-released.html
+++ b/www.freecol.org/news/freecol-0.10.2-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.10.2 released" />
         <meta name="author" content="Doruk Fisek" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.3-released.html b/www.freecol.org/news/freecol-0.10.3-released.html
index 6e685f69a..af6392764 100644
--- a/www.freecol.org/news/freecol-0.10.3-released.html
+++ b/www.freecol.org/news/freecol-0.10.3-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.10.3 released" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.4-released.html b/www.freecol.org/news/freecol-0.10.4-released.html
index b2333cc13..d6daad930 100644
--- a/www.freecol.org/news/freecol-0.10.4-released.html
+++ b/www.freecol.org/news/freecol-0.10.4-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.10.4 released" />
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.5-released.html b/www.freecol.org/news/freecol-0.10.5-released.html
index 66d903e57..2b2fe5efd 100644
--- a/www.freecol.org/news/freecol-0.10.5-released.html
+++ b/www.freecol.org/news/freecol-0.10.5-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.10.5 released" />
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.6-released.html b/www.freecol.org/news/freecol-0.10.6-released.html
index e8f7790c4..04d832f63 100644
--- a/www.freecol.org/news/freecol-0.10.6-released.html
+++ b/www.freecol.org/news/freecol-0.10.6-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.10.6 released" />
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.10.7-released.html b/www.freecol.org/news/freecol-0.10.7-released.html
index 2a0df5c07..9eca96523 100644
--- a/www.freecol.org/news/freecol-0.10.7-released.html
+++ b/www.freecol.org/news/freecol-0.10.7-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.10.7 released" />
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.11.0-released.html b/www.freecol.org/news/freecol-0.11.0-released.html
index 82e80c36e..c1bed44d0 100644
--- a/www.freecol.org/news/freecol-0.11.0-released.html
+++ b/www.freecol.org/news/freecol-0.11.0-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.11.0 released" />
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.11.1-released.html b/www.freecol.org/news/freecol-0.11.1-released.html
index 6301f7dc0..9ae2a8c26 100644
--- a/www.freecol.org/news/freecol-0.11.1-released.html
+++ b/www.freecol.org/news/freecol-0.11.1-released.html
@@ -1,150 +1,159 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-        <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
-        <title>FreeCol - FreeCol 0.11.1 released</title>
-        <meta name="title" content="FreeCol 0.11.1 released" />
-        <meta name="author" content="Mike Pope" />
-        <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="robots" content="index, follow" />
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
+    <title>FreeCol - FreeCol 0.11.1 released</title>
+    <meta name="title" content="FreeCol 0.11.1 released" />
+    <meta name="author" content="Mike Pope" />
+    <meta name="description" content="FreeCol - a turn based strategy game" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
+    <meta name="robots" content="index, follow" />
 
-        <link rel="shortcut icon" href="../images/favicon.ico" />
-        <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
-        <link href="../templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
-    </head>
-    <body>
+    <link rel="shortcut icon" href="../images/favicon.ico" />
+    <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
+    <link href="../templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
 
-        <div id="pagewidth-800" >
-            <div id="header" >
-                <div id="top-top">
-                    <div id="topmenu">
-                    </div>
-                </div>
-                <div class="clr"></div>
-                <div id="top-bottom">
-                    <a href="index.html"><img src="../templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
-                </div>
+<div id="pagewidth-800" >
+    <div id="header" >
+        <div id="top-top">
+            <div id="topmenu">
             </div>
-            <div id="outer-800" >
-                <div id="pathway">
-                    <span class="pathway"><a href="../index.html" class="pathway">Home</a> <img src="../images/M_images/arrow.png" alt="arrow" /> <a href="../news/" class="pathway">News</a> <img src="../images/M_images/arrow.png" alt="arrow" />   FreeCol 0.11.1 released </span>
+        </div>
+        <div class="clr"></div>
+        <div id="top-bottom">
+            <a href="index.html"><img src="../templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
+        </div>
+    </div>
+    <div id="outer-800" >
+        <div id="pathway">
+            <span class="pathway"><a href="../index.html" class="pathway">Home</a> <img src="../images/M_images/arrow.png" alt="arrow" /> <a href="../news/" class="pathway">News</a> <img src="../images/M_images/arrow.png" alt="arrow" />   FreeCol 0.11.1 released </span>
                     <span class="pathway-right">
                         <a href="../sitemap.html"><img src="../templates/freecol/images/sitemap.png" border="0" width="14" height="16" alt="SITEMAP" /></a>
 
                     </span>
+        </div>
+        <div id="leftcol">
+            <a name="menu"></a>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Main Menu</h3>
+                            <table width="100%" border="0" cellpadding="0" cellspacing="0">
+                                <tr align="left"><td><a href="../index.html" class="mainlevel" >Home</a></td></tr>
+                                <tr align="left"><td><a href="../news/" class="mainlevel" id="active_menu">News</a>
+
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/releases.html" class="sublevel" >Releases</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/development.html" class="sublevel" >Development</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/other.html" class="sublevel" >Other</a></div>
+                                </td></tr>
+                                <tr align="left"><td><a href="../about.html" class="mainlevel" >About FreeCol</a></td></tr>
+                                <tr align="left"><td><a href="../documentation/" class="mainlevel" >Documentation</a></td></tr>
+                                <tr align="left"><td><a href="../screenshots.html" class="mainlevel" >Screenshots</a></td></tr>
+                                <tr align="left"><td><a href="../download.html" class="mainlevel" >Download</a></td></tr>
+                                <tr align="left"><td><a href="../community.html" class="mainlevel" >Community</a></td></tr>
+                            </table>					</div>
+                    </div>
                 </div>
-                <div id="leftcol">
-                    <a name="menu"></a>
-		<div class="module">
-			<div>
-				<div>
-					<div>
-						<h3>Main Menu</h3>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr align="left"><td><a href="../index.html" class="mainlevel" >Home</a></td></tr>
-<tr align="left"><td><a href="../news/" class="mainlevel" id="active_menu">News</a>
-
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/releases.html" class="sublevel" >Releases</a></div>
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/development.html" class="sublevel" >Development</a></div>
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/other.html" class="sublevel" >Other</a></div>
-</td></tr>
-<tr align="left"><td><a href="../about.html" class="mainlevel" >About FreeCol</a></td></tr>
-<tr align="left"><td><a href="../documentation/" class="mainlevel" >Documentation</a></td></tr>
-<tr align="left"><td><a href="../screenshots.html" class="mainlevel" >Screenshots</a></td></tr>
-<tr align="left"><td><a href="../download.html" class="mainlevel" >Download</a></td></tr>
-<tr align="left"><td><a href="../community.html" class="mainlevel" >Community</a></td></tr>
-</table>					</div>
-				</div>
-			</div>
-		</div>
-				<div class="module">
-			<div>
-				<div>
-					<div>
-						<h3>Syndicate</h3><div class="syndicate">
-			<div align="center">
-			<a href="../component/option,com_rss/feed,RSS0.91/no_html,1/">
-				<img src="../images/M_images/rss091.gif"  alt="RSS 0.91" name="RSS091" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,RSS1.0/no_html,1/">
-				<img src="../images/M_images/rss10.gif"  alt="RSS 1.0" name="RSS10" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,RSS2.0/no_html,1/">
-				<img src="../images/M_images/rss20.gif"  alt="RSS 2.0" name="RSS20" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,ATOM0.3/no_html,1/">
-				<img src="../images/M_images/atom03.gif"  alt="ATOM 0.3" name="ATOM03" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,OPML/no_html,1/">
-				<img src="../images/M_images/opml.png"  alt="OPML" name="OPML" align="middle" border="0" /></a>
-		</div>
-		</div>					</div>
-				</div>
-			</div>
-		</div>
-		                </div>
-                <div id="maincol-wide-800" >
-                    <div class="clr"></div>
-                    <div class="content">
-                        <a name="content"></a>
-                                				<table class="contentpaneopen">
-			<tr>
-								<td class="contentheading" width="100%">
-					FreeCol 0.11.1 released									</td>
-								<td align="right" width="100%" class="buttonheading">
-					<a href="../index2.php?option=com_content&amp;task=view&amp;id=125&amp;pop=1&amp;page=0&amp;Itemid=39" target="_blank" onclick="window.open('../index2.php?option=com_content&amp;task=view&amp;id=125&amp;pop=1&amp;page=0&amp;Itemid=39','win2','status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no'); return false;" title="Print">
-						<img src="../images/M_images/printButton.png"  alt="Print" name="Print" align="middle" border="0" /></a>
-				</td>
-							</tr>
-			</table>
-			
-		<table class="contentpaneopen">
-					<tr>
-				<td valign="top" colspan="2" class="createdate">
-					Sunday, 16 November 2014				</td>
-			</tr>
-					<tr>
-			<td valign="top" colspan="2">
-				<div align="left">FreeCol 0.11.1</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are sort-of pleased to announce the release of FreeCol 0.11.1.&nbsp; This is a bug fix release to clean up some annoying problems in version 0.11.0. All 0.10.x and 0.11.0 games should continue to work with 0.11.1.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.1.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="../download.html">Download FreeCol 0.11.1</a></em></strong>                         </td>                     </tr>                 </tbody></table>
-
-			</td>
-		</tr>
-				</table>
-
-		<span class="article_seperator">&nbsp;</span>
-
-					<table align="center" style="margin-top: 25px;">
-			<tr>
-									<th class="pagenav_next">
-						<a href="../news/freecol-0.11.0-released.html">
-							Next &gt;</a>
-					</th>
-								</tr>
-			</table>
-						<div class="back_button">
-				<a href='javascript:history.go(-1)'>
-					[ Back ]</a>
-			</div>
-			                    </div>
-                </div>
-                <div class="clr"></div>
             </div>
-            <div id="sflogo">
-                <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
-            </div>
-            <div id="footer-800" >
-                <div align="center" class="footer-copyright">
-                    &copy; 2002-2015 FreeCol - <a href="../contact.html">Contact Us</a>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Syndicate</h3><div class="syndicate">
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS0.91/no_html,1/">
+                                    <img src="../images/M_images/rss091.gif"  alt="RSS 0.91" name="RSS091" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS1.0/no_html,1/">
+                                    <img src="../images/M_images/rss10.gif"  alt="RSS 1.0" name="RSS10" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS2.0/no_html,1/">
+                                    <img src="../images/M_images/rss20.gif"  alt="RSS 2.0" name="RSS20" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,ATOM0.3/no_html,1/">
+                                    <img src="../images/M_images/atom03.gif"  alt="ATOM 0.3" name="ATOM03" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,OPML/no_html,1/">
+                                    <img src="../images/M_images/opml.png"  alt="OPML" name="OPML" align="middle" border="0" /></a>
+                            </div>
+                        </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-    </body>
+        <div id="maincol-wide-800" >
+            <div class="clr"></div>
+            <div class="content">
+                <a name="content"></a>
+                <table class="contentpaneopen">
+                    <tr>
+                        <td class="contentheading" width="100%">
+                            FreeCol 0.11.1 released</td>
+                        <td align="right" width="100%" class="buttonheading">
+                            <a href="../index2.php?option=com_content&amp;task=view&amp;id=125&amp;pop=1&amp;page=0&amp;Itemid=39" target="_blank" onclick="window.open('../index2.php?option=com_content&amp;task=view&amp;id=125&amp;pop=1&amp;page=0&amp;Itemid=39','win2','status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no'); return false;" title="Print">
+                                <img src="../images/M_images/printButton.png"  alt="Print" name="Print" align="middle" border="0" /></a>
+                        </td>
+                    </tr>
+                </table>
+
+                <table class="contentpaneopen">
+                    <tr>
+                        <td valign="top" colspan="2" class="createdate">
+                            Sunday, 16 November 2014</td>
+                    </tr>
+                    <tr>
+                        <td valign="top" colspan="2">
+                            <div align="left">FreeCol 0.11.1</div>
+                            <div align="left">&nbsp;</div>
+                            <div align="left">The FreeCol team are sort-of pleased to announce the release of FreeCol 0.11.1.
+                                This is a bug fix release to clean up some annoying problems in version 0.11.0.
+                                All 0.10.x and 0.11.0 games should continue to work with 0.11.1.</div>
+                            <div align="left">&nbsp;</div>
+                            <div align="left">For more information about this release, please consult the
+                                <a href="" target="_blank" title="FreeCol Release Notes">Release Notes</a>.</div>
+                            <div align="left">We hope you enjoy FreeCol 0.11.1. Onward to 1.0.<br /><br />
+                                The FreeCol Team</div>
+                        </td>
+                    </tr>
+                </table>
+
+                <span class="article_seperator">&nbsp;</span>
+
+                <table align="center" style="margin-top: 25px;">
+                    <tr>
+                        <th class="pagenav_next">
+                            <a href="../news/freecol-0.11.0-released.html">
+                                Next &gt;</a>
+                        </th>
+                    </tr>
+                </table>
+                <div class="back_button">
+                    <a href='javascript:history.go(-1)'>
+                        [ Back ]</a>
+                </div>
+            </div>
+        </div>
+        <div class="clr"></div>
+    </div>
+    <div id="sflogo">
+        <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
+    </div>
+    <div id="footer-800" >
+        <div align="center" class="footer-copyright">
+            &copy; 2002-2015 FreeCol - <a href="../contact.html">Contact Us</a>
+        </div>
+    </div>
+</div>
+</body>
 </html>
 <!-- 1419163600 -->
diff --git a/www.freecol.org/news/freecol-0.11.2-released.html b/www.freecol.org/news/freecol-0.11.2-released.html
index 521a09607..e950ed75e 100644
--- a/www.freecol.org/news/freecol-0.11.2-released.html
+++ b/www.freecol.org/news/freecol-0.11.2-released.html
@@ -1,148 +1,152 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-        <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
-        <title>FreeCol - FreeCol 0.11.2 released</title>
-        <meta name="title" content="FreeCol 0.11.2 released" />
-        <meta name="author" content="Mike Pope" />
-        <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="robots" content="index, follow" />
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
+    <title>FreeCol - FreeCol 0.11.2 released</title>
+    <meta name="title" content="FreeCol 0.11.2 released" />
+    <meta name="author" content="Mike Pope" />
+    <meta name="description" content="FreeCol - a turn based strategy game" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
+    <meta name="robots" content="index, follow" />
 
-        <link rel="shortcut icon" href="../images/favicon.ico" />
-        <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
-        <link href="../templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
-    </head>
-    <body>
+    <link rel="shortcut icon" href="../images/favicon.ico" />
+    <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
+    <link href="../templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
 
-        <div id="pagewidth-800" >
-            <div id="header" >
-                <div id="top-top">
-                    <div id="topmenu">
-                    </div>
-                </div>
-                <div class="clr"></div>
-                <div id="top-bottom">
-                    <a href="index.html"><img src="../templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
-                </div>
+<div id="pagewidth-800" >
+    <div id="header" >
+        <div id="top-top">
+            <div id="topmenu">
             </div>
-            <div id="outer-800" >
-                <div id="pathway">
-                    <span class="pathway"><a href="../index.html" class="pathway">Home</a> <img src="../images/M_images/arrow.png" alt="arrow" /> <a href="../news/" class="pathway">News</a> <img src="../images/M_images/arrow.png" alt="arrow" />   FreeCol 0.11.2 released </span>
+        </div>
+        <div class="clr"></div>
+        <div id="top-bottom">
+            <a href="index.html"><img src="../templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
+        </div>
+    </div>
+    <div id="outer-800" >
+        <div id="pathway">
+            <span class="pathway"><a href="../index.html" class="pathway">Home</a> <img src="../images/M_images/arrow.png" alt="arrow" /> <a href="../news/" class="pathway">News</a> <img src="../images/M_images/arrow.png" alt="arrow" />   FreeCol 0.11.2 released </span>
                     <span class="pathway-right">
                         <a href="../sitemap.html"><img src="../templates/freecol/images/sitemap.png" border="0" width="14" height="16" alt="SITEMAP" /></a>
-
                     </span>
+        </div>
+        <div id="leftcol">
+            <a name="menu"></a>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Main Menu</h3>
+                            <table width="100%" border="0" cellpadding="0" cellspacing="0">
+                                <tr align="left"><td><a href="../index.html" class="mainlevel" >Home</a></td></tr>
+                                <tr align="left"><td><a href="../news/" class="mainlevel" id="active_menu">News</a>
+
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/releases.html" class="sublevel" >Releases</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/development.html" class="sublevel" >Development</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/other.html" class="sublevel" >Other</a></div>
+                                </td></tr>
+                                <tr align="left"><td><a href="../about.html" class="mainlevel" >About FreeCol</a></td></tr>
+                                <tr align="left"><td><a href="../documentation/" class="mainlevel" >Documentation</a></td></tr>
+                                <tr align="left"><td><a href="../screenshots.html" class="mainlevel" >Screenshots</a></td></tr>
+                                <tr align="left"><td><a href="../download.html" class="mainlevel" >Download</a></td></tr>
+                                <tr align="left"><td><a href="../community.html" class="mainlevel" >Community</a></td></tr>
+                            </table>
+                        </div>
+                    </div>
                 </div>
-                <div id="leftcol">
-                    <a name="menu"></a>
-		<div class="module">
-			<div>
-				<div>
-					<div>
-						<h3>Main Menu</h3>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr align="left"><td><a href="../index.html" class="mainlevel" >Home</a></td></tr>
-<tr align="left"><td><a href="../news/" class="mainlevel" id="active_menu">News</a>
-
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/releases.html" class="sublevel" >Releases</a></div>
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/development.html" class="sublevel" >Development</a></div>
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/other.html" class="sublevel" >Other</a></div>
-</td></tr>
-<tr align="left"><td><a href="../about.html" class="mainlevel" >About FreeCol</a></td></tr>
-<tr align="left"><td><a href="../documentation/" class="mainlevel" >Documentation</a></td></tr>
-<tr align="left"><td><a href="../screenshots.html" class="mainlevel" >Screenshots</a></td></tr>
-<tr align="left"><td><a href="../download.html" class="mainlevel" >Download</a></td></tr>
-<tr align="left"><td><a href="../community.html" class="mainlevel" >Community</a></td></tr>
-</table>					</div>
-				</div>
-			</div>
-		</div>
-				<div class="module">
-			<div>
-				<div>
-					<div>
-						<h3>Syndicate</h3><div class="syndicate">
-			<div align="center">
-			<a href="../component/option,com_rss/feed,RSS0.91/no_html,1/">
-				<img src="../images/M_images/rss091.gif"  alt="RSS 0.91" name="RSS091" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,RSS1.0/no_html,1/">
-				<img src="../images/M_images/rss10.gif"  alt="RSS 1.0" name="RSS10" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,RSS2.0/no_html,1/">
-				<img src="../images/M_images/rss20.gif"  alt="RSS 2.0" name="RSS20" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,ATOM0.3/no_html,1/">
-				<img src="../images/M_images/atom03.gif"  alt="ATOM 0.3" name="ATOM03" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,OPML/no_html,1/">
-				<img src="../images/M_images/opml.png"  alt="OPML" name="OPML" align="middle" border="0" /></a>
-		</div>
-		</div>					</div>
-				</div>
-			</div>
-		</div>
-		                </div>
-                <div id="maincol-wide-800" >
-                    <div class="clr"></div>
-                    <div class="content">
-                        <a name="content"></a>
-                                				<table class="contentpaneopen">
-			<tr>
-								<td class="contentheading" width="100%">
-					FreeCol 0.11.2 released									</td>
-								<td align="right" width="100%" class="buttonheading">
-					<a href="../index2.php?option=com_content&amp;task=view&amp;id=125&amp;pop=1&amp;page=0&amp;Itemid=39" target="_blank" onclick="window.open('../index2.php?option=com_content&amp;task=view&amp;id=125&amp;pop=1&amp;page=0&amp;Itemid=39','win2','status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no'); return false;" title="Print">
-						<img src="../images/M_images/printButton.png"  alt="Print" name="Print" align="middle" border="0" /></a>
-				</td>
-							</tr>
-			</table>
-			
-		<table class="contentpaneopen">
-					<tr>
-				<td valign="top" colspan="2" class="createdate">
-					Sunday, 4 January 2015				</td>
-			</tr>
-					<tr>
-			<td valign="top" colspan="2">
-				<div align="left">FreeCol 0.11.2</div><div align="left">&nbsp;</div><div align="left">The FreeCol team are mostly pleased to announce the release of FreeCol 0.11.2.  This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1. See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.2%20Release%20Notes/" title="release notes">release notes</a> for more detail. All 0.10.x and 0.11.x games should continue to work with 0.11.2.<br /></div>&nbsp;<div align="left">We hope you enjoy FreeCol 0.11.2.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div> <table border="0">                     <tbody><tr>                         <td>                             <a href="../download.html"><img src="images/download2.png" border="0" alt="" /></a>                          </td>                         <td>                             <strong><em><a href="../download.html">Download FreeCol 0.11.2</a></em></strong>                         </td>                     </tr>                 </tbody></table>			</td>
-		</tr>
-				</table>
-
-		<span class="article_seperator">&nbsp;</span>
-
-					<table align="center" style="margin-top: 25px;">
-			<tr>
-									<th class="pagenav_next">
-						<a href="../news/freecol-0.11.1-released.html">
-							Next &gt;</a>
-					</th>
-								</tr>
-			</table>
-						<div class="back_button">
-				<a href='javascript:history.go(-1)'>
-					[ Back ]</a>
-			</div>
-			                    </div>
-                </div>
-                <div class="clr"></div>
             </div>
-            <div id="sflogo">
-                <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
-            </div>
-            <div id="footer-800" >
-                <div align="center" class="footer-copyright">
-                    &copy; 2002-2015 FreeCol - <a href="../contact.html">Contact Us</a>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Syndicate</h3><div class="syndicate">
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS0.91/no_html,1/">
+                                    <img src="../images/M_images/rss091.gif"  alt="RSS 0.91" name="RSS091" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS1.0/no_html,1/">
+                                    <img src="../images/M_images/rss10.gif"  alt="RSS 1.0" name="RSS10" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS2.0/no_html,1/">
+                                    <img src="../images/M_images/rss20.gif"  alt="RSS 2.0" name="RSS20" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,ATOM0.3/no_html,1/">
+                                    <img src="../images/M_images/atom03.gif"  alt="ATOM 0.3" name="ATOM03" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,OPML/no_html,1/">
+                                    <img src="../images/M_images/opml.png"  alt="OPML" name="OPML" align="middle" border="0" /></a>
+                            </div>
+                        </div>					</div>
+                    </div>
                 </div>
             </div>
         </div>
-    </body>
+        <div id="maincol-wide-800" >
+            <div class="clr"></div>
+            <div class="content">
+                <a name="content"></a>
+                <table class="contentpaneopen">
+                    <tr>
+                        <td class="contentheading" width="100%">
+                            FreeCol 0.11.2 released									</td>
+                        <td align="right" width="100%" class="buttonheading">
+                            <a href="../index2.php?option=com_content&amp;task=view&amp;id=125&amp;pop=1&amp;page=0&amp;Itemid=39" target="_blank" onclick="window.open('../index2.php?option=com_content&amp;task=view&amp;id=125&amp;pop=1&amp;page=0&amp;Itemid=39','win2','status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no'); return false;" title="Print">
+                                <img src="../images/M_images/printButton.png"  alt="Print" name="Print" align="middle" border="0" /></a>
+                        </td>
+                    </tr>
+                </table>
+
+                <table class="contentpaneopen">
+                    <tr>
+                        <td valign="top" colspan="2" class="createdate">
+                            Sunday, 4 January 2015				</td>
+                    </tr>
+                    <tr>
+                        <td valign="top" colspan="2">
+                            <div align="left">FreeCol 0.11.2</div>
+                            <div align="left">&nbsp;</div>
+                            <div align="left">The FreeCol team are mostly pleased to announce the release of FreeCol 0.11.2.
+                                This is a bug fix release to clean up yet more annoying problems in version 0.11.0/1.
+                                See the <a href="https://sourceforge.net/p/freecol/wiki/0.11.2%20Release%20Notes/" title="release notes">release notes</a> for more detail.
+                                All 0.10.x and 0.11.x games should continue to work with 0.11.2.<br /></div>
+                    </tr>
+                </table>
+
+                <span class="article_seperator">&nbsp;</span>
+
+                <table align="center" style="margin-top: 25px;">
+                    <tr>
+                        <th class="pagenav_next">
+                            <a href="../news/freecol-0.11.1-released.html">
+                                Next &gt;</a>
+                        </th>
+                    </tr>
+                </table>
+                <div class="back_button">
+                    <a href='javascript:history.go(-1)'>
+                        [ Back ]</a>
+                </div>
+            </div>
+        </div>
+        <div class="clr"></div>
+    </div>
+    <div id="sflogo">
+        <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
+    </div>
+    <div id="footer-800" >
+        <div align="center" class="footer-copyright">
+            &copy; 2002-2015 FreeCol - <a href="../contact.html">Contact Us</a>
+        </div>
+    </div>
+</div>
+</body>
 </html>
-<!-- 1419163600 -->
diff --git a/www.freecol.org/news/freecol-0.11.3-released.html b/www.freecol.org/news/freecol-0.11.3-released.html
index 6a9109737..a4ebb8596 100644
--- a/www.freecol.org/news/freecol-0.11.3-released.html
+++ b/www.freecol.org/news/freecol-0.11.3-released.html
@@ -1,158 +1,157 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-        <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
-        <title>FreeCol - FreeCol 0.11.3 released</title>
-        <meta name="title" content="FreeCol 0.11.3 released" />
-        <meta name="author" content="Mike Pope" />
-        <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
-        <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
-        <meta name="robots" content="index, follow" />
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
+    <title>FreeCol - FreeCol 0.11.3 released</title>
+    <meta name="title" content="FreeCol 0.11.3 released" />
+    <meta name="author" content="Mike Pope" />
+    <meta name="description" content="FreeCol - a turn based strategy game" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
+    <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
+    <meta name="robots" content="index, follow" />
+    <link rel="shortcut icon" href="../images/favicon.ico" />
+    <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
+    <link href="../templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
 
-        <link rel="shortcut icon" href="../images/favicon.ico" />
-        <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
-        <link href="../templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
-    </head>
-    <body>
-
-        <div id="pagewidth-800" >
-            <div id="header" >
-                <div id="top-top">
-                    <div id="topmenu">
-                    </div>
-                </div>
-                <div class="clr"></div>
-                <div id="top-bottom">
-                    <a href="index.html"><img src="../templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
-                </div>
+<div id="pagewidth-800" >
+    <div id="header" >
+        <div id="top-top">
+            <div id="topmenu">
             </div>
-            <div id="outer-800" >
-                <div id="pathway">
-                    <span class="pathway"><a href="../index.html" class="pathway">Home</a> <img src="../images/M_images/arrow.png" alt="arrow" /> <a href="../news/" class="pathway">News</a> <img src="../images/M_images/arrow.png" alt="arrow" />   FreeCol 0.11.3 released </span>
+        </div>
+        <div class="clr"></div>
+        <div id="top-bottom">
+            <a href="index.html"><img src="../templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
+        </div>
+    </div>
+    <div id="outer-800" >
+        <div id="pathway">
+            <span class="pathway"><a href="../index.html" class="pathway">Home</a> <img src="../images/M_images/arrow.png" alt="arrow" /> <a href="../news/" class="pathway">News</a> <img src="../images/M_images/arrow.png" alt="arrow" />   FreeCol 0.11.3 released </span>
                     <span class="pathway-right">
                         <a href="../sitemap.html"><img src="../templates/freecol/images/sitemap.png" border="0" width="14" height="16" alt="SITEMAP" /></a>
 
                     </span>
+        </div>
+        <div id="leftcol">
+            <a name="menu"></a>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Main Menu</h3>
+                            <table width="100%" border="0" cellpadding="0" cellspacing="0">
+                                <tr align="left"><td><a href="../index.html" class="mainlevel" >Home</a></td></tr>
+                                <tr align="left"><td><a href="../news/" class="mainlevel" id="active_menu">News</a>
+
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/releases.html" class="sublevel" >Releases</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/development.html" class="sublevel" >Development</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/other.html" class="sublevel" >Other</a></div>
+                                </td></tr>
+                                <tr align="left"><td><a href="../about.html" class="mainlevel" >About FreeCol</a></td></tr>
+                                <tr align="left"><td><a href="../documentation/" class="mainlevel" >Documentation</a></td></tr>
+                                <tr align="left"><td><a href="../screenshots.html" class="mainlevel" >Screenshots</a></td></tr>
+                                <tr align="left"><td><a href="../download.html" class="mainlevel" >Download</a></td></tr>
+                                <tr align="left"><td><a href="../community.html" class="mainlevel" >Community</a></td></tr>
+                            </table>					</div>
+                    </div>
                 </div>
-                <div id="leftcol">
-                    <a name="menu"></a>
-		<div class="module">
-			<div>
-				<div>
-					<div>
-						<h3>Main Menu</h3>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr align="left"><td><a href="../index.html" class="mainlevel" >Home</a></td></tr>
-<tr align="left"><td><a href="../news/" class="mainlevel" id="active_menu">News</a>
-
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/releases.html" class="sublevel" >Releases</a></div>
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/development.html" class="sublevel" >Development</a></div>
-<div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/other.html" class="sublevel" >Other</a></div>
-</td></tr>
-<tr align="left"><td><a href="../about.html" class="mainlevel" >About FreeCol</a></td></tr>
-<tr align="left"><td><a href="../documentation/" class="mainlevel" >Documentation</a></td></tr>
-<tr align="left"><td><a href="../screenshots.html" class="mainlevel" >Screenshots</a></td></tr>
-<tr align="left"><td><a href="../download.html" class="mainlevel" >Download</a></td></tr>
-<tr align="left"><td><a href="../community.html" class="mainlevel" >Community</a></td></tr>
-</table>					</div>
-				</div>
-			</div>
-		</div>
-				<div class="module">
-			<div>
-				<div>
-					<div>
-						<h3>Syndicate</h3><div class="syndicate">
-			<div align="center">
-			<a href="../component/option,com_rss/feed,RSS0.91/no_html,1/">
-				<img src="../images/M_images/rss091.gif"  alt="RSS 0.91" name="RSS091" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,RSS1.0/no_html,1/">
-				<img src="../images/M_images/rss10.gif"  alt="RSS 1.0" name="RSS10" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,RSS2.0/no_html,1/">
-				<img src="../images/M_images/rss20.gif"  alt="RSS 2.0" name="RSS20" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,ATOM0.3/no_html,1/">
-				<img src="../images/M_images/atom03.gif"  alt="ATOM 0.3" name="ATOM03" align="middle" border="0" /></a>
-		</div>
-				<div align="center">
-			<a href="../component/option,com_rss/feed,OPML/no_html,1/">
-				<img src="../images/M_images/opml.png"  alt="OPML" name="OPML" align="middle" border="0" /></a>
-		</div>
-		</div>					</div>
-				</div>
-			</div>
-		</div>
-		                </div>
-                <div id="maincol-wide-800" >
-                    <div class="clr"></div>
-                    <div class="content">
-                        <a name="content"></a>
-                                				<table class="contentpaneopen">
-			<tr>
-								<td class="contentheading" width="100%">
-					FreeCol 0.11.3 released									</td>
-							</tr>
-			</table>
-			
-		<table class="contentpaneopen">
-					<tr>
-				<td valign="top" colspan="2" class="createdate">
-					Sunday, 8 March 2015				</td>
-			</tr>
-					<tr>
-			<td valign="top" colspan="2">
-				<div align="left">FreeCol 0.11.3</div>
-                <div align="left">&nbsp;</div>
-                <div align="left">The FreeCol team are vaguely pleased to announce the release of
-                    FreeCol 0.11.3. This is a bug fix release to clean up yet more annoying
-                    problems in version 0.11.0/1/2. See the
-                    <a href="https://sourceforge.net/p/freecol/wiki/0.11.3%20Release%20Notes/" title="release notes">release notes</a> for more detail.
-                    All 0.10.x and 0.11.x games should continue to work with 0.11.3.<br /></div>&nbsp;
-                <div align="left">We hope you enjoy FreeCol 0.11.3.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div>
-			</td>
-		</tr>
-				</table>
-
-		<span class="article_seperator">&nbsp;</span>
-
-					<table align="center" style="margin-top: 25px;">
-			<tr>
-                <th class="pagenav_prev">
-                    <a href="../news/freecol-0.11.4-released.html">
-                        &lt; Previous
-                    </a>
-                </th>
-                <th class="pagenav_next">
-						<a href="../news/freecol-0.11.2-released.html">
-							Next &gt;</a>
-                </th>
-			</tr>
-			</table>
-						<div class="back_button">
-				<a href='javascript:history.go(-1)'>
-					[ Back ]</a>
-			</div>
-			                    </div>
-                </div>
-                <div class="clr"></div>
             </div>
-            <div id="sflogo">
-                <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
-            </div>
-            <div id="footer-800" >
-                <div align="center" class="footer-copyright">
-                    &copy; 2002-2015 FreeCol - <a href="../contact.html">Contact Us</a>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Syndicate</h3><div class="syndicate">
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS0.91/no_html,1/">
+                                    <img src="../images/M_images/rss091.gif"  alt="RSS 0.91" name="RSS091" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS1.0/no_html,1/">
+                                    <img src="../images/M_images/rss10.gif"  alt="RSS 1.0" name="RSS10" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS2.0/no_html,1/">
+                                    <img src="../images/M_images/rss20.gif"  alt="RSS 2.0" name="RSS20" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,ATOM0.3/no_html,1/">
+                                    <img src="../images/M_images/atom03.gif"  alt="ATOM 0.3" name="ATOM03" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,OPML/no_html,1/">
+                                    <img src="../images/M_images/opml.png"  alt="OPML" name="OPML" align="middle" border="0" /></a>
+                            </div>
+                        </div>					</div>
+                    </div>
                 </div>
             </div>
         </div>
-    </body>
+        <div id="maincol-wide-800" >
+            <div class="clr"></div>
+            <div class="content">
+                <a name="content"></a>
+                <table class="contentpaneopen">
+                    <tr>
+                        <td class="contentheading" width="100%">
+                            FreeCol 0.11.3 released									</td>
+                    </tr>
+                </table>
+
+                <table class="contentpaneopen">
+                    <tr>
+                        <td valign="top" colspan="2" class="createdate">
+                            Sunday, 8 March 2015				</td>
+                    </tr>
+                    <tr>
+                        <td valign="top" colspan="2">
+                            <div align="left">FreeCol 0.11.3</div>
+                            <div align="left">&nbsp;</div>
+                            <div align="left">The FreeCol team are vaguely pleased to announce the release of
+                                FreeCol 0.11.3. This is a bug fix release to clean up yet more annoying
+                                problems in version 0.11.0/1/2. See the
+                                <a href="https://sourceforge.net/p/freecol/wiki/0.11.3%20Release%20Notes/" title="release notes">release notes</a> for more detail.
+                                All 0.10.x and 0.11.x games should continue to work with 0.11.3.<br /></div>&nbsp;
+                            <div align="left">We hope you enjoy FreeCol 0.11.3.&nbsp; Onward to 1.0.<br /><br />The FreeCol Team</div><div align="left">&nbsp;</div>
+                        </td>
+                    </tr>
+                </table>
+
+                <span class="article_seperator">&nbsp;</span>
+
+                <table align="center" style="margin-top: 25px;">
+                    <tr>
+                        <th class="pagenav_prev">
+                            <a href="../news/freecol-0.11.4-released.html">
+                                &lt; Previous
+                            </a>
+                        </th>
+                        <th class="pagenav_next">
+                            <a href="../news/freecol-0.11.2-released.html">
+                                Next &gt;</a>
+                        </th>
+                    </tr>
+                </table>
+                <div class="back_button">
+                    <a href='javascript:history.go(-1)'>
+                        [ Back ]</a>
+                </div>
+            </div>
+        </div>
+        <div class="clr"></div>
+    </div>
+    <div id="sflogo">
+        <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
+    </div>
+    <div id="footer-800" >
+        <div align="center" class="footer-copyright">
+            &copy; 2002-2015 FreeCol - <a href="../contact.html">Contact Us</a>
+        </div>
+    </div>
+</div>
+</body>
 </html>
 <!-- 1419163600 -->
diff --git a/www.freecol.org/news/freecol-0.11.4-released.html b/www.freecol.org/news/freecol-0.11.4-released.html
index 624c1dddb..d5caa6fa5 100644
--- a/www.freecol.org/news/freecol-0.11.4-released.html
+++ b/www.freecol.org/news/freecol-0.11.4-released.html
@@ -8,7 +8,7 @@
     <meta name="title" content="FreeCol 0.11.4 released" />
     <meta name="author" content="Mike Pope" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
     <meta name="robots" content="index, follow" />
 
diff --git a/www.freecol.org/news/freecol-0.11.5-released.html b/www.freecol.org/news/freecol-0.11.5-released.html
index b74ca1ad2..a0b4d0a91 100644
--- a/www.freecol.org/news/freecol-0.11.5-released.html
+++ b/www.freecol.org/news/freecol-0.11.5-released.html
@@ -8,7 +8,7 @@
     <meta name="title" content="FreeCol 0.11.5 released" />
     <meta name="author" content="Caleb Williams" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
 
     <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -109,20 +109,32 @@
                         <td valign="top" colspan="2">
                             <div align="left">FreeCol 0.11.5</div>
                             <div align="left">&nbsp;</div>
+                            <div align="left" style="margin-bottom: 1em;">
+                                FreeCol 0.11.5 has been released with one
+                                critical bug fix from the withdrawn 0.11.4.
+                                All 0.10.x and 0.11.x games should continue
+                                to work with 0.11.5, with the exception of
+                                games generated with 0.11.4 which are badly
+                                broken. For more details on the changes
+                                since 0.11.3, see the
+                                <a href="https://sourceforge.net/p/freecol/wiki/0.11.5%20Release%20Notes/"
+                                   title="release notes">release notes</a>.
+                            </div>
                             <div align="left">
-                                FreeCol 0.11.5 has been released to fix
-                                file corruption in 0.11.4. All users of
-                                FreeCol 0.11.4 are encouraged to upgrade
-                                as soon as possible.
+                                We hope this time you get to enjoy the new
+                                FreeCol release. Onward to 1.0.
+                                <br /><br />The FreeCol Team
                             </div>
                             <div align="left">&nbsp;</div>
                             <!-- Here is the download button.
-                            Move it to the new release! -->
+                                 Move it to the new release! -->
                             <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
                                 <a href="../download.html">Download FreeCol 0.11.5</a>
                             </em></strong></td></tr></tbody></table>
                             <!-- End of download button -->
-                        </td></tr></table>
+                        </td>
+                    </tr>
+                </table>
 
                 <span class="article_seperator">&nbsp;</span>
 
diff --git a/www.freecol.org/news/freecol-0.2.0-released.html b/www.freecol.org/news/freecol-0.2.0-released.html
index e2cde4da4..ef9f533c0 100644
--- a/www.freecol.org/news/freecol-0.2.0-released.html
+++ b/www.freecol.org/news/freecol-0.2.0-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.2.0 Released" />
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.3.0-released.html b/www.freecol.org/news/freecol-0.3.0-released.html
index f7bb46f5c..fc1809760 100644
--- a/www.freecol.org/news/freecol-0.3.0-released.html
+++ b/www.freecol.org/news/freecol-0.3.0-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.3.0 Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.4.0-release-candidate.html b/www.freecol.org/news/freecol-0.4.0-release-candidate.html
index 77e22a7e4..1abbca57f 100644
--- a/www.freecol.org/news/freecol-0.4.0-release-candidate.html
+++ b/www.freecol.org/news/freecol-0.4.0-release-candidate.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.4.0 Release Candidate" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.4.0-released.html b/www.freecol.org/news/freecol-0.4.0-released.html
index 932b774b5..e5d660e0e 100644
--- a/www.freecol.org/news/freecol-0.4.0-released.html
+++ b/www.freecol.org/news/freecol-0.4.0-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.4.0 Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.5.0-released.html b/www.freecol.org/news/freecol-0.5.0-released.html
index a9c490598..0c6b30653 100644
--- a/www.freecol.org/news/freecol-0.5.0-released.html
+++ b/www.freecol.org/news/freecol-0.5.0-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.5.0 Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.5.1-released.html b/www.freecol.org/news/freecol-0.5.1-released.html
index 59961d054..98ce21bf6 100644
--- a/www.freecol.org/news/freecol-0.5.1-released.html
+++ b/www.freecol.org/news/freecol-0.5.1-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.5.1 Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.5.2-released.html b/www.freecol.org/news/freecol-0.5.2-released.html
index ab83c4f6a..57c70c06b 100644
--- a/www.freecol.org/news/freecol-0.5.2-released.html
+++ b/www.freecol.org/news/freecol-0.5.2-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.5.2 Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.5.3-released.html b/www.freecol.org/news/freecol-0.5.3-released.html
index 25bd01cf1..ec8cc80bd 100644
--- a/www.freecol.org/news/freecol-0.5.3-released.html
+++ b/www.freecol.org/news/freecol-0.5.3-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.5.3 Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.6.0-released.html b/www.freecol.org/news/freecol-0.6.0-released.html
index a737bafcd..fe6eb7bf8 100644
--- a/www.freecol.org/news/freecol-0.6.0-released.html
+++ b/www.freecol.org/news/freecol-0.6.0-released.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.6.1-released.html b/www.freecol.org/news/freecol-0.6.1-released.html
index d7f607dbc..a51df6254 100644
--- a/www.freecol.org/news/freecol-0.6.1-released.html
+++ b/www.freecol.org/news/freecol-0.6.1-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.6.1 Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.7.0-released.html b/www.freecol.org/news/freecol-0.7.0-released.html
index d0074edcc..a4d63efe7 100644
--- a/www.freecol.org/news/freecol-0.7.0-released.html
+++ b/www.freecol.org/news/freecol-0.7.0-released.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.7.1-released.html b/www.freecol.org/news/freecol-0.7.1-released.html
index d0074edcc..a4d63efe7 100644
--- a/www.freecol.org/news/freecol-0.7.1-released.html
+++ b/www.freecol.org/news/freecol-0.7.1-released.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.7.2-released.html b/www.freecol.org/news/freecol-0.7.2-released.html
index 319df4845..f0abcfeca 100644
--- a/www.freecol.org/news/freecol-0.7.2-released.html
+++ b/www.freecol.org/news/freecol-0.7.2-released.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.7.3-on-january-27th.html b/www.freecol.org/news/freecol-0.7.3-on-january-27th.html
index 882adfb5a..863478130 100644
--- a/www.freecol.org/news/freecol-0.7.3-on-january-27th.html
+++ b/www.freecol.org/news/freecol-0.7.3-on-january-27th.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.7.3 on January 27th" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.7.3-released.html b/www.freecol.org/news/freecol-0.7.3-released.html
index 486d76935..1658756c4 100644
--- a/www.freecol.org/news/freecol-0.7.3-released.html
+++ b/www.freecol.org/news/freecol-0.7.3-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.7.3 Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.7.4-released.html b/www.freecol.org/news/freecol-0.7.4-released.html
index 242559f02..6f3399f5d 100644
--- a/www.freecol.org/news/freecol-0.7.4-released.html
+++ b/www.freecol.org/news/freecol-0.7.4-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.7.4 Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.8.0-alpha-released.html b/www.freecol.org/news/freecol-0.8.0-alpha-released.html
index fd0ba4400..1c58bc339 100644
--- a/www.freecol.org/news/freecol-0.8.0-alpha-released.html
+++ b/www.freecol.org/news/freecol-0.8.0-alpha-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.8.0-alpha Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.8.0-alpha2-released.html b/www.freecol.org/news/freecol-0.8.0-alpha2-released.html
index 62147956d..fd891d05e 100644
--- a/www.freecol.org/news/freecol-0.8.0-alpha2-released.html
+++ b/www.freecol.org/news/freecol-0.8.0-alpha2-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.8.0-alpha2 Released" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.8.0-alpha3-released.html b/www.freecol.org/news/freecol-0.8.0-alpha3-released.html
index 7a82d489f..2f868b19e 100644
--- a/www.freecol.org/news/freecol-0.8.0-alpha3-released.html
+++ b/www.freecol.org/news/freecol-0.8.0-alpha3-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.8.0-alpha3 Released" />
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.8.0-released.html b/www.freecol.org/news/freecol-0.8.0-released.html
index e1865f5dd..77a6f56f8 100644
--- a/www.freecol.org/news/freecol-0.8.0-released.html
+++ b/www.freecol.org/news/freecol-0.8.0-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.8.0 Released" />
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.8.1-released.html b/www.freecol.org/news/freecol-0.8.1-released.html
index 917ca86f2..76f428a5a 100644
--- a/www.freecol.org/news/freecol-0.8.1-released.html
+++ b/www.freecol.org/news/freecol-0.8.1-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.8.1 Released" />
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.8.2-released.html b/www.freecol.org/news/freecol-0.8.2-released.html
index 40e154437..9896b6334 100644
--- a/www.freecol.org/news/freecol-0.8.2-released.html
+++ b/www.freecol.org/news/freecol-0.8.2-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.8.2 Released" />
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.8.3-released.html b/www.freecol.org/news/freecol-0.8.3-released.html
index b2656403c..0e9456003 100644
--- a/www.freecol.org/news/freecol-0.8.3-released.html
+++ b/www.freecol.org/news/freecol-0.8.3-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.8.3 Released" />
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.8.4-released.html b/www.freecol.org/news/freecol-0.8.4-released.html
index 831fd7610..2835aa612 100644
--- a/www.freecol.org/news/freecol-0.8.4-released.html
+++ b/www.freecol.org/news/freecol-0.8.4-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.8.4 Released" />
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.9.0-alpha-released.html b/www.freecol.org/news/freecol-0.9.0-alpha-released.html
index 683982970..7dddb221e 100644
--- a/www.freecol.org/news/freecol-0.9.0-alpha-released.html
+++ b/www.freecol.org/news/freecol-0.9.0-alpha-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.9.0-alpha released" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.9.0-alpha2-released.html b/www.freecol.org/news/freecol-0.9.0-alpha2-released.html
index e72bb6f20..a21b8940f 100644
--- a/www.freecol.org/news/freecol-0.9.0-alpha2-released.html
+++ b/www.freecol.org/news/freecol-0.9.0-alpha2-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.9.0-alpha2 released" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.9.0-released.html b/www.freecol.org/news/freecol-0.9.0-released.html
index be1b08155..9ab1bc83a 100644
--- a/www.freecol.org/news/freecol-0.9.0-released.html
+++ b/www.freecol.org/news/freecol-0.9.0-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.9.0 released" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.9.1-released.html b/www.freecol.org/news/freecol-0.9.1-released.html
index 283f381ed..b4eaf5555 100644
--- a/www.freecol.org/news/freecol-0.9.1-released.html
+++ b/www.freecol.org/news/freecol-0.9.1-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.9.1 released" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.9.2-released.html b/www.freecol.org/news/freecol-0.9.2-released.html
index dd87d00ab..94fdfc159 100644
--- a/www.freecol.org/news/freecol-0.9.2-released.html
+++ b/www.freecol.org/news/freecol-0.9.2-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.9.2 released" />
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.9.3-released.html b/www.freecol.org/news/freecol-0.9.3-released.html
index 4aae885c5..e857160f2 100644
--- a/www.freecol.org/news/freecol-0.9.3-released.html
+++ b/www.freecol.org/news/freecol-0.9.3-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.9.3 released" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.9.4-released.html b/www.freecol.org/news/freecol-0.9.4-released.html
index e0eb2e4de..a18463867 100644
--- a/www.freecol.org/news/freecol-0.9.4-released.html
+++ b/www.freecol.org/news/freecol-0.9.4-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.9.4 released" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/freecol-0.9.5-released.html b/www.freecol.org/news/freecol-0.9.5-released.html
index afc374072..c11089922 100644
--- a/www.freecol.org/news/freecol-0.9.5-released.html
+++ b/www.freecol.org/news/freecol-0.9.5-released.html
@@ -8,7 +8,7 @@
         <meta name="title" content="FreeCol 0.9.5 released" />
         <meta name="author" content="Mike Pope" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/improvements-to-upgrade-and-downgrade-elements.html b/www.freecol.org/news/improvements-to-upgrade-and-downgrade-elements.html
index 0bb266ba1..4976d6ce3 100644
--- a/www.freecol.org/news/improvements-to-upgrade-and-downgrade-elements.html
+++ b/www.freecol.org/news/improvements-to-upgrade-and-downgrade-elements.html
@@ -8,7 +8,7 @@
         <meta name="title" content="Improvements to upgrade and downgrade elements" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/index.html b/www.freecol.org/news/index.html
index b947d7516..a47165996 100644
--- a/www.freecol.org/news/index.html
+++ b/www.freecol.org/news/index.html
@@ -6,7 +6,7 @@
     <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
     <title>FreeCol - News</title>
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="../images/favicon.ico" />
@@ -110,21 +110,20 @@
                       <td valign="top" colspan="2">
                         <div align="left">FreeCol 0.11.5</div>
                         <div align="left">&nbsp;</div>
-                        <div align="left">
+                        <div align="left" style="margin-bottom: 1em;">
                           FreeCol 0.11.5 has been released with one
                           critical bug fix from the withdrawn 0.11.4.
                           All 0.10.x and 0.11.x games should continue
                           to work with 0.11.5, with the exception of
                           games generated with 0.11.4 which are badly
-                          broken.  For more details on the changes
+                          broken. For more details on the changes
                           since 0.11.3, see the                       
                           <a href="https://sourceforge.net/p/freecol/wiki/0.11.5%20Release%20Notes/"
-
                              title="release notes">release notes</a>.
                         </div>
                         <div align="left">
-                          We this time you get to enjoy the new FreeCol
-                          release.&nbsp; Onward to 1.0.
+                          We hope this time you get to enjoy the new
+                          FreeCol release. Onward to 1.0.
                           <br /><br />The FreeCol Team
                         </div>
                         <div align="left">&nbsp;</div>
@@ -134,7 +133,9 @@
                                     <a href="../download.html">Download FreeCol 0.11.5</a>
                         </em></strong></td></tr></tbody></table>
                         <!-- End of download button -->
-                      </td></tr></table>
+                      </td>
+                    </tr>
+                  </table>
 
                   <span class="article_seperator">&nbsp;</span>
 
diff --git a/www.freecol.org/news/intro-movie-and-music.html b/www.freecol.org/news/intro-movie-and-music.html
index 26a6e5d1a..a12b17ae8 100644
--- a/www.freecol.org/news/intro-movie-and-music.html
+++ b/www.freecol.org/news/intro-movie-and-music.html
@@ -8,7 +8,7 @@
         <meta name="title" content="Intro Movie and Music" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/new-colonization.html b/www.freecol.org/news/new-colonization.html
index c92e43b76..d5486e594 100644
--- a/www.freecol.org/news/new-colonization.html
+++ b/www.freecol.org/news/new-colonization.html
@@ -8,7 +8,7 @@
         <meta name="title" content="Sid Meier's Colonization Recreated Using the Civilization IV Engine" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/new-modifiers-available.html b/www.freecol.org/news/new-modifiers-available.html
index 23c3996fa..3e6a13829 100644
--- a/www.freecol.org/news/new-modifiers-available.html
+++ b/www.freecol.org/news/new-modifiers-available.html
@@ -8,7 +8,7 @@
         <meta name="title" content="New modifiers available" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/new-website.html b/www.freecol.org/news/new-website.html
index 66da81351..b70fb3f21 100644
--- a/www.freecol.org/news/new-website.html
+++ b/www.freecol.org/news/new-website.html
@@ -8,7 +8,7 @@
         <meta name="title" content="New Website" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/other.html b/www.freecol.org/news/other.html
index 46c7fe531..ab516f754 100644
--- a/www.freecol.org/news/other.html
+++ b/www.freecol.org/news/other.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Other</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/production-depending-on-difficulty.html b/www.freecol.org/news/production-depending-on-difficulty.html
index fe7a978ed..9b3ced11d 100644
--- a/www.freecol.org/news/production-depending-on-difficulty.html
+++ b/www.freecol.org/news/production-depending-on-difficulty.html
@@ -8,7 +8,7 @@
         <meta name="title" content="Production depending on difficulty" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/project-member-leaving.html b/www.freecol.org/news/project-member-leaving.html
index 31b5ca7f4..5261a9a37 100644
--- a/www.freecol.org/news/project-member-leaving.html
+++ b/www.freecol.org/news/project-member-leaving.html
@@ -8,7 +8,7 @@
         <meta name="title" content="Project member leaving" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases.html b/www.freecol.org/news/releases.html
index b91712b3d..c2f42e65b 100644
--- a/www.freecol.org/news/releases.html
+++ b/www.freecol.org/news/releases.html
@@ -6,7 +6,7 @@
     <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
     <title>FreeCol - Releases</title>
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="Generator" content="Joomla! - Copyright (C) 2005 - 2006 Open Source Matters. All rights reserved." />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-2.html b/www.freecol.org/news/releases/Page-2.html
index 2bd3b1dfe..ec90ba030 100644
--- a/www.freecol.org/news/releases/Page-2.html
+++ b/www.freecol.org/news/releases/Page-2.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
         <link rel="shortcut icon" href="../../images/favicon.ico" />
         <link href="../../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/news/releases/Page-3.html b/www.freecol.org/news/releases/Page-3.html
index 7ac3cb743..510ad4f84 100644
--- a/www.freecol.org/news/releases/Page-3.html
+++ b/www.freecol.org/news/releases/Page-3.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-4.html b/www.freecol.org/news/releases/Page-4.html
index faac44d72..333e6f782 100644
--- a/www.freecol.org/news/releases/Page-4.html
+++ b/www.freecol.org/news/releases/Page-4.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-5.html b/www.freecol.org/news/releases/Page-5.html
index 018704051..b824d6514 100644
--- a/www.freecol.org/news/releases/Page-5.html
+++ b/www.freecol.org/news/releases/Page-5.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-6.html b/www.freecol.org/news/releases/Page-6.html
index b69a34c51..4ff9e1f77 100644
--- a/www.freecol.org/news/releases/Page-6.html
+++ b/www.freecol.org/news/releases/Page-6.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-7.html b/www.freecol.org/news/releases/Page-7.html
index 379eb1209..c9a89df32 100644
--- a/www.freecol.org/news/releases/Page-7.html
+++ b/www.freecol.org/news/releases/Page-7.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-8.html b/www.freecol.org/news/releases/Page-8.html
index c220d3c21..c31f11206 100644
--- a/www.freecol.org/news/releases/Page-8.html
+++ b/www.freecol.org/news/releases/Page-8.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/releases/Page-9.html b/www.freecol.org/news/releases/Page-9.html
index 6358dfe94..c6db467c8 100644
--- a/www.freecol.org/news/releases/Page-9.html
+++ b/www.freecol.org/news/releases/Page-9.html
@@ -6,7 +6,7 @@
         <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../../component/option,com_rss/feed,RSS1.0/no_html,1/" />
         <title>FreeCol - Releases</title>
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../../images/favicon.ico" />
diff --git a/www.freecol.org/news/sourceforge.net-community-choice-awards.html b/www.freecol.org/news/sourceforge.net-community-choice-awards.html
index 3acbf1f7d..06639a080 100644
--- a/www.freecol.org/news/sourceforge.net-community-choice-awards.html
+++ b/www.freecol.org/news/sourceforge.net-community-choice-awards.html
@@ -8,7 +8,7 @@
         <meta name="title" content="SourceForge.net Community Choice Awards" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/start-of-the-freecol-project.html b/www.freecol.org/news/start-of-the-freecol-project.html
index 82e0f986d..c7516641d 100644
--- a/www.freecol.org/news/start-of-the-freecol-project.html
+++ b/www.freecol.org/news/start-of-the-freecol-project.html
@@ -8,7 +8,7 @@
         <meta name="title" content="Start of the FreeCol project" />
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/status-update.html b/www.freecol.org/news/status-update.html
index 7435b0a79..b5bc21855 100644
--- a/www.freecol.org/news/status-update.html
+++ b/www.freecol.org/news/status-update.html
@@ -8,7 +8,7 @@
         <meta name="title" content="Status Update" />
         <meta name="author" content="Administrator" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/vote-for-freecol.html b/www.freecol.org/news/vote-for-freecol.html
index 454a08b50..c6a975c2e 100644
--- a/www.freecol.org/news/vote-for-freecol.html
+++ b/www.freecol.org/news/vote-for-freecol.html
@@ -8,7 +8,7 @@
         <meta name="title" content="Vote for FreeCol!" />
         <meta name="author" content="Stian Grenborgen" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/news/you-can-help-us.html b/www.freecol.org/news/you-can-help-us.html
index e3f25b8ff..dae1ea5ce 100644
--- a/www.freecol.org/news/you-can-help-us.html
+++ b/www.freecol.org/news/you-can-help-us.html
@@ -8,7 +8,7 @@
         <meta name="title" content="You can help us" />
         <meta name="author" content="Michael Burschik" />
         <meta name="description" content="FreeCol - a turn based strategy game" />
-        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+        <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
         <meta name="robots" content="index, follow" />
 
         <link rel="shortcut icon" href="../images/favicon.ico" />
diff --git a/www.freecol.org/roadmap.html b/www.freecol.org/roadmap.html
index 8313cd50a..5713ac258 100644
--- a/www.freecol.org/roadmap.html
+++ b/www.freecol.org/roadmap.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Roadmap" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/screenshots.html b/www.freecol.org/screenshots.html
index b6f839604..88089c936 100644
--- a/www.freecol.org/screenshots.html
+++ b/www.freecol.org/screenshots.html
@@ -11,7 +11,7 @@
     <meta name="author" content="FreeCol Team"/>
     <meta name="description" content="FreeCol - a turn based strategy game"/>
     <meta name="keywords"
-          content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose"/>
+          content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose"/>
     <meta name="robots" content="index, follow"/>
     <link rel="shortcut icon" href="images/favicon.ico"/>
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css"/>
diff --git a/www.freecol.org/sitemap.html b/www.freecol.org/sitemap.html
index a3f2cdb13..399267b1e 100644
--- a/www.freecol.org/sitemap.html
+++ b/www.freecol.org/sitemap.html
@@ -7,7 +7,7 @@
     <title>FreeCol Site Map</title>
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
diff --git a/www.freecol.org/status.html b/www.freecol.org/status.html
index 4f4495b15..6bd593a1f 100644
--- a/www.freecol.org/status.html
+++ b/www.freecol.org/status.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Current Status" />
     <meta name="author" content="FreeColTeam" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
@@ -44,7 +44,6 @@
                                 <tr align="left"><td><a href="index.html" class="mainlevel">Home</a></td></tr>
                                 <tr align="left"><td><a href="news/" class="mainlevel">News</a></td></tr>
                                 <tr align="left"><td><a href="about.html" class="mainlevel">About FreeCol</a>
-
                                     <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="status.html" class="sublevel" id="active_menu">Current Status</a></div>
                                     <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="history.html" class="sublevel">History</a></div>
                                     <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="roadmap.html" class="sublevel">Roadmap</a></div>
@@ -75,7 +74,7 @@
                 <table class="contentpaneopen">
                     <tr>
                         <td valign="top" colspan="2">
-                            <p>The last version to be released was FreeCol 0.11.5.</p>
+                            <p>The the current version of FreeCol is 0.11.5.</p>
                             <p>FreeCol is continuously developed. For more on the latest Freecol development progress, please visit the <a href="https://sourceforge.net/projects/freecol/" title="FreeCol on SourceForge">SourceForge Project page</a>.</p>
                         </td>
                     </tr>
diff --git a/www.freecol.org/team-and-credits.html b/www.freecol.org/team-and-credits.html
index e8995d4df..423d6329e 100644
--- a/www.freecol.org/team-and-credits.html
+++ b/www.freecol.org/team-and-credits.html
@@ -8,7 +8,7 @@
     <meta name="title" content="Team and Credits" />
     <meta name="author" content="FreeCol Team" />
     <meta name="description" content="FreeCol - a turn based strategy game" />
-    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonisation, Sid Meier's Colonization, Colonization 2, Microproose" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
     <meta name="robots" content="index, follow" />
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />

From 23f04a7904a967e35083d2c454e5403f441d8f7b Mon Sep 17 00:00:00 2001
From: calebrw <calebrw@gmail.com>
Date: Sun, 23 Aug 2015 11:12:30 -0500
Subject: [PATCH 119/323] Cleanup download.html and roadmap.html pages.

---
 www.freecol.org/download.html |  14 +-
 www.freecol.org/roadmap.html  | 279 +++++++++++++++++-----------------
 2 files changed, 141 insertions(+), 152 deletions(-)

diff --git a/www.freecol.org/download.html b/www.freecol.org/download.html
index 68527a470..640aa0bad 100644
--- a/www.freecol.org/download.html
+++ b/www.freecol.org/download.html
@@ -66,9 +66,10 @@
                 <table class="contentpaneopen">
                     <tr>
                         <td valign="top" colspan="2">
+                            <p align="left">The latest version of FreeCol:</p>
                             <p align="left">The latest version of FreeCol:</p>
                             <div class="graded_block">
-                                <table border="0" cellspacing="0" cellpadding="5">
+                                <table border="0" cellspacing="0" cellpadding="5" style="position: relative; top: 20%; margin-top: -25px;">
                                     <tbody>
                                     <tr class="cBody">
                                         <td class="cBody">
@@ -144,9 +145,7 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <br />
                             <p align="center"><img src="images/art/colony02f12.png" alt="" /> </p>
-                            <br />
                             <h4>Distribution files with source code included:</h4>
                             <table border="0" cellspacing="0" cellpadding="5">
                                 <tbody>
@@ -178,7 +177,6 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <br /><br />
                             <h4>Requirements:</h4>
                             All platforms:
                             <br />
@@ -186,7 +184,7 @@
                                 <li>A minimum screen resolution of 1024x768</li>
                                 <li><strong>Java Virtual Machine version 1.7 or above</strong></li>
                             </ul>
-                            <br />
+                            <div class="warningbox">Moving forward, FreeCol will require Java Virtual Machine version 1.8. This change is effective in the code repository currently and will be part of the next official FreeCol release.</div>
                             <h4>Instructions:</h4>
                             <p align="justify">
                                 Windows users should download
@@ -199,12 +197,6 @@
                                 Users that know how to start a java program can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">freecol-0.11.5-installer.jar</a>. Start the installation program by running the command: &quot;java -jar freecol-0.11.5-installer.jar&quot;. This installer is recommended for Linux users. <br /><br />
                                 If you don&#39;t need a desktop icon and you know how to start a java program then you can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5.zip?download">freecol-0.11.5.zip</a>. The same applies for <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-src.zip?download">freecol-0.11.5-src.zip</a>, but the source files are included as well in these two packages. In that case you might want to take a look at the README file to get information on how to compile and run FreeCol.
                             </p>
-                            <p class="cWarning" align="justify">
-                                Note 1: You may ignore the message &quot;<em>The music files could not be loaded by FreeCol. Disabling music.</em>&quot;. There is no music available yet in this release of FreeCol. </p>
-                            <p class="cWarning" align="justify">
-                                Note 2: The current implementation of Java&#39;s full screen support doesn&#39;t work well with all <strong>Linux</strong> window managers. Add the command line option &quot;--windowed&quot; if you&#39;re having trouble. Also try this option if you&#39;re having trouble in <strong>Windows</strong>.
-                            </p>
-                            <br />
                             <h4>Help, Feedback &amp; Bugs:</h4>
                             <p align="justify">Help requests and feedback can be sent via e-mail to
                                 <script language='JavaScript' type='text/javascript'>
diff --git a/www.freecol.org/roadmap.html b/www.freecol.org/roadmap.html
index 5713ac258..536f3a873 100644
--- a/www.freecol.org/roadmap.html
+++ b/www.freecol.org/roadmap.html
@@ -14,157 +14,154 @@
     <link href="templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
     <link href="templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
 </head>
-    <body>
-    <div id="pagewidth-800">
-    <div id="header">
-        <div id="top-top">
-            <div id="topmenu">
-            </div>
-        </div>
-        <div class="clr"></div>
-        <div id="top-bottom">
-            <a href="index.html"><img src="templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
+<body>
+<div id="pagewidth-800">
+<div id="header">
+    <div id="top-top">
+        <div id="topmenu">
         </div>
     </div>
-    <div id="outer-800">
-        <div id="pathway">
-            <span class="pathway"><a href="index.html" class="pathway">Home</a> <img src="images/M_images/arrow.png" alt="arrow" /> <a href="about.html" class="pathway">About FreeCol</a> <img src="images/M_images/arrow.png" alt="arrow" />   Roadmap </span>
-                    <span class="pathway-right">
-                        <a href="sitemap.html"><img src="templates/freecol/images/sitemap.png" border="0" width="14" height="16" alt="SITEMAP" /></a>
-                    </span>
-        </div>
-        <div id="leftcol">
-            <a name="menu"></a>
-            <div class="module">
+    <div class="clr"></div>
+    <div id="top-bottom">
+        <a href="index.html"><img src="templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
+    </div>
+</div>
+<div id="outer-800">
+    <div id="pathway">
+        <span class="pathway"><a href="index.html" class="pathway">Home</a> <img src="images/M_images/arrow.png" alt="arrow" /> <a href="about.html" class="pathway">About FreeCol</a> <img src="images/M_images/arrow.png" alt="arrow" />   Roadmap </span>
+                <span class="pathway-right">
+                    <a href="sitemap.html"><img src="templates/freecol/images/sitemap.png" border="0" width="14" height="16" alt="SITEMAP" /></a>
+                </span>
+    </div>
+    <div id="leftcol">
+        <a name="menu"></a>
+        <div class="module">
+            <div>
                 <div>
                     <div>
-                        <div>
-                            <h3>Main Menu</h3>
-                            <table width="100%" border="0" cellpadding="0" cellspacing="0">
-                                <tr align="left"><td><a href="" class="mainlevel">Home</a></td></tr>
-                                <tr align="left"><td><a href="news/" class="mainlevel">News</a></td></tr>
-                                <tr align="left">
-                                    <td>
-                                        <a href="about.html" class="mainlevel">About FreeCol</a>
-                                        <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="status.html" class="sublevel">Current Status</a></div>
-                                        <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="history.html" class="sublevel">History</a></div>
-                                        <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="roadmap.html" class="sublevel" id="active_menu">Roadmap</a></div>
-                                        <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="team-and-credits.html" class="sublevel">Team and Credits</a></div>
-                                        <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="how-to-contribute.html" class="sublevel">How to Contribute</a></div>
-                                        <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="contact.html" class="sublevel">Contact Us</a></div>
-                                    </td>
-                                </tr>
-                                <tr align="left"><td><a href="documentation/" class="mainlevel">Documentation</a></td></tr>
-                                <tr align="left"><td><a href="screenshots.html" class="mainlevel">Screenshots</a></td></tr>
-                                <tr align="left"><td><a href="download.html" class="mainlevel">Download</a></td></tr>
-                                <tr align="left"><td><a href="community.html" class="mainlevel">Community</a></td></tr>
-                            </table>
-                        </div>
+                        <h3>Main Menu</h3>
+                        <table width="100%" border="0" cellpadding="0" cellspacing="0">
+                            <tr align="left"><td><a href="" class="mainlevel">Home</a></td></tr>
+                            <tr align="left"><td><a href="news/" class="mainlevel">News</a></td></tr>
+                            <tr align="left">
+                                <td>
+                                    <a href="about.html" class="mainlevel">About FreeCol</a>
+                                    <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="status.html" class="sublevel">Current Status</a></div>
+                                    <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="history.html" class="sublevel">History</a></div>
+                                    <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="roadmap.html" class="sublevel" id="active_menu">Roadmap</a></div>
+                                    <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="team-and-credits.html" class="sublevel">Team and Credits</a></div>
+                                    <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="how-to-contribute.html" class="sublevel">How to Contribute</a></div>
+                                    <div class="submenu"><img src="templates/freecol/images/indent1.png" alt="" /><a href="contact.html" class="sublevel">Contact Us</a></div>
+                                </td>
+                            </tr>
+                            <tr align="left"><td><a href="documentation/" class="mainlevel">Documentation</a></td></tr>
+                            <tr align="left"><td><a href="screenshots.html" class="mainlevel">Screenshots</a></td></tr>
+                            <tr align="left"><td><a href="download.html" class="mainlevel">Download</a></td></tr>
+                            <tr align="left"><td><a href="community.html" class="mainlevel">Community</a></td></tr>
+                        </table>
                     </div>
                 </div>
             </div>
         </div>
-        <div id="maincol-wide-800">
-            <div class="clr"></div>
-            <div class="content">
-                <a name="content"></a>
-                <table class="contentpaneopen">
-                    <tr>
-                        <td class="contentheading" width="100%">Roadmap</td>
-                    </tr>
-                </table>
-                <table class="contentpaneopen">
-                    <tr>
-                        <td valign="top" colspan="2">
-                            <div align="left">
-                                <div align="justify">
-                                    <div class="warningbox">The roadmap below is long out of date and retained for historical interest.</div>
-                                    <p>This is a good place though to answer the following FAQ:</p>
-                                </div>
-                            </div>
-                            <div align="left">
-                                Q. When is the next release coming out?<br /><br />
-                                A. This question is discussed on the freecol-developers mailing list.&nbsp; Anyone who wants a detailed understanding of the current issues in FreeCol is more than welcome to subscribe (see <a href="community.html" title="here">/community.html)</a>. The list is low volume, and nicely illustrates that the real answer to this question is almost always `No one knows&#39;.<br /><br />
-                                Q. No, really, surely you have some sort of plan/roadmap/release schedule?<br /><br />
-                                A. Not really.  FreeCol is developed for fun, by a small group of volunteer contributors, at least some of which find the idea of a formal release schedule in a small volunteer project laughably impractical and/or not fun.<br /><br />
-                                Q. Well, alright, can you at least tell us what will be in the next release?<br /><br />
-                                <ul>
-                                    <li>A1. Bug fixes.</li>
-                                    <li>A2. Read the mailing list and you will know what we have been discussing.</li>
-                                    <li>A3. Follow freecol-commits and you will know what we have actually done.</li>
-                                    <li>A4. `Whatever catches the various developer&#39;s interest&#39;<br /></li>
-                                </ul>
-                            </div>
-                            <pre>&nbsp;</pre>
-                            <div align="left">
-                                <pre>0.8.0 -----  Objective: Make the game easier to modify </pre>
-                                <pre>Release:   Released, January 14th </pre>
-                                <pre> - Allow the game to be customized using XML-files.</pre>
-                                <pre> - Units now slide between tiles while moving. </pre>
-                                <pre> - New terrain graphics.</pre>
-                                <pre> - Menu music added.</pre>
-                                <pre> - Sound effects for dragoons, artillery capturing a colony, building complete, church and blacksmith.</pre>
-                                <pre> - New sound effects for artillery and buying/selling goods.</pre>
-                                <pre> - Short music clips for Aztecs and fountain of Youth. </pre>
-                                <pre> - Named regions and nicer placement of native settlements.</pre>
-                                <pre> - New nations added: Portuguese, Swedish, Danish and Russian </pre>
-                                <pre> - Games with up to eight European players are now supported.  More information: </pre>
-                                <pre>
-                                    <ul>
-                                        <li><a href="http://sourceforge.net/tracker/index.php?func=browse&amp;group_id=43225&amp;atid=435581&amp;_group=749890&amp;sort=DESC&amp;order=artifact_id&amp;_category=100&amp;_status=100&amp;_assigned_to=0&amp;set=custom">Feature requests implemented for this version</a></li>
-                                        <li><a href="http://sourceforge.net/tracker/index.php?func=browse&amp;group_id=43225&amp;atid=435578&amp;_group=749887&amp;sort=DESC&amp;order=artifact_id&amp;_category=100&amp;_status=100&amp;_assigned_to=0&amp;set=custom">Bugs fixed for this version</a></li>
-                                    </ul>
-                                </pre>
-                                <pre>0.9.0 -----  Objective: Improve graphics and audio</pre>
-                                <pre> - New background images, borders and buttons.</pre>
-                                <pre> - Implement feature requests from our users.</pre>
-                                <pre> - Unit combat animations. </pre>
-                                <pre> - Add more sound effects and music.</pre>
-                                <pre> - Opening movie.   </pre>
-                                <pre>0.10.0 ------  Objective: Improve the computer players  </pre>
-                                <pre> - Add personalities and better strategy to computer opponents. </pre>
-                                <pre> - Add features for admin (kick player, restart game etc.)   </pre>
-                                <pre>0.11.0 ------  Objective: Campaigns and scenarios </pre>
-                                <pre> - Support triggers and events for scenario development. </pre>
-                                <pre> - Extend the map editor to support scenarios. </pre>
-                                <pre> - Backward compatibility for savegames will be assured after this release.</pre>
-                                <pre> - Create a few scenarios.   </pre>
-                                <pre>0.12.0 ------  Objective: Improve gameplay  </pre>
-                                <pre> - Implement feature requests from our community. </pre>
-                                <pre> - Balance the advantages of the different nations.</pre>
-                                <pre> - Create some campaigns. </pre><pre>- Improve AI.  </pre>
-                                <pre>0.13.0 ------  Objective: Easier customization of the game. </pre>
-                                <pre> - Extend the map editor and create editors for units and terrain. </pre>
-                                <pre> - Add other features simplifying modding.  </pre>
-                                <pre>0.14.0 ------  Objective: Improve graphics and audio </pre>
-                                <pre> - Add more sound effects. </pre>
-                                <pre> - Add skins for the colony panel and the Europe panel.   </pre>
-                                <pre>1.0.0 -----  Objective: The final polish :-)  </pre>
-                                <pre> - Add the remaining sfx and music.</pre>
-                                <pre> - Use more illustrations and background images. </pre>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="2" align="left" class="modifydate">
-                            Last Updated ( Friday, 11 January 2013 )
-                        </td>
-                    </tr>
-                </table>
-                <span class="article_seperator">&nbsp;</span>
-                <div class="back_button"><a href='javascript:history.go(-1)'>[ Back ]</a></div>
-            </div>
-        </div>
+    </div>
+    <div id="maincol-wide-800">
         <div class="clr"></div>
-    </div>
-    <div id="sflogo">
-        <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
-    </div>
-    <div id="footer-800">
-        <div align="center" class="footer-copyright">
-            &copy; 2002-2015 FreeCol - <a href="contact.html">Contact Us</a>
+        <div class="content">
+            <a name="content"></a>
+            <table class="contentpaneopen">
+                <tr>
+                    <td class="contentheading" width="100%">Roadmap</td>
+                </tr>
+            </table>
+            <table class="contentpaneopen">
+                <tr>
+                    <td valign="top" colspan="2">
+                        <div align="left">
+                            <div align="justify">
+                                <div class="warningbox">The roadmap below is long out of date and retained for historical interest.</div>
+                                <p>This is a good place though to answer the following FAQ:</p>
+                            </div>
+                        </div>
+                        <div align="left">
+                            Q. When is the next release coming out?<br /><br />
+                            A. This question is discussed on the freecol-developers mailing list.&nbsp; Anyone who wants a detailed understanding of the current issues in FreeCol is more than welcome to subscribe (see <a href="community.html" title="here">/community.html)</a>. The list is low volume, and nicely illustrates that the real answer to this question is almost always `No one knows&#39;.<br /><br />
+                            Q. No, really, surely you have some sort of plan/roadmap/release schedule?<br /><br />
+                            A. Not really.  FreeCol is developed for fun, by a small group of volunteer contributors, at least some of which find the idea of a formal release schedule in a small volunteer project laughably impractical and/or not fun.<br /><br />
+                            Q. Well, alright, can you at least tell us what will be in the next release?<br /><br />
+                            <ul>
+                                <li>A1. Bug fixes.</li>
+                                <li>A2. Read the mailing list and you will know what we have been discussing.</li>
+                                <li>A3. Follow freecol-commits and you will know what we have actually done.</li>
+                                <li>A4. `Whatever catches the various developer&#39;s interest&#39;<br /></li>
+                            </ul>
+                        </div>
+                        <div align="left">
+                            <pre>0.8.0 -----  Objective: Make the game easier to modify </pre>
+                            <pre>Release:   Released, January 14th </pre>
+                            <pre> - Allow the game to be customized using XML-files.</pre>
+                            <pre> - Units now slide between tiles while moving.</pre>
+                            <pre> - New terrain graphics.</pre>
+                            <pre> - Menu music added.</pre>
+                            <pre> - Sound effects for dragoons, artillery capturing a colony, building complete, church and blacksmith.</pre>
+                            <pre> - New sound effects for artillery and buying/selling goods.</pre>
+                            <pre> - Short music clips for Aztecs and fountain of Youth.</pre>
+                            <pre> - Named regions and nicer placement of native settlements.</pre>
+                            <pre> - New nations added: Portuguese, Swedish, Danish and Russian </pre>
+                            <pre> - Games with up to eight European players are now supported. More information:</pre>
+                                <ul>
+                                    <li><pre><a href="http://sourceforge.net/tracker/index.php?func=browse&amp;group_id=43225&amp;atid=435581&amp;_group=749890&amp;sort=DESC&amp;order=artifact_id&amp;_category=100&amp;_status=100&amp;_assigned_to=0&amp;set=custom">Feature requests implemented for this version</a></pre></li>
+                                    <li><pre><a href="http://sourceforge.net/tracker/index.php?func=browse&amp;group_id=43225&amp;atid=435578&amp;_group=749887&amp;sort=DESC&amp;order=artifact_id&amp;_category=100&amp;_status=100&amp;_assigned_to=0&amp;set=custom">Bugs fixed for this version</a></pre></li>
+                                </ul>
+                            <pre>0.9.0 -----  Objective: Improve graphics and audio</pre>
+                            <pre> - New background images, borders and buttons.</pre>
+                            <pre> - Implement feature requests from our users.</pre>
+                            <pre> - Unit combat animations. </pre>
+                            <pre> - Add more sound effects and music.</pre>
+                            <pre> - Opening movie.</pre>
+                            <pre>0.10.0 ------  Objective: Improve the computer players  </pre>
+                            <pre> - Add personalities and better strategy to computer opponents. </pre>
+                            <pre> - Add features for admin (kick player, restart game etc.)   </pre>
+                            <pre>0.11.0 ------  Objective: Campaigns and scenarios </pre>
+                            <pre> - Support triggers and events for scenario development. </pre>
+                            <pre> - Extend the map editor to support scenarios. </pre>
+                            <pre> - Backward compatibility for savegames will be assured after this release.</pre>
+                            <pre> - Create a few scenarios.   </pre>
+                            <pre>0.12.0 ------  Objective: Improve gameplay  </pre>
+                            <pre> - Implement feature requests from our community. </pre>
+                            <pre> - Balance the advantages of the different nations.</pre>
+                            <pre> - Create some campaigns. </pre><pre>- Improve AI.  </pre>
+                            <pre>0.13.0 ------  Objective: Easier customization of the game. </pre>
+                            <pre> - Extend the map editor and create editors for units and terrain. </pre>
+                            <pre> - Add other features simplifying modding.  </pre>
+                            <pre>0.14.0 ------  Objective: Improve graphics and audio </pre>
+                            <pre> - Add more sound effects. </pre>
+                            <pre> - Add skins for the colony panel and the Europe panel.   </pre>
+                            <pre>1.0.0 -----  Objective: The final polish :-)  </pre>
+                            <pre> - Add the remaining sfx and music.</pre>
+                            <pre> - Use more illustrations and background images. </pre>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2" align="left" class="modifydate">
+                        Last Updated ( Friday, 11 January 2013 )
+                    </td>
+                </tr>
+            </table>
+            <span class="article_seperator">&nbsp;</span>
+            <div class="back_button"><a href='javascript:history.go(-1)'>[ Back ]</a></div>
         </div>
     </div>
+    <div class="clr"></div>
+</div>
+<div id="sflogo">
+    <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
+</div>
+<div id="footer-800">
+    <div align="center" class="footer-copyright">
+        &copy; 2002-2015 FreeCol - <a href="contact.html">Contact Us</a>
     </div>
-    </body>
+</div>
+</div>
+</body>
 </html>

From 1196e7fcb55660efeb450565ceb557b8ad71fc3a Mon Sep 17 00:00:00 2001
From: calebrw <calebrw@gmail.com>
Date: Sun, 23 Aug 2015 11:16:05 -0500
Subject: [PATCH 120/323] Cleanup site CSS a bit.

---
 .../templates/freecol/css/template_css.css            | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/www.freecol.org/templates/freecol/css/template_css.css b/www.freecol.org/templates/freecol/css/template_css.css
index dc5200a1d..4b74db734 100644
--- a/www.freecol.org/templates/freecol/css/template_css.css
+++ b/www.freecol.org/templates/freecol/css/template_css.css
@@ -273,9 +273,7 @@ iframe.wrapper {
 
 #rightcol-broad div.module {
     width: 180px;
-    /* background: transparent url(../images/module_middle_wide.jpg) left repeat-y; */
     background: transparent url(../images/vertical-line.jpg) left repeat-y;
-    /*margin-bottom: 10px;*/
     padding-left: 5px;
     padding-bottom: 10px;
 }
@@ -283,28 +281,21 @@ iframe.wrapper {
 #rightcol-broad-top {
     width: 170px;
     padding-left: 5px;
-    /*margin-top: 10px;*/
-    /*background: transparent url(../images/vertical-line.jpg) left repeat-y;
-    padding-bottom: 100%;*/
     background: transparent url(../images/horizontal-line.jpg) bottom repeat-x;
 }
 
 #rightcol-broad-bottom {
     width: 170px;
     padding-left: 5px;
-    /*background: transparent url(../images/vertical-line.jpg) left repeat-y;
-    padding-bottom: 100%;*/
     background: transparent url(../images/horizontal-line.jpg) top repeat-x;
 }
 
 #rightcol-broad div.module div {
     width: 180px;
-    /* background: transparent url(../images/module_top_wide.jpg) top left no-repeat; */
 }
 
 #rightcol-broad div.module div div {
     width: 180px;
-    /* background: transparent url(../images/module_bottom_wide.jpg)  bottom left no-repeat; */
 }
 
 #rightcol-broad div.module div div div {
@@ -757,4 +748,4 @@ div#sflogo {
     right: 1px;
     top: -27px;
     height: 10px;
-}
\ No newline at end of file
+}

From 03840d3591ae5767a53e6ba5c796227522c13566 Mon Sep 17 00:00:00 2001
From: calebrw <calebrw@gmail.com>
Date: Sun, 23 Aug 2015 11:45:59 -0500
Subject: [PATCH 121/323] Cleanup web documentation.

---
 www.freecol.org/documentation/git.html        | 11 ++-
 www.freecol.org/documentation/index.html      |  4 +-
 www.freecol.org/documentation/subversion.html | 24 ++---
 www.freecol.org/how-to-contribute.html        | 95 +++++++++----------
 4 files changed, 62 insertions(+), 72 deletions(-)

diff --git a/www.freecol.org/documentation/git.html b/www.freecol.org/documentation/git.html
index a1971fa32..459757b57 100644
--- a/www.freecol.org/documentation/git.html
+++ b/www.freecol.org/documentation/git.html
@@ -86,21 +86,22 @@
                         <td valign="top" colspan="2">
                             <p align="justify">Git is the tool we use for storing our source code in a&nbsp;<a
                                     href="https://sourceforge.net/p/freecol/git/ci/master/tree/" title="repo">central
-                                location</a> . This system allows everyone to have their own copy of the source code.
+                                location</a>. This system allows everyone to have their own copy of the source code.
                                 You can <a href="http://en.wikipedia.org/wiki/Git_(software)">read more about Git</a> at
                                 Wikipedia. <br/><br/> If you just wish to take a quick look at the the code, you may use
-                                the <a href="https://sourceforge.net/p/freecol/git/">web-based interface</a>. <br/><br/>
+                                the <a href="https://sourceforge.net/p/freecol/git/">web-based interface</a>.
                             </p>
                             <h4>Development branches</h4>
-                            <div class="warningbox">FreeCol no longer normally developed with a trunk branch.</div>
+                            <div class="warningbox">FreeCol no longer normally uses a trunk branch.</div>
                             <p align="justify">We are sometimes developing two versions of FreeCol at the same time: the
                                 main/trunk version and a stable branch. The former will be released as FreeCol x.0 and
                                 will probably be buggy for some time, while the latter is used for creating stable
-                                releases.&nbsp; Usually though only the trunk is being worked on.</p><br/><h4>Download
+                                releases. Usually though only the trunk is being worked on.</p>
+                            <h4>Download
                             and Build</h4>
                             <p align="justify">There are several ways to download a git repository for FreeCol available
                                 <a href="https://sourceforge.net/p/freecol/git/">here</a>. In order to compile the game
-                                you will need a <strong>Java Virtual Machine version 1.7 or higher</strong> and a recent
+                                you will need a <strong>Java Virtual Machine version 1.8 or higher</strong> and a recent
                                 version of <a href="http://ant.apache.org">Ant</a>.</p>
                         </td>
                     </tr>
diff --git a/www.freecol.org/documentation/index.html b/www.freecol.org/documentation/index.html
index df4cc9969..44124f9bb 100644
--- a/www.freecol.org/documentation/index.html
+++ b/www.freecol.org/documentation/index.html
@@ -62,7 +62,7 @@
                     <li>
                         <a class="blogsection" href="freecol-user-manual.html">FreeCol User Manual</a>
                     </li>
-                </ul><br />
+                </ul>
                 <h4 class="link_category">Development Documentation</h4>
                 <ul>
                     <li>
@@ -78,14 +78,12 @@
                         <a class="blogsection" href="trackers-use.html">Tracker Usage</a>
                     </li>
                 </ul>
-                <br />
                 <h4 class="link_category">Code Documentation</h4>
                 <ul>
                     <li>
                         <a class="blogsection" href="javadoc.html">Javadoc</a>
                     </li>
                 </ul>
-                <br />&nbsp;
             </div>
             </td>
             </tr>
diff --git a/www.freecol.org/documentation/subversion.html b/www.freecol.org/documentation/subversion.html
index e2b19aae7..4e2d417cc 100644
--- a/www.freecol.org/documentation/subversion.html
+++ b/www.freecol.org/documentation/subversion.html
@@ -67,19 +67,15 @@
                     <tr>
                         <td valign="top" colspan="2">
                             <div class="warningbox">FreeCol no longer uses Subversion. For the latest documentation on compiling FreeCol, please see our <a href="git.html" title="Git Repository">Git Repository</a>. This information is retained for historical reference.</div>
-                            <p align="justify">Subversion is the tool we use for storing our source code in a central location. This system allows everyone to have their own copy of the source code. You can <a href="http://en.wikipedia.org/wiki/Subversion_(software)" target="wikipedia_subversion">read more about Subversion</a> at Wikipedia.
-                                <br /><br />
-                                If you just wish to take a quick look at the the Subversion repository, you may use the web-based interface: <a href="http://freecol.svn.sourceforge.net/viewvc/freecol/freecol/">Browse Subversion Repository</a>.  <br /><br /> </p>
-                            <h4>Development branches</h4><p>  We are often developing two versions of FreeCol at the same time: the <a href="http://freecol.svn.sourceforge.net/viewvc/freecol/freecol/trunk">main/trunk version</a> and a <a href="http://freecol.svn.sourceforge.net/viewvc/freecol/freecol/branches/0.9.x">stable branch</a>. The former will be released as FreeCol x.0 and will probably be buggy for some time, while the latter is used for creating stable releases.&nbsp; At other times however only the trunk is being worked on.</p>
-                            <p><br /><em>Read more on the <a href="subversion-repository-layout.html">Subversion Repository Layout</a></em>
-                                <br /><br />
-                                <a name="latest" title="latest"></a>
-                            </p>
+                            <p align="justify">Subversion is the tool we use for storing our source code in a central location. This system allows everyone to have their own copy of the source code. You can <a href="http://en.wikipedia.org/wiki/Subversion_(software)" target="wikipedia_subversion">read more about Subversion</a> at Wikipedia.</p>
+                            <p>If you just wish to take a quick look at the the Subversion repository, you may use the web-based interface: <a href="http://freecol.svn.sourceforge.net/viewvc/freecol/freecol/">Browse Subversion Repository</a>.</p>
+                            <h4>Development branches</h4>
+                            <p>We are often developing two versions of FreeCol at the same time: the <a href="http://freecol.svn.sourceforge.net/viewvc/freecol/freecol/trunk">main/trunk version</a> and a <a href="http://freecol.svn.sourceforge.net/viewvc/freecol/freecol/branches/0.9.x">stable branch</a>. The former will be released as FreeCol x.0 and will probably be buggy for some time, while the latter is used for creating stable releases. At other times however only the trunk is being worked on.</p>
+                            <p><em>Read more on the <a href="subversion-repository-layout.html">Subversion Repository Layout</a></em></p>
+                            <a name="latest" title="latest"></a>
                             <h4>Get the latest development version</h4>
-                            <p align="justify">The stability of the trunk might be poor, but is recommended for users who are comfortable with Java development and who would like to test new features and report bugs.&nbsp;  If more stability is desired, it is usually better to work from the current release.
-                                <br /><br />
-                                You need a <a href="http://sourceforge.net/docs/B01/en/svn_client#svn_client" target="sf_subversion">Subversion client</a> in order to get the development version of the game.
-                                <br /><br />
+                            <p align="justify">The stability of the trunk might be poor, but is recommended for users who are comfortable with Java development and who would like to test new features and report bugs. If more stability is desired, it is usually better to work from the current release.</p>
+                            <p>You need a <a href="http://sourceforge.net/docs/B01/en/svn_client#svn_client" target="sf_subversion">Subversion client</a> in order to get the development version of the game.
                             <table border="1">
                                 <tbody>
                                 <tr>
@@ -117,8 +113,8 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <p align="justify">The hash (#) represents your command-line prompt - don&#39;t include it :-)<br /><br />
-                                In order to compile the game you will need a <strong>Java Virtual Machine version 1.7 or higher</strong> from <a href="http://java.sun.com">Sun</a> or <a href="http://openjdk.java.net">OpenJDK</a> and strong>a recent version of <a href="http://ant.apache.org">Ant</a>.
+                            <p align="justify">The hash (#) represents your command-line prompt - don&#39;t include it :-)</p>
+                            <p align="justify">In order to compile the game you will need a <strong>Java Virtual Machine version 1.8</strong> or higher from <a href="http://java.sun.com">Sun</a> or <a href="http://openjdk.java.net">OpenJDK</a> and <strong>a recent version of <a href="http://ant.apache.org">Ant</a></strong>.
                             </p>
                             <br />
                         </td>
diff --git a/www.freecol.org/how-to-contribute.html b/www.freecol.org/how-to-contribute.html
index 3606260b2..1098db7ce 100644
--- a/www.freecol.org/how-to-contribute.html
+++ b/www.freecol.org/how-to-contribute.html
@@ -76,28 +76,27 @@
                 <table class="contentpaneopen">
                     <tr>
                         <td valign="top" colspan="2">
-                            The FreeCol-team is always looking for new people who would like to contribute to our volunteer-based project. No matter what your areas of interests are, we can make use of your skills.<br /><br />This is a list of whom to contact if you want to participate:<br /><br />
+                            The FreeCol-team is always looking for new people who would like to contribute to our volunteer-based project. No matter what your areas of interests are, we can make use of your skills.<br /><br />This is a list of whom to contact if you want to participate:<br />
                             <h4>Programming:</h4>
                             <table border="0">
                                 <tbody>
                                 <tr>
                                     <td width="30">&nbsp;</td>
                                     <td>
-                                        <p>We can always make use of skilled programmers wanting to either submit patches or fully participate in the development of the game.&nbsp; If you are interested in contributing, the usual procedure is:</p>
+                                        <div align="left">We can always make use of skilled programmers wanting to either submit patches or fully participate in the development of the game. If you are interested in contributing, the usual procedure is:</div>
                                         <ul>
-                                            <li>&nbsp;Subscribe to the developer mailing list so you can see what happening/being discussed</li>
-                                            <li>&nbsp;Pick something to work on and send patches to the mailing list</li>
+                                            <li>Subscribe to the developer mailing list so you can see what happening/being discussed</li>
+                                            <li>Pick something to work on and send patches to the mailing list</li>
                                             <li>
                                                 <ul>
                                                     <li>Start small until you have a broad familiarity with the codebase</li>
                                                     <li>Bugfixes are preferred over new functionality</li>
-                                                    <li>&nbsp;The AI code is notoriously tricky and not recommended for starting projects</li>
+                                                    <li>The AI code is notoriously tricky and not recommended for starting projects</li>
                                                 </ul>
                                             </li>
-                                            <li>&nbsp;After &lt;small number&gt; of useful patches, people tend to get added to the project, with write commit privilege.</li>
+                                            <li>After &lt;small number&gt; of useful patches, people tend to get added to the project, with write commit privilege.</li>
                                         </ul>
-                                        <br />
-                                        <p>&nbsp;<em>Please contact: </em><em>
+                                        <p><em>Please contact: </em><em>
                                             <script language='JavaScript' type='text/javascript'>
                                                 <!--
                                                 var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
@@ -125,14 +124,13 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <br />
                             <h4>Graphics:</h4>
                             <table border="0">
                                 <tbody>
                                 <tr>
                                     <td width="30">&nbsp;</td>
                                     <td>
-                                        <p>You can help develop the visual appearance of the game by making terrain graphics, background images and illustrations. Use your creativity and help define the graphical appearance of the game.&nbsp;&nbsp;There are open bugs for missing animations (bug report #1011)&nbsp; and images (smaller fort/fortress, BR#2049).</p>
+                                        <div align="left">You can help develop the visual appearance of the game by making terrain graphics, background images and illustrations. Use your creativity and help define the graphical appearance of the game.&nbsp;&nbsp;There are open bugs for missing animations (bug report #1011) and images (smaller fort/fortress, BR#2049).</div>
                                         <p><em>Please contact:
                                             <script language='JavaScript' type='text/javascript'>
                                                 <!--
@@ -161,45 +159,12 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <br />
                             <h4>Music and Sound Effects:</h4>
                             <table border="0">
                                 <tbody>
                                 <tr>
                                     <td width="30">&nbsp;</td>
                                     <td><em>Please contact:
-                                        <script language='JavaScript' type='text/javascript'>
-                                            <!--
-                                            var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
-                                            var path = 'hr' + 'ef' + '=';
-                                            var addy13036 = '&#105;c&#111;' + '&#64;';
-                                            addy13036 = addy13036 + 'b&#117;kv&#105;c' + '&#46;' + 'n&#101;t';
-                                            var addy_text13036 = 'Ivica Ico Bukvic';
-                                            document.write( '<a ' + path + '\'' + prefix + ':' + addy13036 + '\'>' );
-                                            document.write( addy_text13036 );
-                                            document.write( '<\/a>' );
-                                            document.write( '<span style=\'display: none;\'>' );
-                                            //-->
-                                        </script>This e-mail address is being protected from spam bots, you need JavaScript enabled to view it
-                                        <script language='JavaScript' type='text/javascript'>
-                                            <!--
-                                            document.write( '</' );
-                                            document.write( 'span>' );
-                                            //-->
-                                        </script>
-                                    </em>
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                            <br />
-                            <h4>Content Writers:</h4>
-                            <table border="0">
-                                <tbody>
-                                <tr>
-                                    <td width="30">&nbsp;</td>
-                                    <td>
-                                        <p>Add historical facts and write texts that truly defines the complete gaming experience. Learn more about American history and share your knowledge in an exciting manner.&nbsp;</p><p>The lists of native settlement names would benefit from attention from someone who actually knows something about native American history.</p><p><em style="text-align: center">Please contact: </em><em style="text-align: center">
                                         <script language='JavaScript' type='text/javascript'>
                                             <!--
                                             var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
@@ -211,18 +176,53 @@
                                             document.write( addy_text20668 );
                                             document.write( '<\/a>' );
                                             document.write( '<span style=\'display: none;\'>' );
+                                            //-->
+                                        </script>
+                                        This e-mail address is being protected from spam bots, you need JavaScript enabled to view it
+                                        <script language='JavaScript' type='text/javascript'>
+                                            <!--
+                                            document.write( '</' );
+                                            document.write( 'span>' );
+                                            //-->
+                                        </script>
+                                    </em>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <h4>Content Writers:</h4>
+                            <table border="0">
+                                <tbody>
+                                <tr>
+                                    <td width="30">&nbsp;</td>
+                                    <td>
+                                        <div align="left">Add historical facts and write texts that truly defines the complete gaming experience. Learn more about American history and share your knowledge in an exciting manner.&nbsp;</div><p>The lists of native settlement names would benefit from attention from someone who actually knows something about native American history.</p><p><em style="text-align: center">Please contact: </em><em style="text-align: center">
+                                        <script language='JavaScript' type='text/javascript'>
+                                            <!--
+                                            var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
+                                            var path = 'hr' + 'ef' + '=';
+                                            var addy20668 = 'fr&#101;&#101;c&#111;l-d&#101;v&#101;l&#111;p&#101;rs' + '&#64;';
+                                            addy20668 = addy20668 + 'l&#105;sts' + '&#46;' + 's&#111;&#117;rc&#101;f&#111;rg&#101;' + '&#46;' + 'n&#101;t';
+                                            var addy_text20668 = 'The developers mailing list';
+                                            document.write( '<a ' + path + '\'' + prefix + ':' + addy20668 + '\'>' );
+                                            document.write( addy_text20668 );
+                                            document.write( '<\/a>' );
+                                            document.write( '<span style=\'display: none;\'>' );
+                                            //-->
+                                        </script>
+                                        This e-mail address is being protected from spam bots, you need JavaScript enabled to view it.
+                                        <script language='JavaScript' type='text/javascript'>
+                                            <!--
                                             document.write( '</' );
                                             document.write( 'span>' );
                                             //-->
                                         </script>
-                                        This e-mail address is being protected from spam bots, you need JavaScript enabled to view it
                                     </em>
                                     </p>
                                     </td>
                                 </tr>
                                 </tbody>
                             </table>
-                            <br />
                             <h4>Translations:</h4>
                             <table border="0">
                                 <tbody>
@@ -234,7 +234,6 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <br />
                             <a name="website" title="website"></a>
                             <h4>Website:</h4>
                             <table border="0">
@@ -248,7 +247,6 @@
                                             <li>Graphic Design</li>
                                             <li>Human-computer interaction</li>
                                         </ul>
-                                        <br />
                                         <em>Feel free to join the discussions on the
                                             <script language='JavaScript' type='text/javascript'>
                                                 <!--
@@ -273,7 +271,6 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <br />
                             <h4>Testing:</h4>
                             <table border="0">
                                 <tbody>
@@ -305,8 +302,6 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <p>&nbsp;</p>
-
                         </td>
                     </tr>
                 </table>

From 143f6361b2bf2d9ef433cde0c8cd3086590d99dc Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 24 Aug 2015 20:39:09 +0200
Subject: [PATCH 122/323] Clean up all unused imports

---
 src/net/sf/freecol/FreeCol.java                          | 4 ----
 src/net/sf/freecol/client/control/InGameController.java  | 2 --
 .../sf/freecol/client/control/InGameInputHandler.java    | 3 ---
 src/net/sf/freecol/client/control/PreGameController.java | 1 -
 src/net/sf/freecol/client/gui/action/ActionManager.java  | 1 -
 src/net/sf/freecol/client/gui/menu/DebugMenu.java        | 4 +---
 src/net/sf/freecol/client/gui/panel/AboutPanel.java      | 1 -
 .../sf/freecol/client/gui/panel/BuildingDetailPanel.java | 2 --
 .../client/gui/panel/ColopediaGameObjectTypePanel.java   | 1 -
 src/net/sf/freecol/client/gui/panel/EuropePanel.java     | 1 -
 src/net/sf/freecol/client/gui/panel/RecruitPanel.java    | 3 ++-
 .../client/gui/panel/ReportClassicColonyPanel.java       | 2 +-
 .../client/gui/panel/ReportCompactColonyPanel.java       | 1 -
 src/net/sf/freecol/client/gui/panel/ReportPanel.java     | 4 +---
 .../client/gui/panel/ReportRequirementsPanel.java        | 2 +-
 .../sf/freecol/client/gui/panel/ReportTradePanel.java    | 1 -
 src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java | 1 -
 .../sf/freecol/client/gui/panel/SelectAmountDialog.java  | 1 -
 src/net/sf/freecol/client/gui/panel/StatisticsPanel.java | 3 +--
 src/net/sf/freecol/client/gui/panel/WarehouseDialog.java | 1 -
 src/net/sf/freecol/common/i18n/Messages.java             | 1 -
 src/net/sf/freecol/common/i18n/NameCache.java            | 2 +-
 src/net/sf/freecol/common/io/FreeColDataFile.java        | 1 -
 src/net/sf/freecol/common/model/Colony.java              | 3 ++-
 src/net/sf/freecol/common/model/Operand.java             | 2 --
 src/net/sf/freecol/common/model/Player.java              | 4 ++--
 src/net/sf/freecol/common/model/Specification.java       | 3 ---
 src/net/sf/freecol/common/model/Stance.java              | 2 +-
 src/net/sf/freecol/common/model/Tile.java                | 3 +--
 src/net/sf/freecol/common/model/Turn.java                | 1 -
 src/net/sf/freecol/common/model/WorkLocation.java        | 1 -
 src/net/sf/freecol/common/option/SelectOption.java       | 1 -
 src/net/sf/freecol/server/ai/AIGoods.java                | 1 -
 src/net/sf/freecol/server/ai/EuropeanAIPlayer.java       | 9 ++-------
 src/net/sf/freecol/server/control/ChangeSet.java         | 1 -
 src/net/sf/freecol/server/control/InGameController.java  | 3 ++-
 .../sf/freecol/server/generator/TerrainGenerator.java    | 3 ++-
 src/net/sf/freecol/server/model/MonarchSession.java      | 2 --
 src/net/sf/freecol/server/model/ServerGame.java          | 1 -
 .../sf/freecol/server/model/ServerIndianSettlement.java  | 5 ++---
 src/net/sf/freecol/server/model/ServerRegion.java        | 2 --
 src/net/sf/freecol/tools/GenerateDocumentation.java      | 1 -
 test/src/net/sf/freecol/common/i18n/MessagesTest.java    | 1 -
 43 files changed, 22 insertions(+), 70 deletions(-)

diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index bc7ea1ff1..3cf22c516 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -28,11 +28,9 @@ import java.io.InputStream;
 import java.io.IOException;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.net.InetAddress;
-import java.net.JarURLConnection;
 import java.net.URL;
 import java.net.JarURLConnection;
 import java.util.Locale;
-import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 import java.util.logging.Handler;
@@ -46,7 +44,6 @@ import net.sf.freecol.common.FreeColException;
 import net.sf.freecol.common.FreeColSeed;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
-import net.sf.freecol.common.i18n.NameCache;
 import net.sf.freecol.common.io.FreeColDirectories;
 import net.sf.freecol.common.io.FreeColSavegameFile;
 import net.sf.freecol.common.io.FreeColTcFile;
@@ -55,7 +52,6 @@ import net.sf.freecol.common.logging.DefaultHandler;
 import net.sf.freecol.common.model.NationOptions.Advantages;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
-import net.sf.freecol.common.model.Turn;
 import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.server.FreeColServer;
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 77ffac7ad..70046453b 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -21,7 +21,6 @@ package net.sf.freecol.client.control;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -63,7 +62,6 @@ import net.sf.freecol.common.model.GameOptions;
 import net.sf.freecol.common.model.GoldTradeItem;
 import net.sf.freecol.common.model.Goods;
 import net.sf.freecol.common.model.GoodsType;
-import net.sf.freecol.common.model.HighScore;
 import net.sf.freecol.common.model.IndianSettlement;
 import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.LostCityRumour;
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index 24c42d720..981c2d662 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -24,10 +24,8 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.common.debug.FreeColDebugger;
-import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.DiplomaticTrade;
@@ -46,7 +44,6 @@ import net.sf.freecol.common.model.Stance;
 import net.sf.freecol.common.model.Region;
 import net.sf.freecol.common.model.Settlement;
 import net.sf.freecol.common.model.Specification;
-import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.TradeRoute;
 import net.sf.freecol.common.model.Unit;
diff --git a/src/net/sf/freecol/client/control/PreGameController.java b/src/net/sf/freecol/client/control/PreGameController.java
index 9cdb7594b..6a36aa630 100644
--- a/src/net/sf/freecol/client/control/PreGameController.java
+++ b/src/net/sf/freecol/client/control/PreGameController.java
@@ -28,7 +28,6 @@ import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.GameOptions;
-import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.Nation;
 import net.sf.freecol.common.model.NationOptions.NationState;
 import net.sf.freecol.common.model.NationType;
diff --git a/src/net/sf/freecol/client/gui/action/ActionManager.java b/src/net/sf/freecol/client/gui/action/ActionManager.java
index 52fef4079..1eba723c9 100644
--- a/src/net/sf/freecol/client/gui/action/ActionManager.java
+++ b/src/net/sf/freecol/client/gui/action/ActionManager.java
@@ -19,7 +19,6 @@
 
 package net.sf.freecol.client.gui.action;
 
-import java.util.Iterator;
 import java.util.logging.Logger;
 
 import net.sf.freecol.client.FreeColClient;
diff --git a/src/net/sf/freecol/client/gui/menu/DebugMenu.java b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
index 63d2f637c..ec9a4891a 100644
--- a/src/net/sf/freecol/client/gui/menu/DebugMenu.java
+++ b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
@@ -24,9 +24,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.logging.Logger;
@@ -50,6 +47,7 @@ import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.resources.ImageResource;
 import net.sf.freecol.common.resources.ResourceManager;
+
 import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
diff --git a/src/net/sf/freecol/client/gui/panel/AboutPanel.java b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
index 8e1f79f16..4c79009db 100644
--- a/src/net/sf/freecol/client/gui/panel/AboutPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
@@ -38,7 +38,6 @@ import net.miginfocom.swing.MigLayout;
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.FontLibrary;
-import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.resources.ResourceManager;
 
 
diff --git a/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java b/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java
index d6e185709..fff93e1b0 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java
@@ -21,7 +21,6 @@ package net.sf.freecol.client.gui.panel;
 
 import java.awt.Dimension;
 import java.awt.Font;
-import java.awt.Image;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -53,7 +52,6 @@ import net.sf.freecol.common.model.Modifier;
 import net.sf.freecol.common.model.ProductionType;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.UnitType;
-import net.sf.freecol.common.resources.ResourceManager;
 
 
 /**
diff --git a/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java b/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java
index 932355cae..1071def06 100644
--- a/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java
@@ -19,7 +19,6 @@
 
 package net.sf.freecol.client.gui.panel;
 
-import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
diff --git a/src/net/sf/freecol/client/gui/panel/EuropePanel.java b/src/net/sf/freecol/client/gui/panel/EuropePanel.java
index 849b49c1e..1e32a5158 100644
--- a/src/net/sf/freecol/client/gui/panel/EuropePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/EuropePanel.java
@@ -50,7 +50,6 @@ import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController.BoycottAction;
 import net.sf.freecol.client.gui.Canvas;
-import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Europe;
diff --git a/src/net/sf/freecol/client/gui/panel/RecruitPanel.java b/src/net/sf/freecol/client/gui/panel/RecruitPanel.java
index fe31b73b9..77c9af82f 100644
--- a/src/net/sf/freecol/client/gui/panel/RecruitPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/RecruitPanel.java
@@ -21,10 +21,11 @@ package net.sf.freecol.client.gui.panel;
 
 import java.awt.event.ActionEvent;
 import java.util.logging.Logger;
+
 import javax.swing.ImageIcon;
 
 import javax.swing.JButton;
-import javax.swing.JTextArea;
+
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
diff --git a/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
index 1b701d7ad..3f174a4cb 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.client.gui.panel;
 
 import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import java.util.ArrayList;
@@ -32,6 +31,7 @@ import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
+
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index 98d097b2f..40a6d7812 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -43,7 +43,6 @@ import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.ImageLibrary;
-import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.AbstractGoods;
diff --git a/src/net/sf/freecol/client/gui/panel/ReportPanel.java b/src/net/sf/freecol/client/gui/panel/ReportPanel.java
index 6e758eabe..93e3fe93e 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportPanel.java
@@ -31,17 +31,15 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
+
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.AbstractUnit;
-import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.Europe;
 import net.sf.freecol.common.model.FreeColGameObject;
-import net.sf.freecol.common.model.IndianSettlement;
 import net.sf.freecol.common.model.Map;
-import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.UnitType;
 
diff --git a/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java b/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
index 5e630e8d3..8f516feec 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java
@@ -32,6 +32,7 @@ import javax.swing.JButton;
 import javax.swing.JTextPane;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
+
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
@@ -43,7 +44,6 @@ import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.Colony.TileImprovementSuggestion;
 import net.sf.freecol.common.model.ColonyTile;
 import net.sf.freecol.common.model.GoodsType;
-import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.ProductionInfo;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
diff --git a/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java b/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
index f2f15f7b8..8b74cfcf5 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
@@ -27,7 +27,6 @@ import java.util.List;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 
diff --git a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
index 874161578..229603667 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
@@ -44,7 +44,6 @@ import net.miginfocom.swing.MigLayout;
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.FontLibrary;
-import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.Europe;
diff --git a/src/net/sf/freecol/client/gui/panel/SelectAmountDialog.java b/src/net/sf/freecol/client/gui/panel/SelectAmountDialog.java
index 2a367812f..0afb832be 100644
--- a/src/net/sf/freecol/client/gui/panel/SelectAmountDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/SelectAmountDialog.java
@@ -30,7 +30,6 @@ import javax.swing.JTextArea;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.GoodsType;
 import net.sf.freecol.common.model.Player;
 
diff --git a/src/net/sf/freecol/client/gui/panel/StatisticsPanel.java b/src/net/sf/freecol/client/gui/panel/StatisticsPanel.java
index 523e25007..ac8fd6f3b 100644
--- a/src/net/sf/freecol/client/gui/panel/StatisticsPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/StatisticsPanel.java
@@ -23,9 +23,7 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.logging.Logger;
@@ -40,6 +38,7 @@ import javax.swing.table.AbstractTableModel;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.common.i18n.Messages;
+
 import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
diff --git a/src/net/sf/freecol/client/gui/panel/WarehouseDialog.java b/src/net/sf/freecol/client/gui/panel/WarehouseDialog.java
index c63da19fb..e228e3a15 100644
--- a/src/net/sf/freecol/client/gui/panel/WarehouseDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/WarehouseDialog.java
@@ -34,7 +34,6 @@ import javax.swing.SpinnerNumberModel;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.Colony;
diff --git a/src/net/sf/freecol/common/i18n/Messages.java b/src/net/sf/freecol/common/i18n/Messages.java
index c6123f53e..05dc46b00 100644
--- a/src/net/sf/freecol/common/i18n/Messages.java
+++ b/src/net/sf/freecol/common/i18n/Messages.java
@@ -41,7 +41,6 @@ import net.sf.freecol.common.io.FreeColDirectories;
 import net.sf.freecol.common.io.FreeColDataFile;
 import net.sf.freecol.common.io.FreeColModFile;
 import net.sf.freecol.common.io.Mods;
-import net.sf.freecol.common.model.FreeColObject;
 import net.sf.freecol.common.model.Named;
 import net.sf.freecol.common.model.Role;
 import net.sf.freecol.common.model.StringTemplate;
diff --git a/src/net/sf/freecol/common/i18n/NameCache.java b/src/net/sf/freecol/common/i18n/NameCache.java
index 6a284eb42..72cf8756c 100644
--- a/src/net/sf/freecol/common/i18n/NameCache.java
+++ b/src/net/sf/freecol/common/i18n/NameCache.java
@@ -32,8 +32,8 @@ import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Region;
 import net.sf.freecol.common.model.Region.RegionType;
 import net.sf.freecol.common.model.StringTemplate;
-import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.UnitType;
+
 import static net.sf.freecol.common.util.RandomUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
 
diff --git a/src/net/sf/freecol/common/io/FreeColDataFile.java b/src/net/sf/freecol/common/io/FreeColDataFile.java
index b682c9948..180197167 100644
--- a/src/net/sf/freecol/common/io/FreeColDataFile.java
+++ b/src/net/sf/freecol/common/io/FreeColDataFile.java
@@ -40,7 +40,6 @@ import java.util.jar.JarFile;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.sf.freecol.common.resources.Resource;
 import net.sf.freecol.common.resources.ResourceFactory;
 import net.sf.freecol.common.resources.ResourceMapper;
 import net.sf.freecol.common.resources.ResourceMapping;
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 17c6b49c1..3423202d1 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -26,7 +26,6 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.logging.Level;
@@ -38,7 +37,9 @@ import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.Occupation;
 import net.sf.freecol.common.model.Stance;
+
 import static net.sf.freecol.common.util.CollectionUtils.*;
+
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.common.util.RandomChoice;
 
diff --git a/src/net/sf/freecol/common/model/Operand.java b/src/net/sf/freecol/common/model/Operand.java
index dcb81087b..55bfb41ca 100644
--- a/src/net/sf/freecol/common/model/Operand.java
+++ b/src/net/sf/freecol/common/model/Operand.java
@@ -21,7 +21,6 @@ package net.sf.freecol.common.model;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.stream.XMLStreamException;
@@ -29,7 +28,6 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.util.Utils;
-import static net.sf.freecol.common.util.StringUtils.*;
 
 
 /**
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 150a998df..3efb51d39 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -41,11 +41,11 @@ import net.sf.freecol.common.i18n.NameCache;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.NationOptions.NationState;
-import net.sf.freecol.common.model.Region.RegionType;
 import net.sf.freecol.common.option.OptionGroup;
+
 import static net.sf.freecol.common.util.CollectionUtils.*;
-import static net.sf.freecol.common.util.RandomUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
+
 import net.sf.freecol.common.util.Utils;
 
 import org.w3c.dom.Element;
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index a147d6aa5..7f0b58945 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -38,14 +38,11 @@ import java.util.logging.Logger;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 
-import net.sf.freecol.FreeCol;
 import net.sf.freecol.common.io.FreeColDirectories;
 import net.sf.freecol.common.io.FreeColModFile;
 import net.sf.freecol.common.io.FreeColTcFile;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
-import net.sf.freecol.common.i18n.Messages;
-import net.sf.freecol.common.i18n.NameCache;
 import net.sf.freecol.common.model.NationOptions.Advantages;
 import net.sf.freecol.common.option.AbstractOption;
 import net.sf.freecol.common.option.AbstractUnitOption;
diff --git a/src/net/sf/freecol/common/model/Stance.java b/src/net/sf/freecol/common/model/Stance.java
index 1ad71b140..56054488f 100644
--- a/src/net/sf/freecol/common/model/Stance.java
+++ b/src/net/sf/freecol/common/model/Stance.java
@@ -20,9 +20,9 @@
 package net.sf.freecol.common.model;
 
 import net.sf.freecol.common.i18n.Messages;
-import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Named;
 import net.sf.freecol.common.model.Tension;
+
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 3b14610fb..15aa4f045 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -34,12 +34,11 @@ import java.util.logging.Logger;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 
-import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.Direction;
-import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.common.util.RandomChoice;
+
 import static net.sf.freecol.common.util.RandomUtils.*;
 
 
diff --git a/src/net/sf/freecol/common/model/Turn.java b/src/net/sf/freecol/common/model/Turn.java
index 80f26ab3a..edbe9bcb3 100644
--- a/src/net/sf/freecol/common/model/Turn.java
+++ b/src/net/sf/freecol/common/model/Turn.java
@@ -21,7 +21,6 @@ package net.sf.freecol.common.model;
 
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.i18n.NameCache;
-import static net.sf.freecol.common.util.StringUtils.*;
 
 
 /**
diff --git a/src/net/sf/freecol/common/model/WorkLocation.java b/src/net/sf/freecol/common/model/WorkLocation.java
index 22307982d..3c6a1571b 100644
--- a/src/net/sf/freecol/common/model/WorkLocation.java
+++ b/src/net/sf/freecol/common/model/WorkLocation.java
@@ -19,7 +19,6 @@
 
 package net.sf.freecol.common.model;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/src/net/sf/freecol/common/option/SelectOption.java b/src/net/sf/freecol/common/option/SelectOption.java
index 339ba9101..55758bc70 100644
--- a/src/net/sf/freecol/common/option/SelectOption.java
+++ b/src/net/sf/freecol/common/option/SelectOption.java
@@ -22,7 +22,6 @@ package net.sf.freecol.common.option;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.stream.XMLStreamException;
diff --git a/src/net/sf/freecol/server/ai/AIGoods.java b/src/net/sf/freecol/server/ai/AIGoods.java
index e51dc70f2..2a7a9280a 100644
--- a/src/net/sf/freecol/server/ai/AIGoods.java
+++ b/src/net/sf/freecol/server/ai/AIGoods.java
@@ -30,7 +30,6 @@ import net.sf.freecol.common.model.Europe;
 import net.sf.freecol.common.model.FreeColGameObject;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.Goods;
-import net.sf.freecol.common.model.GoodsContainer;
 import net.sf.freecol.common.model.GoodsType;
 import net.sf.freecol.common.model.Locatable;
 import net.sf.freecol.common.model.Location;
diff --git a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
index ce3e3dca2..a148d78ed 100644
--- a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
@@ -37,11 +37,8 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.model.Ability;
-import net.sf.freecol.common.model.AbstractGoods;
 import net.sf.freecol.common.model.Building;
 import net.sf.freecol.common.model.Colony;
-import net.sf.freecol.common.model.ColonyTile;
-import net.sf.freecol.common.model.ColonyTradeItem;
 import net.sf.freecol.common.model.DiplomaticTrade;
 import net.sf.freecol.common.model.DiplomaticTrade.TradeStatus;
 import net.sf.freecol.common.model.Europe;
@@ -51,10 +48,8 @@ import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.GameOptions;
 import net.sf.freecol.common.model.GoldTradeItem;
 import net.sf.freecol.common.model.Goods;
-import net.sf.freecol.common.model.GoodsTradeItem;
 import net.sf.freecol.common.model.GoodsType;
 import net.sf.freecol.common.model.HistoryEvent;
-import net.sf.freecol.common.model.InciteTradeItem;
 import net.sf.freecol.common.model.IndianSettlement;
 import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.Map;
@@ -75,16 +70,16 @@ import net.sf.freecol.common.model.TradeItem;
 import net.sf.freecol.common.model.Turn;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.Unit.UnitState;
-import net.sf.freecol.common.model.UnitTradeItem;
 import net.sf.freecol.common.model.UnitType;
-import net.sf.freecol.common.model.WorkLocation;
 import net.sf.freecol.common.model.pathfinding.CostDeciders;
 import net.sf.freecol.common.model.pathfinding.GoalDeciders;
 import net.sf.freecol.common.networking.NetworkConstants;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.common.util.RandomChoice;
+
 import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.RandomUtils.*;
+
 import net.sf.freecol.server.ai.mission.BuildColonyMission;
 import net.sf.freecol.server.ai.mission.CashInTreasureTrainMission;
 import net.sf.freecol.server.ai.mission.DefendSettlementMission;
diff --git a/src/net/sf/freecol/server/control/ChangeSet.java b/src/net/sf/freecol/server/control/ChangeSet.java
index bf26da18b..af421a6a9 100644
--- a/src/net/sf/freecol/server/control/ChangeSet.java
+++ b/src/net/sf/freecol/server/control/ChangeSet.java
@@ -41,7 +41,6 @@ import net.sf.freecol.common.model.Modifier;
 import net.sf.freecol.common.model.Ownable;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Stance;
-import net.sf.freecol.common.model.Region;
 import net.sf.freecol.common.model.Settlement;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.TradeRoute;
diff --git a/src/net/sf/freecol/server/control/InGameController.java b/src/net/sf/freecol/server/control/InGameController.java
index cf4590a57..1f00f548b 100644
--- a/src/net/sf/freecol/server/control/InGameController.java
+++ b/src/net/sf/freecol/server/control/InGameController.java
@@ -41,7 +41,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.sf.freecol.FreeCol;
-import net.sf.freecol.common.FreeColException;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.i18n.NameCache;
@@ -118,8 +117,10 @@ import net.sf.freecol.common.networking.RearrangeColonyMessage.UnitChange;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.common.util.RandomChoice;
 import net.sf.freecol.common.util.Utils;
+
 import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.RandomUtils.*;
+
 import net.sf.freecol.server.FreeColServer;
 import net.sf.freecol.server.ai.AIPlayer;
 import net.sf.freecol.server.ai.REFAIPlayer;
diff --git a/src/net/sf/freecol/server/generator/TerrainGenerator.java b/src/net/sf/freecol/server/generator/TerrainGenerator.java
index 1c8f2952a..5dc9a2479 100644
--- a/src/net/sf/freecol/server/generator/TerrainGenerator.java
+++ b/src/net/sf/freecol/server/generator/TerrainGenerator.java
@@ -19,7 +19,6 @@
 
 package net.sf.freecol.server.generator;
 
-import java.awt.Rectangle;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.EnumMap;
@@ -46,7 +45,9 @@ import net.sf.freecol.common.option.MapGeneratorOptions;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.common.util.RandomChoice;
+
 import static net.sf.freecol.common.util.RandomUtils.*;
+
 import net.sf.freecol.server.model.ServerRegion;
 
 
diff --git a/src/net/sf/freecol/server/model/MonarchSession.java b/src/net/sf/freecol/server/model/MonarchSession.java
index 1e913ae3b..5a9e8ca65 100644
--- a/src/net/sf/freecol/server/model/MonarchSession.java
+++ b/src/net/sf/freecol/server/model/MonarchSession.java
@@ -24,10 +24,8 @@ import java.util.logging.Logger;
 
 import net.sf.freecol.common.model.AbstractUnit;
 import net.sf.freecol.common.model.Goods;
-import net.sf.freecol.common.model.ModelMessage;
 import net.sf.freecol.common.model.Monarch.MonarchAction;
 import net.sf.freecol.server.control.ChangeSet;
-import net.sf.freecol.server.control.ChangeSet.See;
 
 
 /**
diff --git a/src/net/sf/freecol/server/model/ServerGame.java b/src/net/sf/freecol/server/model/ServerGame.java
index cf39c500f..79934e17d 100644
--- a/src/net/sf/freecol/server/model/ServerGame.java
+++ b/src/net/sf/freecol/server/model/ServerGame.java
@@ -54,7 +54,6 @@ import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
 import net.sf.freecol.common.util.LogBuilder;
-import static net.sf.freecol.common.util.RandomUtils.*;
 import net.sf.freecol.server.control.ChangeSet;
 import net.sf.freecol.server.control.ChangeSet.ChangePriority;
 import net.sf.freecol.server.control.ChangeSet.See;
diff --git a/src/net/sf/freecol/server/model/ServerIndianSettlement.java b/src/net/sf/freecol/server/model/ServerIndianSettlement.java
index 4e0c076a6..9da3db774 100644
--- a/src/net/sf/freecol/server/model/ServerIndianSettlement.java
+++ b/src/net/sf/freecol/server/model/ServerIndianSettlement.java
@@ -33,17 +33,16 @@ import net.sf.freecol.common.model.ModelMessage;
 import net.sf.freecol.common.model.Modifier;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Role;
-import net.sf.freecol.common.model.Settlement;
 import net.sf.freecol.common.model.Specification;
-import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Tension;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Turn;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.UnitType;
-import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
 import net.sf.freecol.common.util.LogBuilder;
+
 import static net.sf.freecol.common.util.RandomUtils.*;
+
 import net.sf.freecol.server.control.ChangeSet;
 import net.sf.freecol.server.control.ChangeSet.See;
 
diff --git a/src/net/sf/freecol/server/model/ServerRegion.java b/src/net/sf/freecol/server/model/ServerRegion.java
index 557d77986..8e0eca163 100644
--- a/src/net/sf/freecol/server/model/ServerRegion.java
+++ b/src/net/sf/freecol/server/model/ServerRegion.java
@@ -26,7 +26,6 @@ import java.util.Queue;
 
 import java.awt.Rectangle;
 
-import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.GameOptions;
@@ -36,7 +35,6 @@ import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Region;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Turn;
-import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.server.control.ChangeSet;
 import net.sf.freecol.server.control.ChangeSet.See;
 import net.sf.freecol.common.util.LogBuilder;
diff --git a/src/net/sf/freecol/tools/GenerateDocumentation.java b/src/net/sf/freecol/tools/GenerateDocumentation.java
index 72fbbe157..ed09ecdc9 100644
--- a/src/net/sf/freecol/tools/GenerateDocumentation.java
+++ b/src/net/sf/freecol/tools/GenerateDocumentation.java
@@ -33,7 +33,6 @@ import javax.xml.transform.stream.StreamSource;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 
diff --git a/test/src/net/sf/freecol/common/i18n/MessagesTest.java b/test/src/net/sf/freecol/common/i18n/MessagesTest.java
index 84ca10cff..bc0deb49c 100644
--- a/test/src/net/sf/freecol/common/i18n/MessagesTest.java
+++ b/test/src/net/sf/freecol/common/i18n/MessagesTest.java
@@ -32,7 +32,6 @@ import net.sf.freecol.common.model.HistoryEvent;
 import net.sf.freecol.common.model.Monarch;
 import net.sf.freecol.common.model.Nation;
 import net.sf.freecol.common.model.Role;
-import net.sf.freecol.common.model.Turn;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.Unit.UnitLabelType;
 import net.sf.freecol.common.model.UnitType;

From a49621fb5f9c05c2935842f56c140680d6aced8b Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 24 Aug 2015 20:55:52 +0200
Subject: [PATCH 123/323] Rename ImageLibrary.scalingFactor for consistency
 with other classes

---
 .../sf/freecol/client/gui/ChatDisplay.java    |   2 +-
 .../sf/freecol/client/gui/ImageLibrary.java   | 100 +++++++++---------
 src/net/sf/freecol/client/gui/MapViewer.java  |  52 ++++-----
 src/net/sf/freecol/client/gui/SwingGUI.java   |   2 +-
 src/net/sf/freecol/client/gui/TilePopup.java  |   6 +-
 .../client/gui/menu/InGameMenuBar.java        |   2 +-
 .../freecol/client/gui/panel/AboutPanel.java  |   4 +-
 .../client/gui/panel/BuildQueuePanel.java     |   2 +-
 .../client/gui/panel/BuildingPanel.java       |   2 +-
 .../client/gui/panel/BuildingToolTip.java     |   4 +-
 .../freecol/client/gui/panel/ColonyPanel.java |  10 +-
 .../client/gui/panel/ColopediaPanel.java      |   4 +-
 .../client/gui/panel/ConstructionPanel.java   |   2 +-
 .../freecol/client/gui/panel/EuropePanel.java |   2 +-
 .../freecol/client/gui/panel/InfoPanel.java   |   6 +-
 .../client/gui/panel/NegotiationDialog.java   |   2 +-
 .../client/gui/panel/PreCombatDialog.java     |   2 +-
 .../client/gui/panel/ProductionLabel.java     |   2 +-
 .../gui/panel/ReportExplorationPanel.java     |   2 +-
 .../gui/panel/ReportForeignAffairPanel.java   |   2 +-
 .../client/gui/panel/ReportIndianPanel.java   |   6 +-
 .../freecol/client/gui/panel/ReportPanel.java |   2 +-
 .../gui/panel/ReportReligiousPanel.java       |   2 +-
 .../client/gui/panel/ReportTradePanel.java    |   2 +-
 .../gui/panel/TradeRouteInputPanel.java       |   2 +-
 .../freecol/client/gui/panel/UnitLabel.java   |   2 +-
 .../client/gui/panel/WorkProductionPanel.java |   2 +-
 27 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/ChatDisplay.java b/src/net/sf/freecol/client/gui/ChatDisplay.java
index fbf0e86f4..32d1dc77f 100644
--- a/src/net/sf/freecol/client/gui/ChatDisplay.java
+++ b/src/net/sf/freecol/client/gui/ChatDisplay.java
@@ -93,7 +93,7 @@ public class ChatDisplay {
         if (getMessageCount() > 0) {
             // Don't edit the list of messages while I'm drawing them.
             Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-                FontLibrary.FontSize.TINY, lib.getScalingFactor());
+                FontLibrary.FontSize.TINY, lib.getScaleFactor());
             GUIMessage message = getMessage(0);
             Image si = lib.getStringImage(
                 g, message.getMessage(), message.getColor(), font);
diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index ad0f9c7cb..295200263 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -143,11 +143,11 @@ public final class ImageLibrary {
 
 
     /**
-     * The scaling factor used when creating this
+     * The scale factor used when creating this
      * <code>ImageLibrary</code>.  The value <code>1</code> is used if
      * this object is not a result of a scaling operation.
      */
-    private final float scalingFactor;
+    private final float scaleFactor;
 
     private final HashMap<String,BufferedImage> stringImageCache;
 
@@ -168,11 +168,11 @@ public final class ImageLibrary {
      * but this gets multiplied for tiny 0.25(rarely, candidate for removal),
      * smaller 0.5, small 0.75 and normal 1.0 image retrieval methods.
      * 
-     * @param scalingFactor The factor used when scaling. 2 is twice
+     * @param scaleFactor The factor used when scaling. 2 is twice
      *      the size of the original images and 0.5 is half.
      */
-    public ImageLibrary(float scalingFactor) {
-        this.scalingFactor = scalingFactor;
+    public ImageLibrary(float scaleFactor) {
+        this.scaleFactor = scaleFactor;
         stringImageCache = new HashMap<>();
     }
 
@@ -183,8 +183,8 @@ public final class ImageLibrary {
      * this object.
      * @return The scaling factor of this ImageLibrary.
      */
-    public float getScalingFactor() {
-        return scalingFactor;
+    public float getScaleFactor() {
+        return scaleFactor;
     }
 
     /**
@@ -246,7 +246,7 @@ public final class ImageLibrary {
     public BufferedImage getBeachCornerImage(int index, int x, int y) {
         return ResourceManager.getImage("image.tile.model.tile.beach.corner" + index
                                         + ".r" + ((isEven(x, y)) ? "0" : "1"),
-                                        scalingFactor);
+                                        scaleFactor);
     }
 
     /**
@@ -260,7 +260,7 @@ public final class ImageLibrary {
     public BufferedImage getBeachEdgeImage(int index, int x, int y) {
         return ResourceManager.getImage("image.tile.model.tile.beach.edge" + index
                                         + ".r"+ ((isEven(x, y)) ? "0" : "1"),
-                                        scalingFactor);
+                                        scaleFactor);
     }
 
     /**
@@ -279,7 +279,7 @@ public final class ImageLibrary {
         String key = (type == null) ? "model.tile.unexplored" : type.getId();
         return ResourceManager.getImage("image.tile." + key + ".border." + direction
                                         + ".r" + ((isEven(x, y)) ?  "0" : "1")
-                                        , scalingFactor);
+                                        , scaleFactor);
     }
 
     /**
@@ -289,11 +289,11 @@ public final class ImageLibrary {
      * @return The image at the given index.
      */
     public BufferedImage getForestImage(TileType type) {
-        return getForestImage(type, scalingFactor);
+        return getForestImage(type, scaleFactor);
     }
 
     public BufferedImage getForestImage(TileType type, TileImprovementStyle riverStyle) {
-        return getForestImage(type, riverStyle, scalingFactor);
+        return getForestImage(type, riverStyle, scaleFactor);
     }
 
     public static BufferedImage getForestImage(TileType type, float scale) {
@@ -333,7 +333,7 @@ public final class ImageLibrary {
 
     public BufferedImage getSmallBuildableImage(BuildableType buildable, Player player) {
         // FIXME: distinguish national unit types
-        float scale = scalingFactor * 0.75f;
+        float scale = scaleFactor * 0.75f;
         BufferedImage image = (buildable instanceof BuildingType)
             ? ImageLibrary.getBuildingImage(
                 (BuildingType) buildable, player, scale)
@@ -350,12 +350,12 @@ public final class ImageLibrary {
 
     public BufferedImage getSmallBuildingImage(Building building) {
         return getBuildingImage(building.getType(), building.getOwner(),
-            scalingFactor * 0.75f);
+            scaleFactor * 0.75f);
     }
 
     public BufferedImage getBuildingImage(Building building) {
         return getBuildingImage(building.getType(), building.getOwner(),
-            scalingFactor);
+            scaleFactor);
     }
 
     public static BufferedImage getBuildingImage(BuildingType buildingType,
@@ -382,32 +382,32 @@ public final class ImageLibrary {
 
     public BufferedImage getSmallerIconImage(FreeColGameObjectType type) {
         return getMiscImage("image.icon." + type.getId(), new Dimension(
-            Math.round(scalingFactor * (ICON_SIZE.width * 0.5f)),
-            Math.round(scalingFactor * (ICON_SIZE.height * 0.5f))));
+            Math.round(scaleFactor * (ICON_SIZE.width * 0.5f)),
+            Math.round(scaleFactor * (ICON_SIZE.height * 0.5f))));
     }
 
     public BufferedImage getSmallIconImage(FreeColGameObjectType type) {
         return getMiscImage("image.icon." + type.getId(), new Dimension(
-            Math.round(scalingFactor * (ICON_SIZE.width * 0.75f)),
-            Math.round(scalingFactor * (ICON_SIZE.height * 0.75f))));
+            Math.round(scaleFactor * (ICON_SIZE.width * 0.75f)),
+            Math.round(scaleFactor * (ICON_SIZE.height * 0.75f))));
     }
 
     public BufferedImage getIconImage(FreeColGameObjectType type) {
         return getMiscImage("image.icon." + type.getId(), new Dimension(
-            Math.round(scalingFactor * ICON_SIZE.width),
-            Math.round(scalingFactor * ICON_SIZE.height)));
+            Math.round(scaleFactor * ICON_SIZE.width),
+            Math.round(scaleFactor * ICON_SIZE.height)));
     }
 
     public BufferedImage getSmallerMiscIconImage(FreeColGameObjectType type) {
-        return getMiscIconImage(type, scalingFactor * 0.5f);
+        return getMiscIconImage(type, scaleFactor * 0.5f);
     }
 
     public BufferedImage getSmallMiscIconImage(FreeColGameObjectType type) {
-        return getMiscIconImage(type, scalingFactor * 0.75f);
+        return getMiscIconImage(type, scaleFactor * 0.75f);
     }
 
     public BufferedImage getMiscIconImage(FreeColGameObjectType type) {
-        return getMiscIconImage(type, scalingFactor);
+        return getMiscIconImage(type, scaleFactor);
     }
 
     public static BufferedImage getMiscIconImage(FreeColGameObjectType type, float scale) {
@@ -425,7 +425,7 @@ public final class ImageLibrary {
      * @return The image.
      */
     public BufferedImage getMiscImage(String id) {
-        return getMiscImage(id, scalingFactor);
+        return getMiscImage(id, scaleFactor);
     }
 
     public static BufferedImage getMiscImage(String id, float scale) {
@@ -446,7 +446,7 @@ public final class ImageLibrary {
      */
     public BufferedImage getObjectImage(FreeColObject display, float scale) {
         try {
-            final float combinedScale = scalingFactor * scale;
+            final float combinedScale = scaleFactor * scale;
             final Dimension size = new Dimension(
                 Math.round(combinedScale*ICON_SIZE.width),
                 Math.round(combinedScale*ICON_SIZE.height));
@@ -510,7 +510,7 @@ public final class ImageLibrary {
      * @return A pseudo-random terrain image.
      */
     public BufferedImage getOverlayImage(Tile tile) {
-        return getOverlayImage(tile.getType(), tile.getId(), scalingFactor);
+        return getOverlayImage(tile.getType(), tile.getId(), scaleFactor);
     }
 
     /**
@@ -533,7 +533,7 @@ public final class ImageLibrary {
     }
 
     public BufferedImage getOverlayImage(Tile tile, Set<String> overlayCache) {
-        return getOverlayImage(tile.getType(), tile.getId(), scalingFactor,
+        return getOverlayImage(tile.getType(), tile.getId(), scaleFactor,
                                overlayCache);
     }
 
@@ -614,7 +614,7 @@ public final class ImageLibrary {
      * @return The image with the given style.
      */
     public BufferedImage getRiverImage(TileImprovementStyle style) {
-        return getRiverImage(style, scalingFactor);
+        return getRiverImage(style, scaleFactor);
     }
 
     /**
@@ -654,11 +654,11 @@ public final class ImageLibrary {
                                     int x, int y) {
         String key = "image.tile.model.tile.delta." + direction
             + (magnitude == 1 ? ".small" : ".large");
-        return ResourceManager.getImage(key, scalingFactor);
+        return ResourceManager.getImage(key, scaleFactor);
     }
 
     public BufferedImage getSmallSettlementImage(Settlement settlement) {
-        return getSettlementImage(settlement, scalingFactor * 0.75f);
+        return getSettlementImage(settlement, scaleFactor * 0.75f);
     }
 
     /**
@@ -668,7 +668,7 @@ public final class ImageLibrary {
      * @return The graphics that will represent the given settlement.
      */
     public BufferedImage getSettlementImage(Settlement settlement) {
-        return getSettlementImage(settlement, scalingFactor);
+        return getSettlementImage(settlement, scaleFactor);
     }
 
     /**
@@ -694,7 +694,7 @@ public final class ImageLibrary {
      * @return The graphics that will represent the given settlement.
      */
     public BufferedImage getSettlementImage(SettlementType settlementType) {
-        return getSettlementImage(settlementType, scalingFactor);
+        return getSettlementImage(settlementType, scaleFactor);
     }
 
     public static BufferedImage getSettlementImage(SettlementType settlementType,
@@ -727,7 +727,7 @@ public final class ImageLibrary {
      * @return The terrain-image at the given index.
      */
     public BufferedImage getTerrainImage(TileType type, int x, int y) {
-        return getTerrainImage(type, x, y, scalingFactor);
+        return getTerrainImage(type, x, y, scaleFactor);
     }
 
     public static BufferedImage getTerrainImage(TileType type, int x, int y, float scale) {
@@ -738,27 +738,27 @@ public final class ImageLibrary {
 
     public BufferedImage getSmallerUnitImage(Unit unit) {
         return getUnitImage(unit.getType(), unit.getRole().getId(),
-            unit.hasNativeEthnicity(), false, scalingFactor * 0.5f);
+            unit.hasNativeEthnicity(), false, scaleFactor * 0.5f);
     }
 
     public BufferedImage getSmallUnitImage(Unit unit) {
         return getUnitImage(unit.getType(), unit.getRole().getId(),
-            unit.hasNativeEthnicity(), false, scalingFactor * 0.75f);
+            unit.hasNativeEthnicity(), false, scaleFactor * 0.75f);
     }
 
     public BufferedImage getSmallUnitImage(Unit unit, boolean grayscale) {
         return getUnitImage(unit.getType(), unit.getRole().getId(),
-            unit.hasNativeEthnicity(), grayscale, scalingFactor * 0.75f);
+            unit.hasNativeEthnicity(), grayscale, scaleFactor * 0.75f);
     }
 
     public BufferedImage getUnitImage(Unit unit) {
         return getUnitImage(unit.getType(), unit.getRole().getId(),
-            unit.hasNativeEthnicity(), false, scalingFactor);
+            unit.hasNativeEthnicity(), false, scaleFactor);
     }
 
     public BufferedImage getUnitImage(Unit unit, boolean grayscale) {
         return getUnitImage(unit.getType(), unit.getRole().getId(),
-            unit.hasNativeEthnicity(), grayscale, scalingFactor);
+            unit.hasNativeEthnicity(), grayscale, scaleFactor);
     }
 
     public static BufferedImage getUnitImage(Unit unit, float scale) {
@@ -768,38 +768,38 @@ public final class ImageLibrary {
 
     public BufferedImage getTinyUnitImage(UnitType unitType) {
         return getUnitImage(unitType, unitType.getDisplayRoleId(),
-            false, false, scalingFactor * 0.25f);
+            false, false, scaleFactor * 0.25f);
     }
 
     public BufferedImage getTinyUnitImage(UnitType unitType, boolean grayscale) {
         return getUnitImage(unitType, unitType.getDisplayRoleId(),
-            false, grayscale, scalingFactor * 0.25f);
+            false, grayscale, scaleFactor * 0.25f);
     }
 
     public BufferedImage getSmallerUnitImage(UnitType unitType) {
         return getUnitImage(unitType, unitType.getDisplayRoleId(),
-            false, false, scalingFactor * 0.5f);
+            false, false, scaleFactor * 0.5f);
     }
 
     public BufferedImage getSmallUnitImage(UnitType unitType) {
         return getUnitImage(unitType, unitType.getDisplayRoleId(),
-            false, false, scalingFactor * 0.75f);
+            false, false, scaleFactor * 0.75f);
     }
 
     public BufferedImage getSmallUnitImage(UnitType unitType, boolean grayscale) {
         return getUnitImage(unitType, unitType.getDisplayRoleId(),
-            false, grayscale, scalingFactor * 0.75f);
+            false, grayscale, scaleFactor * 0.75f);
     }
 
     public BufferedImage getSmallUnitImage(UnitType unitType, String roleId,
                                    boolean grayscale) {
         return getUnitImage(unitType, roleId,
-            false, grayscale, scalingFactor * 0.75f);
+            false, grayscale, scaleFactor * 0.75f);
     }
 
     public BufferedImage getUnitImage(UnitType unitType) {
         return getUnitImage(unitType, unitType.getDisplayRoleId(),
-            false, false, scalingFactor);
+            false, false, scaleFactor);
     }
 
     public static BufferedImage getUnitImage(UnitType unitType, float scale) {
@@ -1020,9 +1020,9 @@ public final class ImageLibrary {
     private BufferedImage createChip(Graphics2D g, String text, Color border,
                                      Color background, Color foreground) {
         Font font = FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
-            FontLibrary.FontSize.TINY, Font.BOLD, scalingFactor);
+            FontLibrary.FontSize.TINY, Font.BOLD, scaleFactor);
         FontMetrics fm = g.getFontMetrics(font);
-        int padding = (int)(6 * scalingFactor);
+        int padding = (int)(6 * scaleFactor);
         BufferedImage bi = new BufferedImage(fm.stringWidth(text) + padding,
             fm.getMaxAscent() + fm.getMaxDescent() + padding,
             BufferedImage.TYPE_INT_ARGB);
@@ -1057,9 +1057,9 @@ public final class ImageLibrary {
                                            double amount, Color fill,
                                            Color foreground) {
         Font font = FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
-            FontLibrary.FontSize.TINY, Font.BOLD, scalingFactor);
+            FontLibrary.FontSize.TINY, Font.BOLD, scaleFactor);
         FontMetrics fm = g.getFontMetrics(font);
-        int padding = (int)(6 * scalingFactor);
+        int padding = (int)(6 * scaleFactor);
         BufferedImage bi = new BufferedImage(fm.stringWidth(text) + padding,
             fm.getMaxAscent() + fm.getMaxDescent() + padding,
             BufferedImage.TYPE_INT_ARGB);
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 53ae1b5be..d5052ddef 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -662,7 +662,7 @@ public final class MapViewer {
             Player owner = freeColClient.getMyPlayer();
             String text = Messages.message(unit.getOccupationLabel(owner, false));
             g.drawImage(lib.getOccupationIndicatorChip(g, unit, text),
-                        (int)(STATE_OFFSET_X * lib.getScalingFactor()),
+                        (int)(STATE_OFFSET_X * lib.getScaleFactor()),
                         0, null);
         }
     }
@@ -754,7 +754,7 @@ public final class MapViewer {
      * @return The current map scale.
      */
     public float getMapScale() {
-        return lib.getScalingFactor();
+        return lib.getScaleFactor();
     }
 
     /**
@@ -846,7 +846,7 @@ public final class MapViewer {
                 / 2 - unitLabel.getWidth() / 2;
             int labelY = tileP.y + tileHeight
                 / 2 - unitLabel.getHeight() / 2
-                - (int) (UNIT_OFFSET * lib.getScalingFactor());
+                - (int) (UNIT_OFFSET * lib.getScaleFactor());
             return new Point(labelX, labelY);
         } else {
             return null;
@@ -1168,15 +1168,15 @@ public final class MapViewer {
     }
 
     boolean isAtMaxMapScale() {
-        return lib.getScalingFactor() == MAP_SCALE_MAX;
+        return lib.getScaleFactor() == MAP_SCALE_MAX;
     }
 
     boolean isAtMinMapScale() {
-        return lib.getScalingFactor() == MAP_SCALE_MIN;
+        return lib.getScaleFactor() == MAP_SCALE_MIN;
     }
 
     void increaseMapScale() {
-        float newScale = lib.getScalingFactor() + MAP_SCALE_STEP;
+        float newScale = lib.getScaleFactor() + MAP_SCALE_STEP;
         if (newScale >= MAP_SCALE_MAX)
             newScale = MAP_SCALE_MAX;
         setImageLibraryAndUpdateData(new ImageLibrary(newScale));
@@ -1184,7 +1184,7 @@ public final class MapViewer {
     }
 
     void decreaseMapScale() {
-        float newScale = lib.getScalingFactor() - MAP_SCALE_STEP;
+        float newScale = lib.getScaleFactor() - MAP_SCALE_STEP;
         if (newScale <= MAP_SCALE_MIN)
             newScale = MAP_SCALE_MIN;
         setImageLibraryAndUpdateData(new ImageLibrary(newScale));
@@ -1481,7 +1481,7 @@ public final class MapViewer {
      */
     private void displayPath(Graphics2D g, PathNode path) {
         final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.TINY, lib.getScalingFactor());
+            FontLibrary.FontSize.TINY, lib.getScaleFactor());
         final boolean debug = FreeColDebugger
             .isInDebugMode(FreeColDebugger.DebugMode.PATHS);
 
@@ -1537,7 +1537,7 @@ public final class MapViewer {
         AffineTransform originTransform = g.getTransform();
         Rectangle clipBounds = g.getClipBounds();
         Map map = freeColClient.getGame().getMap();
-        FontLibrary fontLibrary = new FontLibrary(lib.getScalingFactor());
+        FontLibrary fontLibrary = new FontLibrary(lib.getScaleFactor());
 
         g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
                            RenderingHints.VALUE_ANTIALIAS_ON);
@@ -1822,27 +1822,27 @@ public final class MapViewer {
                         }
 
                         int width = (int)((nameImage.getWidth(null)
-                                * lib.getScalingFactor())
+                                * lib.getScaleFactor())
                             + ((leftImage != null)
                                 ? (leftImage.getWidth(null)
-                                    * lib.getScalingFactor()) + spacing
+                                    * lib.getScaleFactor()) + spacing
                                 : 0)
                             + ((rightImage != null)
                                 ? (rightImage.getWidth(null)
-                                    * lib.getScalingFactor()) + spacing
+                                    * lib.getScaleFactor()) + spacing
                                 : 0));
                         int labelOffset = (tileWidth - width)/2;
                         yOffset -= (nameImage.getHeight(null)
-                            * lib.getScalingFactor())/2;
+                            * lib.getScaleFactor())/2;
                         if (leftImage != null) {
                             g.drawImage(leftImage, labelOffset, yOffset, null);
                             labelOffset += (leftImage.getWidth(null)
-                                * lib.getScalingFactor()) + spacing;
+                                * lib.getScaleFactor()) + spacing;
                         }
                         g.drawImage(nameImage, labelOffset, yOffset, null);
                         if (rightImage != null) {
                             labelOffset += (nameImage.getWidth(null)
-                                * lib.getScalingFactor()) + spacing;
+                                * lib.getScaleFactor()) + spacing;
                             g.drawImage(rightImage, labelOffset, yOffset, null);
                         }
                         break;
@@ -1907,7 +1907,7 @@ public final class MapViewer {
 
         g.setColor(Color.BLACK);
         g.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.TINY, lib.getScalingFactor()));
+            FontLibrary.FontSize.TINY, lib.getScaleFactor()));
         if (text != null) {
             int b = getBreakingPoint(text);
             if (b == -1) {
@@ -1975,10 +1975,10 @@ public final class MapViewer {
                     Font font = (colony.getPreferredSizeChange() > 0)
                         ? FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
                             FontLibrary.FontSize.SMALLER, Font.BOLD | Font.ITALIC,
-                            lib.getScalingFactor())
+                            lib.getScaleFactor())
                         : FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
                             FontLibrary.FontSize.TINY, Font.BOLD,
-                            lib.getScalingFactor());
+                            lib.getScaleFactor());
                     Image stringImage = lib.getStringImage(g,
                         populationString, theColor, font);
                     displayCenteredImage(g, stringImage, tileWidth, tileHeight);
@@ -1992,8 +1992,8 @@ public final class MapViewer {
                 displayCenteredImage(g, settlementImage, tileWidth, tileHeight);
 
                 Image chip;
-                float xOffset = STATE_OFFSET_X * lib.getScalingFactor();
-                float yOffset = STATE_OFFSET_Y * lib.getScalingFactor();
+                float xOffset = STATE_OFFSET_X * lib.getScaleFactor();
+                float yOffset = STATE_OFFSET_Y * lib.getScaleFactor();
                 final int colonyLabels = freeColClient.getClientOptions()
                     .getInteger(ClientOptions.COLONY_LABELS);
                 if (colonyLabels != ClientOptions.COLONY_LABELS_MODERN) {
@@ -2105,7 +2105,7 @@ public final class MapViewer {
         // Draw an occupation and nation indicator.
         String text = Messages.message(unit.getOccupationLabel(player, false));
         g.drawImage(lib.getOccupationIndicatorChip(g, unit, text),
-                    (int)(STATE_OFFSET_X * lib.getScalingFactor()), 0,
+                    (int)(STATE_OFFSET_X * lib.getScaleFactor()), 0,
                     null);
 
         // Draw one small line for each additional unit (like in civ3).
@@ -2121,9 +2121,9 @@ public final class MapViewer {
             g.setColor(Color.WHITE);
             int unitLinesY = OTHER_UNITS_OFFSET_Y;
             int x1 = (int)((STATE_OFFSET_X + OTHER_UNITS_OFFSET_X)
-                * lib.getScalingFactor());
+                * lib.getScaleFactor());
             int x2 = (int)((STATE_OFFSET_X + OTHER_UNITS_OFFSET_X
-                    + OTHER_UNITS_WIDTH) * lib.getScalingFactor());
+                    + OTHER_UNITS_WIDTH) * lib.getScaleFactor());
             for (int i = 0; i < unitsOnTile && i < MAX_OTHER_UNITS; i++) {
                 g.drawLine(x1, unitLinesY, x2, unitLinesY);
                 unitLinesY += 2;
@@ -2201,7 +2201,7 @@ public final class MapViewer {
                 if (ResourceManager.hasImageResource(key)) {
                     // Has its own Overlay Image in Misc, use it
                     Image overlay = ResourceManager.getImage(key,
-                        lib.getScalingFactor());
+                        lib.getScaleFactor());
                     g.drawImage(overlay, 0, 0, null);
                 }
             }
@@ -2305,7 +2305,7 @@ public final class MapViewer {
     private Point calculateUnitImagePositionInTile(Image unitImage) {
         int unitX = (tileWidth - unitImage.getWidth(null)) / 2;
         int unitY = (tileHeight - unitImage.getHeight(null)) / 2 -
-                    (int) (UNIT_OFFSET * lib.getScalingFactor());
+                    (int) (UNIT_OFFSET * lib.getScaleFactor());
 
         return new Point(unitX, unitY);
     }
@@ -2728,7 +2728,7 @@ public final class MapViewer {
         borderPoints.put(Direction.W,  new Point2D.Float(dx + ddx, halfHeight + ddy));
 
         borderStroke = new BasicStroke(dy);
-        gridStroke = new BasicStroke(lib.getScalingFactor());
+        gridStroke = new BasicStroke(lib.getScaleFactor());
 
         fog.reset();
         fog.moveTo(halfWidth, 0);
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index c7b496d46..b5908a5fe 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -176,7 +176,7 @@ public class SwingGUI extends GUI {
         FreeColLookAndFeel fclaf = new FreeColLookAndFeel();
         FreeColLookAndFeel.install(fclaf);
         Font font = FontLibrary.createMainFont(
-            fontName, imageLibrary.getScalingFactor());
+            fontName, imageLibrary.getScaleFactor());
         FreeColLookAndFeel.installFont(font);
         Utility.initStyleContext(font);
     }
diff --git a/src/net/sf/freecol/client/gui/TilePopup.java b/src/net/sf/freecol/client/gui/TilePopup.java
index 6d1cf3f17..a9d4597a1 100644
--- a/src/net/sf/freecol/client/gui/TilePopup.java
+++ b/src/net/sf/freecol/client/gui/TilePopup.java
@@ -482,7 +482,7 @@ public final class TilePopup extends JPopupMenu {
         JMenuItem menuItem = new JMenuItem(text);
         menuItem.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.TINY, Font.BOLD,
-            gui.getImageLibrary().getScalingFactor()));
+            gui.getImageLibrary().getScaleFactor()));
         menuItem.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent event) {
@@ -533,7 +533,7 @@ public final class TilePopup extends JPopupMenu {
         JMenuItem menuItem = Utility.localizedMenuItem(name);
         menuItem.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.TINY, Font.BOLD,
-            gui.getImageLibrary().getScalingFactor()));
+            gui.getImageLibrary().getScaleFactor()));
         menuItem.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent event) {
@@ -568,7 +568,7 @@ public final class TilePopup extends JPopupMenu {
         JMenuItem menuItem = Utility.localizedMenuItem(name);
         menuItem.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.TINY, Font.BOLD,
-            gui.getImageLibrary().getScalingFactor()));
+            gui.getImageLibrary().getScaleFactor()));
         menuItem.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent event) {
diff --git a/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java b/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
index 2ef09b563..754d373f5 100644
--- a/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
@@ -277,7 +277,7 @@ public class InGameMenuBar extends FreeColMenuBar {
                         freeColClient.getGame().getTurn().getLabel()));
             Rectangle2D displayStringBounds
                 = g2d.getFontMetrics().getStringBounds(displayString, g);
-            int y = Math.round(12f*freeColClient.getGUI().getImageLibrary().getScalingFactor())
+            int y = Math.round(12f*freeColClient.getGUI().getImageLibrary().getScaleFactor())
                   + 3 + getInsets().top;
             g2d.drawString(displayString, getWidth() - 10 - (int) displayStringBounds.getWidth(), y);
         }
diff --git a/src/net/sf/freecol/client/gui/panel/AboutPanel.java b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
index 4c79009db..16bdb289e 100644
--- a/src/net/sf/freecol/client/gui/panel/AboutPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
@@ -100,9 +100,9 @@ public final class AboutPanel extends FreeColPanel {
         // Create available Font choices
         Font fontBold = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.TINY, Font.BOLD,
-            getImageLibrary().getScalingFactor());
+            getImageLibrary().getScaleFactor());
         Font fontNormal = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.TINY, getImageLibrary().getScalingFactor());
+            FontLibrary.FontSize.TINY, getImageLibrary().getScaleFactor());
         
         // Version
         JLabel apVersion = Utility.localizedLabel("aboutPanel.version");
diff --git a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
index 37335114a..3678014f3 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
@@ -575,7 +575,7 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
         // Create Font choice
         Font fontSubHead = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
                 FontLibrary.FontSize.SMALLER, Font.BOLD,
-                getImageLibrary().getScalingFactor());
+                getImageLibrary().getScaleFactor());
         
         // Create the components
         JLabel header = Utility.localizedHeaderLabel(
diff --git a/src/net/sf/freecol/client/gui/panel/BuildingPanel.java b/src/net/sf/freecol/client/gui/panel/BuildingPanel.java
index 81f1b805e..d1bb7a56a 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildingPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildingPanel.java
@@ -262,7 +262,7 @@ public class BuildingPanel extends MigPanel implements PropertyChangeListener {
                 Integer.toString(number), getForeground(),
                 FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
                     FontLibrary.FontSize.TINY, Font.BOLD,
-                    lib.getScalingFactor()));
+                    lib.getScaleFactor()));
             g.drawImage(image,
                 (getIcon().getIconWidth() - image.getWidth(null))/2,
                 (getIcon().getIconHeight() - image.getHeight(null))/2, null);
diff --git a/src/net/sf/freecol/client/gui/panel/BuildingToolTip.java b/src/net/sf/freecol/client/gui/panel/BuildingToolTip.java
index ecb873ef5..1f248371f 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildingToolTip.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildingToolTip.java
@@ -72,7 +72,7 @@ public class BuildingToolTip extends JToolTip {
         if (arrow == null) {
             arrow = new JLabel(ResourceManager.getString("arrow.E"));
             arrow.setFont(FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
-                FontLibrary.FontSize.SMALL, Font.BOLD, lib.getScalingFactor()));
+                FontLibrary.FontSize.SMALL, Font.BOLD, lib.getScaleFactor()));
         }
 
         String columns = "[align center]";
@@ -86,7 +86,7 @@ public class BuildingToolTip extends JToolTip {
 
         JLabel buildingName = new JLabel(Messages.getName(building));
         buildingName.setFont(FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
-            FontLibrary.FontSize.SMALLER, Font.BOLD, lib.getScalingFactor()));
+            FontLibrary.FontSize.SMALLER, Font.BOLD, lib.getScaleFactor()));
         add(buildingName, "span");
 
         ProductionInfo info = building.getProductionInfo();
diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index c4a809949..e3c4f4801 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -275,7 +275,7 @@ public final class ColonyPanel extends PortPanel
 
         // Make the colony label
         Font nameBoxFont = FontLibrary.createFont(FontLibrary.FontType.HEADER,
-            FontLibrary.FontSize.SMALL, getImageLibrary().getScalingFactor());
+            FontLibrary.FontSize.SMALL, getImageLibrary().getScaleFactor());
         boolean incompatibleFont = false;
         if (editable) {
             for (Colony c : freeColClient.getMySortedColonies()) {
@@ -293,7 +293,7 @@ public final class ColonyPanel extends PortPanel
         if(incompatibleFont) {
             nameBoxFont = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
                 FontLibrary.FontSize.SMALL,
-                getImageLibrary().getScalingFactor());
+                getImageLibrary().getScaleFactor());
         }
         this.nameBox.setFont(nameBoxFont);
         this.nameBox.setSelectedItem(colony);
@@ -355,7 +355,7 @@ public final class ColonyPanel extends PortPanel
             JComponent.WHEN_IN_FOCUSED_WINDOW, nameIM);
 
         initialize(colony);
-        float scale = getImageLibrary().getScalingFactor();
+        float scale = getImageLibrary().getScaleFactor();
         getGUI().restoreSavedSize(this, 200 + (int)(scale*850), 200 + (int)(scale*525));
     }
 
@@ -435,7 +435,7 @@ public final class ColonyPanel extends PortPanel
 
         add(this.nameBox, "height 42:, grow");
         int tmp = (int)(ImageLibrary.ICON_SIZE.height
-            * gui.getImageLibrary().getScalingFactor());
+            * gui.getImageLibrary().getScaleFactor());
         add(netProductionPanel,
             "grow, height " + (tmp+10) + ":" + (2*tmp+10) + ":" + (2*tmp+10));
         add(tilesScroll, "width 390!, height 200!, top");
@@ -1224,7 +1224,7 @@ public final class ColonyPanel extends PortPanel
             final ImageLibrary lib = getGUI().getColonyTileMapViewer()
                 .getImageLibrary();
             final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-                FontLibrary.FontSize.SMALLER, lib.getScalingFactor());
+                FontLibrary.FontSize.SMALLER, lib.getScaleFactor());
             final int uc = colony.getUnitCount();
             final int solPercent = colony.getSoL();
             final int rebels = Colony.calculateRebels(uc, solPercent);
diff --git a/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java b/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java
index e3f9e29ec..8c4495b4f 100644
--- a/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java
@@ -94,7 +94,7 @@ public final class ColopediaPanel extends FreeColPanel
 
         add(okButton, "newline 20, span, tag ok");
 
-        float scale = getImageLibrary().getScalingFactor();
+        float scale = getImageLibrary().getScaleFactor();
         getGUI().restoreSavedSize(this, 200 + (int)(scale*850), 200 + (int)(scale*525));
         tree = buildTree();
 
@@ -140,7 +140,7 @@ public final class ColopediaPanel extends FreeColPanel
                 @Override
                 public Dimension getPreferredSize() {
                     return new Dimension(
-                        (int)(200 * getImageLibrary().getScalingFactor()),
+                        (int)(200 * getImageLibrary().getScaleFactor()),
                         super.getPreferredSize().height);
                 }
             };
diff --git a/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java b/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
index f3ca02931..388f60750 100644
--- a/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
@@ -137,7 +137,7 @@ public class ConstructionPanel extends MigPanel
         final ImageLibrary lib = ((SwingGUI)freeColClient.getGUI())
             .getColonyTileMapViewer().getImageLibrary();
         final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.SMALLER, lib.getScalingFactor());
+            FontLibrary.FontSize.SMALLER, lib.getScaleFactor());
 
         if (buildable == null) {
             String clickToBuild = Messages.message(getDefaultLabel());
diff --git a/src/net/sf/freecol/client/gui/panel/EuropePanel.java b/src/net/sf/freecol/client/gui/panel/EuropePanel.java
index 1e32a5158..ea185bbc2 100644
--- a/src/net/sf/freecol/client/gui/panel/EuropePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/EuropePanel.java
@@ -698,7 +698,7 @@ public final class EuropePanel extends PortPanel {
 
         setSelectedUnitLabel(null);
 
-        float scale = getImageLibrary().getScalingFactor();
+        float scale = getImageLibrary().getScaleFactor();
         getGUI().restoreSavedSize(this, 200 + (int)(scale*850), 200 + (int)(scale*525));
     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index 5883a5e76..1a384fd2d 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -91,7 +91,7 @@ public final class InfoPanel extends FreeColPanel {
             final ImageLibrary lib = getGUI().getColonyTileMapViewer()
                 .getImageLibrary();
             Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-                FontLibrary.FontSize.TINY, lib.getScalingFactor());
+                FontLibrary.FontSize.TINY, lib.getScaleFactor());
 
             String labelString = Messages.message("infoPanel.endTurn");
             for (String s : splitText(labelString, " /",
@@ -147,7 +147,7 @@ public final class InfoPanel extends FreeColPanel {
             final MapViewer mapViewer = getGUI().getColonyTileMapViewer();
             final ImageLibrary lib = mapViewer.getImageLibrary();
             final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-                FontLibrary.FontSize.TINY, lib.getScalingFactor());
+                FontLibrary.FontSize.TINY, lib.getScaleFactor());
             if (tile != null && tile.getType() != null) {
                 final int width = getWidth() - SLACK;
                 BufferedImage image = mapViewer.createTileImageWithBeachBorderAndItems(tile);
@@ -283,7 +283,7 @@ public final class InfoPanel extends FreeColPanel {
             final ImageLibrary lib = getGUI().getColonyTileMapViewer()
                 .getImageLibrary();
             Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-                FontLibrary.FontSize.TINY, lib.getScalingFactor());
+                FontLibrary.FontSize.TINY, lib.getScaleFactor());
             String text;
             JLabel textLabel;
             if (unit != null) {
diff --git a/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java b/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
index d39e5c49e..8e6389ac3 100644
--- a/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
@@ -929,7 +929,7 @@ public final class NegotiationDialog extends FreeColDialog<DiplomaticTrade> {
         JTextArea labelDemandMessage = Utility.localizedTextArea(this.demand);
         Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL, 
                 FontLibrary.FontSize.TINY, Font.BOLD,
-                getImageLibrary().getScalingFactor());
+                getImageLibrary().getScaleFactor());
         labelDemandMessage.setFont(font);
         panel.add(labelDemandMessage);
         JTextArea blank = new JTextArea(" ");
diff --git a/src/net/sf/freecol/client/gui/panel/PreCombatDialog.java b/src/net/sf/freecol/client/gui/panel/PreCombatDialog.java
index 3a07f2247..94e346b6d 100644
--- a/src/net/sf/freecol/client/gui/panel/PreCombatDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/PreCombatDialog.java
@@ -135,7 +135,7 @@ public class PreCombatDialog extends FreeColConfirmDialog {
         }
 
         Font bigFont = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.SMALLER, Font.BOLD, lib.getScalingFactor());
+            FontLibrary.FontSize.SMALLER, Font.BOLD, lib.getScaleFactor());
         float offenceResult
             = FeatureContainer.applyModifiers(0f, turn, attackModifiers);
         JLabel finalOffenceLabel = Utility.localizedLabel("finalResult");
diff --git a/src/net/sf/freecol/client/gui/panel/ProductionLabel.java b/src/net/sf/freecol/client/gui/panel/ProductionLabel.java
index d8d70efb8..f98b22d83 100644
--- a/src/net/sf/freecol/client/gui/panel/ProductionLabel.java
+++ b/src/net/sf/freecol/client/gui/panel/ProductionLabel.java
@@ -166,7 +166,7 @@ public final class ProductionLabel extends AbstractGoodsLabel {
             : this.goodsIcon.getIconWidth() * 2;
 
         setFont(FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
-            FontLibrary.FontSize.TINY, Font.BOLD, lib.getScalingFactor()));
+            FontLibrary.FontSize.TINY, Font.BOLD, lib.getScaleFactor()));
         setForeground((getAmount() < 0) ? Color.RED : Color.WHITE);
         setToolTipText((getType() == null || getAmount() == 0) ? null
             : Messages.message(getAbstractGoods().getLabel()));
diff --git a/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java b/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java
index 548682359..af38a1059 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java
@@ -78,7 +78,7 @@ public final class ReportExplorationPanel extends ReportPanel {
          * Header Row
          */
         Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.TINY, Font.BOLD, getImageLibrary().getScalingFactor());
+            FontLibrary.FontSize.TINY, Font.BOLD, getImageLibrary().getScaleFactor());
         JLabel nameOfRegion = Utility.localizedLabel("report.exploration.nameOfRegion");
         nameOfRegion.setFont(font);
         reportPanel.add(nameOfRegion);
diff --git a/src/net/sf/freecol/client/gui/panel/ReportForeignAffairPanel.java b/src/net/sf/freecol/client/gui/panel/ReportForeignAffairPanel.java
index 853f896ac..0ab8b3245 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportForeignAffairPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportForeignAffairPanel.java
@@ -52,7 +52,7 @@ public final class ReportForeignAffairPanel extends ReportPanel {
 
         final ImageLibrary lib = freeColClient.getGUI().getImageLibrary();
         final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.SMALL, Font.BOLD, lib.getScalingFactor());
+            FontLibrary.FontSize.SMALL, Font.BOLD, lib.getScaleFactor());
         final String stance = Messages.message(
             StringTemplate.key("report.foreignAffair.stance"));
         final String numberOfColonies = Messages.message(
diff --git a/src/net/sf/freecol/client/gui/panel/ReportIndianPanel.java b/src/net/sf/freecol/client/gui/panel/ReportIndianPanel.java
index 4b086369f..ebeab91ea 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportIndianPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportIndianPanel.java
@@ -101,15 +101,15 @@ public final class ReportIndianPanel extends ReportPanel {
         JLabel villageLabel = new JLabel();
         villageLabel.setIcon(new ImageIcon(ImageLibrary.getSettlementImage(
             opponent.getNationType().getCapitalType(),
-            lib.getScalingFactor())));
+            lib.getScaleFactor())));
         reportPanel.add(villageLabel, "span, split 2");
         JLabel headline = Utility.localizedLabel(opponent.getNationLabel());
         headline.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.SMALL, Font.BOLD, lib.getScalingFactor()));
+            FontLibrary.FontSize.SMALL, Font.BOLD, lib.getScaleFactor()));
         reportPanel.add(headline, "wrap 20, aligny center");
         JLabel label = Utility.localizedLabel("report.indian.chieftain");
         Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.TINY, Font.BOLD, lib.getScalingFactor());
+            FontLibrary.FontSize.TINY, Font.BOLD, lib.getScaleFactor());
         label.setFont(font);
         reportPanel.add(label);
         reportPanel.add(Utility.localizedLabel(opponent.getName()), "left, wrap");
diff --git a/src/net/sf/freecol/client/gui/panel/ReportPanel.java b/src/net/sf/freecol/client/gui/panel/ReportPanel.java
index 93e3fe93e..e9bb5af68 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportPanel.java
@@ -96,7 +96,7 @@ public class ReportPanel extends FreeColPanel {
         add(scrollPane, "cell 0 1, height 100%, width 100%");
         add(okButton, "cell 0 2, tag ok");
 
-        float scale = getImageLibrary().getScalingFactor();
+        float scale = getImageLibrary().getScaleFactor();
         getGUI().restoreSavedSize(this, 200 + (int)(scale*850), 200 + (int)(scale*525));
     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/ReportReligiousPanel.java b/src/net/sf/freecol/client/gui/panel/ReportReligiousPanel.java
index 4edb797ab..c12ec5611 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportReligiousPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportReligiousPanel.java
@@ -49,7 +49,7 @@ public final class ReportReligiousPanel extends ReportPanel {
 
         final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.SMALLER, Font.BOLD,
-            freeColClient.getGUI().getImageLibrary().getScalingFactor());
+            freeColClient.getGUI().getImageLibrary().getScaleFactor());
         final Player player = getMyPlayer();
         final Specification spec = getSpecification();
 
diff --git a/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java b/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
index 8b74cfcf5..1e730b555 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
@@ -86,7 +86,7 @@ public final class ReportTradePanel extends ReportPanel {
 
         String layoutConstraints = "insets 0, gap 0 0";
         String columnConstraints = "[25%!, fill]["
-            + Math.round(lib.getScalingFactor()
+            + Math.round(lib.getScaleFactor()
                 * (ImageLibrary.ICON_SIZE.width * 1.25f))
             + "!, fill]";
         String rowConstraints = "[fill]";
diff --git a/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java b/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
index 07a6f96e1..c4e5b4046 100644
--- a/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
@@ -465,7 +465,7 @@ public final class TradeRouteInputPanel extends FreeColPanel
             } else if (location instanceof Colony) {
                 Colony colony = (Colony) location;
                 icon = new JLabel(new ImageIcon(ImageLibrary.getSettlementImage(
-                    colony, lib.getScalingFactor()* 0.5f)));
+                    colony, lib.getScaleFactor()* 0.5f)));
                 name = new JLabel(colony.getName());
             } else {
                 throw new IllegalStateException("Bogus location: " + location);
diff --git a/src/net/sf/freecol/client/gui/panel/UnitLabel.java b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
index 2fb1a2b05..d35537ddf 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitLabel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
@@ -301,7 +301,7 @@ public final class UnitLabel extends JLabel
                 String underRepair1 = underRepair.substring(0, underRepair.indexOf('(')).trim();
                 String underRepair2 = underRepair.substring(underRepair.indexOf('(')).trim();
                 Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-                    FontLibrary.FontSize.TINY, lib.getScalingFactor());
+                    FontLibrary.FontSize.TINY, lib.getScaleFactor());
                 Image repairImage1 = lib.getStringImage(g, underRepair1, Color.RED, font);
                 Image repairImage2 = lib.getStringImage(g, underRepair2, Color.RED, font);
                 int textHeight = repairImage1.getHeight(null) + repairImage2.getHeight(null);
diff --git a/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java b/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java
index 69973ff16..0f393638e 100644
--- a/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java
@@ -119,7 +119,7 @@ public class WorkProductionPanel extends FreeColPanel {
         }
 
         Font bigFont = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.SMALLER, Font.BOLD, lib.getScalingFactor());
+            FontLibrary.FontSize.SMALLER, Font.BOLD, lib.getScaleFactor());
         JLabel finalLabel = Utility.localizedLabel("finalResult");
         finalLabel.setFont(bigFont);
         add(finalLabel, "newline");

From 30dab63cc2d33ae35935df0fd0ef5bd917e7628a Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 24 Aug 2015 22:20:58 +0200
Subject: [PATCH 124/323] Add scaleDimension helper method

---
 .../sf/freecol/client/gui/ImageLibrary.java   | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index 295200263..e1d404385 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -187,6 +187,15 @@ public final class ImageLibrary {
         return scaleFactor;
     }
 
+    public Dimension scaleDimension(Dimension size) {
+        return scaleDimension(size, scaleFactor);
+    }
+
+    public static Dimension scaleDimension(Dimension size, float scaleFactor) {
+        return new Dimension(Math.round(size.width*scaleFactor),
+                             Math.round(size.height*scaleFactor));
+    }
+
     /**
      * Gets a suitable foreground color given a background color.
      *
@@ -381,21 +390,18 @@ public final class ImageLibrary {
     }
 
     public BufferedImage getSmallerIconImage(FreeColGameObjectType type) {
-        return getMiscImage("image.icon." + type.getId(), new Dimension(
-            Math.round(scaleFactor * (ICON_SIZE.width * 0.5f)),
-            Math.round(scaleFactor * (ICON_SIZE.height * 0.5f))));
+        return getMiscImage("image.icon." + type.getId(),
+            scaleDimension(ICON_SIZE, scaleFactor * 0.5f));
     }
 
     public BufferedImage getSmallIconImage(FreeColGameObjectType type) {
-        return getMiscImage("image.icon." + type.getId(), new Dimension(
-            Math.round(scaleFactor * (ICON_SIZE.width * 0.75f)),
-            Math.round(scaleFactor * (ICON_SIZE.height * 0.75f))));
+        return getMiscImage("image.icon." + type.getId(),
+            scaleDimension(ICON_SIZE, scaleFactor * 0.75f));
     }
 
     public BufferedImage getIconImage(FreeColGameObjectType type) {
-        return getMiscImage("image.icon." + type.getId(), new Dimension(
-            Math.round(scaleFactor * ICON_SIZE.width),
-            Math.round(scaleFactor * ICON_SIZE.height)));
+        return getMiscImage("image.icon." + type.getId(),
+            scaleDimension(ICON_SIZE, scaleFactor));
     }
 
     public BufferedImage getSmallerMiscIconImage(FreeColGameObjectType type) {
@@ -447,9 +453,7 @@ public final class ImageLibrary {
     public BufferedImage getObjectImage(FreeColObject display, float scale) {
         try {
             final float combinedScale = scaleFactor * scale;
-            final Dimension size = new Dimension(
-                Math.round(combinedScale*ICON_SIZE.width),
-                Math.round(combinedScale*ICON_SIZE.height));
+            final Dimension size = scaleDimension(ICON_SIZE, combinedScale);
             BufferedImage image;
             if (display instanceof Goods) {
                 display = ((Goods)display).getType();

From a85590de4e4ee619b8c1e823eaa93c5471a2b42b Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 24 Aug 2015 23:31:57 +0200
Subject: [PATCH 125/323] Calculate tile sizes independent from image sizes,
 letting the game tolerate more modding

For images having keys image.tile.*, image.tileforest.* and image.tileoverlay.*
the game allows using different image resolutions now.
For example, you could replace a tile with an image having 2x normal
size, to have it show without blurr when zooming the map in.
Non-integer multiples of the standard size or images streched in one dimension
will still show up in lower quality though.
More than 2x larger images will be scaled down and not improve the game atm,
but increase used RAM.
---
 .../sf/freecol/client/gui/ImageLibrary.java   | 43 ++++++++-----------
 src/net/sf/freecol/client/gui/MapViewer.java  |  6 +--
 .../freecol/client/gui/panel/ColonyPanel.java |  2 +-
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index e1d404385..5a887ad3f 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -255,7 +255,7 @@ public final class ImageLibrary {
     public BufferedImage getBeachCornerImage(int index, int x, int y) {
         return ResourceManager.getImage("image.tile.model.tile.beach.corner" + index
                                         + ".r" + ((isEven(x, y)) ? "0" : "1"),
-                                        scaleFactor);
+                                        scaleDimension(TILE_SIZE));
     }
 
     /**
@@ -269,7 +269,7 @@ public final class ImageLibrary {
     public BufferedImage getBeachEdgeImage(int index, int x, int y) {
         return ResourceManager.getImage("image.tile.model.tile.beach.edge" + index
                                         + ".r"+ ((isEven(x, y)) ? "0" : "1"),
-                                        scaleFactor);
+                                        scaleDimension(TILE_SIZE));
     }
 
     /**
@@ -287,8 +287,8 @@ public final class ImageLibrary {
                                 int x, int y) {
         String key = (type == null) ? "model.tile.unexplored" : type.getId();
         return ResourceManager.getImage("image.tile." + key + ".border." + direction
-                                        + ".r" + ((isEven(x, y)) ?  "0" : "1")
-                                        , scaleFactor);
+                                        + ".r" + ((isEven(x, y)) ?  "0" : "1"),
+                                        scaleDimension(TILE_SIZE));
     }
 
     /**
@@ -306,10 +306,12 @@ public final class ImageLibrary {
     }
 
     public static BufferedImage getForestImage(TileType type, float scale) {
-        return ResourceManager.getImage("image.tileforest." + type.getId(), scale);
+        return ResourceManager.getImage("image.tileforest." + type.getId(),
+                                        scaleDimension(TILE_FOREST_SIZE, scale));
     }
 
     public static BufferedImage getForestImage(TileType type, TileImprovementStyle riverStyle, float scale) {
+        Dimension size = scaleDimension(TILE_FOREST_SIZE, scale);
         if (riverStyle != null) {
             String key = "image.tileforest." + type.getId() + ".s" + riverStyle.getMask();
             // @compat 0.10.6
@@ -321,9 +323,9 @@ public final class ImageLibrary {
             // Consider keeping the fallback, as its safer to have one.
             if (ResourceManager.hasImageResource(key))
             // end @compat
-                return ResourceManager.getImage(key, scale);
+                return ResourceManager.getImage(key, size);
         }
-        return ResourceManager.getImage("image.tileforest." + type.getId(), scale);
+        return ResourceManager.getImage("image.tileforest." + type.getId(), size);
     }
 
     /**
@@ -559,11 +561,13 @@ public final class ImageLibrary {
             case 0:
                 return null;
             case 1:
-                return ResourceManager.getImage(keys.get(0), scale);
+                return ResourceManager.getImage(keys.get(0),
+                    scaleDimension(TILE_OVERLAY_SIZE, scale));
             default:
                 Collections.sort(keys);
                 return ResourceManager.getImage(
-                    keys.get(Math.abs(id.hashCode() % count)), scale);
+                    keys.get(Math.abs(id.hashCode() % count)),
+                    scaleDimension(TILE_OVERLAY_SIZE, scale));
         }
     }
 
@@ -640,7 +644,9 @@ public final class ImageLibrary {
      * @return The image with the given style.
      */
     public static BufferedImage getRiverImage(String style, float scale) {
-        return ResourceManager.getImage("image.tile.model.improvement.river.s" + style, scale);
+        return ResourceManager.getImage(
+            "image.tile.model.improvement.river.s" + style,
+            scaleDimension(TILE_SIZE, scale));
     }
 
     /**
@@ -658,7 +664,7 @@ public final class ImageLibrary {
                                     int x, int y) {
         String key = "image.tile.model.tile.delta." + direction
             + (magnitude == 1 ? ".small" : ".large");
-        return ResourceManager.getImage(key, scaleFactor);
+        return ResourceManager.getImage(key, scaleDimension(TILE_SIZE));
     }
 
     public BufferedImage getSmallSettlementImage(Settlement settlement) {
@@ -707,19 +713,6 @@ public final class ImageLibrary {
                                         scale);
     }
 
-    /**
-     * Get a tile size for displaying the colony tiles.
-     * 
-     * @param tile The <code>Tile</code> to get the size for.
-     * @return The tile size.
-     */
-    public Dimension calculateTileSize(Tile tile) {
-        final TileType tileType = tile.getType();
-        final BufferedImage image = getTerrainImage(tileType,
-            tile.getX(), tile.getY());
-        return new Dimension(image.getWidth(), image.getHeight());
-    }
-
     /**
      * Returns the terrain-image for the given type.
      *
@@ -737,7 +730,7 @@ public final class ImageLibrary {
     public static BufferedImage getTerrainImage(TileType type, int x, int y, float scale) {
         String key = (type == null) ? "model.tile.unexplored" : type.getId();
         return ResourceManager.getImage("image.tile." + key + ".center.r"
-            + (isEven(x, y) ? "0" : "1"), scale);
+            + (isEven(x, y) ? "0" : "1"), scaleDimension(TILE_SIZE, scale));
     }
 
     public BufferedImage getSmallerUnitImage(Unit unit) {
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index d5052ddef..c7d514737 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -470,7 +470,7 @@ public final class MapViewer {
                     compoundHeight = tmpHeight;
             }
             if (tileType.isForested()) {
-                tmpHeight = lib.getForestImage(tileType).getHeight(null);
+                tmpHeight = lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height;
                 if(tmpHeight > compoundHeight)
                     compoundHeight = tmpHeight;
             }
@@ -587,7 +587,7 @@ public final class MapViewer {
     public void displayColonyTiles(Graphics2D g, Tile[][] tiles, Colony colony) {
         Set<String> overlayCache = ImageLibrary.createOverlayCache();
         final Tile tile = colony.getTile();
-        Dimension tileSize = lib.calculateTileSize(tile);
+        Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
         for (int x = 0; x < 3; x++) {
             for (int y = 0; y < 3; y++) {
                 if (tiles[x][y] != null) {
@@ -2201,7 +2201,7 @@ public final class MapViewer {
                 if (ResourceManager.hasImageResource(key)) {
                     // Has its own Overlay Image in Misc, use it
                     Image overlay = ResourceManager.getImage(key,
-                        lib.getScaleFactor());
+                        lib.scaleDimension(ImageLibrary.TILE_SIZE));
                     g.drawImage(overlay, 0, 0, null);
                 }
             }
diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index e3c4f4801..6d9f2713b 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -2044,7 +2044,7 @@ public final class ColonyPanel extends PortPanel
                 setOpaque(false);
                 // Size and position:
                 Dimension size = getGUI().getColonyTileMapViewer()
-                    .getImageLibrary().calculateTileSize(colonyTile.getTile());
+                    .getImageLibrary().scaleDimension(ImageLibrary.TILE_SIZE);
                 setSize(size);
                 setLocation(((2 - x) + y) * size.width / 2,
                     (x + y) * size.height / 2);

From b8866eee55e7d9fb812db13896abceca5a885223 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Wed, 26 Aug 2015 19:15:34 +0930
Subject: [PATCH 126/323] Aggression level message fix.

---
 src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java b/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java
index b0f55feea..2cadc877c 100644
--- a/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java
@@ -185,7 +185,7 @@ public class NationTypeDetailPanel
         JLabel name = Utility.localizedHeaderLabel(nationType, FontLibrary.FontSize.SMALL);
         panel.add(name, "span, align center, wrap 40");
 
-        panel.add(Utility.localizedLabel("colopedia.nationType.aggressionLevel"));
+        panel.add(Utility.localizedLabel("colopedia.nationType.aggression"));
         panel.add(Utility.localizedLabel("colopedia.nationType."
                 + nationType.getAggression().getKey()));
 

From f36250b33b377c914476a9134efa3ad8e84dc5a7 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Wed, 26 Aug 2015 19:36:56 +0930
Subject: [PATCH 127/323] Fix conquest modifier string.

---
 data/strings/FreeColMessages.properties                 | 1 +
 src/net/sf/freecol/client/gui/panel/ModifierFormat.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 3bbb8bb0d..9ecd93f1e 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -3423,6 +3423,7 @@ mapSizeDialog.mapSize=Select map size
 
 # ModifierFormat
 modifierFormat.unknown=???
+modifierFormat.scopeMethod.isIndian.name=natives
 
 # MonarchDialog
 monarchDialog.default=A message from the Crown
diff --git a/src/net/sf/freecol/client/gui/panel/ModifierFormat.java b/src/net/sf/freecol/client/gui/panel/ModifierFormat.java
index cbada3ef1..6afada512 100644
--- a/src/net/sf/freecol/client/gui/panel/ModifierFormat.java
+++ b/src/net/sf/freecol/client/gui/panel/ModifierFormat.java
@@ -125,7 +125,8 @@ public class ModifierFormat {
                 } else if (scope.getAbilityId() != null) {
                     key = scope.getAbilityId();
                 } else if (scope.getMethodName() != null) {
-                    key = "model.scope." + scope.getMethodName();
+                    key = "modifierFormat.scopeMethod."
+                        + scope.getMethodName();
                 }
                 if (key != null) {
                     label += (scope.isMatchNegated() ? " !" : " ")

From 72ae95150155b935e0c8ee3c7ffe02c4f2e7d0b6 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 27 Aug 2015 20:08:12 +0930
Subject: [PATCH 128/323] Add missing "gold" to native raid plunder message.

---
 data/strings/FreeColMessages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 9ecd93f1e..08c07a885 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -2597,7 +2597,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% has evaded an attack by %unit%.
 combat.enemyShipSunk=%unit% has sunk %enemyNation% %enemyUnit%!
 combat.equipmentCaptured=Beware, the braves of the %nation% have acquired %equipment%!
 combat.goodsStolen=%enemyNation% %enemyUnit% steals %amount% %goods% at %colony%!
-combat.indianPlunder=%enemyNation% %enemyUnit% plunder %amount% from %colony%.
+combat.indianPlunder=%enemyNation% %enemyUnit% plunder %amount% gold from %colony%.
 combat.indianRaid=Our spies report that the %nation% have raided the %colonyNation% colony of %colony%.
 combat.indianSurprise=The %nation% make a surprise raid at %colony%, alarming our colonists. The %nation% chief denies involvement.
 combat.indianTreasure=You plunder %amount% from %settlement%.

From 59aa1deba207f82bb79978d736c9daf7f8dc75d6 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 27 Aug 2015 20:11:01 +0930
Subject: [PATCH 129/323] colonyPanel.outsideColony, not
 colonyPanel.outsideOfColony.

---
 src/net/sf/freecol/client/gui/panel/ColonyPanel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 6d9f2713b..0fc511792 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -724,7 +724,7 @@ public final class ColonyPanel extends PortPanel
             } else if (!unit.isOnCarrier()) {
                 unitIcon = new ImageIcon(lib.getSmallerUnitImage(unit));
                 String menuTitle = unit.getDescription()
-                    + " " + Messages.message("colonyPanel.outsideOfColony");
+                    + " " + Messages.message("colonyPanel.outsideColony");
                 subMenu = new JMenuItem(menuTitle, unitIcon);
                 subMenu.addActionListener(new ActionListener() {
                     @Override

From 3f237bb910e6d90f0d0643e73d28983ce99850b6 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 27 Aug 2015 20:16:00 +0930
Subject: [PATCH 130/323] Not "producing.name".

---
 data/strings/FreeColMessages.properties              | 2 +-
 src/net/sf/freecol/client/gui/panel/ColonyPanel.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 08c07a885..8c220c838 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -3234,7 +3234,7 @@ colonyPanel.buildQueue=Build Queue
 colonyPanel.colonyUnits=Colony Units
 colonyPanel.inPort=In Port
 colonyPanel.outsideColony=Outside Colony
-colonyPanel.producing=Producing:
+colonyPanel.producing=producing:
 colonyPanel.reducePopulation=If you reduce the population below %number%, %colony% will no longer be able to build %buildable%.
 colonyPanel.setGoods=Set Goods
 colonyPanel.traceWork=Trace Work
diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 0fc511792..6653ba2e6 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -657,7 +657,7 @@ public final class ColonyPanel extends PortPanel
                     .template(goodsType)
                     .addAmount("%amount%", producing));
                 sb.append(unit.getDescription())
-                    .append(" ").append(Messages.message("producing.name"))
+                    .append(" ").append(Messages.message("colonyPanel.producing"))
                     .append(" ").append(producing)
                     .append(" ").append(nominative);
             } else if (workingInBuilding != null && goodsType != null) {

From 2895fe2243c44c1d7c0c8972c2fd491cffe05be7 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 27 Aug 2015 20:33:42 +0930
Subject: [PATCH 131/323] Add messages for model.option.warSupport{Force,Gold}.

---
 data/strings/FreeColMessages.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 8c220c838..947114d30 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -611,6 +611,10 @@ model.option.interventionForce.name=Intervention Force
 model.option.interventionForce.shortDescription=The Intervention Force dispatched to support your War of Independence.
 model.option.mercenaryForce.name=Mercenary Force
 model.option.mercenaryForce.shortDescription=The Mercenary Force offered to support your War of Independence.
+model.option.warSupportForce.name=War Support Force
+model.option.warSupportForce.shortDescription=The maximum Force offered by the Monarch to support your wars.
+model.option.warSupportGold.name=War Support Gold
+model.option.warSupportGold.shortDescription=The maximum gold offered by the Monarch to support your wars.
 
 model.difficulty.government.name=Government
 model.option.badGovernmentLimit.name=Bad government limit

From c356c77932e59077ad20b36a7fd0e61c19d25219 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 10 Aug 2015 14:34:26 +0930
Subject: [PATCH 132/323] Untangle the use of updateMenuBar and its interaction
 with the ActionManager.

---
 .../sf/freecol/client/control/InGameController.java  |  1 -
 .../freecol/client/control/MapEditorController.java  |  4 ++--
 src/net/sf/freecol/client/gui/Canvas.java            | 12 ++++--------
 src/net/sf/freecol/client/gui/MapViewer.java         |  6 ------
 src/net/sf/freecol/client/gui/SwingGUI.java          | 12 +++++++++---
 .../freecol/client/gui/action/NewEmptyMapAction.java |  2 +-
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 70046453b..4d0493ace 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -310,7 +310,6 @@ public final class InGameController implements NetworkConstants {
         SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    freeColClient.updateActions();
                     gui.updateMenuBar();
                 }
             });
diff --git a/src/net/sf/freecol/client/control/MapEditorController.java b/src/net/sf/freecol/client/control/MapEditorController.java
index c6e7f5e85..54b945c1d 100644
--- a/src/net/sf/freecol/client/control/MapEditorController.java
+++ b/src/net/sf/freecol/client/control/MapEditorController.java
@@ -186,7 +186,7 @@ public final class MapEditorController {
             .createMap(new LogBuilder(-1));
         requireNativeNations(game);
         gui.setFocus(game.getMap().getTile(1,1));
-        freeColClient.updateActions();
+        gui.updateMenuBar();
         gui.refresh();
     }
 
@@ -308,7 +308,7 @@ public final class MapEditorController {
                                     gui.closeStatusPanel();
                                     gui.setFocus(freeColClient.getGame()
                                         .getMap().getTile(1,1));
-                                    freeColClient.updateActions();
+                                    gui.updateMenuBar();
                                     gui.refresh();
                                 }
                             });
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 31572bd38..caf09d618 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -986,8 +986,7 @@ public final class Canvas extends JDesktopPane {
      */
     public void add(Component comp, Integer i) {
         addToCanvas(comp, i);
-        updateMenuBar();
-        freeColClient.updateActions();
+        gui.updateMenuBar();
     }
 
     /**
@@ -1407,10 +1406,8 @@ public final class Canvas extends JDesktopPane {
     @Override
     public void remove(Component comp) {
         removeFromCanvas(comp);
-        final boolean takeFocus = (comp != statusPanel);
-        updateMenuBar();
-        freeColClient.updateActions();
-        if (takeFocus && !isShowingSubPanel()) {
+        gui.updateMenuBar();
+        if (comp != statusPanel && !isShowingSubPanel()) {
             requestFocus();
         }
     }
@@ -1623,8 +1620,7 @@ public final class Canvas extends JDesktopPane {
         } finally {
             clientOptionsDialogShowing = false;
             if (group != null) {
-                freeColClient.updateActions();
-                resetMenuBar();
+                gui.resetMenuBar();
                 // Immediately redraw the minimap if that was updated.
                 gui.updateMapControls();
             }
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index c7d514737..52f44d6d5 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -946,7 +946,6 @@ public final class MapViewer {
 
         if (activeUnit == null || tile == null) {
             gui.getCanvas().stopGoto();
-            freeColClient.updateActions();
         } else {
             updateCurrentPathForActiveUnit();
             if (!gui.setSelectedTile(tile)
@@ -1082,11 +1081,6 @@ public final class MapViewer {
             }
         }
 
-        freeColClient.updateActions();
-        gui.updateMenuBar();
-
-        gui.updateMapControls();
-
         // Check for refocus
         if (!onScreen(newTile)
             || freeColClient.getClientOptions().getBoolean(ClientOptions.ALWAYS_CENTER)) {
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index b5908a5fe..57a7ec485 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -543,6 +543,7 @@ public class SwingGUI extends GUI {
      */
     @Override
     public void resetMenuBar() {
+        freeColClient.updateActions();
         canvas.resetMenuBar();
     }
 
@@ -585,20 +586,24 @@ public class SwingGUI extends GUI {
      */
     @Override
     public boolean setActiveUnit(Unit unit) {
-        boolean result=mapViewer.setActiveUnit(unit);
+        boolean result = mapViewer.setActiveUnit(unit);
         updateMapControls();
+        updateMenuBar();
         if (unit != null && !freeColClient.getMyPlayer().owns(unit)) {
             canvas.refresh();
         }
-        canvas.updateMenuBar();
         return result;
     }
 
     /**
      * Update the menu bar.
+     *
+     * Always update the actions first so that the enabled/disabled
+     * state is correct.
      */
     @Override
     public void updateMenuBar() {
+        freeColClient.updateActions();
         canvas.updateMenuBar();
     }
 
@@ -1706,8 +1711,9 @@ public class SwingGUI extends GUI {
 
     @Override
     public boolean setSelectedTile(Tile newTileToSelect) {
-        boolean result=mapViewer.setSelectedTile(newTileToSelect);
+        boolean result = mapViewer.setSelectedTile(newTileToSelect);
         updateMapControls();
+        updateMenuBar();
         return result;
     }
 
diff --git a/src/net/sf/freecol/client/gui/action/NewEmptyMapAction.java b/src/net/sf/freecol/client/gui/action/NewEmptyMapAction.java
index bae197888..8c8b96fdb 100644
--- a/src/net/sf/freecol/client/gui/action/NewEmptyMapAction.java
+++ b/src/net/sf/freecol/client/gui/action/NewEmptyMapAction.java
@@ -72,7 +72,7 @@ public class NewEmptyMapAction extends MapboardAction {
         game.setMap(map);
         Tile tile = map.getTile(size.width/2, size.height/2);
         getGUI().setFocus(tile);
-        getFreeColClient().updateActions();
+        getGUI().updateMenuBar();
         getGUI().refresh();
     }
 }

From 8b816070aa1a57ba46f0d150757955ead8bb7c5f Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 28 Aug 2015 20:06:27 +0930
Subject: [PATCH 133/323] Suppressed animations still should update the gui,
 BR#2890.

---
 .../client/control/InGameController.java      | 20 ++++++++++++++++---
 .../client/control/InGameInputHandler.java    | 14 -------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 4d0493ace..735bcff9b 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -2607,8 +2607,15 @@ public final class InGameController implements NetworkConstants {
     public void animateAttack(Unit attacker, Unit defender,
                               Tile attackerTile, Tile defenderTile,
                               boolean success) {
-        gui.animateUnitAttack(attacker, defender, attackerTile, defenderTile,
-                              success);
+        // Note: we used to focus the map on the unit even when
+        // animation is off as long as the center-active-unit option
+        // was set.  However IR#115 requested that if animation is off
+        // that we display nothing so as to speed up the other player
+        // moves as much as possible.
+        if (freeColClient.getAnimationSpeed(attacker.getOwner()) > 0) {
+            gui.animateUnitAttack(attacker, defender,
+                                  attackerTile, defenderTile, success);
+        }
         gui.refresh();
     }
 
@@ -2622,7 +2629,14 @@ public final class InGameController implements NetworkConstants {
      * @param newTile The <code>Tile</code> the move ends at.
      */
     public void animateMove(Unit unit, Tile oldTile, Tile newTile) {
-        gui.animateUnitMove(unit, oldTile, newTile);
+        // Note: we used to focus the map on the unit even when
+        // animation is off as long as the center-active-unit option
+        // was set.  However IR#115 requested that if animation is off
+        // that we display nothing so as to speed up the other player
+        // moves as much as possible.
+        if (freeColClient.getAnimationSpeed(unit.getOwner()) > 0) {
+            gui.animateUnitMove(unit, oldTile, newTile);
+        }
         gui.refresh();
     }
 
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index 981c2d662..ca8434880 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -374,13 +374,6 @@ public final class InGameInputHandler extends InputHandler {
             throw new IllegalStateException("Attack animation for: "
                 + player.getId() + " omitted attacker: " + str);
         }
-        // Note: we used to focus the map on the unit even when
-        // animation is off as long as the center-active-unit option
-        // was set.  However IR#115 requested that if animation is off
-        // that we display nothing so as to speed up the other player
-        // moves as much as possible.
-        if (getFreeColClient().getAnimationSpeed(u.getOwner()) <= 0)
-            return null;
         final Unit attacker = u;
 
         if ((str = element.getAttribute("defender")).isEmpty()) {
@@ -460,13 +453,6 @@ public final class InGameInputHandler extends InputHandler {
                 + " missing unit:" + unitId);
             return null;
         }
-        // Note: we used to focus the map on the unit even when
-        // animation is off as long as the center-active-unit option
-        // was set.  However IR#115 requested that if animation is off
-        // that we display nothing so as to speed up the other player
-        // moves as much as possible.
-        if (getFreeColClient().getAnimationSpeed(u.getOwner()) <= 0)
-            return null;
         final Unit unit = u;
 
         String oldTileId = element.getAttribute("oldTile");

From 91f82dfa972b8cab7e7c16cff0cb162c0ccbba44 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 28 Aug 2015 16:39:11 +0200
Subject: [PATCH 134/323] Move canvas member from derived classes to
 AbstractCanvasListener

---
 src/net/sf/freecol/client/gui/AbstractCanvasListener.java   | 5 ++++-
 src/net/sf/freecol/client/gui/Canvas.java                   | 4 ++--
 .../sf/freecol/client/gui/CanvasMapEditorMouseListener.java | 6 +-----
 .../sf/freecol/client/gui/CanvasMouseMotionListener.java    | 5 +----
 src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java     | 2 +-
 src/net/sf/freecol/client/gui/menu/InGameMenuBar.java       | 6 ++++--
 src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java    | 6 ++++--
 .../sf/freecol/client/gui/menu/MenuMouseMotionListener.java | 5 +++--
 8 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/AbstractCanvasListener.java b/src/net/sf/freecol/client/gui/AbstractCanvasListener.java
index 68ed1db8e..7b112bcba 100644
--- a/src/net/sf/freecol/client/gui/AbstractCanvasListener.java
+++ b/src/net/sf/freecol/client/gui/AbstractCanvasListener.java
@@ -41,6 +41,8 @@ public class AbstractCanvasListener {
     /** The enclosing client. */
     protected final FreeColClient freeColClient;
 
+    protected final Canvas canvas;
+
     /** The map viewer to scroll. */
     protected final MapViewer mapViewer;
 
@@ -53,8 +55,9 @@ public class AbstractCanvasListener {
      *
      * @param freeColClient The <code>FreeColClient</code> for the game.
      */
-    public AbstractCanvasListener(FreeColClient freeColClient, MapViewer mapViewer) {
+    public AbstractCanvasListener(FreeColClient freeColClient, Canvas canvas, MapViewer mapViewer) {
         this.freeColClient = freeColClient;
+        this.canvas = canvas;
         this.mapViewer = mapViewer;
         this.scrollThread = null;
     }
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index caf09d618..5973197e3 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -327,7 +327,7 @@ public final class Canvas extends JDesktopPane {
         // We may need to reset the zoom value to the default value
         gui.resetMapZoom();
 
-        frame.setJMenuBar(new MapEditorMenuBar(freeColClient, mapViewer));
+        frame.setJMenuBar(new MapEditorMenuBar(freeColClient, this, mapViewer));
         showMapEditorTransformPanel();
 
         CanvasMapEditorMouseListener listener
@@ -353,7 +353,7 @@ public final class Canvas extends JDesktopPane {
     void initializeInGame() {
         if (frame == null) return;
 
-        frame.setJMenuBar(new InGameMenuBar(freeColClient, mapViewer));
+        frame.setJMenuBar(new InGameMenuBar(freeColClient, this, mapViewer));
         frame.paintAll(getGraphics());
     }
 
diff --git a/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java b/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java
index 3b4d4b639..9be9ecf21 100644
--- a/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java
@@ -48,8 +48,6 @@ public final class CanvasMapEditorMouseListener extends AbstractCanvasListener
 
     private static final Logger logger = Logger.getLogger(CanvasMapEditorMouseListener.class.getName());
 
-    private final Canvas canvas;
-
     private Point endPoint;
     private Point startPoint;
 
@@ -60,9 +58,7 @@ public final class CanvasMapEditorMouseListener extends AbstractCanvasListener
      * @param canvas The component this object gets created for.
      */
     public CanvasMapEditorMouseListener(FreeColClient freeColClient, Canvas canvas, MapViewer mapViewer) {
-        super(freeColClient, mapViewer);
-
-        this.canvas = canvas;
+        super(freeColClient, canvas, mapViewer);
     }
 
 
diff --git a/src/net/sf/freecol/client/gui/CanvasMouseMotionListener.java b/src/net/sf/freecol/client/gui/CanvasMouseMotionListener.java
index 17da95866..504efedf7 100644
--- a/src/net/sf/freecol/client/gui/CanvasMouseMotionListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMouseMotionListener.java
@@ -40,8 +40,6 @@ public final class CanvasMouseMotionListener extends AbstractCanvasListener
     /** Number of pixels that must be moved before a goto is enabled. */
     private static final int DRAG_THRESHOLD = 16;
 
-    private Canvas canvas;
-
     /**
      * Temporary variable for checking if we need to recalculate the
      * path when dragging units.
@@ -55,8 +53,7 @@ public final class CanvasMouseMotionListener extends AbstractCanvasListener
      * @param freeColClient The <code>FreeColClient</code> for the game.
      */
     public CanvasMouseMotionListener(FreeColClient freeColClient, Canvas canvas, MapViewer mapViewer) {
-        super(freeColClient, mapViewer);
-        this.canvas = canvas;
+        super(freeColClient, canvas, mapViewer);
     }
 
 
diff --git a/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java b/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
index 6e065fe0b..19dba5c80 100644
--- a/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
+++ b/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
@@ -55,7 +55,7 @@ public class FreeColMenuTest implements ActionListener, ItemListener {
         client.startClient(null, null, true, true, null, null);
 
         //Create the menu bar.
-        menuBar = new InGameMenuBar(client, null);
+        menuBar = new InGameMenuBar(client, null, null);
         client.updateActions();
         ((FreeColMenuBar)menuBar).update();
 
diff --git a/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java b/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
index 754d373f5..404c88f22 100644
--- a/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
@@ -30,6 +30,7 @@ import javax.swing.ButtonGroup;
 import javax.swing.JMenu;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.Canvas;
 import net.sf.freecol.client.gui.MapViewer;
 import net.sf.freecol.client.gui.action.*;
 import net.sf.freecol.client.gui.action.DisplayTileTextAction.DisplayText;
@@ -63,7 +64,7 @@ public class InGameMenuBar extends FreeColMenuBar {
      *
      * @param f The main controller.
      */
-    public InGameMenuBar(FreeColClient f, MapViewer mapViewer) {
+    public InGameMenuBar(FreeColClient f, Canvas canvas, MapViewer mapViewer) {
         // FIXME: FreeColClient should not have to be passed in to
         // this class.  This is only a menu bar, it doesn't need a
         // reference to the main controller.  The only reason it has
@@ -83,7 +84,8 @@ public class InGameMenuBar extends FreeColMenuBar {
 
         // Add a mouse listener so that autoscrolling can happen in
         // this menubar
-        this.addMouseMotionListener(new MenuMouseMotionListener(f, mapViewer));
+        this.addMouseMotionListener(
+            new MenuMouseMotionListener(f, canvas, mapViewer));
         
         reset();
     }
diff --git a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
index eb0885e8d..6b8aa9946 100644
--- a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
@@ -31,6 +31,7 @@ import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.Canvas;
 import net.sf.freecol.client.gui.MapViewer;
 import net.sf.freecol.client.gui.action.*;
 import net.sf.freecol.client.gui.action.DisplayTileTextAction.DisplayText;
@@ -63,11 +64,12 @@ public class MapEditorMenuBar extends FreeColMenuBar {
      *
      * @param freeColClient The <code>FreeColClient</code> for the game.
      */
-    public MapEditorMenuBar(final FreeColClient freeColClient, MapViewer mapViewer) {
+    public MapEditorMenuBar(final FreeColClient freeColClient, Canvas canvas, MapViewer mapViewer) {
         super(freeColClient);
 
         // Add a mouse listener so that autoscrolling can happen in this menubar
-        this.addMouseMotionListener(new MenuMouseMotionListener(freeColClient, mapViewer));
+        this.addMouseMotionListener(
+            new MenuMouseMotionListener(freeColClient, canvas, mapViewer));
         reset();
     }
 
diff --git a/src/net/sf/freecol/client/gui/menu/MenuMouseMotionListener.java b/src/net/sf/freecol/client/gui/menu/MenuMouseMotionListener.java
index 1e7df06dd..6f8902ddb 100644
--- a/src/net/sf/freecol/client/gui/menu/MenuMouseMotionListener.java
+++ b/src/net/sf/freecol/client/gui/menu/MenuMouseMotionListener.java
@@ -24,6 +24,7 @@ import java.awt.event.MouseMotionListener;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.AbstractCanvasListener;
+import net.sf.freecol.client.gui.Canvas;
 import net.sf.freecol.client.gui.MapViewer;
 
 
@@ -47,8 +48,8 @@ public class MenuMouseMotionListener extends AbstractCanvasListener
      *
      * @param freeColClient The enclosing <code>FreeColClient</code>.
      */
-    public MenuMouseMotionListener(FreeColClient freeColClient, MapViewer mapViewer) {
-        super(freeColClient, mapViewer);
+    public MenuMouseMotionListener(FreeColClient freeColClient, Canvas canvas, MapViewer mapViewer) {
+        super(freeColClient, canvas, mapViewer);
     }
 
 

From 1d526beb3bc5a10339fe05e728a60db785c121d8 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 28 Aug 2015 17:40:21 +0200
Subject: [PATCH 135/323] Remove most dependencies on MapViewer in Canvas'
 listeners

---
 .../client/gui/AbstractCanvasListener.java    | 10 +--
 src/net/sf/freecol/client/gui/Canvas.java     | 61 +++++++++++++++++--
 .../gui/CanvasMapEditorMouseListener.java     | 19 +++---
 .../client/gui/CanvasMouseListener.java       | 16 ++---
 .../client/gui/CanvasMouseMotionListener.java | 20 +++---
 src/net/sf/freecol/client/gui/MapViewer.java  | 20 ------
 .../sf/freecol/client/gui/ScrollThread.java   | 13 ++--
 src/net/sf/freecol/client/gui/SwingGUI.java   |  2 +-
 .../client/gui/menu/FreeColMenuTest.java      |  2 +-
 .../client/gui/menu/InGameMenuBar.java        |  7 +--
 .../client/gui/menu/MapEditorMenuBar.java     |  5 +-
 .../gui/menu/MenuMouseMotionListener.java     |  7 +--
 12 files changed, 103 insertions(+), 79 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/AbstractCanvasListener.java b/src/net/sf/freecol/client/gui/AbstractCanvasListener.java
index 7b112bcba..07bf9a8a3 100644
--- a/src/net/sf/freecol/client/gui/AbstractCanvasListener.java
+++ b/src/net/sf/freecol/client/gui/AbstractCanvasListener.java
@@ -43,9 +43,6 @@ public class AbstractCanvasListener {
 
     protected final Canvas canvas;
 
-    /** The map viewer to scroll. */
-    protected final MapViewer mapViewer;
-
     /** The scroll thread itself. */
     protected ScrollThread scrollThread = null;
 
@@ -55,10 +52,9 @@ public class AbstractCanvasListener {
      *
      * @param freeColClient The <code>FreeColClient</code> for the game.
      */
-    public AbstractCanvasListener(FreeColClient freeColClient, Canvas canvas, MapViewer mapViewer) {
+    public AbstractCanvasListener(FreeColClient freeColClient, Canvas canvas) {
         this.freeColClient = freeColClient;
         this.canvas = canvas;
-        this.mapViewer = mapViewer;
         this.scrollThread = null;
     }
 
@@ -110,7 +106,7 @@ public class AbstractCanvasListener {
      */
     private void scroll(int x, int y, int scrollSpace) {
         Direction direction;
-        Dimension size = mapViewer.getSize();
+        Dimension size = canvas.getSize();
         if (x < scrollSpace && y < scrollSpace) { // Upper-Left
             direction = Direction.NW;
         } else if (x >= size.width - scrollSpace
@@ -137,7 +133,7 @@ public class AbstractCanvasListener {
         if (direction == null) {
             stopScrollIfScrollIsActive();
         } else if (scrollThread == null || scrollThread.isInterrupted()) {
-            scrollThread = new ScrollThread(mapViewer);
+            scrollThread = new ScrollThread(canvas);
             scrollThread.setDirection(direction);
             scrollThread.start();
         } else {
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 5973197e3..bdc713322 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -73,6 +73,7 @@ import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColFileFilter;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.DiplomaticTrade;
+import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.FoundingFather;
 import net.sf.freecol.common.model.FreeColGameObject;
 import net.sf.freecol.common.model.FreeColObject;
@@ -202,6 +203,8 @@ public final class Canvas extends JDesktopPane {
 
     private final MapViewer mapViewer;
 
+    private Point gotoDragPoint;
+
     private GrayLayer greyLayer;
 
     private final ServerListPanel serverListPanel;
@@ -327,11 +330,11 @@ public final class Canvas extends JDesktopPane {
         // We may need to reset the zoom value to the default value
         gui.resetMapZoom();
 
-        frame.setJMenuBar(new MapEditorMenuBar(freeColClient, this, mapViewer));
+        frame.setJMenuBar(new MapEditorMenuBar(freeColClient, this));
         showMapEditorTransformPanel();
 
         CanvasMapEditorMouseListener listener
-            = new CanvasMapEditorMouseListener(freeColClient, this, mapViewer);
+            = new CanvasMapEditorMouseListener(freeColClient, this);
         addMouseListener(listener);
         addMouseMotionListener(listener);
     }
@@ -353,7 +356,7 @@ public final class Canvas extends JDesktopPane {
     void initializeInGame() {
         if (frame == null) return;
 
-        frame.setJMenuBar(new InGameMenuBar(freeColClient, this, mapViewer));
+        frame.setJMenuBar(new InGameMenuBar(freeColClient, this));
         frame.paintAll(getGraphics());
     }
 
@@ -377,6 +380,56 @@ public final class Canvas extends JDesktopPane {
         }
     }
 
+    /**
+     * Scroll the map in the given direction.
+     *
+     * @param direction The <code>Direction</code> to scroll in.
+     * @return True if scrolling occurred.
+     */
+    boolean scrollMap(Direction direction) {
+        return mapViewer.scrollMap(direction);
+    }
+
+    /**
+     * Converts the given screen coordinates to Map coordinates.
+     * It checks to see to which Tile the given pixel 'belongs'.
+     *
+     * @param x The x-coordinate in pixels.
+     * @param y The y-coordinate in pixels.
+     * @return The Tile that is located at the given position on the screen.
+     */
+    Tile convertToMapTile(int x, int y) {
+        return mapViewer.convertToMapTile(x, y);
+    }
+
+    /**
+     * Gets the active unit.
+     *
+     * @return The <code>Unit</code>.
+     */
+    Unit getActiveUnit() {
+        return mapViewer.getActiveUnit();
+    }
+
+    /**
+     * Gets the point at which the map was clicked for a drag.
+     *
+     * @return The Point where the mouse was initially clicked.
+     */
+    Point getDragPoint() {
+        return gotoDragPoint;
+    }
+
+    /**
+     * Sets the point at which the map was clicked for a drag.
+     *
+     * @param x The mouse's x position.
+     * @param y The mouse's y position.
+     */
+    void setDragPoint(int x, int y) {
+        gotoDragPoint = new Point(x, y);
+    }
+
     /**
      * Checks if there is currently a goto operation on the mapboard.
      *
@@ -1296,7 +1349,7 @@ public final class Canvas extends JDesktopPane {
     void setupMouseListeners() {
         addMouseListener(new CanvasMouseListener(freeColClient, this,
                                                  mapViewer));
-        addMouseMotionListener(new CanvasMouseMotionListener(freeColClient, this, mapViewer));
+        addMouseMotionListener(new CanvasMouseMotionListener(freeColClient, this));
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java b/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java
index 9be9ecf21..4a3ed2b12 100644
--- a/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMapEditorMouseListener.java
@@ -32,8 +32,8 @@ import javax.swing.JComponent;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.MapEditorController;
-import net.sf.freecol.client.gui.panel.RiverStyleDialog;
 import net.sf.freecol.client.gui.panel.MapEditorTransformPanel.TileTypeTransform;
+import net.sf.freecol.client.gui.panel.RiverStyleDialog;
 import net.sf.freecol.common.model.Map;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.TileImprovement;
@@ -57,8 +57,8 @@ public final class CanvasMapEditorMouseListener extends AbstractCanvasListener
      *
      * @param canvas The component this object gets created for.
      */
-    public CanvasMapEditorMouseListener(FreeColClient freeColClient, Canvas canvas, MapViewer mapViewer) {
-        super(freeColClient, canvas, mapViewer);
+    public CanvasMapEditorMouseListener(FreeColClient freeColClient, Canvas canvas) {
+        super(freeColClient, canvas);
     }
 
 
@@ -89,10 +89,9 @@ public final class CanvasMapEditorMouseListener extends AbstractCanvasListener
      */
     private void drawBox(JComponent component,
                          Point startPoint, Point endPoint) {
-        final MapEditorController controller;
         if (startPoint == null || endPoint == null
             || startPoint.distance(endPoint) == 0
-            || (controller = freeColClient.getMapEditorController()) == null)
+            || freeColClient.getMapEditorController() == null)
             return;
 
         Graphics2D graphics = (Graphics2D)component.getGraphics();
@@ -116,7 +115,7 @@ public final class CanvasMapEditorMouseListener extends AbstractCanvasListener
 
         try {
             if (e.getClickCount() > 1) {
-                mapViewer.convertToMapTile(e.getX(), e.getY());
+                canvas.convertToMapTile(e.getX(), e.getY());
             } else {
                 canvas.requestFocus();
             }
@@ -134,7 +133,7 @@ public final class CanvasMapEditorMouseListener extends AbstractCanvasListener
 
         try {
             if (e.getButton() == MouseEvent.BUTTON1) {
-                Tile tile = mapViewer.convertToMapTile(e.getX(), e.getY());
+                Tile tile = canvas.convertToMapTile(e.getX(), e.getY());
                 if (tile != null) getGUI().setSelectedTile(tile);
                 startPoint = endPoint = null;
 
@@ -146,7 +145,7 @@ public final class CanvasMapEditorMouseListener extends AbstractCanvasListener
             } else if (e.getButton() == MouseEvent.BUTTON3
                 || e.isPopupTrigger()) {
                 startPoint = e.getPoint();
-                Tile tile = mapViewer.convertToMapTile(e.getX(), e.getY());
+                Tile tile = canvas.convertToMapTile(e.getX(), e.getY());
                 if (tile != null) {
                     if (tile.hasRiver()) {
                         TileImprovement river = tile.getRiver();
@@ -187,9 +186,9 @@ public final class CanvasMapEditorMouseListener extends AbstractCanvasListener
         endPoint = e.getPoint();
         if (startPoint == null) startPoint = endPoint;
         drawBox(component, startPoint, endPoint);
-        Tile start = mapViewer.convertToMapTile(startPoint.x, startPoint.y);
+        Tile start = canvas.convertToMapTile(startPoint.x, startPoint.y);
         Tile end = (startPoint == endPoint) ? start
-            : mapViewer.convertToMapTile(endPoint.x, endPoint.y);
+            : canvas.convertToMapTile(endPoint.x, endPoint.y);
 
         // edit 2 more conditions in if statement.  we need to
         // check for coordinator of X and Y if (x,y) outside of
diff --git a/src/net/sf/freecol/client/gui/CanvasMouseListener.java b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
index 3359c3914..bb33c5c2c 100644
--- a/src/net/sf/freecol/client/gui/CanvasMouseListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
@@ -80,7 +80,7 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
     public void mouseClicked(MouseEvent e) {
         try {
             if (e.getClickCount() > 1) {
-                Tile tile = mapViewer.convertToMapTile(e.getX(), e.getY());
+                Tile tile = canvas.convertToMapTile(e.getX(), e.getY());
                 Colony colony = tile.getColony();
                 if (colony != null) {
                     if (FreeColDebugger.isInDebugMode(FreeColDebugger.DebugMode.MENUS)) {
@@ -128,19 +128,19 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
 
         int me = e.getButton();
         if (e.isPopupTrigger()) me = MouseEvent.BUTTON3;
-        Tile tile = mapViewer.convertToMapTile(e.getX(), e.getY());
+        Tile tile = canvas.convertToMapTile(e.getX(), e.getY());
 
         switch (me) {
         case MouseEvent.BUTTON1:
             // Record initial click point for purposes of dragging
-            mapViewer.setDragPoint(e.getX(), e.getY());
+            canvas.setDragPoint(e.getX(), e.getY());
             if (canvas.isGotoStarted()) {
                 PathNode path = canvas.getGotoPath();
                 if (path != null) {
                     canvas.stopGoto();
                     // Move the unit
                     freeColClient.getInGameController()
-                        .goToTile(mapViewer.getActiveUnit(),
+                        .goToTile(canvas.getActiveUnit(),
                             path.getLastNode().getTile());
                 }
             } else if (doubleClickTimer.isRunning()) {
@@ -154,7 +154,7 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
             break;
         case MouseEvent.BUTTON2:
             if (tile != null) {
-                Unit unit = mapViewer.getActiveUnit();
+                Unit unit = canvas.getActiveUnit();
                 if (unit != null && unit.getTile() != tile) {
                     PathNode dragPath = unit.findPath(tile);
                     canvas.startGoto();
@@ -185,7 +185,7 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
                 canvas.stopGoto();
 
                 freeColClient.getInGameController()
-                    .goToTile(mapViewer.getActiveUnit(),
+                    .goToTile(canvas.getActiveUnit(),
                               temp.getLastNode().getTile());
 
             } else if (canvas.isGotoStarted()) {
@@ -205,10 +205,10 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
     @Override
     public void actionPerformed(ActionEvent e) {
         doubleClickTimer.stop();
-        Tile tile=mapViewer.convertToMapTile(centerX, centerY);
+        Tile tile=canvas.convertToMapTile(centerX, centerY);
         if(mapViewer.getViewMode() == GUI.MOVE_UNITS_MODE) {
             // Clear goto order when active unit is on the tile
-            Unit unit=mapViewer.getActiveUnit();
+            Unit unit=canvas.getActiveUnit();
             if(unit != null && unit.getTile() == tile) {
                 freeColClient.getInGameController().clearGotoOrders(unit);
                 mapViewer.updateCurrentPathForActiveUnit();
diff --git a/src/net/sf/freecol/client/gui/CanvasMouseMotionListener.java b/src/net/sf/freecol/client/gui/CanvasMouseMotionListener.java
index 504efedf7..ff1718b4d 100644
--- a/src/net/sf/freecol/client/gui/CanvasMouseMotionListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMouseMotionListener.java
@@ -19,6 +19,7 @@
 
 package net.sf.freecol.client.gui;
 
+import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
 import java.util.logging.Logger;
@@ -52,8 +53,8 @@ public final class CanvasMouseMotionListener extends AbstractCanvasListener
      *
      * @param freeColClient The <code>FreeColClient</code> for the game.
      */
-    public CanvasMouseMotionListener(FreeColClient freeColClient, Canvas canvas, MapViewer mapViewer) {
-        super(freeColClient, canvas, mapViewer);
+    public CanvasMouseMotionListener(FreeColClient freeColClient, Canvas canvas) {
+        super(freeColClient, canvas);
     }
 
 
@@ -69,15 +70,15 @@ public final class CanvasMouseMotionListener extends AbstractCanvasListener
         }
 
         if (canvas.isGotoStarted()) {
-            if (mapViewer.getActiveUnit() == null) {
+            if (canvas.getActiveUnit() == null) {
                 canvas.stopGoto();
             }
 
-            Tile tile = mapViewer.convertToMapTile(e.getX(), e.getY());
+            Tile tile = canvas.convertToMapTile(e.getX(), e.getY());
 
             if (tile != null) {
                 if (lastTile != tile) {
-                    Unit active = mapViewer.getActiveUnit();
+                    Unit active = canvas.getActiveUnit();
                     lastTile = tile;
                     if (active != null && active.getTile() != tile) {
                         PathNode dragPath = active.findPath(tile);
@@ -100,13 +101,13 @@ public final class CanvasMouseMotionListener extends AbstractCanvasListener
 
         performDragScrollIfActive(e);
 
-        Tile tile = mapViewer.convertToMapTile(e.getX(), e.getY());
+        Tile tile = canvas.convertToMapTile(e.getX(), e.getY());
         if (tile != null
             && ((e.getModifiers() & MouseEvent.BUTTON1_MASK)
                 == MouseEvent.BUTTON1_MASK)) {
             // only perform the goto for the left mouse button
             if (canvas.isGotoStarted()) {
-                Unit active = mapViewer.getActiveUnit();
+                Unit active = canvas.getActiveUnit();
                 if (active == null) {
                     canvas.stopGoto();
                 } else if (lastTile != tile) {
@@ -116,8 +117,9 @@ public final class CanvasMouseMotionListener extends AbstractCanvasListener
                 }
             } else {
                 // Only start a goto if the drag is 16 pixels or more
-                int deltaX = Math.abs(e.getX() - mapViewer.getDragPoint().x);
-                int deltaY = Math.abs(e.getY() - mapViewer.getDragPoint().y);
+                Point dragPoint = canvas.getDragPoint();
+                int deltaX = Math.abs(e.getX() - dragPoint.x);
+                int deltaY = Math.abs(e.getY() - dragPoint.y);
                 if (deltaX >= DRAG_THRESHOLD || deltaY >= DRAG_THRESHOLD) {
                     canvas.startGoto();
                 }
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 52f44d6d5..4a922ac25 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -179,7 +179,6 @@ public final class MapViewer {
     /** A path for a current goto order. */
     private PathNode gotoPath = null;
     private boolean gotoStarted = false;
-    private Point gotoDragPoint;
 
     // Helper variables for displaying the map.
     private int tileHeight, tileWidth, halfHeight, halfWidth,
@@ -709,15 +708,6 @@ public final class MapViewer {
         return cursor;
     }
 
-    /**
-     * Gets the point at which the map was clicked for a drag.
-     *
-     * @return The Point where the mouse was initially clicked.
-     */
-    Point getDragPoint() {
-        return gotoDragPoint;
-    }
-
     /**
      * Gets the focus of the map. That is the center tile of the displayed
      * map.
@@ -958,16 +948,6 @@ public final class MapViewer {
         return false;
     }
 
-    /**
-     * Sets the point at which the map was clicked for a drag.
-     *
-     * @param x The mouse's x position.
-     * @param y The mouse's y position.
-     */
-    void setDragPoint(int x, int y) {
-        gotoDragPoint = new Point(x, y);
-    }
-
     /**
      * Sets the focus of the map.
      *
diff --git a/src/net/sf/freecol/client/gui/ScrollThread.java b/src/net/sf/freecol/client/gui/ScrollThread.java
index 6e8069d3e..d94e9ad6a 100644
--- a/src/net/sf/freecol/client/gui/ScrollThread.java
+++ b/src/net/sf/freecol/client/gui/ScrollThread.java
@@ -39,8 +39,8 @@ public class ScrollThread extends Thread {
     /** Delay between scroll steps. */
     private static final int SCROLL_DELAY = 100; // ms
 
-    /** The map viewer to scroll. */
-    private final MapViewer mapViewer;
+    /** The Canvas containing the map to scroll. */
+    private final Canvas canvas;
 
     /** The direction to scroll in. */
     private Direction direction = null;
@@ -49,12 +49,11 @@ public class ScrollThread extends Thread {
     /**
      * The constructor to use.
      * 
-     * @param mapViewer The GUI that holds information such as screen
-     *            resolution.
+     * @param canvas The Canvas containing the map to scroll.
      */
-    public ScrollThread(MapViewer mapViewer) {
+    public ScrollThread(Canvas canvas) {
         super(FreeCol.CLIENT_THREAD + "Mouse scroller");
-        this.mapViewer = mapViewer;
+        this.canvas = canvas;
     }
 
     /**
@@ -78,7 +77,7 @@ public class ScrollThread extends Thread {
                 SwingUtilities.invokeAndWait(new Runnable() {
                     @Override
                     public void run() {
-                        if (!mapViewer.scrollMap(direction)) {
+                        if (!canvas.scrollMap(direction)) {
                             direction = null;
                         }
                     }
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 57a7ec485..d2e824b59 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -481,7 +481,7 @@ public class SwingGUI extends GUI {
             // CanvasMouseMotionListener.
             Point pt = canvas.getMousePosition();
             if (pt != null) {
-                Tile tile = mapViewer.convertToMapTile(pt.x, pt.y);
+                Tile tile = canvas.convertToMapTile(pt.x, pt.y);
                 if (tile != null && unit.getTile() != tile) {
                     canvas.setGotoPath(unit.findPath(tile));
                 }
diff --git a/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java b/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
index 19dba5c80..6e065fe0b 100644
--- a/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
+++ b/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
@@ -55,7 +55,7 @@ public class FreeColMenuTest implements ActionListener, ItemListener {
         client.startClient(null, null, true, true, null, null);
 
         //Create the menu bar.
-        menuBar = new InGameMenuBar(client, null, null);
+        menuBar = new InGameMenuBar(client, null);
         client.updateActions();
         ((FreeColMenuBar)menuBar).update();
 
diff --git a/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java b/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
index 404c88f22..0b6344501 100644
--- a/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
@@ -31,10 +31,8 @@ import javax.swing.JMenu;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.Canvas;
-import net.sf.freecol.client.gui.MapViewer;
 import net.sf.freecol.client.gui.action.*;
 import net.sf.freecol.client.gui.action.DisplayTileTextAction.DisplayText;
-import net.sf.freecol.client.gui.menu.DebugMenu;
 import net.sf.freecol.client.gui.panel.Utility;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
@@ -64,7 +62,7 @@ public class InGameMenuBar extends FreeColMenuBar {
      *
      * @param f The main controller.
      */
-    public InGameMenuBar(FreeColClient f, Canvas canvas, MapViewer mapViewer) {
+    public InGameMenuBar(FreeColClient f, Canvas canvas) {
         // FIXME: FreeColClient should not have to be passed in to
         // this class.  This is only a menu bar, it doesn't need a
         // reference to the main controller.  The only reason it has
@@ -84,8 +82,7 @@ public class InGameMenuBar extends FreeColMenuBar {
 
         // Add a mouse listener so that autoscrolling can happen in
         // this menubar
-        this.addMouseMotionListener(
-            new MenuMouseMotionListener(f, canvas, mapViewer));
+        this.addMouseMotionListener(new MenuMouseMotionListener(f, canvas));
         
         reset();
     }
diff --git a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
index 6b8aa9946..de33a965e 100644
--- a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
@@ -64,12 +64,11 @@ public class MapEditorMenuBar extends FreeColMenuBar {
      *
      * @param freeColClient The <code>FreeColClient</code> for the game.
      */
-    public MapEditorMenuBar(final FreeColClient freeColClient, Canvas canvas, MapViewer mapViewer) {
+    public MapEditorMenuBar(final FreeColClient freeColClient, Canvas canvas) {
         super(freeColClient);
 
         // Add a mouse listener so that autoscrolling can happen in this menubar
-        this.addMouseMotionListener(
-            new MenuMouseMotionListener(freeColClient, canvas, mapViewer));
+        this.addMouseMotionListener(new MenuMouseMotionListener(freeColClient, canvas));
         reset();
     }
 
diff --git a/src/net/sf/freecol/client/gui/menu/MenuMouseMotionListener.java b/src/net/sf/freecol/client/gui/menu/MenuMouseMotionListener.java
index 6f8902ddb..d94a40b6b 100644
--- a/src/net/sf/freecol/client/gui/menu/MenuMouseMotionListener.java
+++ b/src/net/sf/freecol/client/gui/menu/MenuMouseMotionListener.java
@@ -25,7 +25,6 @@ import java.awt.event.MouseMotionListener;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.AbstractCanvasListener;
 import net.sf.freecol.client.gui.Canvas;
-import net.sf.freecol.client.gui.MapViewer;
 
 
 /**
@@ -48,8 +47,8 @@ public class MenuMouseMotionListener extends AbstractCanvasListener
      *
      * @param freeColClient The enclosing <code>FreeColClient</code>.
      */
-    public MenuMouseMotionListener(FreeColClient freeColClient, Canvas canvas, MapViewer mapViewer) {
-        super(freeColClient, canvas, mapViewer);
+    public MenuMouseMotionListener(FreeColClient freeColClient, Canvas canvas) {
+        super(freeColClient, canvas);
     }
 
 
@@ -58,7 +57,7 @@ public class MenuMouseMotionListener extends AbstractCanvasListener
      */
     @Override
     public void mouseDragged(MouseEvent e) {
-        return; //Do nothing
+        //Do nothing
     }
     
     /**

From 27152d1b19e35ad33b7fea8517c0624560404932 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 28 Aug 2015 19:04:39 +0200
Subject: [PATCH 136/323] Simplify Tile drawing methods in MapViewer

---
 src/net/sf/freecol/client/gui/MapViewer.java | 122 ++++++++-----------
 1 file changed, 51 insertions(+), 71 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 4a922ac25..6248ca004 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -457,56 +457,6 @@ public final class MapViewer {
 
     }
 
-
-    private int calculateHeightForTileWithOverlayAndForest(
-            TileType tileType, int height, Image overlayImage) {
-        int compoundHeight = height;
-        if (tileType != null) {
-            int tmpHeight;
-            if (overlayImage != null) {
-                tmpHeight = overlayImage.getHeight(null);
-                if(tmpHeight > compoundHeight)
-                    compoundHeight = tmpHeight;
-            }
-            if (tileType.isForested()) {
-                tmpHeight = lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height;
-                if(tmpHeight > compoundHeight)
-                    compoundHeight = tmpHeight;
-            }
-        }
-        return compoundHeight;
-    }
-
-    /**
-     * Displays the given Tile onto the given Graphics2D object at the
-     * location specified by the coordinates. Draws the terrain and
-     * improvements.  Doesn't draw settlements, lost city rumours, fog
-     * of war, optional values neither units.
-     *
-     * The same as calling <code>displayTile(g, map, tile, x, y, true);</code>.
-     *
-     * @param tile The Tile to draw.
-     * @return The image.
-     */
-    public BufferedImage createTileImageWithBeachBorderAndItems(Tile tile) {
-        final TileType tileType = tile.getType();
-        final Image terrain = lib.getTerrainImage(
-            tileType, tile.getX(), tile.getY());
-        Image overlayImage = lib.getOverlayImage(tile);
-        final int width = terrain.getWidth(null);
-        final int height = terrain.getHeight(null);
-        final int compoundHeight = calculateHeightForTileWithOverlayAndForest(
-            tileType, height, overlayImage);
-        BufferedImage image = new BufferedImage(
-            width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = image.createGraphics();
-        g.translate(0, compoundHeight - height);
-        displayTileWithBeachAndBorder(g, lib, tile, true);
-        displayTileItems(g, tile, overlayImage);
-        g.dispose();
-        return image;
-    }
-
     /**
      * Returns the scaled terrain-image for a terrain type (and position 0, 0).
      *
@@ -514,36 +464,67 @@ public final class MapViewer {
      * @param scale The scale of the terrain image to return.
      * @return The terrain-image
      */
-    public static Image createTileImageWithOverlayAndForest(TileType type, float scale) {
-        Image terrainImage = ImageLibrary.getTerrainImage(type, 0, 0, scale);
-        Image overlayImage = ImageLibrary.getOverlayImage(type, type.getId(), scale);
-        Image forestImage = type.isForested() ? ImageLibrary.getForestImage(type, scale) : null;
+    public static BufferedImage createTileImageWithOverlayAndForest(
+            TileType type, float scale) {
+        BufferedImage terrainImage = ImageLibrary.getTerrainImage(
+            type, 0, 0, scale);
+        BufferedImage overlayImage = ImageLibrary.getOverlayImage(
+            type, type.getId(), scale);
+        BufferedImage forestImage = type.isForested()
+            ? ImageLibrary.getForestImage(type, scale)
+            : null;
         if (overlayImage == null && forestImage == null) {
             return terrainImage;
         } else {
-            int width = terrainImage.getWidth(null);
-            int height = terrainImage.getHeight(null);
+            int width = terrainImage.getWidth();
+            int height = terrainImage.getHeight();
             if (overlayImage != null) {
-                height = Math.max(height, overlayImage.getHeight(null));
+                height = Math.max(height, overlayImage.getHeight());
             }
             if (forestImage != null) {
-                height = Math.max(height, forestImage.getHeight(null));
+                height = Math.max(height, forestImage.getHeight());
             }
             BufferedImage compositeImage = new BufferedImage(width, height,
                 BufferedImage.TYPE_INT_ARGB);
             Graphics2D g = compositeImage.createGraphics();
-            g.drawImage(terrainImage, 0, height - terrainImage.getHeight(null), null);
+            g.drawImage(terrainImage, 0, height - terrainImage.getHeight(), null);
             if (overlayImage != null) {
-                g.drawImage(overlayImage, 0, height - overlayImage.getHeight(null), null);
+                g.drawImage(overlayImage, 0, height - overlayImage.getHeight(), null);
             }
             if (forestImage != null) {
-                g.drawImage(forestImage, 0, height - forestImage.getHeight(null), null);
+                g.drawImage(forestImage, 0, height - forestImage.getHeight(), null);
             }
             g.dispose();
             return compositeImage;
         }
     }
 
+    /**
+     * Create a <code>BufferedImage</code> and draw a <code>Tile</code> on it.
+     * Draws the terrain and improvements.
+     *
+     * @param tile The Tile to draw.
+     * @return The image.
+     */
+    public BufferedImage createTileImageWithBeachBorderAndItems(Tile tile) {
+        final TileType tileType = tile.getType();
+        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        BufferedImage overlayImage = lib.getOverlayImage(tile);
+        final int compoundHeight = (overlayImage != null)
+            ? overlayImage.getHeight()
+            : tileType.isForested()
+                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
+                : terrainTileSize.height;
+        BufferedImage image = new BufferedImage(
+            terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = image.createGraphics();
+        g.translate(0, compoundHeight - terrainTileSize.height);
+        displayTileWithBeachAndBorder(g, lib, tile, true);
+        displayTileItems(g, tile, overlayImage);
+        g.dispose();
+        return image;
+    }
+
     /**
      * Create a <code>BufferedImage</code> and draw a <code>Tile</code> on it.
      * The visualization of the <code>Tile</code> also includes information
@@ -558,17 +539,17 @@ public final class MapViewer {
      */
     public BufferedImage createColonyTileImage(Tile tile, Colony colony) {
         final TileType tileType = tile.getType();
-        final Image terrain = lib.getTerrainImage(
-            tileType, tile.getX(), tile.getY());
-        final int width = terrain.getWidth(null);
-        final int height = terrain.getHeight(null);
-        Image overlayImage = lib.getOverlayImage(tile);
-        final int compoundHeight = calculateHeightForTileWithOverlayAndForest(
-            tileType, height, overlayImage);
+        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        BufferedImage overlayImage = lib.getOverlayImage(tile);
+        final int compoundHeight = (overlayImage != null)
+            ? overlayImage.getHeight()
+            : tileType.isForested()
+                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
+                : terrainTileSize.height;
         BufferedImage image = new BufferedImage(
-            width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
+            terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
         Graphics2D g = image.createGraphics();
-        g.translate(0, compoundHeight - height);
+        g.translate(0, compoundHeight - terrainTileSize.height);
         displayColonyTile(g, tile, colony, overlayImage);
         g.dispose();
         return image;
@@ -585,7 +566,6 @@ public final class MapViewer {
      */
     public void displayColonyTiles(Graphics2D g, Tile[][] tiles, Colony colony) {
         Set<String> overlayCache = ImageLibrary.createOverlayCache();
-        final Tile tile = colony.getTile();
         Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
         for (int x = 0; x < 3; x++) {
             for (int y = 0; y < 3; y++) {

From 98d955a62cd3e61aecdb7fc15a890a49cccbf81a Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 28 Aug 2015 20:48:29 +0200
Subject: [PATCH 137/323] Hide colonyTileMapViewer inside SwingGUI

---
 src/net/sf/freecol/client/gui/MapViewer.java  | 18 +++++-----
 src/net/sf/freecol/client/gui/SwingGUI.java   | 33 +++++++++++++++----
 .../freecol/client/gui/panel/ColonyPanel.java | 13 +++-----
 .../client/gui/panel/ConstructionPanel.java   |  4 +--
 .../freecol/client/gui/panel/InfoPanel.java   | 14 +++-----
 .../gui/panel/MapEditorTransformPanel.java    |  4 +--
 .../client/gui/panel/TerrainDetailPanel.java  |  6 ++--
 .../freecol/client/gui/panel/TilePanel.java   |  5 ++-
 .../freecol/client/gui/panel/UnitLabel.java   |  6 ++--
 .../client/gui/panel/WorkProductionPanel.java |  3 +-
 10 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 6248ca004..19c1fb86d 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -87,11 +87,13 @@ import static net.sf.freecol.common.util.StringUtils.*;
 
 
 /**
+ * MapViewer is a private helper class of Canvas and SwingGUI.
+ * 
  * This class is responsible for drawing the map/background on the
  * <code>Canvas</code>.
- *
+ * It is also used to draw map tiles for some GUI-panels.
  * In addition, the graphical state of the map (focus, active unit..)
- * is also a responsibility of this class.
+ * is currently handled by this class.
  */
 public final class MapViewer {
 
@@ -464,7 +466,7 @@ public final class MapViewer {
      * @param scale The scale of the terrain image to return.
      * @return The terrain-image
      */
-    public static BufferedImage createTileImageWithOverlayAndForest(
+    static BufferedImage createTileImageWithOverlayAndForest(
             TileType type, float scale) {
         BufferedImage terrainImage = ImageLibrary.getTerrainImage(
             type, 0, 0, scale);
@@ -506,7 +508,7 @@ public final class MapViewer {
      * @param tile The Tile to draw.
      * @return The image.
      */
-    public BufferedImage createTileImageWithBeachBorderAndItems(Tile tile) {
+    BufferedImage createTileImageWithBeachBorderAndItems(Tile tile) {
         final TileType tileType = tile.getType();
         Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
         BufferedImage overlayImage = lib.getOverlayImage(tile);
@@ -537,7 +539,7 @@ public final class MapViewer {
      *      get the <code>ColonyTile</code> for the given <code>Tile</code>.
      * @return The image.
      */
-    public BufferedImage createColonyTileImage(Tile tile, Colony colony) {
+    BufferedImage createColonyTileImage(Tile tile, Colony colony) {
         final TileType tileType = tile.getType();
         Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
         BufferedImage overlayImage = lib.getOverlayImage(tile);
@@ -564,7 +566,7 @@ public final class MapViewer {
      * @param colony The <code>Colony</code> to create the visualization
      *      of the <code>Tile</code> objects for.
      */
-    public void displayColonyTiles(Graphics2D g, Tile[][] tiles, Colony colony) {
+    void displayColonyTiles(Graphics2D g, Tile[][] tiles, Colony colony) {
         Set<String> overlayCache = ImageLibrary.createOverlayCache();
         Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
         for (int x = 0; x < 3; x++) {
@@ -714,7 +716,7 @@ public final class MapViewer {
      * 
      * @return The image library;
      */
-    public ImageLibrary getImageLibrary() {
+    ImageLibrary getImageLibrary() {
         return lib;
     }
 
@@ -723,7 +725,7 @@ public final class MapViewer {
      *
      * @return The current map scale.
      */
-    public float getMapScale() {
+    float getMapScale() {
         return lib.getScaleFactor();
     }
 
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index d2e824b59..b19645be4 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -23,6 +23,7 @@ import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.DisplayMode;
 import java.awt.Font;
+import java.awt.Graphics2D;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.HeadlessException;
@@ -92,6 +93,7 @@ import net.sf.freecol.common.model.Settlement;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Tile;
+import net.sf.freecol.common.model.TileType;
 import net.sf.freecol.common.model.TradeRoute;
 import net.sf.freecol.common.model.TypeCountMap;
 import net.sf.freecol.common.model.Unit;
@@ -116,14 +118,14 @@ public class SwingGUI extends GUI {
     private final GraphicsDevice graphicsDevice;
 
     /**
-     * This is the MapViewer instance used to paint the colony tiles
+     * This is the MapViewer instance used to paint the map tiles
      * in the ColonyPanel and other panels.  It should not be scaled
      * along with the default MapViewer.
      */
-    private MapViewer colonyTileMapViewer;
+    private MapViewer tileMapViewer;
 
     /**
-     * The MapViewer instance used to paint the main map.
+     * The MapViewer instance used by canvas to paint the main map.
      * This does need to be scaled.
      */
     private MapViewer mapViewer;
@@ -155,8 +157,8 @@ public class SwingGUI extends GUI {
         return canvas;
     }
 
-    public MapViewer getColonyTileMapViewer() {
-        return colonyTileMapViewer;
+    public ImageLibrary getTileImageLibrary() {
+        return tileMapViewer.getImageLibrary();
     }
 
     @Override
@@ -410,7 +412,7 @@ public class SwingGUI extends GUI {
         this.mapViewer = new MapViewer(freeColClient);
         this.canvas = new Canvas(freeColClient, graphicsDevice,
                                  desiredWindowSize, mapViewer);
-        this.colonyTileMapViewer = new MapViewer(freeColClient);
+        this.tileMapViewer = new MapViewer(freeColClient);
 
         // Now that there is a canvas, prepare for language changes.
         LanguageOption o = (LanguageOption)freeColClient.getClientOptions()
@@ -1722,4 +1724,23 @@ public class SwingGUI extends GUI {
         mapViewer.toggleViewMode();
     }
 
+    // Forwarding to tileMapViewer
+
+    public static BufferedImage createTileImageWithOverlayAndForest(
+            TileType type, float scale) {
+        return MapViewer.createTileImageWithOverlayAndForest(type, scale);
+    }
+
+    public BufferedImage createTileImageWithBeachBorderAndItems(Tile tile) {
+        return tileMapViewer.createTileImageWithBeachBorderAndItems(tile);
+    }
+
+    public BufferedImage createColonyTileImage(Tile tile, Colony colony) {
+        return tileMapViewer.createColonyTileImage(tile, colony);
+    }
+
+    public void displayColonyTiles(Graphics2D g, Tile[][] tiles, Colony colony) {
+        tileMapViewer.displayColonyTiles(g, tiles, colony);
+    }
+
 }
diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 6653ba2e6..3b407e725 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -1221,8 +1221,7 @@ public final class ColonyPanel extends PortPanel
         public void update() {
             final Colony colony = getColony();
             if (colony == null) return;
-            final ImageLibrary lib = getGUI().getColonyTileMapViewer()
-                .getImageLibrary();
+            final ImageLibrary lib = getGUI().getTileImageLibrary();
             final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
                 FontLibrary.FontSize.SMALLER, lib.getScaleFactor());
             final int uc = colony.getUnitCount();
@@ -2014,8 +2013,7 @@ public final class ColonyPanel extends PortPanel
             g.fillRect(0, 0, getWidth(), getHeight());
             if (colony == null) return;
 
-            getGUI().getColonyTileMapViewer().displayColonyTiles(
-                (Graphics2D)g, tiles, colony);
+            getGUI().displayColonyTiles((Graphics2D)g, tiles, colony);
         }
 
         /**
@@ -2043,8 +2041,8 @@ public final class ColonyPanel extends PortPanel
                 setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
                 setOpaque(false);
                 // Size and position:
-                Dimension size = getGUI().getColonyTileMapViewer()
-                    .getImageLibrary().scaleDimension(ImageLibrary.TILE_SIZE);
+                Dimension size = getGUI().getTileImageLibrary()
+                    .scaleDimension(ImageLibrary.TILE_SIZE);
                 setSize(size);
                 setLocation(((2 - x) + y) * size.width / 2,
                     (x + y) * size.height / 2);
@@ -2112,8 +2110,7 @@ public final class ColonyPanel extends PortPanel
                         for (AbstractGoods ag : info.getProduction()) {
                             ProductionLabel productionLabel
                                 = new ProductionLabel(getFreeColClient(),
-                                    getGUI().getColonyTileMapViewer()
-                                        .getImageLibrary(),
+                                    getGUI().getTileImageLibrary(),
                                     ag);
                             productionLabel.addMouseListener(pressListener);
                             add(productionLabel);
diff --git a/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java b/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
index 388f60750..5ad4f8e8d 100644
--- a/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
@@ -43,7 +43,7 @@ import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Turn;
 
-import static net.sf.freecol.common.util.StringUtils.*;
+import static net.sf.freecol.common.util.StringUtils.getBreakingPoint;
 
 
 /**
@@ -135,7 +135,7 @@ public class ConstructionPanel extends MigPanel
     public void update(BuildableType buildable) {
         removeAll();
         final ImageLibrary lib = ((SwingGUI)freeColClient.getGUI())
-            .getColonyTileMapViewer().getImageLibrary();
+            .getTileImageLibrary();
         final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.SMALLER, lib.getScaleFactor());
 
diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index 1a384fd2d..db8f43efc 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -44,7 +44,6 @@ import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.FontLibrary;
 import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.ImageLibrary;
-import net.sf.freecol.client.gui.MapViewer;
 import net.sf.freecol.client.gui.action.EndTurnAction;
 import net.sf.freecol.client.gui.panel.MapEditorTransformPanel.MapTransform;
 import net.sf.freecol.common.i18n.Messages;
@@ -58,7 +57,7 @@ import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.resources.ResourceManager;
 
-import static net.sf.freecol.common.util.StringUtils.*;
+import static net.sf.freecol.common.util.StringUtils.splitText;
 
 
 /**
@@ -88,8 +87,7 @@ public final class InfoPanel extends FreeColPanel {
         public EndTurnPanel() {
             super(new MigLayout("wrap 1, center", "[center]", ""));
 
-            final ImageLibrary lib = getGUI().getColonyTileMapViewer()
-                .getImageLibrary();
+            final ImageLibrary lib = getGUI().getTileImageLibrary();
             Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
                 FontLibrary.FontSize.TINY, lib.getScaleFactor());
 
@@ -144,13 +142,12 @@ public final class InfoPanel extends FreeColPanel {
 
             removeAll();
 
-            final MapViewer mapViewer = getGUI().getColonyTileMapViewer();
-            final ImageLibrary lib = mapViewer.getImageLibrary();
+            final ImageLibrary lib = getGUI().getTileImageLibrary();
             final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
                 FontLibrary.FontSize.TINY, lib.getScaleFactor());
             if (tile != null && tile.getType() != null) {
                 final int width = getWidth() - SLACK;
-                BufferedImage image = mapViewer.createTileImageWithBeachBorderAndItems(tile);
+                BufferedImage image = getGUI().createTileImageWithBeachBorderAndItems(tile);
                 if (tile.isExplored()) {
                     String text = Messages.message(tile.getLabel());
                     for (String s : splitText(text, " /",
@@ -280,8 +277,7 @@ public final class InfoPanel extends FreeColPanel {
         public void update() {
             removeAll();
 
-            final ImageLibrary lib = getGUI().getColonyTileMapViewer()
-                .getImageLibrary();
+            final ImageLibrary lib = getGUI().getTileImageLibrary();
             Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
                 FontLibrary.FontSize.TINY, lib.getScaleFactor());
             String text;
diff --git a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
index bf2566354..855bea0b7 100644
--- a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
@@ -41,7 +41,7 @@ import net.sf.freecol.client.control.MapEditorController;
 import net.sf.freecol.client.control.MapEditorController.IMapTransform;
 import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.ImageLibrary;
-import net.sf.freecol.client.gui.MapViewer;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.IndianNationType;
@@ -119,7 +119,7 @@ public final class MapEditorTransformPanel extends FreeColPanel {
         final Specification spec = getSpecification();
         List<TileType> tileList = spec.getTileTypeList();
         for (TileType type : tileList) {
-            listPanel.add(buildButton(MapViewer.createTileImageWithOverlayAndForest(type, 0.5f),
+            listPanel.add(buildButton(SwingGUI.createTileImageWithOverlayAndForest(type, 0.5f),
                                       Messages.getName(type),
                                       new TileTypeTransform(type)));
         }
diff --git a/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java b/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
index c205429ff..3eeaa51b4 100644
--- a/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
@@ -36,7 +36,7 @@ import net.miginfocom.swing.MigLayout;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.FontLibrary;
 import net.sf.freecol.client.gui.ImageLibrary;
-import net.sf.freecol.client.gui.MapViewer;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.client.gui.action.ColopediaAction.PanelType;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.AbstractGoods;
@@ -78,7 +78,7 @@ public class TerrainDetailPanel
             // FIXME: Use different method supporting a direct request of an
             //        image of fixed ICON_SIZE.
             final float maxTileImageHeight = ImageLibrary.TILE_OVERLAY_SIZE.height;
-            Image tile = MapViewer.createTileImageWithOverlayAndForest(t,
+            Image tile = SwingGUI.createTileImageWithOverlayAndForest(t,
                 ImageLibrary.ICON_SIZE.height / maxTileImageHeight);
             BufferedImage image = new BufferedImage(tile.getWidth(null), ImageLibrary.ICON_SIZE.height,
                 BufferedImage.TYPE_INT_ARGB);
@@ -117,7 +117,7 @@ public class TerrainDetailPanel
         panel.add(nameLabel, "span, align center");
 
         panel.add(Utility.localizedLabel("colopedia.terrain.terrainImage"), "spany 3");
-        Image terrainImage = MapViewer.createTileImageWithOverlayAndForest(tileType, 1);
+        Image terrainImage = SwingGUI.createTileImageWithOverlayAndForest(tileType, 1);
         panel.add(new JLabel(new ImageIcon(terrainImage)), "spany 3");
 
         List<ResourceType> resourceList = tileType.getResourceTypes();
diff --git a/src/net/sf/freecol/client/gui/panel/TilePanel.java b/src/net/sf/freecol/client/gui/panel/TilePanel.java
index 8b8609667..defe58e65 100644
--- a/src/net/sf/freecol/client/gui/panel/TilePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TilePanel.java
@@ -33,11 +33,11 @@ import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
+
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.ImageLibrary;
-import net.sf.freecol.client.gui.MapViewer;
 import net.sf.freecol.common.debug.DebugUtils;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
@@ -90,9 +90,8 @@ public final class TilePanel extends FreeColPanel {
             .addAmount("%y%", tile.getY());
         add(Utility.localizedLabel(template), "span, center");
 
-        final MapViewer mapViewer = getGUI().getColonyTileMapViewer();
         final ImageLibrary lib = getImageLibrary();
-        BufferedImage image = mapViewer.createColonyTileImage(tile, null);
+        BufferedImage image = getGUI().createColonyTileImage(tile, null);
         add(new JLabel(new ImageIcon(image)), "span, center");
 
         if (tile.getRegion() != null) {
diff --git a/src/net/sf/freecol/client/gui/panel/UnitLabel.java b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
index d35537ddf..fe5d11cea 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitLabel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
@@ -52,7 +52,7 @@ import net.sf.freecol.common.model.TileType;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.WorkLocation;
 
-import static net.sf.freecol.common.util.StringUtils.*;
+import static net.sf.freecol.common.util.StringUtils.lastPart;
 
 
 /**
@@ -195,7 +195,7 @@ public final class UnitLabel extends JLabel
      */
     public void setSmall(boolean isSmall) {
         final ImageLibrary lib = useMapImageLibrary
-            ? gui.getColonyTileMapViewer().getImageLibrary()
+            ? gui.getTileImageLibrary()
             : gui.getImageLibrary();
         if (isSmall) {
             ImageIcon imageIcon = new ImageIcon(lib.getSmallUnitImage(unit));
@@ -262,7 +262,7 @@ public final class UnitLabel extends JLabel
     public void paintComponent(Graphics g) {
         final Player player = freeColClient.getMyPlayer();
         final ImageLibrary lib = useMapImageLibrary
-            ? gui.getColonyTileMapViewer().getImageLibrary()
+            ? gui.getTileImageLibrary()
             : gui.getImageLibrary();
         if (ignoreLocation || selected
             || (!unit.isCarrier() && unit.getState() != Unit.UnitState.SENTRY)) {
diff --git a/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java b/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java
index 0f393638e..555d7f449 100644
--- a/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java
@@ -89,8 +89,7 @@ public class WorkProductionPanel extends FreeColPanel {
             final TileType tileType = tile.getType();
             shortName = Messages.getName(tileType);
             longName = Messages.message(colonyTile.getLabel());
-            image = getGUI().getColonyTileMapViewer()
-                .createColonyTileImage(tile, colony);
+            image = getGUI().createColonyTileImage(tile, colony);
 
         } else if (wl instanceof Building) {
             final Building building = (Building)wl;

From 1c6a0cbfeb4698a65746889567a0bc6184c4a8b2 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 28 Aug 2015 21:04:57 +0200
Subject: [PATCH 138/323] Update comments and variable name for consistency
 with renamed tileMapViewer in previous commit

---
 .../sf/freecol/client/gui/panel/ColonyPanel.java   |  4 ++--
 src/net/sf/freecol/client/gui/panel/UnitLabel.java | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 3b407e725..977091eb1 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -1923,8 +1923,8 @@ public final class ColonyPanel extends PortPanel
 
     /**
      * A panel that displays the tiles in the immediate area around the colony.
-     * TilesPanel class must use the ImageLibrary inside
-     * getGUI().getColonyTileMapViewer() for everything.
+     * TilesPanel class must use the ImageLibrary inside SwingGUI.tileMapViewer
+     * for everything.
      */
     public final class TilesPanel extends JPanel {
 
diff --git a/src/net/sf/freecol/client/gui/panel/UnitLabel.java b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
index fe5d11cea..4d141ad7b 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitLabel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
@@ -93,7 +93,7 @@ public final class UnitLabel extends JLabel
 
     private boolean ignoreLocation;
     
-    private boolean useMapImageLibrary;
+    private boolean useTileImageLibrary;
 
 
     /**
@@ -140,12 +140,12 @@ public final class UnitLabel extends JLabel
      * @param isSmall The image will be smaller if set to <code>true</code>.
      * @param ignoreLocation The image will not include production or state
      *            information if set to <code>true</code>.
-     * @param useMapImageLibrary If false use ImageLibrary in gui.
-     *              If true use ImageLibrary in gui.getColonyTileMapViewer().
+     * @param useTileImageLibrary If false use ImageLibrary in GUI.
+     *              If true use tileImageLibrary in SwingGUI.
      */
     public UnitLabel(FreeColClient freeColClient, Unit unit,
                      boolean isSmall, boolean ignoreLocation,
-                     boolean useMapImageLibrary) {
+                     boolean useTileImageLibrary) {
         this.freeColClient = freeColClient;
         this.gui = (SwingGUI)freeColClient.getGUI();
         this.unit = unit;
@@ -153,7 +153,7 @@ public final class UnitLabel extends JLabel
         selected = false;
         this.isSmall = isSmall;
         this.ignoreLocation = ignoreLocation;
-        this.useMapImageLibrary = useMapImageLibrary;
+        this.useTileImageLibrary = useTileImageLibrary;
 
         updateIcon();
     }
@@ -194,7 +194,7 @@ public final class UnitLabel extends JLabel
      * @param isSmall The image will be smaller if set to <code>true</code>.
      */
     public void setSmall(boolean isSmall) {
-        final ImageLibrary lib = useMapImageLibrary
+        final ImageLibrary lib = useTileImageLibrary
             ? gui.getTileImageLibrary()
             : gui.getImageLibrary();
         if (isSmall) {
@@ -261,7 +261,7 @@ public final class UnitLabel extends JLabel
     @Override
     public void paintComponent(Graphics g) {
         final Player player = freeColClient.getMyPlayer();
-        final ImageLibrary lib = useMapImageLibrary
+        final ImageLibrary lib = useTileImageLibrary
             ? gui.getTileImageLibrary()
             : gui.getImageLibrary();
         if (ignoreLocation || selected

From 0cc36053bd56891246d8667b62945d30f273b6fa Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Wed, 5 Aug 2015 19:46:53 +0930
Subject: [PATCH 139/323] Clarify active unit setting in IGC.

---
 .../client/control/InGameController.java      | 665 +++++++++---------
 1 file changed, 347 insertions(+), 318 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 735bcff9b..92ba2114e 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -21,6 +21,7 @@ package net.sf.freecol.client.control;
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -62,6 +63,7 @@ import net.sf.freecol.common.model.GameOptions;
 import net.sf.freecol.common.model.GoldTradeItem;
 import net.sf.freecol.common.model.Goods;
 import net.sf.freecol.common.model.GoodsType;
+import net.sf.freecol.common.model.HighScore;
 import net.sf.freecol.common.model.IndianSettlement;
 import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.LostCityRumour;
@@ -266,6 +268,17 @@ public final class InGameController implements NetworkConstants {
         return false;
     }
 
+    /**
+     * Display the colony panel for a colony, and select the unit that just
+     * arrived there if it is a carrier.
+     *
+     * @param colony The <code>Colony</code> to display.
+     * @param unit An optional <code>Unit</code> to select.
+     */
+    private void colonyPanel(Colony colony, Unit unit) {
+        gui.showColonyPanel(colony, (unit.isCarrier()) ? unit : null);
+    }
+
     /**
      * Convenience function to find an adjacent settlement.  Intended
      * to be called in contexts where we are expecting a settlement to
@@ -304,17 +317,24 @@ public final class InGameController implements NetworkConstants {
     }
 
     /**
-     * Updates the GUI after a unit moves.
+     * Update the GUI and the active unit with a fallback tile.
+     *
+     * @param tile An optional fallback <code>Tile</code> to display if
+     *     no active unit is found, useful when the last unit might have
+     *     died.
      */
-    private void updateControls() {
-        SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    gui.updateMenuBar();
-                }
-            });
+    private void updateGUI(Tile tile) {
+        if (displayModelMessages(false, false)) {
+            ; // If messages are displayed they probably refer to the
+              // current unit, so do not update it.
+        } else if (updateActiveUnit(tile)) {
+            ; // setActiveUnit will update the menu bar
+        } else {
+            gui.updateMenuBar();
+        }
     }
 
+
     // Server access routines called from multiple places.
 
     /**
@@ -364,6 +384,7 @@ public final class InGameController implements NetworkConstants {
             }
         } // else price == 0 and we can just proceed to claim
 
+        // Ask the server
         return askServer().claimTile(tile, claimant, price)
             && player.owns(tile);
     }
@@ -395,21 +416,20 @@ public final class InGameController implements NetworkConstants {
      * @return True if boarding succeeded.
      */
     private boolean askEmbark(Unit unit, Unit carrier) {
-        // Proceed to board
         ColonyWas colonyWas = (unit.getColony() != null)
             ? new ColonyWas(unit.getColony()) : null;
         EuropeWas europeWas = (unit.isInEurope())
             ? new EuropeWas(unit.getOwner().getEurope()) : null;
         UnitWas unitWas = new UnitWas(unit);
-        boolean ret = askServer().embark(unit, carrier, null)
-            && unit.getLocation() == carrier;
-        if (ret) {
+        if (askServer().embark(unit, carrier, null)
+            && unit.getLocation() == carrier) {
             sound("sound.event.loadCargo");
+            unitWas.fireChanges();
+            if (colonyWas != null) colonyWas.fireChanges();
+            if (europeWas != null) europeWas.fireChanges();
+            return true;
         }
-        unitWas.fireChanges();
-        if (colonyWas != null) colonyWas.fireChanges();
-        if (europeWas != null) europeWas.fireChanges();
-        return ret;
+        return false;
     }
     
     /**
@@ -427,12 +447,12 @@ public final class InGameController implements NetworkConstants {
             || !MigrationType.validMigrantSlot(slot)) return null;
 
         EuropeWas europeWas = new EuropeWas(europe);
-        Unit ret = null;
-        if (askServer().emigrate(slot)) {
+        Unit newUnit = null;
+        if (askServer().emigrate(slot)
+            && (newUnit = europeWas.getNewUnit()) != null) {
             europeWas.fireChanges();
-            ret = europeWas.getNewUnit();
         }
-        return ret;
+        return newUnit;
     }
 
     /**
@@ -458,8 +478,7 @@ public final class InGameController implements NetworkConstants {
                 gui.showEmigrationDialog(player, n, fountainOfYouth);
                 return;
             }
-            Unit u = askEmigrate(europe,
-                                 Europe.MigrationType.getDefaultSlot());
+            Unit u = askEmigrate(europe, Europe.MigrationType.getDefaultSlot());
             if (u == null) break; // Give up on failure, try again next turn
             player.addModelMessage(player.getEmigrationMessage(u));
         }
@@ -500,10 +519,12 @@ public final class InGameController implements NetworkConstants {
 
         // Try to purchase.
         int oldAmount = carrier.getGoodsContainer().getGoodsCount(type);
-        boolean ret = askServer().loadGoods(loc, type, amount, carrier)
-            && carrier.getGoodsContainer().getGoodsCount(type) != oldAmount;
-        if (ret && marketWas != null) marketWas.fireChanges(type, amount);
-        return ret;
+        if (askServer().loadGoods(loc, type, amount, carrier)
+            && carrier.getGoodsContainer().getGoodsCount(type) != oldAmount) {
+            if (marketWas != null) marketWas.fireChanges(type, amount);
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -534,10 +555,12 @@ public final class InGameController implements NetworkConstants {
         MarketWas marketWas = (market != null) ? new MarketWas(player) : null;
 
         int oldAmount = carrier.getGoodsContainer().getGoodsCount(type);
-        boolean ret = askServer().unloadGoods(type, amount, carrier)
-            && carrier.getGoodsContainer().getGoodsCount(type) != oldAmount;
-        if (ret && marketWas != null) marketWas.fireChanges(type, -amount);
-        return ret;
+        if (askServer().unloadGoods(type, amount, carrier)
+            && carrier.getGoodsContainer().getGoodsCount(type) != oldAmount) {
+            if (marketWas != null) marketWas.fireChanges(type, -amount);
+            return true;
+        }
+        return false;
     }
 
 
@@ -619,6 +642,7 @@ public final class InGameController implements NetworkConstants {
         return result;
     }
 
+
     // Utilities for message handling.
 
     /**
@@ -739,12 +763,12 @@ public final class InGameController implements NetworkConstants {
                         }
                     };
             }
-            updateControls();
             freeColClient.invokeAndWait(uiTask);
         }
         return !messages.isEmpty();
     }
 
+
     // Utilities to handle the transitions between the active-unit,
     // execute-orders and end-turn states.
 
@@ -874,8 +898,10 @@ public final class InGameController implements NetworkConstants {
      * @return True if the active unit changes.
      */
     private boolean updateActiveUnit(Tile tile) {
-        // Always flush outstanding messages first.
-        displayModelMessages(false, false);
+        // Make sure the active unit is done.
+        final Player player = freeColClient.getMyPlayer();
+        Unit unit = gui.getActiveUnit();
+        if (unit != null && unit.couldMove()) return false;
 
         // Flush any outstanding orders once the mode is raised.
         if (moveMode != MoveMode.NEXT_ACTIVE_UNIT
@@ -883,12 +909,6 @@ public final class InGameController implements NetworkConstants {
             return false;
         }
 
-        // Look for active units and make sure the active unit is done.
-        final Player player = freeColClient.getMyPlayer();
-        Unit unit = gui.getActiveUnit();
-        if (unit != null && !unit.isDisposed()
-            && unit.couldMove()) return false;
-
         // Successfully found a unit to display
         if (player.hasNextActiveUnit()) {
             gui.setActiveUnit(player.getNextActiveUnit());
@@ -904,7 +924,7 @@ public final class InGameController implements NetworkConstants {
         // If not already ending the turn, use the fallback tile if
         // supplied, then check for automatic end of turn, otherwise
         // just select nothing and wait.
-        ClientOptions options = freeColClient.getClientOptions();
+        final ClientOptions options = freeColClient.getClientOptions();
         if (tile != null) {
             gui.setSelectedTile(tile);
         } else if (options.getBoolean(ClientOptions.AUTO_END_TURN)) {
@@ -961,16 +981,10 @@ public final class InGameController implements NetworkConstants {
             askClearGotoOrders(unit);
             Colony colony = (unit.hasTile()) ? unit.getTile().getColony()
                 : null;
-            if (colony != null) gui.showColonyPanel(colony, unit);
-            // Check cash-in, and if the unit has moves left and was
-            // not set to SKIPPED by moveDirection, then return true
-            // to show that this unit could continue.
-            if (!checkCashInTreasureTrain(unit)
-                && !unit.isDisposed()
-                && unit.getMovesLeft() > 0
-                && unit.getState() != UnitState.SKIPPED) {
-                return true;
+            if (colony != null && !checkCashInTreasureTrain(unit)) {
+                colonyPanel(colony, unit);
             }
+            return unit.couldMove();
         }
         return false;
     }
@@ -992,9 +1006,10 @@ public final class InGameController implements NetworkConstants {
         // clear the destination.
         Unit.MoveType mt = unit.getMoveType(direction);
         Location destination = unit.getDestination();
+        Tile oldTile = unit.getTile();
         boolean clearDestination = destination != null
-            && unit.hasTile()
-            && Map.isSameLocation(unit.getTile().getNeighbourOrNull(direction),
+            && oldTile != null
+            && Map.isSameLocation(oldTile.getNeighbourOrNull(direction),
                                   destination);
 
         // Consider all the move types.
@@ -1170,9 +1185,10 @@ public final class InGameController implements NetworkConstants {
             result = false;
             break;
         }
-        if (unit.isDisposed()) return false;
-        if (clearDestination) askClearGotoOrders(unit);
-        return true;
+        if (clearDestination && !unit.isDisposed()) {
+            askClearGotoOrders(unit);
+        }
+        return result;
     }
 
     /**
@@ -1276,7 +1292,7 @@ public final class InGameController implements NetworkConstants {
                 askServer().attack(unit, direction);
                 Colony col = target.getColony();
                 if (col != null && unit.getOwner().owns(col)) {
-                    gui.showColonyPanel(col, unit);
+                    colonyPanel(col, unit);
                 }
                 return false;
             }
@@ -1653,12 +1669,11 @@ public final class InGameController implements NetworkConstants {
                 final Colony colony = tile.getColony();
                 if (unit.getTradeRoute() == null
                     && Map.isSameLocation(tile, unit.getDestination())) {
-                    gui.showColonyPanel(colony, unit);
+                    colonyPanel(colony, unit);
                 }
             }
             ret = unit.getMovesLeft() > 0;
         }
-        displayModelMessages(false);
         return ret;
     }
 
@@ -1968,12 +1983,9 @@ public final class InGameController implements NetworkConstants {
                 if (act == null) break; // User cancelled
                 switch (act) {
                 case BUY: // Accept price, make purchase
-                    if (askServer().buyFromSettlement(unit,
-                            settlement, goods, gold)) {
-                        updateControls(); // Assume success
-                        return null;
-                    }
-                    return abortTrade;
+                    return (askServer().buyFromSettlement(unit,
+                            settlement, goods, gold)) ? null
+                        : abortTrade;
                 case HAGGLE: // Try to negotiate a lower price
                     gold = gold * 9 / 10;
                     break;
@@ -2024,12 +2036,9 @@ public final class InGameController implements NetworkConstants {
                 if (act == null) break; // Cancelled
                 switch (act) {
                 case SELL: // Accepted price, make the sale
-                    if (askServer().sellToSettlement(unit, settlement,
-                                                     goods, gold)) {
-                        updateControls(); // Assume success
-                        return null;
-                    }
-                    return abortTrade;
+                    return (askServer().sellToSettlement(unit, settlement,
+                            goods, gold)) ? null
+                        : abortTrade;
                 case HAGGLE: // Ask for more money
                     gold = (gold * 11) / 10;
                     break;
@@ -2065,11 +2074,10 @@ public final class InGameController implements NetworkConstants {
                                     Messages.message("gift.text"),
                                     settlement,
                                     "cancel", choices);
-        if (goods != null
-            && askServer().deliverGiftToSettlement(unit, settlement, goods)) {
-            return null;
-        }
-        return abortTrade;
+        return (goods != null
+            && askServer().deliverGiftToSettlement(unit, settlement, goods))
+            ? null
+            : abortTrade;
     }
 
     /**
@@ -2132,7 +2140,6 @@ public final class InGameController implements NetworkConstants {
                 && settlement.hasMissionary(player)) {
                 sound("sound.event.missionEstablished");
                 player.invalidateCanSeeTiles();
-                displayModelMessages(false, false);
             }
             break;
         case INCITE_INDIANS:
@@ -2154,16 +2161,12 @@ public final class InGameController implements NetworkConstants {
                     .template("missionarySettlement.inciteGoldFail")
                     .add("%player%", enemy.getName())
                     .addAmount("%amount%", gold));
-            } else {
-                if (gui.confirm(true, unit.getTile(), StringTemplate
-                        .template("missionarySettlement.inciteConfirm")
-                        .add("%player%", enemy.getName())
-                        .addAmount("%amount%", gold),
-                        unit, "yes", "no")) {
-                    if (askServer().incite(unit, direction, enemy, gold) >= 0) {
-                        updateControls();
-                    }
-                }
+            } else if (gui.confirm(true, unit.getTile(), StringTemplate
+                    .template("missionarySettlement.inciteConfirm")
+                    .add("%player%", enemy.getName())
+                    .addAmount("%amount%", gold),
+                    unit, "yes", "no")) {
+                askServer().incite(unit, direction, enemy, gold);
             }
             break;
         default:
@@ -2561,13 +2564,17 @@ public final class InGameController implements NetworkConstants {
     }
 
 
-    // All the routines from here on are user commands.  That is they
+    // Routines from here on are mostly user commands.  That is they
     // are called directly as a result of keyboard, menu, mouse or
-    // panel/dialog actions.  They should all be annotated as such to
+    // panel/dialog actions.  Some though are called indirectly after
+    // a call to the server routes information back through the
+    // InGameInputHandler.  They should all be annotated as such to
     // confirm where they can come from.
     //
-    // They also all return a success/failure indication, except if
-    // the game is stopped.
+    // User command all return a success/failure indication, except if
+    // the game is stopped.  IGIH-initiated routines do not need to.
+    //
+    // Successfully executed commands should update the GUI.
 
     /**
      * Abandon a colony with no units.
@@ -2580,15 +2587,16 @@ public final class InGameController implements NetworkConstants {
     public boolean abandonColony(Colony colony) {
         final Player player = freeColClient.getMyPlayer();
         if (!requireOurTurn() || colony == null
-            || !player.owns(colony) || colony.getUnitCount() > 0) return false;
+            || !player.owns(colony) || colony.getUnitCount() > 0)
+            return false;
 
         // Proceed to abandon
-        Tile tile = colony.getTile();
+        final Tile tile = colony.getTile();
         boolean ret = askServer().abandonColony(colony)
             && !tile.hasSettlement();
         if (ret) {
             player.invalidateCanSeeTiles();
-            gui.setActiveUnit(tile.getFirstUnit());
+            updateGUI(null);
         }
         return ret;
     }
@@ -2661,13 +2669,16 @@ public final class InGameController implements NetworkConstants {
             || !student.canBeStudent(teacher)
             || teacher.getColony() == null
             || student.getColony() != teacher.getColony()
-            || !teacher.getColony().canTrain(teacher)) {
+            || !teacher.getColony().canTrain(teacher))
             return false;
-        }
 
         UnitWas unitWas = new UnitWas(student);
-        boolean ret = askServer().assignTeacher(student, teacher);
-        unitWas.fireChanges();
+        boolean ret = askServer().assignTeacher(student, teacher)
+            && student.getTeacher() == teacher;
+        if (ret) {
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -2686,9 +2697,10 @@ public final class InGameController implements NetworkConstants {
 
         UnitWas unitWas = new UnitWas(unit);
         boolean ret = askAssignTradeRoute(unit, tradeRoute);
-        unitWas.fireChanges();
-        updateControls();
-        updateActiveUnit(null);
+        if (ret) {
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -2705,13 +2717,11 @@ public final class InGameController implements NetworkConstants {
     public boolean boardShip(Unit unit, Unit carrier) {
         if (!requireOurTurn() || unit == null || unit.isCarrier()
             || carrier == null || !carrier.canCarryUnits()
-            || !Map.isSameLocation(unit.getLocation(), carrier.getLocation())
-            ) return false;
+            || !unit.isAtLocation(carrier.getLocation())) return false;
 
         boolean ret = askEmbark(unit, carrier);
         if (ret) {
-            updateControls();
-            updateActiveUnit(null);
+            updateGUI(null);
         }
         return ret;
     }
@@ -2739,10 +2749,11 @@ public final class InGameController implements NetworkConstants {
         }
 
         // Join existing colony if present
-        Colony colony = tile.getColony();
+        final Colony colony = tile.getColony();
         if (colony != null) {
             askServer().joinColony(unit, colony);
-            gui.showColonyPanel(colony, unit);
+            updateGUI(null);
+            colonyPanel(colony, unit);
             return false;
         }
 
@@ -2777,23 +2788,24 @@ public final class InGameController implements NetworkConstants {
         // Only native owners that we can steal, buy from, or use a
         // bonus center tile exception should be possible by this point.
         UnitWas unitWas = new UnitWas(unit);
-        boolean ret = (tile.getOwner() == null
-            || player.owns(tile)
-            || player.canClaimToFoundSettlement(tile))
-            && askClaimTile(player, tile, unit, player.getLandPrice(tile));
-
-        ret = ret && askServer().buildColony(name, unit)
-            && tile.hasSettlement();
+        boolean ret = player.owns(tile)
+            || (player.canClaimToFoundSettlement(tile)
+                && askClaimTile(player, tile, unit,
+                                player.getLandPrice(tile)));
         if (ret) {
-            sound("sound.event.buildingComplete");
-            player.invalidateCanSeeTiles();
-            gui.showColonyPanel((Colony)tile.getSettlement(), unit);
-            // Check units present for treasure cash-in as they are now
-            // at a colony.
-            for (Unit u : tile.getUnitList()) checkCashInTreasureTrain(u);
+            ret = askServer().buildColony(name, unit)
+                && tile.hasSettlement();
+            if (ret) {
+                sound("sound.event.buildingComplete");
+                player.invalidateCanSeeTiles();
+                unitWas.fireChanges();
+                // Check units present for treasure cash-in as they are now
+                // at a colony.
+                for (Unit u : tile.getUnitList()) checkCashInTreasureTrain(u);
+                colonyPanel((Colony)tile.getSettlement(), unit);
+            }
+            updateGUI(null);
         }
-        unitWas.fireChanges();
-        updateControls();
         return ret;
     }
 
@@ -2814,17 +2826,16 @@ public final class InGameController implements NetworkConstants {
             || !carrier.isInEurope()
             || !freeColClient.getMyPlayer().owns(carrier)) return false;
 
-        Europe europe = carrier.getOwner().getEurope();
+        final Europe europe = carrier.getOwner().getEurope();
         EuropeWas europeWas = new EuropeWas(europe);
         UnitWas unitWas = new UnitWas(carrier);
         boolean ret = askLoadGoods(europe, type, amount, carrier);
         if (ret) {
             sound("sound.event.loadCargo");
-            displayModelMessages(false, false);
+            europeWas.fireChanges();
+            unitWas.fireChanges();
+            updateGUI(null);
         }
-        europeWas.fireChanges();
-        unitWas.fireChanges();
-        updateControls();
         return ret;
     }
 
@@ -2873,9 +2884,10 @@ public final class InGameController implements NetworkConstants {
         UnitWas unitWas = new UnitWas(unit);
         boolean ret = askServer().changeState(unit, state)
             && unit.getState() == state;
-        unitWas.fireChanges();
-        updateControls();
-        updateActiveUnit(null);
+        if (ret) {
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -2889,7 +2901,7 @@ public final class InGameController implements NetworkConstants {
      * @return True if the improvement was changed.
      */
     public boolean changeWorkImprovementType(Unit unit,
-                                             TileImprovementType improvementType) {
+        TileImprovementType improvementType) {
         if (!requireOurTurn() || unit == null || improvementType == null
             || !unit.hasTile()
             || !unit.checkSetState(UnitState.IMPROVING)
@@ -2897,19 +2909,20 @@ public final class InGameController implements NetworkConstants {
 
         // May need to claim the tile first
         final Player player = freeColClient.getMyPlayer();
+        final Tile tile = unit.getTile();
         UnitWas unitWas = new UnitWas(unit);
-        boolean ret = true;
-        Tile tile = unit.getTile();
-        if (!player.owns(tile)) {
-            if (!askClaimTile(player, tile, unit,
-                              player.getLandPrice(tile))) ret = false;
+        boolean ret = player.owns(tile)
+            || askClaimTile(player, tile, unit, player.getLandPrice(tile));
+        if (ret) {
+            ret = askServer()
+                .changeWorkImprovementType(unit, improvementType)
+                && unit.getWorkImprovement() != null
+                && unit.getWorkImprovement().getType() == improvementType;
+            if (ret) {
+                unitWas.fireChanges();
+            }
+            updateGUI(null);
         }
-
-        ret = ret && askServer().changeWorkImprovementType(unit,
-                                                           improvementType);
-        unitWas.fireChanges();
-        updateControls();
-        updateActiveUnit(tile);
         return ret;
     }
 
@@ -2928,9 +2941,10 @@ public final class InGameController implements NetworkConstants {
         UnitWas unitWas = new UnitWas(unit);
         boolean ret = askServer().changeWorkType(unit, workType)
             && unit.getWorkType() == workType;
-        unitWas.fireChanges();
-        updateControls();
-        updateActiveUnit(null);
+        if (ret) {
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -2945,11 +2959,10 @@ public final class InGameController implements NetworkConstants {
      */
     public boolean checkCashInTreasureTrain(Unit unit) {
         if (!requireOurTurn() || unit == null
-            || !unit.canCarryTreasure() || !unit.canCashInTreasureTrain()) {
+            || !unit.canCarryTreasure() || !unit.canCashInTreasureTrain())
             return false; // Fail quickly if just not a candidate.
-        }
 
-        Tile tile = unit.getTile();
+        final Tile tile = unit.getTile();
         final Europe europe = unit.getOwner().getEurope();
         if (europe == null || unit.isInEurope()) {
             ;// No need to check for transport.
@@ -2973,10 +2986,9 @@ public final class InGameController implements NetworkConstants {
             && unit.isDisposed();
         if (ret) {
             sound("sound.event.cashInTreasureTrain");
+            unitWas.fireChanges();
+            updateGUI(tile);
         }
-        unitWas.fireChanges();
-        updateControls();
-        updateActiveUnit(tile);
         return ret;
     }
 
@@ -3024,7 +3036,7 @@ public final class InGameController implements NetworkConstants {
             || claimant == null) return false;
 
         final Player player = freeColClient.getMyPlayer();
-        int price = ((claimant instanceof Settlement)
+        final int price = ((claimant instanceof Settlement)
                 ? player.canClaimForSettlement(tile)
                 : player.canClaimForImprovement(tile))
             ? 0
@@ -3032,8 +3044,10 @@ public final class InGameController implements NetworkConstants {
         UnitWas unitWas = (claimant instanceof Unit)
             ? new UnitWas((Unit)claimant) : null;
         boolean ret = askClaimTile(player, tile, claimant, price);
-        if (unitWas != null) unitWas.fireChanges();
-        updateControls();
+        if (ret) {
+            if (unitWas != null) unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -3051,8 +3065,10 @@ public final class InGameController implements NetworkConstants {
 
         UnitWas unitWas = new UnitWas(unit);
         boolean ret = askClearGotoOrders(unit);
-        unitWas.fireChanges();
-        updateControls();
+        if (ret) {
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -3080,8 +3096,10 @@ public final class InGameController implements NetworkConstants {
         boolean ret = askClearGotoOrders(unit)
             && (unit.getState() == UnitState.ACTIVE
                 || askServer().changeState(unit, UnitState.ACTIVE));
-        unitWas.fireChanges();
-        updateControls();
+        if (ret) {
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -3107,7 +3125,7 @@ public final class InGameController implements NetworkConstants {
             return false;
         }
 
-        Tile tile = (gui.isShowingSubPanel()) ? null : unit.getTile();
+        final Tile tile = (gui.isShowingSubPanel()) ? null : unit.getTile();
         if (!gui.confirm(true, tile, StringTemplate
                 .template("clearSpeciality.areYouSure")
                 .addStringTemplate("%oldUnit%",
@@ -3123,9 +3141,10 @@ public final class InGameController implements NetworkConstants {
         UnitWas unitWas = new UnitWas(unit);
         boolean ret = askServer().clearSpeciality(unit)
             && unit.getType() == newType;
-        unitWas.fireChanges();
-        updateControls();
-        updateActiveUnit(null);
+        if (ret) {
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -3147,7 +3166,11 @@ public final class InGameController implements NetworkConstants {
      */
     public boolean declareIndependence() {
         if (!requireOurTurn()) return false;
+
         final Player player = freeColClient.getMyPlayer();
+        if (player.getNewLandName() == null) {
+            return false; // Can only happen in debug mode.
+        }
 
         // Check for adequate support.
         StringTemplate declare = player.checkDeclareIndependence();
@@ -3155,10 +3178,6 @@ public final class InGameController implements NetworkConstants {
             gui.showInformationMessage(declare);
             return false;
         }
-        if (player.getNewLandName() == null) {
-            // Can only happen in debug mode.
-            return false;
-        }
 
         // Confirm intention, and collect nation+country names.
         List<String> names = gui.confirmDeclaration();
@@ -3170,13 +3189,12 @@ public final class InGameController implements NetworkConstants {
         }
 
         // Ask server.
-        String nationName = names.get(0);
-        String countryName = names.get(1);
-        boolean ret = askServer().declareIndependence(nationName, countryName)
+        boolean ret = askServer().declareIndependence(names.get(0), names.get(1))
             && player.isRebel();
-        if (ret) gui.showDeclarationPanel();
-        updateControls();
-        displayModelMessages(false, false);
+        if (ret) {
+            gui.showDeclarationPanel();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -3233,7 +3251,6 @@ public final class InGameController implements NetworkConstants {
             logger.warning("Bogus trade status: " + agreement.getStatus());
             break;
         }
-        updateControls();
         return null;
     }
 
@@ -3250,16 +3267,16 @@ public final class InGameController implements NetworkConstants {
 
         if (unit.getColony() != null
             && !gui.confirmLeaveColony(unit)) return false;
-
-        Tile tile = (gui.isShowingSubPanel()) ? null : unit.getTile();
+        final Tile tile = (gui.isShowingSubPanel()) ? null : unit.getTile();
         if (!gui.confirm(true, tile, StringTemplate.key("disbandUnit.text"),
                          unit, "disbandUnit.yes", "cancel"))
             return false;
 
         // Try to disband
-        boolean ret = askServer().disbandUnit(unit);
-        updateControls();
-        updateActiveUnit(null);
+        boolean ret = askServer().disbandUnit(unit) && unit.isDisposed();
+        if (ret) {
+            updateGUI(tile);
+        }
         return ret;
     }
 
@@ -3273,9 +3290,10 @@ public final class InGameController implements NetworkConstants {
      * @return True, the high scores were displayed.
      */
     public boolean displayHighScores(Boolean high) {
+        List<HighScore> scores = askServer().getHighScores();
         gui.showHighScoresPanel((high == null) ? null
             : (high) ? "highscores.yes" : "highscores.no",
-            askServer().getHighScores());
+            scores);
         return true;
     }
 
@@ -3380,11 +3398,13 @@ public final class InGameController implements NetworkConstants {
         UnitWas unitWas = new UnitWas(unit);
         boolean ret = askServer().equipUnitForRole(unit, role, roleCount)
             && unit.getRole() == role;
-        if (colonyWas != null) colonyWas.fireChanges();
-        if (europeWas != null) europeWas.fireChanges();
-        if (marketWas != null) marketWas.fireChanges(req);
-        unitWas.fireChanges();
-        updateControls();
+        if (ret) {
+            if (colonyWas != null) colonyWas.fireChanges();
+            if (europeWas != null) europeWas.fireChanges();
+            if (marketWas != null) marketWas.fireChanges(req);
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -3433,7 +3453,11 @@ public final class InGameController implements NetworkConstants {
         if (player == null || player == null || player == other
             || tile == null) return false;
 
-        return askServer().firstContact(player, other, tile, result);
+        boolean ret = askServer().firstContact(player, other, tile, result);
+        if (ret) {
+            updateGUI(null);
+        }
+        return ret;
     }
 
     /**
@@ -3488,12 +3512,11 @@ public final class InGameController implements NetworkConstants {
     public TradeRoute getNewTradeRoute(Player player) {
         if (player == null) return null;
 
-        int n = player.getTradeRoutes().size();
-        if (askServer().getNewTradeRoute()
-            && player.getTradeRoutes().size() == n + 1) {
-            return player.getTradeRoutes().get(n);
-        }
-        return null;
+        final int n = player.getTradeRoutes().size();
+        return (askServer().getNewTradeRoute()
+            && player.getTradeRoutes().size() == n + 1)
+            ? player.getTradeRoutes().get(n)
+            : null;
     }
 
     /**
@@ -3504,9 +3527,8 @@ public final class InGameController implements NetworkConstants {
      * @return a <code>List</code> value
      */
     public List<AbstractUnit> getREFUnits() {
-        if (!requireOurTurn()) return Collections.<AbstractUnit>emptyList();
-        
-        return askServer().getREFUnits();
+        return (!requireOurTurn()) ? Collections.<AbstractUnit>emptyList()
+            : askServer().getREFUnits();
     }
 
     /**
@@ -3539,10 +3561,9 @@ public final class InGameController implements NetworkConstants {
         boolean ret = askSetDestination(unit, tile);
         if (ret) {
             moveToDestination(unit, null);
+            unitWas.fireChanges();
+            updateGUI(null);
         }
-        unitWas.fireChanges();
-        updateControls();
-        updateActiveUnit(null);
         return ret;
     }
 
@@ -3560,6 +3581,7 @@ public final class InGameController implements NetworkConstants {
         String key;
         if (message == null
             || (key = message.getIgnoredMessageKey()) == null) return false;
+
         if (flag) {
             final Turn turn = freeColClient.getGame().getTurn();
             if (!continueIgnoreMessage(key, turn)) {
@@ -3706,10 +3728,9 @@ public final class InGameController implements NetworkConstants {
             && unit.getLocation() != carrier;
         if (ret) {
             checkCashInTreasureTrain(unit);
+            unitWas.fireChanges();
+            updateGUI(null);
         }
-        unitWas.fireChanges();
-        updateControls();
-        updateActiveUnit(null);
         return ret;
     }
 
@@ -3740,15 +3761,16 @@ public final class InGameController implements NetworkConstants {
             if (colony == null) return false;
             colonyWas = new ColonyWas(colony);
         }
+
         boolean ret = askLoadGoods(goods.getLocation(), goods.getType(),
                                    goods.getAmount(), carrier);
         if (ret) {
             sound("sound.event.loadCargo");
+            if (colonyWas != null) colonyWas.fireChanges();
+            if (sourceWas != null) sourceWas.fireChanges();
+            carrierWas.fireChanges();
+            updateGUI(null);
         }
-        if (colonyWas != null) colonyWas.fireChanges();
-        if (sourceWas != null) sourceWas.fireChanges();
-        carrierWas.fireChanges();
-        updateControls();
         return ret;
     }
 
@@ -3789,8 +3811,10 @@ public final class InGameController implements NetworkConstants {
 
         UnitWas unitWas = new UnitWas(unit);
         boolean ret = askServer().loot(unit, defenderId, goods);
-        unitWas.fireChanges();
-        updateControls();
+        if (ret) {
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -3819,20 +3843,26 @@ public final class InGameController implements NetworkConstants {
     public boolean monarchAction(MonarchAction action, boolean accept) {
         if (action == null) return false;
 
+        boolean ret = false;
         switch (action) {
         case RAISE_TAX_ACT: case RAISE_TAX_WAR:
         case MONARCH_MERCENARIES: case HESSIAN_MERCENARIES:
-            return askServer().answerMonarch(action, accept);
+            ret = askServer().answerMonarch(action, accept);
+            break;
         default:
             break;
         }
-        updateControls();
-        return false;
+        if (ret) {
+            updateGUI(null);
+        }
+        return ret;
     }
 
     /**
      * Do a monarch interaction.
      *
+     * Called from IGIH.monarchAction.
+     *
      * @param action The <code>MonarchAction</code> to perform.
      * @param template A <code>StringTemplate</code> describing the action.
      * @param monarchKey A key for the monarch involved.
@@ -3876,7 +3906,8 @@ public final class InGameController implements NetworkConstants {
             return false;
         }
 
-        // Autoload emigrants?
+        // Autoload?
+        boolean update = false;
         if (freeColClient.getClientOptions()
             .getBoolean(ClientOptions.AUTOLOAD_EMIGRANTS)
             && unit.isInEurope()) {
@@ -3884,16 +3915,18 @@ public final class InGameController implements NetworkConstants {
                 if (!u.isNaval()
                     && u.getState() == UnitState.SENTRY
                     && unit.canAdd(u)) {
-                    askEmbark(u, unit);
+                    if (askEmbark(u, unit)) update = true;
                 }
             }
         }
 
         UnitWas unitWas = new UnitWas(unit);
         boolean ret = askServer().moveTo(unit, destination);
-        unitWas.fireChanges();
-        updateControls();
-        updateActiveUnit(null);
+        if (ret) {
+            unitWas.fireChanges();
+            update = true;
+        }
+        if (update) updateGUI(null);
         return ret;
     }
 
@@ -3910,18 +3943,26 @@ public final class InGameController implements NetworkConstants {
      */
     public boolean moveUnit(Unit unit, Direction direction) {
         if (!requireOurTurn() || unit == null
-            || direction == null) return false;
+            || direction == null || !unit.hasTile()) return false;
 
+        if (!askClearGotoOrders(unit)) return false;
+
+        final Tile oldTile = unit.getTile();
         UnitWas unitWas = new UnitWas(unit);
         ColonyWas colonyWas = (unit.getColony() == null) ? null
             : new ColonyWas(unit.getColony());
         unit.setState(UnitState.ACTIVE);
-        boolean ret = askClearGotoOrders(unit)
-            && moveDirection(unit, direction, true);
-        unitWas.fireChanges();
-        if (colonyWas != null) colonyWas.fireChanges();
-        updateControls();
-        updateActiveUnit(null);
+        moveDirection(unit, direction, true);
+        boolean ret = unit.getTile() != oldTile;
+        if (ret) {
+            unitWas.fireChanges();
+            if (colonyWas != null) colonyWas.fireChanges();
+            updateGUI(null);
+            if (!unit.couldMove()) { // Show colony panel if unit out of moves
+                Colony colony = unit.getTile().getColony();
+                if (colony != null) colonyPanel(colony, unit);
+            }
+        }
         return ret;
     }
 
@@ -3936,10 +3977,10 @@ public final class InGameController implements NetworkConstants {
     public boolean moveTileCursor(Direction direction) {
         if (direction == null) return false;
 
-        Tile tile = gui.getSelectedTile();
+        final Tile tile = gui.getSelectedTile();
         if (tile == null) return false;
 
-        Tile newTile = tile.getNeighbourOrNull(direction);
+        final Tile newTile = tile.getNeighbourOrNull(direction);
         if (newTile == null) return false;
 
         gui.setSelectedTile(newTile);
@@ -3977,14 +4018,14 @@ public final class InGameController implements NetworkConstants {
             .addName("%colonyKey%", key)
             .add("%colonyMenuItem%", "buildColonyAction.name")
             .add("%ordersMenuItem%", "menuBar.orders"));
-        displayModelMessages(false, false);
+        displayModelMessages(true);
         return true;
     }
 
     /**
      * The player names a new region.
      *
-     * Called from IGIH.newRegionName, GUI.showNameNewRegionDialog
+     * Called from newRegionName, GUI.showNameNewRegionDialog
      *
      * @param tile The <code>Tile</code> within the region.
      * @param unit The <code>Unit</code> that has discovered the region.
@@ -4068,12 +4109,6 @@ public final class InGameController implements NetworkConstants {
                 .addStringTemplate("%year%", currTurn.getLabel())
                 .addAmount("%amount%", currTurn.getSeasonNumber()));
         }
-
-        // Get rid of the "Waiting for..."
-        game.setCurrentPlayer(null);
-        gui.refresh();
-        
-        updateControls();
         return true;
     }
 
@@ -4087,7 +4122,7 @@ public final class InGameController implements NetworkConstants {
     public boolean nextActiveUnit() {
         if (!requireOurTurn()) return false;
 
-        updateActiveUnit(null);
+        updateGUI(null);
         return true;
     }
 
@@ -4126,14 +4161,14 @@ public final class InGameController implements NetworkConstants {
             return false;
         }
 
-        boolean ret = gui.confirm(true, null, StringTemplate
-            .template("payArrears.text")
-            .addAmount("%amount%", arrears),
-            type,
-            "ok", "cancel")
-            && askServer().payArrears(type)
-            && player.canTrade(type);
-        updateControls();
+        StringTemplate t = StringTemplate.template("payArrears.text")
+            .addAmount("%amount%", arrears);
+        if (!gui.confirm(true, null, t, type, "ok", "cancel")) return false;
+
+        boolean ret = askServer().payArrears(type) && player.canTrade(type);
+        if (ret) {
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -4160,20 +4195,18 @@ public final class InGameController implements NetworkConstants {
             return false;
         }
 
-        int price = colony.getPriceForBuilding();
-        if (!gui.confirm(true, null, StringTemplate
-                .template("payForBuilding.text")
-                .addAmount("%amount%", price),
-                colony,
-                "yes", "no")) {
-            return false;
-        }
+        final int price = colony.getPriceForBuilding();
+        StringTemplate t = StringTemplate.template("payForBuilding.text")
+            .addAmount("%amount%", price);
+        if (!gui.confirm(true, null, t, colony, "yes", "no")) return false;
 
         ColonyWas colonyWas = new ColonyWas(colony);
         boolean ret = askServer().payForBuilding(colony)
             && colony.getPriceForBuilding() == 0;
-        colonyWas.fireChanges();
-        updateControls();
+        if (ret) {
+            colonyWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -4196,9 +4229,11 @@ public final class InGameController implements NetworkConstants {
         UnitWas unitWas = new UnitWas(unit);
         boolean ret = askServer().putOutsideColony(unit)
             && unit.getLocation() == colony.getTile();
-        colonyWas.fireChanges();
-        unitWas.fireChanges();
-        updateControls();
+        if (ret) {
+            colonyWas.fireChanges();
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -4244,7 +4279,7 @@ public final class InGameController implements NetworkConstants {
         if (newUnit != null) {
             player.setNextActiveUnit(newUnit);
             gui.setActiveUnit(newUnit);
-            updateControls();
+            updateGUI(null);
         }
         return newUnit != null;
     }
@@ -4406,10 +4441,9 @@ public final class InGameController implements NetworkConstants {
                     moveToDestination(unit, null);
                 }
             }
+            unitWas.fireChanges();
+            updateGUI(null);
         }
-        unitWas.fireChanges();
-        updateControls();
-        updateActiveUnit(null);
         return ret;
     }
 
@@ -4432,15 +4466,13 @@ public final class InGameController implements NetworkConstants {
         Europe europe = player.getEurope();
         EuropeWas europeWas = new EuropeWas(europe);
         UnitWas unitWas = new UnitWas(carrier);
-        boolean ret = askUnloadGoods(goods.getType(), goods.getAmount(),
-                                     carrier);
+        boolean ret = askUnloadGoods(goods.getType(), goods.getAmount(), carrier);
         if (ret) {
             sound("sound.event.sellCargo");
-            displayModelMessages(false, false);
+            europeWas.fireChanges();
+            unitWas.fireChanges();
+            updateGUI(null);
         }
-        europeWas.fireChanges();
-        unitWas.fireChanges();
-        updateControls();
         return ret;
     }
 
@@ -4474,7 +4506,10 @@ public final class InGameController implements NetworkConstants {
 
         ColonyWas colonyWas = new ColonyWas(colony);
         boolean ret = askServer().setBuildQueue(colony, buildQueue);
-        colonyWas.fireChanges();
+        if (ret) {
+            colonyWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 
@@ -4496,7 +4531,6 @@ public final class InGameController implements NetworkConstants {
         final Game game = freeColClient.getGame();
         game.setCurrentPlayer(player);
 
-        Tile fallback = null;
         if (freeColClient.getMyPlayer().equals(player)) {
             if (FreeColDebugger.isInDebugMode(FreeColDebugger.DebugMode.DESYNC)
                 && DebugUtils.checkDesyncAction(freeColClient)) {
@@ -4525,21 +4559,14 @@ public final class InGameController implements NetworkConstants {
                 }
             }
             
-            player.resetIterators();
-            fallback = player.getFallbackTile();
-            updateActiveUnit(fallback);
-            updateControls();
-            
-            // GUI management.
+            // Wake up human!
             if (!freeColClient.isSinglePlayer()) {
                 sound("sound.anthem." + player.getNationId());
             }
-        }
 
-        // Update "Waiting for..."
-        gui.refresh();
-        if (!gui.isShowingSubPanel()) gui.requestFocusInWindow();
-        
+            player.resetIterators();
+            updateGUI(player.getFallbackTile());
+        }
         return true;
     }
 
@@ -4590,7 +4617,6 @@ public final class InGameController implements NetworkConstants {
         if (player != null) {
             player.refilterModelMessages(freeColClient.getClientOptions());
         }
-        updateControls();
     }
 
     /**
@@ -4618,7 +4644,7 @@ public final class InGameController implements NetworkConstants {
      */
     public boolean setInDebugMode() {
         FreeColDebugger.enableDebugMode(FreeColDebugger.DebugMode.MENUS);
-        updateControls();
+        updateGUI(null);
         return true;
     }
 
@@ -4674,10 +4700,11 @@ public final class InGameController implements NetworkConstants {
     public boolean skipUnit(Unit unit) {
         if (!requireOurTurn() || unit == null) return false;
 
-        if (unit.getState() == UnitState.SKIPPED) return true;
-
-        unit.setState(UnitState.SKIPPED);
-        updateActiveUnit(null);
+        boolean ret = unit.getState() != UnitState.SKIPPED;
+        if (ret) {
+            unit.setState(UnitState.SKIPPED);
+        }
+        updateGUI(null);
         return true;
     }
 
@@ -4706,23 +4733,21 @@ public final class InGameController implements NetworkConstants {
         if (!requireOurTurn() || unitType == null) return false;
 
         final Player player = freeColClient.getMyPlayer();
-        Europe europe = player.getEurope();
+        final Europe europe = player.getEurope();
         if (!player.checkGold(europe.getUnitPrice(unitType))) {
             gui.showInformationMessage("info.notEnoughGold");
             return false;
         }
 
         EuropeWas europeWas = new EuropeWas(europe);
-        boolean ret = false;
-        if (askServer().trainUnitInEurope(unitType)) {
-            Unit newUnit = europeWas.getNewUnit();
+        Unit newUnit = null;
+        boolean ret = askServer().trainUnitInEurope(unitType)
+            && (newUnit = europeWas.getNewUnit()) != null;
+        if (ret) {
             europeWas.fireChanges();
-            if (newUnit != null) {
-                player.setNextActiveUnit(newUnit);
-                gui.setActiveUnit(newUnit);
-                ret = true;
-            }
-            updateControls();
+            player.setNextActiveUnit(newUnit);
+            gui.setActiveUnit(newUnit);
+            updateGUI(null);
         }
         return ret;
     }
@@ -4739,9 +4764,9 @@ public final class InGameController implements NetworkConstants {
         if (!requireOurTurn() || unit == null
             || !unit.isCarrier()) return false;
 
-        final boolean inEurope = unit.isInEurope();
-        final Colony colony = unit.getColony();
         boolean ret = true;
+        boolean inEurope = unit.isInEurope();
+        Colony colony = unit.getColony();
         if (colony != null) { // In colony, unload units and goods.
             for (Unit u : unit.getUnitList()) {
                 ret = leaveShip(u) && ret;
@@ -4749,7 +4774,7 @@ public final class InGameController implements NetworkConstants {
             for (Goods goods : unit.getGoodsList()) {
                 ret = unloadCargo(goods, false) && ret;
             }
-        } else if (inEurope) { // In Europe, unload non-boycotted goods
+        } else if (unit.isInEurope()) { // In Europe, unload non-boycotted goods
             Player player = freeColClient.getMyPlayer();
             for (Goods goods : unit.getCompactGoodsList()) {
                 if (player.canTrade(goods.getType())) {
@@ -4760,7 +4785,7 @@ public final class InGameController implements NetworkConstants {
                 gui.showDumpCargoDialog(unit);
                 return false;
             }
-        } else { // Dump goods, however units dislike jumping overboard
+        } else { // Dump goods, units dislike jumping overboard
             for (Goods goods : unit.getGoodsList()) {
                 ret = unloadCargo(goods, false) && ret;
             }
@@ -4786,25 +4811,24 @@ public final class InGameController implements NetworkConstants {
             || !(goods.getLocation() instanceof Unit)) return false;
 
         // Find the carrier
-        Unit carrier = (Unit)goods.getLocation();
+        final Unit carrier = (Unit)goods.getLocation();
 
         // Use Europe-specific routine if needed
         if (carrier.isInEurope()) return sellGoods(goods);
 
         // Check for a colony
-        Colony colony = carrier.getColony();
+        final Colony colony = carrier.getColony();
 
         // Unload
         ColonyWas colonyWas = (colony == null) ? null : new ColonyWas(colony);
         UnitWas unitWas = new UnitWas(carrier);
-        boolean ret = askUnloadGoods(goods.getType(), goods.getAmount(),
-                                     carrier);
+        boolean ret = askUnloadGoods(goods.getType(), goods.getAmount(), carrier);
         if (ret) {
             if (!dump) sound("sound.event.unloadCargo");
+            if (colonyWas != null) colonyWas.fireChanges();
+            unitWas.fireChanges();
+            updateGUI(null);
         }
-        if (colonyWas != null) colonyWas.fireChanges();
-        unitWas.fireChanges();
-        updateControls();
         return ret;
     }
 
@@ -4822,6 +4846,18 @@ public final class InGameController implements NetworkConstants {
         return askServer().updateTradeRoute(route);
     }
 
+    /**
+     * The player has won, show the high scores and victory dialog.
+     *
+     * Called from IGIH.gameEnded.
+     *
+     * @param score If "true", a new high score was reached.
+     */
+    public void victory(String score) {
+        displayHighScores("true".equalsIgnoreCase(score));
+        gui.showVictoryDialog();
+    }
+
     /**
      * The player has won!
      *
@@ -4838,19 +4874,7 @@ public final class InGameController implements NetworkConstants {
         }
         return true;
     }
-
-    /**
-     * The player has won, show the high scores and victory dialog.
-     *
-     * Called from IGIH.gameEnded.
-     *
-     * @param score If "true", a new high score was reached.
-     */
-    public void victory(String score) {
-        displayHighScores("true".equalsIgnoreCase(score));
-        gui.showVictoryDialog();
-    }
-
+        
     /**
      * Tell a unit to wait.
      *
@@ -4859,8 +4883,11 @@ public final class InGameController implements NetworkConstants {
      * @return True, this can not fail.
      */
     public boolean waitUnit() {
+        if (!requireOurTurn()) return false;
+
+        // Defeat the normal check for whether the current unit can move.
         gui.setActiveUnit(null);
-        updateActiveUnit(null);
+        updateGUI(null);
         return true;
     }
 
@@ -4898,9 +4925,11 @@ public final class InGameController implements NetworkConstants {
         UnitWas unitWas = new UnitWas(unit);
         boolean ret = askServer().work(unit, workLocation)
             && unit.getLocation() == workLocation;
-        colonyWas.fireChanges();
-        unitWas.fireChanges();
-        updateControls();
+        if (ret) {
+            colonyWas.fireChanges();
+            unitWas.fireChanges();
+            updateGUI(null);
+        }
         return ret;
     }
 }

From b1d546344507875f01ac7a641f77e3da4dbbb1dd Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 29 Aug 2015 13:00:32 +0930
Subject: [PATCH 140/323] Widen nation column in PlayersTable.

---
 .../freecol/client/gui/panel/PlayersTable.java  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/PlayersTable.java b/src/net/sf/freecol/client/gui/panel/PlayersTable.java
index 22a97f96b..548f50daa 100644
--- a/src/net/sf/freecol/client/gui/panel/PlayersTable.java
+++ b/src/net/sf/freecol/client/gui/panel/PlayersTable.java
@@ -46,6 +46,7 @@ import javax.swing.table.JTableHeader;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.PreGameController;
@@ -694,17 +695,19 @@ public final class PlayersTable extends JTable {
         JTableHeader header = getTableHeader();
         header.addMouseListener(new HeaderListener(header, renderer));
 
-        TableColumn nationColumn = getColumnModel().getColumn(NATION_COLUMN);
+        final TableColumnModel tcm = getColumnModel();
+        
+        TableColumn nationColumn = tcm.getColumn(NATION_COLUMN);
         nationColumn.setCellRenderer(new NationCellRenderer());
         nationColumn.setHeaderRenderer(renderer);
+        nationColumn.setPreferredWidth(2 * tcm.getTotalColumnWidth()
+            / tcm.getColumnCount());
 
-        TableColumn availableColumn
-            = getColumnModel().getColumn(AVAILABILITY_COLUMN);
+        TableColumn availableColumn = tcm.getColumn(AVAILABILITY_COLUMN);
         availableColumn.setCellRenderer(new AvailableCellRenderer());
         availableColumn.setCellEditor(new AvailableCellEditor());
 
-        TableColumn advantagesColumn
-            = getColumnModel().getColumn(ADVANTAGE_COLUMN);
+        TableColumn advantagesColumn = tcm.getColumn(ADVANTAGE_COLUMN);
         switch (nationOptions.getNationalAdvantages()) {
         case SELECTABLE:
             advantagesColumn.setCellEditor(new AdvantageCellEditor(spec
@@ -721,11 +724,11 @@ public final class PlayersTable extends JTable {
         advantagesColumn.setCellRenderer(new AdvantageCellRenderer(nationOptions.getNationalAdvantages()));
         advantagesColumn.setHeaderRenderer(renderer);
 
-        TableColumn colorsColumn = getColumnModel().getColumn(COLOR_COLUMN);
+        TableColumn colorsColumn = tcm.getColumn(COLOR_COLUMN);
         colorsColumn.setCellRenderer(new ColorCellRenderer(true));
         colorsColumn.setCellEditor(new ColorCellEditor(freeColClient));
 
-        TableColumn playerColumn = getColumnModel().getColumn(PLAYER_COLUMN);
+        TableColumn playerColumn = tcm.getColumn(PLAYER_COLUMN);
         playerColumn.setCellEditor(new PlayerCellEditor());
         playerColumn.setCellRenderer(new PlayerCellRenderer());
     }

From 38f89035e1306180964ff8731ce822dd4e79b154 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 29 Aug 2015 13:42:09 +0930
Subject: [PATCH 141/323] Strengthen "skip" command.

---
 data/strings/FreeColMessages.properties       |  5 +--
 .../client/control/InGameController.java      | 31 ++++---------------
 src/net/sf/freecol/client/gui/TilePopup.java  | 12 ++-----
 .../client/gui/action/SkipUnitAction.java     |  3 +-
 4 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 947114d30..512dc3221 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -2498,10 +2498,11 @@ model.unit.underRepair=Repair(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
+# model.unit.unitState.improving is not used.  Improving units use the
+# model.improvement.*.occupationString corresponding to the improvement.
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 92ba2114e..de2eb9880 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -2862,8 +2862,9 @@ public final class InGameController implements NetworkConstants {
      * @return True if the state was changed.
      */
     public boolean changeState(Unit unit, UnitState state) {
-        if (!requireOurTurn() || unit == null
-            || !unit.checkSetState(state)) return false;
+        if (!requireOurTurn() || unit == null) return false;
+        if (unit.getState() == state) return true;
+        if (!unit.checkSetState(state)) return false;
 
         // Check if this is a hostile fortification, and give the player
         // a chance to confirm.
@@ -2874,10 +2875,9 @@ public final class InGameController implements NetworkConstants {
             if (tile != null && tile.getOwningSettlement() != null) {
                 Player enemy = tile.getOwningSettlement().getOwner();
                 if (player != enemy
-                    && player.getStance(enemy) != Stance.ALLIANCE) {
-                    if (!gui.confirmHostileAction(unit, tile))
-                        return false; // Aborted
-                }
+                    && player.getStance(enemy) != Stance.ALLIANCE
+                    && !gui.confirmHostileAction(unit, tile))
+                    return false; // Aborted
             }
         }
 
@@ -4689,25 +4689,6 @@ public final class InGameController implements NetworkConstants {
         return askServer().setTradeRoutes(routes);
     }
 
-    /**
-     * Skip the active unit, note no server interaction.
-     *
-     * Called from SkipUnitAction
-     *
-     * @param unit The <code>Unit</code> to skip.
-     * @return True if the active unit is not null.
-     */
-    public boolean skipUnit(Unit unit) {
-        if (!requireOurTurn() || unit == null) return false;
-
-        boolean ret = unit.getState() != UnitState.SKIPPED;
-        if (ret) {
-            unit.setState(UnitState.SKIPPED);
-        }
-        updateGUI(null);
-        return true;
-    }
-
     /**
      * Spy on a colony.
      *
diff --git a/src/net/sf/freecol/client/gui/TilePopup.java b/src/net/sf/freecol/client/gui/TilePopup.java
index a9d4597a1..1039a325f 100644
--- a/src/net/sf/freecol/client/gui/TilePopup.java
+++ b/src/net/sf/freecol/client/gui/TilePopup.java
@@ -152,9 +152,7 @@ public final class TilePopup extends JPopupMenu {
                     ji.addActionListener(new ActionListener() {
                             @Override
                             public void actionPerformed(ActionEvent event) {
-                                if (activeUnit.checkSetState(UnitState.ACTIVE)) {
-                                    igc.changeState(activeUnit, Unit.UnitState.ACTIVE);
-                                }
+                                igc.changeState(activeUnit, Unit.UnitState.ACTIVE);
                             }
                         });
                     add(ji);
@@ -165,9 +163,7 @@ public final class TilePopup extends JPopupMenu {
                     ji.addActionListener(new ActionListener() {
                             @Override
                             public void actionPerformed(ActionEvent event) {
-                                if (activeUnit.checkSetState(UnitState.FORTIFYING)) {
-                                    igc.changeState(activeUnit, Unit.UnitState.FORTIFYING);
-                                }
+                                igc.changeState(activeUnit, Unit.UnitState.FORTIFYING);
                             }
                         });
                     add(ji);
@@ -178,9 +174,7 @@ public final class TilePopup extends JPopupMenu {
                     ji.addActionListener(new ActionListener() {
                             @Override
                             public void actionPerformed(ActionEvent event) {
-                                if (activeUnit.checkSetState(UnitState.SKIPPED)) {
-                                    igc.changeState(activeUnit, Unit.UnitState.SKIPPED);
-                                }
+                                igc.changeState(activeUnit, Unit.UnitState.SKIPPED);
                             }
                         });
                     add(ji);
diff --git a/src/net/sf/freecol/client/gui/action/SkipUnitAction.java b/src/net/sf/freecol/client/gui/action/SkipUnitAction.java
index fea637956..e804e776a 100644
--- a/src/net/sf/freecol/client/gui/action/SkipUnitAction.java
+++ b/src/net/sf/freecol/client/gui/action/SkipUnitAction.java
@@ -22,6 +22,7 @@ package net.sf.freecol.client.gui.action;
 import java.awt.event.ActionEvent;
 
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.common.model.Unit;
 
 
 /**
@@ -51,6 +52,6 @@ public class SkipUnitAction extends UnitAction {
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        igc().skipUnit(getGUI().getActiveUnit());
+        igc().changeState(getGUI().getActiveUnit(), Unit.UnitState.SKIPPED);
     }
 }

From dc8c0cdc061a793fde3aff0b413cc04079b1c5f4 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 29 Aug 2015 12:30:05 +0200
Subject: [PATCH 142/323] Remove remaining uses of MapViewer outside Canvas and
 SwingGUI

---
 src/net/sf/freecol/client/gui/Canvas.java     | 30 +++++++++++++++++--
 .../client/gui/CanvasMouseListener.java       | 12 ++------
 src/net/sf/freecol/client/gui/MapViewer.java  |  4 +--
 src/net/sf/freecol/client/gui/TilePopup.java  | 12 ++++----
 .../client/gui/menu/MapEditorMenuBar.java     |  1 -
 5 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index bdc713322..947e7cad9 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -402,6 +402,15 @@ public final class Canvas extends JDesktopPane {
         return mapViewer.convertToMapTile(x, y);
     }
 
+    /**
+     * Get the view mode.
+     *
+     * @return The view mode.
+     */
+    public int getViewMode() {
+        return mapViewer.getViewMode();
+    }
+
     /**
      * Gets the active unit.
      *
@@ -411,6 +420,22 @@ public final class Canvas extends JDesktopPane {
         return mapViewer.getActiveUnit();
     }
 
+    /**
+     * Set the current active unit path.
+     *
+     * @param path The current <code>PathNode</code>.
+     */
+    void setCurrentPath(PathNode path) {
+        mapViewer.setCurrentPath(path);
+    }
+
+    /**
+     * Sets the path of the active unit to display it.
+     */
+    void updateCurrentPathForActiveUnit() {
+        mapViewer.updateCurrentPathForActiveUnit();
+    }
+
     /**
      * Gets the point at which the map was clicked for a drag.
      *
@@ -1347,8 +1372,7 @@ public final class Canvas extends JDesktopPane {
     }
 
     void setupMouseListeners() {
-        addMouseListener(new CanvasMouseListener(freeColClient, this,
-                                                 mapViewer));
+        addMouseListener(new CanvasMouseListener(freeColClient, this));
         addMouseMotionListener(new CanvasMouseMotionListener(freeColClient, this));
     }
 
@@ -2567,7 +2591,7 @@ public final class Canvas extends JDesktopPane {
     void showTilePopup(Tile tile, int x, int y) {
         if (tile == null)
             return;
-        TilePopup tp = new TilePopup(freeColClient, mapViewer, tile);
+        TilePopup tp = new TilePopup(freeColClient, this, tile);
         if (tp.hasItem()) {
             tp.show(this, x, y);
             tp.repaint();
diff --git a/src/net/sf/freecol/client/gui/CanvasMouseListener.java b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
index bb33c5c2c..32546c06d 100644
--- a/src/net/sf/freecol/client/gui/CanvasMouseListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
@@ -49,8 +49,6 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
 
     private final Canvas canvas;
 
-    private final MapViewer mapViewer;
-
     private final Timer doubleClickTimer = new Timer(doubleClickDelay,this);
 
     private int centerX, centerY;
@@ -61,14 +59,10 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
      *
      * @param freeColClient The enclosing <code>FreeColClient</code>.
      * @param canvas The component this object gets created for.
-     * @param mapViewer The GUI that holds information such as screen
-     *     resolution.
      */
-    public CanvasMouseListener(FreeColClient freeColClient, Canvas canvas,
-                               MapViewer mapViewer) {
+    public CanvasMouseListener(FreeColClient freeColClient, Canvas canvas) {
         this.freeColClient = freeColClient;
         this.canvas = canvas;
-        this.mapViewer = mapViewer;
     }
 
     /**
@@ -206,12 +200,12 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
     public void actionPerformed(ActionEvent e) {
         doubleClickTimer.stop();
         Tile tile=canvas.convertToMapTile(centerX, centerY);
-        if(mapViewer.getViewMode() == GUI.MOVE_UNITS_MODE) {
+        if(canvas.getViewMode() == GUI.MOVE_UNITS_MODE) {
             // Clear goto order when active unit is on the tile
             Unit unit=canvas.getActiveUnit();
             if(unit != null && unit.getTile() == tile) {
                 freeColClient.getInGameController().clearGotoOrders(unit);
-                mapViewer.updateCurrentPathForActiveUnit();
+                canvas.updateCurrentPathForActiveUnit();
             } else {
                 if (tile != null && tile.hasSettlement()) {
                     freeColClient.getGUI().showSettlement(tile.getSettlement());
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 19c1fb86d..d23b0c363 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -912,7 +912,7 @@ public final class MapViewer {
         this.activeUnit = activeUnit;
 
         // The user activated a unit
-        if (getViewMode() == GUI.VIEW_TERRAIN_MODE && activeUnit != null) {
+        if (viewMode == GUI.VIEW_TERRAIN_MODE && activeUnit != null) {
             changeViewMode(GUI.MOVE_UNITS_MODE);
         }
 
@@ -1029,7 +1029,7 @@ public final class MapViewer {
         boolean ret = false;
         selectedTile = newTile;
 
-        if (getViewMode() == GUI.MOVE_UNITS_MODE) {
+        if (viewMode == GUI.MOVE_UNITS_MODE) {
             if (activeUnit == null || activeUnit.getTile() != newTile) {
                 // select a unit on the selected tile
                 Unit unitInFront = findUnitInFront(newTile);
diff --git a/src/net/sf/freecol/client/gui/TilePopup.java b/src/net/sf/freecol/client/gui/TilePopup.java
index 1039a325f..d2a7318dc 100644
--- a/src/net/sf/freecol/client/gui/TilePopup.java
+++ b/src/net/sf/freecol/client/gui/TilePopup.java
@@ -70,7 +70,7 @@ public final class TilePopup extends JPopupMenu {
 
     private final FreeColClient freeColClient;
     private final GUI gui;
-    private final MapViewer mapViewer;
+    private final Canvas canvas;
     private boolean hasAnItem = false;
 
 
@@ -78,15 +78,17 @@ public final class TilePopup extends JPopupMenu {
      * The constructor that will insert the MenuItems.
      *
      * @param freeColClient The <code>FreeColClient</code> for the game.
+     * @param canvas The Canvas.
      * @param tile The <code>Tile</code> to create a popup for.
      *       The popup menu also appears near this <code>Tile</code>.
      */
-    public TilePopup(final FreeColClient freeColClient, final MapViewer mapViewer, final Tile tile) {
+    public TilePopup(final FreeColClient freeColClient, final Canvas canvas,
+                     final Tile tile) {
         super(Messages.message(tile.getSimpleLabel()));
 
         this.freeColClient = freeColClient;
         this.gui = freeColClient.getGUI();
-        this.mapViewer = mapViewer;
+        this.canvas = canvas;
 
         final Player player = freeColClient.getMyPlayer();
         final Unit activeUnit = gui.getActiveUnit();
@@ -119,7 +121,7 @@ public final class TilePopup extends JPopupMenu {
                             // if unit did not move, we should show
                             // the goto path
                             if (activeUnit.getTile() == currTile) {
-                                mapViewer.updateCurrentPathForActiveUnit();
+                                canvas.updateCurrentPathForActiveUnit();
                             }
                         }
                     });
@@ -423,7 +425,7 @@ public final class TilePopup extends JPopupMenu {
                             activeUnit.getTile(), tile, activeUnit.getCarrier(),
                             null, lb);
                         gui.showInformationMessage(lb.toString());
-                        mapViewer.setCurrentPath(path);
+                        canvas.setCurrentPath(path);
                         gui.refresh();                        
                     }
                 });
diff --git a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
index de33a965e..4a126f154 100644
--- a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
@@ -32,7 +32,6 @@ import javax.swing.JMenuItem;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.Canvas;
-import net.sf.freecol.client.gui.MapViewer;
 import net.sf.freecol.client.gui.action.*;
 import net.sf.freecol.client.gui.action.DisplayTileTextAction.DisplayText;
 import net.sf.freecol.client.gui.panel.Utility;

From fe52024d3c3fea7cf32919860eb14b0f9f1368b0 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 29 Aug 2015 12:58:25 +0200
Subject: [PATCH 143/323] Collect all z-index constants in a single place

---
 src/net/sf/freecol/client/gui/MapViewer.java        |  7 ++-----
 src/net/sf/freecol/common/model/LostCityRumour.java |  2 +-
 src/net/sf/freecol/common/model/Resource.java       |  2 +-
 src/net/sf/freecol/common/model/Tile.java           |  5 +++++
 src/net/sf/freecol/common/model/TileItem.java       |  3 ---
 test/src/net/sf/freecol/common/model/TileTest.java  | 10 +++++-----
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index d23b0c363..96c0134cb 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -228,9 +228,6 @@ public final class MapViewer {
         OTHER_UNITS_WIDTH = 3,
         MAX_OTHER_UNITS = 10;
 
-    public static final int OVERLAY_INDEX = 100;
-    public static final int FOREST_INDEX = 200;
-
     private GeneralPath gridPath = null;
     private final GeneralPath fog = new GeneralPath();
 
@@ -2001,7 +1998,7 @@ public final class MapViewer {
                 : new ArrayList<TileItem>();
             int startIndex = 0;
             for (int index = startIndex; index < tileItems.size(); index++) {
-                if (tileItems.get(index).getZIndex() < OVERLAY_INDEX) {
+                if (tileItems.get(index).getZIndex() < Tile.OVERLAY_ZINDEX) {
                     displayTileItem(g, tile, tileItems.get(index));
                     startIndex = index + 1;
                 } else {
@@ -2014,7 +2011,7 @@ public final class MapViewer {
                 g.drawImage(overlayImage, 0, (tileHeight - overlayImage.getHeight(null)), null);
             }
             for (int index = startIndex; index < tileItems.size(); index++) {
-                if (tileItems.get(index).getZIndex() < FOREST_INDEX) {
+                if (tileItems.get(index).getZIndex() < Tile.FOREST_ZINDEX) {
                     displayTileItem(g, tile, tileItems.get(index));
                     startIndex = index + 1;
                 } else {
diff --git a/src/net/sf/freecol/common/model/LostCityRumour.java b/src/net/sf/freecol/common/model/LostCityRumour.java
index 11ddab7cb..be3023524 100644
--- a/src/net/sf/freecol/common/model/LostCityRumour.java
+++ b/src/net/sf/freecol/common/model/LostCityRumour.java
@@ -314,7 +314,7 @@ public class LostCityRumour extends TileItem {
      */
     @Override
     public final int getZIndex() {
-        return RUMOUR_ZINDEX;
+        return Tile.RUMOUR_ZINDEX;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Resource.java b/src/net/sf/freecol/common/model/Resource.java
index 035727fa4..dfc54216a 100644
--- a/src/net/sf/freecol/common/model/Resource.java
+++ b/src/net/sf/freecol/common/model/Resource.java
@@ -193,7 +193,7 @@ public class Resource extends TileItem {
      */
     @Override
     public final int getZIndex() {
-        return RESOURCE_ZINDEX;
+        return Tile.RESOURCE_ZINDEX;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 15aa4f045..3364e20a2 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -121,6 +121,11 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      */
     public static final int NEAR_RADIUS = 8;
 
+    public static final int OVERLAY_ZINDEX = 100;
+    public static final int FOREST_ZINDEX = 200;
+    public static final int RESOURCE_ZINDEX = 400;
+    public static final int RUMOUR_ZINDEX = 500;
+
     /**
      * The type of the tile.
      * Beware: this may appear to be null in the client when the tile is
diff --git a/src/net/sf/freecol/common/model/TileItem.java b/src/net/sf/freecol/common/model/TileItem.java
index 85b2329f9..c944a8029 100644
--- a/src/net/sf/freecol/common/model/TileItem.java
+++ b/src/net/sf/freecol/common/model/TileItem.java
@@ -32,9 +32,6 @@ import net.sf.freecol.common.io.FreeColXMLReader;
 public abstract class TileItem extends FreeColGameObject
     implements Locatable, Named {
 
-    public static final int RESOURCE_ZINDEX = 400;
-    public static final int RUMOUR_ZINDEX = 500;
-
     /** The tile where the tile item is. */
     protected Tile tile;
 
diff --git a/test/src/net/sf/freecol/common/model/TileTest.java b/test/src/net/sf/freecol/common/model/TileTest.java
index e850bf66f..f09020d77 100644
--- a/test/src/net/sf/freecol/common/model/TileTest.java
+++ b/test/src/net/sf/freecol/common/model/TileTest.java
@@ -716,13 +716,13 @@ public class TileTest extends FreeColTestCase {
     }
 
     public void testZIndex() {
-        assertTrue(MapViewer.OVERLAY_INDEX < MapViewer.FOREST_INDEX);
-        assertTrue(MapViewer.FOREST_INDEX < TileItem.RESOURCE_ZINDEX);
-        assertTrue(TileItem.RESOURCE_ZINDEX < TileItem.RUMOUR_ZINDEX);
+        assertTrue(Tile.OVERLAY_ZINDEX < Tile.FOREST_ZINDEX);
+        assertTrue(Tile.FOREST_ZINDEX < Tile.RESOURCE_ZINDEX);
+        assertTrue(Tile.RESOURCE_ZINDEX < Tile.RUMOUR_ZINDEX);
         assertTrue(plow.getZIndex() < river.getZIndex());
         assertTrue(river.getZIndex() < road.getZIndex());
-        assertTrue(MapViewer.FOREST_INDEX < road.getZIndex());
-        assertTrue(road.getZIndex() < TileItem.RESOURCE_ZINDEX);
+        assertTrue(Tile.FOREST_ZINDEX < road.getZIndex());
+        assertTrue(road.getZIndex() < Tile.RESOURCE_ZINDEX);
     }
 
     public void testCopy() {

From aad9d1c1f223587d85fc785220dafad7a8f2bbb5 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 29 Aug 2015 14:11:49 +0200
Subject: [PATCH 144/323] Clean up unnecessary trivial methods in MapViewer

---
 src/net/sf/freecol/client/gui/MapViewer.java | 54 +++-----------------
 src/net/sf/freecol/client/gui/SwingGUI.java  |  2 +-
 2 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 96c0134cb..0237f1ae7 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -296,16 +296,6 @@ public final class MapViewer {
         }
     }
 
-
-    /**
-     * Get the current active unit path.
-     *
-     * @return The current <code>PathNode</code>.
-     */
-    PathNode getCurrentPath() {
-        return this.currentPath;
-    }
-
     /**
      * Set the current active unit path.
      *
@@ -683,10 +673,6 @@ public final class MapViewer {
         return activeUnit;
     }
 
-    TerrainCursor getCursor() {
-        return cursor;
-    }
-
     /**
      * Gets the focus of the map. That is the center tile of the displayed
      * map.
@@ -717,24 +703,6 @@ public final class MapViewer {
         return lib;
     }
 
-    /**
-     * Get the current scale of the map.
-     *
-     * @return The current map scale.
-     */
-    float getMapScale() {
-        return lib.getScaleFactor();
-    }
-
-    /**
-     * Get the size of this GUI.
-     *
-     * @return The size of this GUI.
-     */
-    Dimension getSize() {
-        return size;
-    }
-
     /**
      * Gets the selected tile.
      *
@@ -861,7 +829,7 @@ public final class MapViewer {
      * @return True if scrolling occurred.
      */
     boolean scrollMap(Direction direction) {
-        Tile t = getFocus();
+        Tile t = focus;
         if (t == null) return false;
         int fx = t.getX(), fy = t.getY();
         if ((t = t.getNeighbourOrNull(direction)) == null) return false;
@@ -1072,7 +1040,7 @@ public final class MapViewer {
             @Override
             public void actionPerformed(ActionEvent event) {
                 if (!blinkingMarqueeEnabled) return;
-                Unit unit = getActiveUnit();
+                Unit unit = activeUnit;
                 if (unit != null) {
                     Tile tile = unit.getTile();
                     if (isTileVisible(tile)) {
@@ -1639,7 +1607,8 @@ public final class MapViewer {
                 // paint transparent borders
                 displayTerritorialBorders(g, tile, BorderType.COUNTRY, false);
 
-                if (shouldDisplayTileCursor(tile)) {
+                if (viewMode == GUI.VIEW_TERRAIN_MODE
+                        && tile != null && tile.equals(selectedTile)) {
                     displayCursor(g);
                 }
                 // check for units
@@ -2043,8 +2012,9 @@ public final class MapViewer {
         final Player player = freeColClient.getMyPlayer();
 
         // Draw the 'selected unit' image if needed.
-        //if ((unit == getActiveUnit()) && cursor) {
-        if (shouldDisplayUnitCursor(unit)) displayCursor(g);
+        if (viewMode == GUI.MOVE_UNITS_MODE && unit == activeUnit
+                && (cursor.isActive() || unit.getMovesLeft() <= 0))
+            displayCursor(g);
 
         // Draw the unit.
         // If unit is sentry, draw in grayscale
@@ -2705,14 +2675,4 @@ public final class MapViewer {
         rightSpace = leftSpace;
     }
 
-    private boolean shouldDisplayTileCursor(Tile tile) {
-        return viewMode == GUI.VIEW_TERRAIN_MODE
-            && tile != null && tile.equals(selectedTile);
-    }
-
-    private boolean shouldDisplayUnitCursor(Unit unit) {
-        return viewMode == GUI.MOVE_UNITS_MODE
-            && unit == activeUnit
-            && (cursor.isActive() || unit.getMovesLeft() <= 0);
-    }
 }
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index b19645be4..ee76e53c0 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1660,7 +1660,7 @@ public class SwingGUI extends GUI {
 
     @Override
     public float getMapScale() {
-        return mapViewer.getMapScale();
+        return mapViewer.getImageLibrary().getScaleFactor();
     }
 
     @Override

From 9b86afeab908971059bb945da509601e95a0082d Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 29 Aug 2015 14:41:20 +0200
Subject: [PATCH 145/323] Remove dependency on JLabel in GUI

---
 src/net/sf/freecol/client/gui/GUI.java             |  4 ++--
 src/net/sf/freecol/client/gui/MapViewer.java       | 14 ++++++++------
 src/net/sf/freecol/client/gui/SwingGUI.java        |  6 ++++--
 .../client/gui/animation/UnitMoveAnimation.java    | 10 ++++++----
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 4dfdf6cc3..decb23510 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -33,7 +33,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import javax.swing.JLabel;
 import javax.swing.filechooser.FileFilter;
 
 import net.sf.freecol.client.ClientOptions;
@@ -1510,7 +1509,8 @@ public class GUI {
     public void changeViewMode(int newViewMode) {
     }
 
-    public Point calculateUnitLabelPositionInTile(JLabel unitLabel, Point tileP) {
+    public Point calculateUnitLabelPositionInTile(int labelWidth,int labelHeight,
+                                                  Point tileP) {
         return null;
     }
 
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 0237f1ae7..ea72093a7 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -772,17 +772,18 @@ public final class MapViewer {
     /**
      * Gets the position where a unitLabel located at tile should be drawn.
      *
-     * @param unitLabel The unit label with the unit's image and
-     *     occupation indicator drawn.
+     * @param labelWidth The width of the unit label.
+     * @param labelHeight The width of the unit label.
      * @param tileP The position of the Tile on the screen.
      * @return The position where to put the label, null if tileP is null.
      */
-    Point calculateUnitLabelPositionInTile(JLabel unitLabel, Point tileP) {
+    Point calculateUnitLabelPositionInTile(int labelWidth,int labelHeight,
+                                           Point tileP) {
         if (tileP != null) {
             int labelX = tileP.x + tileWidth
-                / 2 - unitLabel.getWidth() / 2;
+                / 2 - labelWidth / 2;
             int labelY = tileP.y + tileHeight
-                / 2 - unitLabel.getHeight() / 2
+                / 2 - labelHeight / 2
                 - (int) (UNIT_OFFSET * lib.getScaleFactor());
             return new Point(labelX, labelY);
         } else {
@@ -2138,7 +2139,8 @@ public final class MapViewer {
             final JLabel unitLabel = createUnitLabel(unit);
 
             i = 1;
-            unitLabel.setLocation(calculateUnitLabelPositionInTile(unitLabel,
+            unitLabel.setLocation(calculateUnitLabelPositionInTile(
+                    unitLabel.getWidth(), unitLabel.getHeight(),
                     calculateTilePosition(sourceTile)));
             unitsOutForAnimationLabels.put(unit, unitLabel);
             gui.getCanvas().add(unitLabel, JLayeredPane.DEFAULT_LAYER);
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index ee76e53c0..7b279a2c7 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1637,8 +1637,10 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public Point calculateUnitLabelPositionInTile(JLabel unitLabel, Point tileP) {
-        return mapViewer.calculateUnitLabelPositionInTile(unitLabel, tileP);
+    public Point calculateUnitLabelPositionInTile(int labelWidth,int labelHeight,
+                                                  Point tileP) {
+        return mapViewer.calculateUnitLabelPositionInTile(
+            labelWidth, labelHeight, tileP);
     }
 
     @Override
diff --git a/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java b/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
index ceadfb17d..706a9d804 100644
--- a/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
+++ b/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
@@ -86,10 +86,12 @@ final class UnitMoveAnimation {
             new OutForAnimationCallback() {
                 @Override
                 public void executeWithUnitOutForAnimation(final JLabel unitLabel) {
-                    final Point srcPoint
-                        = gui.calculateUnitLabelPositionInTile(unitLabel, srcP);
-                    final Point dstPoint
-                        = gui.calculateUnitLabelPositionInTile(unitLabel, dstP);
+                    final int labelWidth = unitLabel.getWidth();
+                    final int labelHeight = unitLabel.getHeight();
+                    final Point srcPoint = gui.calculateUnitLabelPositionInTile(
+                        labelWidth, labelHeight, srcP);
+                    final Point dstPoint = gui.calculateUnitLabelPositionInTile(
+                        labelWidth, labelHeight, dstP);
                     final double xratio = gui.getTileWidthHeightRatio();
                     final int stepX = (srcPoint.getX() == dstPoint.getX()) ? 0
                         : (srcPoint.getX() > dstPoint.getX()) ? -1 : 1;

From 80561e4e6b8bb7275e9dd9f2eb23e974c3aaf390 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 29 Aug 2015 14:48:25 +0200
Subject: [PATCH 146/323] Remove dependency on LabourData.UnitData in GUI

---
 src/net/sf/freecol/client/gui/GUI.java      | 4 ----
 src/net/sf/freecol/client/gui/SwingGUI.java | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index decb23510..03a9b2f51 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -39,7 +39,6 @@ import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
 import net.sf.freecol.client.control.InGameController.*;
-import net.sf.freecol.client.gui.panel.LabourData.UnitData;
 import net.sf.freecol.client.gui.panel.MiniMap;
 import net.sf.freecol.client.gui.panel.Parameters;
 import net.sf.freecol.client.gui.panel.Utility;
@@ -1187,9 +1186,6 @@ public class GUI {
     public void showCompactLabourReport() {
     }
 
-    public void showCompactLabourReport(UnitData unitData) {
-    }
-
     public void showDeclarationPanel() {
     }
 
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 7b279a2c7..dbc979057 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1111,7 +1111,6 @@ public class SwingGUI extends GUI {
         canvas.showCompactLabourReport();
     }
 
-    @Override
     public void showCompactLabourReport(UnitData unitData) {
         canvas.showCompactLabourReport(unitData);
     }

From 16309753587e9e1d890c94f11a1966dd4e2dbf8b Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 29 Aug 2015 15:37:18 +0200
Subject: [PATCH 147/323] Centralize creation of JTextArea from StringTemplate,
 increasing likeliness of uniform appearance of all dialogs

---
 src/net/sf/freecol/client/gui/GUI.java        | 24 +++++++------------
 .../client/gui/panel/FreeColDialog.java       |  2 +-
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 03a9b2f51..463cb7c34 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -41,7 +41,6 @@ import net.sf.freecol.client.control.InGameController;
 import net.sf.freecol.client.control.InGameController.*;
 import net.sf.freecol.client.gui.panel.MiniMap;
 import net.sf.freecol.client.gui.panel.Parameters;
-import net.sf.freecol.client.gui.panel.Utility;
 import net.sf.freecol.common.FreeColException;
 import net.sf.freecol.common.ServerInfo;
 import net.sf.freecol.common.debug.FreeColDebugger;
@@ -699,7 +698,7 @@ public class GUI {
                 ArmedUnitSettlementAction.SETTLEMENT_ATTACK));
 
         return getChoice(true, settlement.getTile(),
-            Utility.localizedTextArea(settlement.getAlarmLevelLabel(player)),
+            settlement.getAlarmLevelLabel(player),
             settlement, "cancel", choices);
     }
 
@@ -726,7 +725,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("boycottedGoods.dumpGoods"),
                 BoycottAction.DUMP_CARGO));
 
-        return getChoice(true, null, Utility.localizedTextArea(template),
+        return getChoice(true, null, template,
                          goods.getType(), "cancel", choices);
     }
 
@@ -753,7 +752,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("buy.moreGold"),
                                      BuyAction.HAGGLE));
 
-        return getChoice(true, unit.getTile(), Utility.localizedTextArea(template),
+        return getChoice(true, unit.getTile(), template,
                          goods.getType(), "cancel", choices);
     }
 
@@ -785,7 +784,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("indianLand.take"),
                                      ClaimAction.STEAL));
 
-        return getChoice(true, tile, Utility.localizedTextArea(template),
+        return getChoice(true, tile, template,
                          owner.getNation(), "indianLand.cancel", choices);
     }
 
@@ -821,8 +820,7 @@ public class GUI {
         }
         if (choices.isEmpty()) return null;
 
-        return getChoice(true, settlement.getTile(),
-                         Utility.localizedTextArea(template),
+        return getChoice(true, settlement.getTile(), template,
                          settlement, "cancel", choices);
     }
 
@@ -861,8 +859,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("missionarySettlement.incite"),
                                      MissionaryAction.INCITE_INDIANS));
 
-        return getChoice(true, unit.getTile(),
-                         Utility.localizedTextArea(template),
+        return getChoice(true, unit.getTile(), template,
                          settlement, "cancel", choices);
     }
 
@@ -918,8 +915,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("scoutColony.attack"),
                                      ScoutColonyAction.FOREIGN_COLONY_ATTACK));
 
-        return getChoice(true, unit.getTile(),
-                         Utility.localizedTextArea(template),
+        return getChoice(true, unit.getTile(), template,
                          colony, "cancel", choices);
     }
 
@@ -978,8 +974,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("scoutSettlement.attack"),
                                      ScoutIndianSettlementAction.INDIAN_SETTLEMENT_ATTACK));
 
-        return getChoice(true, settlement.getTile(),
-                         Utility.localizedTextArea(template),
+        return getChoice(true, settlement.getTile(), template,
                          settlement, "cancel", choices);
     }
 
@@ -1010,8 +1005,7 @@ public class GUI {
                     .addStringTemplate("%goods%", goodsTemplate)),
                 SellAction.GIFT));
 
-        return getChoice(true, unit.getTile(),
-                         Utility.localizedTextArea(template),
+        return getChoice(true, unit.getTile(), template,
                          goods.getType(), "cancel", choices);
     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
index d205bccb2..5f30b3fdd 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
@@ -174,7 +174,7 @@ public class FreeColDialog<T> extends JDialog implements PropertyChangeListener
         int def = selectDefault(options);
         ChoiceItem<T> ci = (def >= 0) ? options.get(def) : null;
         if (obj instanceof StringTemplate) {
-            obj = Messages.message((StringTemplate)obj);
+            obj = Utility.localizedTextArea((StringTemplate)obj);
         }
         this.pane = new JOptionPane(obj, paneType, JOptionPane.DEFAULT_OPTION,
                                     icon, selectOptions(), ci);

From 3e02435dd7558945d56d8912d53a0882bcb1fd89 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 29 Aug 2015 16:02:57 +0200
Subject: [PATCH 148/323] Use TextArea for strings in FreeColDialog, to ensure
 consistent formatting

---
 src/net/sf/freecol/client/gui/panel/FreeColDialog.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
index 5f30b3fdd..bd3a8ff91 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
@@ -175,6 +175,8 @@ public class FreeColDialog<T> extends JDialog implements PropertyChangeListener
         ChoiceItem<T> ci = (def >= 0) ? options.get(def) : null;
         if (obj instanceof StringTemplate) {
             obj = Utility.localizedTextArea((StringTemplate)obj);
+        } else if(obj instanceof String) {
+            obj = Utility.getDefaultTextArea((String)obj);
         }
         this.pane = new JOptionPane(obj, paneType, JOptionPane.DEFAULT_OPTION,
                                     icon, selectOptions(), ci);

From b5ac5c4077545294847bf9d8db348cf146123edf Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 29 Aug 2015 20:57:11 +0200
Subject: [PATCH 149/323] Clean up GUI, removing method stubs which are not a
 necessary part of the external API

---
 src/net/sf/freecol/client/gui/Canvas.java     |  12 +-
 src/net/sf/freecol/client/gui/GUI.java        | 118 ------------------
 src/net/sf/freecol/client/gui/MapViewer.java  |   9 --
 src/net/sf/freecol/client/gui/SwingGUI.java   |  45 +------
 src/net/sf/freecol/client/gui/TilePopup.java  |   4 +-
 .../gui/animation/UnitAttackAnimation.java    |   6 +-
 .../gui/animation/UnitImageAnimation.java     |   7 +-
 .../gui/animation/UnitMoveAnimation.java      |   8 +-
 .../client/gui/panel/ConstructionPanel.java   |   2 +-
 .../gui/panel/DefaultTransferHandler.java     |   6 +-
 .../gui/panel/EditSettlementDialog.java       |   8 +-
 .../sf/freecol/client/gui/panel/NewPanel.java |   5 +-
 .../client/gui/panel/QuickActionMenu.java     |   6 +-
 .../client/gui/panel/StartGamePanel.java      |   5 +-
 14 files changed, 41 insertions(+), 200 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 947e7cad9..509b0e848 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -180,7 +180,7 @@ public final class Canvas extends JDesktopPane {
     private final FreeColClient freeColClient;
 
     /** The parent GUI. */
-    private final GUI gui;
+    private final SwingGUI gui;
 
     private final GraphicsDevice graphicsDevice;
 
@@ -228,16 +228,18 @@ public final class Canvas extends JDesktopPane {
      *
      * @param freeColClient The <code>FreeColClient</code> for the game.
      * @param graphicsDevice The used graphics device.
+     * @param gui The gui.
      * @param desiredSize The desired size of the frame.
      * @param mapViewer The object responsible of drawing the map onto
      *     this component.
      */
     Canvas(final FreeColClient freeColClient,
-                  final GraphicsDevice graphicsDevice,
-                  final Dimension desiredSize,
-                  MapViewer mapViewer) {
+           final GraphicsDevice graphicsDevice,
+           final SwingGUI gui,
+           final Dimension desiredSize,
+           MapViewer mapViewer) {
         this.freeColClient = freeColClient;
-        this.gui = freeColClient.getGUI();
+        this.gui = gui;
         this.graphicsDevice = graphicsDevice;
         chatDisplay = new ChatDisplay();
         this.mapViewer = mapViewer;
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 463cb7c34..78efac430 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -19,10 +19,8 @@
 
 package net.sf.freecol.client.gui;
 
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
-import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -30,11 +28,8 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Logger;
 
-import javax.swing.filechooser.FileFilter;
-
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
@@ -42,7 +37,6 @@ import net.sf.freecol.client.control.InGameController.*;
 import net.sf.freecol.client.gui.panel.MiniMap;
 import net.sf.freecol.client.gui.panel.Parameters;
 import net.sf.freecol.common.FreeColException;
-import net.sf.freecol.common.ServerInfo;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColDirectories;
@@ -74,9 +68,7 @@ import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Tension;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.TradeRoute;
-import net.sf.freecol.common.model.TypeCountMap;
 import net.sf.freecol.common.model.Unit;
-import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.option.Option;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.resources.ResourceManager;
@@ -273,14 +265,6 @@ public class GUI {
     public void refresh() {
     }
 
-    /**
-     * Refreshes the screen at the specified Tile.
-     *
-     * @param tile The <code>Tile</code> to refresh.
-     */
-    public void refreshTile(Tile tile) {
-    }
-
     /**
      * Reset the menu bar.
      */
@@ -366,9 +350,6 @@ public class GUI {
     public void updateMapControls() {
     }
 
-    public void updateMapControlsInCanvas() {
-    }
-
     public void zoomInMapControls() {
     }
 
@@ -1104,9 +1085,6 @@ public class GUI {
     public void refreshPlayersTable() {
     }
 
-    public void removeFromCanvas(Component component) {
-    }
-
     public void removeInGameComponents() {
     }
 
@@ -1117,24 +1095,12 @@ public class GUI {
         return false;
     }
 
-    public void restoreSavedSize(Component comp, int w, int h) {
-    }
-
-    public void restoreSavedSize(Component comp, Dimension size) {
-    }
-
     public void returnToTitle() {
     }
 
     public void showAboutPanel() {
     }
 
-    public void showBuildQueuePanel(Colony colony) {
-    }
-
-    public void showBuildQueuePanel(Colony colony, Runnable callBack) {
-    }
-
     public void showCaptureGoodsDialog(final Unit unit, List<Goods> gl,
                                        final String defenderId) {
     }
@@ -1187,11 +1153,6 @@ public class GUI {
         return null;
     }
 
-    public OptionGroup showDifficultyDialog(Specification spec,
-                                            OptionGroup group) {
-        return null;
-    }
-
     public void showDumpCargoDialog(Unit unit) {
     }
 
@@ -1281,10 +1242,6 @@ public class GUI {
         return null;
     }
 
-    public File showLoadDialog(File directory, FileFilter[] fileFilters) {
-        return null;
-    }
-
     final public File showLoadSaveFileDialog() {
         File file = showLoadDialog(FreeColDirectories.getSaveDirectory());
         if (file != null && !file.isFile()) {
@@ -1359,12 +1316,6 @@ public class GUI {
         return false;
     }
 
-    public void showPurchasePanel() {
-    }
-
-    public void showRecruitPanel() {
-    }
-
     public void showReportCargoPanel() {
     }
 
@@ -1389,11 +1340,6 @@ public class GUI {
     public void showReportIndianPanel() {
     }
 
-    public void showReportLabourDetailPanel(UnitType unitType,
-            Map<UnitType, Map<Location, Integer>> data,
-            TypeCountMap<UnitType> unitCount, List<Colony> colonies) {
-    }
-
     public void showReportLabourPanel() {
     }
 
@@ -1422,11 +1368,6 @@ public class GUI {
         return null;
     }
 
-    public File showSaveDialog(File directory, FileFilter[] fileFilters,
-                               String defaultName, String extension) {
-        return null;
-    }
-
     public Dimension showScaleMapSizeDialog() {
         return null;
     }
@@ -1445,9 +1386,6 @@ public class GUI {
         return null;
     }
 
-    public void showServerListPanel(List<ServerInfo> serverList) {
-    }
-
     public void showStartGamePanel(Game game, Player player,
                                    boolean singlePlayerMode) {
     }
@@ -1458,35 +1396,15 @@ public class GUI {
     public void showStatusPanel(String message) {
     }
 
-    public void showTilePanel(Tile tile) {
-    }
-
     public void showTilePopUpAtSelectedTile() {
     }
 
     public void showTradeRoutePanel(Unit unit) {
     }
 
-    public void showTradeRouteInputPanel(TradeRoute newRoute,
-                                         Runnable callBack) {
-    }
-
-    public void showTrainPanel() {
-    }
-
     public void showVictoryDialog() {
     }
 
-    public boolean showWarehouseDialog(Colony colony) {
-        return false;
-    }
-
-    public void showWorkProductionPanel(Unit unit) {
-    }
-
-    public void updateEuropeanSubpanels() {
-    }
-
     public void updateGameOptions() {
     }
 
@@ -1499,16 +1417,6 @@ public class GUI {
     public void changeViewMode(int newViewMode) {
     }
 
-    public Point calculateUnitLabelPositionInTile(int labelWidth,int labelHeight,
-                                                  Point tileP) {
-        return null;
-    }
-
-    public void executeWithUnitOutForAnimation(final Unit unit,
-                                               final Tile sourceTile,
-                                               final OutForAnimationCallback r) {
-    }
-
     public Unit getActiveUnit() {
         return null;
     }
@@ -1517,43 +1425,17 @@ public class GUI {
         return null;
     }
 
-    public float getMapScale() {
-        return 1.0f;
-    }
-
     public Tile getSelectedTile() {
         return null;
     }
 
-    public Rectangle getTileBounds(Tile tile) {
-        return null;
-    }
-
-    public Point getTilePosition(Tile tile) {
-        return null;
-    }
-
-    public double getTileWidthHeightRatio() {
-        return ImageLibrary.TILE_SIZE.width / (double)ImageLibrary.TILE_SIZE.height;
-    }
-
     public int getViewMode() {
         return -1;
     }
 
-    public boolean onScreen(Tile tileToCheck) {
-        return true; // Lets pretend.
-    }
-
-    public void restartBlinking() {
-    }
-
     public void setFocus(Tile tileToFocus) {
     }
 
-    public void setFocusImmediately(Tile tileToFocus) {
-    }
-
     public boolean setSelectedTile(Tile newTileToSelect) {
         return true; // Pretending again.
     }
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index ea72093a7..1ba8d6aa5 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -760,15 +760,6 @@ public final class MapViewer {
         return tileWidth;
     }
 
-    /**
-     * Get the ratio of width/height of tiles on the map.
-     *
-     * @return The ratio.
-     */
-    double getTileWidthHeightRatio() {
-        return tileWidth / (double)tileHeight;
-    }
-
     /**
      * Gets the position where a unitLabel located at tile should be drawn.
      *
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index dbc979057..43294306d 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -326,7 +326,7 @@ public class SwingGUI extends GUI {
                 if (t != null) {
                     t.stop();
                 }
-                freeColClient.getSoundController().playSound("sound.intro.general");
+                playSound("sound.intro.general");
                 showMainPanel(userMsg);
             }
         }
@@ -410,7 +410,7 @@ public class SwingGUI extends GUI {
             });
 
         this.mapViewer = new MapViewer(freeColClient);
-        this.canvas = new Canvas(freeColClient, graphicsDevice,
+        this.canvas = new Canvas(freeColClient, graphicsDevice, this,
                                  desiredWindowSize, mapViewer);
         this.tileMapViewer = new MapViewer(freeColClient);
 
@@ -533,7 +533,6 @@ public class SwingGUI extends GUI {
      *
      * @param tile The <code>Tile</code> to refresh.
      */
-    @Override
     public void refreshTile(Tile tile) {
         if (tile.getX() >= 0 && tile.getY() >= 0) {
             canvas.repaint(mapViewer.calculateTileBounds(tile));
@@ -622,7 +621,7 @@ public class SwingGUI extends GUI {
     private boolean requireFocus(Tile tile) {
         boolean required = freeColClient.getClientOptions()
             .getBoolean(ClientOptions.ALWAYS_CENTER);
-        if ((required && tile != getFocus()) || !onScreen(tile)) {
+        if ((required && tile != getFocus()) || !mapViewer.onScreen(tile)) {
             setFocusImmediately(tile);
             return true;
         }
@@ -704,7 +703,6 @@ public class SwingGUI extends GUI {
         if (mapControls != null) mapControls.update();
     }
 
-    @Override
     public void updateMapControlsInCanvas() {
         if (mapControls == null) return;
         mapControls.removeFromComponent(canvas);
@@ -993,7 +991,6 @@ public class SwingGUI extends GUI {
         canvas.refreshPlayersTable();
     }
 
-    @Override
     public void removeFromCanvas(Component component) {
         canvas.remove(component);
     }
@@ -1017,12 +1014,10 @@ public class SwingGUI extends GUI {
         return canvas.requestFocusInWindow();
     }
 
-    @Override
     public void restoreSavedSize(Component comp, int w, int h) {
         canvas.restoreSavedSize(comp, new Dimension(w, h));
     }
 
-    @Override
     public void restoreSavedSize(Component comp, Dimension size) {
         canvas.restoreSavedSize(comp, size);
     }
@@ -1030,7 +1025,7 @@ public class SwingGUI extends GUI {
     @Override
     public void returnToTitle() {
         canvas.returnToTitle();
-        freeColClient.getSoundController().playSound("sound.intro.general");
+        playSound("sound.intro.general");
     }
 
     @Override
@@ -1038,12 +1033,10 @@ public class SwingGUI extends GUI {
         canvas.showAboutPanel();
     }
 
-    @Override
     public void showBuildQueuePanel(Colony colony) {
         canvas.showBuildQueuePanel(colony);
     }
 
-    @Override
     public void showBuildQueuePanel(Colony colony, Runnable callBack) {
         canvas.showBuildQueuePanel(colony, callBack);
     }
@@ -1125,7 +1118,6 @@ public class SwingGUI extends GUI {
         return canvas.showDifficultyDialog();
     }
 
-    @Override
     public OptionGroup showDifficultyDialog(Specification spec,
                                             OptionGroup group) {
         return canvas.showDifficultyDialog(spec, group);
@@ -1283,7 +1275,6 @@ public class SwingGUI extends GUI {
         return canvas.showLoadDialog(directory);
     }
 
-    @Override
     public File showLoadDialog(File directory, FileFilter[] fileFilters) {
         return canvas.showLoadDialog(directory, fileFilters);
     }
@@ -1406,12 +1397,10 @@ public class SwingGUI extends GUI {
         return canvas.showPreCombatDialog(attacker, defender, tile);
     }
 
-    @Override
     public void showPurchasePanel() {
         canvas.showPurchasePanel();
     }
 
-    @Override
     public void showRecruitPanel() {
         canvas.showRecruitPanel();
     }
@@ -1456,7 +1445,6 @@ public class SwingGUI extends GUI {
         canvas.showReportIndianPanel();
     }
 
-    @Override
     public void showReportLabourDetailPanel(UnitType unitType,
             Map<UnitType, Map<Location, Integer>> data,
             TypeCountMap<UnitType> unitCount, List<Colony> colonies) {
@@ -1509,7 +1497,6 @@ public class SwingGUI extends GUI {
         return canvas.showSaveDialog(directory, defaultName);
     }
 
-    @Override
     public File showSaveDialog(File directory, FileFilter[] fileFilters,
                                String defaultName, String extension) {
         return canvas.showSaveDialog(directory, fileFilters, defaultName,
@@ -1539,7 +1526,6 @@ public class SwingGUI extends GUI {
         return canvas.showSelectDestinationDialog(unit);
     }
 
-    @Override
     public void showServerListPanel(List<ServerInfo> serverList) {
         canvas.showServerListPanel(serverList);
     }
@@ -1560,7 +1546,6 @@ public class SwingGUI extends GUI {
         canvas.showStatusPanel(message);
     }
 
-    @Override
     public void showTilePanel(Tile tile) {
         canvas.showTilePanel(tile);
     }
@@ -1577,13 +1562,11 @@ public class SwingGUI extends GUI {
         canvas.showTradeRoutePanel(unit);
     }
 
-    @Override
     public void showTradeRouteInputPanel(TradeRoute newRoute,
                                          Runnable callBack) {
         canvas.showTradeRouteInputPanel(newRoute, callBack);
     }
 
-    @Override
     public void showTrainPanel() {
         canvas.showTrainPanel();
     }
@@ -1598,17 +1581,14 @@ public class SwingGUI extends GUI {
             });
     }
 
-    @Override
     public boolean showWarehouseDialog(Colony colony) {
         return canvas.showWarehouseDialog(colony);
     }
 
-    @Override
     public void showWorkProductionPanel(Unit unit) {
         canvas.showWorkProductionPanel(unit);
     }
 
-    @Override
     public void updateEuropeanSubpanels() {
         canvas.updateEuropeanSubpanels();
     }
@@ -1635,14 +1615,12 @@ public class SwingGUI extends GUI {
         mapViewer.changeViewMode(newViewMode);
     }
 
-    @Override
     public Point calculateUnitLabelPositionInTile(int labelWidth,int labelHeight,
                                                   Point tileP) {
         return mapViewer.calculateUnitLabelPositionInTile(
             labelWidth, labelHeight, tileP);
     }
 
-    @Override
     public void executeWithUnitOutForAnimation(final Unit unit,
                                                final Tile sourceTile,
                                                final OutForAnimationCallback r) {
@@ -1659,7 +1637,6 @@ public class SwingGUI extends GUI {
         return mapViewer.getFocus();
     }
 
-    @Override
     public float getMapScale() {
         return mapViewer.getImageLibrary().getScaleFactor();
     }
@@ -1669,32 +1646,19 @@ public class SwingGUI extends GUI {
         return mapViewer.getSelectedTile();
     }
 
-    @Override
     public Rectangle getTileBounds(Tile tile) {
         return mapViewer.calculateTileBounds(tile);
     }
 
-    @Override
     public Point getTilePosition(Tile tile) {
         return mapViewer.calculateTilePosition(tile);
     }
 
-    @Override
-    public double getTileWidthHeightRatio() {
-        return mapViewer.getTileWidthHeightRatio();
-    }
-
     @Override
     public int getViewMode() {
         return mapViewer.getViewMode();
     }
 
-    @Override
-    public boolean onScreen(Tile tileToCheck) {
-        return mapViewer.onScreen(tileToCheck);
-    }
-
-    @Override
     public void restartBlinking() {
         mapViewer.restartBlinking();
     }
@@ -1705,7 +1669,6 @@ public class SwingGUI extends GUI {
         canvas.refresh();
     }
 
-    @Override
     public void setFocusImmediately(Tile tileToFocus) {
         mapViewer.setFocus(tileToFocus);
         Dimension size = canvas.getSize();
diff --git a/src/net/sf/freecol/client/gui/TilePopup.java b/src/net/sf/freecol/client/gui/TilePopup.java
index d2a7318dc..2d58245f5 100644
--- a/src/net/sf/freecol/client/gui/TilePopup.java
+++ b/src/net/sf/freecol/client/gui/TilePopup.java
@@ -69,7 +69,7 @@ public final class TilePopup extends JPopupMenu {
     public static final int UNIT_LINES_IN_OTHER_MENUS = 19;
 
     private final FreeColClient freeColClient;
-    private final GUI gui;
+    private final SwingGUI gui;
     private final Canvas canvas;
     private boolean hasAnItem = false;
 
@@ -87,7 +87,7 @@ public final class TilePopup extends JPopupMenu {
         super(Messages.message(tile.getSimpleLabel()));
 
         this.freeColClient = freeColClient;
-        this.gui = freeColClient.getGUI();
+        this.gui = (SwingGUI)freeColClient.getGUI();
         this.canvas = canvas;
 
         final Player player = freeColClient.getMyPlayer();
diff --git a/src/net/sf/freecol/client/gui/animation/UnitAttackAnimation.java b/src/net/sf/freecol/client/gui/animation/UnitAttackAnimation.java
index 7989e0a97..63ae84504 100644
--- a/src/net/sf/freecol/client/gui/animation/UnitAttackAnimation.java
+++ b/src/net/sf/freecol/client/gui/animation/UnitAttackAnimation.java
@@ -20,7 +20,7 @@
 package net.sf.freecol.client.gui.animation;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.io.sza.SimpleZippedAnimation;
 import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.Tile;
@@ -92,7 +92,7 @@ final class UnitAttackAnimation {
      */
     private SimpleZippedAnimation getAnimation(Unit unit,
                                                Direction direction) {
-        float scale = freeColClient.getGUI().getMapScale();
+        float scale = ((SwingGUI)freeColClient.getGUI()).getMapScale();
         String roleStr = (unit.hasDefaultRole()) ? ""
             : "." + unit.getRoleSuffix();
         String startStr = "animation.unit." + unit.getType().getId() + roleStr
@@ -131,7 +131,7 @@ final class UnitAttackAnimation {
      * Do the animation.
      */
     public void animate() {
-        final GUI gui = freeColClient.getGUI();
+        final SwingGUI gui = (SwingGUI)freeColClient.getGUI();
         Direction direction = attackerTile.getDirection(defenderTile);
         SimpleZippedAnimation sza;
 
diff --git a/src/net/sf/freecol/client/gui/animation/UnitImageAnimation.java b/src/net/sf/freecol/client/gui/animation/UnitImageAnimation.java
index 717e2922f..66bab60d3 100644
--- a/src/net/sf/freecol/client/gui/animation/UnitImageAnimation.java
+++ b/src/net/sf/freecol/client/gui/animation/UnitImageAnimation.java
@@ -25,9 +25,9 @@ import java.awt.Rectangle;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 
-import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.client.gui.OutForAnimationCallback;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.io.sza.AnimationEvent;
 import net.sf.freecol.common.io.sza.ImageAnimationEvent;
 import net.sf.freecol.common.io.sza.SimpleZippedAnimation;
@@ -40,7 +40,7 @@ import net.sf.freecol.common.model.Unit;
  */
 public final class UnitImageAnimation {
     
-    private final GUI gui;
+    private final SwingGUI gui;
     private final Unit unit;
     private final Tile tile;
     private final SimpleZippedAnimation animation;
@@ -49,11 +49,12 @@ public final class UnitImageAnimation {
     /**
      * Constructor
      *
+     * @param gui The gui.
      * @param unit The <code>Unit</code> to be animated. 
      * @param tile The <code>Tile</code> where the animation occurs.
      * @param animation The animation to show.
      */
-    public UnitImageAnimation(GUI gui, Unit unit, Tile tile,
+    public UnitImageAnimation(SwingGUI gui, Unit unit, Tile tile,
                               SimpleZippedAnimation animation, boolean mirror) {
         this.gui = gui;
         this.unit = unit;
diff --git a/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java b/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
index 706a9d804..0d23198d3 100644
--- a/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
+++ b/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
@@ -25,8 +25,9 @@ import java.awt.Rectangle;
 import javax.swing.JLabel;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.client.gui.OutForAnimationCallback;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Unit;
 
@@ -70,7 +71,7 @@ final class UnitMoveAnimation {
     public void animate() {
         final int movementSpeed
             = freeColClient.getAnimationSpeed(unit.getOwner());
-        final GUI gui = freeColClient.getGUI();
+        final SwingGUI gui = (SwingGUI)freeColClient.getGUI();
         final Point srcP = gui.getTilePosition(sourceTile);
         final Point dstP = gui.getTilePosition(destinationTile);
         
@@ -92,7 +93,8 @@ final class UnitMoveAnimation {
                         labelWidth, labelHeight, srcP);
                     final Point dstPoint = gui.calculateUnitLabelPositionInTile(
                         labelWidth, labelHeight, dstP);
-                    final double xratio = gui.getTileWidthHeightRatio();
+                    final double xratio = ImageLibrary.TILE_SIZE.width
+                                        / (double)ImageLibrary.TILE_SIZE.height;
                     final int stepX = (srcPoint.getX() == dstPoint.getX()) ? 0
                         : (srcPoint.getX() > dstPoint.getX()) ? -1 : 1;
                     final int stepY = (srcPoint.getY() == dstPoint.getY()) ? 0
diff --git a/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java b/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
index 5ad4f8e8d..bb27083ca 100644
--- a/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ConstructionPanel.java
@@ -111,7 +111,7 @@ public class ConstructionPanel extends MigPanel
                 addMouseListener(new MouseAdapter() {
                         @Override
                         public void mousePressed(MouseEvent e) {
-                            freeColClient.getGUI().showBuildQueuePanel(colony);
+                            ((SwingGUI)freeColClient.getGUI()).showBuildQueuePanel(colony);
                         }
                     });
             }
diff --git a/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java b/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
index dbca942c4..2bcc69204 100644
--- a/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
+++ b/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
@@ -48,8 +48,8 @@ import javax.swing.JPanel;
 import javax.swing.TransferHandler;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.ImageLibrary;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.AbstractGoods;
 import net.sf.freecol.common.model.Goods;
@@ -235,7 +235,7 @@ public final class DefaultTransferHandler extends TransferHandler {
 
     private final FreeColClient freeColClient;
 
-    private final GUI gui;
+    private final SwingGUI gui;
 
     private final FreeColPanel parentPanel;
 
@@ -249,7 +249,7 @@ public final class DefaultTransferHandler extends TransferHandler {
     public DefaultTransferHandler(FreeColClient freeColClient,
                                   FreeColPanel parentPanel) {
         this.freeColClient = freeColClient;
-        this.gui = freeColClient.getGUI();
+        this.gui = (SwingGUI)freeColClient.getGUI();
         this.parentPanel = parentPanel;
     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java b/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
index 141baf89f..e32e83ca1 100644
--- a/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
@@ -38,7 +38,7 @@ import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.ChoiceItem;
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.client.gui.plaf.FreeColComboBoxRenderer;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.IndianNationType;
@@ -206,7 +206,7 @@ public final class EditSettlementDialog extends FreeColDialog<IndianSettlement>
     @Override
     public IndianSettlement getResponse() {
         final Specification spec = freeColClient.getGame().getSpecification();
-        final GUI gui = freeColClient.getGUI();
+        final SwingGUI gui = getGUI();
         IndianSettlement ret = null;
         Set<Tile> tiles = settlement.getOwnedTiles();
         Object value = getValue();
@@ -264,8 +264,8 @@ public final class EditSettlementDialog extends FreeColDialog<IndianSettlement>
             ret = settlement;
 
         } else if (options.get(1).equals(value)) {
-            if (!getGUI().confirm("editSettlementDialog.removeSettlement.text", 
-                                  "ok", "cancel")) {
+            if (!gui.confirm("editSettlementDialog.removeSettlement.text", 
+                             "ok", "cancel")) {
                 return settlement;
             }
             // Dispose of units and settlement on tile
diff --git a/src/net/sf/freecol/client/gui/panel/NewPanel.java b/src/net/sf/freecol/client/gui/panel/NewPanel.java
index 4b503efd2..bd984457b 100644
--- a/src/net/sf/freecol/client/gui/panel/NewPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/NewPanel.java
@@ -43,7 +43,7 @@ import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.ConnectController;
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.client.gui.plaf.FreeColComboBoxRenderer;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.ServerInfo;
@@ -507,10 +507,9 @@ public final class NewPanel extends FreeColPanel
     @Override
     public void actionPerformed(ActionEvent event) {
         final ConnectController cc = getFreeColClient().getConnectController();
-        final GUI gui = getGUI();
+        final SwingGUI gui = getGUI();
         final String command = event.getActionCommand();
 
-        int port;
         switch (Enum.valueOf(NewPanelAction.class, command)) {
         case OK:
             FreeCol.setName(getSelectedName());
diff --git a/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java b/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
index 66c83af98..e73f1fa9f 100644
--- a/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
+++ b/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
@@ -43,8 +43,8 @@ import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
-import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.ImageLibrary;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.client.gui.panel.ColonyPanel.TilesPanel.ASingleTilePanel;
 import net.sf.freecol.client.gui.panel.UnitLabel.UnitAction;
 import net.sf.freecol.common.debug.FreeColDebugger;
@@ -83,7 +83,7 @@ public final class QuickActionMenu extends JPopupMenu {
 
     private final FreeColClient freeColClient;
 
-    private final GUI gui;
+    private final SwingGUI gui;
 
     private final FreeColPanel parentPanel;
 
@@ -97,7 +97,7 @@ public final class QuickActionMenu extends JPopupMenu {
     public QuickActionMenu(FreeColClient freeColClient,
                            FreeColPanel freeColPanel) {
         this.freeColClient = freeColClient;
-        this.gui = freeColClient.getGUI();
+        this.gui = (SwingGUI)freeColClient.getGUI();
         this.parentPanel = freeColPanel;
     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/StartGamePanel.java b/src/net/sf/freecol/client/gui/panel/StartGamePanel.java
index 6afa4a0f7..6ecef2b74 100644
--- a/src/net/sf/freecol/client/gui/panel/StartGamePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/StartGamePanel.java
@@ -31,10 +31,11 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.ScrollPaneConstants;
+
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.GUI;
+import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.GameOptions;
 import net.sf.freecol.common.model.Nation;
@@ -295,7 +296,7 @@ public final class StartGamePanel extends FreeColPanel {
     public void actionPerformed(ActionEvent event) {
         final String command = event.getActionCommand();
         final FreeColClient fcc = getFreeColClient();
-        final GUI gui = getGUI();
+        final SwingGUI gui = getGUI();
         try {
             switch (Integer.parseInt(command)) {
             case START:

From e49d4e3f15393c96499e364c27f60f516f7a26df Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 30 Aug 2015 09:53:28 +0200
Subject: [PATCH 150/323] Replace unnecessarily recursive call

---
 src/net/sf/freecol/client/gui/SwingGUI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 43294306d..43788d56c 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -952,7 +952,7 @@ public class SwingGUI extends GUI {
                 displayObject((FreeColObject)loc);
             }
         } else if (fco instanceof WorkLocation) {
-            displayObject(((WorkLocation)fco).getColony());
+            canvas.showColonyPanel(((WorkLocation)fco).getColony(), null);
         }
     }
 

From d230868dfbcab20f9958810741c9fe01cf926f79 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 30 Aug 2015 12:50:42 +0200
Subject: [PATCH 151/323] Move wrapper for SwingUtilities.invoke* to GUI, where
 they fit better

---
 src/net/sf/freecol/client/FreeColClient.java  | 35 +-------------
 .../client/control/InGameController.java      |  2 +-
 .../client/control/InGameInputHandler.java    | 48 +++++++++----------
 src/net/sf/freecol/client/gui/GUI.java        | 38 +++++++++++++++
 4 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/src/net/sf/freecol/client/FreeColClient.java b/src/net/sf/freecol/client/FreeColClient.java
index d20c105e6..1f0c037dd 100644
--- a/src/net/sf/freecol/client/FreeColClient.java
+++ b/src/net/sf/freecol/client/FreeColClient.java
@@ -21,9 +21,8 @@ package net.sf.freecol.client;
 
 import java.awt.Dimension;
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
+import java.io.InputStream;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
@@ -229,38 +228,6 @@ public final class FreeColClient {
             }
         }
     }
-
-    /**
-     * Wrapper for SwingUtilities.invokeAndWait that handles the case
-     * where we are already in the EDT.
-     *
-     * @param runnable A <code>Runnable</code> to run.
-     */
-    public void invokeAndWait(Runnable runnable) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            runnable.run();
-        } else {
-            try {
-                SwingUtilities.invokeAndWait(runnable);
-            } catch (InterruptedException|InvocationTargetException ex) {
-                logger.log(Level.WARNING, "Client GUI interaction", ex);
-            }
-        }
-    }
-
-    /**
-     * Wrapper for SwingUtilities.invokeLater that handles the case
-     * where we are already in the EDT.
-     *
-     * @param runnable A <code>Runnable</code> to run.
-     */
-    public void invokeLater(Runnable runnable) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            runnable.run();
-        } else {
-            SwingUtilities.invokeLater(runnable);
-        }
-    }
     
     /**
      * Starts the new <code>FreeColClient</code>, including the GUI.
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index de2eb9880..56e59e72d 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -763,7 +763,7 @@ public final class InGameController implements NetworkConstants {
                         }
                     };
             }
-            freeColClient.invokeAndWait(uiTask);
+            gui.invokeNowOrWait(uiTask);
         }
         return !messages.isEmpty();
     }
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index ca8434880..bb91561c3 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -79,7 +79,7 @@ import org.w3c.dom.NodeList;
  * ...except for the special case of the animations.  These have to be
  * done in series but are sometimes in the EDT (our unit moves) and
  * sometimes not (other nation unit moves).  Hence the hack
- * FreeColClient.invokeAndWait.
+ * GUI.invokeNowOrWait.
  */
 public final class InGameInputHandler extends InputHandler {
 
@@ -272,7 +272,7 @@ public final class InGameInputHandler extends InputHandler {
         final FreeColClient fcc = getFreeColClient();
         if (Boolean.TRUE.toString().equals(element.getAttribute("flush"))
             && fcc.currentPlayerIsMyPlayer()) {
-            fcc.invokeLater(displayModelMessagesRunnable);
+            fcc.getGUI().invokeNowOrLater(displayModelMessagesRunnable);
         }
         return reply;
     }
@@ -411,7 +411,7 @@ public final class InGameInputHandler extends InputHandler {
             = Boolean.parseBoolean(element.getAttribute("success"));
 
         // All is well, do the animation.
-        getFreeColClient().invokeAndWait(new Runnable() {
+        getGUI().invokeNowOrWait(new Runnable() {
                 @Override
                 public void run() {
                     igc().animateAttack(attacker, defender,
@@ -481,7 +481,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getFreeColClient().invokeAndWait(new Runnable() {
+        getGUI().invokeNowOrWait(new Runnable() {
                 @Override
                 public void run() {
                     igc().animateMove(unit, oldTile, newTile);
@@ -501,7 +501,7 @@ public final class InGameInputHandler extends InputHandler {
         final Game game = getGame();
         final ChatMessage chatMessage = new ChatMessage(game, element);
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().chat(chatMessage.getPlayer(game),
@@ -524,7 +524,7 @@ public final class InGameInputHandler extends InputHandler {
             = new ChooseFoundingFatherMessage(getGame(), element);
         final List<FoundingFather> ffs = message.getFathers();
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().chooseFoundingFather(ffs);
@@ -544,7 +544,7 @@ public final class InGameInputHandler extends InputHandler {
      * @return Null.
      */
     private Element closeMenus() {
-        getFreeColClient().invokeAndWait(closeMenusRunnable);
+        getGUI().invokeNowOrWait(closeMenusRunnable);
         return null;
     }
 
@@ -576,7 +576,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getFreeColClient().invokeAndWait(new Runnable() {
+        getGUI().invokeNowOrWait(new Runnable() {
                 @Override
                 public void run() {
                     message.setAgreement(igc().diplomacy(our, other,
@@ -627,7 +627,7 @@ public final class InGameInputHandler extends InputHandler {
         final String messageId = element.getAttribute("messageID");
         final String message = element.getAttribute("message");
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().error(messageId, message);
@@ -709,7 +709,7 @@ public final class InGameInputHandler extends InputHandler {
         }
         final int n = message.getSettlementCount();
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().firstContact(player, other, tile, n);
@@ -733,7 +733,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().fountainOfYouth(n);
@@ -762,7 +762,7 @@ public final class InGameInputHandler extends InputHandler {
         final String highScore = element.getAttribute("highScore");
 
         if (winner == freeColClient.getMyPlayer()) {
-            getFreeColClient().invokeLater(new Runnable() {
+            getGUI().invokeNowOrLater(new Runnable() {
                     @Override
                     public void run() {
                         igc().victory(highScore);
@@ -800,7 +800,7 @@ public final class InGameInputHandler extends InputHandler {
             throw new IllegalArgumentException("Demand to anothers colony");
         }
 
-        getFreeColClient().invokeAndWait(new Runnable() {
+        getGUI().invokeNowOrWait(new Runnable() {
                 @Override
                 public void run() {
                     boolean accepted = igc().indianDemand(unit, colony,
@@ -826,7 +826,7 @@ public final class InGameInputHandler extends InputHandler {
         final List<Goods> goods = message.getGoods();
         if (unit == null || goods == null) return null;
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().loot(unit, goods, defenderId);
@@ -847,7 +847,7 @@ public final class InGameInputHandler extends InputHandler {
         final MonarchActionMessage message
             = new MonarchActionMessage(game, element);
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().monarch(message.getAction(), message.getTemplate(),
@@ -895,7 +895,7 @@ public final class InGameInputHandler extends InputHandler {
         if (unit == null || defaultName == null 
             || !unit.hasTile()) return null;
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().newLandName(defaultName, unit);
@@ -920,7 +920,7 @@ public final class InGameInputHandler extends InputHandler {
         final String defaultName = message.getNewRegionName();
         if (defaultName == null || region == null) return null;
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().newRegionName(region, defaultName, tile, unit);
@@ -943,7 +943,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().newTurn(n);
@@ -962,7 +962,7 @@ public final class InGameInputHandler extends InputHandler {
     private Element reconnect(@SuppressWarnings("unused") Element element) {
         logger.finest("Entered reconnect.");
 
-        getFreeColClient().invokeLater(reconnectRunnable);
+        getGUI().invokeNowOrLater(reconnectRunnable);
         return null;
     }
 
@@ -994,7 +994,7 @@ public final class InGameInputHandler extends InputHandler {
         }
 
         if (!objects.isEmpty()) {
-            getFreeColClient().invokeLater(new Runnable() {
+            getGUI().invokeNowOrLater(new Runnable() {
                     @Override
                     public void run() {
                         igc().remove(objects, divert);
@@ -1036,7 +1036,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().setCurrentPlayer(player);
@@ -1060,7 +1060,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().setDead(player);
@@ -1097,7 +1097,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().setStance(stance, p1, p2);
@@ -1142,7 +1142,7 @@ public final class InGameInputHandler extends InputHandler {
         final Element fullElement = (Element)nodeList.item(0);
         final Element normalElement = (Element)nodeList.item(1);
         tile.readFromXMLElement(fullElement);
-        getFreeColClient().invokeLater(new Runnable() {
+        getGUI().invokeNowOrLater(new Runnable() {
                 @Override
                 public void run() {
                     igc().spyColony(tile, new Runnable() {
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 78efac430..4cc0dc216 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -25,11 +25,15 @@ import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.swing.SwingUtilities;
+
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController;
@@ -1478,4 +1482,38 @@ public class GUI {
         return freeColClient.getSoundController().getSoundMixerLabelText();
     }
 
+    // invoke method forwarding
+
+    /**
+     * Wrapper for SwingUtilities.invokeLater that handles the case
+     * where we are already in the EDT.
+     *
+     * @param runnable A <code>Runnable</code> to run.
+     */
+    public void invokeNowOrLater(Runnable runnable) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            runnable.run();
+        } else {
+            SwingUtilities.invokeLater(runnable);
+        }
+    }
+
+    /**
+     * Wrapper for SwingUtilities.invokeAndWait that handles the case
+     * where we are already in the EDT.
+     *
+     * @param runnable A <code>Runnable</code> to run.
+     */
+    public void invokeNowOrWait(Runnable runnable) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            runnable.run();
+        } else {
+            try {
+                SwingUtilities.invokeAndWait(runnable);
+            } catch (InterruptedException | InvocationTargetException ex) {
+                logger.log(Level.WARNING, "Client GUI interaction", ex);
+            }
+        }
+    }
+
 }

From d4017eae50d70767256e3fb586f6a21a82fbd50c Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 29 Aug 2015 13:17:23 +0930
Subject: [PATCH 152/323] Java 8 now required.

---
 build.xml                                 |  6 +++---
 doc/FreeCol.tex                           | 14 ++++++--------
 src/net/sf/freecol/client/gui/Canvas.java |  6 +++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index 70b1426af..31815c0ac 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
         the metaserver, distribution packages, running tests
         and creating documentation.
     </description>
-    <property name="java.target.version" value="1.7"/>
+    <property name="java.target.version" value="1.8"/>
     <property name="freecol.name" value="freecol"/>
     <property environment="env"/>
     <property name="freecol.data.dir" value="${basedir}/data"/>
@@ -338,7 +338,7 @@
                         <authors>
                             <author name="The FreeCol Team" email="developers@freecol.org" />
                         </authors>
-                        <javaversion>1.7</javaversion>
+                        <javaversion>1.8</javaversion>
                     </info>
                     <guiprefs width="640" height="480" resizable="no">
                         <laf name="looks">
@@ -476,7 +476,7 @@
                     mainclass="net.sf.freecol.FreeCol"
                     version="${freecol.version}"
                     vmoptions="-Xmx256M -Dapple.awt.fakefullscreen=true"
-                    jvmversion="1.7+"
+                    jvmversion="1.8+"
                     arguments="--windowed --freecol-data FreeCol.app/Contents/Resources/"
                     stubfile="${freecol.build.dir}/skeletons/FreeCol"
                     icon="${freecol.packaging.dir}/icons/FreeCol.icns">
diff --git a/doc/FreeCol.tex b/doc/FreeCol.tex
index fd98cc6ef..a1216f837 100644
--- a/doc/FreeCol.tex
+++ b/doc/FreeCol.tex
@@ -250,15 +250,13 @@ defined in the file to match the location of the freecol icon.
 \hypertarget{System Requirements}{\section{System Requirements}}
 
 FreeCol is written in Java. In order to run, it requires a Java
-Virtual Machine. In theory, FreeCol should run on any platform on
-which a Java Virtual Machine compatible with Sun Java 7 or higher is
-available. In practice, however, things are less clear cut.
+Virtual Machine.  FreeCol should run on any platform on which a Java
+Virtual Machine compatible with Sun Java 8 or higher is available.
 
-FreeCol is known to work with \href{http://java.sun.com/}{Oracle Java
-  7}. FreeCol also works with OpenJDK, although some minor problems
-and graphics glitches may remain. FreeCol is known to run on recent
-versions of Windows, Linux, and Mac OS X. If you are using FreeCol on
-a different platform, we would like to hear about it.
+FreeCol is known to work with \href{http://java.sun.com/}{Oracle Java}
+and \href{http://openjdk.java.net}{OpenJDK}. FreeCol is known to run on
+recent versions of Windows, Linux, and Mac OS X. If you are using
+FreeCol on a different platform, we would like to hear about it.
 
 FreeCol requires at least 256 MB memory, although some systems slow
 down badly and require 512MB.  FreeCol works best with a screen
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 509b0e848..b9659a9b8 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -2703,9 +2703,9 @@ public final class Canvas extends JDesktopPane {
         } catch (Exception e) {
             compact = false;
         }
-        ReportPanel r
-            = getExistingFreeColPanel((compact) ? ReportCompactColonyPanel.class
-                : ReportClassicColonyPanel.class);
+        ReportPanel r = (compact)
+            ? getExistingFreeColPanel(ReportCompactColonyPanel.class)
+            : getExistingFreeColPanel(ReportClassicColonyPanel.class);
         if (r == null) {
             showSubPanel((compact)
                 ? new ReportCompactColonyPanel(freeColClient)

From 8d7845fcd6afa9a2c742ca8e1851e9aa7f6d589a Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 29 Aug 2015 14:44:44 +0930
Subject: [PATCH 153/323] Convert functional ActionListerner creation to
 lambdas.

---
 src/net/sf/freecol/client/gui/MapViewer.java  |  11 +-
 .../sf/freecol/client/gui/menu/DebugMenu.java | 228 ++++++------------
 .../client/gui/menu/MapEditorMenuBar.java     |  33 ++-
 3 files changed, 94 insertions(+), 178 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 1ba8d6aa5..87f8c3972 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1028,9 +1028,8 @@ public final class MapViewer {
     void startCursorBlinking() {
         blinkingMarqueeEnabled = true;
 
-        ActionListener taskPerformer = new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent event) {
+        cursor = new net.sf.freecol.client.gui.TerrainCursor();
+        cursor.addActionListener((ActionEvent event) -> {
                 if (!blinkingMarqueeEnabled) return;
                 Unit unit = activeUnit;
                 if (unit != null) {
@@ -1039,11 +1038,7 @@ public final class MapViewer {
                         gui.refreshTile(tile);
                     }
                 }
-            }
-        };
-
-        cursor = new net.sf.freecol.client.gui.TerrainCursor();
-        cursor.addActionListener(taskPerformer);
+            });
         cursor.startBlinking();
     }
 
diff --git a/src/net/sf/freecol/client/gui/menu/DebugMenu.java b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
index ec9a4891a..c861336af 100644
--- a/src/net/sf/freecol/client/gui/menu/DebugMenu.java
+++ b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
@@ -21,7 +21,6 @@ package net.sf.freecol.client.gui.menu;
 
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.util.Map;
@@ -98,43 +97,34 @@ public class DebugMenu extends JMenu {
         sc.setOpaque(false);
         sc.setMnemonic(KeyEvent.VK_S);
         this.add(sc);
-        sc.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    boolean val = ((JCheckBoxMenuItem)e.getSource()).isSelected();
-                    FreeColDebugger.setDebugDisplayCoordinates(val);
-                    gui.refresh();
-                }
+        sc.addActionListener((ActionEvent e) -> {
+                boolean val = ((JCheckBoxMenuItem)e.getSource()).isSelected();
+                FreeColDebugger.setDebugDisplayCoordinates(val);
+                gui.refresh();
             });
         sc.setEnabled(true);
 
         final JMenuItem reveal
             = Utility.localizedCheckBoxMenuItem("menuBar.debug.revealEntireMap",
-                                            false);
+                                                false);
         reveal.setOpaque(false);
         reveal.setMnemonic(KeyEvent.VK_R);
         this.add(reveal);
-        reveal.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.revealMap(freeColClient, true);
-                    reveal.setEnabled(false);
-                }
+        reveal.addActionListener((ActionEvent e) -> {
+                DebugUtils.revealMap(freeColClient, true);
+                reveal.setEnabled(false);
             });
         reveal.setEnabled(hasServer);
 
         final JMenuItem hide
             = Utility.localizedCheckBoxMenuItem("menuBar.debug.hideEntireMap",
-                                            false);
+                                                false);
         hide.setOpaque(false);
         //hide.setMnemonic(KeyEvent.VK_R);
         this.add(hide);
-        hide.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.revealMap(freeColClient, false);
-                    hide.setEnabled(false);
-                }
+        hide.addActionListener((ActionEvent e) -> {
+                DebugUtils.revealMap(freeColClient, false);
+                hide.setEnabled(false);
             });
         hide.setEnabled(hasServer);
 
@@ -144,12 +134,9 @@ public class DebugMenu extends JMenu {
                 game.getMap().getSearchTrace());
         searchTrace.setOpaque(false);
         this.add(searchTrace);
-        searchTrace.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    boolean val = ((JCheckBoxMenuItem)e.getSource()).isSelected();
-                    game.getMap().setSearchTrace(val);
-                }
+        searchTrace.addActionListener((ActionEvent e) -> {
+                boolean val = ((JCheckBoxMenuItem)e.getSource()).isSelected();
+                game.getMap().setSearchTrace(val);
             });
 
         final JMenu cvpMenu
@@ -163,12 +150,9 @@ public class DebugMenu extends JMenu {
         cv1.setMnemonic(KeyEvent.VK_C);
         cvpMenu.add(cv1);
         bg.add(cv1);
-        cv1.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    FreeColDebugger.setDebugDisplayColonyValuePlayer(null);
-                    gui.refresh();
-                }
+        cv1.addActionListener((ActionEvent e) -> {
+                FreeColDebugger.setDebugDisplayColonyValuePlayer(null);
+                gui.refresh();
             });
         this.add(cvpMenu);
         cvpMenu.addSeparator();
@@ -181,12 +165,9 @@ public class DebugMenu extends JMenu {
             cvpMenu.add(cv2);
             bg.add(cv2);
             final Player fp = p;
-            cv2.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        FreeColDebugger.setDebugDisplayColonyValuePlayer(fp);
-                        gui.refresh();
-                    }
+            cv2.addActionListener((ActionEvent e) -> {
+                    FreeColDebugger.setDebugDisplayColonyValuePlayer(fp);
+                    gui.refresh();
                 });
         }
 
@@ -196,11 +177,8 @@ public class DebugMenu extends JMenu {
         skipTurns.setOpaque(false);
         skipTurns.setMnemonic(KeyEvent.VK_T);
         this.add(skipTurns);
-        skipTurns.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.skipTurns(freeColClient);
-                }
+        skipTurns.addActionListener((ActionEvent e) -> {
+                DebugUtils.skipTurns(freeColClient);
             });
         DebugUtils.addSkipChangeListener(freeColClient, this, skipTurns);
         skipTurns.setEnabled(hasServer);
@@ -209,11 +187,8 @@ public class DebugMenu extends JMenu {
         addBuilding.setOpaque(false);
         addBuilding.setMnemonic(KeyEvent.VK_B);
         this.add(addBuilding);
-        addBuilding.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.addBuildings(freeColClient, addBuilding.getText());
-                }
+        addBuilding.addActionListener((ActionEvent e) -> {
+                DebugUtils.addBuildings(freeColClient, addBuilding.getText());
             });
         addBuilding.setEnabled(hasServer);
 
@@ -221,11 +196,8 @@ public class DebugMenu extends JMenu {
         addFather.setOpaque(false);
         addFather.setMnemonic(KeyEvent.VK_F);
         this.add(addFather);
-        addFather.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.addFathers(freeColClient, addFather.getText());
-                }
+        addFather.addActionListener((ActionEvent e) -> {
+                DebugUtils.addFathers(freeColClient, addFather.getText());
             });
         addFather.setEnabled(hasServer);
 
@@ -233,11 +205,8 @@ public class DebugMenu extends JMenu {
         runMonarch.setOpaque(false);
         runMonarch.setMnemonic(KeyEvent.VK_M);
         this.add(runMonarch);
-        runMonarch.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.setMonarchAction(freeColClient, runMonarch.getText());
-                }
+        runMonarch.addActionListener((ActionEvent e) -> {
+                DebugUtils.setMonarchAction(freeColClient, runMonarch.getText());
             });
         runMonarch.setEnabled(hasServer);
 
@@ -245,11 +214,8 @@ public class DebugMenu extends JMenu {
         addGold.setOpaque(false);
         addGold.setMnemonic(KeyEvent.VK_G);
         this.add(addGold);
-        addGold.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.addGold(freeColClient);
-                }
+        addGold.addActionListener((ActionEvent e) -> {
+                DebugUtils.addGold(freeColClient);
             });
         addGold.setEnabled(hasServer);
 
@@ -257,11 +223,8 @@ public class DebugMenu extends JMenu {
         addCrosses.setOpaque(false);
         addCrosses.setMnemonic(KeyEvent.VK_I);
         this.add(addCrosses);
-        addCrosses.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.addImmigration(freeColClient);
-                }
+        addCrosses.addActionListener((ActionEvent e) -> {
+                DebugUtils.addImmigration(freeColClient);
             });
         addCrosses.setEnabled(hasServer);
 
@@ -269,11 +232,8 @@ public class DebugMenu extends JMenu {
         giveBells.setOpaque(false);
         giveBells.setMnemonic(KeyEvent.VK_L);
         this.add(giveBells);
-        giveBells.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.addLiberty(freeColClient);
-                }
+        giveBells.addActionListener((ActionEvent e) -> {
+                DebugUtils.addLiberty(freeColClient);
             });
         giveBells.setEnabled(hasServer);
 
@@ -282,11 +242,8 @@ public class DebugMenu extends JMenu {
         rng.setOpaque(false);
         rng.setMnemonic(KeyEvent.VK_X);
         this.add(rng);
-        rng.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.stepRNG(freeColClient);
-                }
+        rng.addActionListener((ActionEvent e) -> {
+                DebugUtils.stepRNG(freeColClient);
             });
         rng.setEnabled(hasServer);
 
@@ -294,11 +251,8 @@ public class DebugMenu extends JMenu {
         final JMenuItem du = Utility.localizedMenuItem("menuBar.debug.displayUnits");
         du.setOpaque(false);
         this.add(du);
-        du.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.displayUnits(freeColClient);
-                }
+        du.addActionListener((ActionEvent e) -> {
+                DebugUtils.displayUnits(freeColClient);
             });
         du.setEnabled(true);
 
@@ -308,21 +262,15 @@ public class DebugMenu extends JMenu {
         panelMenu.setOpaque(false);
 
         final JMenuItem monarchDialog = Utility.localizedMenuItem("menuBar.debug.displayMonarchPanel");
-        monarchDialog.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    gui.showMonarchDialog(Monarch.MonarchAction.RAISE_TAX_WAR,
-                        null, player.getMonarchKey());
-                }
+        monarchDialog.addActionListener((ActionEvent e) -> {
+                gui.showMonarchDialog(Monarch.MonarchAction.RAISE_TAX_WAR,
+                                      null, player.getMonarchKey());
             });
         panelMenu.add(monarchDialog);
 
         final JMenuItem errorMessage = Utility.localizedMenuItem("menuBar.debug.displayErrorMessage");
-        errorMessage.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    gui.showErrorMessage(ERROR_MESSAGE);
-                }
+        errorMessage.addActionListener((ActionEvent e) -> {
+                gui.showErrorMessage(ERROR_MESSAGE);
             });
         panelMenu.add(errorMessage);
 
@@ -332,11 +280,8 @@ public class DebugMenu extends JMenu {
         europeStatus.setOpaque(false);
         europeStatus.setMnemonic(KeyEvent.VK_E);
         this.add(europeStatus);
-        europeStatus.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.displayEurope(freeColClient);
-                }
+        europeStatus.addActionListener((ActionEvent e) -> {
+                DebugUtils.displayEurope(freeColClient);
             });
         europeStatus.setEnabled(hasServer);
 
@@ -349,14 +294,11 @@ public class DebugMenu extends JMenu {
         dam.setOpaque(false);
         dam.setMnemonic(KeyEvent.VK_A);
         this.add(dam);
-        dam.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    boolean val = ((JCheckBoxMenuItem) e.getSource()).isSelected();
-                    FreeColDebugger.setDebugShowMission(val);
-                    dami.setEnabled(val);
-                    gui.refresh();
-                }
+        dam.addActionListener((ActionEvent e) -> {
+                boolean val = ((JCheckBoxMenuItem) e.getSource()).isSelected();
+                FreeColDebugger.setDebugShowMission(val);
+                dami.setEnabled(val);
+                gui.refresh();
             });
         dam.setEnabled(true);
 
@@ -367,25 +309,19 @@ public class DebugMenu extends JMenu {
             Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
                 | InputEvent.ALT_MASK));
         this.add(useAI);
-        useAI.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.useAI(freeColClient);
-                }
+        useAI.addActionListener((ActionEvent e) -> {
+                DebugUtils.useAI(freeColClient);
             });
         useAI.setEnabled(hasServer);
 
         dami.setOpaque(false);
         dami.setMnemonic(KeyEvent.VK_I);
         this.add(dami);
-        dami.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    boolean val = ((JCheckBoxMenuItem) e.getSource()).isSelected();
-                    FreeColDebugger.setDebugShowMissionInfo(val);
-                    dami.setEnabled(val);
-                    gui.refresh();
-                }
+        dami.addActionListener((ActionEvent e) -> {
+                boolean val = ((JCheckBoxMenuItem) e.getSource()).isSelected();
+                FreeColDebugger.setDebugShowMissionInfo(val);
+                dami.setEnabled(val);
+                gui.refresh();
             });
         dami.setEnabled(FreeColDebugger.debugShowMissionInfo());
 
@@ -398,11 +334,8 @@ public class DebugMenu extends JMenu {
             Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
                 | InputEvent.ALT_MASK));
         this.add(compareMaps);
-        compareMaps.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    DebugUtils.checkDesyncAction(freeColClient);
-                }
+        compareMaps.addActionListener((ActionEvent e) -> {
+                DebugUtils.checkDesyncAction(freeColClient);
             });
         compareMaps.setEnabled(hasServer);
 
@@ -410,22 +343,19 @@ public class DebugMenu extends JMenu {
         showResourceKeys.setOpaque(false);
         //showResourceKeys.setMnemonic(KeyEvent.VK_R);
         this.add(showResourceKeys);
-        showResourceKeys.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    StringBuilder builder = new StringBuilder();
-                    Map<String, ImageResource> resources
-                        = ResourceManager.getImageResources();
-                    for (Entry<String, ImageResource> en
-                             : mapEntriesByKey(resources)) {
-                        builder.append(en.getKey());
-                        builder.append(" (");
-                        builder.append(en.getValue().getCount());
-                        builder.append(")");
-                        builder.append("\n");
-                    }
-                    gui.showInformationMessage(builder.toString());
+        showResourceKeys.addActionListener((ActionEvent e) -> {
+                StringBuilder builder = new StringBuilder();
+                Map<String, ImageResource> resources
+                    = ResourceManager.getImageResources();
+                for (Entry<String, ImageResource> en
+                         : mapEntriesByKey(resources)) {
+                    builder.append(en.getKey());
+                    builder.append(" (");
+                    builder.append(en.getValue().getCount());
+                    builder.append(")");
+                    builder.append("\n");
                 }
+                gui.showInformationMessage(builder.toString());
             });
         showResourceKeys.setEnabled(true);
 
@@ -434,11 +364,8 @@ public class DebugMenu extends JMenu {
         statistics.setOpaque(false);
         //statistics.setMnemonic(KeyEvent.VK_I);
         this.add(statistics);
-        statistics.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    gui.showStatisticsPanel();
-                }
+        statistics.addActionListener((ActionEvent e) -> {
+                gui.showStatisticsPanel();
             });
         statistics.setEnabled(true);
 
@@ -447,11 +374,8 @@ public class DebugMenu extends JMenu {
         gc.setOpaque(false);
         //gc.setMnemonic(KeyEvent.VK_G);
         this.add(gc);
-        gc.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    System.gc();
-                }
+        gc.addActionListener((ActionEvent e) -> {
+                System.gc();
             });
         gc.setEnabled(true);
 
diff --git a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
index 4a126f154..a14c62594 100644
--- a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
@@ -101,24 +101,21 @@ public class MapEditorMenuBar extends FreeColMenuBar {
         menu.add(getMenuItem(OpenAction.id));
         menu.add(getMenuItem(SaveAction.id));
         JMenuItem playItem = Utility.localizedMenuItem("startGame");
-        playItem.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    File startFile = FreeColDirectories.getStartMapFile();
-                    freeColClient.getMapEditorController()
-                        .saveGame(startFile);
-                    OptionGroup options = freeColClient.getGame()
-                        .getMapGeneratorOptions();
-                    FileOption fileOption = (FileOption)options
-                        .getOption(MapGeneratorOptions.IMPORT_FILE);
-                    fileOption.setValue(startFile);
-                    File mapOptionsFile = FreeColDirectories
-                        .getOptionsFile(FreeColDirectories.MAP_GENERATOR_OPTIONS_FILE_NAME);
-                    try {
-                        options.save(mapOptionsFile);
-                    } catch (FileNotFoundException fnfe) {}
-                    freeColClient.newGame(true);
-                }
+        playItem.addActionListener((ActionEvent event) -> {
+                File startFile = FreeColDirectories.getStartMapFile();
+                freeColClient.getMapEditorController()
+                    .saveGame(startFile);
+                OptionGroup options = freeColClient.getGame()
+                    .getMapGeneratorOptions();
+                FileOption fileOption = (FileOption)options
+                    .getOption(MapGeneratorOptions.IMPORT_FILE);
+                fileOption.setValue(startFile);
+                File mapOptionsFile = FreeColDirectories
+                    .getOptionsFile(FreeColDirectories.MAP_GENERATOR_OPTIONS_FILE_NAME);
+                try {
+                    options.save(mapOptionsFile);
+                } catch (FileNotFoundException fnfe) {}
+                freeColClient.newGame(true);
             });
         menu.add(playItem);
         menu.addSeparator();

From c5e816ddb0eb576e2d731a705e472a64c9723798 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 29 Aug 2015 14:58:52 +0930
Subject: [PATCH 154/323] Convert functional PropertyChangeListener creation to
 lambdas.

---
 src/net/sf/freecol/client/gui/SwingGUI.java   | 39 ++++++++-----------
 .../sf/freecol/common/sound/SoundPlayer.java  | 15 ++-----
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 43788d56c..ae9b90646 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -38,7 +38,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.image.BufferedImage;
 import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.InputStream;
 import java.util.List;
@@ -400,13 +399,10 @@ public class SwingGUI extends GUI {
             logger.info(pmoffscreen + " overrides client option: "
                 + pmoffscreenValue);
         }
-        usePixmaps.addPropertyChangeListener(new PropertyChangeListener() {
-                @Override
-                public void propertyChange(PropertyChangeEvent e) {
-                    String newValue = e.getNewValue().toString();
-                    System.setProperty(pmoffscreen, newValue);
-                    logger.info("Set " + pmoffscreen + " to: " + newValue);
-                }
+        usePixmaps.addPropertyChangeListener((PropertyChangeEvent e) -> {
+                String newValue = e.getNewValue().toString();
+                System.setProperty(pmoffscreen, newValue);
+                logger.info("Set " + pmoffscreen + " to: " + newValue);
             });
 
         this.mapViewer = new MapViewer(freeColClient);
@@ -417,21 +413,18 @@ public class SwingGUI extends GUI {
         // Now that there is a canvas, prepare for language changes.
         LanguageOption o = (LanguageOption)freeColClient.getClientOptions()
             .getOption(ClientOptions.LANGUAGE);
-        o.addPropertyChangeListener(new PropertyChangeListener() {
-                @Override
-                public void propertyChange(PropertyChangeEvent e) {
-                    Language language = (Language)e.getNewValue();
-                    logger.info("Set language to: " + language);
-                    if (Messages.AUTOMATIC.equalsIgnoreCase(language.getKey())) {
-                        showInformationMessage("info.autodetectLanguageSelected");
-                    } else {
-                        Locale l = language.getLocale();
-                        Messages.loadMessageBundle(l);
-                        Messages.loadModMessageBundle(l);
-                        showInformationMessage(StringTemplate
-                            .template("info.newLanguageSelected")
-                            .addName("%language%", l.getDisplayName()));
-                    }
+        o.addPropertyChangeListener((PropertyChangeEvent e) -> {
+                Language language = (Language)e.getNewValue();
+                logger.info("Set language to: " + language);
+                if (Messages.AUTOMATIC.equalsIgnoreCase(language.getKey())) {
+                    showInformationMessage("info.autodetectLanguageSelected");
+                } else {
+                    Locale l = language.getLocale();
+                    Messages.loadMessageBundle(l);
+                    Messages.loadModMessageBundle(l);
+                    showInformationMessage(StringTemplate
+                        .template("info.newLanguageSelected")
+                        .addName("%language%", l.getDisplayName()));
                 }
             });
 
diff --git a/src/net/sf/freecol/common/sound/SoundPlayer.java b/src/net/sf/freecol/common/sound/SoundPlayer.java
index b8ff33cb6..610a1467a 100644
--- a/src/net/sf/freecol/common/sound/SoundPlayer.java
+++ b/src/net/sf/freecol/common/sound/SoundPlayer.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.common.sound;
 
 import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -66,18 +65,12 @@ public class SoundPlayer {
         if (mixer == null) {
             throw new IllegalStateException("Mixer unavailable.");
         }
-        mixerOption.addPropertyChangeListener(new PropertyChangeListener() {
-                @Override
-                public void propertyChange(PropertyChangeEvent e) {
-                    setMixer((MixerWrapper)e.getNewValue());
-                }
+        mixerOption.addPropertyChangeListener((PropertyChangeEvent e) -> {
+                setMixer((MixerWrapper)e.getNewValue());
             });
         setVolume(volumeOption.getValue());
-        volumeOption.addPropertyChangeListener(new PropertyChangeListener() {
-                @Override
-                public void propertyChange(PropertyChangeEvent e) {
-                    setVolume((Integer)e.getNewValue());
-                }
+        volumeOption.addPropertyChangeListener((PropertyChangeEvent e) -> {
+                setVolume((Integer)e.getNewValue());
             });
         soundPlayerThread = new SoundPlayerThread();
         soundPlayerThread.start();

From 9321ceef0933298f79badb24a830ee1e0629421a Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 29 Aug 2015 14:20:47 +0930
Subject: [PATCH 155/323] Convert functional Runnable creation to lambdas.

---
 src/net/sf/freecol/client/FreeColClient.java  |  34 +--
 .../client/control/ConnectController.java     | 103 ++++-----
 .../client/control/InGameController.java      |  14 +-
 .../client/control/InGameInputHandler.java    | 209 ++++++------------
 .../freecol/client/control/InputHandler.java  |  15 +-
 .../client/control/MapEditorController.java   |  93 ++++----
 .../client/control/PreGameInputHandler.java   |   9 +-
 src/net/sf/freecol/client/gui/Canvas.java     |  16 +-
 .../sf/freecol/client/gui/ScrollThread.java   |  11 +-
 .../client/gui/menu/FreeColMenuTest.java      |   7 +-
 .../gui/panel/ReportCompactColonyPanel.java   |  14 +-
 .../client/gui/panel/TradeRoutePanel.java     |  52 ++---
 .../client/gui/video/VideoComponent.java      |   8 +-
 .../net/sf/freecol/client/WorkerCheck.java    |  21 +-
 14 files changed, 213 insertions(+), 393 deletions(-)

diff --git a/src/net/sf/freecol/client/FreeColClient.java b/src/net/sf/freecol/client/FreeColClient.java
index 1f0c037dd..b2a2db83e 100644
--- a/src/net/sf/freecol/client/FreeColClient.java
+++ b/src/net/sf/freecol/client/FreeColClient.java
@@ -282,40 +282,26 @@ public final class FreeColClient {
         //     NewPanel to a call to the connect controller to start a game)
         if (savedGame != null) {
             soundController.playSound("sound.intro.general");
-            SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (!connectController.startSavedGame(savedGame,
-                                                              userMsg)) {
-                            gui.showMainPanel(userMsg);
-                        }
+            SwingUtilities.invokeLater(() -> {
+                    if (!connectController.startSavedGame(savedGame, userMsg)) {
+                        gui.showMainPanel(userMsg);
                     }
                 });
         } else if (spec != null) { // Debug or fast start
             soundController.playSound("sound.intro.general");
-            SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (!connectController.startSinglePlayerGame(spec,
-                                                                     true)) {
-                            gui.showMainPanel(userMsg);
-                        }
+            SwingUtilities.invokeLater(() -> {
+                    if (!connectController.startSinglePlayerGame(spec, true)) {
+                        gui.showMainPanel(userMsg);
                     }
                 });
         } else if (showOpeningVideo) {
-            SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        gui.showOpeningVideo(userMsg);
-                    }
+            SwingUtilities.invokeLater(() -> {
+                    gui.showOpeningVideo(userMsg);
                 });
         } else {
             soundController.playSound("sound.intro.general");
-            SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        gui.showMainPanel(userMsg);
-                    }
+            SwingUtilities.invokeLater(() -> {
+                    gui.showMainPanel(userMsg);
                 });
         }
 
diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
index 52f1ded57..6b4c0fcf4 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -598,65 +598,58 @@ public final class ConnectController {
         gui.showStatusPanel(Messages.message("status.loadingGame"));
 
         final File theFile = file;
-        Runnable loadGameJob = new Runnable() {
-            @Override
-            public void run() {
-                FreeColServer freeColServer = null;
-                StringTemplate err = null;
-                try {
-                    final FreeColSavegameFile saveGame
-                        = new FreeColSavegameFile(theFile);
-                    freeColServer = new FreeColServer(saveGame,
-                        (Specification)null, port, name);
-                    freeColClient.setFreeColServer(freeColServer);
-                    // Server might have bounced to another port.
-                    freeColClient.setSinglePlayer(singlePlayer);
-                    freeColClient.getInGameController().setGameConnected();
-                    if (login(FreeCol.getName(), freeColServer.getHost(), 
-                              freeColServer.getPort())) {
-                        SwingUtilities.invokeLater(new Runnable() {
-                            @Override
-                            public void run() {
-                                ResourceManager.setScenarioMapping(saveGame.getResourceMapping());
-                                if (userMsg != null) gui.showInformationMessage(userMsg);
-                                gui.closeStatusPanel();
+        Runnable loadGameJob = () -> {
+            FreeColServer freeColServer = null;
+            StringTemplate err = null;
+            try {
+                final FreeColSavegameFile saveGame
+                    = new FreeColSavegameFile(theFile);
+                freeColServer = new FreeColServer(saveGame,
+                    (Specification)null, port, name);
+                freeColClient.setFreeColServer(freeColServer);
+                // Server might have bounced to another port.
+                freeColClient.setSinglePlayer(singlePlayer);
+                freeColClient.getInGameController().setGameConnected();
+                if (login(FreeCol.getName(), freeColServer.getHost(), 
+                        freeColServer.getPort())) {
+                    SwingUtilities.invokeLater(() -> {
+                            ResourceManager.setScenarioMapping(saveGame.getResourceMapping());
+                            if (userMsg != null) {
+                                gui.showInformationMessage(userMsg);
                             }
+                            gui.closeStatusPanel();
                         });
-                        return; // Success!
-                    }
-                    err = StringTemplate.key("server.couldNotLogin");
-                    logger.warning("Could not log in.");
-                } catch (FileNotFoundException e) {
-                    err = StringTemplate.key("server.fileNotFound");
-                    logger.log(Level.WARNING, "Can not find file.", e);
-                } catch (FreeColException e) {
-                    err = StringTemplate.name(e.getMessage());
-                    logger.log(Level.WARNING, "FreeCol error.", e);
-                } catch (IOException e) {
-                    err = StringTemplate.key("server.initialize");
-                    logger.log(Level.WARNING, "Error starting game.", e);
-                } catch (NoRouteToServerException e) {
-                    err = StringTemplate.key("server.noRouteToServer");
-                    logger.log(Level.WARNING, "No route to server.", e);
-                } catch (XMLStreamException e) {
-                    err = FreeCol.badLoad(theFile);
-                    logger.log(Level.WARNING, "Stream error.", e);
+                    return; // Success!
                 }
-                if (err != null) {
-                    // If this is a debug run, fail hard.
-                    if (freeColClient.isHeadless()
-                        || FreeColDebugger.getDebugRunTurns() >= 0) {
-                        FreeCol.fatal(Messages.message(err));
-                    }
-                    SwingUtilities.invokeLater(new Runnable() {
-                        @Override
-                            public void run() {
-                                gui.closeMainPanel();
-                                gui.showMainPanel(null);
-                            }
-                        });
-                    SwingUtilities.invokeLater(new ErrorJob(err));
+                err = StringTemplate.key("server.couldNotLogin");
+                logger.warning("Could not log in.");
+            } catch (FileNotFoundException e) {
+                err = StringTemplate.key("server.fileNotFound");
+                logger.log(Level.WARNING, "Can not find file.", e);
+            } catch (FreeColException e) {
+                err = StringTemplate.name(e.getMessage());
+                logger.log(Level.WARNING, "FreeCol error.", e);
+            } catch (IOException e) {
+                err = StringTemplate.key("server.initialize");
+                logger.log(Level.WARNING, "Error starting game.", e);
+            } catch (NoRouteToServerException e) {
+                err = StringTemplate.key("server.noRouteToServer");
+                logger.log(Level.WARNING, "No route to server.", e);
+            } catch (XMLStreamException e) {
+                err = FreeCol.badLoad(theFile);
+                logger.log(Level.WARNING, "Stream error.", e);
+            }
+            if (err != null) {
+                // If this is a debug run, fail hard.
+                if (freeColClient.isHeadless()
+                    || FreeColDebugger.getDebugRunTurns() >= 0) {
+                    FreeCol.fatal(Messages.message(err));
                 }
+                SwingUtilities.invokeLater(() -> {
+                        gui.closeMainPanel();
+                        gui.showMainPanel(null);
+                    });
+                SwingUtilities.invokeLater(new ErrorJob(err));
             }
         };
         freeColClient.setWork(loadGameJob);
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 56e59e72d..2b1a7e799 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -749,19 +749,9 @@ public final class InGameController implements NetworkConstants {
             Runnable uiTask;
             if (endOfTurn) {
                 turnReportMessages.addAll(messages);
-                uiTask = new Runnable() {
-                        @Override
-                        public void run() {
-                            displayTurnReportMessages();
-                        }
-                    };
+                uiTask = () -> { displayTurnReportMessages(); };
             } else {
-                uiTask = new Runnable() {
-                        @Override
-                        public void run() {
-                            gui.showModelMessages(messages);
-                        }
-                    };
+                uiTask = () -> { gui.showModelMessages(messages); };
             }
             gui.invokeNowOrWait(uiTask);
         }
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index bb91561c3..6d5bb8b95 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -86,24 +86,15 @@ public final class InGameInputHandler extends InputHandler {
     private static final Logger logger = Logger.getLogger(InGameInputHandler.class.getName());
 
     // A bunch of predefined non-closure runnables.
-    private final Runnable closeMenusRunnable = new Runnable() {
-            @Override
-            public void run() {
-                igc().closeMenus();
-            }
-        };
-    private final Runnable displayModelMessagesRunnable = new Runnable() {
-            @Override
-            public void run() {
-                igc().displayModelMessages(false);
-            }
-        };
-    private final Runnable reconnectRunnable = new Runnable() {
-            @Override
-            public void run() {
-                igc().reconnect();
-            }
-        };
+    private final Runnable closeMenusRunnable = () -> {
+        igc().closeMenus();
+    };
+    private final Runnable displayModelMessagesRunnable = () -> {
+        igc().displayModelMessages(false);
+    };
+    private final Runnable reconnectRunnable = () -> {
+        igc().reconnect();
+    };
 
 
     /**
@@ -125,6 +116,24 @@ public final class InGameInputHandler extends InputHandler {
         return getFreeColClient().getInGameController();
     }
 
+    /**
+     * Shorthand to run in the EDT and wait.
+     *
+     * @return runnable The <code>Runnable</code> to run.
+     */
+    private void invokeAndWait(Runnable runnable) {
+        getFreeColClient().getGUI().invokeNowOrWait(runnable);
+    }
+    
+    /**
+     * Shorthand to run in the EDT eventually.
+     *
+     * @return runnable The <code>Runnable</code> to run.
+     */
+    private void invokeLater(Runnable runnable) {
+        getFreeColClient().getGUI().invokeNowOrLater(runnable);
+    }
+    
     /**
      * Get the integer value of an element attribute.
      *
@@ -272,7 +281,7 @@ public final class InGameInputHandler extends InputHandler {
         final FreeColClient fcc = getFreeColClient();
         if (Boolean.TRUE.toString().equals(element.getAttribute("flush"))
             && fcc.currentPlayerIsMyPlayer()) {
-            fcc.getGUI().invokeNowOrLater(displayModelMessagesRunnable);
+            invokeLater(displayModelMessagesRunnable);
         }
         return reply;
     }
@@ -411,12 +420,9 @@ public final class InGameInputHandler extends InputHandler {
             = Boolean.parseBoolean(element.getAttribute("success"));
 
         // All is well, do the animation.
-        getGUI().invokeNowOrWait(new Runnable() {
-                @Override
-                public void run() {
-                    igc().animateAttack(attacker, defender,
-                        attackerTile, defenderTile, success);
-                }
+        invokeAndWait(() -> {
+                igc().animateAttack(attacker, defender,
+                                    attackerTile, defenderTile, success);
             });
         return null;
     }
@@ -481,12 +487,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getGUI().invokeNowOrWait(new Runnable() {
-                @Override
-                public void run() {
-                    igc().animateMove(unit, oldTile, newTile);
-                }
-            });
+        invokeAndWait(() -> { igc().animateMove(unit, oldTile, newTile); });
         return null;
     }
 
@@ -501,13 +502,9 @@ public final class InGameInputHandler extends InputHandler {
         final Game game = getGame();
         final ChatMessage chatMessage = new ChatMessage(game, element);
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().chat(chatMessage.getPlayer(game),
-                               chatMessage.getMessage(),
-                               chatMessage.isPrivate());
-                }
+        invokeLater(() -> {
+                igc().chat(chatMessage.getPlayer(game),
+                           chatMessage.getMessage(), chatMessage.isPrivate());
             });
         return null;
     }
@@ -524,12 +521,7 @@ public final class InGameInputHandler extends InputHandler {
             = new ChooseFoundingFatherMessage(getGame(), element);
         final List<FoundingFather> ffs = message.getFathers();
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().chooseFoundingFather(ffs);
-                }
-            });
+        invokeLater(() -> { igc().chooseFoundingFather(ffs); });
         return null;
     }
 
@@ -544,7 +536,7 @@ public final class InGameInputHandler extends InputHandler {
      * @return Null.
      */
     private Element closeMenus() {
-        getGUI().invokeNowOrWait(closeMenusRunnable);
+        invokeAndWait(closeMenusRunnable);
         return null;
     }
 
@@ -576,12 +568,8 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getGUI().invokeNowOrWait(new Runnable() {
-                @Override
-                public void run() {
-                    message.setAgreement(igc().diplomacy(our, other,
-                                                         agreement));
-                }
+        invokeAndWait(() -> {
+                message.setAgreement(igc().diplomacy(our, other, agreement));
             });
         return (message.getAgreement() == null) ? null
             : message.toXMLElement();
@@ -627,12 +615,7 @@ public final class InGameInputHandler extends InputHandler {
         final String messageId = element.getAttribute("messageID");
         final String message = element.getAttribute("message");
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().error(messageId, message);
-                }
-            });
+        invokeLater(() -> { igc().error(messageId, message); });
         return null;
     }
 
@@ -709,12 +692,7 @@ public final class InGameInputHandler extends InputHandler {
         }
         final int n = message.getSettlementCount();
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().firstContact(player, other, tile, n);
-                }
-            });
+        invokeLater(() -> { igc().firstContact(player, other, tile, n); });
         return null;
     }
 
@@ -733,12 +711,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().fountainOfYouth(n);
-                }
-            });
+        invokeLater(() -> { igc().fountainOfYouth(n); });
         return null;
     }
 
@@ -762,12 +735,7 @@ public final class InGameInputHandler extends InputHandler {
         final String highScore = element.getAttribute("highScore");
 
         if (winner == freeColClient.getMyPlayer()) {
-            getGUI().invokeNowOrLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        igc().victory(highScore);
-                    }
-                });
+            invokeLater(() -> { igc().victory(highScore); });
         }
         return null;
     }
@@ -800,13 +768,9 @@ public final class InGameInputHandler extends InputHandler {
             throw new IllegalArgumentException("Demand to anothers colony");
         }
 
-        getGUI().invokeNowOrWait(new Runnable() {
-                @Override
-                public void run() {
-                    boolean accepted = igc().indianDemand(unit, colony,
-                        message.getType(game), message.getAmount());
-                    message.setResult(accepted);
-                }
+        invokeAndWait(() -> {
+                message.setResult(igc().indianDemand(unit, colony,
+                        message.getType(game), message.getAmount()));
             });
         return message.toXMLElement();
     }
@@ -826,12 +790,7 @@ public final class InGameInputHandler extends InputHandler {
         final List<Goods> goods = message.getGoods();
         if (unit == null || goods == null) return null;
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().loot(unit, goods, defenderId);
-                }
-            });
+        invokeLater(() -> { igc().loot(unit, goods, defenderId); });
         return null;
     }
 
@@ -847,12 +806,9 @@ public final class InGameInputHandler extends InputHandler {
         final MonarchActionMessage message
             = new MonarchActionMessage(game, element);
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().monarch(message.getAction(), message.getTemplate(),
-                                  message.getMonarchKey());
-                }
+        invokeLater(() -> {
+                igc().monarch(message.getAction(), message.getTemplate(),
+                              message.getMonarchKey());
             });
         return null;
     }
@@ -895,12 +851,7 @@ public final class InGameInputHandler extends InputHandler {
         if (unit == null || defaultName == null 
             || !unit.hasTile()) return null;
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().newLandName(defaultName, unit);
-                }
-            });
+        invokeLater(() -> { igc().newLandName(defaultName, unit); });
         return null;
     }
 
@@ -920,11 +871,8 @@ public final class InGameInputHandler extends InputHandler {
         final String defaultName = message.getNewRegionName();
         if (defaultName == null || region == null) return null;
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().newRegionName(region, defaultName, tile, unit);
-                }
+        invokeLater(() -> {
+                igc().newRegionName(region, defaultName, tile, unit);
             });
         return null;
     }
@@ -943,12 +891,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().newTurn(n);
-                }
-            });
+        invokeLater(() -> { igc().newTurn(n); });
         return null;
     }
 
@@ -962,7 +905,7 @@ public final class InGameInputHandler extends InputHandler {
     private Element reconnect(@SuppressWarnings("unused") Element element) {
         logger.finest("Entered reconnect.");
 
-        getGUI().invokeNowOrLater(reconnectRunnable);
+        invokeLater(reconnectRunnable);
         return null;
     }
 
@@ -994,12 +937,7 @@ public final class InGameInputHandler extends InputHandler {
         }
 
         if (!objects.isEmpty()) {
-            getGUI().invokeNowOrLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        igc().remove(objects, divert);
-                    }
-                });
+            invokeLater(() -> { igc().remove(objects, divert); });
         }
         return null;
     }
@@ -1036,12 +974,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().setCurrentPlayer(player);
-                }
-            });
+        invokeLater(() -> { igc().setCurrentPlayer(player); });
         return null;
     }
 
@@ -1060,12 +993,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().setDead(player);
-                }
-            });
+        invokeLater(() -> { igc().setDead(player); });
         return null;
     }
 
@@ -1097,12 +1025,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().setStance(stance, p1, p2);
-                }
-            });
+        invokeLater(() -> { igc().setStance(stance, p1, p2); });
         return null;
     }
 
@@ -1142,16 +1065,10 @@ public final class InGameInputHandler extends InputHandler {
         final Element fullElement = (Element)nodeList.item(0);
         final Element normalElement = (Element)nodeList.item(1);
         tile.readFromXMLElement(fullElement);
-        getGUI().invokeNowOrLater(new Runnable() {
-                @Override
-                public void run() {
-                    igc().spyColony(tile, new Runnable() {
-                            @Override
-                            public void run() {
-                                tile.readFromXMLElement(normalElement);
-                            }
-                        });
-                }
+        invokeLater(() -> {
+                igc().spyColony(tile, () -> {
+                        tile.readFromXMLElement(normalElement);
+                    });
             });
         return null;
     }
diff --git a/src/net/sf/freecol/client/control/InputHandler.java b/src/net/sf/freecol/client/control/InputHandler.java
index 63c341522..da1b4aa77 100644
--- a/src/net/sf/freecol/client/control/InputHandler.java
+++ b/src/net/sf/freecol/client/control/InputHandler.java
@@ -101,15 +101,12 @@ public abstract class InputHandler implements MessageHandler {
      */
     protected Element disconnect(Element element) {
         // Updating the GUI should always be done in the EDT:
-        javax.swing.SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    if (getGUI().containsInGameComponents()) {
-                        if (freeColClient.getFreeColServer() == null) {
-                            getGUI().returnToTitle();
-                        } else {
-                            getGUI().removeInGameComponents();
-                        }
+        javax.swing.SwingUtilities.invokeLater(() -> {
+                if (getGUI().containsInGameComponents()) {
+                    if (freeColClient.getFreeColServer() == null) {
+                        getGUI().returnToTitle();
+                    } else {
+                        getGUI().removeInGameComponents();
                     }
                 }
             });
diff --git a/src/net/sf/freecol/client/control/MapEditorController.java b/src/net/sf/freecol/client/control/MapEditorController.java
index 54b945c1d..1e9ea5aca 100644
--- a/src/net/sf/freecol/client/control/MapEditorController.java
+++ b/src/net/sf/freecol/client/control/MapEditorController.java
@@ -220,19 +220,13 @@ public final class MapEditorController {
                         BufferedImage thumb = gui.createMiniMapThumbNail();
                         freeColClient.getFreeColServer()
                             .saveMapEditorGame(file, thumb);
-                        SwingUtilities.invokeLater(new Runnable() {
-                                @Override
-                                public void run() {
-                                    gui.closeStatusPanel();
-                                    gui.requestFocusInWindow();
-                                }
+                        SwingUtilities.invokeLater(() -> {
+                                gui.closeStatusPanel();
+                                gui.requestFocusInWindow();
                             });
                     } catch (IOException e) {
-                        SwingUtilities.invokeLater(new Runnable() {
-                                @Override
-                                public void run() {
-                                    gui.showErrorMessage(FreeCol.badSave(file));
-                                }
+                        SwingUtilities.invokeLater(() -> {
+                                gui.showErrorMessage(FreeCol.badSave(file));
                             });
                     }
                 }
@@ -291,54 +285,43 @@ public final class MapEditorController {
 
         gui.showStatusPanel(Messages.message("status.loadingGame"));
 
-        Runnable loadGameJob = new Runnable() {
-                @Override
-                public void run() {
-                    FreeColServer freeColServer
-                        = freeColClient.getFreeColServer();
-                    try {
-                        Specification spec = getDefaultSpecification();
-                        Game game = FreeColServer.readGame(new FreeColSavegameFile(theFile),
-                            spec, freeColServer);
-                        freeColClient.setGame(game);
-                        requireNativeNations(game);
-                        SwingUtilities.invokeLater(new Runnable() {
-                            @Override
-                                public void run() {
-                                    gui.closeStatusPanel();
-                                    gui.setFocus(freeColClient.getGame()
-                                        .getMap().getTile(1,1));
-                                    gui.updateMenuBar();
-                                    gui.refresh();
-                                }
-                            });
-                    } catch (FreeColException e) {
-                        reloadMainPanel();
-                        SwingUtilities.invokeLater(new ErrorJob(StringTemplate.name(e.getMessage())));
-                    } catch (FileNotFoundException e) {
-                        reloadMainPanel();
-                        SwingUtilities.invokeLater(new ErrorJob(StringTemplate.key("server.fileNotFound")));
-                    } catch (IOException e) {
-                        reloadMainPanel();
-                        SwingUtilities.invokeLater(new ErrorJob(StringTemplate.key("server.initialize")));
-                    } catch (XMLStreamException e) {
-                        reloadMainPanel();
-                        SwingUtilities.invokeLater(new ErrorJob(FreeCol.badLoad(theFile)));
-                    }
-                }
-            };
+        Runnable loadGameJob = () -> {
+            FreeColServer freeColServer = freeColClient.getFreeColServer();
+            try {
+                Specification spec = getDefaultSpecification();
+                Game game = FreeColServer.readGame(new FreeColSavegameFile(theFile),
+                                                   spec, freeColServer);
+                freeColClient.setGame(game);
+                requireNativeNations(game);
+                SwingUtilities.invokeLater(() -> {
+                        gui.closeStatusPanel();
+                        gui.setFocus(freeColClient.getGame().getMap().getTile(1,1));
+                        gui.updateMenuBar();
+                        gui.refresh();
+                    });
+            } catch (FreeColException e) {
+                reloadMainPanel();
+                SwingUtilities.invokeLater(new ErrorJob(StringTemplate.name(e.getMessage())));
+            } catch (FileNotFoundException e) {
+                reloadMainPanel();
+                SwingUtilities.invokeLater(new ErrorJob(StringTemplate.key("server.fileNotFound")));
+            } catch (IOException e) {
+                reloadMainPanel();
+                SwingUtilities.invokeLater(new ErrorJob(StringTemplate.key("server.initialize")));
+            } catch (XMLStreamException e) {
+                reloadMainPanel();
+                SwingUtilities.invokeLater(new ErrorJob(FreeCol.badLoad(theFile)));
+            }
+        };
         freeColClient.setWork(loadGameJob);
     }
 
     private void reloadMainPanel () {
-        SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    gui.closeMainPanel();
-                    gui.showMainPanel(null);
-                    freeColClient.getSoundController()
-                        .playSound("sound.intro.general");
-                }
+        SwingUtilities.invokeLater(() -> {
+                gui.closeMainPanel();
+                gui.showMainPanel(null);
+                freeColClient.getSoundController()
+                    .playSound("sound.intro.general");
             });
     }
 }
diff --git a/src/net/sf/freecol/client/control/PreGameInputHandler.java b/src/net/sf/freecol/client/control/PreGameInputHandler.java
index 514389ad8..1e9e309d2 100644
--- a/src/net/sf/freecol/client/control/PreGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/PreGameInputHandler.java
@@ -283,12 +283,9 @@ public final class PreGameInputHandler extends InputHandler {
                         } catch (Exception ex) {}
                     }
                     
-                    SwingUtilities.invokeLater(new Runnable() {
-                            @Override
-                            public void run() {
-                                getFreeColClient().getPreGameController()
-                                    .startGame();
-                            }
+                    SwingUtilities.invokeLater(() -> {
+                            getFreeColClient().getPreGameController()
+                                .startGame();
                         });
                 }
             }.start();
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index b9659a9b8..2c1fd1f61 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -1174,12 +1174,9 @@ public final class Canvas extends JDesktopPane {
                         T ret = type.cast(c2);
                         if (ret != null) {
                             final JInternalFrame jif = (JInternalFrame)c1;
-                            SwingUtilities.invokeLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        jif.toFront();
-                                        jif.repaint();
-                                    }
+                            SwingUtilities.invokeLater(() -> {
+                                    jif.toFront();
+                                    jif.repaint();
                                 });
                             return ret;
                         }
@@ -1924,12 +1921,7 @@ public final class Canvas extends JDesktopPane {
         EuropePanel panel = getExistingFreeColPanel(EuropePanel.class);
         if (panel == null) {
             panel = new EuropePanel(freeColClient, this);
-            panel.addClosingCallback(new Runnable() {
-                    @Override
-                    public void run() {
-                        removeEuropeanSubpanels();
-                    }
-                });
+            panel.addClosingCallback(() -> { removeEuropeanSubpanels(); });
             showSubPanel(panel, true);
         }
     }
diff --git a/src/net/sf/freecol/client/gui/ScrollThread.java b/src/net/sf/freecol/client/gui/ScrollThread.java
index d94e9ad6a..b885d50af 100644
--- a/src/net/sf/freecol/client/gui/ScrollThread.java
+++ b/src/net/sf/freecol/client/gui/ScrollThread.java
@@ -74,14 +74,9 @@ public class ScrollThread extends Thread {
     public void run() {
         while (direction != null) {
             try {
-                SwingUtilities.invokeAndWait(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (!canvas.scrollMap(direction)) {
-                            direction = null;
-                        }
-                    }
-                });
+                SwingUtilities.invokeAndWait(() -> {
+                        if (!canvas.scrollMap(direction)) direction = null;
+                    });
             } catch (InvocationTargetException e) {
                 logger.log(Level.WARNING, "Scroll thread caught error", e);
                 break;
diff --git a/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java b/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
index 6e065fe0b..d043f5c9c 100644
--- a/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
+++ b/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
@@ -154,11 +154,6 @@ public class FreeColMenuTest implements ActionListener, ItemListener {
     public static void main(String[] args) {
         //Schedule a job for the event-dispatching thread:
         //creating and showing this application's GUI.
-        javax.swing.SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                createAndShowGUI();
-            }
-        });
+        javax.swing.SwingUtilities.invokeLater(() -> { createAndShowGUI(); });
     }
 }
diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index 40a6d7812..856b1ae31 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -1124,24 +1124,14 @@ public final class ReportCompactColonyPanel extends ReportPanel
             command = command.substring(BUILDQUEUE.length());
             Colony colony = game.getFreeColGameObject(command, Colony.class);
             if (colony != null) {
-                getGUI().showBuildQueuePanel(colony, new Runnable() {
-                        @Override
-                        public void run() {
-                            update();
-                        }
-                    });
+                getGUI().showBuildQueuePanel(colony, () -> { update(); });
                 return;
             }
         } else {
             Colony colony = game.getFreeColGameObject(command, Colony.class);
             if (colony != null) {
                 getGUI().showColonyPanel2(colony, null)
-                    .addClosingCallback(new Runnable() {
-                            @Override
-                            public void run() {
-                                update();
-                            }
-                        });
+                    .addClosingCallback(() -> { update(); });
                 return;
             }
         }
diff --git a/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java b/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
index 0d00dc853..a8cda5250 100644
--- a/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
@@ -154,19 +154,15 @@ public final class TradeRoutePanel extends FreeColPanel {
                     final TradeRoute selected
                         = tradeRoutes.getSelectedValue();
                     final String name = selected.getName();
-                    getGUI().showTradeRouteInputPanel(selected,
-                        new Runnable() {
-                            @Override
-                            public void run() {
-                                StringTemplate template = null;
-                                if (selected.getName() == null) { // Cancelled
-                                    selected.setName(name);
-                                } else if ((template = selected.verify()) == null) {
-                                    igc().updateTradeRoute(selected);
-                                    updateList(selected);
-                                } else {
-                                    getGUI().showInformationMessage(template);
-                                }
+                    getGUI().showTradeRouteInputPanel(selected, () -> {
+                            StringTemplate template = null;
+                            if (selected.getName() == null) { // Cancelled
+                                selected.setName(name);
+                            } else if ((template = selected.verify()) == null) {
+                                igc().updateTradeRoute(selected);
+                                updateList(selected);
+                            } else {
+                                getGUI().showInformationMessage(template);
                             }
                         });
                 }
@@ -240,24 +236,18 @@ public final class TradeRoutePanel extends FreeColPanel {
         final Player player = getMyPlayer();
         final Unit u = this.unit;
         final TradeRoute newRoute = igc().getNewTradeRoute(player);
-        getGUI().showTradeRouteInputPanel(newRoute,
-            new Runnable() {
-                @Override
-                public void run() {
-                    StringTemplate template = null;
-                    if (newRoute.getName() == null) { // Cancelled
-                        deleteTradeRoute(newRoute);
-                        updateList(null);
-                    } else {
-                        if ((template = newRoute.verify()) == null) {
-                            igc().updateTradeRoute(newRoute);
-                            if (u != null) igc().assignTradeRoute(u, newRoute);
-                            updateList(newRoute);
-                        } else {
-                            updateList(null);
-                            getGUI().showInformationMessage(template);
-                        }
-                    }
+        getGUI().showTradeRouteInputPanel(newRoute, () -> {
+                StringTemplate template = null;
+                if (newRoute.getName() == null) { // Cancelled
+                    deleteTradeRoute(newRoute);
+                    updateList(null);
+                } else if ((template = newRoute.verify()) == null) {
+                    igc().updateTradeRoute(newRoute);
+                    if (u != null) igc().assignTradeRoute(u, newRoute);
+                    updateList(newRoute);
+                } else {
+                    updateList(null);
+                    getGUI().showInformationMessage(template);
                 }
             });
     }
diff --git a/src/net/sf/freecol/client/gui/video/VideoComponent.java b/src/net/sf/freecol/client/gui/video/VideoComponent.java
index 446cc27d2..dc73e11d6 100644
--- a/src/net/sf/freecol/client/gui/video/VideoComponent.java
+++ b/src/net/sf/freecol/client/gui/video/VideoComponent.java
@@ -78,11 +78,9 @@ public class VideoComponent extends JPanel {
         // Disable the feature that seems to be missing from the stock Cortado
         //applet.setStopListener(new StopListener() {
         //    public void stopped() {
-        //        SwingUtilities.invokeLater(new Runnable() {
-        //            public void run() {
-        //                for (VideoListener sl : videoListeners) {
-        //                    sl.stopped();
-        //                }
+        //        SwingUtilities.invokeLater(() -> {
+        //            for (VideoListener sl : videoListeners) {
+        //                sl.stopped();
         //            }
         //        });
         //    }
diff --git a/test/src/net/sf/freecol/client/WorkerCheck.java b/test/src/net/sf/freecol/client/WorkerCheck.java
index b5a46840a..c98daf7c2 100644
--- a/test/src/net/sf/freecol/client/WorkerCheck.java
+++ b/test/src/net/sf/freecol/client/WorkerCheck.java
@@ -53,18 +53,15 @@ public final class WorkerCheck {
         textArea = new JTextArea( 10, 40 );
         textArea.setEditable( false );
 
-        final Runnable  workerJob = new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    SwingUtilities.invokeLater( new TestJob("starting the job\n", false) );
-                    SwingUtilities.invokeLater( new TestJob("working.  check that the AWT thread can repaint this window\n", false) );
-                    // this example sleeps, but time-consuming work could be done
-                    Thread.sleep( 7000 );
-                    SwingUtilities.invokeLater( new TestJob("the job is done\n", true) );
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
+        final Runnable workerJob = () -> {
+            try {
+                SwingUtilities.invokeLater( new TestJob("starting the job\n", false) );
+                SwingUtilities.invokeLater( new TestJob("working.  check that the AWT thread can repaint this window\n", false) );
+                // this example sleeps, but time-consuming work could be done
+                Thread.sleep( 7000 );
+                SwingUtilities.invokeLater( new TestJob("the job is done\n", true) );
+            } catch (InterruptedException e) {
+                e.printStackTrace();
             }
         };
 

From 7e0c14e2c339e94314d37e1643cfca610e627a02 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 30 Aug 2015 15:54:18 +0200
Subject: [PATCH 156/323] Reorganize ReportTurnPanel.getHeadline to avoid type
 testing

---
 .../client/gui/panel/ReportTurnPanel.java     | 77 +++++++++----------
 1 file changed, 35 insertions(+), 42 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
index 229603667..4cb18927e 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
@@ -19,6 +19,7 @@
 
 package net.sf.freecol.client.gui.panel;
 
+import java.awt.Font;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -124,7 +125,7 @@ public final class ReportTurnPanel extends ReportPanel {
                 FreeColGameObject messageSource = game.getMessageSource(message);
                 if (messageSource != source) {
                     source = messageSource;
-                    reportPanel.add(getHeadline(source), "newline 20, skip");
+                    reportPanel.add(getHeadline(messageSource), "newline 20, skip");
                 }
                 break;
             case ClientOptions.MESSAGES_GROUP_BY_TYPE:
@@ -249,68 +250,60 @@ public final class ReportTurnPanel extends ReportPanel {
         }
     }
 
-    private JComponent getHeadline(Object source) {
-        JComponent headline;
+    private JComponent getHeadline(FreeColGameObject source) {
+        String text;
+        String commandId = null;
         if (source == null) {
-            return new JLabel();
+            text = "";
         } else if (source instanceof Player) {
             Player player = (Player) source;
-            headline = Utility.localizedLabel(StringTemplate
+            StringTemplate template = StringTemplate
                 .template("report.turn.playerNation")
                 .addName("%player%", player.getName())
-                .addStringTemplate("%nation%", player.getNationLabel()));
+                .addStringTemplate("%nation%", player.getNationLabel());
+            text = Messages.message(template);
         } else if (source instanceof Europe) {
             Europe europe = (Europe) source;
-            JButton button = new JButton(Messages.getName(europe));
-            button.addActionListener(this);
-            button.setActionCommand(europe.getId());
-            headline = button;
+            text = Messages.getName(europe);
+            commandId = europe.getId();
         } else if (source instanceof Market) {
             Market market = (Market) source;
-            JButton button = Utility.localizedButton(market.getOwner().getMarketName());
-            button.addActionListener(this);
-            button.setActionCommand(getMyPlayer().getEurope().getId());
-            headline = button;
+            StringTemplate template = market.getOwner().getMarketName();
+            text = Messages.message(template);
+            commandId = getMyPlayer().getEurope().getId();
         } else if (source instanceof Colony) {
             final Colony colony = (Colony) source;
-            JButton button = new JButton(colony.getName());
-            button.addActionListener(this);
-            button.setActionCommand(colony.getId());
-            headline = button;
+            text = colony.getName();
+            commandId = colony.getId();
         } else if (source instanceof Unit) {
             final Unit unit = (Unit) source;
-            JButton button
-                = new JButton(unit.getDescription(Unit.UnitLabelType.NATIONAL));
-            button.addActionListener(this);
-            button.setActionCommand(unit.getLocation().getId());
-            headline = button;
+            text = unit.getDescription(Unit.UnitLabelType.NATIONAL);
+            commandId = unit.getLocation().getId();
         } else if (source instanceof Tile) {
             final Tile tile = (Tile) source;
-            JButton button = Utility.localizedButton(tile.getLocationLabelFor(getMyPlayer()));
-            button.addActionListener(this);
-            button.setActionCommand(tile.getId());
-            headline = button;
+            StringTemplate template = tile.getLocationLabelFor(getMyPlayer());
+            text = Messages.message(template);
+            commandId = tile.getId();
         } else if (source instanceof Nameable) {
-            headline = new JLabel(((Nameable) source).getName());
+            text = ((Nameable) source).getName();
         } else {
-            headline = new JLabel(source.toString());
+            text = source.toString();
         }
 
-        // FIXME: Get text before putting it inside and remove type testing.
-        String text;
-        if(headline instanceof JLabel)
-            text = ((JLabel)headline).getText();
-        else if(headline instanceof JButton)
-            text = ((JButton)headline).getText();
-        else {
-            text = "";
-            logger.warning("Unknown JComponent");
+        Font font = FontLibrary.createCompatibleFont(text,
+            FontLibrary.FontType.HEADER, FontLibrary.FontSize.SMALL);
+        JComponent headline;
+        if(commandId != null) {
+            JButton button = new JButton(text);
+            button.addActionListener(this);
+            button.setActionCommand(commandId);
+            headline = button;
+            headline.setForeground(Utility.LINK_COLOR);
+        } else {
+            headline = new JLabel(text);
         }
-
-        headline.setFont(FontLibrary.createCompatibleFont(text,
-            FontLibrary.FontType.HEADER, FontLibrary.FontSize.SMALL));
+        headline.setFont(font);
         headline.setOpaque(false);
-        headline.setForeground(Utility.LINK_COLOR);
         headline.setBorder(Utility.blankBorder(5, 0, 0, 0));
         return headline;
     }

From 859a4246bba49b0a3308b2995985083c0534d1f3 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 30 Aug 2015 16:14:41 +0200
Subject: [PATCH 157/323] Update developer.tex to reflect Java 1.8 requirement

---
 doc/developer.tex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/developer.tex b/doc/developer.tex
index bf8587f00..c59d1df72 100644
--- a/doc/developer.tex
+++ b/doc/developer.tex
@@ -283,9 +283,9 @@ and launch the game right away. Enjoy.
 We have a NetBeans project with updated settings, but it is not at the
 standard location the IDE expects it at, as the IDE gets slower while a
 large project, like FreeCol, is open.
-NetBeans (currently on version 8.02) also, for a long time, contains a bug
+NetBeans (currently on version 8.0.2) also, for a long time, contains a bug
 in that it wont read or write the editor setting for the Java version, if it
-was correctly set to 1.7.
+was correctly set to 1.8.
 It is therefore set to 1.5 in the project file and causes the Editor to show a
 huge amount of wrong compatibility warnings, though compilation is not affected.
 
@@ -300,7 +300,7 @@ you do not close the project manually.
 Each time you open the IDE right click on the ``FreeCol'' project name inside
 the ``Projects'' panel, choose ``Properties'', then from the opened dialog choose
 ``Java Sources'' on the tree part, then change the ``Source Level'' setting to
-``JDK 1.7'' and click the ``OK'' button. This is necessary every time, until
+``JDK 1.8'' and click the ``OK'' button. This is necessary every time, until
 the NetBeans bug got fixed!
 
 \hypertarget{Creating a new NetBeans project}{\subsection{Creating a new NetBeans project (thanks to ``xsainnz'')}}

From 796bb76856cf74d2d1e5fd29e4cf53aa8e67deb2 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 30 Aug 2015 16:29:47 +0200
Subject: [PATCH 158/323] Update README to reflect Java 1.8 requirement

---
 packaging/common/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/common/README b/packaging/common/README
index 080bf3971..1e49f0bc5 100644
--- a/packaging/common/README
+++ b/packaging/common/README
@@ -14,7 +14,7 @@ VI.  About
 I.   Requirements
 =================================
 The program is written in Java. It can be ran with any Java
-Runtime Environment (JRE) that is at least version 1.7.
+Runtime Environment (JRE) that is at least version 1.8.
 The JRE (or JVM) can be downloaded from:
 http://java.sun.com/getjava/download.html
 

From 8d2c2edf743c4a7012feb64257b0e069bdf014d5 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 30 Aug 2015 16:30:27 +0200
Subject: [PATCH 159/323] Update jsmooth config to reflect Java 1.8 requirement

---
 build/installer.jsmooth   | 2 +-
 build/startup.jsmooth     | 2 +-
 build/uninstaller.jsmooth | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/installer.jsmooth b/build/installer.jsmooth
index 1f1e4b57e..48c4e8e4e 100644
--- a/build/installer.jsmooth
+++ b/build/installer.jsmooth
@@ -19,7 +19,7 @@
     <mainClassName>com.izforge.izpack.installer.Installer</mainClassName>
     <maximumMemoryHeap>268435456</maximumMemoryHeap>
     <maximumVersion></maximumVersion>
-    <minimumVersion>1.7</minimumVersion>
+    <minimumVersion>1.8</minimumVersion>
     <skeletonName>Windowed Wrapper</skeletonName>
     <skeletonProperties>
         <key>Message</key>
diff --git a/build/startup.jsmooth b/build/startup.jsmooth
index 042092a88..2abfeb8c3 100644
--- a/build/startup.jsmooth
+++ b/build/startup.jsmooth
@@ -23,7 +23,7 @@
     <mainClassName>net.sf.freecol.FreeCol</mainClassName>
     <maximumMemoryHeap>536870912</maximumMemoryHeap>
     <maximumVersion></maximumVersion>
-    <minimumVersion>1.7</minimumVersion>
+    <minimumVersion>1.8</minimumVersion>
     <skeletonName>Windowed Wrapper</skeletonName>
     <skeletonProperties>
         <key>Message</key>
diff --git a/build/uninstaller.jsmooth b/build/uninstaller.jsmooth
index 838b559d5..e9bef7f74 100644
--- a/build/uninstaller.jsmooth
+++ b/build/uninstaller.jsmooth
@@ -19,7 +19,7 @@
     <mainClassName>com.izforge.izpack.uninstaller.Uninstaller</mainClassName>
     <maximumMemoryHeap>-1</maximumMemoryHeap>
     <maximumVersion></maximumVersion>
-    <minimumVersion>1.7</minimumVersion>
+    <minimumVersion>1.8</minimumVersion>
     <skeletonName>Windowed Wrapper</skeletonName>
     <skeletonProperties>
         <key>Message</key>

From 3e1a791106844649762d2b69707768e23a86ba2d Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 31 Aug 2015 10:15:15 +0200
Subject: [PATCH 160/323] Sort the menu such that its order is same as the
 Colopedia itself

---
 src/net/sf/freecol/client/gui/action/ColopediaAction.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/action/ColopediaAction.java b/src/net/sf/freecol/client/gui/action/ColopediaAction.java
index a0a23b734..4a1945e3c 100644
--- a/src/net/sf/freecol/client/gui/action/ColopediaAction.java
+++ b/src/net/sf/freecol/client/gui/action/ColopediaAction.java
@@ -33,8 +33,9 @@ public class ColopediaAction extends FreeColAction {
 
     public static final String id = "colopediaAction.";
 
+    // Order of elements will influence ingame order of menu items.
     public static enum PanelType {
-        TERRAIN, RESOURCES, UNITS, GOODS,
+        TERRAIN, RESOURCES, GOODS, UNITS,
         SKILLS, BUILDINGS, FATHERS, NATIONS,
         NATION_TYPES, CONCEPTS;
 
@@ -46,8 +47,8 @@ public class ColopediaAction extends FreeColAction {
     private static final int[] mnemonics = {
         KeyEvent.VK_T,
         KeyEvent.VK_R,
-        KeyEvent.VK_U,
         KeyEvent.VK_G,
+        KeyEvent.VK_U,
         KeyEvent.VK_S,
         KeyEvent.VK_B,
         KeyEvent.VK_F,

From 0e2c9eb288dd041e4c4b27fe41126a7896b1197d Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 31 Aug 2015 13:59:41 +0930
Subject: [PATCH 161/323] Merge the units colopedia menus, BR#2894.

---
 .../panel/ColopediaGameObjectTypePanel.java   | 40 +++++++++++--------
 .../gui/panel/ColopediaTreeCellRenderer.java  | 20 +++++-----
 .../client/gui/panel/ColopediaTreeItem.java   | 12 +++---
 .../client/gui/panel/UnitDetailPanel.java     | 13 +-----
 4 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java b/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java
index 1071def06..a4c407105 100644
--- a/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java
@@ -104,25 +104,31 @@ public abstract class ColopediaGameObjectTypePanel<T extends FreeColGameObjectTy
      * @param id The object identifier of the new branch node.
      * @param types a List of FreeColGameObjectTypes
      */
-    public void addSubTrees(DefaultMutableTreeNode root, String id, List<T> types) {
+    public void addSubTrees(DefaultMutableTreeNode root, String id,
+                            List<T> types) {
         String name = getName();
-        DefaultMutableTreeNode node =
-            new DefaultMutableTreeNode(new ColopediaTreeItem(this, id, name, null));
+        ColopediaTreeItem cti = new ColopediaTreeItem(this, id, name, null);
+        DefaultMutableTreeNode node = new DefaultMutableTreeNode(cti);
         int width = ImageLibrary.ICON_SIZE.width;
         int height = ImageLibrary.ICON_SIZE.height;
         for (FreeColGameObjectType type : types) {
             Image image = (type instanceof GoodsType)
-                ? ImageLibrary.getMiscImage("image.icon." + type.getId(), ImageLibrary.ICON_SIZE)
+                ? ImageLibrary.getMiscImage("image.icon." + type.getId(),
+                                            ImageLibrary.ICON_SIZE)
                 : (type instanceof ResourceType)
-                    ? ImageLibrary.getMiscImage("image.tileitem." + type.getId(), ImageLibrary.ICON_SIZE)
-                    : (type instanceof Nation)
-                        ? ImageLibrary.getMiscIconImage(type, ImageLibrary.ICON_SIZE)
-                        : (type instanceof BuildableType)
-                            ? ImageLibrary.getBuildableImage((BuildableType)type, ImageLibrary.ICON_SIZE)
-                            : ImageLibrary.getMiscImage(ResourceManager.REPLACEMENT_IMAGE, ImageLibrary.ICON_SIZE);
+                ? ImageLibrary.getMiscImage("image.tileitem." + type.getId(),
+                                            ImageLibrary.ICON_SIZE)
+                : (type instanceof Nation)
+                ? ImageLibrary.getMiscIconImage(type, ImageLibrary.ICON_SIZE)
+                : (type instanceof BuildableType)
+                ? ImageLibrary.getBuildableImage((BuildableType)type,
+                                                 ImageLibrary.ICON_SIZE)
+                : ImageLibrary.getMiscImage(ResourceManager.REPLACEMENT_IMAGE,
+                                            ImageLibrary.ICON_SIZE);
             int x = (width - image.getWidth(null)) / 2;
             int y = (height - image.getHeight(null)) / 2;
-            BufferedImage centeredImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+            BufferedImage centeredImage
+                = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
             Graphics2D g = centeredImage.createGraphics();
             g.drawImage(image, x, y, null);
             g.dispose();
@@ -131,21 +137,23 @@ public abstract class ColopediaGameObjectTypePanel<T extends FreeColGameObjectTy
         root.add(node);
     }
 
-    protected DefaultMutableTreeNode buildItem(FreeColGameObjectType type, ImageIcon icon) {
+    protected DefaultMutableTreeNode buildItem(FreeColGameObjectType type,
+                                               ImageIcon icon) {
         String name = Messages.getName(type);
         return new DefaultMutableTreeNode(new ColopediaTreeItem(this, 
                 type.getId(), name, icon));
     }
 
-
-    protected JButton getButton(FreeColGameObjectType type, String text, ImageIcon icon) {
+    protected JButton getButton(FreeColGameObjectType type, String text,
+                                ImageIcon icon) {
         JButton button = Utility.getLinkButton((text != null) ? text
             : Messages.getName(type), icon, type.getId());
         button.addActionListener(colopediaPanel);
         return button;
     }
 
-    protected JButton getButton(PanelType panelType, String text, ImageIcon icon) {
+    protected JButton getButton(PanelType panelType, String text,
+                                ImageIcon icon) {
         JButton button = Utility.getLinkButton(text, icon,
             "colopediaAction." + panelType.getKey());
         button.addActionListener(colopediaPanel);
@@ -205,7 +213,7 @@ public abstract class ColopediaGameObjectTypePanel<T extends FreeColGameObjectTy
         } catch (Exception e) {
             // not a production bonus
             JLabel label = new JLabel(ModifierFormat.getFeatureAsString(modifier) + ": "
-                                      + ModifierFormat.getModifierAsString(modifier));
+                + ModifierFormat.getModifierAsString(modifier));
             label.setToolTipText(Messages.getShortDescription(modifier));
             return label;
         }
diff --git a/src/net/sf/freecol/client/gui/panel/ColopediaTreeCellRenderer.java b/src/net/sf/freecol/client/gui/panel/ColopediaTreeCellRenderer.java
index bd3307ef8..2a1e62146 100644
--- a/src/net/sf/freecol/client/gui/panel/ColopediaTreeCellRenderer.java
+++ b/src/net/sf/freecol/client/gui/panel/ColopediaTreeCellRenderer.java
@@ -43,25 +43,25 @@ public class ColopediaTreeCellRenderer extends DefaultTreeCellRenderer {
         setBackgroundNonSelectionColor(new Color(0,0,0,1));
     }
 
+
     /**
-     * Returns the rendered Component
-     *
-     * @return the rendered item's Component
+     * {@inheritDoc}
      */
     @Override
-    public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected,
-                                                  boolean expanded, boolean leaf, int row, boolean hasFocus) {
+    public Component getTreeCellRendererComponent(JTree tree, Object value,
+        boolean selected, boolean expanded, boolean leaf, int row,
+        boolean hasFocus) {
         DefaultMutableTreeNode node = (DefaultMutableTreeNode)value;
 
-        super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
+        super.getTreeCellRendererComponent(tree, value, selected, expanded,
+                                           leaf, row, hasFocus);
         ColopediaTreeItem nodeItem = (ColopediaTreeItem)node.getUserObject();
-
         if (nodeItem.getIcon() != null) {
             setIcon(nodeItem.getIcon());
-        } else if (expanded) {
-            setIcon(new ImageIcon(ResourceManager.getImage("image.icon.Colopedia.openSection")));
         } else {
-            setIcon(new ImageIcon(ResourceManager.getImage("image.icon.Colopedia.closedSection")));
+            String key = "image.icon.Colopedia."
+                + ((expanded) ? "open" : "closed") + "Section";
+            setIcon(new ImageIcon(ResourceManager.getImage(key)));
         }
         return this;
     }
diff --git a/src/net/sf/freecol/client/gui/panel/ColopediaTreeItem.java b/src/net/sf/freecol/client/gui/panel/ColopediaTreeItem.java
index 4e56a3515..383ad64ff 100644
--- a/src/net/sf/freecol/client/gui/panel/ColopediaTreeItem.java
+++ b/src/net/sf/freecol/client/gui/panel/ColopediaTreeItem.java
@@ -28,22 +28,24 @@ import javax.swing.ImageIcon;
  */
 class ColopediaTreeItem {
 
-    private final ColopediaDetailPanel panelType;
+    private final ColopediaDetailPanel detailPanel;
     private final String id;
     private final String text;
     private final ImageIcon icon;
 
+
     /**
      * The default constructor for a ColopediaTreeItem that
      * corresponds to a leaf node.
      *
-     * @param panelType a <code>ColopediaDetailPanel</code> value
+     * @param detailPanel A <code>ColopediaDetailPanel</code> value.
      * @param id The object identifier.
      * @param text a <code>String</code> value
      * @param icon an <code>ImageIcon</code> value
      */
-    ColopediaTreeItem(ColopediaDetailPanel panelType, String id, String text, ImageIcon icon) {
-        this.panelType = panelType;
+    ColopediaTreeItem(ColopediaDetailPanel detailPanel, String id, String text,
+                      ImageIcon icon) {
+        this.detailPanel = detailPanel;
         this.id = id;
         this.text = text;
         this.icon = icon;
@@ -55,7 +57,7 @@ class ColopediaTreeItem {
      * @return the panel type this item belongs to.
      */
     public ColopediaDetailPanel getPanelType() {
-        return panelType;
+        return detailPanel;
     }
 
     public String getId() {
diff --git a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
index 0b2c326c7..ce951871d 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
@@ -81,19 +81,8 @@ public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
      */
     @Override
     public void addSubTrees(DefaultMutableTreeNode root) {
-        List<UnitType> units = new ArrayList<>();
-        List<UnitType> skills = new ArrayList<>();
-        for (UnitType u : getSpecification().getUnitTypeList()) {
-            if (u.getSkill() <= 0 || u.hasAbility(Ability.EXPERT_SOLDIER)) {
-                units.add(u);
-            } else {
-                skills.add(u);
-            }
-        }
         super.addSubTrees(root, "colopediaAction." + PanelType.UNITS.getKey(),
-                          units);
-        super.addSubTrees(root, "colopediaAction." + PanelType.SKILLS.getKey(),
-                          skills);
+            new ArrayList<>(getSpecification().getUnitTypeList()));
     }
 
     /**

From c4df64e3f0d52b55a1d95fc1f35f2434219dd2e5 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Tue, 1 Sep 2015 19:55:23 +0930
Subject: [PATCH 162/323] Backward compatibility for cibola tags in old saved
 games, BR#2903.

---
 src/net/sf/freecol/common/model/Game.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/common/model/Game.java b/src/net/sf/freecol/common/model/Game.java
index 560d402b4..979654bfa 100644
--- a/src/net/sf/freecol/common/model/Game.java
+++ b/src/net/sf/freecol/common/model/Game.java
@@ -1318,7 +1318,12 @@ public class Game extends FreeColGameObject {
         //logger.finest("Found game tag " + tag + " id=" + xr.readId());
 
         if (CIBOLA_TAG.equals(tag)) {
-            NameCache.addCityOfCibola(xr.readId());
+            String cibola = xr.readId();
+            // @compat 0.11.3
+            final String oldPrefix = "lostCityRumour.cityName";
+            if (cibola.startsWith(oldPrefix)) cibola = "nameCache." + cibola;
+            // end @compat 0.11.3
+            NameCache.addCityOfCibola(cibola);
             xr.closeTag(CIBOLA_TAG);
 
         } else if (Map.getXMLElementTagName().equals(tag)) {

From 6ff9d285659c90de46174e80521bbba77e9887f2 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 1 Sep 2015 14:21:18 +0930
Subject: [PATCH 163/323] Use generic List, not specific ArrayList.

---
 src/net/sf/freecol/client/gui/ImageLibrary.java          | 7 ++++---
 src/net/sf/freecol/common/resources/FAFile.java          | 3 ++-
 src/net/sf/freecol/common/resources/ResourceManager.java | 7 ++++---
 src/net/sf/freecol/common/resources/ResourceMapping.java | 9 +++++----
 .../sf/freecol/server/generator/TerrainGenerator.java    | 4 ++--
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index 5a887ad3f..aef68a214 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -35,6 +35,7 @@ import java.awt.image.RescaleOp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -530,7 +531,7 @@ public final class ImageLibrary {
      */
     public static BufferedImage getOverlayImage(TileType type, String id, float scale) {
         String prefix = "image.tileoverlay." + type.getId();
-        ArrayList<String> keys = ResourceManager.getImageKeys(prefix);
+        List<String> keys = ResourceManager.getImageKeys(prefix);
         return getRandomizedImage(keys, id, scale);
     }
 
@@ -546,7 +547,7 @@ public final class ImageLibrary {
     public static BufferedImage getOverlayImage(TileType type, String id, float scale,
                                         Set<String> overlayCache) {
         String prefix = "image.tileoverlay." + type.getId() + ".r";
-        ArrayList<String> keys = new ArrayList<>();
+        List<String> keys = new ArrayList<>();
         for (String key : overlayCache) {
             if (key.startsWith(prefix)) {
                 keys.add(key);
@@ -555,7 +556,7 @@ public final class ImageLibrary {
         return getRandomizedImage(keys, id, scale);
     }
 
-    private static BufferedImage getRandomizedImage(ArrayList<String> keys, String id, float scale) {
+    private static BufferedImage getRandomizedImage(List<String> keys, String id, float scale) {
         int count = keys.size();
         switch(count) {
             case 0:
diff --git a/src/net/sf/freecol/common/resources/FAFile.java b/src/net/sf/freecol/common/resources/FAFile.java
index 721370334..42166d985 100644
--- a/src/net/sf/freecol/common/resources/FAFile.java
+++ b/src/net/sf/freecol/common/resources/FAFile.java
@@ -27,6 +27,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.StringTokenizer;
 
 
@@ -111,7 +112,7 @@ public class FAFile {
         if (fn != null) {
             return fn.points;
         }
-        ArrayList<Point> points = new ArrayList<>();
+        List<Point> points = new ArrayList<>();
         int x = 0;
         for (int i=0; i<text.length(); i++) {
             FALetter fl = getLetter(text.charAt(i));
diff --git a/src/net/sf/freecol/common/resources/ResourceManager.java b/src/net/sf/freecol/common/resources/ResourceManager.java
index 8a6dabdb5..1b63635f1 100644
--- a/src/net/sf/freecol/common/resources/ResourceManager.java
+++ b/src/net/sf/freecol/common/resources/ResourceManager.java
@@ -25,6 +25,7 @@ import java.awt.Font;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
@@ -198,7 +199,7 @@ public class ResourceManager {
                 public void run() {
                     // Make a local list of the resources to load.
                     logger.info("Background thread started");
-                    ArrayList<Resource> resources
+                    List<Resource> resources
                         = new ArrayList<>(getResources().values());
                     int n = 0;
                     for (Resource r : resources) {
@@ -262,7 +263,7 @@ public class ResourceManager {
      * @param prefix the prefix
      * @return a list of all keys starting with the given prefix
      */
-    public static synchronized ArrayList<String> getImageKeys(String prefix) {
+    public static synchronized List<String> getImageKeys(String prefix) {
         //logger.finest("getImageKeys(" + prefix + ")");
         return mergedContainer.getImageKeys(prefix);
     }
@@ -275,7 +276,7 @@ public class ResourceManager {
      * @param suffix the suffix
      * @return a list of all resulting keys
      */
-    public static synchronized ArrayList<String> getImageKeys(String prefix,
+    public static synchronized List<String> getImageKeys(String prefix,
                                                               String suffix) {
         logger.finest("getImageKeys(" + prefix + ", " + suffix + ")");
         return mergedContainer.getImageKeys(prefix, suffix);
diff --git a/src/net/sf/freecol/common/resources/ResourceMapping.java b/src/net/sf/freecol/common/resources/ResourceMapping.java
index 33abb8b56..04f18df64 100644
--- a/src/net/sf/freecol/common/resources/ResourceMapping.java
+++ b/src/net/sf/freecol/common/resources/ResourceMapping.java
@@ -22,6 +22,7 @@ package net.sf.freecol.common.resources;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
@@ -290,8 +291,8 @@ public final class ResourceMapping {
      * @param prefix The prefix to check for.
      * @return A list of keys.
      */
-    public ArrayList<String> getImageKeys(String prefix) {
-        ArrayList<String> result = new ArrayList<>();
+    public List<String> getImageKeys(String prefix) {
+        List<String> result = new ArrayList<>();
         for (String key : imageResources.keySet()) {
             if (key.startsWith(prefix)) {
                 result.add(key);
@@ -307,8 +308,8 @@ public final class ResourceMapping {
      * @param suffix The suffix to check for.
      * @return A list of keys.
      */
-    public ArrayList<String> getImageKeys(String prefix, String suffix) {
-        ArrayList<String> result = new ArrayList<>();
+    public List<String> getImageKeys(String prefix, String suffix) {
+        List<String> result = new ArrayList<>();
         for (String key : imageResources.keySet()) {
             if (key.startsWith(prefix) && key.endsWith(suffix)) {
                 result.add(key);
diff --git a/src/net/sf/freecol/server/generator/TerrainGenerator.java b/src/net/sf/freecol/server/generator/TerrainGenerator.java
index 5dc9a2479..3fc09c7cb 100644
--- a/src/net/sf/freecol/server/generator/TerrainGenerator.java
+++ b/src/net/sf/freecol/server/generator/TerrainGenerator.java
@@ -86,8 +86,8 @@ public class TerrainGenerator {
     private final Specification spec;
 
     /** The cached land and ocean tile types. */
-    private ArrayList<TileType> landTileTypes = null;
-    private ArrayList<TileType> oceanTileTypes = null;
+    private List<TileType> landTileTypes = null;
+    private List<TileType> oceanTileTypes = null;
 
 
     /**

From 517330c735dbcd2700afe47cf09b5d83dc981631 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 2 Sep 2015 09:21:33 +0930
Subject: [PATCH 164/323] Move lumber delivery bonuses to spec, BR#2884.

---
 data/rules/classic/specification.xml          |  6 +-
 .../freecol/common/model/Specification.java   | 15 ++++-
 .../sf/freecol/server/model/ServerUnit.java   | 34 ++---------
 .../freecol/server/model/ServerUnitTest.java  | 60 ++++++++++++++++++-
 4 files changed, 83 insertions(+), 32 deletions(-)

diff --git a/data/rules/classic/specification.xml b/data/rules/classic/specification.xml
index b9665d350..c4c77c54d 100644
--- a/data/rules/classic/specification.xml
+++ b/data/rules/classic/specification.xml
@@ -1594,6 +1594,10 @@
                recruit-probability="1" score-value="4">
       <default-role id="model.role.pioneer"/>
       <ability id="model.ability.expertPioneer" value="true"/>
+      <modifier id="model.modifier.tileTypeChangeProduction"
+                type="multiplicative" value="2">
+        <scope type="model.goods.lumber"/>
+      </modifier>
     </unit-type>
     <unit-type id="model.unit.veteranSoldier" extends="colonist"
                price="2000" skill="2"
@@ -2003,7 +2007,7 @@
       <required-goods id="model.goods.hammers"
                       value="52"/>
       <modifier id="model.modifier.tileTypeChangeProduction"
-                value="3" type="multiplicative">
+                type="multiplicative" value="3">
         <scope type="model.goods.lumber"/>
       </modifier>
     </building-type>
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index 7f0b58945..d7340908b 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -2249,7 +2249,20 @@ public final class Specification {
             }
         }
         // end @compat 0.11.3
-        
+
+        // @compat 0.11.5
+        // Added a modifier to hardy pioneer
+        UnitType hardyPioneer = getUnitType("model.unit.hardyPioneer");
+        if (hardyPioneer.getModifiers(Modifier.TILE_TYPE_CHANGE_PRODUCTION)
+            .isEmpty()) {
+            Modifier m = new Modifier(Modifier.TILE_TYPE_CHANGE_PRODUCTION,
+                2.0f, Modifier.ModifierType.MULTIPLICATIVE);
+            Scope scope = new Scope();
+            scope.setType("model.goods.lumber");
+            m.addScope(scope);
+            hardyPioneer.addModifier(m);
+        }
+        // end @compat 0.11.5
     }
 
     /**
diff --git a/src/net/sf/freecol/server/model/ServerUnit.java b/src/net/sf/freecol/server/model/ServerUnit.java
index 8c5010893..8cbb38504 100644
--- a/src/net/sf/freecol/server/model/ServerUnit.java
+++ b/src/net/sf/freecol/server/model/ServerUnit.java
@@ -394,42 +394,18 @@ public class ServerUnit extends Unit implements ServerModelObject {
     private void csImproveTile(Random random, ChangeSet cs) {
         Tile tile = getTile();
         tile.cacheUnseen();//+til
-        AbstractGoods deliver = getWorkImprovement().getType().getProduction(tile.getType());
+        AbstractGoods deliver = getWorkImprovement().getType()
+            .getProduction(tile.getType());
         if (deliver != null) { // Deliver goods if any
             final Turn turn = getGame().getTurn();
             int amount = deliver.getAmount();
-            if (getType().hasAbility(Ability.EXPERT_PIONEER)) {
-                amount *= 2;
-            }
-            Settlement settlement = tile.getSettlement();
+            amount = (int)this.applyModifiers(amount, turn,
+                Modifier.TILE_TYPE_CHANGE_PRODUCTION, deliver.getType());
+            Settlement settlement = tile.getOwningSettlement();
             if (settlement != null && owner.owns(settlement)) {
                 amount = (int)settlement.applyModifiers(amount, turn,
                     Modifier.TILE_TYPE_CHANGE_PRODUCTION, deliver.getType());
                 settlement.addGoods(deliver.getType(), amount);
-            } else {
-                List<Settlement> adjacent = new ArrayList<>();
-                int newAmount = amount;
-                for (Tile t : tile.getSurroundingTiles(2)) {
-                    Settlement ts = t.getSettlement();
-                    if (ts != null && owner.owns(ts)) {
-                        adjacent.add(ts);
-                        int modAmount = (int)ts.applyModifiers((float)amount,
-                            turn, Modifier.TILE_TYPE_CHANGE_PRODUCTION,
-                            deliver.getType());
-                        if (modAmount > newAmount) {
-                            newAmount = modAmount;
-                        }
-                    }
-                }
-                if (!adjacent.isEmpty()) {
-                    int deliverPerCity = newAmount / adjacent.size();
-                    for (Settlement s : adjacent) {
-                        s.addGoods(deliver.getType(), deliverPerCity);
-                    }
-                    // Add residue to first adjacent settlement.
-                    adjacent.get(0).addGoods(deliver.getType(),
-                                             newAmount % adjacent.size());
-                }
             }
         }
 
diff --git a/test/src/net/sf/freecol/server/model/ServerUnitTest.java b/test/src/net/sf/freecol/server/model/ServerUnitTest.java
index 58e417965..7797f048a 100644
--- a/test/src/net/sf/freecol/server/model/ServerUnitTest.java
+++ b/test/src/net/sf/freecol/server/model/ServerUnitTest.java
@@ -25,11 +25,12 @@ import java.util.List;
 import net.sf.freecol.common.model.BuildingType;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.ColonyTile;
+import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.GameOptions;
 import net.sf.freecol.common.model.GoodsType;
 import net.sf.freecol.common.model.Map;
-import net.sf.freecol.common.model.Direction;
+import net.sf.freecol.common.model.Modifier;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Role;
 import net.sf.freecol.common.model.Tile;
@@ -48,6 +49,8 @@ import net.sf.freecol.util.test.MockPseudoRandom;
 
 public class ServerUnitTest extends FreeColTestCase {
 
+    private static final BuildingType carpenterHouseType
+        = spec().getBuildingType("model.building.carpenterHouse");
     private static final BuildingType townHallType
         = spec().getBuildingType("model.building.townHall");
 
@@ -55,6 +58,8 @@ public class ServerUnitTest extends FreeColTestCase {
         = spec().getPrimaryFoodType();
     private static final GoodsType grainType
         = spec().getGoodsType("model.goods.grain");
+    private static final GoodsType lumberType
+        = spec().getGoodsType("model.goods.lumber");
 
     private static final TileImprovementType road
         = spec().getTileImprovementType("model.improvement.road");
@@ -461,4 +466,57 @@ public class ServerUnitTest extends FreeColTestCase {
         assertEquals(savannah, tile.getType());
         assertTrue(tile.hasResource());
     }
+
+    public void testUnitLumberDelivery() {
+        Game game = ServerTestHelper.startServerGame(getTestMap(savannahForest));
+        InGameController igc = ServerTestHelper.getInGameController();
+        Colony colony = getStandardColony(3);
+        ServerPlayer player = (ServerPlayer)colony.getOwner();
+        Tile tile = colony.getTile();
+        
+        // Set up a hardy pioneer to clear the colony tile
+        Role pioneerRole = spec().getRole("model.role.pioneer");
+        ServerUnit hardyPioneer = new ServerUnit(game, tile, player,
+                                                 pioneerType, pioneerRole);
+        igc.changeWorkImprovementType(player, hardyPioneer, clear);
+
+        // Verify initial state
+        assertEquals(8, hardyPioneer.getWorkLeft());
+        assertEquals(savannahForest, tile.getType());
+        assertEquals(colony, tile.getOwningSettlement());
+        
+        // Almost finish clearing
+        ServerTestHelper.newTurn();
+        ServerTestHelper.newTurn();
+        ServerTestHelper.newTurn();
+
+        // Lumber should be delivered on this turn
+        int lumber = colony.getGoodsCount(lumberType);
+        ServerTestHelper.newTurn();
+        assertEquals("Lumber delivery with hardy pioneer", lumber + 20 * 2,
+                     colony.getGoodsCount(lumberType));
+
+        // Upgrade to lumber mill
+        assertEquals(0,
+            colony.getModifiers(Modifier.TILE_TYPE_CHANGE_PRODUCTION).size());
+        colony.getBuilding(carpenterHouseType).upgrade();
+        assertEquals(1,
+            colony.getModifiers(Modifier.TILE_TYPE_CHANGE_PRODUCTION).size());
+
+        // Almost clear another tile
+        Tile tile2 = tile.getNeighbourOrNull(Direction.N);
+        assertEquals(colony, tile2.getOwningSettlement());
+        hardyPioneer.setLocation(tile2);
+        hardyPioneer.setMovesLeft(1);
+        igc.changeWorkImprovementType(player, hardyPioneer, clear);
+        ServerTestHelper.newTurn();
+        ServerTestHelper.newTurn();
+        ServerTestHelper.newTurn();
+
+        // Lumber should be delivered on this turn
+        lumber = colony.getGoodsCount(lumberType);
+        ServerTestHelper.newTurn();
+        assertEquals("Lumber delivered with hardy pioneer and mill",
+                     lumber + 20 * 2 * 3, colony.getGoodsCount(lumberType));
+    }
 }

From f71245a3d0bd886b308cabf3e91fc6a013d614be Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 1 Sep 2015 09:15:32 +0930
Subject: [PATCH 165/323] Clean up the remaining obvious lambdas for standard
 Java functional interfaces.

---
 src/net/sf/freecol/FreeCol.java               |   8 +-
 .../client/gui/CanvasMouseListener.java       |   2 +-
 src/net/sf/freecol/client/gui/MapViewer.java  |   7 +-
 src/net/sf/freecol/client/gui/SwingGUI.java   |   2 +-
 .../sf/freecol/client/gui/TerrainCursor.java  |   6 +-
 src/net/sf/freecol/client/gui/TilePopup.java  | 233 ++++++------------
 .../client/gui/action/AboutAction.java        |   2 +-
 .../gui/action/AssignTradeRouteAction.java    |   2 +-
 .../client/gui/action/BuildColonyAction.java  |   2 +-
 .../client/gui/action/CenterAction.java       |   2 +-
 .../client/gui/action/ChangeAction.java       |   2 +-
 .../gui/action/ChangeWindowedModeAction.java  |   2 +-
 .../freecol/client/gui/action/ChatAction.java |   2 +-
 .../client/gui/action/ClearOrdersAction.java  |   2 +-
 .../client/gui/action/ColopediaAction.java    |   2 +-
 .../client/gui/action/ContinueAction.java     |   2 +-
 .../client/gui/action/DebugAction.java        |   2 +-
 .../gui/action/DeclareIndependenceAction.java |   2 +-
 .../gui/action/DetermineHighSeasAction.java   |   2 +-
 .../client/gui/action/DisbandUnitAction.java  |   2 +-
 .../gui/action/DisplayBordersAction.java      |   4 +-
 .../client/gui/action/DisplayGridAction.java  |   4 +-
 .../gui/action/DisplayTileTextAction.java     |   4 +-
 .../client/gui/action/EndTurnAction.java      |   2 +-
 .../client/gui/action/EuropeAction.java       |   2 +-
 .../gui/action/ExecuteGotoOrdersAction.java   |   2 +-
 .../gui/action/FindSettlementAction.java      |   2 +-
 .../client/gui/action/FortifyAction.java      |   2 +-
 .../freecol/client/gui/action/GotoAction.java |   2 +-
 .../client/gui/action/GotoTileAction.java     |   2 +-
 .../client/gui/action/ImprovementAction.java  |   2 +-
 .../freecol/client/gui/action/LoadAction.java |   2 +-
 .../client/gui/action/MapControlsAction.java  |   4 +-
 .../client/gui/action/MapEditorAction.java    |   2 +-
 .../action/MiniMapToggleFogOfWarAction.java   |   2 +-
 .../gui/action/MiniMapToggleViewAction.java   |   2 +-
 .../gui/action/MiniMapZoomInAction.java       |   2 +-
 .../gui/action/MiniMapZoomOutAction.java      |   2 +-
 .../freecol/client/gui/action/MoveAction.java |   2 +-
 .../freecol/client/gui/action/NewAction.java  |   2 +-
 .../client/gui/action/NewEmptyMapAction.java  |   2 +-
 .../freecol/client/gui/action/OpenAction.java |   2 +-
 .../client/gui/action/PreferencesAction.java  |   2 +-
 .../freecol/client/gui/action/QuitAction.java |   2 +-
 .../client/gui/action/ReconnectAction.java    |   2 +-
 .../client/gui/action/RenameAction.java       |   2 +-
 .../client/gui/action/ReportCargoAction.java  |   2 +-
 .../client/gui/action/ReportColonyAction.java |   2 +-
 .../ReportContinentalCongressAction.java      |   2 +-
 .../gui/action/ReportEducationAction.java     |   2 +-
 .../gui/action/ReportExplorationAction.java   |   2 +-
 .../gui/action/ReportForeignAction.java       |   2 +-
 .../gui/action/ReportHighScoresAction.java    |   2 +-
 .../gui/action/ReportHistoryAction.java       |   2 +-
 .../client/gui/action/ReportIndianAction.java |   2 +-
 .../client/gui/action/ReportLabourAction.java |   2 +-
 .../gui/action/ReportMilitaryAction.java      |   2 +-
 .../client/gui/action/ReportNavalAction.java  |   2 +-
 .../gui/action/ReportProductionAction.java    |   2 +-
 .../gui/action/ReportReligionAction.java      |   2 +-
 .../gui/action/ReportRequirementsAction.java  |   2 +-
 .../client/gui/action/ReportTradeAction.java  |   2 +-
 .../client/gui/action/ReportTurnAction.java   |   2 +-
 .../client/gui/action/RetireAction.java       |   2 +-
 .../freecol/client/gui/action/SaveAction.java |   2 +-
 .../client/gui/action/SaveAndQuitAction.java  |   2 +-
 .../client/gui/action/ScaleMapAction.java     |   2 +-
 .../gui/action/ShowDifficultyAction.java      |   2 +-
 .../gui/action/ShowGameOptionsAction.java     |   2 +-
 .../client/gui/action/ShowMainAction.java     |   2 +-
 .../action/ShowMapGeneratorOptionsAction.java |   2 +-
 .../client/gui/action/SkipUnitAction.java     |   2 +-
 .../client/gui/action/TilePopupAction.java    |   2 +-
 .../gui/action/ToggleViewModeAction.java      |   2 +-
 .../client/gui/action/TradeRouteAction.java   |   2 +-
 .../client/gui/action/UnloadAction.java       |   2 +-
 .../freecol/client/gui/action/WaitAction.java |   2 +-
 .../client/gui/action/ZoomInAction.java       |   2 +-
 .../client/gui/action/ZoomOutAction.java      |   2 +-
 .../sf/freecol/client/gui/menu/DebugMenu.java |  58 ++---
 .../client/gui/menu/FreeColMenuTest.java      |   4 +-
 .../client/gui/menu/MapEditorMenuBar.java     |   5 +-
 .../client/gui/option/AudioMixerOptionUI.java |  36 ++-
 .../client/gui/option/FileOptionUI.java       |  16 +-
 .../client/gui/option/FreeColActionUI.java    |   8 +-
 .../client/gui/option/ListOptionUI.java       |  87 +++----
 .../freecol/client/gui/panel/AboutPanel.java  |   6 +-
 .../client/gui/panel/BuildQueuePanel.java     |  14 +-
 .../client/gui/panel/CaptureGoodsDialog.java  |  32 +--
 .../freecol/client/gui/panel/ChatPanel.java   |   6 +-
 .../freecol/client/gui/panel/ColonyPanel.java |  47 ++--
 .../client/gui/panel/ColopediaPanel.java      |   4 +-
 .../client/gui/panel/ColorCellEditor.java     |   4 +-
 .../client/gui/panel/CompactLabourReport.java |  59 ++---
 .../gui/panel/ConfirmDeclarationDialog.java   |   4 +-
 .../client/gui/panel/DeclarationPanel.java    |  48 ++--
 .../client/gui/panel/DifficultyDialog.java    |  41 ++-
 .../client/gui/panel/EndTurnDialog.java       |   4 +-
 .../freecol/client/gui/panel/ErrorPanel.java  |   6 +-
 .../freecol/client/gui/panel/EuropePanel.java |   6 +-
 .../client/gui/panel/FindSettlementPanel.java |   4 +-
 .../client/gui/panel/FreeColPanel.java        |   5 +-
 .../client/gui/panel/InformationPanel.java    |   7 +-
 .../freecol/client/gui/panel/LoadDialog.java  |  15 +-
 .../freecol/client/gui/panel/MainPanel.java   |   2 +-
 .../gui/panel/MapEditorTransformPanel.java    |  25 +-
 .../gui/panel/MapGeneratorOptionsDialog.java  |   7 +-
 .../client/gui/panel/MonarchDialog.java       |   7 +-
 .../client/gui/panel/NegotiationDialog.java   |  26 +-
 .../sf/freecol/client/gui/panel/NewPanel.java |  20 +-
 .../client/gui/panel/NewUnitPanel.java        |   6 +-
 .../client/gui/panel/ParametersDialog.java    |   9 +-
 .../client/gui/panel/PlayersTable.java        |  30 +--
 .../client/gui/panel/QuickActionMenu.java     | 141 ++++-------
 .../client/gui/panel/RecruitPanel.java        |   6 +-
 .../gui/panel/ReportCompactColonyPanel.java   |   6 +-
 .../client/gui/panel/ReportLabourPanel.java   |  10 +-
 .../freecol/client/gui/panel/ReportPanel.java |   4 +-
 .../gui/panel/ReportProductionPanel.java      |   7 +-
 .../client/gui/panel/ReportTurnPanel.java     |  35 +--
 .../freecol/client/gui/panel/SaveDialog.java  |  21 +-
 .../client/gui/panel/ScaleMapSizeDialog.java  |   9 +-
 .../gui/panel/SelectDestinationDialog.java    |  22 +-
 .../client/gui/panel/ServerListPanel.java     |   9 +-
 .../client/gui/panel/StartGamePanel.java      |   8 +-
 .../freecol/client/gui/panel/TilePanel.java   |   4 +-
 .../gui/panel/TradeRouteInputPanel.java       |  29 +--
 .../client/gui/panel/TradeRoutePanel.java     |  72 +++---
 .../freecol/client/gui/panel/UnitLabel.java   |   4 +-
 .../client/gui/plaf/FreeColOptionPaneUI.java  |  15 +-
 .../sf/freecol/common/debug/DebugUtils.java   |  15 +-
 .../common/resources/ResourceManager.java     |   3 +-
 src/net/sf/freecol/tools/FlagTest.java        |   4 +-
 .../freecol/tools/GenerateDocumentation.java  |   3 +-
 134 files changed, 607 insertions(+), 890 deletions(-)

diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index 3cf22c516..806509a24 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -26,7 +26,6 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.IOException;
-import java.lang.Thread.UncaughtExceptionHandler;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.JarURLConnection;
@@ -291,11 +290,8 @@ public final class FreeCol {
                 + e.getMessage());
             e.printStackTrace();
         }
-        Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler() {
-                @Override
-                public void uncaughtException(Thread thread, Throwable e) {
-                    baseLogger.log(Level.WARNING, "Uncaught exception from thread: " + thread, e);
-                }
+        Thread.setDefaultUncaughtExceptionHandler((Thread thread, Throwable e) -> {
+                baseLogger.log(Level.WARNING, "Uncaught exception from thread: " + thread, e);
             });
 
         // Now we can find the client options, allow the options
diff --git a/src/net/sf/freecol/client/gui/CanvasMouseListener.java b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
index 32546c06d..0772ead8c 100644
--- a/src/net/sf/freecol/client/gui/CanvasMouseListener.java
+++ b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
@@ -197,7 +197,7 @@ public final class CanvasMouseListener implements ActionListener, MouseListener
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         doubleClickTimer.stop();
         Tile tile=canvas.convertToMapTile(centerX, centerY);
         if(canvas.getViewMode() == GUI.MOVE_UNITS_MODE) {
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 87f8c3972..3f57ec80a 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -32,7 +32,6 @@ import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Stroke;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.font.TextLayout;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Ellipse2D;
@@ -1029,14 +1028,12 @@ public final class MapViewer {
         blinkingMarqueeEnabled = true;
 
         cursor = new net.sf.freecol.client.gui.TerrainCursor();
-        cursor.addActionListener((ActionEvent event) -> {
+        cursor.addActionListener((ActionEvent ae) -> {
                 if (!blinkingMarqueeEnabled) return;
                 Unit unit = activeUnit;
                 if (unit != null) {
                     Tile tile = unit.getTile();
-                    if (isTileVisible(tile)) {
-                        gui.refreshTile(tile);
-                    }
+                    if (isTileVisible(tile)) gui.refreshTile(tile);
                 }
             });
         cursor.startBlinking();
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index ae9b90646..e97a35fdd 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -307,7 +307,7 @@ public class SwingGUI extends GUI {
             }
 
             @Override
-            public void actionPerformed(ActionEvent e8) {
+            public void actionPerformed(ActionEvent ae8) {
                 execute();
             }
 
diff --git a/src/net/sf/freecol/client/gui/TerrainCursor.java b/src/net/sf/freecol/client/gui/TerrainCursor.java
index de1870700..9feece474 100644
--- a/src/net/sf/freecol/client/gui/TerrainCursor.java
+++ b/src/net/sf/freecol/client/gui/TerrainCursor.java
@@ -86,10 +86,10 @@ public class TerrainCursor implements ActionListener  {
         listenerList.remove(ActionListener.class, listener);
     }
 
-    public void fireActionEvent(ActionEvent event) {
+    public void fireActionEvent(ActionEvent ae) {
         for (ActionListener al
                  : listenerList.getListeners(ActionListener.class)) {
-            al.actionPerformed(event);
+            al.actionPerformed(ae);
         }
     }
 
@@ -100,7 +100,7 @@ public class TerrainCursor implements ActionListener  {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         active = !active;
         int eventId = active? ON : OFF;
         ActionEvent blinkEvent = new ActionEvent(this,eventId,"blink");
diff --git a/src/net/sf/freecol/client/gui/TilePopup.java b/src/net/sf/freecol/client/gui/TilePopup.java
index 2d58245f5..7f12c43da 100644
--- a/src/net/sf/freecol/client/gui/TilePopup.java
+++ b/src/net/sf/freecol/client/gui/TilePopup.java
@@ -107,22 +107,15 @@ public final class TilePopup extends JPopupMenu {
                 gotoMenuItem = Utility.localizedMenuItem("goToThisTile");
             }
             if (gotoMenuItem != null) {
-                gotoMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent event) {
-                            if (!freeColClient.currentPlayerIsMyPlayer()) {
-                                return;
-                            }
-                            Tile currTile = activeUnit.getTile();
-                            // already at the destination?
-                            if (currTile == tile) return;
-                            freeColClient.getInGameController()
-                                .goToTile(activeUnit, tile);
-                            // if unit did not move, we should show
-                            // the goto path
-                            if (activeUnit.getTile() == currTile) {
-                                canvas.updateCurrentPathForActiveUnit();
-                            }
+                gotoMenuItem.addActionListener((ActionEvent ae) -> {
+                        if (!freeColClient.currentPlayerIsMyPlayer()) return;
+                        Tile currTile = activeUnit.getTile();
+                        if (currTile == tile) return; // already at destination
+                        freeColClient.getInGameController()
+                            .goToTile(activeUnit, tile);
+                        // if unit did not move, we should show the goto path
+                        if (activeUnit.getTile() == currTile) {
+                            canvas.updateCurrentPathForActiveUnit();
                         }
                     });
                 add(gotoMenuItem);
@@ -133,14 +126,9 @@ public final class TilePopup extends JPopupMenu {
             if (unitTile == tile && activeUnit.hasHighSeasMove()) {
                 JMenuItem europeMenuItem = Utility.localizedMenuItem(StringTemplate
                     .template("goToEurope"));
-                europeMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent event) {
-                            if (!freeColClient.currentPlayerIsMyPlayer()) {
-                                return;
-                            }
-                            igc.moveTo(activeUnit, player.getEurope());
-                        }
+                europeMenuItem.addActionListener((ActionEvent ae) -> {
+                        if (!freeColClient.currentPlayerIsMyPlayer()) return;
+                        igc.moveTo(activeUnit, player.getEurope());
                     });
                 add(europeMenuItem);
                 hasAnItem = true;
@@ -151,33 +139,24 @@ public final class TilePopup extends JPopupMenu {
                 JMenuItem ji = null;
                 if (activeUnit.checkSetState(UnitState.ACTIVE)) {
                     ji = Utility.localizedMenuItem("activateUnit");
-                    ji.addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent event) {
-                                igc.changeState(activeUnit, Unit.UnitState.ACTIVE);
-                            }
+                    ji.addActionListener((ActionEvent ae) -> {
+                            igc.changeState(activeUnit, Unit.UnitState.ACTIVE);
                         });
                     add(ji);
                     hasAnItem = true;
                 }
                 if (activeUnit.checkSetState(UnitState.FORTIFYING)) {
                     ji = Utility.localizedMenuItem("fortify");
-                    ji.addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent event) {
-                                igc.changeState(activeUnit, Unit.UnitState.FORTIFYING);
-                            }
+                    ji.addActionListener((ActionEvent ae) -> {
+                            igc.changeState(activeUnit, Unit.UnitState.FORTIFYING);
                         });
                     add(ji);
                     hasAnItem = true;
                 }
                 if (activeUnit.checkSetState(UnitState.SKIPPED)) {
                     ji = Utility.localizedMenuItem("skip");
-                    ji.addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent event) {
-                                igc.changeState(activeUnit, Unit.UnitState.SKIPPED);
-                            }
+                    ji.addActionListener((ActionEvent ae) -> {
+                            igc.changeState(activeUnit, Unit.UnitState.SKIPPED);
                         });
                     add(ji);
                     hasAnItem = true;
@@ -185,11 +164,8 @@ public final class TilePopup extends JPopupMenu {
                 if (activeUnit.canCarryTreasure()
                     && activeUnit.canCashInTreasureTrain()) {
                     ji = Utility.localizedMenuItem("cashInTreasureTrain");
-                    ji.addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent e) {
-                                igc.checkCashInTreasureTrain(activeUnit);
-                            }
+                    ji.addActionListener((ActionEvent ae) -> {
+                            igc.checkCashInTreasureTrain(activeUnit);
                         });
                     ji.setEnabled(true);
                     add(ji);
@@ -198,11 +174,8 @@ public final class TilePopup extends JPopupMenu {
 
                 if (activeUnit.getDestination() != null) {
                     ji = Utility.localizedMenuItem("clearOrders");
-                    ji.addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent event) {
-                                igc.clearOrders(activeUnit);
-                            }
+                    ji.addActionListener((ActionEvent ae) -> {
+                            igc.clearOrders(activeUnit);
                         });
                     add(ji);
                     hasAnItem = true;
@@ -252,17 +225,13 @@ public final class TilePopup extends JPopupMenu {
             if (moreUnits) addSeparator();
             JMenuItem activateAllItem = Utility.localizedMenuItem(StringTemplate
                 .template("activateAllUnits"));
-            activateAllItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent event) {
-                        Unit lastUnit = null;
-                        for (Unit unit : tile.getUnitList()) {
-                            freeColClient.getInGameController()
-                                .clearOrders(unit);
-                            lastUnit = unit;
-                        }
-                        gui.setActiveUnit(lastUnit);
+            activateAllItem.addActionListener((ActionEvent ae) -> {
+                    Unit lastUnit = null;
+                    for (Unit unit : tile.getUnitList()) {
+                        freeColClient.getInGameController().clearOrders(unit);
+                        lastUnit = unit;
                     }
+                    gui.setActiveUnit(lastUnit);
                 });
             add(activateAllItem);
         }
@@ -297,32 +266,23 @@ public final class TilePopup extends JPopupMenu {
 
         for (final Unit unit : tile.getUnitList()) {
             JMenuItem toMenuItem = new JMenuItem(unit.toString());
-            toMenuItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent event) {
-                        DebugUtils.changeOwnership(freeColClient, unit);
-                    }
+            toMenuItem.addActionListener((ActionEvent ae) -> {
+                    DebugUtils.changeOwnership(freeColClient, unit);
                 });
             changeOwnership.add(toMenuItem);
 
             if (unit.isCarrier()) {
                 JMenuItem menuItem = new JMenuItem(unit.toString());
-                menuItem.addActionListener(new ActionListener() {
-                       @Override
-                       public void actionPerformed(ActionEvent event) {
-                           DebugUtils.displayMission(freeColClient, unit);
-                       }
+                menuItem.addActionListener((ActionEvent ae) -> {
+                        DebugUtils.displayMission(freeColClient, unit);
                     });
                 transportLists.add(menuItem);
             }
 
             if (unit.isPerson()) {
                 JMenuItem roleMenuItem = new JMenuItem(unit.toString());
-                roleMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent event) {
-                            DebugUtils.changeRole(freeColClient, unit);
-                        }
+                roleMenuItem.addActionListener((ActionEvent ae) -> {
+                        DebugUtils.changeRole(freeColClient, unit);
                     });
                 changeRole.add(roleMenuItem);
             }
@@ -335,40 +295,28 @@ public final class TilePopup extends JPopupMenu {
             }
             JMenuItem toMenuItem = new JMenuItem(tile.getColony().toString());
             final Colony colony = tile.getColony();
-            toMenuItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent event) {
-                        DebugUtils.changeOwnership(freeColClient, colony);
-                    }
+            toMenuItem.addActionListener((ActionEvent ae) -> {
+                    DebugUtils.changeOwnership(freeColClient, colony);
                 });
             changeOwnership.add(toMenuItem);
 
             JMenuItem displayColonyPlan = new JMenuItem("Display Colony Plan");
-            displayColonyPlan.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent event) {
-                        DebugUtils.displayColonyPlan(freeColClient, colony);
-                    }
+            displayColonyPlan.addActionListener((ActionEvent ae) -> {
+                    DebugUtils.displayColonyPlan(freeColClient, colony);
                 });
             add(displayColonyPlan);
 
             JMenuItem applyDisaster = new JMenuItem("Apply Disaster");
-            applyDisaster.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent event) {
-                        DebugUtils.applyDisaster(freeColClient, colony);
-                    }
+            applyDisaster.addActionListener((ActionEvent ae) -> {
+                    DebugUtils.applyDisaster(freeColClient, colony);
                 });
             add(applyDisaster);
         }
         if (tile.getIndianSettlement() != null) {
             JMenuItem displayGoods = new JMenuItem("Examine Settlement");
             final IndianSettlement is = tile.getIndianSettlement();
-            displayGoods.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent event) {
-                        DebugUtils.summarizeSettlement(freeColClient, is);
-                    }
+            displayGoods.addActionListener((ActionEvent ae) -> {
+                    DebugUtils.summarizeSettlement(freeColClient, is);
                 });
             add(displayGoods);
         }
@@ -378,22 +326,16 @@ public final class TilePopup extends JPopupMenu {
         if (tile.hasLostCityRumour()) {
             JMenuItem rumourItem = new JMenuItem("Set Lost City Rumour type");
             rumourItem.setOpaque(false);
-            rumourItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent event) {
-                        DebugUtils.setRumourType(freeColClient, tile);
-                    }
+            rumourItem.addActionListener((ActionEvent ae) -> {
+                    DebugUtils.setRumourType(freeColClient, tile);
                 });
             add(rumourItem);
         }
 
         JMenuItem addu = new JMenuItem("Add unit");
         addu.setOpaque(false);
-        addu.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    DebugUtils.addNewUnitToTile(freeColClient, tile);
-                }
+        addu.addActionListener((ActionEvent ae) -> {
+                DebugUtils.addNewUnitToTile(freeColClient, tile);
             });
         add(addu);
 
@@ -401,11 +343,8 @@ public final class TilePopup extends JPopupMenu {
             JMenuItem adda = new JMenuItem("Reset moves");
             adda.setOpaque(false);
             final List<Unit> tileUnits = tile.getUnitList();
-            adda.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent event) {
-                        DebugUtils.resetMoves(freeColClient, tileUnits);
-                    }
+            adda.addActionListener((ActionEvent ae) -> {
+                    DebugUtils.resetMoves(freeColClient, tileUnits);
                 });
             add(adda);
         }
@@ -413,21 +352,18 @@ public final class TilePopup extends JPopupMenu {
         final Unit activeUnit = gui.getActiveUnit();
         if (activeUnit != null && activeUnit.getTile() != null) {
             JMenuItem menuItem = new JMenuItem("Show search");
-            menuItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent event) {
-                        if (!freeColClient.currentPlayerIsMyPlayer()) return;
-                        Tile currTile = activeUnit.getTile();
-                        if (currTile == tile) return;
-                        final Map map = activeUnit.getGame().getMap();
-                        LogBuilder lb = new LogBuilder(512);
-                        PathNode path = map.findPath(activeUnit,
-                            activeUnit.getTile(), tile, activeUnit.getCarrier(),
-                            null, lb);
-                        gui.showInformationMessage(lb.toString());
-                        canvas.setCurrentPath(path);
-                        gui.refresh();                        
-                    }
+            menuItem.addActionListener((ActionEvent ae) -> {
+                    if (!freeColClient.currentPlayerIsMyPlayer()) return;
+                    Tile currTile = activeUnit.getTile();
+                    if (currTile == tile) return;
+                    final Map map = activeUnit.getGame().getMap();
+                    LogBuilder lb = new LogBuilder(512);
+                    PathNode path = map.findPath(activeUnit,
+                        activeUnit.getTile(), tile, activeUnit.getCarrier(),
+                        null, lb);
+                    gui.showInformationMessage(lb.toString());
+                    canvas.setCurrentPath(path);
+                    gui.refresh();                        
                 });
             add(menuItem);
         }
@@ -437,11 +373,8 @@ public final class TilePopup extends JPopupMenu {
                 JMenuItem addg = new JMenuItem("Add goods");
                 addg.setOpaque(false);
                 final Unit unit = u;
-                addg.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent event) {
-                            DebugUtils.addUnitGoods(freeColClient, unit);
-                        }
+                addg.addActionListener((ActionEvent ae) -> {
+                        DebugUtils.addUnitGoods(freeColClient, unit);
                     });
                 add(addg);
                 break;
@@ -450,11 +383,8 @@ public final class TilePopup extends JPopupMenu {
 
         JMenuItem dumpItem = new JMenuItem("Dump tile");
         dumpItem.setOpaque(false);
-        dumpItem.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    DebugUtils.dumpTile(freeColClient, tile);
-                }
+        dumpItem.addActionListener((ActionEvent ae) -> {
+                DebugUtils.dumpTile(freeColClient, tile);
             });
         add(dumpItem);
     }
@@ -479,11 +409,8 @@ public final class TilePopup extends JPopupMenu {
         menuItem.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.TINY, Font.BOLD,
             gui.getImageLibrary().getScaleFactor()));
-        menuItem.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    gui.setActiveUnit(unit);
-                }
+        menuItem.addActionListener((ActionEvent ae) -> {
+                gui.setActiveUnit(unit);
             });
         int lineCount = 1;
         if (indent) {
@@ -530,21 +457,15 @@ public final class TilePopup extends JPopupMenu {
         menuItem.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.TINY, Font.BOLD,
             gui.getImageLibrary().getScaleFactor()));
-        menuItem.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    gui.showColonyPanel(colony, null);
-                }
+        menuItem.addActionListener((ActionEvent ae) -> {
+                gui.showColonyPanel(colony, null);
             });
 
         add(menuItem);
 
         menuItem = Utility.localizedMenuItem("rename");
-        menuItem.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    freeColClient.getInGameController().rename(colony);
-                }
+        menuItem.addActionListener((ActionEvent ae) -> {
+                freeColClient.getInGameController().rename(colony);
             });
 
         add(menuItem);
@@ -565,11 +486,8 @@ public final class TilePopup extends JPopupMenu {
         menuItem.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
             FontLibrary.FontSize.TINY, Font.BOLD,
             gui.getImageLibrary().getScaleFactor()));
-        menuItem.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    gui.showIndianSettlementPanel(settlement);
-                }
+        menuItem.addActionListener((ActionEvent ae) -> {
+                gui.showIndianSettlementPanel(settlement);
             });
         add(menuItem);
         hasAnItem = true;
@@ -582,11 +500,8 @@ public final class TilePopup extends JPopupMenu {
      */
     private void addTile(final Tile tile) {
         JMenuItem menuItem = new JMenuItem(Messages.getName(tile));
-        menuItem.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    gui.showTilePanel(tile);
-                }
+        menuItem.addActionListener((ActionEvent ae) -> {
+                gui.showTilePanel(tile);
             });
 
         add(menuItem);
diff --git a/src/net/sf/freecol/client/gui/action/AboutAction.java b/src/net/sf/freecol/client/gui/action/AboutAction.java
index 8c764eea8..339b60437 100644
--- a/src/net/sf/freecol/client/gui/action/AboutAction.java
+++ b/src/net/sf/freecol/client/gui/action/AboutAction.java
@@ -51,7 +51,7 @@ public class AboutAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showAboutPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/AssignTradeRouteAction.java b/src/net/sf/freecol/client/gui/action/AssignTradeRouteAction.java
index 10e0e6fbf..a26106f5a 100644
--- a/src/net/sf/freecol/client/gui/action/AssignTradeRouteAction.java
+++ b/src/net/sf/freecol/client/gui/action/AssignTradeRouteAction.java
@@ -64,7 +64,7 @@ public class AssignTradeRouteAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         Unit unit = getGUI().getActiveUnit();
         if (unit != null) getGUI().showTradeRoutePanel(unit);
     }
diff --git a/src/net/sf/freecol/client/gui/action/BuildColonyAction.java b/src/net/sf/freecol/client/gui/action/BuildColonyAction.java
index 328b9c76f..20c7e08de 100644
--- a/src/net/sf/freecol/client/gui/action/BuildColonyAction.java
+++ b/src/net/sf/freecol/client/gui/action/BuildColonyAction.java
@@ -68,7 +68,7 @@ public class BuildColonyAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().buildColony(getGUI().getActiveUnit());
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/CenterAction.java b/src/net/sf/freecol/client/gui/action/CenterAction.java
index f3c1346ae..751133396 100644
--- a/src/net/sf/freecol/client/gui/action/CenterAction.java
+++ b/src/net/sf/freecol/client/gui/action/CenterAction.java
@@ -48,7 +48,7 @@ public class CenterAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().centerActiveUnit();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ChangeAction.java b/src/net/sf/freecol/client/gui/action/ChangeAction.java
index b0944ec9e..8c51a250e 100644
--- a/src/net/sf/freecol/client/gui/action/ChangeAction.java
+++ b/src/net/sf/freecol/client/gui/action/ChangeAction.java
@@ -89,7 +89,7 @@ public class ChangeAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         final Unit unit = getGUI().getActiveUnit();
         final Tile tile = unit.getTile();
 
diff --git a/src/net/sf/freecol/client/gui/action/ChangeWindowedModeAction.java b/src/net/sf/freecol/client/gui/action/ChangeWindowedModeAction.java
index 84d5b7d8a..90b22312e 100644
--- a/src/net/sf/freecol/client/gui/action/ChangeWindowedModeAction.java
+++ b/src/net/sf/freecol/client/gui/action/ChangeWindowedModeAction.java
@@ -75,7 +75,7 @@ public class ChangeWindowedModeAction extends SelectableAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         GUI gui = getGUI();
         if (gui == null) return;
         gui.changeWindowedMode(!gui.isWindowed());
diff --git a/src/net/sf/freecol/client/gui/action/ChatAction.java b/src/net/sf/freecol/client/gui/action/ChatAction.java
index 9dafbf861..186353faf 100644
--- a/src/net/sf/freecol/client/gui/action/ChatAction.java
+++ b/src/net/sf/freecol/client/gui/action/ChatAction.java
@@ -64,7 +64,7 @@ public class ChatAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showChatPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ClearOrdersAction.java b/src/net/sf/freecol/client/gui/action/ClearOrdersAction.java
index c21bbd85a..798461124 100644
--- a/src/net/sf/freecol/client/gui/action/ClearOrdersAction.java
+++ b/src/net/sf/freecol/client/gui/action/ClearOrdersAction.java
@@ -48,7 +48,7 @@ public class ClearOrdersAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().clearOrders(getGUI().getActiveUnit());
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ColopediaAction.java b/src/net/sf/freecol/client/gui/action/ColopediaAction.java
index 4a1945e3c..fa2612045 100644
--- a/src/net/sf/freecol/client/gui/action/ColopediaAction.java
+++ b/src/net/sf/freecol/client/gui/action/ColopediaAction.java
@@ -77,7 +77,7 @@ public class ColopediaAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showColopediaPanel(getId());
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ContinueAction.java b/src/net/sf/freecol/client/gui/action/ContinueAction.java
index a6c14ee36..276d51a95 100644
--- a/src/net/sf/freecol/client/gui/action/ContinueAction.java
+++ b/src/net/sf/freecol/client/gui/action/ContinueAction.java
@@ -55,7 +55,7 @@ public class ContinueAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         File lastSave = FreeColDirectories.getLastSaveGameFile();
         if (lastSave != null) {
             getGUI().removeInGameComponents();
diff --git a/src/net/sf/freecol/client/gui/action/DebugAction.java b/src/net/sf/freecol/client/gui/action/DebugAction.java
index 2cf350bef..d8f503691 100644
--- a/src/net/sf/freecol/client/gui/action/DebugAction.java
+++ b/src/net/sf/freecol/client/gui/action/DebugAction.java
@@ -66,7 +66,7 @@ public class DebugAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         if (shouldBeEnabled()) {
             igc().setInDebugMode();
             getConnectController().reconnect();
diff --git a/src/net/sf/freecol/client/gui/action/DeclareIndependenceAction.java b/src/net/sf/freecol/client/gui/action/DeclareIndependenceAction.java
index 3f3fd121d..98eb373ec 100644
--- a/src/net/sf/freecol/client/gui/action/DeclareIndependenceAction.java
+++ b/src/net/sf/freecol/client/gui/action/DeclareIndependenceAction.java
@@ -63,7 +63,7 @@ public class DeclareIndependenceAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().declareIndependence();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/DetermineHighSeasAction.java b/src/net/sf/freecol/client/gui/action/DetermineHighSeasAction.java
index a8732600f..8d46720fd 100644
--- a/src/net/sf/freecol/client/gui/action/DetermineHighSeasAction.java
+++ b/src/net/sf/freecol/client/gui/action/DetermineHighSeasAction.java
@@ -64,7 +64,7 @@ public class DetermineHighSeasAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         final Map map = getGame().getMap();
         
         Parameters p = getGUI().showParametersDialog();
diff --git a/src/net/sf/freecol/client/gui/action/DisbandUnitAction.java b/src/net/sf/freecol/client/gui/action/DisbandUnitAction.java
index 936469bbb..56539711b 100644
--- a/src/net/sf/freecol/client/gui/action/DisbandUnitAction.java
+++ b/src/net/sf/freecol/client/gui/action/DisbandUnitAction.java
@@ -50,7 +50,7 @@ public class DisbandUnitAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().disbandUnit(getGUI().getActiveUnit());
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/DisplayBordersAction.java b/src/net/sf/freecol/client/gui/action/DisplayBordersAction.java
index 520814ad0..eeda94b0f 100644
--- a/src/net/sf/freecol/client/gui/action/DisplayBordersAction.java
+++ b/src/net/sf/freecol/client/gui/action/DisplayBordersAction.java
@@ -51,8 +51,8 @@ public class DisplayBordersAction extends SelectableAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
-        setSelected(((JCheckBoxMenuItem) e.getSource()).isSelected());
+    public void actionPerformed(ActionEvent ae) {
+        setSelected(((JCheckBoxMenuItem)ae.getSource()).isSelected());
         setOption(isSelected());
         getGUI().refresh();
     }
diff --git a/src/net/sf/freecol/client/gui/action/DisplayGridAction.java b/src/net/sf/freecol/client/gui/action/DisplayGridAction.java
index a7ecd0625..95dec50da 100644
--- a/src/net/sf/freecol/client/gui/action/DisplayGridAction.java
+++ b/src/net/sf/freecol/client/gui/action/DisplayGridAction.java
@@ -51,8 +51,8 @@ public class DisplayGridAction extends SelectableAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
-        setSelected(((JCheckBoxMenuItem)e.getSource()).isSelected());
+    public void actionPerformed(ActionEvent ae) {
+        setSelected(((JCheckBoxMenuItem)ae.getSource()).isSelected());
         setOption(isSelected());
         getGUI().refresh();
     }
diff --git a/src/net/sf/freecol/client/gui/action/DisplayTileTextAction.java b/src/net/sf/freecol/client/gui/action/DisplayTileTextAction.java
index 81c65f130..93d71f140 100644
--- a/src/net/sf/freecol/client/gui/action/DisplayTileTextAction.java
+++ b/src/net/sf/freecol/client/gui/action/DisplayTileTextAction.java
@@ -94,8 +94,8 @@ public class DisplayTileTextAction extends SelectableAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
-        if (((JRadioButtonMenuItem) e.getSource()).isSelected()) {
+    public void actionPerformed(ActionEvent ae) {
+        if (((JRadioButtonMenuItem)ae.getSource()).isSelected()) {
             freeColClient.getClientOptions()
                 .setInteger(ClientOptions.DISPLAY_TILE_TEXT, display.ordinal());
             getGUI().refresh();
diff --git a/src/net/sf/freecol/client/gui/action/EndTurnAction.java b/src/net/sf/freecol/client/gui/action/EndTurnAction.java
index 828ddf738..9d0a6db50 100644
--- a/src/net/sf/freecol/client/gui/action/EndTurnAction.java
+++ b/src/net/sf/freecol/client/gui/action/EndTurnAction.java
@@ -50,7 +50,7 @@ public class EndTurnAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().endTurn(true);
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/EuropeAction.java b/src/net/sf/freecol/client/gui/action/EuropeAction.java
index 846a72acf..e125e69bf 100644
--- a/src/net/sf/freecol/client/gui/action/EuropeAction.java
+++ b/src/net/sf/freecol/client/gui/action/EuropeAction.java
@@ -62,7 +62,7 @@ public class EuropeAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showEuropePanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ExecuteGotoOrdersAction.java b/src/net/sf/freecol/client/gui/action/ExecuteGotoOrdersAction.java
index 9728d305a..62c375f1c 100644
--- a/src/net/sf/freecol/client/gui/action/ExecuteGotoOrdersAction.java
+++ b/src/net/sf/freecol/client/gui/action/ExecuteGotoOrdersAction.java
@@ -48,7 +48,7 @@ public class ExecuteGotoOrdersAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().executeGotoOrders();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/FindSettlementAction.java b/src/net/sf/freecol/client/gui/action/FindSettlementAction.java
index b96b1ef18..2fffdf4a8 100644
--- a/src/net/sf/freecol/client/gui/action/FindSettlementAction.java
+++ b/src/net/sf/freecol/client/gui/action/FindSettlementAction.java
@@ -48,7 +48,7 @@ public class FindSettlementAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showFindSettlementPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/FortifyAction.java b/src/net/sf/freecol/client/gui/action/FortifyAction.java
index f0253520b..a7dc00cce 100644
--- a/src/net/sf/freecol/client/gui/action/FortifyAction.java
+++ b/src/net/sf/freecol/client/gui/action/FortifyAction.java
@@ -63,7 +63,7 @@ public class FortifyAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().changeState(getGUI().getActiveUnit(),
             Unit.UnitState.FORTIFYING);
     }
diff --git a/src/net/sf/freecol/client/gui/action/GotoAction.java b/src/net/sf/freecol/client/gui/action/GotoAction.java
index fb76091a9..99040e589 100644
--- a/src/net/sf/freecol/client/gui/action/GotoAction.java
+++ b/src/net/sf/freecol/client/gui/action/GotoAction.java
@@ -62,7 +62,7 @@ public class GotoAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         Unit unit = getGUI().getActiveUnit();
         if (unit != null) {
             igc().selectDestination(unit);
diff --git a/src/net/sf/freecol/client/gui/action/GotoTileAction.java b/src/net/sf/freecol/client/gui/action/GotoTileAction.java
index 9c7f21850..02fe05c17 100644
--- a/src/net/sf/freecol/client/gui/action/GotoTileAction.java
+++ b/src/net/sf/freecol/client/gui/action/GotoTileAction.java
@@ -60,7 +60,7 @@ public class GotoTileAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().activateGotoPath();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ImprovementAction.java b/src/net/sf/freecol/client/gui/action/ImprovementAction.java
index 2a86d03fb..381d5d4d6 100644
--- a/src/net/sf/freecol/client/gui/action/ImprovementAction.java
+++ b/src/net/sf/freecol/client/gui/action/ImprovementAction.java
@@ -78,7 +78,7 @@ public class ImprovementAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         Unit unit = getGUI().getActiveUnit();
         if (unit == null) return;
 
diff --git a/src/net/sf/freecol/client/gui/action/LoadAction.java b/src/net/sf/freecol/client/gui/action/LoadAction.java
index a9a4e305d..c3e5a5e53 100644
--- a/src/net/sf/freecol/client/gui/action/LoadAction.java
+++ b/src/net/sf/freecol/client/gui/action/LoadAction.java
@@ -68,7 +68,7 @@ public class LoadAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         final Unit unit = getGUI().getActiveUnit();
         if (unit == null) return;
 
diff --git a/src/net/sf/freecol/client/gui/action/MapControlsAction.java b/src/net/sf/freecol/client/gui/action/MapControlsAction.java
index 1d75f27bf..22d1d0b47 100644
--- a/src/net/sf/freecol/client/gui/action/MapControlsAction.java
+++ b/src/net/sf/freecol/client/gui/action/MapControlsAction.java
@@ -64,8 +64,8 @@ public class MapControlsAction extends SelectableAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
-        setSelected(((AbstractButton)e.getSource()).isSelected());
+    public void actionPerformed(ActionEvent ae) {
+        setSelected(((AbstractButton)ae.getSource()).isSelected());
         setOption(isSelected());
         update();
     }
diff --git a/src/net/sf/freecol/client/gui/action/MapEditorAction.java b/src/net/sf/freecol/client/gui/action/MapEditorAction.java
index 8140e9d2a..79362ad64 100644
--- a/src/net/sf/freecol/client/gui/action/MapEditorAction.java
+++ b/src/net/sf/freecol/client/gui/action/MapEditorAction.java
@@ -48,7 +48,7 @@ public class MapEditorAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         freeColClient.getMapEditorController().startMapEditor();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/MiniMapToggleFogOfWarAction.java b/src/net/sf/freecol/client/gui/action/MiniMapToggleFogOfWarAction.java
index 1b442c228..3afbf8498 100644
--- a/src/net/sf/freecol/client/gui/action/MiniMapToggleFogOfWarAction.java
+++ b/src/net/sf/freecol/client/gui/action/MiniMapToggleFogOfWarAction.java
@@ -62,7 +62,7 @@ public class MiniMapToggleFogOfWarAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().miniMapToggleFogOfWarControls();
 
         if (freeColClient.getClientOptions().getBoolean(ClientOptions.MINIMAP_TOGGLE_FOG_OF_WAR)) {
diff --git a/src/net/sf/freecol/client/gui/action/MiniMapToggleViewAction.java b/src/net/sf/freecol/client/gui/action/MiniMapToggleViewAction.java
index b437d318f..35202ebc1 100644
--- a/src/net/sf/freecol/client/gui/action/MiniMapToggleViewAction.java
+++ b/src/net/sf/freecol/client/gui/action/MiniMapToggleViewAction.java
@@ -62,7 +62,7 @@ public class MiniMapToggleViewAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().miniMapToggleViewControls();
 
         if (freeColClient.getClientOptions().getBoolean(ClientOptions.MINIMAP_TOGGLE_BORDERS)) {
diff --git a/src/net/sf/freecol/client/gui/action/MiniMapZoomInAction.java b/src/net/sf/freecol/client/gui/action/MiniMapZoomInAction.java
index b1d3f44b1..6fe89c3c7 100644
--- a/src/net/sf/freecol/client/gui/action/MiniMapZoomInAction.java
+++ b/src/net/sf/freecol/client/gui/action/MiniMapZoomInAction.java
@@ -73,7 +73,7 @@ public class MiniMapZoomInAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().zoomInMapControls();
         update();
         getActionManager().getFreeColAction(MiniMapZoomOutAction.id).update();
diff --git a/src/net/sf/freecol/client/gui/action/MiniMapZoomOutAction.java b/src/net/sf/freecol/client/gui/action/MiniMapZoomOutAction.java
index 9c7874a84..4ff530e21 100644
--- a/src/net/sf/freecol/client/gui/action/MiniMapZoomOutAction.java
+++ b/src/net/sf/freecol/client/gui/action/MiniMapZoomOutAction.java
@@ -73,7 +73,7 @@ public class MiniMapZoomOutAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().zoomOutMapControls();
         update();
         getActionManager().getFreeColAction(MiniMapZoomInAction.id).update();
diff --git a/src/net/sf/freecol/client/gui/action/MoveAction.java b/src/net/sf/freecol/client/gui/action/MoveAction.java
index 26987bf47..5b1ac0fe9 100644
--- a/src/net/sf/freecol/client/gui/action/MoveAction.java
+++ b/src/net/sf/freecol/client/gui/action/MoveAction.java
@@ -69,7 +69,7 @@ public class MoveAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) { 
+    public void actionPerformed(ActionEvent ae) { 
         switch (getGUI().getViewMode()) {
         case GUI.MOVE_UNITS_MODE:
             igc().moveUnit(getGUI().getActiveUnit(), direction);
diff --git a/src/net/sf/freecol/client/gui/action/NewAction.java b/src/net/sf/freecol/client/gui/action/NewAction.java
index 7b011d965..50cfc5196 100644
--- a/src/net/sf/freecol/client/gui/action/NewAction.java
+++ b/src/net/sf/freecol/client/gui/action/NewAction.java
@@ -48,7 +48,7 @@ public class NewAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         if (freeColClient.isMapEditor()) {
             freeColClient.getMapEditorController().newMap();
         } else {
diff --git a/src/net/sf/freecol/client/gui/action/NewEmptyMapAction.java b/src/net/sf/freecol/client/gui/action/NewEmptyMapAction.java
index 8c8b96fdb..b7063678e 100644
--- a/src/net/sf/freecol/client/gui/action/NewEmptyMapAction.java
+++ b/src/net/sf/freecol/client/gui/action/NewEmptyMapAction.java
@@ -63,7 +63,7 @@ public class NewEmptyMapAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         Dimension size = getGUI().showMapSizeDialog();
         if (size == null) return;
         final Game game = getGame();
diff --git a/src/net/sf/freecol/client/gui/action/OpenAction.java b/src/net/sf/freecol/client/gui/action/OpenAction.java
index a13b7d36d..be539d1b9 100644
--- a/src/net/sf/freecol/client/gui/action/OpenAction.java
+++ b/src/net/sf/freecol/client/gui/action/OpenAction.java
@@ -48,7 +48,7 @@ public class OpenAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         if (!freeColClient.isMapEditor()) {
             igc().loadGame();
         } else {
diff --git a/src/net/sf/freecol/client/gui/action/PreferencesAction.java b/src/net/sf/freecol/client/gui/action/PreferencesAction.java
index 2d705d7e2..eae03a6c7 100644
--- a/src/net/sf/freecol/client/gui/action/PreferencesAction.java
+++ b/src/net/sf/freecol/client/gui/action/PreferencesAction.java
@@ -48,7 +48,7 @@ public class PreferencesAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showClientOptionsDialog();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/QuitAction.java b/src/net/sf/freecol/client/gui/action/QuitAction.java
index 79c2ada4a..e442036c0 100644
--- a/src/net/sf/freecol/client/gui/action/QuitAction.java
+++ b/src/net/sf/freecol/client/gui/action/QuitAction.java
@@ -48,7 +48,7 @@ public class QuitAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         freeColClient.askToQuit();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReconnectAction.java b/src/net/sf/freecol/client/gui/action/ReconnectAction.java
index 9be9c4d8b..d04b7f3d8 100644
--- a/src/net/sf/freecol/client/gui/action/ReconnectAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReconnectAction.java
@@ -48,7 +48,7 @@ public class ReconnectAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().reconnect();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/RenameAction.java b/src/net/sf/freecol/client/gui/action/RenameAction.java
index dae097387..3a89d4f30 100644
--- a/src/net/sf/freecol/client/gui/action/RenameAction.java
+++ b/src/net/sf/freecol/client/gui/action/RenameAction.java
@@ -48,7 +48,7 @@ public class RenameAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().rename(getGUI().getActiveUnit());
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportCargoAction.java b/src/net/sf/freecol/client/gui/action/ReportCargoAction.java
index 86168b066..3cc788092 100644
--- a/src/net/sf/freecol/client/gui/action/ReportCargoAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportCargoAction.java
@@ -48,7 +48,7 @@ public class ReportCargoAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportCargoPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportColonyAction.java b/src/net/sf/freecol/client/gui/action/ReportColonyAction.java
index 69eb3499d..ebb26a448 100644
--- a/src/net/sf/freecol/client/gui/action/ReportColonyAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportColonyAction.java
@@ -48,7 +48,7 @@ public class ReportColonyAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportColonyPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportContinentalCongressAction.java b/src/net/sf/freecol/client/gui/action/ReportContinentalCongressAction.java
index 8c4683cf2..387de28de 100644
--- a/src/net/sf/freecol/client/gui/action/ReportContinentalCongressAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportContinentalCongressAction.java
@@ -48,7 +48,7 @@ public class ReportContinentalCongressAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportContinentalCongressPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportEducationAction.java b/src/net/sf/freecol/client/gui/action/ReportEducationAction.java
index c50184e9b..250d5bd09 100644
--- a/src/net/sf/freecol/client/gui/action/ReportEducationAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportEducationAction.java
@@ -48,7 +48,7 @@ public class ReportEducationAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportEducationPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportExplorationAction.java b/src/net/sf/freecol/client/gui/action/ReportExplorationAction.java
index 83f4324a7..ea32e4b93 100644
--- a/src/net/sf/freecol/client/gui/action/ReportExplorationAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportExplorationAction.java
@@ -48,7 +48,7 @@ public class ReportExplorationAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         freeColClient.getGUI().showReportExplorationPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportForeignAction.java b/src/net/sf/freecol/client/gui/action/ReportForeignAction.java
index da9a4927e..74f8fc39f 100644
--- a/src/net/sf/freecol/client/gui/action/ReportForeignAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportForeignAction.java
@@ -48,7 +48,7 @@ public class ReportForeignAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportForeignAffairPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportHighScoresAction.java b/src/net/sf/freecol/client/gui/action/ReportHighScoresAction.java
index 685bab740..810a562d8 100644
--- a/src/net/sf/freecol/client/gui/action/ReportHighScoresAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportHighScoresAction.java
@@ -48,7 +48,7 @@ public class ReportHighScoresAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().displayHighScores(null);
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportHistoryAction.java b/src/net/sf/freecol/client/gui/action/ReportHistoryAction.java
index e6214dd85..ff2816d69 100644
--- a/src/net/sf/freecol/client/gui/action/ReportHistoryAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportHistoryAction.java
@@ -48,7 +48,7 @@ public class ReportHistoryAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportHistoryPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportIndianAction.java b/src/net/sf/freecol/client/gui/action/ReportIndianAction.java
index abca471fd..ce5d98089 100644
--- a/src/net/sf/freecol/client/gui/action/ReportIndianAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportIndianAction.java
@@ -48,7 +48,7 @@ public class ReportIndianAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportIndianPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportLabourAction.java b/src/net/sf/freecol/client/gui/action/ReportLabourAction.java
index c4b568a5b..879568ce9 100644
--- a/src/net/sf/freecol/client/gui/action/ReportLabourAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportLabourAction.java
@@ -49,7 +49,7 @@ public class ReportLabourAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         if (getClientOptions().getInteger(ClientOptions.LABOUR_REPORT)
             == ClientOptions.LABOUR_REPORT_CLASSIC) {
             getGUI().showReportLabourPanel();
diff --git a/src/net/sf/freecol/client/gui/action/ReportMilitaryAction.java b/src/net/sf/freecol/client/gui/action/ReportMilitaryAction.java
index 1f021f73a..af40e6dab 100644
--- a/src/net/sf/freecol/client/gui/action/ReportMilitaryAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportMilitaryAction.java
@@ -48,7 +48,7 @@ public class ReportMilitaryAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportMilitaryPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportNavalAction.java b/src/net/sf/freecol/client/gui/action/ReportNavalAction.java
index 1d53fc23e..0d8dbafad 100644
--- a/src/net/sf/freecol/client/gui/action/ReportNavalAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportNavalAction.java
@@ -48,7 +48,7 @@ public class ReportNavalAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportNavalPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportProductionAction.java b/src/net/sf/freecol/client/gui/action/ReportProductionAction.java
index f3be6756a..a946d17ef 100644
--- a/src/net/sf/freecol/client/gui/action/ReportProductionAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportProductionAction.java
@@ -48,7 +48,7 @@ public class ReportProductionAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportProductionPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportReligionAction.java b/src/net/sf/freecol/client/gui/action/ReportReligionAction.java
index bf10a473b..dc5eebddc 100644
--- a/src/net/sf/freecol/client/gui/action/ReportReligionAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportReligionAction.java
@@ -48,7 +48,7 @@ public class ReportReligionAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportReligiousPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportRequirementsAction.java b/src/net/sf/freecol/client/gui/action/ReportRequirementsAction.java
index 4e14b9f38..8901e8ea0 100644
--- a/src/net/sf/freecol/client/gui/action/ReportRequirementsAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportRequirementsAction.java
@@ -48,7 +48,7 @@ public class ReportRequirementsAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportRequirementsPanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportTradeAction.java b/src/net/sf/freecol/client/gui/action/ReportTradeAction.java
index d0d88188d..766b770c0 100644
--- a/src/net/sf/freecol/client/gui/action/ReportTradeAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportTradeAction.java
@@ -48,7 +48,7 @@ public class ReportTradeAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showReportTradePanel();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ReportTurnAction.java b/src/net/sf/freecol/client/gui/action/ReportTurnAction.java
index 8acb1d972..b4208145c 100644
--- a/src/net/sf/freecol/client/gui/action/ReportTurnAction.java
+++ b/src/net/sf/freecol/client/gui/action/ReportTurnAction.java
@@ -48,7 +48,7 @@ public class ReportTurnAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().displayTurnReportMessages();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/RetireAction.java b/src/net/sf/freecol/client/gui/action/RetireAction.java
index c1431e03d..dedb8330b 100644
--- a/src/net/sf/freecol/client/gui/action/RetireAction.java
+++ b/src/net/sf/freecol/client/gui/action/RetireAction.java
@@ -63,7 +63,7 @@ public class RetireAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         freeColClient.retire();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/SaveAction.java b/src/net/sf/freecol/client/gui/action/SaveAction.java
index c2817fd00..f24d7f480 100644
--- a/src/net/sf/freecol/client/gui/action/SaveAction.java
+++ b/src/net/sf/freecol/client/gui/action/SaveAction.java
@@ -63,7 +63,7 @@ public class SaveAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         if (!freeColClient.isMapEditor()) {
             igc().saveGame();
         } else {
diff --git a/src/net/sf/freecol/client/gui/action/SaveAndQuitAction.java b/src/net/sf/freecol/client/gui/action/SaveAndQuitAction.java
index 31ce57c24..71678a2f3 100644
--- a/src/net/sf/freecol/client/gui/action/SaveAndQuitAction.java
+++ b/src/net/sf/freecol/client/gui/action/SaveAndQuitAction.java
@@ -48,7 +48,7 @@ public class SaveAndQuitAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         if (freeColClient.isMapEditor()) {
             freeColClient.getMapEditorController().saveGame();
         } else {
diff --git a/src/net/sf/freecol/client/gui/action/ScaleMapAction.java b/src/net/sf/freecol/client/gui/action/ScaleMapAction.java
index 65718ebb7..f5ec13a61 100644
--- a/src/net/sf/freecol/client/gui/action/ScaleMapAction.java
+++ b/src/net/sf/freecol/client/gui/action/ScaleMapAction.java
@@ -121,7 +121,7 @@ public class ScaleMapAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         Dimension ms = getGUI().showScaleMapSizeDialog();
         if (ms != null) {
             scaleMapTo(ms.width, ms.height);
diff --git a/src/net/sf/freecol/client/gui/action/ShowDifficultyAction.java b/src/net/sf/freecol/client/gui/action/ShowDifficultyAction.java
index 234690194..535322c04 100644
--- a/src/net/sf/freecol/client/gui/action/ShowDifficultyAction.java
+++ b/src/net/sf/freecol/client/gui/action/ShowDifficultyAction.java
@@ -48,7 +48,7 @@ public class ShowDifficultyAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showDifficultyDialog();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ShowGameOptionsAction.java b/src/net/sf/freecol/client/gui/action/ShowGameOptionsAction.java
index 74af1918e..168c21d11 100644
--- a/src/net/sf/freecol/client/gui/action/ShowGameOptionsAction.java
+++ b/src/net/sf/freecol/client/gui/action/ShowGameOptionsAction.java
@@ -48,7 +48,7 @@ public class ShowGameOptionsAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showGameOptionsDialog(false, false);
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ShowMainAction.java b/src/net/sf/freecol/client/gui/action/ShowMainAction.java
index fb9105497..92ef5e8c1 100644
--- a/src/net/sf/freecol/client/gui/action/ShowMainAction.java
+++ b/src/net/sf/freecol/client/gui/action/ShowMainAction.java
@@ -51,7 +51,7 @@ public class ShowMainAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         if (!getGUI().confirmStopGame()) return;
         getConnectController().quitGame(true);
         getGUI().removeInGameComponents();
diff --git a/src/net/sf/freecol/client/gui/action/ShowMapGeneratorOptionsAction.java b/src/net/sf/freecol/client/gui/action/ShowMapGeneratorOptionsAction.java
index f88375a57..49995bcb7 100644
--- a/src/net/sf/freecol/client/gui/action/ShowMapGeneratorOptionsAction.java
+++ b/src/net/sf/freecol/client/gui/action/ShowMapGeneratorOptionsAction.java
@@ -48,7 +48,7 @@ public class ShowMapGeneratorOptionsAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showMapGeneratorOptionsDialog(false);
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/SkipUnitAction.java b/src/net/sf/freecol/client/gui/action/SkipUnitAction.java
index e804e776a..8a85bbf76 100644
--- a/src/net/sf/freecol/client/gui/action/SkipUnitAction.java
+++ b/src/net/sf/freecol/client/gui/action/SkipUnitAction.java
@@ -51,7 +51,7 @@ public class SkipUnitAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().changeState(getGUI().getActiveUnit(), Unit.UnitState.SKIPPED);
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/TilePopupAction.java b/src/net/sf/freecol/client/gui/action/TilePopupAction.java
index c32861155..3a28d9a08 100644
--- a/src/net/sf/freecol/client/gui/action/TilePopupAction.java
+++ b/src/net/sf/freecol/client/gui/action/TilePopupAction.java
@@ -48,7 +48,7 @@ public class TilePopupAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showTilePopUpAtSelectedTile();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ToggleViewModeAction.java b/src/net/sf/freecol/client/gui/action/ToggleViewModeAction.java
index 99483e412..57e0b206d 100644
--- a/src/net/sf/freecol/client/gui/action/ToggleViewModeAction.java
+++ b/src/net/sf/freecol/client/gui/action/ToggleViewModeAction.java
@@ -49,7 +49,7 @@ public class ToggleViewModeAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().toggleViewMode();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/TradeRouteAction.java b/src/net/sf/freecol/client/gui/action/TradeRouteAction.java
index d23436fe4..af186a351 100644
--- a/src/net/sf/freecol/client/gui/action/TradeRouteAction.java
+++ b/src/net/sf/freecol/client/gui/action/TradeRouteAction.java
@@ -48,7 +48,7 @@ public class TradeRouteAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().showTradeRoutePanel(null);
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/UnloadAction.java b/src/net/sf/freecol/client/gui/action/UnloadAction.java
index ec4f62e55..8bba506f1 100644
--- a/src/net/sf/freecol/client/gui/action/UnloadAction.java
+++ b/src/net/sf/freecol/client/gui/action/UnloadAction.java
@@ -89,7 +89,7 @@ public class UnloadAction extends MapboardAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         Unit carrier = getUnit();
         if (carrier != null) igc().unload(carrier);
     }
diff --git a/src/net/sf/freecol/client/gui/action/WaitAction.java b/src/net/sf/freecol/client/gui/action/WaitAction.java
index 8891c73ee..f1f5399e5 100644
--- a/src/net/sf/freecol/client/gui/action/WaitAction.java
+++ b/src/net/sf/freecol/client/gui/action/WaitAction.java
@@ -50,7 +50,7 @@ public class WaitAction extends UnitAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         igc().waitUnit();
     }
 }
diff --git a/src/net/sf/freecol/client/gui/action/ZoomInAction.java b/src/net/sf/freecol/client/gui/action/ZoomInAction.java
index c25c14723..01f333a0d 100644
--- a/src/net/sf/freecol/client/gui/action/ZoomInAction.java
+++ b/src/net/sf/freecol/client/gui/action/ZoomInAction.java
@@ -63,7 +63,7 @@ public class ZoomInAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().zoomInMap();
         update();
         getActionManager().getFreeColAction(ZoomOutAction.id).update();
diff --git a/src/net/sf/freecol/client/gui/action/ZoomOutAction.java b/src/net/sf/freecol/client/gui/action/ZoomOutAction.java
index 3b39da004..9fb43ffc7 100644
--- a/src/net/sf/freecol/client/gui/action/ZoomOutAction.java
+++ b/src/net/sf/freecol/client/gui/action/ZoomOutAction.java
@@ -63,7 +63,7 @@ public class ZoomOutAction extends FreeColAction {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent ae) {
         getGUI().zoomOutMap();
         update();
         getActionManager().getFreeColAction(ZoomInAction.id).update();
diff --git a/src/net/sf/freecol/client/gui/menu/DebugMenu.java b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
index c861336af..8cd2edaed 100644
--- a/src/net/sf/freecol/client/gui/menu/DebugMenu.java
+++ b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
@@ -97,8 +97,8 @@ public class DebugMenu extends JMenu {
         sc.setOpaque(false);
         sc.setMnemonic(KeyEvent.VK_S);
         this.add(sc);
-        sc.addActionListener((ActionEvent e) -> {
-                boolean val = ((JCheckBoxMenuItem)e.getSource()).isSelected();
+        sc.addActionListener((ActionEvent ae) -> {
+                boolean val = ((JCheckBoxMenuItem)ae.getSource()).isSelected();
                 FreeColDebugger.setDebugDisplayCoordinates(val);
                 gui.refresh();
             });
@@ -110,7 +110,7 @@ public class DebugMenu extends JMenu {
         reveal.setOpaque(false);
         reveal.setMnemonic(KeyEvent.VK_R);
         this.add(reveal);
-        reveal.addActionListener((ActionEvent e) -> {
+        reveal.addActionListener((ActionEvent ae) -> {
                 DebugUtils.revealMap(freeColClient, true);
                 reveal.setEnabled(false);
             });
@@ -122,7 +122,7 @@ public class DebugMenu extends JMenu {
         hide.setOpaque(false);
         //hide.setMnemonic(KeyEvent.VK_R);
         this.add(hide);
-        hide.addActionListener((ActionEvent e) -> {
+        hide.addActionListener((ActionEvent ae) -> {
                 DebugUtils.revealMap(freeColClient, false);
                 hide.setEnabled(false);
             });
@@ -134,8 +134,8 @@ public class DebugMenu extends JMenu {
                 game.getMap().getSearchTrace());
         searchTrace.setOpaque(false);
         this.add(searchTrace);
-        searchTrace.addActionListener((ActionEvent e) -> {
-                boolean val = ((JCheckBoxMenuItem)e.getSource()).isSelected();
+        searchTrace.addActionListener((ActionEvent ae) -> {
+                boolean val = ((JCheckBoxMenuItem)ae.getSource()).isSelected();
                 game.getMap().setSearchTrace(val);
             });
 
@@ -150,7 +150,7 @@ public class DebugMenu extends JMenu {
         cv1.setMnemonic(KeyEvent.VK_C);
         cvpMenu.add(cv1);
         bg.add(cv1);
-        cv1.addActionListener((ActionEvent e) -> {
+        cv1.addActionListener((ActionEvent ae) -> {
                 FreeColDebugger.setDebugDisplayColonyValuePlayer(null);
                 gui.refresh();
             });
@@ -165,7 +165,7 @@ public class DebugMenu extends JMenu {
             cvpMenu.add(cv2);
             bg.add(cv2);
             final Player fp = p;
-            cv2.addActionListener((ActionEvent e) -> {
+            cv2.addActionListener((ActionEvent ae) -> {
                     FreeColDebugger.setDebugDisplayColonyValuePlayer(fp);
                     gui.refresh();
                 });
@@ -177,7 +177,7 @@ public class DebugMenu extends JMenu {
         skipTurns.setOpaque(false);
         skipTurns.setMnemonic(KeyEvent.VK_T);
         this.add(skipTurns);
-        skipTurns.addActionListener((ActionEvent e) -> {
+        skipTurns.addActionListener((ActionEvent ae) -> {
                 DebugUtils.skipTurns(freeColClient);
             });
         DebugUtils.addSkipChangeListener(freeColClient, this, skipTurns);
@@ -187,7 +187,7 @@ public class DebugMenu extends JMenu {
         addBuilding.setOpaque(false);
         addBuilding.setMnemonic(KeyEvent.VK_B);
         this.add(addBuilding);
-        addBuilding.addActionListener((ActionEvent e) -> {
+        addBuilding.addActionListener((ActionEvent ae) -> {
                 DebugUtils.addBuildings(freeColClient, addBuilding.getText());
             });
         addBuilding.setEnabled(hasServer);
@@ -196,7 +196,7 @@ public class DebugMenu extends JMenu {
         addFather.setOpaque(false);
         addFather.setMnemonic(KeyEvent.VK_F);
         this.add(addFather);
-        addFather.addActionListener((ActionEvent e) -> {
+        addFather.addActionListener((ActionEvent ae) -> {
                 DebugUtils.addFathers(freeColClient, addFather.getText());
             });
         addFather.setEnabled(hasServer);
@@ -205,7 +205,7 @@ public class DebugMenu extends JMenu {
         runMonarch.setOpaque(false);
         runMonarch.setMnemonic(KeyEvent.VK_M);
         this.add(runMonarch);
-        runMonarch.addActionListener((ActionEvent e) -> {
+        runMonarch.addActionListener((ActionEvent ae) -> {
                 DebugUtils.setMonarchAction(freeColClient, runMonarch.getText());
             });
         runMonarch.setEnabled(hasServer);
@@ -214,7 +214,7 @@ public class DebugMenu extends JMenu {
         addGold.setOpaque(false);
         addGold.setMnemonic(KeyEvent.VK_G);
         this.add(addGold);
-        addGold.addActionListener((ActionEvent e) -> {
+        addGold.addActionListener((ActionEvent ae) -> {
                 DebugUtils.addGold(freeColClient);
             });
         addGold.setEnabled(hasServer);
@@ -223,7 +223,7 @@ public class DebugMenu extends JMenu {
         addCrosses.setOpaque(false);
         addCrosses.setMnemonic(KeyEvent.VK_I);
         this.add(addCrosses);
-        addCrosses.addActionListener((ActionEvent e) -> {
+        addCrosses.addActionListener((ActionEvent ae) -> {
                 DebugUtils.addImmigration(freeColClient);
             });
         addCrosses.setEnabled(hasServer);
@@ -232,7 +232,7 @@ public class DebugMenu extends JMenu {
         giveBells.setOpaque(false);
         giveBells.setMnemonic(KeyEvent.VK_L);
         this.add(giveBells);
-        giveBells.addActionListener((ActionEvent e) -> {
+        giveBells.addActionListener((ActionEvent ae) -> {
                 DebugUtils.addLiberty(freeColClient);
             });
         giveBells.setEnabled(hasServer);
@@ -242,7 +242,7 @@ public class DebugMenu extends JMenu {
         rng.setOpaque(false);
         rng.setMnemonic(KeyEvent.VK_X);
         this.add(rng);
-        rng.addActionListener((ActionEvent e) -> {
+        rng.addActionListener((ActionEvent ae) -> {
                 DebugUtils.stepRNG(freeColClient);
             });
         rng.setEnabled(hasServer);
@@ -251,7 +251,7 @@ public class DebugMenu extends JMenu {
         final JMenuItem du = Utility.localizedMenuItem("menuBar.debug.displayUnits");
         du.setOpaque(false);
         this.add(du);
-        du.addActionListener((ActionEvent e) -> {
+        du.addActionListener((ActionEvent ae) -> {
                 DebugUtils.displayUnits(freeColClient);
             });
         du.setEnabled(true);
@@ -262,14 +262,14 @@ public class DebugMenu extends JMenu {
         panelMenu.setOpaque(false);
 
         final JMenuItem monarchDialog = Utility.localizedMenuItem("menuBar.debug.displayMonarchPanel");
-        monarchDialog.addActionListener((ActionEvent e) -> {
+        monarchDialog.addActionListener((ActionEvent ae) -> {
                 gui.showMonarchDialog(Monarch.MonarchAction.RAISE_TAX_WAR,
                                       null, player.getMonarchKey());
             });
         panelMenu.add(monarchDialog);
 
         final JMenuItem errorMessage = Utility.localizedMenuItem("menuBar.debug.displayErrorMessage");
-        errorMessage.addActionListener((ActionEvent e) -> {
+        errorMessage.addActionListener((ActionEvent ae) -> {
                 gui.showErrorMessage(ERROR_MESSAGE);
             });
         panelMenu.add(errorMessage);
@@ -280,7 +280,7 @@ public class DebugMenu extends JMenu {
         europeStatus.setOpaque(false);
         europeStatus.setMnemonic(KeyEvent.VK_E);
         this.add(europeStatus);
-        europeStatus.addActionListener((ActionEvent e) -> {
+        europeStatus.addActionListener((ActionEvent ae) -> {
                 DebugUtils.displayEurope(freeColClient);
             });
         europeStatus.setEnabled(hasServer);
@@ -294,8 +294,8 @@ public class DebugMenu extends JMenu {
         dam.setOpaque(false);
         dam.setMnemonic(KeyEvent.VK_A);
         this.add(dam);
-        dam.addActionListener((ActionEvent e) -> {
-                boolean val = ((JCheckBoxMenuItem) e.getSource()).isSelected();
+        dam.addActionListener((ActionEvent ae) -> {
+                boolean val = ((JCheckBoxMenuItem)ae.getSource()).isSelected();
                 FreeColDebugger.setDebugShowMission(val);
                 dami.setEnabled(val);
                 gui.refresh();
@@ -309,7 +309,7 @@ public class DebugMenu extends JMenu {
             Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
                 | InputEvent.ALT_MASK));
         this.add(useAI);
-        useAI.addActionListener((ActionEvent e) -> {
+        useAI.addActionListener((ActionEvent ae) -> {
                 DebugUtils.useAI(freeColClient);
             });
         useAI.setEnabled(hasServer);
@@ -317,8 +317,8 @@ public class DebugMenu extends JMenu {
         dami.setOpaque(false);
         dami.setMnemonic(KeyEvent.VK_I);
         this.add(dami);
-        dami.addActionListener((ActionEvent e) -> {
-                boolean val = ((JCheckBoxMenuItem) e.getSource()).isSelected();
+        dami.addActionListener((ActionEvent ae) -> {
+                boolean val = ((JCheckBoxMenuItem)ae.getSource()).isSelected();
                 FreeColDebugger.setDebugShowMissionInfo(val);
                 dami.setEnabled(val);
                 gui.refresh();
@@ -334,7 +334,7 @@ public class DebugMenu extends JMenu {
             Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
                 | InputEvent.ALT_MASK));
         this.add(compareMaps);
-        compareMaps.addActionListener((ActionEvent e) -> {
+        compareMaps.addActionListener((ActionEvent ae) -> {
                 DebugUtils.checkDesyncAction(freeColClient);
             });
         compareMaps.setEnabled(hasServer);
@@ -343,7 +343,7 @@ public class DebugMenu extends JMenu {
         showResourceKeys.setOpaque(false);
         //showResourceKeys.setMnemonic(KeyEvent.VK_R);
         this.add(showResourceKeys);
-        showResourceKeys.addActionListener((ActionEvent e) -> {
+        showResourceKeys.addActionListener((ActionEvent ae) -> {
                 StringBuilder builder = new StringBuilder();
                 Map<String, ImageResource> resources
                     = ResourceManager.getImageResources();
@@ -364,7 +364,7 @@ public class DebugMenu extends JMenu {
         statistics.setOpaque(false);
         //statistics.setMnemonic(KeyEvent.VK_I);
         this.add(statistics);
-        statistics.addActionListener((ActionEvent e) -> {
+        statistics.addActionListener((ActionEvent ae) -> {
                 gui.showStatisticsPanel();
             });
         statistics.setEnabled(true);
@@ -374,7 +374,7 @@ public class DebugMenu extends JMenu {
         gc.setOpaque(false);
         //gc.setMnemonic(KeyEvent.VK_G);
         this.add(gc);
-        gc.addActionListener((ActionEvent e) -> {
+        gc.addActionListener((ActionEvent ae) -> {
                 System.gc();
             });
         gc.setEnabled(true);
diff --git a/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java b/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
index d043f5c9c..0e73821fa 100644
--- a/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
+++ b/src/net/sf/freecol/client/gui/menu/FreeColMenuTest.java
@@ -79,8 +79,8 @@ public class FreeColMenuTest implements ActionListener, ItemListener {
     }
 
     @Override
-    public void actionPerformed(ActionEvent e) {
-        JMenuItem source = (JMenuItem)(e.getSource());
+    public void actionPerformed(ActionEvent ae) {
+        JMenuItem source = (JMenuItem)ae.getSource();
         String s = "Action event detected."
                    + newline
                    + "    Event source: " + source.getText()
diff --git a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
index a14c62594..3dc84af9b 100644
--- a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
@@ -101,10 +101,9 @@ public class MapEditorMenuBar extends FreeColMenuBar {
         menu.add(getMenuItem(OpenAction.id));
         menu.add(getMenuItem(SaveAction.id));
         JMenuItem playItem = Utility.localizedMenuItem("startGame");
-        playItem.addActionListener((ActionEvent event) -> {
+        playItem.addActionListener((ActionEvent ae) -> {
                 File startFile = FreeColDirectories.getStartMapFile();
-                freeColClient.getMapEditorController()
-                    .saveGame(startFile);
+                freeColClient.getMapEditorController().saveGame(startFile);
                 OptionGroup options = freeColClient.getGame()
                     .getMapGeneratorOptions();
                 FileOption fileOption = (FileOption)options
diff --git a/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java b/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java
index f342428de..550d3e651 100644
--- a/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java
+++ b/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java
@@ -49,23 +49,6 @@ public final class AudioMixerOptionUI extends OptionUI<AudioMixerOption> {
     private final JButton button2;
     private final JLabel currentMixerLabel;
 
-    private final ActionListener aHandler = new ActionListener () {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (e.getSource() == button1) {
-                    gui.playSound("sound.event.buildingComplete");
-                } else if (e.getSource() == button2) {
-                    gui.playSound("sound.intro.general");
-                } else if (e.getSource() == cbox) {
-                    MixerWrapper value = (MixerWrapper) cbox.getSelectedItem();
-                    if (getOption().getValue() != value) {
-                        getOption().setValue(value);
-                        updateMixerLabel();
-                    }
-                }
-            }
-        };
-
 
     /**
      * Creates a new <code>AudioMixerOptionUI</code> for the given
@@ -95,18 +78,31 @@ public final class AudioMixerOptionUI extends OptionUI<AudioMixerOption> {
 
         button1 = Utility.localizedButton("test");
         panel.add(button1);
-        button1.addActionListener(aHandler);
 
         button2 = Utility.localizedButton("music");
         panel.add(button2);
-        button2.addActionListener(aHandler);
 
         cbox.add(super.getJLabel());
         cbox.setModel(new DefaultComboBoxModel<>(getOption().getChoices()
                 .toArray(new MixerWrapper[0])));
         reset();
-
         cbox.setEnabled(editable);
+
+        ActionListener aHandler = (ActionEvent ae) -> {
+            if (ae.getSource() == button1) {
+                gui.playSound("sound.event.buildingComplete");
+            } else if (ae.getSource() == button2) {
+                gui.playSound("sound.intro.general");
+            } else if (ae.getSource() == cbox) {
+                MixerWrapper value = (MixerWrapper) cbox.getSelectedItem();
+                if (getOption().getValue() != value) {
+                    getOption().setValue(value);
+                    updateMixerLabel();
+                }
+            }
+        };
+        button1.addActionListener(aHandler);
+        button2.addActionListener(aHandler);
         cbox.addActionListener(aHandler);
 
         initialize();
diff --git a/src/net/sf/freecol/client/gui/option/FileOptionUI.java b/src/net/sf/freecol/client/gui/option/FileOptionUI.java
index 195a87424..59e7eff67 100644
--- a/src/net/sf/freecol/client/gui/option/FileOptionUI.java
+++ b/src/net/sf/freecol/client/gui/option/FileOptionUI.java
@@ -63,23 +63,17 @@ public final class FileOptionUI extends OptionUI<FileOption>  {
 
         JButton browse = Utility.localizedButton("browse");
         if (editable) {
-            browse.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        File file = gui.showLoadSaveFileDialog();
-                        if (file != null) setValue(file);
-                    }
+            browse.addActionListener((ActionEvent ae) -> {
+                    File f = gui.showLoadSaveFileDialog();
+                    if (f != null) setValue(f);
                 });
         }
         panel.add(browse);
 
         JButton remove = Utility.localizedButton("remove");
         if (editable) {
-            remove.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        setValue(null);
-                    }
+            remove.addActionListener((ActionEvent ae) -> {
+                    setValue(null);
                 });
         }
         panel.add(remove);
diff --git a/src/net/sf/freecol/client/gui/option/FreeColActionUI.java b/src/net/sf/freecol/client/gui/option/FreeColActionUI.java
index b8eff5c79..43db00be3 100644
--- a/src/net/sf/freecol/client/gui/option/FreeColActionUI.java
+++ b/src/net/sf/freecol/client/gui/option/FreeColActionUI.java
@@ -168,11 +168,11 @@ public final class FreeColActionUI extends OptionUI<FreeColAction>
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent evt) {
-        if (evt.getSource() == recordButton) {
+    public void actionPerformed(ActionEvent ae) {
+        if (ae.getSource() == recordButton) {
             bl.startBlinking();
             bl.requestFocus();
-        } else if (evt.getSource() == removeButton) {
+        } else if (ae.getSource() == removeButton) {
             bl.stopBlinking();
             bl.setText(" ");
             keyStroke = null;
@@ -264,7 +264,7 @@ public final class FreeColActionUI extends OptionUI<FreeColAction>
          * {@inheritDoc}
          */
         @Override
-        public void actionPerformed(ActionEvent e) {
+        public void actionPerformed(ActionEvent ae) {
             if (!hasFocus()) stopBlinking();
 
             if (blinkOn) {
diff --git a/src/net/sf/freecol/client/gui/option/ListOptionUI.java b/src/net/sf/freecol/client/gui/option/ListOptionUI.java
index ff1157f50..407c35ec6 100644
--- a/src/net/sf/freecol/client/gui/option/ListOptionUI.java
+++ b/src/net/sf/freecol/client/gui/option/ListOptionUI.java
@@ -110,66 +110,49 @@ public final class ListOptionUI<T> extends OptionUI<ListOption<T>>
             this.panel.add(button);
         }
 
-        addButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    AbstractOption<T> oldValue
-                        = list.getSelectedValue();
-                    if (oldValue == null) oldValue = option.getTemplate();
-                    try {
-                        AbstractOption<T> newValue = (oldValue == null) ? null
-                            : oldValue.clone();
-                        if (gui.showEditOptionDialog(newValue)) {
-                            if (option.canAdd(newValue)) {
-                                model.addElement(newValue);
-                                list.setSelectedValue(newValue, true);
-                                list.repaint();
-                            }
-                        }
-                    } catch (CloneNotSupportedException e) {
-                        logger.log(Level.WARNING, "Can not clone: " + oldValue,
-                            e);
-                    }
-                }
-            });
-        editButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    Object object = list.getSelectedValue();
-                    if (object != null) {
-                        if (gui.showEditOptionDialog((Option)object)) {
+        addButton.addActionListener((ActionEvent ae) -> {
+                AbstractOption<T> oldValue = list.getSelectedValue();
+                if (oldValue == null) oldValue = option.getTemplate();
+                try {
+                    AbstractOption<T> newValue = (oldValue == null) ? null
+                        : oldValue.clone();
+                    if (gui.showEditOptionDialog(newValue)) {
+                        if (option.canAdd(newValue)) {
+                            model.addElement(newValue);
+                            list.setSelectedValue(newValue, true);
                             list.repaint();
                         }
                     }
+                } catch (CloneNotSupportedException e) {
+                    logger.log(Level.WARNING, "Can not clone: " + oldValue, e);
                 }
             });
-        removeButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    model.removeElementAt(list.getSelectedIndex());
+        editButton.addActionListener((ActionEvent ae) -> {
+                Object object = list.getSelectedValue();
+                if (object != null) {
+                    if (gui.showEditOptionDialog((Option)object)) {
+                        list.repaint();
+                    }
                 }
             });
-        upButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    if (list.getSelectedIndex() == 0) return;
-                    final int index = list.getSelectedIndex();
-                    final AbstractOption<T> temp = model.getElementAt(index);
-                    model.setElementAt(model.getElementAt(index-1), index);
-                    model.setElementAt(temp, index-1);
-                    list.setSelectedIndex(index-1);
-                }
+        removeButton.addActionListener((ActionEvent ae) -> {
+                model.removeElementAt(list.getSelectedIndex());
             });
-        downButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    if (list.getSelectedIndex() == model.getSize() - 1) return;
-                    final int index = list.getSelectedIndex();
-                    final AbstractOption<T> temp = model.getElementAt(index);
-                    model.setElementAt(model.getElementAt(index+1), index);
-                    model.setElementAt(temp, index+1);
-                    list.setSelectedIndex(index+1);
-                }
+        upButton.addActionListener((ActionEvent ae) -> {
+                if (list.getSelectedIndex() == 0) return;
+                final int index = list.getSelectedIndex();
+                final AbstractOption<T> temp = model.getElementAt(index);
+                model.setElementAt(model.getElementAt(index-1), index);
+                model.setElementAt(temp, index-1);
+                list.setSelectedIndex(index-1);
+            });
+        downButton.addActionListener((ActionEvent ae) -> {
+                if (list.getSelectedIndex() == model.getSize() - 1) return;
+                final int index = list.getSelectedIndex();
+                final AbstractOption<T> temp = model.getElementAt(index);
+                model.setElementAt(model.getElementAt(index+1), index);
+                model.setElementAt(temp, index+1);
+                list.setSelectedIndex(index+1);
             });
 
         list.addListSelectionListener(this);
diff --git a/src/net/sf/freecol/client/gui/panel/AboutPanel.java b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
index 16bdb289e..2cdc12651 100644
--- a/src/net/sf/freecol/client/gui/panel/AboutPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
@@ -162,8 +162,8 @@ public final class AboutPanel extends FreeColPanel {
      * @param event
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        String url = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String url = ae.getActionCommand();
         if (SITE_URL.equals(url) || PROJECT_URL.equals(url)) {
             String os = System.getProperty("os.name");
             // FIXME: move this to OS utilities
@@ -191,7 +191,7 @@ public final class AboutPanel extends FreeColPanel {
                 // couldn't start browser
             }
         } else {
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
         }
     }
 }
diff --git a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
index 3678014f3..80b9ae642 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
@@ -552,15 +552,15 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
         BuildQueueMouseAdapter adapter = new BuildQueueMouseAdapter(true);
         Action addAction = new AbstractAction() {
                 @Override
-                public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent ae) {
                     JList<BuildableType> bql
                         = BuildQueuePanel.this.buildQueueList;
                     DefaultListModel<BuildableType> model
                         = (DefaultListModel<BuildableType>)bql.getModel();
                     JList<? extends BuildableType> btl
-                        = (e.getSource() == BuildQueuePanel.this.unitList)
+                        = (ae.getSource() == BuildQueuePanel.this.unitList)
                         ? BuildQueuePanel.this.unitList
-                        : (e.getSource() == BuildQueuePanel.this.buildingList)
+                        : (ae.getSource() == BuildQueuePanel.this.buildingList)
                         ? BuildQueuePanel.this.buildingList
                         : null;
                     if (btl != null) {
@@ -619,7 +619,7 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
         this.buildQueueList.getActionMap().put("delete",
             new AbstractAction() {
                 @Override
-                public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent ae) {
                     JList<BuildableType> bql = BuildQueuePanel.
                             this.buildQueueList;
                     for (BuildableType bt : bql.getSelectedValuesList()) {
@@ -1073,10 +1073,10 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
+    public void actionPerformed(ActionEvent ae) {
         final String FAIL = "FAIL";
         if (this.colony.getOwner() == getMyPlayer()) {
-            String command = event.getActionCommand();
+            String command = ae.getActionCommand();
             List<BuildableType> buildables = getBuildableTypes(this
                     .buildQueueList);
             while (!buildables.isEmpty()
@@ -1098,7 +1098,7 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
                     igc().payForBuilding(this.colony);
                     break;
                 default:
-                    super.actionPerformed(event);
+                    super.actionPerformed(ae);
                     break;
             }
         }
diff --git a/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java b/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
index bd0fe0164..0dba4b463 100644
--- a/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
@@ -127,31 +127,25 @@ public final class CaptureGoodsDialog extends FreeColDialog<List<Goods>> {
         this.maxCargo = winner.getSpaceLeft();
 
         this.allButton = Utility.localizedButton("all");
-        this.allButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    JList<GoodsItem> gl = CaptureGoodsDialog.this.goodsList;
-                    for (int i = 0; i < gl.getModel().getSize()
-                             && i < CaptureGoodsDialog.this.maxCargo; i++) {
-                        GoodsItem gi = gl.getModel().getElementAt(i);
-                        gi.setSelected(true);
-                        updateComponents();
-                    }
+        this.allButton.addActionListener((ActionEvent ae) -> {
+                JList<GoodsItem> gl = CaptureGoodsDialog.this.goodsList;
+                for (int i = 0; i < gl.getModel().getSize()
+                         && i < CaptureGoodsDialog.this.maxCargo; i++) {
+                    GoodsItem gi = gl.getModel().getElementAt(i);
+                    gi.setSelected(true);
+                    updateComponents();
                 }
             });
         this.allButton.setMnemonic('a');
         this.allButton.setActionCommand(this.allButton.getText());
  
         this.noneButton = Utility.localizedButton("none");
-        this.noneButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    JList<GoodsItem> gl = CaptureGoodsDialog.this.goodsList;
-                    for (int i = 0; i < gl.getModel().getSize(); i++) {
-                        GoodsItem gi = gl.getModel().getElementAt(i);
-                        gi.setSelected(false);
-                        updateComponents();
-                    }
+        this.noneButton.addActionListener((ActionEvent ae) -> {
+                JList<GoodsItem> gl = CaptureGoodsDialog.this.goodsList;
+                for (int i = 0; i < gl.getModel().getSize(); i++) {
+                    GoodsItem gi = gl.getModel().getElementAt(i);
+                    gi.setSelected(false);
+                    updateComponents();
                 }
             });
         this.noneButton.setMnemonic('n');
diff --git a/src/net/sf/freecol/client/gui/panel/ChatPanel.java b/src/net/sf/freecol/client/gui/panel/ChatPanel.java
index df9fbe9ae..66cb416c8 100644
--- a/src/net/sf/freecol/client/gui/panel/ChatPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ChatPanel.java
@@ -95,8 +95,8 @@ public final class ChatPanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         try {
             switch (Integer.parseInt(command)) {
             case CHAT:
@@ -106,7 +106,7 @@ public final class ChatPanel extends FreeColPanel {
                 getGUI().removeFromCanvas(this);
                 break;
             default:
-                super.actionPerformed(event);
+                super.actionPerformed(ae);
             }
         } catch (NumberFormatException e) {
             logger.warning("Invalid ActionEvent, not a number: " + command);
diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 977091eb1..5850d8a1b 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -414,13 +414,10 @@ public final class ColonyPanel extends PortPanel
 
         final GUI gui = getGUI();
         this.nameBox.setEnabled(isEditable());
-        this.nameBox.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    final Colony newColony = (Colony)nameBox.getSelectedItem();
-                    closeColonyPanel();
-                    gui.showColonyPanel(newColony, null);
-                }
+        this.nameBox.addActionListener((ActionEvent ae) -> {
+                final Colony newColony = (Colony)nameBox.getSelectedItem();
+                closeColonyPanel();
+                gui.showColonyPanel(newColony, null);
             });
         updateNetProductionPanel();
 
@@ -677,12 +674,9 @@ public final class ColonyPanel extends PortPanel
             }
             String menuTitle = sb.toString();
             subMenu = new JMenuItem(menuTitle, unitIcon);
-            subMenu.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        unitMenu.addMenuItems(new UnitLabel(freeColClient, unit));
-                        unitMenu.show(getGUI().getCanvas(), 0, 0);
-                    }
+            subMenu.addActionListener((ActionEvent ae) -> {
+                    unitMenu.addMenuItems(new UnitLabel(freeColClient, unit));
+                    unitMenu.show(getGUI().getCanvas(), 0, 0);
                 });
             unitNumber++;
             colonyUnitsMenu.add(subMenu);
@@ -694,13 +688,10 @@ public final class ColonyPanel extends PortPanel
                 String menuTitle = unit.getDescription()
                     + " " + Messages.message("colonyPanel.inPort");
                 subMenu = new JMenuItem(menuTitle, unitIcon);
-                subMenu.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
+                subMenu.addActionListener((ActionEvent ae) -> {
                         unitMenu.addMenuItems(new UnitLabel(freeColClient, unit));
                         unitMenu.show(getGUI().getCanvas(), 0, 0);
-                    }
-                });
+                    });
                 unitNumber++;
                 colonyUnitsMenu.add(subMenu);
                 if (unit.getUnitList() != null) {
@@ -710,13 +701,10 @@ public final class ColonyPanel extends PortPanel
                             + " " + Messages.message("cargoOnCarrier")
                             + " " + unit.getDescription();
                         subMenu = new JMenuItem(menuTitle, unitIcon);
-                        subMenu.addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent e) {
+                        subMenu.addActionListener((ActionEvent ae) -> {
                                 unitMenu.addMenuItems(new UnitLabel(freeColClient, innerUnit));
                                 unitMenu.show(getGUI().getCanvas(), 0, 0);
-                            }
-                        });
+                            });
                         unitNumber++;
                         colonyUnitsMenu.add(subMenu);
                     }
@@ -726,13 +714,10 @@ public final class ColonyPanel extends PortPanel
                 String menuTitle = unit.getDescription()
                     + " " + Messages.message("colonyPanel.outsideColony");
                 subMenu = new JMenuItem(menuTitle, unitIcon);
-                subMenu.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
+                subMenu.addActionListener((ActionEvent ae) -> {
                         unitMenu.addMenuItems(new UnitLabel(freeColClient, unit));
                         unitMenu.show(getGUI().getCanvas(), 0, 0);
-                    }
-                });
+                    });
                 unitNumber++;
                 colonyUnitsMenu.add(subMenu);
             }
@@ -966,9 +951,9 @@ public final class ColonyPanel extends PortPanel
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
+    public void actionPerformed(ActionEvent ae) {
         final Colony colony = getColony();
-        final String command = event.getActionCommand();
+        final String command = ae.getActionCommand();
         final Unit unit = getSelectedUnit();
 
         if (OK.equals(command)) {
@@ -1030,7 +1015,7 @@ public final class ColonyPanel extends PortPanel
                 colony.setOccupationTrace(!colony.getOccupationTrace());
                 break;
             default:
-                super.actionPerformed(event);
+                super.actionPerformed(ae);
             }
         }
     }
diff --git a/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java b/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java
index 8c4495b4f..ece89a376 100644
--- a/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java
@@ -221,8 +221,8 @@ public final class ColopediaPanel extends FreeColPanel
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         if (OK.equals(command)) {
             getGUI().removeFromCanvas(this);
         } else {
diff --git a/src/net/sf/freecol/client/gui/panel/ColorCellEditor.java b/src/net/sf/freecol/client/gui/panel/ColorCellEditor.java
index eb1e2c0f2..52a2f6b4f 100644
--- a/src/net/sf/freecol/client/gui/panel/ColorCellEditor.java
+++ b/src/net/sf/freecol/client/gui/panel/ColorCellEditor.java
@@ -96,8 +96,8 @@ public final class ColorCellEditor extends AbstractCellEditor
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         SwingGUI gui = (SwingGUI)freeColClient.getGUI();
         if (null != command) switch (command) {
             case EDIT:
diff --git a/src/net/sf/freecol/client/gui/panel/CompactLabourReport.java b/src/net/sf/freecol/client/gui/panel/CompactLabourReport.java
index 6634c9452..fb1418195 100644
--- a/src/net/sf/freecol/client/gui/panel/CompactLabourReport.java
+++ b/src/net/sf/freecol/client/gui/panel/CompactLabourReport.java
@@ -128,11 +128,8 @@ public final class CompactLabourReport extends ReportPanel {
             }
         }
 
-        return createButton(text, new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
+        return createButton(text, (ActionEvent ae) -> {
                 getGUI().showColonyPanel(colony, null);
-            }
         });
     }
 
@@ -397,32 +394,34 @@ public final class CompactLabourReport extends ReportPanel {
         int row = 1;
         JLabel summaryLabel = Utility.localizedLabel("report.labour.summary");
         summaryLabel.setBorder(Utility.LEFTCELLBORDER);
-        reportPanel.add(summaryLabel, "cell " + COLONY_COLUMN + " " + row + " 1 " + unitTotal.getRowCount());
+        reportPanel.add(summaryLabel, "cell " + COLONY_COLUMN + " " + row
+            + " 1 " + unitTotal.getRowCount());
 
         row = addLocationData(unitTotal, null, row);
 
         for (Colony colony : getFreeColClient().getMySortedColonies()) {
-            LabourData.LocationData colonyData = unitData.getDetails().get(colony);
+            LabourData.LocationData colonyData
+                = unitData.getDetails().get(colony);
             if (colonyData != null) {
-                reportPanel.add(createColonyButton(colony), "cell " + COLONY_COLUMN + " "
-                                + row + " 1 " + colonyData.getRowCount());
+                reportPanel.add(createColonyButton(colony),
+                    "cell " + COLONY_COLUMN + " " + row
+                    + " 1 " + colonyData.getRowCount());
                 row = addLocationData(colonyData, colony, row);
             }
         }
         LabourData.LocationData europe = unitData.getUnitsInEurope();
         if (europe.getRowCount() > 0) {
-            JButton button = createButton(Messages.getName(getMyPlayer().getEurope()),
-                                          new ActionListener() {
-                                              @Override
-                                              public void actionPerformed(ActionEvent e) {
-                                                  getGUI().showEuropePanel();
-                                              }
-                                          });
-            reportPanel.add(button, "cell " + COLONY_COLUMN + " " + row + " 1 " + europe.getRowCount());
+            String nam = Messages.getName(getMyPlayer().getEurope());
+            JButton button = createButton(nam,
+                (ActionEvent ae) -> { getGUI().showEuropePanel(); });
+            reportPanel.add(button, "cell " + COLONY_COLUMN + " " + row
+                + " 1 " + europe.getRowCount());
             row = addLocationData(europe, null, row);
         }
-        row = addNonLinkedLocation(unitData.getUnitsOnLand(), "report.labour.onLand", row);
-        row = addNonLinkedLocation(unitData.getUnitsAtSea(), "report.labour.atSea", row);
+        row = addNonLinkedLocation(unitData.getUnitsOnLand(),
+                                   "report.labour.onLand", row);
+        row = addNonLinkedLocation(unitData.getUnitsAtSea(),
+                                   "report.labour.atSea", row);
 
         reportPanel.add(Utility.localizedLabel("report.labour.canTrain"),
                         "cell 1 " + row + " " + COLUMNS + " 1");
@@ -590,7 +589,8 @@ public final class CompactLabourReport extends ReportPanel {
     }
 
     private JLabel createNonCountedLabel(int otherAmateurs) {
-        JLabel label = createNumberLabel(otherAmateurs, "report.labour.notCounted.tooltip");
+        JLabel label = createNumberLabel(otherAmateurs,
+                                         "report.labour.notCounted.tooltip");
         label.setForeground(Color.GRAY);
         return label;
     }
@@ -603,13 +603,11 @@ public final class CompactLabourReport extends ReportPanel {
         return label;
     }
 
-    private JButton createUnitNameButton(String name, final LabourData.UnitData unitData) {
-        JButton button = createButton(name, new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
+    private JButton createUnitNameButton(String name,
+                                         LabourData.UnitData unitData) {
+        JButton button = createButton(name, (ActionEvent ae) -> {
                 getGUI().showCompactLabourReport(unitData);
-            }
-        });
+            });
 
         if (!unitData.isSummary()) {
             button.setIcon(new ImageIcon(
@@ -620,18 +618,23 @@ public final class CompactLabourReport extends ReportPanel {
     }
 
     private GoodsType getGoodsType() {
-        return isSummary() ? null : unitData.getUnitType().getExpertProduction();
+        return (isSummary()) ? null
+            : unitData.getUnitType().getExpertProduction();
     }
 
     /**
-     * @return if this is the location summary, grouped by unit type
+     * Is this an overview/location summary?
+     *
+     * @return True if this is the location summary.
      */
     private boolean isOverview() {
         return unitData == null;
     }
 
     /**
-     * @return if we are any summary
+     * Is this a summary?
+     *
+     * @return True if this is any sort of summary.
      */
     private boolean isSummary() {
         return isOverview() || unitData.isSummary();
diff --git a/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java b/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java
index 84e4906a9..c974d8429 100644
--- a/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java
@@ -392,8 +392,8 @@ public class ConfirmDeclarationDialog extends FreeColDialog<List<String>>
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
-        ColorButton button = (ColorButton)e.getSource();
+    public void actionPerformed(ActionEvent ae) {
+        ColorButton button = (ColorButton)ae.getSource();
         Color color = JColorChooser.showDialog(this, this.label.getText(),
                                                button.getBackground());
         button.setColor(color);
diff --git a/src/net/sf/freecol/client/gui/panel/DeclarationPanel.java b/src/net/sf/freecol/client/gui/panel/DeclarationPanel.java
index 386450c57..04d4c1687 100644
--- a/src/net/sf/freecol/client/gui/panel/DeclarationPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/DeclarationPanel.java
@@ -95,11 +95,8 @@ public final class DeclarationPanel extends FreeColPanel {
 
         add(signaturePanel);
     
-        Timer t = new Timer(START_DELAY, new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    signaturePanel.startAnimation();
-                }
+        Timer t = new Timer(START_DELAY, (ActionEvent ae) -> {
+                signaturePanel.startAnimation();
             });
         t.setRepeats(false);
         t.start();
@@ -112,19 +109,16 @@ public final class DeclarationPanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         if (ANIMATION_STOPPED.equals(command)) {
-            Timer t = new Timer(FINISH_DELAY, new ActionListener() {
-                @Override
-                    public void actionPerformed(ActionEvent e) {
-                        getGUI().removeFromCanvas(DeclarationPanel.this);
-                    }
+            Timer t = new Timer(FINISH_DELAY, (x) -> {
+                    getGUI().removeFromCanvas(DeclarationPanel.this);
                 });
             t.setRepeats(false);
             t.start();
         } else {
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
         }
     }
 
@@ -151,7 +145,8 @@ public final class DeclarationPanel extends FreeColPanel {
 
         private final FAFile faFile;
 
-        private final ArrayList<ActionListener> actionListeners = new ArrayList<>();
+        private final ArrayList<ActionListener> actionListeners
+            = new ArrayList<>();
 
         private Point[] points = null;
 
@@ -258,22 +253,19 @@ public final class DeclarationPanel extends FreeColPanel {
          * @see #addActionListener(ActionListener)
          */
         public void startAnimation() {
-            ActionListener taskPerformer = new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent evt) {
-                    if (counter < points.length - 1) {
-                        counter += 20;
-                        if (counter > points.length) {
-                            counter = points.length - 1;
-                            ((Timer) evt.getSource()).stop();
-                            notifyStopped();
-                        }
-                        validate();
-                        repaint();
-                    } else {
-                        ((Timer)evt.getSource()).stop();
+            ActionListener taskPerformer = (ActionEvent ae) -> {
+                if (counter < points.length - 1) {
+                    counter += 20;
+                    if (counter > points.length) {
+                        counter = points.length - 1;
+                        ((Timer)ae.getSource()).stop();
                         notifyStopped();
                     }
+                    validate();
+                    repaint();
+                } else {
+                    ((Timer)ae.getSource()).stop();
+                    notifyStopped();
                 }
             };
             new Timer(ANIMATION_DELAY, taskPerformer).start();
diff --git a/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java b/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java
index d1423f0e8..b5909d146 100644
--- a/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java
@@ -126,11 +126,8 @@ public final class DifficultyDialog extends OptionsDialog
      * @param button The <code>JButton</code> to add the action to.
      */
     private void addResetAction(JButton button) {
-        button.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    getOptionUI().reset();
-                }
+        button.addActionListener((ActionEvent ae) -> {
+                getOptionUI().reset();
             });
     }
 
@@ -140,16 +137,13 @@ public final class DifficultyDialog extends OptionsDialog
      * @param button The <code>JButton</code> to add the action to.
      */
     private void addLoadAction(JButton button) {
-        button.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    File dir = FreeColDirectories.getOptionsDirectory();
-                    File file = getGUI().showLoadDialog(dir, filters);
-                    if (file != null && load(file)) {
-                        invalidate();
-                        validate();
-                        repaint();
-                    }
+        button.addActionListener((ActionEvent ae) -> {
+                File dir = FreeColDirectories.getOptionsDirectory();
+                File file = getGUI().showLoadDialog(dir, filters);
+                if (file != null && load(file)) {
+                    invalidate();
+                    validate();
+                    repaint();
                 }
             });
     }
@@ -160,16 +154,13 @@ public final class DifficultyDialog extends OptionsDialog
      * @param button The <code>JButton</code> to add the action to.
      */
     private void addSaveAction(JButton button) {
-        button.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    File dir = FreeColDirectories.getOptionsDirectory();
-                    File file = getGUI().showSaveDialog(dir, filters,
-                        getDefaultFileName(), ".xml");
-                    if (file != null) {
-                        getOptionUI().updateOption();
-                        save(file);
-                    }
+        button.addActionListener((ActionEvent ae) -> {
+                File dir = FreeColDirectories.getOptionsDirectory();
+                File file = getGUI().showSaveDialog(dir, filters,
+                    getDefaultFileName(), ".xml");
+                if (file != null) {
+                    getOptionUI().updateOption();
+                    save(file);
                 }
             });
     }
diff --git a/src/net/sf/freecol/client/gui/panel/EndTurnDialog.java b/src/net/sf/freecol/client/gui/panel/EndTurnDialog.java
index 6b17190cb..f3f0a6a16 100644
--- a/src/net/sf/freecol/client/gui/panel/EndTurnDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/EndTurnDialog.java
@@ -165,7 +165,7 @@ public final class EndTurnDialog extends FreeColConfirmDialog {
                                         "select");
         this.unitList.getActionMap().put("select", new AbstractAction() {
                 @Override
-                public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent ae) {
                     selectUnit();
                 }
             });
@@ -173,7 +173,7 @@ public final class EndTurnDialog extends FreeColConfirmDialog {
                                         "quit");
         this.unitList.getActionMap().put("quit", new AbstractAction() {
                 @Override
-                public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent ae) {
                     EndTurnDialog.this.setValue(options.get(1));
                 }
             });
diff --git a/src/net/sf/freecol/client/gui/panel/ErrorPanel.java b/src/net/sf/freecol/client/gui/panel/ErrorPanel.java
index 05d809799..939a478c6 100644
--- a/src/net/sf/freecol/client/gui/panel/ErrorPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ErrorPanel.java
@@ -105,12 +105,12 @@ public final class ErrorPanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         if (SHOW.equals(command)) {
             getGUI().showLogFilePanel();
         } else {
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
         }
     }
 }
diff --git a/src/net/sf/freecol/client/gui/panel/EuropePanel.java b/src/net/sf/freecol/client/gui/panel/EuropePanel.java
index ea185bbc2..bd3b1af25 100644
--- a/src/net/sf/freecol/client/gui/panel/EuropePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/EuropePanel.java
@@ -838,8 +838,8 @@ public final class EuropePanel extends PortPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         EuropeAction act = EuropeAction.valueOf(command);
         switch (act) {
         case EXIT:
@@ -861,7 +861,7 @@ public final class EuropePanel extends PortPanel {
             unloadAction();
             break;
         default:
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
             break;
         }
     }
diff --git a/src/net/sf/freecol/client/gui/panel/FindSettlementPanel.java b/src/net/sf/freecol/client/gui/panel/FindSettlementPanel.java
index 1567521c7..ec9a09edf 100644
--- a/src/net/sf/freecol/client/gui/panel/FindSettlementPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/FindSettlementPanel.java
@@ -111,7 +111,7 @@ public final class FindSettlementPanel extends FreeColPanel
         this.settlementList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         Action selectAction = new AbstractAction() {
                 @Override
-                public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent ae) {
                     selectSettlement();
                 }
             };
@@ -120,7 +120,7 @@ public final class FindSettlementPanel extends FreeColPanel
         this.settlementList.getActionMap().put("select", selectAction);
         Action quitAction = new AbstractAction() {
                 @Override
-                public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent ae) {
                     getGUI().removeFromCanvas(FindSettlementPanel.this);
                 }
             };
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColPanel.java b/src/net/sf/freecol/client/gui/panel/FreeColPanel.java
index 12d5507cf..faa7e0f3a 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColPanel.java
@@ -220,6 +220,7 @@ public abstract class FreeColPanel extends MigPanel implements ActionListener {
                 public void propertyChange(PropertyChangeEvent e) {
                     if ("closing".equals(e.getPropertyName())) {
                         runnable.run();
+                        // Lambda unsuitable due to use of "this"
                         FreeColPanel.this.removePropertyChangeListener(this);
                     }
                 }
@@ -232,8 +233,8 @@ public abstract class FreeColPanel extends MigPanel implements ActionListener {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         if (OK.equals(command)) {
             getGUI().removeFromCanvas(this);
         } else {
diff --git a/src/net/sf/freecol/client/gui/panel/InformationPanel.java b/src/net/sf/freecol/client/gui/panel/InformationPanel.java
index 0c4c64593..089b90e56 100644
--- a/src/net/sf/freecol/client/gui/panel/InformationPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InformationPanel.java
@@ -94,11 +94,8 @@ public class InformationPanel extends FreeColPanel {
                 .template("informationPanel.display")
                 .addStringTemplate("%object%", disp));
             final FreeColObject fco = fcos[i];
-            button.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        gui.displayObject(fco);
-                    }
+            button.addActionListener((ActionEvent ae) -> {
+                    gui.displayObject(fco);
                 });
             textPanel.add(button, "skip");
         }
diff --git a/src/net/sf/freecol/client/gui/panel/LoadDialog.java b/src/net/sf/freecol/client/gui/panel/LoadDialog.java
index 8dc868e20..4a146dbc5 100644
--- a/src/net/sf/freecol/client/gui/panel/LoadDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/LoadDialog.java
@@ -68,15 +68,12 @@ public final class LoadDialog extends FreeColDialog<File> {
         fileChooser.setDialogType(JFileChooser.OPEN_DIALOG);
         fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         fileChooser.setFileHidingEnabled(false);
-        fileChooser.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    final String cmd = event.getActionCommand();
-                    File value = (JFileChooser.APPROVE_SELECTION.equals(cmd))
-                        ? ((JFileChooser)event.getSource()).getSelectedFile()
-                        : cancelFile;
-                    setValue(value);
-                }
+        fileChooser.addActionListener((ActionEvent ae) -> {
+                final String cmd = ae.getActionCommand();
+                File value = (JFileChooser.APPROVE_SELECTION.equals(cmd))
+                    ? ((JFileChooser)ae.getSource()).getSelectedFile()
+                    : cancelFile;
+                setValue(value);
             });
 
         List<ChoiceItem<File>> c = choices();
diff --git a/src/net/sf/freecol/client/gui/panel/MainPanel.java b/src/net/sf/freecol/client/gui/panel/MainPanel.java
index a6808604b..5a9288efc 100644
--- a/src/net/sf/freecol/client/gui/panel/MainPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MainPanel.java
@@ -98,7 +98,7 @@ public final class MainPanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
+    public void actionPerformed(ActionEvent ae) {
         // The actions are handled implicitly by the JButton/FreeColActions
         getGUI().removeFromCanvas(this);
     }
diff --git a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
index 855bea0b7..657b35bf4 100644
--- a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
@@ -163,19 +163,18 @@ public final class MapEditorTransformPanel extends FreeColPanel {
         button.setToolTipText(text);
         button.setOpaque(false);
         group.add(button);
-        button.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    MapEditorController ctlr = getFreeColClient().getMapEditorController();
-                    MapTransform newMapTransform = null;
-                    if(ctlr.getMapTransform() != mt){
-                        newMapTransform = mt;
-                    }
-                    ctlr.setMapTransform(newMapTransform);
-                    if(newMapTransform == null && mt != null){
-                        //select the invisible button, de-selecting all others
-                        group.setSelected(group.getElements().nextElement().getModel(),true);
-                    }
+        button.addActionListener((ActionEvent ae) -> {
+                MapEditorController ctlr
+                    = getFreeColClient().getMapEditorController();
+                MapTransform newMapTransform = null;
+                if (ctlr.getMapTransform() != mt) {
+                    newMapTransform = mt;
+                }
+                ctlr.setMapTransform(newMapTransform);
+                if (newMapTransform == null && mt != null) {
+                    //select the invisible button, de-selecting all others
+                    group.setSelected(group.getElements().nextElement()
+                        .getModel(), true);
                 }
             });
         button.setBorder(null);
diff --git a/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java b/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
index fc85817ac..43a7177a3 100644
--- a/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
@@ -92,11 +92,8 @@ public final class MapGeneratorOptionsDialog extends OptionsDialog {
                 for (final File file : files) {
                     JButton mapButton = makeMapButton(file);
                     if (mapButton == null) continue;
-                    mapButton.addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent e) {
-                                updateFile(file);
-                            }
+                    mapButton.addActionListener((ActionEvent ae) -> {
+                            updateFile(file);
                         });
                     mapPanel.add(mapButton);
                 }
diff --git a/src/net/sf/freecol/client/gui/panel/MonarchDialog.java b/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
index 5d1ba68b1..c56bdeef0 100644
--- a/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
@@ -88,11 +88,8 @@ public final class MonarchDialog extends FreeColDialog<Boolean> {
         if (action == MonarchAction.RAISE_TAX_ACT
             || action == MonarchAction.RAISE_TAX_WAR) {
             JButton helpButton = Utility.localizedButton("help");
-            helpButton.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        getGUI().showColopediaPanel("colopedia.concepts.taxes");
-                    }
+            helpButton.addActionListener((ActionEvent ae) -> {
+                    getGUI().showColopediaPanel("colopedia.concepts.taxes");
                 });
             panel.add(helpButton, "tag help");
         }
diff --git a/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java b/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
index 8e6389ac3..22b9bed67 100644
--- a/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
@@ -100,7 +100,7 @@ public final class NegotiationDialog extends FreeColDialog<DiplomaticTrade> {
          * {@inheritDoc}
          */
         @Override
-        public void actionPerformed(ActionEvent e) {
+        public void actionPerformed(ActionEvent ae) {
             agreement.remove(item);
             updateDialog();
         }
@@ -193,8 +193,8 @@ public final class NegotiationDialog extends FreeColDialog<DiplomaticTrade> {
          * {@inheritDoc}
          */
         @Override
-        public void actionPerformed(ActionEvent event) {
-            final String command = event.getActionCommand();
+        public void actionPerformed(ActionEvent ae) {
+            final String command = ae.getActionCommand();
             if (null != command) switch (command) {
                 case ADD:
                     NegotiationDialog.this.addColonyTradeItem(source,
@@ -273,8 +273,8 @@ public final class NegotiationDialog extends FreeColDialog<DiplomaticTrade> {
          * {@inheritDoc}
          */
         @Override
-        public void actionPerformed(ActionEvent event) {
-            final String command = event.getActionCommand();
+        public void actionPerformed(ActionEvent ae) {
+            final String command = ae.getActionCommand();
             if (null != command) switch (command) {
                 case ADD:
                     int amount = ((Integer)spinner.getValue());
@@ -400,8 +400,8 @@ public final class NegotiationDialog extends FreeColDialog<DiplomaticTrade> {
          * {@inheritDoc}
          */
         @Override
-        public void actionPerformed(ActionEvent event) {
-            final String command = event.getActionCommand();
+        public void actionPerformed(ActionEvent ae) {
+            final String command = ae.getActionCommand();
             if (null != command) switch (command) {
                 case ADD:
                     NegotiationDialog.this.addGoodsTradeItem(source,
@@ -519,8 +519,8 @@ public final class NegotiationDialog extends FreeColDialog<DiplomaticTrade> {
          * {@inheritDoc}
          */
         @Override
-        public void actionPerformed(ActionEvent event) {
-            final String command = event.getActionCommand();
+        public void actionPerformed(ActionEvent ae) {
+            final String command = ae.getActionCommand();
             if (null != command) switch (command) {
                 case ADD:
                     Player victim = (Player)victimBox.getSelectedItem();
@@ -641,8 +641,8 @@ public final class NegotiationDialog extends FreeColDialog<DiplomaticTrade> {
          * {@inheritDoc}
          */
         @Override
-        public void actionPerformed(ActionEvent event) {
-            final String command = event.getActionCommand();
+        public void actionPerformed(ActionEvent ae) {
+            final String command = ae.getActionCommand();
             if (null != command) switch (command) {
                 case ADD:
                     Stance stance = (Stance)stanceBox.getSelectedItem();
@@ -761,8 +761,8 @@ public final class NegotiationDialog extends FreeColDialog<DiplomaticTrade> {
          * {@inheritDoc}
          */
         @Override
-        public void actionPerformed(ActionEvent event) {
-            final String command = event.getActionCommand();
+        public void actionPerformed(ActionEvent ae) {
+            final String command = ae.getActionCommand();
             if (null != command) switch (command) {
                 case ADD:
                     NegotiationDialog.this.addUnitTradeItem(source,
diff --git a/src/net/sf/freecol/client/gui/panel/NewPanel.java b/src/net/sf/freecol/client/gui/panel/NewPanel.java
index bd984457b..d1feec56f 100644
--- a/src/net/sf/freecol/client/gui/panel/NewPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/NewPanel.java
@@ -217,11 +217,8 @@ public final class NewPanel extends FreeColPanel
         this.serverPortLabel = Utility.localizedLabel("newPanel.startServerOnPort");
         this.serverPortField
             = new JTextField(Integer.toString(FreeCol.getServerPort()));
-        this.serverPortField.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    getSelectedPort(NewPanel.this.serverPortField);
-                }
+        this.serverPortField.addActionListener((ActionEvent ae) -> {
+                getSelectedPort(NewPanel.this.serverPortField);
             });
 
         this.rulesLabel = Utility.localizedLabel("rules");
@@ -264,11 +261,8 @@ public final class NewPanel extends FreeColPanel
         this.joinPortLabel = Utility.localizedLabel("port");
         this.joinPortField
             = new JTextField(Integer.toString(FreeCol.getServerPort()));
-        this.joinPortField.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    getSelectedPort(NewPanel.this.joinPortField);
-                }
+        this.joinPortField.addActionListener((ActionEvent ae) -> {
+                getSelectedPort(NewPanel.this.joinPortField);
             });
 
         okButton.setActionCommand(String.valueOf(NewPanelAction.OK));
@@ -505,10 +499,10 @@ public final class NewPanel extends FreeColPanel
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
+    public void actionPerformed(ActionEvent ae) {
         final ConnectController cc = getFreeColClient().getConnectController();
         final SwingGUI gui = getGUI();
-        final String command = event.getActionCommand();
+        final String command = ae.getActionCommand();
 
         switch (Enum.valueOf(NewPanelAction.class, command)) {
         case OK:
@@ -559,7 +553,7 @@ public final class NewPanel extends FreeColPanel
             enableComponents();
             break;
         default:
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
             break;
         }
     }
diff --git a/src/net/sf/freecol/client/gui/panel/NewUnitPanel.java b/src/net/sf/freecol/client/gui/panel/NewUnitPanel.java
index 17ae3d2bd..9433e10c8 100644
--- a/src/net/sf/freecol/client/gui/panel/NewUnitPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/NewUnitPanel.java
@@ -142,10 +142,10 @@ public class NewUnitPanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        String command = ae.getActionCommand();
         if (OK.equals(command)) {
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
         } else {
             UnitType unitType = getSpecification().getUnitType(command);
             igc().trainUnitInEurope(unitType);
diff --git a/src/net/sf/freecol/client/gui/panel/ParametersDialog.java b/src/net/sf/freecol/client/gui/panel/ParametersDialog.java
index db5685f9f..44468a15e 100644
--- a/src/net/sf/freecol/client/gui/panel/ParametersDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/ParametersDialog.java
@@ -96,12 +96,9 @@ public class ParametersDialog extends FreeColDialog<Parameters> {
         panel.add(heightPanel);
         panel.setSize(panel.getPreferredSize());
         
-        final ActionListener al = new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    ParametersDialog.this.checkFields();
-                }
-            };
+        final ActionListener al = (ActionEvent ae) -> {
+            ParametersDialog.this.checkFields();
+        };
         inputD.addActionListener(al);
         inputM.addActionListener(al);
 
diff --git a/src/net/sf/freecol/client/gui/panel/PlayersTable.java b/src/net/sf/freecol/client/gui/panel/PlayersTable.java
index 548f50daa..7ca54a395 100644
--- a/src/net/sf/freecol/client/gui/panel/PlayersTable.java
+++ b/src/net/sf/freecol/client/gui/panel/PlayersTable.java
@@ -210,12 +210,9 @@ public final class PlayersTable extends JTable {
             = new JComboBox<>(NationState.values());
         private JComboBox activeBox;
 
-        private final ActionListener listener = new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    stopCellEditing();
-                }
-            };
+        private final ActionListener listener = (ActionEvent ae) -> {
+            stopCellEditing();
+        };
 
 
         public AvailableCellEditor() {
@@ -395,11 +392,8 @@ public final class PlayersTable extends JTable {
 
 
         public PlayerCellEditor() {
-            button.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        fireEditingStopped();
-                    }
+            button.addActionListener((ActionEvent ae) -> {
+                    fireEditingStopped();
                 });
         }
 
@@ -668,20 +662,14 @@ public final class PlayersTable extends JTable {
         setRowHeight(47);
 
         JButton nationButton = Utility.localizedButton("nation");
-        nationButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    gui.showColopediaPanel(PanelType.NATIONS.getKey());
-                }
+        nationButton.addActionListener((ActionEvent ae) -> {
+                gui.showColopediaPanel(PanelType.NATIONS.getKey());
             });
 
         JLabel availabilityLabel = Utility.localizedLabel("playersTable.availability");
         JButton advantageButton = Utility.localizedButton("playersTable.advantage");
-        advantageButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    gui.showColopediaPanel(PanelType.NATION_TYPES.getKey());
-                }
+        advantageButton.addActionListener((ActionEvent ae) -> {
+                gui.showColopediaPanel(PanelType.NATION_TYPES.getKey());
             });
 
         JLabel colorLabel = Utility.localizedLabel("color");
diff --git a/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java b/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
index e73f1fa9f..4722a49d9 100644
--- a/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
+++ b/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
@@ -206,11 +206,8 @@ public final class QuickActionMenu extends JPopupMenu {
                     .addStringTemplate("%unit%",
                         unit.getLabel(Unit.UnitLabelType.NATIONAL));
                 JMenuItem menuItem = Utility.localizedMenuItem(template);
-                menuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            igc.boardShip(tempUnit, unit);
-                        }
+                menuItem.addActionListener((ActionEvent ae) -> {
+                        igc.boardShip(tempUnit, unit);
                     });
                 this.add(menuItem);
                 added = true;
@@ -230,14 +227,11 @@ public final class QuickActionMenu extends JPopupMenu {
                     .addStringTemplate("%unit%",
                         unit.getLabel(Unit.UnitLabelType.NATIONAL));
                 JMenuItem menuItem = Utility.localizedMenuItem(template);
-                menuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            if ((e.getModifiers() & ActionEvent.SHIFT_MASK) != 0) {
-                                promptForGoods(goods);
-                            }
-                            igc.loadCargo(goods, unit);
+                menuItem.addActionListener((ActionEvent ae) -> {
+                        if ((ae.getModifiers() & ActionEvent.SHIFT_MASK) != 0) {
+                            promptForGoods(goods);
                         }
+                        igc.loadCargo(goods, unit);
                     });
                 this.add(menuItem);
                 added = true;
@@ -388,11 +382,8 @@ public final class QuickActionMenu extends JPopupMenu {
 
         if (current != null && unit.getWorkType() != null) {
             JMenuItem ji = Utility.localizedMenuItem("showProductionModifiers");
-            ji.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent event) {
-                        gui.showWorkProductionPanel(unit);
-                    }
+            ji.addActionListener((ActionEvent ae) -> {
+                    gui.showWorkProductionPanel(unit);
                 });
             this.add(ji);
         }
@@ -486,15 +477,12 @@ public final class QuickActionMenu extends JPopupMenu {
         final boolean isUnitAtSea = tempUnit.isAtSea();
 
         JMenuItem menuItem = Utility.localizedMenuItem("activateUnit");
-        menuItem.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    if (tempUnit.getState() != Unit.UnitState.ACTIVE) {
-                        freeColClient.getInGameController()
-                            .changeState(tempUnit, Unit.UnitState.ACTIVE);
-                    }
-                    gui.setActiveUnit(tempUnit);
+        menuItem.addActionListener((ActionEvent ae) -> {
+                if (tempUnit.getState() != Unit.UnitState.ACTIVE) {
+                    freeColClient.getInGameController()
+                        .changeState(tempUnit, Unit.UnitState.ACTIVE);
                 }
+                gui.setActiveUnit(tempUnit);
             });
         menuItem.setEnabled(!isUnitAtSea);
         this.add(menuItem);
@@ -536,12 +524,9 @@ public final class QuickActionMenu extends JPopupMenu {
 
         if (tempUnit.canCarryTreasure() && tempUnit.canCashInTreasureTrain()) {
             menuItem = Utility.localizedMenuItem("cashInTreasureTrain");
-            menuItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        freeColClient.getInGameController()
-                            .checkCashInTreasureTrain(tempUnit);
-                    }
+            menuItem.addActionListener((ActionEvent ae) -> {
+                    freeColClient.getInGameController()
+                        .checkCashInTreasureTrain(tempUnit);
                 });
             menuItem.setEnabled(true);
             this.add(menuItem);
@@ -617,15 +602,12 @@ public final class QuickActionMenu extends JPopupMenu {
 
         JMenuItem item = new JMenuItem(text, icon);
         final InGameController igc = freeColClient.getInGameController();
-        item.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    igc.equipUnitForRole(unitLabel.getUnit(), to, toCount);
-                    unitLabel.updateIcon();
-                    // FIXME: fix the PCL handling so this can go away
-                    if (parentPanel instanceof ColonyPanel) {
-                        ((ColonyPanel)parentPanel).update();
-                    }
+        item.addActionListener((ActionEvent ae) -> {
+                igc.equipUnitForRole(unitLabel.getUnit(), to, toCount);
+                unitLabel.updateIcon();
+                // FIXME: fix the PCL handling so this can go away
+                if (parentPanel instanceof ColonyPanel) {
+                    ((ColonyPanel)parentPanel).update();
                 }
             });
         return item;
@@ -706,11 +688,8 @@ public final class QuickActionMenu extends JPopupMenu {
             Messages.getName(goods) + " (" + Messages.message("colopedia") + ")",
             new ImageIcon(
                 gui.getImageLibrary().getSmallIconImage(goods.getType())));
-        name.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    gui.showColopediaPanel(goods.getType().getId());
-                }
+        name.addActionListener((ActionEvent ae) -> {
+                gui.showColopediaPanel(goods.getType().getId());
             });
         this.add(name);
 
@@ -743,14 +722,11 @@ public final class QuickActionMenu extends JPopupMenu {
                 || (carrier.isInEurope()
                     && player.canTrade(goods.getType()))) {
                 JMenuItem unload = Utility.localizedMenuItem("unload");
-                unload.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            if ((e.getModifiers() & ActionEvent.SHIFT_MASK) != 0) {
-                                promptForGoods(goods);
-                            }
-                            igc.unloadCargo(goods, false);
+                unload.addActionListener((ActionEvent ae) -> {
+                        if ((ae.getModifiers() & ActionEvent.SHIFT_MASK) != 0) {
+                            promptForGoods(goods);
                         }
+                        igc.unloadCargo(goods, false);
                     });
                 this.add(unload);
             } else {
@@ -760,19 +736,16 @@ public final class QuickActionMenu extends JPopupMenu {
                 }
 
                 JMenuItem dump = Utility.localizedMenuItem("dumpCargo");
-                dump.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            if ((e.getModifiers() & ActionEvent.SHIFT_MASK) != 0) {
-                                promptForGoods(goods);
-                            }
-                            igc.unloadCargo(goods, true);
-                            // FIXME: fix pcls so this hackery can go away
-                            if (parentPanel instanceof CargoPanel) {
-                                ((CargoPanel) parentPanel).initialize();
-                            }
-                            parentPanel.revalidate();
+                dump.addActionListener((ActionEvent ae) -> {
+                        if ((ae.getModifiers() & ActionEvent.SHIFT_MASK) != 0) {
+                            promptForGoods(goods);
                         }
+                        igc.unloadCargo(goods, true);
+                        // FIXME: fix pcls so this hackery can go away
+                        if (parentPanel instanceof CargoPanel) {
+                            ((CargoPanel) parentPanel).initialize();
+                        }
+                        parentPanel.revalidate();
                     });
                 this.add(dump);
             }
@@ -788,17 +761,14 @@ public final class QuickActionMenu extends JPopupMenu {
         final InGameController igc = freeColClient.getInGameController();
 
         JMenuItem menuItem = Utility.localizedMenuItem("payArrears");
-        menuItem.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    igc.payArrears(goodsType);
-                    // FIXME: fix pcls so this hackery can go away
-                    if (parentPanel instanceof CargoPanel) {
-                        CargoPanel cargoPanel = (CargoPanel) parentPanel;
-                        cargoPanel.initialize();
-                    }
-                    parentPanel.revalidate();
+        menuItem.addActionListener((ActionEvent ae) -> {
+                igc.payArrears(goodsType);
+                // FIXME: fix pcls so this hackery can go away
+                if (parentPanel instanceof CargoPanel) {
+                    CargoPanel cargoPanel = (CargoPanel) parentPanel;
+                    cargoPanel.initialize();
                 }
+                parentPanel.revalidate();
             });
         this.add(menuItem);
     }
@@ -818,11 +788,8 @@ public final class QuickActionMenu extends JPopupMenu {
             Messages.getName(ag) + " (" + Messages.message("colopedia") + ")",
             new ImageIcon(
                 gui.getImageLibrary().getSmallIconImage(ag.getType())));
-        name.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    gui.showColopediaPanel(ag.getType().getId());
-                }
+        name.addActionListener((ActionEvent ae) -> {
+                gui.showColopediaPanel(ag.getType().getId());
             });
         this.add(name);
 
@@ -846,14 +813,11 @@ public final class QuickActionMenu extends JPopupMenu {
                     .addStringTemplate("%unit%",
                         unit.getLabel(Unit.UnitLabelType.NATIONAL));
                 JMenuItem menuItem = Utility.localizedMenuItem(template);
-                menuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            if ((e.getModifiers() & ActionEvent.SHIFT_MASK) != 0) {
-                                promptForGoods(ag);
-                            }
-                            igc.buyGoods(ag.getType(), ag.getAmount(), unit);
+                menuItem.addActionListener((ActionEvent ae) -> {
+                        if ((ae.getModifiers() & ActionEvent.SHIFT_MASK) != 0) {
+                            promptForGoods(ag);
                         }
+                        igc.buyGoods(ag.getType(), ag.getAmount(), unit);
                     });
                 this.add(menuItem);
                 added = true;
@@ -897,11 +861,8 @@ public final class QuickActionMenu extends JPopupMenu {
     private void addTileItem(final Tile tile) {
         if (tile != null) {
             JMenuItem menuItem = new JMenuItem(Messages.getName(tile));
-            menuItem.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
+            menuItem.addActionListener((ActionEvent ae) -> {
                     gui.showTilePanel(tile);
-                }
             });
             this.add(menuItem);
         }
diff --git a/src/net/sf/freecol/client/gui/panel/RecruitPanel.java b/src/net/sf/freecol/client/gui/panel/RecruitPanel.java
index 77c9af82f..a8a1475aa 100644
--- a/src/net/sf/freecol/client/gui/panel/RecruitPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/RecruitPanel.java
@@ -120,10 +120,10 @@ public final class RecruitPanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         if (OK.equals(command)) {
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
         } else {
             try {
                 int index = Integer.parseInt(command);
diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index 856b1ae31..2bc268bbd 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -1117,9 +1117,9 @@ public final class ReportCompactColonyPanel extends ReportPanel
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
+    public void actionPerformed(ActionEvent ae) {
         final Game game = getGame();
-        String command = event.getActionCommand();
+        String command = ae.getActionCommand();
         if (command.startsWith(BUILDQUEUE)) {
             command = command.substring(BUILDQUEUE.length());
             Colony colony = game.getFreeColGameObject(command, Colony.class);
@@ -1135,6 +1135,6 @@ public final class ReportCompactColonyPanel extends ReportPanel
                 return;
             }
         }
-        super.actionPerformed(event);
+        super.actionPerformed(ae);
     }
 }
diff --git a/src/net/sf/freecol/client/gui/panel/ReportLabourPanel.java b/src/net/sf/freecol/client/gui/panel/ReportLabourPanel.java
index 89cbdf5a8..363cd3f9e 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportLabourPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportLabourPanel.java
@@ -173,13 +173,13 @@ public final class ReportLabourPanel extends ReportPanel {
         }
         Action selectAction = new AbstractAction() {
                 @Override
-                public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent ae) {
                     showDetails();
                 }
             };
         Action quitAction = new AbstractAction() {
                 @Override
-                public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent ae) {
                     getGUI().removeFromCanvas(ReportLabourPanel.this);
                 }
             };
@@ -223,10 +223,10 @@ public final class ReportLabourPanel extends ReportPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         if (OK.equals(command)) {
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
         } else {
             UnitType unitType = getSpecification().getUnitType(command);
             getGUI().showReportLabourDetailPanel(unitType, this.data,
diff --git a/src/net/sf/freecol/client/gui/panel/ReportPanel.java b/src/net/sf/freecol/client/gui/panel/ReportPanel.java
index e9bb5af68..c92b996c4 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportPanel.java
@@ -160,8 +160,8 @@ public class ReportPanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         if (OK.equals(command)) {
             getGUI().removeFromCanvas(this);
         } else {
diff --git a/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java b/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java
index 2455af1ea..c3b78b4cc 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java
@@ -93,11 +93,8 @@ public final class ReportProductionPanel extends ReportPanel {
         reportPanel.add(selectLabel);
 
         JButton selectButton = Utility.localizedButton("report.production.update");
-        selectButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    update();
-                }
+        selectButton.addActionListener((ActionEvent ae) -> {
+                update();
             });
         reportPanel.add(selectButton, "wrap");
 
diff --git a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
index 4cb18927e..4bea800a7 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
@@ -177,14 +177,11 @@ public final class ReportTurnPanel extends ReportPanel {
                 Utility.localizeToolTip(ignoreButton, 
                     StringTemplate.copy("report.turn.ignore", message));
                 final ModelMessage m = message;
-                ignoreButton.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent event) {
-                            boolean flag = label.isEnabled();
-                            igc().ignoreMessage(m, flag);
-                            textPane.setEnabled(!flag);
-                            label.setEnabled(!flag);
-                        }
+                ignoreButton.addActionListener((ActionEvent ae) -> {
+                        boolean flag = label.isEnabled();
+                        igc().ignoreMessage(m, flag);
+                        textPane.setEnabled(!flag);
+                        label.setEnabled(!flag);
                     });
                 reportPanel.add(ignoreButton);
                 ignore = true;
@@ -214,18 +211,12 @@ public final class ReportTurnPanel extends ReportPanel {
                     .template("report.turn.filter")
                     .addNamed("%type%", message.getMessageType()));
                 final ModelMessage m = message;
-                filterButton.addActionListener(new ActionListener() {
-                        
-                        @Override
-                        public void actionPerformed(ActionEvent event) {
-                            boolean flag = filterOption.getValue();
-                            filterOption.setValue(!flag);
-                            //textPane.setEnabled(!flag);
-                            //label.setEnabled(!flag);
-                            
-                            setEnabledByType(m.getMessageType(), !flag);
-                        }
-                        
+                filterButton.addActionListener((ActionEvent ae) -> {
+                        boolean flag = filterOption.getValue();
+                        filterOption.setValue(!flag);
+                        //textPane.setEnabled(!flag);
+                        //label.setEnabled(!flag);
+                        setEnabledByType(m.getMessageType(), !flag);
                     });
                 if (ignore) {
                     reportPanel.add(filterButton);
@@ -430,7 +421,7 @@ public final class ReportTurnPanel extends ReportPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        super.actionPerformed(event);
+    public void actionPerformed(ActionEvent ae) {
+        super.actionPerformed(ae);
     }
 }
diff --git a/src/net/sf/freecol/client/gui/panel/SaveDialog.java b/src/net/sf/freecol/client/gui/panel/SaveDialog.java
index 6b87015de..3be589a91 100644
--- a/src/net/sf/freecol/client/gui/panel/SaveDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/SaveDialog.java
@@ -71,19 +71,16 @@ public final class SaveDialog extends FreeColDialog<File> {
         fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         fileChooser.setFileHidingEnabled(false);
         fileChooser.setSelectedFile(new File(defaultName));
-        fileChooser.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    final String cmd = event.getActionCommand();
-                    if (JFileChooser.APPROVE_SELECTION.equals(cmd)) {
-                        File file = fileChooser.getSelectedFile();
-                        if (!file.getName().endsWith(ext)) {
-                            file = new File(file.getAbsolutePath() + ext);
-                        }
-                        setValue(file);
-                    } else {
-                        setValue(cancelFile);
+        fileChooser.addActionListener((ActionEvent ae) -> {
+                final String cmd = ae.getActionCommand();
+                if (JFileChooser.APPROVE_SELECTION.equals(cmd)) {
+                    File file = fileChooser.getSelectedFile();
+                    if (!file.getName().endsWith(ext)) {
+                        file = new File(file.getAbsolutePath() + ext);
                     }
+                    setValue(file);
+                } else {
+                    setValue(cancelFile);
                 }
             });
 
diff --git a/src/net/sf/freecol/client/gui/panel/ScaleMapSizeDialog.java b/src/net/sf/freecol/client/gui/panel/ScaleMapSizeDialog.java
index 0f33e3a84..8587814dc 100644
--- a/src/net/sf/freecol/client/gui/panel/ScaleMapSizeDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/ScaleMapSizeDialog.java
@@ -96,12 +96,9 @@ public class ScaleMapSizeDialog extends FreeColDialog<Dimension> {
         panel.add(heightPanel);
         panel.setSize(panel.getPreferredSize());
 
-        final ActionListener al = new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    ScaleMapSizeDialog.this.checkFields();
-                }
-            };
+        final ActionListener al = (ActionEvent ae) -> {
+            ScaleMapSizeDialog.this.checkFields();
+        };
 
         inputWidth.addActionListener(al);
         inputHeight.addActionListener(al);
diff --git a/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java b/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
index 018d6d6a3..21dd44136 100644
--- a/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
@@ -387,12 +387,9 @@ public final class SelectDestinationDialog extends FreeColDialog<Location>
 
         String omcb = Messages.message("selectDestinationDialog.onlyMyColonies");
         this.onlyMyColoniesBox = new JCheckBox(omcb, showOnlyMyColonies);
-        this.onlyMyColoniesBox.addChangeListener(new ChangeListener() {
-                @Override
-                public void stateChanged(ChangeEvent event) {
-                    showOnlyMyColonies = onlyMyColoniesBox.isSelected();
-                    updateDestinationList();
-                }
+        this.onlyMyColoniesBox.addChangeListener((ChangeEvent event) -> {
+                showOnlyMyColonies = onlyMyColoniesBox.isSelected();
+                updateDestinationList();
             });
 
         this.comparatorBox = new JComboBox<>(new String[] {
@@ -400,14 +397,11 @@ public final class SelectDestinationDialog extends FreeColDialog<Location>
                 Messages.message("selectDestinationDialog.sortByName"),
                 Messages.message("selectDestinationDialog.sortByDistance")
             });
-        this.comparatorBox.addItemListener(new ItemListener() {
-                @Override
-                public void itemStateChanged(ItemEvent event) {
-                    updateDestinationComparator();
-                    Collections.sort(SelectDestinationDialog.this.destinations,
-                        SelectDestinationDialog.this.destinationComparator);
-                    updateDestinationList();
-                }
+        this.comparatorBox.addItemListener((ItemEvent event) -> {
+                updateDestinationComparator();
+                Collections.sort(SelectDestinationDialog.this.destinations,
+                    SelectDestinationDialog.this.destinationComparator);
+                updateDestinationList();
             });
         this.comparatorBox.setSelectedIndex(
             (this.destinationComparator instanceof NameComparator) ? 1
diff --git a/src/net/sf/freecol/client/gui/panel/ServerListPanel.java b/src/net/sf/freecol/client/gui/panel/ServerListPanel.java
index 06ea61828..8ba0f38f4 100644
--- a/src/net/sf/freecol/client/gui/panel/ServerListPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ServerListPanel.java
@@ -184,9 +184,8 @@ public final class ServerListPanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
-
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         try {
             switch (Integer.parseInt(command)) {
             case CONNECT:
@@ -198,9 +197,9 @@ public final class ServerListPanel extends FreeColPanel {
                 getGUI().showNewPanel();
                 break;
             default:
-                super.actionPerformed(event);
+                super.actionPerformed(ae);
             }
-        } catch (NumberFormatException e) {
+        } catch (NumberFormatException nfe) {
             logger.warning("Invalid ActionEvent, not a number: " + command);
         }
     }
diff --git a/src/net/sf/freecol/client/gui/panel/StartGamePanel.java b/src/net/sf/freecol/client/gui/panel/StartGamePanel.java
index 6ecef2b74..1450703eb 100644
--- a/src/net/sf/freecol/client/gui/panel/StartGamePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/StartGamePanel.java
@@ -293,8 +293,8 @@ public final class StartGamePanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         final FreeColClient fcc = getFreeColClient();
         final SwingGUI gui = getGUI();
         try {
@@ -348,9 +348,9 @@ public final class StartGamePanel extends FreeColPanel {
                 }
                 break;
             default:
-                super.actionPerformed(event);
+                super.actionPerformed(ae);
             }
-        } catch (NumberFormatException e) {
+        } catch (NumberFormatException nfe) {
             logger.warning("Invalid ActionEvent, not a number: " + command);
         }
     }
diff --git a/src/net/sf/freecol/client/gui/panel/TilePanel.java b/src/net/sf/freecol/client/gui/panel/TilePanel.java
index defe58e65..8964e1aae 100644
--- a/src/net/sf/freecol/client/gui/panel/TilePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TilePanel.java
@@ -219,8 +219,8 @@ public final class TilePanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         if (OK.equals(command)) {
             getGUI().removeFromCanvas(this);
         } else {
diff --git a/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java b/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
index c4e5b4046..91d129303 100644
--- a/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
@@ -587,27 +587,18 @@ public final class TradeRouteInputPanel extends FreeColPanel
         this.messagesBox
             = new JCheckBox(Messages.message("tradeRouteInputPanel.silence"));
         this.messagesBox.setSelected(tradeRoute.isSilent());
-        this.messagesBox.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    tradeRoute.setSilent(messagesBox.isSelected());
-                }
+        this.messagesBox.addActionListener((ActionEvent ae) -> {
+                tradeRoute.setSilent(messagesBox.isSelected());
             });
 
         this.addStopButton = Utility.localizedButton("tradeRouteInputPanel.addStop");
-        this.addStopButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    addSelectedStops();
-                }
+        this.addStopButton.addActionListener((ActionEvent ae) -> {
+                addSelectedStops();
             });
 
         this.removeStopButton = Utility.localizedButton("tradeRouteInputPanel.removeStop");
-        this.removeStopButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    deleteCurrentlySelectedStops();
-                }
+        this.removeStopButton.addActionListener((ActionEvent ae) -> {
+                deleteCurrentlySelectedStops();
             });
 
         this.goodsPanel = new GoodsPanel();
@@ -764,21 +755,21 @@ public final class TradeRouteInputPanel extends FreeColPanel
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         if (command == null) return;
         switch (command) {
         case OK:
             if (!verifyNewTradeRoute()) return;
             // Return to TradeRoutePanel, which will add the route
             // if needed, and it is valid.
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
             break;
         case CANCEL:
             cancelTradeRoute();
             break;
         default:
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
             break;
         }
     }
diff --git a/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java b/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
index a8cda5250..1a91cc0ea 100644
--- a/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
@@ -38,7 +38,6 @@ import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JScrollPane;
 import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
@@ -106,11 +105,8 @@ public final class TradeRoutePanel extends FreeColPanel {
 
         this.unit = unit;
         this.tradeRoutes = new JList<>(listModel);
-        this.tradeRoutes.addListSelectionListener(new ListSelectionListener() {
-                @Override
-                public void valueChanged(ListSelectionEvent e) {
-                    updateButtons();
-                }
+        this.tradeRoutes.addListSelectionListener((ListSelectionEvent e) -> {
+                updateButtons();
             });
         this.tradeRoutes.setCellRenderer(new DefaultListCellRenderer() {
                 @Override
@@ -139,48 +135,38 @@ public final class TradeRoutePanel extends FreeColPanel {
         // listener below.
         this.newRouteButton = Utility.localizedButton("tradeRoutePanel.newRoute");
         Utility.localizeToolTip(this.newRouteButton, "tradeRoutePanel.new.tooltip");
-        this.newRouteButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    newRoute();
-                }
+        this.newRouteButton.addActionListener((ActionEvent ae) -> {
+                newRoute();
             });
 
         this.editRouteButton = Utility.localizedButton("tradeRoutePanel.editRoute");
         Utility.localizeToolTip(this.editRouteButton, "tradeRoutePanel.edit.tooltip");
-        this.editRouteButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    final TradeRoute selected
-                        = tradeRoutes.getSelectedValue();
-                    final String name = selected.getName();
-                    getGUI().showTradeRouteInputPanel(selected, () -> {
-                            StringTemplate template = null;
-                            if (selected.getName() == null) { // Cancelled
-                                selected.setName(name);
-                            } else if ((template = selected.verify()) == null) {
-                                igc().updateTradeRoute(selected);
-                                updateList(selected);
-                            } else {
-                                getGUI().showInformationMessage(template);
-                            }
-                        });
-                }
+        this.editRouteButton.addActionListener((ActionEvent ae) -> {
+                final TradeRoute selected = tradeRoutes.getSelectedValue();
+                final String name = selected.getName();
+                getGUI().showTradeRouteInputPanel(selected, () -> {
+                        StringTemplate template = null;
+                        if (selected.getName() == null) { // Cancelled
+                            selected.setName(name);
+                        } else if ((template = selected.verify()) == null) {
+                            igc().updateTradeRoute(selected);
+                            updateList(selected);
+                        } else {
+                            getGUI().showInformationMessage(template);
+                        }
+                    });
             });
 
         this.deleteRouteButton = Utility.localizedButton("tradeRoutePanel.deleteRoute");
         Utility.localizeToolTip(this.deleteRouteButton, "tradeRoutePanel.delete.tooltip");
-        this.deleteRouteButton.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    TradeRoute route = getRoute();
-                    if (route != null) {
-                        for (Unit u : route.getAssignedUnits()) {
-                            igc().assignTradeRoute(u, null);
-                        }
-                        deleteTradeRoute(route);
-                        updateList(null);
+        this.deleteRouteButton.addActionListener((ActionEvent ae) -> {
+                TradeRoute route = getRoute();
+                if (route != null) {
+                    for (Unit u : route.getAssignedUnits()) {
+                        igc().assignTradeRoute(u, null);
                     }
+                    deleteTradeRoute(route);
+                    updateList(null);
                 }
             });
 
@@ -322,8 +308,8 @@ public final class TradeRoutePanel extends FreeColPanel {
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
-        final String command = event.getActionCommand();
+    public void actionPerformed(ActionEvent ae) {
+        final String command = ae.getActionCommand();
         if (null == command) return;
         final TradeRoute route = getRoute();
         switch (command) {
@@ -342,13 +328,13 @@ public final class TradeRoutePanel extends FreeColPanel {
             if (unit != null && route != null) {
                 igc().assignTradeRoute(unit, route);
             }
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
             break;
         case CANCEL:
             getGUI().removeTradeRoutePanel(this);
             break;
         default:
-            super.actionPerformed(event);
+            super.actionPerformed(ae);
             break;
         }
     }
diff --git a/src/net/sf/freecol/client/gui/panel/UnitLabel.java b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
index 4d141ad7b..cf19e4101 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitLabel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
@@ -370,11 +370,11 @@ public final class UnitLabel extends JLabel
      * {@inheritDoc}
      */
     @Override
-    public void actionPerformed(ActionEvent event) {
+    public void actionPerformed(ActionEvent ae) {
         final Game game = freeColClient.getGame();
         final Specification spec = game.getSpecification();
         final InGameController igc = freeColClient.getInGameController();
-        String[] args = event.getActionCommand().split("/");
+        String[] args = ae.getActionCommand().split("/");
         GoodsType gt;
         switch (Enum.valueOf(UnitAction.class,
                              args[0].toUpperCase(Locale.US))) {
diff --git a/src/net/sf/freecol/client/gui/plaf/FreeColOptionPaneUI.java b/src/net/sf/freecol/client/gui/plaf/FreeColOptionPaneUI.java
index 35f7e7594..26575afd9 100644
--- a/src/net/sf/freecol/client/gui/plaf/FreeColOptionPaneUI.java
+++ b/src/net/sf/freecol/client/gui/plaf/FreeColOptionPaneUI.java
@@ -25,7 +25,6 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.event.ActionListener;
 import java.awt.event.HierarchyEvent;
-import java.awt.event.HierarchyListener;
 
 import javax.swing.Icon;
 import javax.swing.JButton;
@@ -170,15 +169,11 @@ public class FreeColOptionPaneUI extends BasicOptionPaneUI {
         if (0 <= initialIndex && initialIndex < buttons.length) {
             JButton b = newButtons[initialIndex];
             this.initialFocusComponent = b;
-            b.addHierarchyListener(new HierarchyListener() {
-                    @Override
-                    public void hierarchyChanged(HierarchyEvent e) {
-                        if ((e.getChangeFlags()
-                                & HierarchyEvent.PARENT_CHANGED) != 0) {
-                            JButton b = (JButton)e.getComponent();
-                            JRootPane root = SwingUtilities.getRootPane(b);
-                            if (root != null) root.setDefaultButton(b);
-                        }
+            b.addHierarchyListener((HierarchyEvent e) -> {
+                    if ((e.getChangeFlags() & HierarchyEvent.PARENT_CHANGED) != 0) {
+                        JButton button = (JButton)e.getComponent();
+                        JRootPane root = SwingUtilities.getRootPane(button);
+                        if (root != null) root.setDefaultButton(button);
                     }
                 });
         }
diff --git a/src/net/sf/freecol/common/debug/DebugUtils.java b/src/net/sf/freecol/common/debug/DebugUtils.java
index 9f87c781e..f6e8415d3 100644
--- a/src/net/sf/freecol/common/debug/DebugUtils.java
+++ b/src/net/sf/freecol/common/debug/DebugUtils.java
@@ -291,15 +291,12 @@ public class DebugUtils {
         final FreeColServer server = freeColClient.getFreeColServer();
         if (server == null) return;
 
-        menu.addChangeListener(new ChangeListener() {
-                @Override
-                public void stateChanged(ChangeEvent e) {
-                    boolean skipping = server.getInGameController()
-                        .getSkippedTurns() > 0;
-                    item.setText(Messages.message((skipping)
-                            ? "menuBar.debug.stopSkippingTurns"
-                            : "menuBar.debug.skipTurns"));
-                }
+        menu.addChangeListener((ChangeEvent e) -> {
+                boolean skipping = server.getInGameController()
+                    .getSkippedTurns() > 0;
+                item.setText(Messages.message((skipping)
+                        ? "menuBar.debug.stopSkippingTurns"
+                        : "menuBar.debug.skipTurns"));
             });
     }
 
diff --git a/src/net/sf/freecol/common/resources/ResourceManager.java b/src/net/sf/freecol/common/resources/ResourceManager.java
index 1b63635f1..1010a07e6 100644
--- a/src/net/sf/freecol/common/resources/ResourceManager.java
+++ b/src/net/sf/freecol/common/resources/ResourceManager.java
@@ -193,8 +193,7 @@ public class ResourceManager {
             return; // Do not preload in headless mode
         }
 
-        preloadThread = new Thread(FreeCol.CLIENT_THREAD
-            + "-Resource loader") {
+        preloadThread = new Thread(FreeCol.CLIENT_THREAD + "-Resource loader") {
                 @Override
                 public void run() {
                     // Make a local list of the resources to load.
diff --git a/src/net/sf/freecol/tools/FlagTest.java b/src/net/sf/freecol/tools/FlagTest.java
index c6b7efbd0..3b81b8aec 100644
--- a/src/net/sf/freecol/tools/FlagTest.java
+++ b/src/net/sf/freecol/tools/FlagTest.java
@@ -212,8 +212,8 @@ public class FlagTest extends JFrame implements ActionListener, ItemListener {
     }
 
     @Override
-    public void actionPerformed(ActionEvent e) {
-        ColorButton button = (ColorButton) e.getSource();
+    public void actionPerformed(ActionEvent ae) {
+        ColorButton button = (ColorButton)ae.getSource();
         Color color = JColorChooser
             .showDialog(FlagTest.this,
                         label.getText(),
diff --git a/src/net/sf/freecol/tools/GenerateDocumentation.java b/src/net/sf/freecol/tools/GenerateDocumentation.java
index ed09ecdc9..aac0f55a4 100644
--- a/src/net/sf/freecol/tools/GenerateDocumentation.java
+++ b/src/net/sf/freecol/tools/GenerateDocumentation.java
@@ -56,7 +56,8 @@ public class GenerateDocumentation {
 
     private static final Map<String, String> resources = new HashMap<>();
 
-    private static final String[] sourceFiles = STRING_DIRECTORY.list(new FilenameFilter() {
+    private static final String[] sourceFiles
+        = STRING_DIRECTORY.list(new FilenameFilter() {
             @Override
             public boolean accept(File dir, String name) {
                 return name.matches("FreeColMessages.*\\.properties");

From a14940d5665e938144f3f0136622e4d71c7dca72 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 2 Sep 2015 11:29:03 +0930
Subject: [PATCH 166/323] Update GUI after disembark.

---
 src/net/sf/freecol/client/control/InGameController.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 2b1a7e799..a4be44b08 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -3937,13 +3937,15 @@ public final class InGameController implements NetworkConstants {
 
         if (!askClearGotoOrders(unit)) return false;
 
+        final int unitCount = unit.getUnitCount();
         final Tile oldTile = unit.getTile();
         UnitWas unitWas = new UnitWas(unit);
         ColonyWas colonyWas = (unit.getColony() == null) ? null
             : new ColonyWas(unit.getColony());
         unit.setState(UnitState.ACTIVE);
         moveDirection(unit, direction, true);
-        boolean ret = unit.getTile() != oldTile;
+        boolean ret = unit.getTile() != oldTile
+            || unit.getUnitCount() != unitCount; // disembark occurred
         if (ret) {
             unitWas.fireChanges();
             if (colonyWas != null) colonyWas.fireChanges();

From 9949587a37accf4c778c66512ccd7a7c7399581d Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 2 Sep 2015 22:33:06 +0200
Subject: [PATCH 167/323] Remove skills menu item which got non-functional with
 git.0e2c9eb2

---
 src/net/sf/freecol/client/gui/action/ColopediaAction.java | 3 +--
 src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java  | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/action/ColopediaAction.java b/src/net/sf/freecol/client/gui/action/ColopediaAction.java
index fa2612045..fb65cb146 100644
--- a/src/net/sf/freecol/client/gui/action/ColopediaAction.java
+++ b/src/net/sf/freecol/client/gui/action/ColopediaAction.java
@@ -36,7 +36,7 @@ public class ColopediaAction extends FreeColAction {
     // Order of elements will influence ingame order of menu items.
     public static enum PanelType {
         TERRAIN, RESOURCES, GOODS, UNITS,
-        SKILLS, BUILDINGS, FATHERS, NATIONS,
+        BUILDINGS, FATHERS, NATIONS,
         NATION_TYPES, CONCEPTS;
 
         public String getKey() {
@@ -49,7 +49,6 @@ public class ColopediaAction extends FreeColAction {
         KeyEvent.VK_R,
         KeyEvent.VK_G,
         KeyEvent.VK_U,
-        KeyEvent.VK_S,
         KeyEvent.VK_B,
         KeyEvent.VK_F,
         KeyEvent.VK_N,
diff --git a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
index ce951871d..1aac91a06 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
@@ -93,11 +93,6 @@ public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
      */
     @Override
     public void buildDetail(String id, JPanel panel) {
-        if (getId().equals(id)
-            || ("colopediaAction." + PanelType.SKILLS.getKey()).equals(id)) {
-            return;
-        }
-
         UnitType type = getSpecification().getUnitType(id);
         panel.setLayout(new MigLayout("wrap 4", "[]20[]40[]20[]"));
 

From 3433444111e28103de7a7e170677a89d29a492ef Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 3 Sep 2015 13:11:37 +0930
Subject: [PATCH 168/323] More clean up in Colopedia.

---
 data/strings/FreeColMessages.properties       |  1 -
 .../client/gui/panel/BuildingDetailPanel.java | 30 +++++--------
 .../panel/ColopediaGameObjectTypePanel.java   | 32 ++++++++++----
 .../client/gui/panel/ColopediaPanel.java      | 12 ++---
 .../client/gui/panel/ConceptDetailPanel.java  | 44 +++++--------------
 .../client/gui/panel/FatherDetailPanel.java   | 33 +++++++-------
 .../client/gui/panel/GoodsDetailPanel.java    | 20 +++------
 .../client/gui/panel/NationDetailPanel.java   | 13 ++----
 .../gui/panel/NationTypeDetailPanel.java      | 35 ++++++---------
 .../gui/panel/ResourcesDetailPanel.java       | 19 +++-----
 .../client/gui/panel/TerrainDetailPanel.java  | 26 +++++------
 .../client/gui/panel/UnitDetailPanel.java     | 36 +++++++--------
 12 files changed, 128 insertions(+), 173 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 512dc3221..05696c19c 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -340,7 +340,6 @@ colopediaAction.goods.name=Goods
 colopediaAction.nations.name=Nations
 colopediaAction.nationTypes.name=National Advantages
 colopediaAction.resources.name=Bonus Resources
-colopediaAction.skills.name=Skills
 colopediaAction.terrain.name=Terrain Types
 colopediaAction.units.name=Units
 colopediaAction.name=%object% (Colopedia)
diff --git a/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java b/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java
index fff93e1b0..71c4ad5be 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildingDetailPanel.java
@@ -72,21 +72,22 @@ public class BuildingDetailPanel
     }
 
 
+    // Implement ColopediaDetailPanel
+
     /**
-     * Adds one or several subtrees for all the objects for which this
-     * ColopediaDetailPanel could build a detail panel to the given
-     * root node.
-     *
-     * @param root a <code>DefaultMutableTreeNode</code>
+     * {@inheritDoc}
      */
     @Override
     public void addSubTrees(DefaultMutableTreeNode root) {
-        DefaultMutableTreeNode parent =
-            new DefaultMutableTreeNode(new ColopediaTreeItem(this, getId(), getName(), null));
+        DefaultMutableTreeNode parent
+            = new DefaultMutableTreeNode(new ColopediaTreeItem(this, getId(),
+                    getName(), null));
 
         List<BuildingType> buildingTypes = new ArrayList<>();
-        Map<BuildingType, DefaultMutableTreeNode> buildingHash = new HashMap<>();
-        for (BuildingType buildingType : getSpecification().getBuildingTypeList()) {
+        Map<BuildingType, DefaultMutableTreeNode> buildingHash
+            = new HashMap<>();
+        for (BuildingType buildingType
+                 : getSpecification().getBuildingTypeList()) {
             if (buildingType.getUpgradesFrom() == null) {
                 String name = Messages.getName(buildingType);
                 DefaultMutableTreeNode item =
@@ -122,17 +123,11 @@ public class BuildingDetailPanel
     }
 
     /**
-     * Builds the details panel for the BuildingType with the given
-     * identifier.
-     *
-     * @param id The object identifier.
-     * @param panel the detail panel to build
+     * {@inheritDoc}
      */
     @Override
     public void buildDetail(String id, JPanel panel) {
-        if (getId().equals(id)) {
-            return;
-        }
+        if (getId().equals(id)) return;
 
         BuildingType buildingType = getSpecification().getBuildingType(id);
         panel.setLayout(new MigLayout("wrap 7, gapx 20", "", ""));
@@ -276,5 +271,4 @@ public class BuildingDetailPanel
         panel.add(Utility.localizedTextArea(Messages.descriptionKey(buildingType)),
                   "span, growx");
     }
-
 }
diff --git a/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java b/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java
index a4c407105..e82589620 100644
--- a/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColopediaGameObjectTypePanel.java
@@ -59,10 +59,20 @@ public abstract class ColopediaGameObjectTypePanel<T extends FreeColGameObjectTy
     extends FreeColPanel implements ColopediaDetailPanel<T> {
 
 
+    /** The enclosing colopedia panel. */
+    private ColopediaPanel colopediaPanel; 
+
+    /** The specific panel id. */
     private final String id;
-    private ColopediaPanel colopediaPanel;
 
 
+    /**
+     * Create a new Colopedia game object type panel.
+     *
+     * @param freeColClient The <code>FreeColClient</code> for the game.
+     * @param colopediaPanel The parent <code>ColopediaPanel</code>.
+     * @param id The panel type identifier.
+     */
     public ColopediaGameObjectTypePanel(FreeColClient freeColClient,
                                         ColopediaPanel colopediaPanel,
                                         String id) {
@@ -72,21 +82,27 @@ public abstract class ColopediaGameObjectTypePanel<T extends FreeColGameObjectTy
         this.id = "colopediaAction." + id;
     }
 
+
     /**
-     * Returns the name of this ColopediaDetailPanel, which is
-     * generally used to label the root node of its sub-tree.
+     * Get the panel id.
      *
-     * @return a String value
+     * @return The panel id, usually "colopediaAction.*".
+     */
+    protected String getId() {
+        return id;
+    }
+
+    /**
+     * Get the name of this ColopediaDetailPanel, which is generally
+     * used to label the root node of its sub-tree.
+     *
+     * @return The panel name.
      */
     @Override
     public String getName() {
         return Messages.getName(id);
     }
 
-    protected String getId() {
-        return id;
-    }
-
     /**
      * Builds a subtree including all the given objects.
      *
diff --git a/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java b/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java
index ece89a376..12891c2d5 100644
--- a/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColopediaPanel.java
@@ -160,16 +160,18 @@ public final class ColopediaPanel extends FreeColPanel
     }
 
     /**
-     * This function analyzes a tree selection event and calls the right methods to take care
-     * of building the requested unit's details.
+     * This function analyzes a tree selection event and calls the
+     * right methods to take care of building the requested unit's
+     * details.
      *
-     * @param event The incoming TreeSelectionEvent.
+     * @param event The incoming <code>TreeSelectionEvent</code>.
      */
     @Override
     public void valueChanged(TreeSelectionEvent event) {
-        DefaultMutableTreeNode node = (DefaultMutableTreeNode) tree.getLastSelectedPathComponent();
+        DefaultMutableTreeNode node
+            = (DefaultMutableTreeNode)tree.getLastSelectedPathComponent();
         if (node != null) {
-            showDetails((ColopediaTreeItem) node.getUserObject());
+            showDetails((ColopediaTreeItem)node.getUserObject());
         }
     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java b/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java
index 873a5afbe..8fe45b7f3 100644
--- a/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java
@@ -90,22 +90,22 @@ public class ConceptDetailPanel extends FreeColPanel
         return Messages.getName(id);
     }
 
+    // Implement ColopediaDetailPanel
+
     /**
-     * Adds one or several subtrees for all the objects for which this
-     * ColopediaDetailPanel could build a detail panel to the given
-     * root node.
-     *
-     * @param root a <code>DefaultMutableTreeNode</code>
+     * {@inheritDoc}
      */
     @Override
     public void addSubTrees(DefaultMutableTreeNode root) {
-        DefaultMutableTreeNode node =
-            new DefaultMutableTreeNode(new ColopediaTreeItem(this, id, getName(), null));
+        DefaultMutableTreeNode node
+            = new DefaultMutableTreeNode(new ColopediaTreeItem(this, id,
+                    getName(), null));
         List<DefaultMutableTreeNode> nodes = new ArrayList<>();
         for (String concept : concepts) {
             String nodeId = "colopedia.concepts." + concept;
             String nodeName = Messages.getName(nodeId);
-            nodes.add(new DefaultMutableTreeNode(new ColopediaTreeItem(this, nodeId, nodeName, null)));
+            nodes.add(new DefaultMutableTreeNode(new ColopediaTreeItem(this,
+                        nodeId, nodeName, null)));
         }
         Collections.sort(nodes, nodeComparator);
         for (DefaultMutableTreeNode n : nodes) {
@@ -115,16 +115,11 @@ public class ConceptDetailPanel extends FreeColPanel
     }
 
     /**
-     * Builds the details panel for the given identifier.
-     *
-     * @param id The object identifier to display.
-     * @param panel the detail panel to build
+     * {@inheritDoc}
      */
     @Override
     public void buildDetail(String id, JPanel panel) {
-        if (ConceptDetailPanel.id.equals(id)) {
-            return;
-        }
+        if (this.id.equals(id)) return;
 
         panel.setLayout(new MigLayout("wrap 1, center"));
 
@@ -132,7 +127,8 @@ public class ConceptDetailPanel extends FreeColPanel
             SwingConstants.LEADING, FontLibrary.FontSize.SMALL);
         panel.add(header, "align center, wrap 20");
 
-        JEditorPane editorPane = new JEditorPane("text/html", Messages.getDescription(id)) {
+        JEditorPane editorPane = new JEditorPane("text/html",
+            Messages.getDescription(id)) {
 
             @Override
             public void paintComponent(Graphics g) {
@@ -145,11 +141,9 @@ public class ConceptDetailPanel extends FreeColPanel
                 graphics2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
                                             RenderingHints.VALUE_FRACTIONALMETRICS_ON);
                 */
-
                 super.paintComponent(graphics2d);
             }
         };
-
         editorPane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES,
                                      Boolean.TRUE);
         editorPane.setFont(panel.getFont());
@@ -158,19 +152,5 @@ public class ConceptDetailPanel extends FreeColPanel
         editorPane.addHyperlinkListener(colopediaPanel);
 
         panel.add(editorPane, "width 95%");
-
-    }
-
-    // Override Component
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void removeNotify() {
-        super.removeNotify();
-
-        removeAll();
-        colopediaPanel = null;
     }
 }
diff --git a/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java b/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java
index 1baf4b53a..f698c9758 100644
--- a/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/FatherDetailPanel.java
@@ -41,6 +41,7 @@ import net.sf.freecol.client.gui.action.ColopediaAction.PanelType;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.FoundingFather;
 import net.sf.freecol.common.model.FoundingFather.FoundingFatherType;
+import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Turn;
 import net.sf.freecol.common.resources.ResourceManager;
@@ -65,33 +66,33 @@ public class FatherDetailPanel
     }
 
 
+    // Implelement ColopediaDetailPanel
+
     /**
-     * Adds one or several subtrees for all the objects for which this
-     * ColopediaDetailPanel could build a detail panel to the given
-     * root node.
-     *
-     * @param root a <code>DefaultMutableTreeNode</code>
+     * {@inheritDoc}
      */
     @Override
     public void addSubTrees(DefaultMutableTreeNode root) {
-        DefaultMutableTreeNode parent =
-            new DefaultMutableTreeNode(new ColopediaTreeItem(this, getId(), getName(), null));
+        final Specification spec = getSpecification();
+        DefaultMutableTreeNode parent
+            = new DefaultMutableTreeNode(new ColopediaTreeItem(this, getId(),
+                    getName(), null));
 
-        EnumMap<FoundingFatherType, List<FoundingFather>> fathersByType =
-            new EnumMap<>(FoundingFatherType.class);
+        EnumMap<FoundingFatherType, List<FoundingFather>> fathersByType
+            = new EnumMap<>(FoundingFatherType.class);
         for (FoundingFatherType fatherType : FoundingFatherType.values()) {
             fathersByType.put(fatherType, new ArrayList<FoundingFather>());
         }
-        for (FoundingFather foundingFather : getSpecification().getFoundingFathers()) {
+        for (FoundingFather foundingFather : spec.getFoundingFathers()) {
             fathersByType.get(foundingFather.getType()).add(foundingFather);
         }
         ImageIcon icon = new ImageIcon(ImageLibrary.getMiscImage(ImageLibrary.BELLS, ImageLibrary.ICON_SIZE));
         for (FoundingFatherType fatherType : FoundingFatherType.values()) {
             String id = FoundingFather.getTypeKey(fatherType);
             String typeName = Messages.message(id);
-            DefaultMutableTreeNode node =
-                new DefaultMutableTreeNode(new ColopediaTreeItem(this, id, typeName, null));
-
+            DefaultMutableTreeNode node
+                = new DefaultMutableTreeNode(new ColopediaTreeItem(this, id,
+                        typeName, null));
             parent.add(node);
             for (FoundingFather father : fathersByType.get(fatherType)) {
                 node.add(buildItem(father, icon));
@@ -101,11 +102,7 @@ public class FatherDetailPanel
     }
 
     /**
-     * Builds the details panel for the FoundingFather with the given
-     * identifier.
-     *
-     * @param id The object identifier.
-     * @param panel the detail panel to build
+     * {@inheritDoc}
      */
     @Override
     public void buildDetail(String id, JPanel panel) {
diff --git a/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java b/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java
index 295e03b8b..8aacd48f6 100644
--- a/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java
@@ -63,12 +63,10 @@ public class GoodsDetailPanel extends ColopediaGameObjectTypePanel<GoodsType> {
     }
 
 
+    // Implement ColopediaDetailPanel
+
     /**
-     * Adds one or several subtrees for all the objects for which this
-     * ColopediaDetailPanel could build a detail panel to the given
-     * root node.
-     *
-     * @param root a <code>DefaultMutableTreeNode</code>
+     * {@inheritDoc}
      */
     @Override
     public void addSubTrees(DefaultMutableTreeNode root) {
@@ -76,16 +74,11 @@ public class GoodsDetailPanel extends ColopediaGameObjectTypePanel<GoodsType> {
     }
 
     /**
-     * Builds the details panel for the GoodsType with the given identifier.
-     *
-     * @param id The object identifier.
-     * @param panel the detail panel to build
+     * {@inheritDoc}
      */
     @Override
     public void buildDetail(String id, JPanel panel) {
-        if (getId().equals(id)) {
-            return;
-        }
+        if (getId().equals(id)) return;
 
         GoodsType type = getSpecification().getGoodsType(id);
         panel.setLayout(new MigLayout("wrap 4", "[]20[]"));
@@ -215,7 +208,8 @@ public class GoodsDetailPanel extends ColopediaGameObjectTypePanel<GoodsType> {
     }
 
 
-    private <T extends BuildableType> boolean filterBuildables(List<T> input, List<T> output, GoodsType type) {
+    private <T extends BuildableType> boolean filterBuildables(List<T> input,
+        List<T> output, GoodsType type) {
         boolean result = true;
         for (T buildableType : input) {
             if (buildableType.needsGoodsToBuild()) {
diff --git a/src/net/sf/freecol/client/gui/panel/NationDetailPanel.java b/src/net/sf/freecol/client/gui/panel/NationDetailPanel.java
index f65cd1051..6392ca6a5 100644
--- a/src/net/sf/freecol/client/gui/panel/NationDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/NationDetailPanel.java
@@ -56,12 +56,10 @@ public class NationDetailPanel extends ColopediaGameObjectTypePanel<Nation> {
     }
 
 
+    // Implement ColopediaDetailPanel
+    
     /**
-     * Adds one or several subtrees for all the objects for which this
-     * ColopediaDetailPanel could build a detail panel to the given
-     * root node.
-     *
-     * @param root a <code>DefaultMutableTreeNode</code>
+     * {@inheritDoc}
      */
     @Override
     public void addSubTrees(DefaultMutableTreeNode root) {
@@ -72,10 +70,7 @@ public class NationDetailPanel extends ColopediaGameObjectTypePanel<Nation> {
     }
 
     /**
-     * Builds the details panel for the Nation with the given identifier.
-     *
-     * @param id The object identifier.
-     * @param panel the detail panel to build
+     * {@inheritDoc}
      */
     @Override
     public void buildDetail(String id, JPanel panel) {
diff --git a/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java b/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java
index 2cadc877c..6e1b31b17 100644
--- a/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/NationTypeDetailPanel.java
@@ -68,17 +68,16 @@ public class NationTypeDetailPanel
     }
 
 
+    // Implement ColopediaDetailPanel
+    
     /**
-     * Adds one or several subtrees for all the objects for which this
-     * ColopediaDetailPanel could build a detail panel to the given
-     * root node.
-     *
-     * @param root a <code>DefaultMutableTreeNode</code>
+     * {@inheritDoc}
      */
     @Override
     public void addSubTrees(DefaultMutableTreeNode root) {
-        DefaultMutableTreeNode parent =
-            new DefaultMutableTreeNode(new ColopediaTreeItem(this, getId(), getName(), null));
+        DefaultMutableTreeNode parent
+            = new DefaultMutableTreeNode(new ColopediaTreeItem(this, getId(),
+                    getName(), null));
 
         List<NationType> nations = new ArrayList<>();
         nations.addAll(getSpecification().getEuropeanNationTypes());
@@ -92,22 +91,17 @@ public class NationTypeDetailPanel
     }
 
     /**
-     * Builds the details panel for the NationType with the given identifier.
-     *
-     * @param id The object identifier to display.
-     * @param panel the detail panel to build
+     * {@inheritDoc}
      */
     @Override
     public void buildDetail(String id, JPanel panel) {
-        if (getId().equals(id)) {
-            return;
-        }
+        if (getId().equals(id)) return;
 
         NationType nationType = getSpecification().getNationType(id);
         if (nationType instanceof EuropeanNationType) {
-            buildEuropeanNationTypeDetail((EuropeanNationType) nationType, panel);
+            buildEuropeanNationTypeDetail((EuropeanNationType)nationType, panel);
         } else if (nationType instanceof IndianNationType) {
-            buildIndianNationTypeDetail((IndianNationType) nationType, panel);
+            buildIndianNationTypeDetail((IndianNationType)nationType, panel);
         }
     }
 
@@ -118,8 +112,8 @@ public class NationTypeDetailPanel
      * @param nationType - the EuropeanNationType
      * @param panel the panel to use
      */
-    private void buildEuropeanNationTypeDetail(EuropeanNationType nationType, JPanel panel) {
-
+    private void buildEuropeanNationTypeDetail(EuropeanNationType nationType,
+                                               JPanel panel) {
         Font boldFont = FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
             FontLibrary.FontSize.SMALLER, Font.BOLD);
 
@@ -169,15 +163,14 @@ public class NationTypeDetailPanel
         }
     }
 
-
     /**
      * Builds the details panel for the given nation type.
      *
      * @param nationType - the IndianNationType
      * @param panel the panel to use
      */
-    private void buildIndianNationTypeDetail(IndianNationType nationType, JPanel panel) {
-
+    private void buildIndianNationTypeDetail(IndianNationType nationType,
+                                             JPanel panel) {
         List<RandomChoice<UnitType>> skills = nationType.getSkills();
 
         panel.setLayout(new MigLayout("wrap 2, gapx 20", "", ""));
diff --git a/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java b/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java
index a4716d0a2..ac2f60a44 100644
--- a/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java
@@ -60,12 +60,10 @@ public class ResourcesDetailPanel
     }
 
 
+    // Implement ColopediaDetailPanel
+
     /**
-     * Adds one or several subtrees for all the objects for which this
-     * ColopediaDetailPanel could build a detail panel to the given
-     * root node.
-     *
-     * @param root a <code>DefaultMutableTreeNode</code>
+     * {@inheritDoc}
      */
     @Override
     public void addSubTrees(DefaultMutableTreeNode root) {
@@ -73,17 +71,11 @@ public class ResourcesDetailPanel
     }
 
     /**
-     * Builds the details panel for the ResourceType with the given
-     * identifier.
-     *
-     * @param id The object identifier.
-     * @param panel the detail panel to build
+     * {@inheritDoc}
      */
     @Override
     public void buildDetail(String id, JPanel panel) {
-        if (getId().equals(id)) {
-            return;
-        }
+        if (getId().equals(id)) return;
 
         ResourceType type = getSpecification().getResourceType(id);
         panel.setLayout(new MigLayout("wrap 2", "[]20[]"));
@@ -121,5 +113,4 @@ public class ResourcesDetailPanel
         panel.add(Utility.localizedTextArea(Messages.descriptionKey(type), 30),
                   "growx");
     }
-
 }
diff --git a/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java b/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
index 3eeaa51b4..50911f50d 100644
--- a/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
@@ -63,25 +63,24 @@ public class TerrainDetailPanel
     }
 
 
+    // Implement ColopediaDetailPanel
+
     /**
-     * Adds one or several subtrees for all the objects for which this
-     * ColopediaDetailPanel could build a detail panel to the given
-     * root node.
-     *
-     * @param root a <code>DefaultMutableTreeNode</code>
+     * {@inheritDoc}
      */
     @Override
     public void addSubTrees(DefaultMutableTreeNode root) {
-        DefaultMutableTreeNode node =
-            new DefaultMutableTreeNode(new ColopediaTreeItem(this, getId(), getName(), null));
+        DefaultMutableTreeNode node
+            = new DefaultMutableTreeNode(new ColopediaTreeItem(this, getId(),
+                                         getName(), null));
         for (TileType t : getSpecification().getTileTypeList()) {
             // FIXME: Use different method supporting a direct request of an
             //        image of fixed ICON_SIZE.
             final float maxTileImageHeight = ImageLibrary.TILE_OVERLAY_SIZE.height;
             Image tile = SwingGUI.createTileImageWithOverlayAndForest(t,
                 ImageLibrary.ICON_SIZE.height / maxTileImageHeight);
-            BufferedImage image = new BufferedImage(tile.getWidth(null), ImageLibrary.ICON_SIZE.height,
-                BufferedImage.TYPE_INT_ARGB);
+            BufferedImage image = new BufferedImage(tile.getWidth(null),
+                ImageLibrary.ICON_SIZE.height, BufferedImage.TYPE_INT_ARGB);
             Graphics2D g = image.createGraphics();
             g.drawImage(tile, 0, (ImageLibrary.ICON_SIZE.height - tile.getHeight(null)) / 2, null);
             g.dispose();
@@ -92,16 +91,11 @@ public class TerrainDetailPanel
     }
 
     /**
-     * Builds the details panel for the TileType with the given identifier.
-     *
-     * @param id The object identifier.
-     * @param panel the detail panel to build
+     * {@inheritDoc}
      */
     @Override
     public void buildDetail(String id, JPanel panel) {
-        if (getId().equals(id)) {
-            return;
-        }
+        if (getId().equals(id)) return;
 
         TileType tileType = getSpecification().getTileType(id);
         panel.setLayout(new MigLayout("wrap 4, gap 20"));
diff --git a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
index 1aac91a06..dfd8b46b9 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
@@ -46,6 +46,7 @@ import net.sf.freecol.common.model.GoodsType;
 import net.sf.freecol.common.model.IndianNationType;
 import net.sf.freecol.common.model.Modifier;
 import net.sf.freecol.common.model.Player;
+import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.util.RandomChoice;
@@ -56,12 +57,12 @@ import net.sf.freecol.common.util.RandomChoice;
  */
 public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
 
-    // layout of production modifier panel
+    /** Layout of production modifier panel. */
     private static final int MODIFIERS_PER_ROW = 5;
 
 
     /**
-     * Creates a new instance of this ColopediaDetailPanel.
+     * Creates a new instance of this colopedia subpanel.
      *
      * @param freeColClient The <code>FreeColClient</code> for the game.
      * @param colopediaPanel The parent ColopediaPanel.
@@ -72,28 +73,26 @@ public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
     }
 
 
+    // Implement ColopediaDetailPanel
+
     /**
-     * Adds one or several subtrees for all the objects for which this
-     * ColopediaDetailPanel could build a detail panel to the given
-     * root node.
-     *
-     * @param root a <code>DefaultMutableTreeNode</code>
+     * {@inheritDoc}
      */
     @Override
     public void addSubTrees(DefaultMutableTreeNode root) {
-        super.addSubTrees(root, "colopediaAction." + PanelType.UNITS.getKey(),
+        super.addSubTrees(root, getId(),
             new ArrayList<>(getSpecification().getUnitTypeList()));
     }
 
     /**
-     * Builds the details panel for the UnitType with the given identifier.
-     *
-     * @param id The object identifier.
-     * @param panel the detail panel to build
+     * {@inheritDoc}
      */
     @Override
     public void buildDetail(String id, JPanel panel) {
-        UnitType type = getSpecification().getUnitType(id);
+        if (getId().equals(id)) return;
+
+        final Specification spec = getSpecification();
+        UnitType type = spec.getUnitType(id);
         panel.setLayout(new MigLayout("wrap 4", "[]20[]40[]20[]"));
 
         JLabel name = Utility.localizedHeaderLabel(type, FontLibrary.FontSize.SMALL);
@@ -134,8 +133,9 @@ public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
             panel.add(new JLabel(Integer.toString(type.getSkill())), "right");
 
             List<BuildingType> schools = new ArrayList<>();
-            for (final BuildingType buildingType : getSpecification().getBuildingTypeList()) {
-                if (buildingType.hasAbility(Ability.TEACH) && buildingType.canAdd(type)) {
+            for (BuildingType buildingType : spec.getBuildingTypeList()) {
+                if (buildingType.hasAbility(Ability.TEACH)
+                    && buildingType.canAdd(type)) {
                     schools.add(buildingType);
                 }
             }
@@ -155,7 +155,7 @@ public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
             }
 
             List<IndianNationType> nations = new ArrayList<>();
-            for (IndianNationType nation : getSpecification().getIndianNationTypes()) {
+            for (IndianNationType nation : spec.getIndianNationTypes()) {
                 for (RandomChoice<UnitType> choice : nation.getSkills()) {
                     if (choice.getObject() == type) {
                         nations.add(nation);
@@ -193,7 +193,7 @@ public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
         }
 
         List<Modifier> bonusList = new ArrayList<>();
-        for (GoodsType goodsType : getSpecification().getGoodsTypeList()) {
+        for (GoodsType goodsType : spec.getGoodsTypeList()) {
             bonusList.addAll(type.getModifiers(goodsType.getId()));
         }
         int bonusNumber = bonusList.size();
@@ -205,7 +205,7 @@ public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
             JPanel productionPanel = new JPanel(new GridLayout(0, MODIFIERS_PER_ROW));
             productionPanel.setOpaque(false);
             for (Modifier productionBonus : bonusList) {
-                GoodsType goodsType = getSpecification().getGoodsType(productionBonus.getId());
+                GoodsType goodsType = spec.getGoodsType(productionBonus.getId());
                 String bonus = ModifierFormat.getModifierAsString(productionBonus);
                 productionPanel.add(getGoodsButton(goodsType, bonus));
             }

From 2566818b101adb797743a9f2d94ac4b02d6d9d07 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 3 Sep 2015 09:34:23 +0930
Subject: [PATCH 169/323] Classic colony panel lacked update call, BR#2898.

---
 .../sf/freecol/client/gui/panel/ReportClassicColonyPanel.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
index 3f174a4cb..9df44b8b6 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
@@ -70,6 +70,7 @@ public final class ReportClassicColonyPanel extends ReportPanel
         super(freeColClient, "reportColonyAction");
         
         this.colonies.addAll(freeColClient.getMySortedColonies());
+        update();
     }
 
     private void update() {

From 58c752e7401adabfc832916438c7137c1b8af56a Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 3 Sep 2015 07:40:40 +0930
Subject: [PATCH 170/323] Call igc.setCurrentPlayer directly.

---
 src/net/sf/freecol/client/control/InGameInputHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index 6d5bb8b95..b5a58d1ff 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -974,7 +974,7 @@ public final class InGameInputHandler extends InputHandler {
             return null;
         }
 
-        invokeLater(() -> { igc().setCurrentPlayer(player); });
+        igc().setCurrentPlayer(player); // It is safe to call this one directly
         return null;
     }
 

From aab8bd1a601aa0b69e7b2a7f3bb86f538242df27 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 3 Sep 2015 20:11:57 +0930
Subject: [PATCH 171/323] Fix broken logic for claiming land prior to colony
 build, BR#2906.

---
 data/strings/FreeColMessages.properties                |  2 +-
 .../sf/freecol/client/control/InGameController.java    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 05696c19c..1aafe8356 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -2719,7 +2719,7 @@ indianLand.cancel=Leave the land
 indianLand.pay=Offer %amount% gold for the land
 indianLand.take=Take what is rightfully ours
 indianLand.text=This land is owned by the %player%.  Would you like to:
-indianLand.unknown=Some unknown people live in these lands.  Would you like to:
+indianLand.unknown=Some uncontacted people live in these lands.  Would you like to:
 info.autodetectLanguageSelected=You have now chosen to autodetect the language. This will be done the next time you restart the game.
 info.enterSomeText=Please enter some text.
 info.newLanguageSelected=Setting the language to %language%. You will need to restart the game for the changes to fully take effect.
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index a4be44b08..ffc8d3063 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -41,6 +41,7 @@ import net.sf.freecol.client.gui.option.FreeColActionUI;
 import net.sf.freecol.common.debug.DebugUtils;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
+import net.sf.freecol.common.i18n.NameCache;
 import net.sf.freecol.common.io.FreeColDirectories;
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.AbstractGoods;
@@ -2778,10 +2779,11 @@ public final class InGameController implements NetworkConstants {
         // Only native owners that we can steal, buy from, or use a
         // bonus center tile exception should be possible by this point.
         UnitWas unitWas = new UnitWas(unit);
-        boolean ret = player.owns(tile)
-            || (player.canClaimToFoundSettlement(tile)
-                && askClaimTile(player, tile, unit,
-                                player.getLandPrice(tile)));
+        boolean ret = player.owns(tile);
+        if (!ret) {
+            ret = askClaimTile(player, tile, unit, player.getLandPrice(tile));
+            if (!ret) NameCache.putSettlementName(player, name);
+        }            
         if (ret) {
             ret = askServer().buildColony(name, unit)
                 && tile.hasSettlement();

From f82a54843db0967b4af57a019c16d8fedcde5655 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 3 Sep 2015 21:05:24 +0930
Subject: [PATCH 172/323] Prevent NPE shown in BR#2904.

---
 src/net/sf/freecol/server/FreeColServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/server/FreeColServer.java b/src/net/sf/freecol/server/FreeColServer.java
index 9040cedf4..0931a8291 100644
--- a/src/net/sf/freecol/server/FreeColServer.java
+++ b/src/net/sf/freecol/server/FreeColServer.java
@@ -1038,7 +1038,7 @@ public final class FreeColServer {
 
         // AI initialization.
         AIMain aiMain = getAIMain();
-        int aiIntegrity = aiMain.checkIntegrity(true);
+        int aiIntegrity = (aiMain == null) ? -1 : aiMain.checkIntegrity(true);
         if (aiIntegrity < 0) {
             aiMain = new AIMain(this);
             aiMain.findNewObjects(true);

From 81375e5f25462d5c5b705c3f7096e4e6ae694b2e Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 3 Sep 2015 21:26:35 +0200
Subject: [PATCH 173/323] Fix calculation of frame bounds in windowed mode,
 allowing it to be correctly positioned on second monitor, BR#2803-2

---
 src/net/sf/freecol/client/gui/FreeColFrame.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/FreeColFrame.java b/src/net/sf/freecol/client/gui/FreeColFrame.java
index 05faf10b6..702fceb24 100644
--- a/src/net/sf/freecol/client/gui/FreeColFrame.java
+++ b/src/net/sf/freecol/client/gui/FreeColFrame.java
@@ -88,9 +88,11 @@ public class FreeColFrame extends JFrame {
             if (windowed) {
                 Insets screenInsets = Toolkit.getDefaultToolkit()
                         .getScreenInsets(gd.getDefaultConfiguration());
-                bounds = new Rectangle(0, 0,
-                    bounds.width - (bounds.x+screenInsets.left+screenInsets.right),
-                    bounds.height - (bounds.y+screenInsets.top+screenInsets.bottom));
+                bounds = new Rectangle(
+                    bounds.x + screenInsets.left,
+                    bounds.y + screenInsets.top,
+                    bounds.width - screenInsets.right,
+                    bounds.height - screenInsets.bottom);
             }
         }
         setBounds(bounds);

From 5100355dc88ea5f6fa6ad7eae0220f44b73b289b Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 3 Sep 2015 23:02:53 +0200
Subject: [PATCH 174/323] Stop overwriting the JDialog location with a wrong
 value, fixing BR#2803.

FreeColDialog sets the location correctly in center of screen already.
chooseLocation is incompatible with JDialogs, as it is using a local
coordinate system inside the frame, but a JDialog is a free Window
requiring global window system coordinates.
The local coordinates were causing the dialogs to always appear on
primary screen, as the primary screen got 0,0 in upper left.
---
 src/net/sf/freecol/client/gui/Canvas.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 2c1fd1f61..76878851f 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -1591,9 +1591,6 @@ public final class Canvas extends JDesktopPane {
      */
     private <T> void viewFreeColDialog(final FreeColDialog<T> freeColDialog,
                                       Tile tile) {
-        freeColDialog.setLocation(chooseLocation(freeColDialog,
-                freeColDialog.getWidth(), freeColDialog.getHeight(),
-                getPopupPosition(tile)));
         dialogAdd(freeColDialog);
         if (freeColDialog.isModal()) stopBlinking();
         freeColDialog.requestFocus();

From c1da8e31a2e636a733167108e90e42bbfc42f80b Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 4 Sep 2015 08:02:24 +0930
Subject: [PATCH 175/323] Cortez now provides transport even when galleon
 present, PF#74.

---
 src/net/sf/freecol/common/model/Unit.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index 820786c37..dcb0f9f36 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -3407,9 +3407,10 @@ public class Unit extends GoodsLocation
         }
         if (loc.getColony() != null) {
             // Cash in if at a colony which has connectivity to Europe
-            // if the player does not have a suitable carrier.
+            // unless the player has a suitable carrier and no free transport.
             return loc.getColony().isConnectedPort()
-                && getOwner().getCarriersForUnit(this).isEmpty();
+                && (getOwner().getCarriersForUnit(this).isEmpty()
+                    || getTransportFee() == 0);
         }
         // Otherwise, cash in if in Europe.
         return loc instanceof Europe

From f55770e82f3acfdda9e547c9cd4715651904e44a Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 4 Sep 2015 08:09:58 +0930
Subject: [PATCH 176/323] Remove terrain bonus for settlement defence, PF#73.

---
 src/net/sf/freecol/common/model/SimpleCombatModel.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/common/model/SimpleCombatModel.java b/src/net/sf/freecol/common/model/SimpleCombatModel.java
index 994d76c6d..2ff13f9e4 100644
--- a/src/net/sf/freecol/common/model/SimpleCombatModel.java
+++ b/src/net/sf/freecol/common/model/SimpleCombatModel.java
@@ -541,9 +541,12 @@ public class SimpleCombatModel extends CombatModel {
 
             // Tile defence bonus
             disableFortified |= hasStrongDefenceModifier(tile.getType());
-            result.addAll(tile.getType().getDefenceModifiers());
 
             if (settlement == null) {
+                // PF#73 demonstrated that tile modifiers do not apply
+                // for colonies
+                result.addAll(tile.getType().getDefenceModifiers());
+
                 // Artillery in the Open penalty
                 if (defender.hasAbility(Ability.BOMBARD)
                     && defender.getState() != Unit.UnitState.FORTIFIED) {

From 594bd51b96e58fb7ccfb7b20b3e966506e1464e4 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 4 Sep 2015 08:19:05 +0930
Subject: [PATCH 177/323] Disable Coronado ongoing display of unseen colonies,
 PF#83.

---
 src/net/sf/freecol/common/model/Player.java | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 3efb51d39..9abdd79b4 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -2854,17 +2854,17 @@ public class Player extends FreeColGameObject implements Nameable {
             }
         }
         // All other European settlements if can see all colonies.
-        if (isEuropean() && hasAbility(Ability.SEE_ALL_COLONIES)) {
-            for (Player other : getGame().getLiveEuropeanPlayers(this)) {
-                for (Colony colony : other.getColonies()) {
-                    for (Tile t : colony.getTile().getSurroundingTiles(0,
-                            colony.getLineOfSight())) {
-                        cST[t.getX()][t.getY()] = true;
-                        t.seeTile(this);
-                    }
-                }
-            }
-        }
+        //if (isEuropean() && hasAbility(Ability.SEE_ALL_COLONIES)) {
+        //    for (Player other : getGame().getLiveEuropeanPlayers(this)) {
+        //        for (Colony colony : other.getColonies()) {
+        //            for (Tile t : colony.getTile().getSurroundingTiles(0,
+        //                    colony.getLineOfSight())) {
+        //                cST[t.getX()][t.getY()] = true;
+        //                t.seeTile(this);
+        //            }
+        //        }
+        //    }
+        //}
         return cST;
     }
 

From adee108c5e239088e2b7e02388d067b464daf480 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 4 Sep 2015 08:56:09 +0930
Subject: [PATCH 178/323] Move the see-all-colonies ability to freecol-rules
 Coronado.

---
 data/rules/classic/specification.xml        |  2 --
 data/rules/freecol/specification.xml        |  8 ++++++++
 src/net/sf/freecol/common/model/Player.java | 22 ++++++++++-----------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/data/rules/classic/specification.xml b/data/rules/classic/specification.xml
index c4c77c54d..90d1cfa90 100644
--- a/data/rules/classic/specification.xml
+++ b/data/rules/classic/specification.xml
@@ -2516,8 +2516,6 @@
     <founding-father id="model.foundingFather.franciscoDeCoronado"
                      type="exploration"
                      weight1="3" weight2="5" weight3="7">
-      <ability id="model.ability.seeAllColonies"
-               value="true"/>
       <event id="model.event.seeAllColonies"/>
     </founding-father>
     <founding-father id="model.foundingFather.hernandoDeSoto"
diff --git a/data/rules/freecol/specification.xml b/data/rules/freecol/specification.xml
index ca95720cc..6292a6ff1 100644
--- a/data/rules/freecol/specification.xml
+++ b/data/rules/freecol/specification.xml
@@ -58,6 +58,14 @@
   </building-types>
 
   <founding-fathers>
+    <founding-father id="model.foundingFather.franciscoDeCoronado"
+                     type="exploration"
+                     weight1="3" weight2="5" weight3="7">
+      <!-- FreeCol extension -->
+      <ability id="model.ability.seeAllColonies"
+               value="true"/>
+      <event id="model.event.seeAllColonies"/>
+    </founding-father>
     <founding-father id="model.foundingFather.pocahontas" type="political"
                      weight1="7" weight2="5" weight3="3">
       <modifier id="model.modifier.nativeAlarmModifier"
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 9abdd79b4..3efb51d39 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -2854,17 +2854,17 @@ public class Player extends FreeColGameObject implements Nameable {
             }
         }
         // All other European settlements if can see all colonies.
-        //if (isEuropean() && hasAbility(Ability.SEE_ALL_COLONIES)) {
-        //    for (Player other : getGame().getLiveEuropeanPlayers(this)) {
-        //        for (Colony colony : other.getColonies()) {
-        //            for (Tile t : colony.getTile().getSurroundingTiles(0,
-        //                    colony.getLineOfSight())) {
-        //                cST[t.getX()][t.getY()] = true;
-        //                t.seeTile(this);
-        //            }
-        //        }
-        //    }
-        //}
+        if (isEuropean() && hasAbility(Ability.SEE_ALL_COLONIES)) {
+            for (Player other : getGame().getLiveEuropeanPlayers(this)) {
+                for (Colony colony : other.getColonies()) {
+                    for (Tile t : colony.getTile().getSurroundingTiles(0,
+                            colony.getLineOfSight())) {
+                        cST[t.getX()][t.getY()] = true;
+                        t.seeTile(this);
+                    }
+                }
+            }
+        }
         return cST;
     }
 

From 22fbbbbb961a15aa6b0f8f817cf31f434b2e06ed Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 4 Sep 2015 10:24:08 +0930
Subject: [PATCH 179/323] Restrict Coronado ability to freecol ruleset.

---
 src/net/sf/freecol/common/io/FreeColTcFile.java    | 5 +----
 src/net/sf/freecol/common/model/Specification.java | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/common/io/FreeColTcFile.java b/src/net/sf/freecol/common/io/FreeColTcFile.java
index ce3c5075c..22f5957d7 100644
--- a/src/net/sf/freecol/common/io/FreeColTcFile.java
+++ b/src/net/sf/freecol/common/io/FreeColTcFile.java
@@ -68,12 +68,9 @@ public class FreeColTcFile extends FreeColModFile {
      * @exception IOException if an error occurs reading the specification.
      */
     public Specification getSpecification() throws IOException {
-        Specification specification;
         try (InputStream si = getSpecificationInputStream()) {
-            if (si == null) return null;
-            specification = new Specification(si);
+            return (si == null) ? null : new Specification(si);
         }
-        return specification;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index d7340908b..4cf2caf78 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -1961,10 +1961,11 @@ public final class Specification {
             }
         }
 
-        // Coronado gained an ability
+        // Coronado gained an ability in freecol
         FoundingFather coronado
             = getFoundingFather("model.foundingFather.franciscoDeCoronado");
-        if (!coronado.hasAbility(Ability.SEE_ALL_COLONIES)) {
+        if ("freecol".equals(getId())
+            && !coronado.hasAbility(Ability.SEE_ALL_COLONIES)) {
             coronado.addAbility(new Ability(Ability.SEE_ALL_COLONIES,
                                             coronado, true));
         }

From f04c0117452f7149f26eaf5076109c2bc5752354 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 4 Sep 2015 09:29:35 +0930
Subject: [PATCH 180/323] Implement Coronado revealed colonies size==1.

---
 doc/FreeCol.tex                                   |  4 ++++
 src/net/sf/freecol/server/model/ServerPlayer.java | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/doc/FreeCol.tex b/doc/FreeCol.tex
index a1216f837..99b071601 100644
--- a/doc/FreeCol.tex
+++ b/doc/FreeCol.tex
@@ -189,6 +189,10 @@ The following differences between the ``Classic'' rule set and the
   first. FreeCol optionally allows you to select the unit to be
   trained yourself. This feature is off by default in the Classic
   rule set and on by default in the FreeCol rule set.
+\item In the FreeCol ruleset, Francisco de Coronado grants full
+  ongoing visibility of foreign colonies and their surroundings.  Classic
+  rules do not grant ongoing or surroundings visibility, and show
+  revealed colonies as having size of one.
 \end{itemize}
 
 
diff --git a/src/net/sf/freecol/server/model/ServerPlayer.java b/src/net/sf/freecol/server/model/ServerPlayer.java
index 3412df5e2..ffb662a24 100644
--- a/src/net/sf/freecol/server/model/ServerPlayer.java
+++ b/src/net/sf/freecol/server/model/ServerPlayer.java
@@ -2163,7 +2163,19 @@ public class ServerPlayer extends Player implements ServerModelObject {
                     Colony colony = t.getColony();
                     Set<Tile> tiles = new HashSet<>();
                     if (colony != null && !this.owns(colony)) {
-                        tiles.addAll(exploreForSettlement(colony));
+                        // FreeCol ruleset adds this ability, allowing
+                        // full visibility of colony and surroundings.
+                        if (hasAbility(Ability.SEE_ALL_COLONIES)) {
+                            tiles.addAll(exploreForSettlement(colony));
+                        } else {
+                            // Col1 showed Coronado-revealed colonies as size 1
+                            if (exploreTile(t)) {
+                                Tile c = t.copy(game, Tile.class);
+                                c.getColony().setDisplayUnitCount(1);
+                                t.setCachedTile(this, c);
+                                tiles.add(t);
+                            }
+                        }
                     }
                     cs.add(See.only(this), tiles);
                 }

From 2b31360773f36cc7ee4dbd86c23e9ccc8df648c3 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 4 Sep 2015 19:56:55 +0930
Subject: [PATCH 181/323] Ensure defender of doomed native settlement is
 serialized in AttackChange.

---
 src/net/sf/freecol/server/control/ChangeSet.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/server/control/ChangeSet.java b/src/net/sf/freecol/server/control/ChangeSet.java
index af421a6a9..83ff6baaa 100644
--- a/src/net/sf/freecol/server/control/ChangeSet.java
+++ b/src/net/sf/freecol/server/control/ChangeSet.java
@@ -323,6 +323,8 @@ public class ChangeSet {
         private final Unit attacker;
         private final Unit defender;
         private final boolean success;
+        private final boolean defenderInSettlement;
+
 
         /**
          * Build a new AttackChange.
@@ -335,6 +337,10 @@ public class ChangeSet {
          * settlement, but if unscoped too much is disclosed.  So we
          * make a copy and neuter it.
          *
+         * We have to remember if the defender was in a settlement
+         * because by the time serialization occurs the settlement
+         * might have been destroyed.
+         *
          * We just have to accept that combat animation is an
          * exception to the normal visibility rules.
          *
@@ -347,6 +353,7 @@ public class ChangeSet {
                             boolean success) {
             super(see);
             Game game = attacker.getGame();
+            this.defenderInSettlement = defender.getTile().hasSettlement();
             this.attacker = attacker.copy(game, Unit.class);
             this.attacker.setLocationNoUpdate(this.attacker.getTile());
             this.defender = defender.copy(game, Unit.class);
@@ -404,7 +411,8 @@ public class ChangeSet {
                     element.appendChild(loc.toXMLElement(doc, serverPlayer));
                 }
             }
-            if (!canSeeUnit(serverPlayer, defender)) {
+            if (!canSeeUnit(serverPlayer, defender)
+                || this.defenderInSettlement) {
                 defender.setWorkType(null);
                 element.appendChild(defender.toXMLElement(doc));
             }

From 6f92ccaa5a220f5214446d52247f96cb829b7adb Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 1 Sep 2015 10:37:38 +0930
Subject: [PATCH 182/323] Use lambda in Map.

---
 src/net/sf/freecol/common/model/Map.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Map.java b/src/net/sf/freecol/common/model/Map.java
index d054e545e..0e54080c3 100644
--- a/src/net/sf/freecol/common/model/Map.java
+++ b/src/net/sf/freecol/common/model/Map.java
@@ -706,7 +706,7 @@ public class Map extends FreeColGameObject implements Location {
      * Simple interface to supply a heuristic to the A* routine.
      */
     private interface SearchHeuristic {
-        public int getValue(Tile tile);
+        int getValue(Tile tile);
     }
 
     /**
@@ -715,14 +715,8 @@ public class Map extends FreeColGameObject implements Location {
      * @param endTile The <code>Tile</code> to aim for.
      * @return A new <code>SearchHeuristic</code> aiming for the end tile.
      */
-    private SearchHeuristic getManhattenHeuristic(final Tile endTile) {
-        return new SearchHeuristic() {
-            // Manhatten distance to the end tile.
-            @Override
-            public int getValue(Tile tile) {
-                return tile.getDistanceTo(endTile);
-            }
-        };
+    private SearchHeuristic getManhattenHeuristic(Tile endTile) {
+        return (Tile tile) -> tile.getDistanceTo(endTile);
     }
 
     /**

From 1fa5b909eb7f193716fefb661195c77b41325f3a Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 6 Sep 2015 19:18:15 +0930
Subject: [PATCH 183/323] Improve turn report buttons, fixing BR#2908 in
 passing.

---
 .../client/gui/panel/ReportTurnPanel.java     | 164 +++++++-----------
 src/net/sf/freecol/common/i18n/Messages.java  |   8 +-
 2 files changed, 70 insertions(+), 102 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
index 4bea800a7..b2822c1d8 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
@@ -45,6 +45,7 @@ import net.miginfocom.swing.MigLayout;
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.FontLibrary;
+import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.Europe;
@@ -142,14 +143,14 @@ public final class ReportTurnPanel extends ReportPanel {
             
             JComponent component = new JLabel();
             FreeColObject messageDisplay = game.getMessageDisplay(message);
+            final ImageLibrary lib = getImageLibrary();
             if (messageDisplay != null) {
-                Image image = getImageLibrary().getObjectImage(messageDisplay, 1f);
+                Image image = lib.getObjectImage(messageDisplay, 1f);
                 ImageIcon icon = (image == null) ? null : new ImageIcon(image);
-
                 if (messageDisplay instanceof Colony
                     || messageDisplay instanceof Europe) {
                     JButton button = Utility.getLinkButton(null, icon,
-                                                       messageDisplay.getId());
+                        messageDisplay.getId());
                     button.addActionListener(this);
                     component = button;
                 } else if (messageDisplay instanceof Unit) {
@@ -165,8 +166,12 @@ public final class ReportTurnPanel extends ReportPanel {
             reportPanel.add(component, "newline");
             
             final JTextPane textPane = Utility.getDefaultTextPane();
-            insertMessage(textPane.getStyledDocument(), message,
-                          getMyPlayer());
+            try {
+                insertMessage(textPane.getStyledDocument(), message,
+                              getMyPlayer());
+            } catch (BadLocationException ble) {
+                logger.log(Level.WARNING, "message insert fail", ble);
+            }
             reportPanel.add(textPane);
 
             boolean ignore = false;
@@ -300,96 +305,67 @@ public final class ReportTurnPanel extends ReportPanel {
     }
 
     private void insertMessage(StyledDocument document, ModelMessage message,
-                               Player player) {
-        try {
-            String input = null;
-            String id = message.getId();
-            if (id == null || id.equals(input = Messages.message(id))) {
-                // id not present, fallback to default
-                input = Messages.message(message.getDefaultId());
-            }
-            int start = input.indexOf('%');
-            if (start == -1) {
-                // no variables present
-                insertText(document, input);
-                return;
-            } else if (start > 0) {
-                // output any string before the first occurrence of '%'
-                insertText(document, input.substring(0, start));
-            }
-
-            int end;
-            while ((end = input.indexOf('%', start + 1)) >= 0) {
-                String var = input.substring(start, end + 1);
-                String item = Messages.message(message.getReplacement(var));
-                FreeColGameObject messageSource = getFreeColClient().getGame()
-                    .getMessageSource(message);
-                if (item != null) {
-                    // found variable to replace
-                    if ("%colony%".equals(var) || var.endsWith("Colony%")) {
-                        Colony colony = player.getColonyByName(item);
-                        if (colony != null) {
-                            insertLinkButton(document, colony, item);
-                        } else if (messageSource instanceof Tile) {
-                            insertLinkButton(document, messageSource, item);
-                        } else {
-                            insertText(document, item);
-                        }
-                    } else if ("%europe%".equals(var)
-                        || ("%market%".equals(var) && player.isColonial())) {
-                        insertLinkButton(document, player.getEurope(),
-                            Messages.getName(player.getEurope()));
-                    } else if ("%unit%".equals(var)
-                        || var.endsWith("Unit%")
-                        || "%newName%".equals(var)) {
-                        Tile tile = null;
-                        if (messageSource instanceof Unit) {
-                            tile = ((Unit)messageSource).getTile();
-                        } else if (messageSource instanceof Tile) {
-                            tile = (Tile)messageSource;
-                        }
-                        if (tile != null) {
-                            Settlement settlement = tile.getSettlement();
-                            if (settlement != null) {
-                                insertLinkButton(document, settlement, item);
-                            } else {
-                                insertLinkButton(document, tile, item);
-                            }
-                        } else {
-                            insertText(document, item);
-                        }
-                    } else if ("%location%".equals(var)
-                        || var.endsWith("Location%")) {
-                        if (messageSource instanceof Europe) {
-                            insertLinkButton(document, player.getEurope(),
-                                Messages.getName(player.getEurope()));
-                        } else if (messageSource instanceof Location) {
-                            Location loc = upLoc((Location)messageSource);
-                            insertLinkButton(document, (FreeColGameObject)loc,
-                                             item);
-                        } else {
-                            insertText(document, item);
-                        }
+                               Player player) throws BadLocationException {
+        final String input = Messages.message(message);
+        final Game game = getFreeColClient().getGame();
+        final FreeColGameObject messageSource = game.getMessageSource(message);
+        int start = 0;
+        for (String key : message.getKeys()) {
+            StringTemplate rep = message.getReplacement(key);
+            String val = Messages.message(rep);
+            int index = input.indexOf(val, start);
+            if (index < 0) continue;
+            insertText(document, input.substring(start, index));
+            if ("%colony%".equals(key) || key.endsWith("Colony%")) {
+                Settlement settlement = game.getSettlement(val);
+                if (settlement != null) {
+                    if (player.owns(settlement)) {
+                        insertLinkButton(document, settlement, val);
                     } else {
-                        insertText(document, item);
+                        insertLinkButton(document, settlement.getTile(), val);
                     }
-                    start = end + 1;
+                } else if (messageSource instanceof Tile) {
+                    insertLinkButton(document, messageSource, val);
                 } else {
-                    // found no variable to replace: either a single '%', or
-                    // some unnecessary variable
-                    insertText(document, input.substring(start, end));
-                    start = end;
+                    insertText(document, val);
                 }
+            } else if ("%europe%".equals(key)
+                || ("%market%".equals(key) && player.isColonial())) {
+                insertLinkButton(document, player.getEurope(), val);
+            } else if ("%location%".equals(key)
+                || key.endsWith("Location%")) {
+                if (messageSource instanceof Europe) {
+                    insertLinkButton(document, player.getEurope(), val);
+                } else if (messageSource instanceof Location) {
+                    Location loc = upLoc((Location)messageSource);
+                    insertLinkButton(document, (FreeColGameObject)loc, val);
+                } else {
+                    insertText(document, val);
+                }
+            } else if ("%unit%".equals(key) || key.endsWith("Unit%")
+                || "%newName%".equals(key)) {
+                Tile tile = null;
+                if (messageSource instanceof Unit) {
+                    tile = ((Unit)messageSource).getTile();
+                } else if (messageSource instanceof Tile) {
+                    tile = (Tile)messageSource;
+                }
+                if (tile != null) {
+                    Settlement settlement = tile.getSettlement();
+                    if (settlement != null && player.owns(settlement)) {
+                        insertLinkButton(document, settlement, val);
+                    } else {
+                        insertLinkButton(document, tile, val);
+                    }
+                } else {
+                    insertText(document, val);
+                }
+            } else {
+                insertText(document, val);
             }
-
-            // output any string after the last occurrence of '%'
-            if (start < input.length()) {
-                insertText(document, input.substring(start));
-            }
-
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "Insert fail: " + message, e);
+            start = index + val.length();
         }
+        insertText(document, input.substring(start));
     }
 
     private void insertText(StyledDocument document, String text)
@@ -414,14 +390,4 @@ public final class ReportTurnPanel extends ReportPanel {
             : (loc.getSettlement() != null) ? loc.getSettlement()
             : loc;
     }
-
-    // Interface ActionListener
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void actionPerformed(ActionEvent ae) {
-        super.actionPerformed(ae);
-    }
 }
diff --git a/src/net/sf/freecol/common/i18n/Messages.java b/src/net/sf/freecol/common/i18n/Messages.java
index 05dc46b00..2ea617495 100644
--- a/src/net/sf/freecol/common/i18n/Messages.java
+++ b/src/net/sf/freecol/common/i18n/Messages.java
@@ -873,10 +873,12 @@ public class Messages {
                 int replacementIndex = input.indexOf('|', start);
                 int nextOpenIndex = input.indexOf("{{", start);
                 if (nextOpenIndex >= 0 && nextOpenIndex < replacementIndex) {
-                    replacementIndex = input.indexOf('|', findMatchingBracket(input, nextOpenIndex + 2) + 2);
+                    replacementIndex = input.indexOf('|',
+                        findMatchingBracket(input, nextOpenIndex + 2) + 2);
                 }
-                int end = (replacementIndex < 0 || replacementIndex > closeChoice)
-                    ? closeChoice : replacementIndex;
+                int end = (replacementIndex < 0
+                    || replacementIndex > closeChoice) ? closeChoice
+                    : replacementIndex;
                 String replacement = input.substring(start, end);
                 if (!replacement.contains("{{")) {
                     result.append(replacement);

From 46a3e8405d342c3b6d6faf5b77209474616ae38c Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 6 Sep 2015 19:48:00 +0930
Subject: [PATCH 184/323] Move upLoc to Location.

---
 .../client/gui/panel/ReportTurnPanel.java        | 11 ++---------
 src/net/sf/freecol/common/model/Location.java    | 11 +++++++++++
 src/net/sf/freecol/server/ai/AIGoods.java        |  2 +-
 src/net/sf/freecol/server/ai/AIObject.java       | 16 ----------------
 src/net/sf/freecol/server/ai/AIUnit.java         |  7 ++++---
 src/net/sf/freecol/server/ai/Cargo.java          | 10 +++++-----
 .../sf/freecol/server/ai/EuropeanAIPlayer.java   |  6 +++---
 .../server/ai/mission/BuildColonyMission.java    |  4 ++--
 .../ai/mission/CashInTreasureTrainMission.java   |  4 ++--
 .../ai/mission/IdleAtSettlementMission.java      |  3 ++-
 .../sf/freecol/server/ai/mission/Mission.java    | 11 ++++++-----
 .../server/ai/mission/PioneeringMission.java     |  2 +-
 .../server/ai/mission/ScoutingMission.java       |  4 ++--
 .../server/ai/mission/TransportMission.java      |  5 +++--
 14 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
index b2822c1d8..2af423b79 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
@@ -155,7 +155,7 @@ public final class ReportTurnPanel extends ReportPanel {
                     component = button;
                 } else if (messageDisplay instanceof Unit) {
                     JButton button = Utility.getLinkButton(null, icon,
-                        upLoc(((Unit)messageDisplay).getLocation()).getId());
+                        ((Unit)messageDisplay).up().getId());
                     button.addActionListener(this);
                     component = button;
                 } else { // includes Player
@@ -337,7 +337,7 @@ public final class ReportTurnPanel extends ReportPanel {
                 if (messageSource instanceof Europe) {
                     insertLinkButton(document, player.getEurope(), val);
                 } else if (messageSource instanceof Location) {
-                    Location loc = upLoc((Location)messageSource);
+                    Location loc = ((Location)messageSource).up();
                     insertLinkButton(document, (FreeColGameObject)loc, val);
                 } else {
                     insertText(document, val);
@@ -383,11 +383,4 @@ public final class ReportTurnPanel extends ReportPanel {
         document.insertString(document.getLength(), " ",
                               document.getStyle("button"));
     }
-    
-    public static Location upLoc(Location loc) {
-        if (loc instanceof Unit) loc = ((Unit)loc).getLocation();
-        return (loc == null) ? null
-            : (loc.getSettlement() != null) ? loc.getSettlement()
-            : loc;
-    }
 }
diff --git a/src/net/sf/freecol/common/model/Location.java b/src/net/sf/freecol/common/model/Location.java
index e2b5a40cb..0ab3bf57e 100644
--- a/src/net/sf/freecol/common/model/Location.java
+++ b/src/net/sf/freecol/common/model/Location.java
@@ -169,4 +169,15 @@ public interface Location extends ObjectWithId {
      * @return A short description.
      */
     public String toShortString();
+
+
+    /**
+     * Static frontend to up().
+     *
+     * @param loc The <code>Location</code> to improve.
+     * @return The improved <code>Location</code>.
+     */
+    public static Location upLoc(Location loc) {
+        return (loc == null) ? null : loc.up();
+    }
 }
diff --git a/src/net/sf/freecol/server/ai/AIGoods.java b/src/net/sf/freecol/server/ai/AIGoods.java
index 2a7a9280a..e738b5020 100644
--- a/src/net/sf/freecol/server/ai/AIGoods.java
+++ b/src/net/sf/freecol/server/ai/AIGoods.java
@@ -240,7 +240,7 @@ public class AIGoods extends TransportableAIObject {
      */
     @Override
     public PathNode getDeliveryPath(Unit carrier, Location dst) {
-        if (dst == null) dst = upLoc(getTransportDestination());
+        if (dst == null) dst = Location.upLoc(getTransportDestination());
 
         PathNode path = (goods.getLocation() == carrier) ? carrier.findPath(dst)
             : (goods.getLocation() instanceof Unit) ? null
diff --git a/src/net/sf/freecol/server/ai/AIObject.java b/src/net/sf/freecol/server/ai/AIObject.java
index 967f0cf2e..a8027b33b 100644
--- a/src/net/sf/freecol/server/ai/AIObject.java
+++ b/src/net/sf/freecol/server/ai/AIObject.java
@@ -164,22 +164,6 @@ public abstract class AIObject extends FreeColObject {
         if (getId() != null) aiMain.addAIObject(getId(), this);
     }
 
-    /**
-     * Gets a location's settlement if it has one, or failing that at
-     * least make sure the location is not just a carrier.  The intent
-     * is to increase the relevance of a location used as a target.
-     *
-     * @param loc The <code>Location</code> to test.
-     * @return The location settlement if any, otherwise, the original
-     *     location.
-     */
-    public static Location upLoc(Location loc) {
-        if (loc instanceof Unit) loc = ((Unit)loc).getLocation();
-        return (loc == null) ? null
-            : (loc.getSettlement() != null) ? loc.getSettlement()
-            : loc;
-    }
-
 
     // Override FreeColObject
 
diff --git a/src/net/sf/freecol/server/ai/AIUnit.java b/src/net/sf/freecol/server/ai/AIUnit.java
index 76363eb94..fa34086c3 100644
--- a/src/net/sf/freecol/server/ai/AIUnit.java
+++ b/src/net/sf/freecol/server/ai/AIUnit.java
@@ -271,7 +271,8 @@ public class AIUnit extends TransportableAIObject {
      */
     public Location getTrivialTarget() {
         PathNode path = unit.getTrivialPath();
-        return (path == null) ? null : upLoc(path.getLastNode().getLocation());
+        return (path == null) ? null
+            : Location.upLoc(path.getLastNode().getLocation());
     }
 
     /**
@@ -385,7 +386,7 @@ public class AIUnit extends TransportableAIObject {
     public boolean equipForRole(Role role) {
         final Specification spec = getSpecification();
         final Player player = unit.getOwner();
-        Location loc = upLoc(unit.getLocation());
+        Location loc = Location.upLoc(unit.getLocation());
         if (!(loc instanceof UnitLocation)) return false;
         int count = role.getMaximumCount();
         if (count > 0) {
@@ -448,7 +449,7 @@ public class AIUnit extends TransportableAIObject {
             dst = getTransportDestination();
             if (dst == null) return null;
         }
-        dst = upLoc(dst);
+        dst = Location.upLoc(dst);
 
         PathNode path;
         if (unit.getLocation() == carrier) {
diff --git a/src/net/sf/freecol/server/ai/Cargo.java b/src/net/sf/freecol/server/ai/Cargo.java
index 5fb1c09be..47993e207 100644
--- a/src/net/sf/freecol/server/ai/Cargo.java
+++ b/src/net/sf/freecol/server/ai/Cargo.java
@@ -109,7 +109,7 @@ public class Cargo {
                 && (destination = t.getTransportDestination()) == null) {
                 return "invalid-null-destination";
             }
-            this.tdst = AIObject.upLoc(destination);
+            this.tdst = Location.upLoc(destination);
             final Location src = t.getLocation();
             final boolean carrying = src == carrier;
             if (!carrying && src instanceof Unit) {
@@ -139,14 +139,14 @@ public class Cargo {
             if (carrying) {
                 this.twait = this.cwait = null;
             } else {
-                this.cwait = AIObject.upLoc(pick.getLocation());
+                this.cwait = Location.upLoc(pick.getLocation());
                 // If there is a previous non-carrier move on the delivery
                 // path, that is where the transportable should wait.
                 // This will be true for units moving directly from land
                 // to a naval carrier, but usually false when collection
                 // occurs in a colony (as for goods).
                 PathNode prev = (pick.previous == null) ? pick : pick.previous;
-                this.twait = AIObject.upLoc(prev.getLocation());
+                this.twait = Location.upLoc(prev.getLocation());
             }
 
             // Can the carrier reach the pickup point?  If already
@@ -168,10 +168,10 @@ public class Cargo {
                     + " " + pick.fullPathToString()
                     + " " + drop);
             }
-            this.cdst = AIObject.upLoc(drop.previous.getLocation());
+            this.cdst = Location.upLoc(drop.previous.getLocation());
 
             // The transportable ends up at the end of the delivery path.
-            this.tdst = AIObject.upLoc(deliver.getLastNode().getLocation());
+            this.tdst = Location.upLoc(deliver.getLastNode().getLocation());
 
             // Total turns is just that of the delivery path if the
             // transportable has been collected.  Otherwise, it is the
diff --git a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
index a148d78ed..4cbb48849 100644
--- a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
@@ -1076,7 +1076,7 @@ public class EuropeanAIPlayer extends AIPlayer {
             TransportableAIObject t = w.getTransportable();
             if (t != null && t.getTransport() == null
                 && t.getTransportDestination() != null) {
-                Location loc = upLoc(t.getTransportDestination());
+                Location loc = Location.upLoc(t.getTransportDestination());
                 appendToMapList(transportDemand, loc, w);
             }
         }
@@ -1197,7 +1197,7 @@ public class EuropeanAIPlayer extends AIPlayer {
      * @return A list of <code>WorkerWish</code>es.
      */
     public List<WorkerWish> getWorkerWishesAt(Location loc, UnitType type) {
-        List<Wish> demand = transportDemand.get(upLoc(loc));
+        List<Wish> demand = transportDemand.get(Location.upLoc(loc));
         if (demand == null) return Collections.<WorkerWish>emptyList();
         List<WorkerWish> result = new ArrayList<>();
         for (Wish w : demand) {
@@ -1217,7 +1217,7 @@ public class EuropeanAIPlayer extends AIPlayer {
      * @return A list of <code>GoodsWish</code>es.
      */
     public List<GoodsWish> getGoodsWishesAt(Location loc, GoodsType type) {
-        List<Wish> demand = transportDemand.get(upLoc(loc));
+        List<Wish> demand = transportDemand.get(Location.upLoc(loc));
         if (demand == null) return Collections.<GoodsWish>emptyList();
         List<GoodsWish> result = new ArrayList<>();
         for (Wish w : demand) {
diff --git a/src/net/sf/freecol/server/ai/mission/BuildColonyMission.java b/src/net/sf/freecol/server/ai/mission/BuildColonyMission.java
index 46f69b208..7087e3b49 100644
--- a/src/net/sf/freecol/server/ai/mission/BuildColonyMission.java
+++ b/src/net/sf/freecol/server/ai/mission/BuildColonyMission.java
@@ -217,8 +217,8 @@ public class BuildColonyMission extends Mission {
                                       boolean deferOK) {
         PathNode path = findTargetPath(aiUnit, range, deferOK);
         return (path != null) ? extractTarget(aiUnit, path)
-            : upLoc(findCircleTarget(aiUnit, getGoalDecider(aiUnit, deferOK),
-                                     range*3, deferOK));
+            : Location.upLoc(findCircleTarget(aiUnit,
+                    getGoalDecider(aiUnit, deferOK), range*3, deferOK));
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/mission/CashInTreasureTrainMission.java b/src/net/sf/freecol/server/ai/mission/CashInTreasureTrainMission.java
index 2e3caa4b0..0a69ff601 100644
--- a/src/net/sf/freecol/server/ai/mission/CashInTreasureTrainMission.java
+++ b/src/net/sf/freecol/server/ai/mission/CashInTreasureTrainMission.java
@@ -259,8 +259,8 @@ public class CashInTreasureTrainMission extends Mission {
                                       boolean deferOK) {
         PathNode path = findTargetPath(aiUnit, range, deferOK);
         return (path != null) ? extractTarget(aiUnit, path)
-            : upLoc(findCircleTarget(aiUnit, getGoalDecider(aiUnit, deferOK),
-                                     range*3, deferOK));
+            : Location.upLoc(findCircleTarget(aiUnit,
+                    getGoalDecider(aiUnit, deferOK), range*3, deferOK));
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/mission/IdleAtSettlementMission.java b/src/net/sf/freecol/server/ai/mission/IdleAtSettlementMission.java
index 357aa697f..d2cb59d67 100644
--- a/src/net/sf/freecol/server/ai/mission/IdleAtSettlementMission.java
+++ b/src/net/sf/freecol/server/ai/mission/IdleAtSettlementMission.java
@@ -118,7 +118,8 @@ public class IdleAtSettlementMission extends Mission {
 
         final Unit unit = getAIUnit().getUnit();
         PathNode path = unit.findOurNearestOtherSettlement();
-        return (path == null) ? null : upLoc(path.getLastNode().getLocation());
+        return (path == null) ? null
+            : Location.upLoc(path.getLastNode().getLocation());
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/mission/Mission.java b/src/net/sf/freecol/server/ai/mission/Mission.java
index f86bfe1fa..40410d4f1 100644
--- a/src/net/sf/freecol/server/ai/mission/Mission.java
+++ b/src/net/sf/freecol/server/ai/mission/Mission.java
@@ -394,7 +394,7 @@ public abstract class Mission extends AIObject {
      */
     protected Mission lbAt(LogBuilder lb) {
         final Unit unit = getUnit();
-        lb.add(", at ", upLoc(unit.getLocation()));
+        lb.add(", at ", Location.upLoc(unit.getLocation()));
         return this;
     }
 
@@ -667,7 +667,7 @@ public abstract class Mission extends AIObject {
         final Map map = unit.getGame().getMap();
         PathNode path = null;
         boolean useTransport = false;
-        target = upLoc(target);
+        target = Location.upLoc(target);
 
         // Consider where the unit is starting.
         if (unit.isAtSea()) {
@@ -866,11 +866,11 @@ public abstract class Mission extends AIObject {
         for (; path != null; path = path.next) {
             // Check for immediate failure
             if (unit.isDisposed()) {
-                lb.add(", died going to ", upLoc(path.getLocation()));
+                lb.add(", died going to ", Location.upLoc(path.getLocation()));
                 return MoveType.MOVE_NO_REPAIR;
             } else if (unit.getMovesLeft() <= 0) {
                 lbAt(lb);
-                lb.add(", en route to ", upLoc(target));
+                lb.add(", en route to ", Location.upLoc(target));
                 return MoveType.MOVE_NO_MOVES;
             }
 
@@ -894,7 +894,8 @@ public abstract class Mission extends AIObject {
             }
             if (!aiUnit.move(path.getDirection())) {
                 lbAt(lb);
-                lb.add(", failed to move to ", upLoc(path.getLocation()));
+                lb.add(", failed to move to ",
+                    Location.upLoc(path.getLocation()));
                 return MoveType.MOVE_ILLEGAL;
             }
         }
diff --git a/src/net/sf/freecol/server/ai/mission/PioneeringMission.java b/src/net/sf/freecol/server/ai/mission/PioneeringMission.java
index fb6ee2e65..f55ff9081 100644
--- a/src/net/sf/freecol/server/ai/mission/PioneeringMission.java
+++ b/src/net/sf/freecol/server/ai/mission/PioneeringMission.java
@@ -340,7 +340,7 @@ public class PioneeringMission extends Mission {
         if (deferOK) return getBestPioneeringColony(aiUnit);
         Location loc = findCircleTarget(aiUnit, getGoalDecider(aiUnit, false),
                                         range*3, false);
-        return (hasTools(aiUnit)) ? loc : upLoc(loc);
+        return (hasTools(aiUnit)) ? loc : Location.upLoc(loc);
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/mission/ScoutingMission.java b/src/net/sf/freecol/server/ai/mission/ScoutingMission.java
index 980ac0d14..9fbce3ce0 100644
--- a/src/net/sf/freecol/server/ai/mission/ScoutingMission.java
+++ b/src/net/sf/freecol/server/ai/mission/ScoutingMission.java
@@ -218,8 +218,8 @@ public class ScoutingMission extends Mission {
                                       boolean deferOK) {
         PathNode path = findTargetPath(aiUnit, range, deferOK);
         return (path != null) ? extractTarget(aiUnit, path)
-            : upLoc(findCircleTarget(aiUnit, getGoalDecider(aiUnit, deferOK),
-                                     range*3, deferOK));
+            : Location.upLoc(findCircleTarget(aiUnit,
+                    getGoalDecider(aiUnit, deferOK), range*3, deferOK));
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/mission/TransportMission.java b/src/net/sf/freecol/server/ai/mission/TransportMission.java
index 0f4faf849..ce336abf7 100644
--- a/src/net/sf/freecol/server/ai/mission/TransportMission.java
+++ b/src/net/sf/freecol/server/ai/mission/TransportMission.java
@@ -352,7 +352,7 @@ public class TransportMission extends Mission {
             }
             if (next == null) next = getAIUnit().getTrivialTarget();
         }
-        setTarget(upLoc(next));
+        setTarget(Location.upLoc(next));
     }
 
     // Medium-level cargo and target manipulation, should be kept
@@ -831,7 +831,8 @@ public class TransportMission extends Mission {
                     try {
                         Cargo cargo = Cargo.newCargo(t, carrier, end, false);
                         boolean result = queueCargo(cargo, false, lb);
-                        lb.add(" to drop at ", upLoc(end), "=", result);
+                        lb.add(" to drop at ", Location.upLoc(end),
+                            "=", result);
                     } catch (FreeColException fce) {
                         lb.add(" ", t, " drop-fail(", fce.getMessage(), ")");
                     }

From 62c4bb856d5150f900745aa3b0c308956b5fd704 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 1 Sep 2015 10:52:57 +0930
Subject: [PATCH 185/323] Use lambda in NetworkRequestHandler.

---
 .../networking/NetworkRequestHandler.java     |   2 +-
 .../server/control/InGameInputHandler.java    | 136 ++++++------------
 .../freecol/server/control/InputHandler.java  |  18 +--
 .../server/control/PreGameInputHandler.java   |  71 ++++-----
 4 files changed, 75 insertions(+), 152 deletions(-)

diff --git a/src/net/sf/freecol/common/networking/NetworkRequestHandler.java b/src/net/sf/freecol/common/networking/NetworkRequestHandler.java
index 0a40e84ca..f119852b0 100644
--- a/src/net/sf/freecol/common/networking/NetworkRequestHandler.java
+++ b/src/net/sf/freecol/common/networking/NetworkRequestHandler.java
@@ -35,5 +35,5 @@ public interface NetworkRequestHandler {
      * @param element The root <code>Element</code> of the message.
      * @return The reply <code>Element</code>, which may be null.
      */
-    public Element handle(Connection connection, Element element);
+    Element handle(Connection connection, Element element);
 }
diff --git a/src/net/sf/freecol/server/control/InGameInputHandler.java b/src/net/sf/freecol/server/control/InGameInputHandler.java
index 61c5ee140..63414b95a 100644
--- a/src/net/sf/freecol/server/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/server/control/InGameInputHandler.java
@@ -582,111 +582,65 @@ public final class InGameInputHandler extends InputHandler
 
         // NetworkRequestHandlers
         register(AssignTradeRouteMessage.getXMLElementTagName(),
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return new AssignTradeRouteMessage(getGame(), element)
-                    .handle(freeColServer, connection);
-            }});
+            (Connection connection, Element element) ->
+            new AssignTradeRouteMessage(getGame(), element)
+                .handle(freeColServer, connection));
         register("continuePlaying",
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return freeColServer.getInGameController()
-                    .continuePlaying(freeColServer.getPlayer(connection));
-            }});
+            (Connection connection, Element element) ->
+            freeColServer.getInGameController()
+                .continuePlaying(freeColServer.getPlayer(connection)));
         register(DiplomacyMessage.getXMLElementTagName(),
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return new DiplomacyMessage(getGame(), element)
-                    .handle(freeColServer, connection);
-            }});
+            (Connection connection, Element element) ->
+            new DiplomacyMessage(getGame(), element)
+                .handle(freeColServer, connection));
         register("enterRevengeMode",
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return freeColServer.getInGameController()
-                    .enterRevengeMode(freeColServer.getPlayer(connection));
-            }});
+            (Connection connection, Element element) ->
+            freeColServer.getInGameController()
+                .enterRevengeMode(freeColServer.getPlayer(connection)));
         register(FirstContactMessage.getXMLElementTagName(),
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return new FirstContactMessage(getGame(), element)
-                    .handle(freeColServer, connection);
-            }});
+            (Connection connection, Element element) ->
+            new FirstContactMessage(getGame(), element)
+                .handle(freeColServer, connection));
         register("getHighScores",
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return freeColServer.getInGameController()
-                    .getHighScores(freeColServer.getPlayer(connection));
-            }});
+            (Connection connection, Element element) ->
+            freeColServer.getInGameController()
+                .getHighScores(freeColServer.getPlayer(connection)));
         register(GetNationSummaryMessage.getXMLElementTagName(),
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return new GetNationSummaryMessage(element)
-                    .handle(freeColServer, connection);
-            }});
+            (Connection connection, Element element) ->
+            new GetNationSummaryMessage(element)
+                .handle(freeColServer, connection));
         register("getNewTradeRoute",
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return freeColServer.getInGameController()
-                    .getNewTradeRoute(freeColServer.getPlayer(connection));
-            }});
+            (Connection connection, Element element) ->
+            freeColServer.getInGameController()
+                .getNewTradeRoute(freeColServer.getPlayer(connection)));
         register("retire",
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return freeColServer.getInGameController()
-                    .retire(freeColServer.getPlayer(connection));
-            }
-        });
+            (Connection connection, Element element) ->
+            freeColServer.getInGameController()
+                .retire(freeColServer.getPlayer(connection)));
         register(SetCurrentStopMessage.getXMLElementTagName(),
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return new SetCurrentStopMessage(getGame(), element)
-                    .handle(freeColServer, connection);
-            }});
+            (Connection connection, Element element) ->
+            new SetCurrentStopMessage(getGame(), element)
+                .handle(freeColServer, connection));
         register(SetDestinationMessage.getXMLElementTagName(),
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return new SetDestinationMessage(getGame(), element)
-                    .handle(freeColServer, connection);
-            }});
+            (Connection connection, Element element) ->
+            new SetDestinationMessage(getGame(), element)
+                .handle(freeColServer, connection));
         register(SetTradeRoutesMessage.getXMLElementTagName(),
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return new SetTradeRoutesMessage(getGame(), element)
-                    .handle(freeColServer, connection);
-            }});
+            (Connection connection, Element element) ->
+            new SetTradeRoutesMessage(getGame(), element)
+                .handle(freeColServer, connection));
         register(SpySettlementMessage.getXMLElementTagName(),
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return new SpySettlementMessage(getGame(), element)
-                    .handle(freeColServer, connection);
-            }});
+            (Connection connection, Element element) ->
+            new SpySettlementMessage(getGame(), element)
+                .handle(freeColServer, connection));
         register("getStatistics",
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return freeColServer.getInGameController()
-                    .getStatistics(freeColServer.getPlayer(connection));
-            }});
+            (Connection connection, Element element) ->
+            freeColServer.getInGameController()
+                .getStatistics(freeColServer.getPlayer(connection)));
         register(UpdateTradeRouteMessage.getXMLElementTagName(),
-                 new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return new UpdateTradeRouteMessage(getGame(), element)
-                    .handle(freeColServer, connection);
-            }});
+            (Connection connection, Element element) ->
+            new UpdateTradeRouteMessage(getGame(), element)
+                .handle(freeColServer, connection));
     }
 
     /**
diff --git a/src/net/sf/freecol/server/control/InputHandler.java b/src/net/sf/freecol/server/control/InputHandler.java
index 1fa42b208..6f1fd95bd 100644
--- a/src/net/sf/freecol/server/control/InputHandler.java
+++ b/src/net/sf/freecol/server/control/InputHandler.java
@@ -63,20 +63,12 @@ public abstract class InputHandler extends FreeColServerHolder implements Messag
     public InputHandler(final FreeColServer freeColServer) {
         super(freeColServer);
         // All sub-classes are forced to implement this one
-        register("logout", new NetworkRequestHandler() {
-                @Override
-                public Element handle(Connection connection, Element element) {
-                    return logout(connection, element);
-                }
-            });
+        register("logout", (Connection connection, Element element) ->
+            logout(connection, element));
         register("disconnect", new DisconnectHandler());
-        register("chat", new NetworkRequestHandler() {
-                @Override
-                public Element handle(Connection connection, Element element) {
-                    return new ChatMessage(getGame(), element)
-                        .handle(freeColServer, connection);
-                }
-            });
+        register("chat", (Connection connection, Element element) ->
+            new ChatMessage(getGame(), element)
+                .handle(freeColServer, connection));
     }
 
     /**
diff --git a/src/net/sf/freecol/server/control/PreGameInputHandler.java b/src/net/sf/freecol/server/control/PreGameInputHandler.java
index 7dcc1675a..21726b176 100644
--- a/src/net/sf/freecol/server/control/PreGameInputHandler.java
+++ b/src/net/sf/freecol/server/control/PreGameInputHandler.java
@@ -62,58 +62,35 @@ public final class PreGameInputHandler extends InputHandler {
     public PreGameInputHandler(FreeColServer freeColServer) {
         super(freeColServer);
         // FIXME: move and simplify methods later, for now just delegate
-        register("ready", new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return ready(connection, element);
-            }
-        });
-        register("requestLaunch", new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
+        register("ready",
+            (Connection connection, Element element) ->
+            ready(connection, element));
+        register("requestLaunch",
+            (Connection connection, Element element) -> {
                 Element reply = requestLaunch(connection, element);
                 if (reply != null) {
                     launching = false;
                 }
                 return reply;
-            }
-        });
-        register("setColor", new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return setColor(connection, element);
-            }
-        });
-        register("setNation", new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return setNation(connection, element);
-            }
-        });
-        register("setNationType", new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return setNationType(connection, element);
-            }
-        });
-        register("setAvailable", new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return setAvailable(connection, element);
-            }
-        });
-        register("updateGameOptions", new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return updateGameOptions(connection, element);
-            }
-        });
-        register("updateMapGeneratorOptions", new NetworkRequestHandler() {
-            @Override
-            public Element handle(Connection connection, Element element) {
-                return updateMapGeneratorOptions(connection, element);
-            }
-        });
+            });
+        register("setColor",
+            (Connection connection, Element element) ->
+            setColor(connection, element));
+        register("setNation",
+            (Connection connection, Element element) ->
+            setNation(connection, element));
+        register("setNationType",
+            (Connection connection, Element element) ->
+            setNationType(connection, element));
+        register("setAvailable",
+            (Connection connection, Element element) ->
+            setAvailable(connection, element));
+        register("updateGameOptions",
+            (Connection connection, Element element) ->
+            updateGameOptions(connection, element));
+        register("updateMapGeneratorOptions",
+            (Connection connection, Element element) ->
+            updateMapGeneratorOptions(connection, element));
     }
 
     /**

From a1bcf20ba80f0ea0e3b61ebfabe90ac20379f078 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 7 Sep 2015 21:01:42 +0200
Subject: [PATCH 186/323] Clean up Canvas.chooseLocation removing the check for
 dialogs

This is because it would get coordinates in 2 coordinate systems which it
does not handle and chooseLocation is only called for panels now cause of this.
The method saving these locations only does it for FreeColPanel anyway,
so the only effect was slowing down the game a tiny bit.
---
 src/net/sf/freecol/client/gui/Canvas.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 76878851f..6cee3705f 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -627,7 +627,7 @@ public final class Canvas extends JDesktopPane {
     private Point chooseLocation(Component comp, int width, int height, 
                                  PopupPosition popupPosition) {
         Point p = null;
-        if ((comp instanceof FreeColPanel || comp instanceof FreeColDialog<?>)
+        if ((comp instanceof FreeColPanel)
             && (p = getSavedPosition(comp)) != null) {
             // Sanity check stuff coming out of client options.
             if (p.getX() < 0

From efde380686337cd9eb24917c7e2d7b09aa6fda6f Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 7 Sep 2015 22:14:28 +0200
Subject: [PATCH 187/323] Fix some regressions from the bugfix for BR#2803 in
 git.5100355d

Readd getPopupPosition, which was also silently refocusing the map.
Move non-modal dialogs to the other side of the canvas, if needed
to avoid hiding the tile.
---
 src/net/sf/freecol/client/gui/Canvas.java | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 6cee3705f..1d4aba02b 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -1591,6 +1591,25 @@ public final class Canvas extends JDesktopPane {
      */
     private <T> void viewFreeColDialog(final FreeColDialog<T> freeColDialog,
                                       Tile tile) {
+        PopupPosition pp = getPopupPosition(tile);
+
+        // TODO: Remove compatibility code when all non-modal dialogs
+        //       have been converted into panels.
+        if(!freeColDialog.isModal()) {
+            int canvasWidth = getWidth();
+            int dialogWidth = freeColDialog.getWidth();
+            if(dialogWidth*2 <= canvasWidth) {
+                Point location = freeColDialog.getLocation();
+                if(pp == PopupPosition.CENTERED_LEFT) {
+                    freeColDialog.setLocation(location.x - canvasWidth/4,
+                                              location.y);
+                } else if(pp == PopupPosition.CENTERED_RIGHT) {
+                    freeColDialog.setLocation(location.x + canvasWidth/4,
+                                              location.y);
+                }
+            }
+        }
+
         dialogAdd(freeColDialog);
         if (freeColDialog.isModal()) stopBlinking();
         freeColDialog.requestFocus();

From fb4df79635d30cd10c436e26c7f467b4770af165 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 7 Sep 2015 22:08:32 +0200
Subject: [PATCH 188/323] Rename misleading getPopupPosition method with hidden
 call to refocus the map

---
 src/net/sf/freecol/client/gui/Canvas.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 1d4aba02b..6c7e53701 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -811,13 +811,13 @@ public final class Canvas extends JDesktopPane {
     }
 
     /**
-     * Given a tile to be made visible, determine a position to popup
+     * Make a tile visible, then determine corresponding position to popup
      * a panel.
      *
      * @param tile A <code>Tile</code> to be made visible.
      * @return A <code>PopupPosition</code> for a panel to be displayed.
      */
-    private PopupPosition getPopupPosition(Tile tile) {
+    private PopupPosition setOffsetFocus(Tile tile) {
         if (tile == null) return PopupPosition.CENTERED;
         int where = mapViewer.setOffsetFocus(tile);
         return (where > 0) ? PopupPosition.CENTERED_LEFT
@@ -1015,7 +1015,7 @@ public final class Canvas extends JDesktopPane {
      */
     private void showFreeColPanel(FreeColPanel panel, Tile tile,
                                   boolean resizable) {
-        showSubPanel(panel, getPopupPosition(tile), resizable);
+        showSubPanel(panel, setOffsetFocus(tile), resizable);
     }
 
     /**
@@ -1591,7 +1591,7 @@ public final class Canvas extends JDesktopPane {
      */
     private <T> void viewFreeColDialog(final FreeColDialog<T> freeColDialog,
                                       Tile tile) {
-        PopupPosition pp = getPopupPosition(tile);
+        PopupPosition pp = setOffsetFocus(tile);
 
         // TODO: Remove compatibility code when all non-modal dialogs
         //       have been converted into panels.

From feb2390650643372ad1b77bd1339e133d22791a2 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 8 Sep 2015 09:49:24 +0930
Subject: [PATCH 189/323] Increase Coronado reveal radius, using a new
 spec-level modifier.

---
 data/rules/classic/specification.xml          |  2 +
 src/net/sf/freecol/common/model/Modifier.java |  2 +
 .../freecol/common/model/Specification.java   |  6 +++
 .../sf/freecol/server/model/ServerPlayer.java | 38 ++++++++++---------
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/data/rules/classic/specification.xml b/data/rules/classic/specification.xml
index 90d1cfa90..6062ef8c2 100644
--- a/data/rules/classic/specification.xml
+++ b/data/rules/classic/specification.xml
@@ -2517,6 +2517,8 @@
                      type="exploration"
                      weight1="3" weight2="5" weight3="7">
       <event id="model.event.seeAllColonies"/>
+      <modifier id="model.modifier.exposedTilesRadius"
+                type="additive" value="3"/>
     </founding-father>
     <founding-father id="model.foundingFather.hernandoDeSoto"
                      type="exploration"
diff --git a/src/net/sf/freecol/common/model/Modifier.java b/src/net/sf/freecol/common/model/Modifier.java
index be3c47481..503a93b30 100644
--- a/src/net/sf/freecol/common/model/Modifier.java
+++ b/src/net/sf/freecol/common/model/Modifier.java
@@ -70,6 +70,8 @@ public class Modifier extends Feature {
         = "model.modifier.defence";
     public static final String EXPLORE_LOST_CITY_RUMOUR
         = "model.modifier.exploreLostCityRumour";
+    public static final String EXPOSED_TILES_RADIUS
+        = "model.modifier.exposedTilesRadius";
     public static final String FORTIFIED
         = "model.modifier.fortified";
     public static final String IMMIGRATION
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index 4cf2caf78..f6884c742 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -2263,6 +2263,12 @@ public final class Specification {
             m.addScope(scope);
             hardyPioneer.addModifier(m);
         }
+
+        // Added modifier to Coronado
+        if (!coronado.hasModifier(Modifier.EXPOSED_TILES_RADIUS)) {
+            coronado.addModifier(new Modifier(Modifier.EXPOSED_TILES_RADIUS,
+                    3.0f, Modifier.ModifierType.ADDITIVE, coronado, 0));
+        }
         // end @compat 0.11.5
     }
 
diff --git a/src/net/sf/freecol/server/model/ServerPlayer.java b/src/net/sf/freecol/server/model/ServerPlayer.java
index ffb662a24..e602f14ea 100644
--- a/src/net/sf/freecol/server/model/ServerPlayer.java
+++ b/src/net/sf/freecol/server/model/ServerPlayer.java
@@ -2048,9 +2048,10 @@ public class ServerPlayer extends Player implements ServerModelObject {
      */
     public void csAddFoundingFather(FoundingFather father, Random random,
                                     ChangeSet cs) {
-        Game game = getGame();
-        Specification spec = game.getSpecification();
-        ServerEurope europe = (ServerEurope)getEurope();
+        final Game game = getGame();
+        final Specification spec = game.getSpecification();
+        final ServerEurope europe = (ServerEurope)getEurope();
+        final Turn turn = game.getTurn();
         boolean europeDirty = false, visibilityChange = false;
 
         // FIXME: We do not want to have to update the whole player
@@ -2064,7 +2065,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
                       .addNamed("%foundingFather%", father)
                       .add("%description%", father.getDescriptionKey()));
         cs.addHistory(this,
-            new HistoryEvent(getGame().getTurn(),
+            new HistoryEvent(turn,
                 HistoryEvent.HistoryEventType.FOUNDING_FATHER, this)
                     .addNamed("%father%", father));
 
@@ -2161,22 +2162,25 @@ public class ServerPlayer extends Player implements ServerModelObject {
                 visibilityChange = true;//-vis(this), can now see other colonies
                 for (Tile t : game.getMap().getAllTiles()) {
                     Colony colony = t.getColony();
+                    if (colony == null) continue;
                     Set<Tile> tiles = new HashSet<>();
-                    if (colony != null && !this.owns(colony)) {
-                        // FreeCol ruleset adds this ability, allowing
-                        // full visibility of colony and surroundings.
-                        if (hasAbility(Ability.SEE_ALL_COLONIES)) {
-                            tiles.addAll(exploreForSettlement(colony));
-                        } else {
-                            // Col1 showed Coronado-revealed colonies as size 1
-                            if (exploreTile(t)) {
-                                Tile c = t.copy(game, Tile.class);
-                                c.getColony().setDisplayUnitCount(1);
-                                t.setCachedTile(this, c);
-                                tiles.add(t);
-                            }
+                    if (exploreTile(t)) {
+                        if (!hasAbility(Ability.SEE_ALL_COLONIES)) {
+                            // FreeCol ruleset adds this ability
+                            // allowing full visibility of colony,
+                            // whereas Col1 showed colonies as size 1.
+                            Tile c = t.copy(game, Tile.class);
+                            c.getColony().setDisplayUnitCount(1);
+                            t.setCachedTile(this, c);
                         }
+                        tiles.add(t);
                     }
+                    // Revealed tiles in 11x11 block in Col1
+                    final int fullRadius = (int)father
+                        .applyModifiers((float)colony.getLineOfSight(),
+                                        turn, Modifier.EXPOSED_TILES_RADIUS);
+                    tiles.addAll(exploreTiles(t.getSurroundingTiles(1,
+                                fullRadius)));
                     cs.add(See.only(this), tiles);
                 }
 

From af4c81a404dfb12a99712ba2b023443cf28f6c9d Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 8 Sep 2015 14:39:13 +0930
Subject: [PATCH 190/323] Ensure incited European war status is serialized,
 BR#2880.

---
 .../client/control/InGameController.java      |  9 ++++++---
 .../client/control/InGameInputHandler.java    |  3 ++-
 .../server/control/InGameController.java      | 19 ++++++++++++++++---
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index ffc8d3063..ac765bf1d 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -3220,9 +3220,12 @@ public final class InGameController implements NetworkConstants {
                 visibilityChange = true;
             }
             if (visibilityChange) player.invalidateCanSeeTiles();//+vis(player)
-            t = StringTemplate.template("diplomacy.offerAccepted")
-                .addStringTemplate("%nation%", nation);
-            gui.showInformationMessage(t);
+            ModelMessage mm
+                = new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
+                                   "diplomacy.offerAccepted", otherPlayer)
+                    .addStringTemplate("%nation%", nation);
+            player.addModelMessage(mm);
+            updateGUI(null);
             break;
         case REJECT_TRADE:
             t = StringTemplate.template("diplomacy.offerRejected")
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index b5a58d1ff..6cd77ba6f 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -311,7 +311,8 @@ public final class InGameInputHandler extends InputHandler {
 
             final String tag = e.getTagName();
             if (FoundingFather.getXMLElementTagName().equals(tag)) {
-                FoundingFather father = spec.getFoundingFather(FreeColObject.readId(e));
+                FoundingFather father
+                    = spec.getFoundingFather(FreeColObject.readId(e));
                 if (father != null) player.addFather(father);
                 player.invalidateCanSeeTiles();// Might be coronado?
                 
diff --git a/src/net/sf/freecol/server/control/InGameController.java b/src/net/sf/freecol/server/control/InGameController.java
index 1f00f548b..a4690fd29 100644
--- a/src/net/sf/freecol/server/control/InGameController.java
+++ b/src/net/sf/freecol/server/control/InGameController.java
@@ -3122,9 +3122,22 @@ public final class InGameController extends Controller {
                 }
             }
             ServerPlayer victim = (ServerPlayer)tradeItem.getVictim();
-            if (victim != null
-                && !source.csChangeStance(Stance.WAR, victim, true, cs)) {
-                logger.warning("Incite trade failure: " + victim);
+            if (victim != null) {
+                if (source.csChangeStance(Stance.WAR, victim, true, cs)) {
+                    // Have to add in an explicit stance change and
+                    // message because the player does not normally
+                    // have visibility of stance changes between other nations.
+                    cs.addStance(See.only(dest), source, Stance.WAR, victim);
+                    cs.addMessage(See.only(dest),
+                        new ModelMessage(ModelMessage.MessageType.FOREIGN_DIPLOMACY,
+                            Stance.WAR.getOtherStanceChangeKey(), source)
+                            .addStringTemplate("%attacker%",
+                                source.getNationLabel())
+                            .addStringTemplate("%defender%",
+                                victim.getNationLabel()));
+                } else {
+                    logger.warning("Incite trade failure: " + victim);
+                }
             }                
             ServerUnit newUnit = (ServerUnit)tradeItem.getUnit();
             if (newUnit != null && settlement != null) {

From 8620dd3faaf7b721e12ec23914f9ab952ceb5888 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 8 Sep 2015 09:10:32 +0930
Subject: [PATCH 191/323] Improve education messages, BR#2909.

---
 data/strings/FreeColMessages.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 1aafe8356..c9c602247 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -2683,9 +2683,9 @@ metaServer.communicationError=There was an error while communicating with the me
 # Lots of messages here, prefix more specific to the actual use
 abandonEducation.action.studying=studying
 abandonEducation.action.teaching=teaching
-abandonEducation.no=No, continue the education
+abandonEducation.no=Continue education
 abandonEducation.text=If your %unit% leaves %colony% it will abandon %action% in the %building%, are you sure it should leave?
-abandonEducation.yes=Yes, leave the colony
+abandonEducation.yes=Abandon education
 abandonTeaching.text=If your %unit% leaves the %building% it will stop teaching, are you sure it should leave?
 armedUnitSettlement.attack=Attack
 armedUnitSettlement.tribute=Demand tribute

From 3ef026bf499a4e7aaf6b77f918fb8c1442b38d9a Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Tue, 8 Sep 2015 21:25:21 +0930
Subject: [PATCH 192/323] Do not display all messages on new-land-naming.

---
 .../client/control/InGameController.java        |  8 ++++----
 src/net/sf/freecol/common/model/ColonyWas.java  | 10 +++++++++-
 src/net/sf/freecol/common/model/EuropeWas.java  |  6 +++++-
 .../sf/freecol/common/model/GoodsContainer.java |  7 ++++++-
 src/net/sf/freecol/common/model/UnitWas.java    | 17 +++++++++++++++--
 5 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index ac765bf1d..39a7a0f73 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -3942,7 +3942,8 @@ public final class InGameController implements NetworkConstants {
 
         if (!askClearGotoOrders(unit)) return false;
 
-        final int unitCount = unit.getUnitCount();
+        final int unitCount = unit.getUnitCount(),
+            goodsCount = unit.getGoodsList().size();
         final Tile oldTile = unit.getTile();
         UnitWas unitWas = new UnitWas(unit);
         ColonyWas colonyWas = (unit.getColony() == null) ? null
@@ -3950,9 +3951,8 @@ public final class InGameController implements NetworkConstants {
         unit.setState(UnitState.ACTIVE);
         moveDirection(unit, direction, true);
         boolean ret = unit.getTile() != oldTile
-            || unit.getUnitCount() != unitCount; // disembark occurred
+            || unitWas.fireChanges();
         if (ret) {
-            unitWas.fireChanges();
             if (colonyWas != null) colonyWas.fireChanges();
             updateGUI(null);
             if (!unit.couldMove()) { // Show colony panel if unit out of moves
@@ -4015,7 +4015,7 @@ public final class InGameController implements NetworkConstants {
             .addName("%colonyKey%", key)
             .add("%colonyMenuItem%", "buildColonyAction.name")
             .add("%ordersMenuItem%", "menuBar.orders"));
-        displayModelMessages(true);
+        displayModelMessages(false);
         return true;
     }
 
diff --git a/src/net/sf/freecol/common/model/ColonyWas.java b/src/net/sf/freecol/common/model/ColonyWas.java
index f673afa27..5ba8778fb 100644
--- a/src/net/sf/freecol/common/model/ColonyWas.java
+++ b/src/net/sf/freecol/common/model/ColonyWas.java
@@ -58,26 +58,34 @@ public class ColonyWas {
     /**
      * Fire any property changes resulting from actions within a
      * colony.
+     *
+     * @return True if something changed.
      */
-    public void fireChanges() {
+    public boolean fireChanges() {
+        boolean ret = false;
         int newPopulation = colony.getUnitCount();
         if (newPopulation != population) {
             String pc = ColonyChangeEvent.POPULATION_CHANGE.toString();
             colony.firePropertyChange(pc, population, newPopulation);
+            ret = true;
         }
         int newProductionBonus = colony.getProductionBonus();
         if (newProductionBonus != productionBonus) {
             String pc = ColonyChangeEvent.BONUS_CHANGE.toString();
             colony.firePropertyChange(pc, productionBonus,
                 newProductionBonus);
+            ret = true;
         }
         List<BuildableType> newBuildQueue = colony.getBuildQueue();
         if (!newBuildQueue.equals(buildQueue)) {
             String pc = ColonyChangeEvent.BUILD_QUEUE_CHANGE.toString();
             colony.firePropertyChange(pc, buildQueue, newBuildQueue);
+            ret = true;
         }
         if (colony.getGoodsContainer() != null) {
             colony.getGoodsContainer().fireChanges();
+            ret = true;
         }
+        return true;
     }
 }
diff --git a/src/net/sf/freecol/common/model/EuropeWas.java b/src/net/sf/freecol/common/model/EuropeWas.java
index 682702315..5bdce9430 100644
--- a/src/net/sf/freecol/common/model/EuropeWas.java
+++ b/src/net/sf/freecol/common/model/EuropeWas.java
@@ -68,13 +68,17 @@ public class EuropeWas {
 
     /**
      * Fire any property changes resulting from actions in Europe.
+     *
+     * @return True if something changed.
      */
-    public void fireChanges() {
+    public boolean fireChanges() {
         int newUnitCount = europe.getUnitCount();
 
         if (newUnitCount != unitCount) {
             europe.firePropertyChange(Europe.UNIT_CHANGE,
                                       unitCount, newUnitCount);
+            return true;
         }
+        return false;
     }
 }
diff --git a/src/net/sf/freecol/common/model/GoodsContainer.java b/src/net/sf/freecol/common/model/GoodsContainer.java
index 9d2023c2d..a4af04796 100644
--- a/src/net/sf/freecol/common/model/GoodsContainer.java
+++ b/src/net/sf/freecol/common/model/GoodsContainer.java
@@ -457,15 +457,20 @@ public class GoodsContainer extends FreeColGameObject implements Ownable {
     /**
      * Fire property changes for all goods that have seen level changes
      * since the last saveState().
+     *
+     * @return True if something changed.
      */
-    public void fireChanges() {
+    public boolean fireChanges() {
+        boolean ret = false;
         for (GoodsType type : getSpecification().getGoodsTypeList()) {
             int oldCount = getOldGoodsCount(type);
             int newCount = getGoodsCount(type);
             if (oldCount != newCount) {
                 firePropertyChange(type.getId(), oldCount, newCount);
+                ret = true;
             }
         }
+        return ret;
     }
 
     // Interface Ownable
diff --git a/src/net/sf/freecol/common/model/UnitWas.java b/src/net/sf/freecol/common/model/UnitWas.java
index 7b0dc6a03..46ac149b6 100644
--- a/src/net/sf/freecol/common/model/UnitWas.java
+++ b/src/net/sf/freecol/common/model/UnitWas.java
@@ -83,8 +83,10 @@ public class UnitWas implements Comparable<UnitWas> {
 
     /**
      * Fire any property changes resulting from actions of a unit.
+     *
+     * @return True if something changed.
      */
-    public void fireChanges() {
+    public boolean fireChanges() {
         UnitType newType = null;
         Role newRole = null;
         int newRoleCount = 0;
@@ -92,6 +94,7 @@ public class UnitWas implements Comparable<UnitWas> {
         GoodsType newWork = null;
         int newWorkAmount = 0;
         int newMovesLeft = 0;
+        boolean ret = false;
         if (!unit.isDisposed()) {
             newLoc = unit.getLocation();
             if (colony != null) {
@@ -112,15 +115,18 @@ public class UnitWas implements Comparable<UnitWas> {
             if (newLoc != null) {
                 newFcgo.firePropertyChange(change(newFcgo), null, unit);
             }
+            ret = true;
         }
         if (colony != null) {
             if (type != newType && newType != null) {
                 String pc = ColonyChangeEvent.UNIT_TYPE_CHANGE.toString();
                 colony.firePropertyChange(pc, type, newType);
+                ret = true;
             } else if (role != newRole && newRole != null) {
                 String pc = Tile.UNIT_CHANGE;
                 colony.firePropertyChange(pc, role.toString(),
                                           newRole.toString());
+                ret = true;
             }
             if (work != newWork) {
                 if (work != null && oldFcgo != null && workAmount != 0) {
@@ -130,25 +136,32 @@ public class UnitWas implements Comparable<UnitWas> {
                     newFcgo.firePropertyChange(newWork.getId(),
                                                0, newWorkAmount);
                 }
+                ret = true;
             } else if (workAmount != newWorkAmount) {
                 newFcgo.firePropertyChange(newWork.getId(),
                                            workAmount, newWorkAmount);
+                ret = true;
             }
         }
         if (role != newRole && newRole != null) {
             unit.firePropertyChange(Unit.ROLE_CHANGE, role, newRole);
+            ret = true;
         } else if (roleCount != newRoleCount && newRoleCount >= 0) {
             unit.firePropertyChange(Unit.ROLE_CHANGE, roleCount, newRoleCount);
+            ret = true;
         }
         if (unit.getGoodsContainer() != null) {
-            unit.getGoodsContainer().fireChanges();
+            ret |= unit.getGoodsContainer().fireChanges();
         }
         if (!units.equals(unit.getUnitList())) {
             unit.firePropertyChange(Unit.CARGO_CHANGE, null, unit);
+            ret = true;
         }
         if (movesLeft != newMovesLeft) {
             unit.firePropertyChange(Unit.MOVE_CHANGE, movesLeft, newMovesLeft);
+            ret = true;
         }
+        return ret;
     }
 
     // FIXME: fix this non-OO nastiness

From 364812d81aabec811eb0832d39f510a0dcc825b2 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 8 Sep 2015 21:22:41 +0200
Subject: [PATCH 193/323] Fix a few panel backgrounds

---
 .../freecol/client/gui/panel/FirstContactDialog.java   |  2 ++
 src/net/sf/freecol/client/gui/panel/FreeColDialog.java |  1 +
 .../client/gui/panel/FreeColStringInputDialog.java     |  2 ++
 src/net/sf/freecol/client/gui/panel/Utility.java       | 10 ++++++++--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java b/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
index 7dc0dd309..362d51e23 100644
--- a/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FirstContactDialog.java
@@ -65,6 +65,7 @@ public class FirstContactDialog extends FreeColConfirmDialog {
 
         MigPanel panel
             = new MigPanel(new MigLayout("wrap 1", "[center]", "[]20"));
+        panel.setOpaque(false);
 
         String headerKey = BASE_KEY + other.getNation().getSuffix();
         String imageKey = IMAGE_BASE_KEY + other.getNationResourceKey();
@@ -76,6 +77,7 @@ public class FirstContactDialog extends FreeColConfirmDialog {
             SwingConstants.LEADING, FontLibrary.FontSize.MEDIUM);
         JLabel image
             = new JLabel(new ImageIcon(ResourceManager.getImage(imageKey)));
+        image.setOpaque(false);
 
         JTextArea tutorial = null;
         if (!player.hasContactedIndians() && freeColClient.tutorialMode()) {
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
index bd3a8ff91..8c10cde62 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
@@ -181,6 +181,7 @@ public class FreeColDialog<T> extends JDialog implements PropertyChangeListener
         this.pane = new JOptionPane(obj, paneType, JOptionPane.DEFAULT_OPTION,
                                     icon, selectOptions(), ci);
         this.pane.setBorder(Utility.DIALOG_BORDER);
+        this.pane.setOpaque(false);
         this.pane.setName("FreeColDialog");
         this.pane.setValue(JOptionPane.UNINITIALIZED_VALUE);
         this.pane.addPropertyChangeListener(this);
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColStringInputDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColStringInputDialog.java
index 53f6362e1..a47a5dd47 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColStringInputDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColStringInputDialog.java
@@ -54,12 +54,14 @@ public final class FreeColStringInputDialog extends FreeColInputDialog<String> {
         super(freeColClient, frame);
 
         textField = new JTextField(defaultValue);
+        textField.setOpaque(false);
         JPanel panel = new JPanel(new BorderLayout()) {
                 @Override
                 public void requestFocus() {
                     textField.requestFocus();
                 }
             };
+        panel.setOpaque(false);
 
         panel.add(Utility.getDefaultTextArea(text));
         panel.add(textField, BorderLayout.SOUTH);
diff --git a/src/net/sf/freecol/client/gui/panel/Utility.java b/src/net/sf/freecol/client/gui/panel/Utility.java
index 07a43d212..c1bf61c3b 100644
--- a/src/net/sf/freecol/client/gui/panel/Utility.java
+++ b/src/net/sf/freecol/client/gui/panel/Utility.java
@@ -381,6 +381,7 @@ public final class Utility {
         JLabel header = new JLabel(text, alignment);
         header.setFont(FontLibrary.createCompatibleFont(
             text, FontLibrary.FontType.HEADER, size));
+        header.setOpaque(false);
         return header;
     }
 
@@ -391,6 +392,7 @@ public final class Utility {
         JLabel header = new JLabel(text, alignment);
         header.setFont(FontLibrary.createCompatibleFont(
             text, FontLibrary.FontType.HEADER, size));
+        header.setOpaque(false);
         return header;
     }
 
@@ -427,7 +429,9 @@ public final class Utility {
      * @return The <code>JLabel</code>.
      */
     public static JLabel localizedLabel(StringTemplate template) {
-        return new JLabel(Messages.message(template));
+        JLabel label = new JLabel(Messages.message(template));
+        label.setOpaque(false);
+        return label;
     }
 
     /**
@@ -440,7 +444,9 @@ public final class Utility {
      */
     public static JLabel localizedLabel(StringTemplate template, Icon icon,
                                         int alignment) {
-        return new JLabel(Messages.message(template), icon, alignment);
+        JLabel label = new JLabel(Messages.message(template), icon, alignment);
+        label.setOpaque(false);
+        return label;
     }
 
     /**

From 58ae7d1465a1036fde3790e742f40ad80110391e Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 9 Sep 2015 09:40:55 +0930
Subject: [PATCH 194/323] Track down movement weirdness.

---
 .../sf/freecol/client/control/InGameController.java    |  2 ++
 src/net/sf/freecol/client/gui/GUI.java                 | 10 ++++++++++
 src/net/sf/freecol/client/gui/SwingGUI.java            |  6 +++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 39a7a0f73..4f0a13d68 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -2635,6 +2635,8 @@ public final class InGameController implements NetworkConstants {
         // moves as much as possible.
         if (freeColClient.getAnimationSpeed(unit.getOwner()) > 0) {
             gui.animateUnitMove(unit, oldTile, newTile);
+        } else if (freeColClient.getMyPlayer().owns(unit)) {
+            gui.requireFocus(newTile);
         }
         gui.refresh();
     }
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 4cc0dc216..226dde813 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -314,6 +314,16 @@ public class GUI {
 
     // Animation handling
 
+    /**
+     * Require the given tile to be in the onScreen()-area.
+     *
+     * @param tile The <code>Tile</code> to check.
+     * @return True if the focus was set.
+     */
+    public boolean requireFocus(Tile tile) {
+        return false;
+    }
+    
     /**
      * Animate a unit attack.
      *
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index e97a35fdd..4e3dc8c8f 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -576,7 +576,7 @@ public class SwingGUI extends GUI {
      * Set the active unit.
      *
      * @param unit The <code>Unit</code> to activate.
-     * @return true if the focus was set.
+     * @return True if the focus was set.
      */
     @Override
     public boolean setActiveUnit(Unit unit) {
@@ -606,12 +606,12 @@ public class SwingGUI extends GUI {
 
     /**
      * Require the given tile to be in the onScreen()-area.
-     * Account for the ALWAYS_CENTER client option.
      *
      * @param tile The <code>Tile</code> to check.
      * @return True if the focus was set.
      */
-    private boolean requireFocus(Tile tile) {
+    public boolean requireFocus(Tile tile) {
+        // Account for the ALWAYS_CENTER client option.
         boolean required = freeColClient.getClientOptions()
             .getBoolean(ClientOptions.ALWAYS_CENTER);
         if ((required && tile != getFocus()) || !mapViewer.onScreen(tile)) {

From 61b1fc018cbdd2958a40bcd333a63f4e5a30165c Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Thu, 10 Sep 2015 10:33:51 +0200
Subject: [PATCH 195/323] Localisation updates from https://translatewiki.net.

---
 data/strings/FreeColMessages_af.properties    |  33 +-
 data/strings/FreeColMessages_ang.properties   |  40 +-
 data/strings/FreeColMessages_ar.properties    |  31 +-
 data/strings/FreeColMessages_arz.properties   |  29 +-
 .../FreeColMessages_be-tarask.properties      |  47 ++-
 data/strings/FreeColMessages_br.properties    |  78 +++-
 data/strings/FreeColMessages_ca.properties    |  76 +++-
 data/strings/FreeColMessages_cs_CZ.properties |  80 +++-
 data/strings/FreeColMessages_da.properties    |  72 +++-
 data/strings/FreeColMessages_de.properties    |  80 +++-
 data/strings/FreeColMessages_el.properties    |  18 +-
 data/strings/FreeColMessages_eo.properties    |  63 ++-
 data/strings/FreeColMessages_es_ES.properties |  78 +++-
 data/strings/FreeColMessages_fi.properties    |  25 +-
 data/strings/FreeColMessages_fr.properties    |  80 +++-
 data/strings/FreeColMessages_gl.properties    |  60 ++-
 data/strings/FreeColMessages_he.properties    |  12 +-
 data/strings/FreeColMessages_hsb.properties   |  30 +-
 data/strings/FreeColMessages_hu.properties    |  41 +-
 data/strings/FreeColMessages_ia.properties    |  82 +++-
 data/strings/FreeColMessages_it_IT.properties |  63 ++-
 data/strings/FreeColMessages_ja.properties    |  88 ++--
 data/strings/FreeColMessages_ko.properties    |  15 +-
 data/strings/FreeColMessages_lt.properties    |  37 +-
 data/strings/FreeColMessages_mk.properties    |  92 +++-
 data/strings/FreeColMessages_ms.properties    |  76 +++-
 data/strings/FreeColMessages_nl.properties    |  85 +++-
 data/strings/FreeColMessages_nl_BE.properties |  34 +-
 data/strings/FreeColMessages_oc.properties    |  60 ++-
 data/strings/FreeColMessages_pl_PL.properties |  60 ++-
 data/strings/FreeColMessages_pt_BR.properties | 127 ++++--
 data/strings/FreeColMessages_pt_PT.properties |  64 ++-
 data/strings/FreeColMessages_qqq.properties   |   8 +-
 data/strings/FreeColMessages_ru.properties    | 114 ++++-
 data/strings/FreeColMessages_sk.properties    | 398 ++++++++++++------
 data/strings/FreeColMessages_sv_SE.properties |  52 ++-
 data/strings/FreeColMessages_tl.properties    |  58 ++-
 data/strings/FreeColMessages_tr.properties    |  20 +-
 data/strings/FreeColMessages_uk.properties    |  76 +++-
 .../FreeColMessages_zh-hant.properties        |  34 +-
 data/strings/FreeColMessages_zh_CN.properties |  89 +++-
 41 files changed, 2135 insertions(+), 570 deletions(-)

diff --git a/data/strings/FreeColMessages_af.properties b/data/strings/FreeColMessages_af.properties
index 8c010b272..ae0abf815 100644
--- a/data/strings/FreeColMessages_af.properties
+++ b/data/strings/FreeColMessages_af.properties
@@ -177,7 +177,6 @@ colopediaAction.goods.name=Goedere
 colopediaAction.nations.name=Nasies
 colopediaAction.nationTypes.name=Nasionale voordele
 colopediaAction.resources.name=Bonus grondstowwe
-colopediaAction.skills.name=Bekwaamdhede
 colopediaAction.terrain.name=Terrein-tipes
 colopediaAction.units.name=Eenhede
 colopediaAction.name=%object% (Colopedia)
@@ -1178,24 +1177,33 @@ model.building.locationLabel=In %location%
 model.colony.badGovernment=Regering effektiwiteit van %colony% is sleg. Produksie verhindering vind plaas.
 model.colony.governmentImproved1=Regering van %colony% het verbeter, maar is nog oneffektief. Produksie verhindering vind steeds plaas.
 model.colony.governmentImproved2=Regering van %colony% het verbeter. Produksie verhindering vind nie meer plaas nie.
+# Fuzzy
 model.colony.insufficientProduction=In %colony% sou %outputAmount% meer %outputType% geproduseer kan word as daar %inputAmount% meer %inputType% beskikbaar was.
 model.colony.minimumColonySize=%object% verhoed dat bevolking verder kan verminder.
 model.colony.unbuildable=%colony% kan nie tans %object% bou nie. %object% is uit die boulys verwyder.
 model.colony.veryBadGovernment=Regering effektiwiteit van %colony% is baie sleg. Erge produksie verhindering vind plaas.
 model.historyEventType.abandonColony.description=U laat vaar die kolonie van %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Die %nation% ontdek %city%, een van die Sewe Stede van Goud, en 'n skat van %treasure% goud.
+# Fuzzy
 model.historyEventType.colonyConquered.description=U kolonie %colony% is deur die %nation% verower.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=U kolonie %colony% is deur die %nation% vernietig.
 # Fuzzy
 model.historyEventType.declareIndependence.description=U vernietig die nedersetting %settlement% van die %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=U maak die %nation% van kant.
 model.historyEventType.discoverNewWorld.description=U het die Nuwe Wêreld ontdek.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Die %nation% het die %region% ontdek.
 model.historyEventType.foundColony.description=U het die kolonie %colony% gevestig.
 model.historyEventType.foundingFather.description=%father% tree tot die Kontinentale Kongres toe
 model.historyEventType.independence.description=U bereik onafhanklikheid van die Kroon.
+# Fuzzy
 model.historyEventType.meetNation.description=U ontmoet die %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Die %nation% is van kant gemaak.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Die %loserNation% staan al hul kolonies in die Nuwe Wêreld af aan die %nation%.
 model.indianSettlement.mostHatedNone=Geen
 model.indianSettlement.nameUnknown=Onbekend
@@ -1240,6 +1248,7 @@ model.nationState.notAvailable.name=nie beskikbaar nie
 model.player.forces=%nation% Magte
 model.player.independentMarket=Europa
 model.player.startGame=Na maande op see het u eindelik by die kus van 'n onbekende kontinent aangekom. Seil na die weste om die Nuwe Wêreld te ontdek en dit vir die kroon toe te eien.
+# Fuzzy
 model.player.waitingFor=Wag vir: %nation%
 model.regionType.coast.name=Kus
 model.regionType.coast.unknown=Onbekende kusgebied
@@ -1288,9 +1297,9 @@ model.unit.underRepair=Besig met herstelwerk (%turns% beurte oor)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1315,23 +1324,29 @@ model.colony.warehouseOverfull=Die pakhuis in %colony% is vol met %goods%.
 model.colony.warehouseSoonFull=Die pakhuis in %colony% sal teen die volgende beurt vol %goods% wees. %amount% %goods% sal vermors word.
 model.colony.warehouseWaste=Die pakhuis in %colony% is oorvol met %goods%. %waste% eenhede is weggegooi.
 model.colonyTile.resourceExhausted=Die grondstof %resource% is op in %colony%
+# Fuzzy
 model.game.spanishSuccession=U eksellensie, die Oorlog van Spaanse Opvolging het in Europa geëindig. Volgens die ooreenkoms van Utrecht, moes die %loserNation% alle kolonies in die Nuwe Wêreld oorgee aan die %nation%!
 model.indianSettlement.mission.denounced=Jou sendeling by %settlement% is aan die kaak gestel is tereggestel!
 model.player.colonyGoodsParty.harbour=U koloniste in %colony% het %amount% %goods% in die have gegooi in protes teen die oneerlike belasting van die koning!
 model.player.colonyGoodsParty.horses=U koloniste in %colony% het %amount% perde vrygelaat uit protes teen die onregverdige belasting deur die Kroon!
 model.player.colonyGoodsParty.landLocked=U koloniste in %colony% het %amount% eenhede %goods% verbrand op die markplein in protes teen die oneerlike belasting van die koning!
+# Fuzzy
 model.player.dead.european=U eksellensie, die %nation% het verklaar 'n onvoorwaardelike ontrekking van die Nuwe Wêreld!
 model.player.dead.native=U eksellensie, die %nation% is vernietig.
 model.player.emigrate=In %europe% het %unit% besluit om te emigreer.
 model.player.foundingFatherJoinedCongress=%foundingFather% het by die kongres aangesluit!\n\n%description%
 model.player.soLDecrease=Rebelle in u kolonies het geval tot %newSoL% persent!
 model.player.soLIncrease=Rebelle in u kolonies het gestyg tot %newSoL% persent!
+# Fuzzy
 model.player.stance.alliance.declared=U eksellensie, die %nation% is in alliansie met ons!
 model.player.stance.alliance.others=U eksellensie, die %attacker% is in alliansie met die %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=U eksellensie, die %nation% het ooreengekom tot 'n skietstilstand met ons!
 model.player.stance.ceaseFire.others=U eksellensie, die %attacker% het ooreengekom tot 'n skietstilstand met die %defender%.
+# Fuzzy
 model.player.stance.peace.declared=U eksellensie, die %nation% is in vredesooreenkoms met ons!
 model.player.stance.peace.others=U eksellensie, die %attacker% is in vredesooreenkoms met die %defender%.
+# Fuzzy
 model.player.stance.war.declared=Slegte nuus, u eksellensie, die %nation% het oorlog verklaar op ons!
 model.player.stance.war.others=U eksellensie, die %attacker% het oorlog verklaar met die %defender%.
 combat.automaticDefence=U %unit% in %colony% het wapens opgeneem om die kolonie te verdedig!
@@ -1346,6 +1361,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% het die aanval deur %unit% ontw
 combat.enemyShipSunk=%unit% het %enemyNation% %enemyUnit% gesink!
 combat.equipmentCaptured=Pasop, die krygers van %nation% het %equipment% buitgemaak!
 combat.goodsStolen=%enemyNation% %enemyUnit% steel %amount% %goods% in %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% plunder %amount% van %colony%.
 combat.indianTreasure=U plunder %amount% van %settlement%.
 combat.nativeCapitalBurned=U het %name% afgebrand, die hoofstad van %nation%. Die %nation% gee oor aan u mag!
@@ -1393,6 +1409,7 @@ error.couldNotLoad='n Fout het voorgekom tydens spellaai!
 # Fuzzy
 error.couldNotSave='n Fout het voorgekom tydens spelstoor!
 main.defaultPlayerName=Speler Naam
+# Fuzzy
 client.choicePlayer=Kies asseblief 'n speler:
 metaServer.couldNotConnect=Jammer, kon nie aan meta-bediener koppel. Probeer asseblief weer later.
 metaServer.communicationError=Daar was fout tydens die meta-bediener kommunikasie. Probeer asseblief weer later.
@@ -1402,8 +1419,11 @@ buy.moreGold=Vra vir laer prys
 buy.takeOffer=Aanvaar die aanbod
 buy.text=Die %nation% wil graag hulle %goods% vir %gold% verkoop:
 clearTradeRoute.text=Jou %unit% is toegeken aan handelsroete roete %route%. Deur sy bestemming te stel, sal dit die handel roete laat vaar. Is jy seker jy wil dit doen?
+# Fuzzy
 confirmHostile.alliance=U kan nie 'n bondgenoot aanval nie! Wil u regtig u alliansie met die %nation% verbreek en oorlog verklaar?
+# Fuzzy
 confirmHostile.ceaseFire=We het 'n skietstaking onderteken met %nation%. Wil u steeds aanval?
+# Fuzzy
 confirmHostile.peace=U is in vrede met die %nation%. Wil u regtig oorlog verklaar?
 error.noSuchFile=Die spesifieke lêer bestaan nie of is nie 'n gewone lêer nie.
 # Fuzzy
@@ -1452,7 +1472,9 @@ clearSpeciality.areYouSure=Is u seker u wil 'n %oldUnit% demoveer na 'n %unit%?
 clearSpeciality.impossible=%unit% kan nie gedemoveer word nie!
 defeated.text=U is verslaan! Wil U graag:
 defeated.yes=Bly en kyk
+# Fuzzy
 diplomacy.offerAccepted=U vrygewige aanbod is deur %nation% aanvaar.
+# Fuzzy
 diplomacy.offerRejected=U vrygewige aanbod is deur %nation% verwerp.
 disbandUnit.text=Is U seker U wil hierdie eenheid ontbind?
 disbandUnit.yes=Agterlaat
@@ -1492,7 +1514,9 @@ move.noAccessBeached='n Gestrande skip van die %nation% versper ons weg.
 move.noAccessContact=Ons moet eers oor land kontak maak met die %nation%, Eksellensie.
 move.noAccessSettlement=Die %nation% laat nie toe dat ons %unit% hul nedersetting betree nie.
 move.noAccessSkill=Ons %unit% kan nikts leer van die inheemse bevolking.
+# Fuzzy
 move.noAccessTrade=Ons het geen volmag om handel te dryf met ander Europeërs soos die %nation% nie.
+# Fuzzy
 move.noAccessWar=Ons kan geen handel dryf met die %nation% as ons in oorlog is nie.
 move.noAccessWater=Ons %unit% moet eers aan land kom voor dit die nedersetting kan betree.
 nameRegion.text=U het 'n %type% ontdek en eien dit toe aan die Kroon! Soos gebruiklik mag u dit 'n naam gee:
@@ -1592,6 +1616,7 @@ colopedia.unit.price=Prys in Europa:
 # Fuzzy
 colopedia.unit.productionBonus=Produksiewysiger(s):
 colopedia.unit.requirements=Vereistes:
+# Fuzzy
 colopedia.unit.school=Skool nodig vir opleiding:
 colopedia.unit.skill=Vaardigheid:
 report.labour.allColonists=Alle Koloniste
@@ -1661,12 +1686,14 @@ report.requirements.surplus='n Oorskot van %goods% word geproduseer by
 report.trade.afterTaxes=Inkomste na belasting
 report.trade.beforeTaxes=Inkomste voor belasting
 report.trade.cargoUnits=Eenhede in vrag
+# Fuzzy
 report.trade.hasCustomHouse=* Hierdie kolonie het 'n doannehuis; hierdie goedere word uitgevoer.
 report.trade.totalDelta=Totale produksie
 report.trade.totalUnits=Aantal eenhede
 report.trade.unitsSold=Eenhede gekoop of verkoop
 report.turn.filter=Moenie hierdie tipe boodskap vertoon nie (%type%)
 report.turn.ignore=Ignoreer die berig (Kolonie: %colony%, Goedere: %goods%)
+# Fuzzy
 report.turn.playerNation=%player% se %nation%
 # Fuzzy
 aboutPanel.copyright=Kopiereg (C) 2002-2013 Die FreeCol-span
@@ -1696,7 +1723,9 @@ colonyPanel.notBestTile=%unit% kan meer %goods% produseer op %tile%.
 confirmDeclarationDialog.areYouSure.no=Miskien later
 confirmDeclarationDialog.areYouSure.text=Laat ons die onregverdige tirannie van %monarch% verwerp en laat ons die onafhanklikheid van ons kolonies van die kroon verklaar!
 confirmDeclarationDialog.areYouSure.yes=Vryheid of die Dood!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Verenigde State van %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Vrye %nation%
 confirmDeclarationDialog.enterCountry=Voortaan staan ons land bekend as
 confirmDeclarationDialog.enterNation=elke burger van ons glorieryke land sal trots wees om bekend te staan as
diff --git a/data/strings/FreeColMessages_ang.properties b/data/strings/FreeColMessages_ang.properties
index eb00d488b..345806715 100644
--- a/data/strings/FreeColMessages_ang.properties
+++ b/data/strings/FreeColMessages_ang.properties
@@ -226,7 +226,6 @@ colopediaAction.goods.name=Cēapas
 colopediaAction.nations.name=Þēoda
 colopediaAction.nationTypes.name=Þēodlīca mihta
 colopediaAction.resources.name=Oferduȝuþlīce timberas
-colopediaAction.skills.name=Cræftas
 colopediaAction.terrain.name=Landȝecynd
 colopediaAction.units.name=Ƿiht
 colopediaAction.name=%object% (Colopedia)
@@ -1243,6 +1242,7 @@ model.building.locationLabel=On %location%
 model.colony.badGovernment=Se ƿealdscipe of %colony% ƿyrceþ earfoðe. Forþbǣro lyre ȝelimpþ.
 model.colony.governmentImproved1=Se ƿealdscipe of %colony% hafaþ bēted ȝeƿord, ac hit ȝīet ne ƿyrceþ ƿel. Forþbǣro lyre ȝīet ȝelimpþ.
 model.colony.governmentImproved2=Se ƿealdscipe of %colony% hafaþ bēted ȝeƿorden. Forþbǣro lyre ne ȝelimpþ ȝīet.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% mā %outputType% cūðe mann forþberan on %colony%, ȝif ƿē hæfden %inputAmount% mā þonne %inputType%fromfaru.
 model.colony.minimumColonySize=%object% ƿirneþ māran gelytlunge þære leodrædne.
 model.colony.unbuildable=%colony% ne cann timbrian %object% herrihte. %object% ƿæs anumen fram þære endebyrdnesse bolda to ƿesenne getimbrod.
@@ -1256,21 +1256,29 @@ model.direction.SW.name=suþƿest
 model.direction.W.name=ƿest
 model.direction.NW.name=norþƿest
 model.historyEventType.abandonColony.description=Þū forlǣtst þā %colony%landbūnesse.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Sēo %nation%þēod fint þā %city%burȝe, ān þāra seofona ȝyldenena burȝa, and ēac hord %treasure% ȝoldes.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Þīn %colony%landbūness is oferƿunnen fram þǣre %nation%þēode.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Þīn %colony%landbūness is forloren fram þǣre %nation%þēode.
 # Fuzzy
 model.historyEventType.conquerColony.description=Þū ne dearst andfōn ūre holdan fōreƿearde and ȝīeþ æthlīepst lēane? Swilc tƿifealdness sceall ascian þā biteran lēane ūrre ƿrǣþþu.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Þū forlure %settlement%setl %nation%þēode.
+# Fuzzy
 model.historyEventType.destroyNation.description=Þā %nation% forluron þā %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Þū hafast þā nīƿan land ȝefunden.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Sēo %nation%þēod fint %region%.
 model.historyEventType.foundColony.description=Þū staðolast þā landbūnesse þǣre %colony%landbūnesse.
 model.historyEventType.foundingFather.description=%father% formenȝeþ mid þǣm Ƿitenaȝemōte.
 model.historyEventType.independence.description=Þū efnest selfƿeald fram þǣm cynecynne.
+# Fuzzy
 model.historyEventType.meetNation.description=Þū mētst þā %nation%þēode.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=%nation%þēod nis ȝīet andƿeard on þǣm nīƿum landum.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Sēo %loserNation%þēod ȝieldeþ ealla heora landbūnessa on þǣm nīƿum landum tō þǣre %nation%þēode.
 model.indianSettlement.mostHatedNone=Nǣniȝ
 model.indianSettlement.nameUnknown=Uncūþ
@@ -1315,6 +1323,7 @@ model.messageType.warning.name=Ƿærƿord
 model.monarch.action.addToRef.text=Se Cynescipe hafaþ geīht þone Cyneaspyriunghere mid %number% {{plural:%number%|%unit%}}. Landbūnesslādmenn gecȳðaþ ƿærlīcnesse.
 model.monarch.action.addToRef.no=Fulfremed
 model.monarch.action.declarePeace.no=Fulfyled lā
+# Fuzzy
 model.monarch.action.declareWar.text=Sēo ƿlencu %nation%þēode fornȳdeþ ūs tō farenne on herȝoðe ƿiþ hīe!
 model.monarch.action.declareWar.no=Fulfremed
 # Fuzzy
@@ -1350,6 +1359,7 @@ model.noClaimReason.worked.description=Ōðer setl ǣr brȳcþ þis land.
 model.player.forces=%nation%þēode full here
 model.player.independentMarket=Europe
 model.player.startGame=Æfter manigum monaðum on ðæm garsecge eart þu nu gecumen to þæm strande ungecuðes landes. Sægla {{tag:%direction%|west=ƿest|east=east|default=ƿiþ ƿind}} to findenne þa Niƿan Land and to manienne heora for þæm cynedome.
+# Fuzzy
 model.player.waitingFor=Abidende: %nation% nu gaþ
 model.regionType.coast.name=Strand
 model.regionType.coast.unknown=Uncūþ stōƿ on þǣm strande
@@ -1403,6 +1413,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1433,23 +1444,29 @@ model.colony.warehouseOverfull=Þīn hordærn on %colony%landbūnesse hafaþ ȝe
 model.colony.warehouseSoonFull=Þīn hordærn on þǣre %colony%landbūnesse sceall habban tō fela %goods%ƿara under þǣm nīehstan stæpe. %amount% %goods%ƿara sculon ƿesan forloren.
 model.colony.warehouseWaste=Þīn hordærn on þǣre %colony%landbūnesse hafaþ tō fela %goods%ƿara.%waste% ƿara ƿǣron forloren.
 model.colonyTile.resourceExhausted=Þæt %resource% andƿeorc is nū ascortod on þǣre %colony%landbūnesse
+# Fuzzy
 model.game.spanishSuccession=Lēof, on Europe hafaþ þæt Ƿīȝ þǣre Spēoniscan Æfterȝenȝnesse ȝeendod. On þǣre Fōreƿearde Traiectum, sēo %loserNation%þēod ƿæs fornȳded tō ȝieldenne ealla landbūnessa on þǣm nīƿum landum tō þǣre %nation%þēode!
 model.indianSettlement.mission.denounced=Þīn boda be %settlement% hafaþ ȝeƿorden ȝeƿrēht and ofsloȝen!
 model.player.colonyGoodsParty.harbour=Þīne landbūendas on þǣre %colony%landbūnesse habbaþ āƿorpen %amount% %goods%ƿara in þā hȳðe tō ceorienne onȝēan þās unrihtan ȝafole ȝesettunȝe fram þǣm cynecynne!
 model.player.colonyGoodsParty.horses=Þīne landbūendas on þǣre %colony%landbūnesse habbaþ ȝelȳsed %amount% horsa tō onhebbenne þās unrihtan ȝafola fram þǣm cynecynne!
 model.player.colonyGoodsParty.landLocked=Þīne landbūendas on þǣre %colony%landbūnesse habbaþ forburnen %amount% %goods%ƿara in þǣre cēapstōƿe ceorienne onȝēan þās unrihtan ȝafole ȝesettunȝe fram þǣm cynecynne!
+# Fuzzy
 model.player.dead.european=Lēof, sēo %nation%þēod hafaþ ȝehāten arēdnesslēase lēornesse fram nīƿra landa intinȝum!
 model.player.dead.native=Lēof, sēo %nation%þēod hafaþ ȝeƿorden forloren.
 model.player.emigrate=On %europe%, %unit%ƿiht hafaþ ȝecoren tō ȝeleorenne.
 model.player.foundingFatherJoinedCongress=%foundingFather% hafaþ ȝeþēoded hine selfne mid þǣm Ƿitenaȝemōte!\n\n%description%
 model.player.soLDecrease=Suna Frēodōmes ȝyldrǣden on þīnum landbūnessum hafaþ ȝeƿorden āƿend tō %newSoL% hundtēontiȝoðena dǣla!
 model.player.soLIncrease=Suna Frēodōmes ȝyldrǣden on þīnum landbūnesum hafaþ ȝeƿorden āƿend tō %newSoL% hundtēontiȝoðena dǣla!
+# Fuzzy
 model.player.stance.alliance.declared=Lēof, sēo %nation%þēod is on ȝeþoftscipe mid ūs!
 model.player.stance.alliance.others=Lēof, sēo %attacker%þēod is on ȝeþoftscipe mid þǣre %defender%þēode.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Lēof, sēo %nation%þēod hafaþ ȝeþafad þæt ƿē ne feohten!
 model.player.stance.ceaseFire.others=Lēof, sēo %attacker%þēod hafaþ ȝeþafod þæt hēo ne feohte ƿiþ þā %defender%þēode.
+# Fuzzy
 model.player.stance.peace.declared=Lēof, sēo %nation%þēod friðaþ ūsic!
 model.player.stance.peace.others=Lēof, sēo %attacker%þēod friðaþ þā %defender%þēode.
+# Fuzzy
 model.player.stance.war.declared=Ƿā, lēof, sēo %nation%þēod hafaþ nū drēoȝaþ ȝeƿinn ƿit ūsic!
 model.player.stance.war.others=Lēof, sēo %attacker%þēod nū drīehþ ȝeƿinn ƿiþ þā %defender%þēode.
 combat.automaticDefence=Þīn %unit%ƿiht on þǣre %colony%landbūnesse hafaþ ȝeƿǣpned self tō beorȝenne þā landbūnesse!
@@ -1465,6 +1482,7 @@ combat.enemyShipEvaded=Þǣre %enemyNation%þēode %enemyUnit%ƿiht hafaþ æthl
 combat.enemyShipSunk=%unit%ƿiht hafaþ ȝesenced þǣre %enemyNation%þēode %enemyUnit%ƿiht!
 combat.equipmentCaptured=Ƿara! Þā ƿīȝan þǣre %nation%þēode habbaþ ȝefanȝen %equipment%tōl!
 combat.goodsStolen=Þǣre %enemyNation%þēode %enemyUnit%ƿiht stīelþ %amount% %goods%ƿara be þǣre %colony%landbūnesse!
+# Fuzzy
 combat.indianPlunder=Þǣre %enemyNation%þēode %enemyUnit%ƿiht ȝeherȝaþ %amount% ȝoldes fram þǣre %colony%landbūnesse.
 combat.indianRaid=Ūre scēaƿereas secȝaþ þe sēo %nation%þēod hafaþ ȝeherȝod þǣre %colonyNation%þēode þā %colony%landbūnesse.
 combat.indianSurprise=Sēo %nation%þēod macaþ undersmȳhþ %colony% landbūnesse, þe eȝsaþ ūre landbūendas. Þǣre %nation%þēode hēafodmann sæȝþ þætte hēo ne dyde hit.
@@ -1518,6 +1536,7 @@ error.couldNotLoad=Ƿog gelamp þa hƿīle þe ic sohte þæt gamen hladan!
 error.couldNotSave=Ƿog gelamp þa hƿile þe ic sohte þæt gamen hordian!
 main.defaultPlayerName=Plegendes nama
 main.javaVersion=Java fadunge %minVersion% oþþe beteran fadunge ah man habban to plegenne FreeCol.\n(%version% is seo fadung þe ƿæs funden; bruc --no-java-check to bebugenne þas neosunge).
+# Fuzzy
 client.choicePlayer=Ceos la plegend:
 metaServer.couldNotConnect=Ƿala, ne cuðe se spearctellend geþeodan selfne ƿiþ þone eallþegntol. Sec þu la eft siþþan.
 metaServer.communicationError=Þær ƿæs ƿog under þære hƿile þære gemansumunge mid þæm eallþegntole. Sec la eft siþþan.
@@ -1527,8 +1546,11 @@ buy.moreGold=Ābidd læssan cēapȝyldes
 buy.takeOffer=Andfōh þā bēodunȝe
 buy.text=Sēo %nation%þēod wile cīepan heora %goods%ƿara ƿiþ %gold%:
 clearTradeRoute.text=Þīn %unit%ƿiht is ȝeseted tō cēapƿeȝe %route%. Ȝif þū sette his foreteohunȝe, þonne hit ne ȝā æfter þǣm cēapƿeȝe ȝīet.  Ƿilt þū sōþlīce þis dōn?
+# Fuzzy
 confirmHostile.alliance=Þū ne scealt afeohtan ȝesibbþēode! Ƿilt þū sōþlīce brecan þone ȝeþoftscipe þǣre %nation%þēode and drēoȝan ȝeƿinn?
+# Fuzzy
 confirmHostile.ceaseFire=Þū hafast ȝesett griþ mid þǣre %nation%þēode. Ƿilt þū sōþlīce anƿinnan?
+# Fuzzy
 confirmHostile.peace=Þū and sēo %nation%þēod habbaþ friþ. Ƿilt þū sōþlīce drēoȝan ȝeƿinn ƿiþ hīe?
 confirmTribute.unwise=Þa %nation% sindon strange and manige. Ƿitodlice ne si hit ƿis to abylgenne hie la?
 error.noSuchFile=Seo genamode ymele nis na, oþþe nis heo gewunelic ymele.
@@ -1580,7 +1602,9 @@ clearSpeciality.areYouSure=Ƿilt þū sōþlīce fornȳdan %oldUnit% tō ƿeorð
 clearSpeciality.impossible=%unit% ne cann ƿeorðan læsse!
 defeated.text=Þū hafast ȝeƿorden oferdrifen! Ƿilt þū:
 defeated.yes=Abīdan and ƿæccan
+# Fuzzy
 diplomacy.offerAccepted=Þa %nation% habbaþ andfangen þin cystige lac.
+# Fuzzy
 diplomacy.offerRejected=Þa %nation% habbaþ aƿend þin cystige lac.
 disbandUnit.text=Ƿilt þū sōþlīce þis ƿiht tōhladan?
 disbandUnit.yes=Tōhlad
@@ -1624,7 +1648,9 @@ move.noAccessContact=Ƿē sculon staðolian ǣrendsecȝunȝ mid þǣm %nation% 
 move.noAccessGoods=Sēo %nation%þēod nile bycȝan of ǣmettiȝre %unit%ƿihte.
 move.noAccessSettlement=%nation%þēod ne alȳfþ ūrre %unit%ƿihte tō inȝanȝenne in heora setl.
 move.noAccessSkill=Ūre %unit% ne cann leornian þinȝ fram þǣm inlendiscum.
+# Fuzzy
 move.noAccessTrade=Ƿē ne habbaþ þæt ȝeƿeald tō cīepenne ōðrum Europiscum þēodum sƿelce þā %nation%.
+# Fuzzy
 move.noAccessWar=Ƿe ne cunnon cīepan þǣm %nation% þā hƿīle þe ƿē sind on ƿīȝe.
 move.noAccessWater=Ūru %unit%ƿiht sceal lendan ætfōran inȝanȝe in þæt setl.
 move.noAttackWater=Ūre %unit%ƿiht sceall lendan ǣr hēo onrǣse.
@@ -1733,6 +1759,7 @@ colopedia.unit.offensivePower=Ƿiðerrǣde miht:
 colopedia.unit.price=Cēapȝyld on Europe:
 colopedia.unit.productionBonus=Forþbǣro {{plural:%number%|one=modifier|other=modifiers}}:
 colopedia.unit.requirements=Nēada:
+# Fuzzy
 colopedia.unit.school=Behēfu scolu tō lǣrenne:
 colopedia.unit.skill=Cræftiȝness:
 report.labour.allColonists=Ealle landbūendas
@@ -1765,8 +1792,6 @@ report.colony.making.description=Þæt þēos landbūness ƿyrceþ
 report.colony.making.header=Ƿyrcende
 report.colony.name.description=Þæt ȝetæl landbūnessa
 report.colony.name.header=Landbūness
-report.colony.plow.header=P
-report.colony.road.header=R
 report.continentalCongress.none=(nǣniȝ)
 report.continentalCongress.recruiting=Inlǣdunȝ
 report.education.students=Ȝearu leornere
@@ -1813,12 +1838,14 @@ report.requirements.surplus=Oferēaca %goods%ƿara is forþboren be
 report.trade.afterTaxes=Lēan æfter ȝeafolrǣdne
 report.trade.beforeTaxes=Lēanȝyld ǣr ȝeafolrǣdne
 report.trade.cargoUnits=Ƿihta on hlæste
+# Fuzzy
 report.trade.hasCustomHouse=* Þēos landbūness nafaþ cēapsceamol; þās ƿara sind ūtsenda.
 report.trade.totalDelta=Eall forþbǣro
 report.trade.totalUnits=Ealla ƿihta
 report.trade.unitsSold=Ȝebohta oþþe ȝecīepda ƿihta
 report.turn.filter=Ēoƿa þis ȝecynd ǣrendȝeƿrita (%type%)
 report.turn.ignore=Lǣt þis ǣrendȝeƿrit (on þǣre %colony%landbūnesse; %goods%ƿaru)
+# Fuzzy
 report.turn.playerNation=%nation% of %player%
 # Fuzzy
 aboutPanel.copyright=Cræftriht lōcaþ tō © 2002-2013 The FreeCol Team
@@ -1843,6 +1870,7 @@ chooseFoundingFatherDialog.title=Namie staðoliend
 colonyPanel.colonyUnits=Landbunesse ƿihta
 colonyPanel.inPort=On porte
 colonyPanel.outsideColony=Butan landbunesse
+# Fuzzy
 colonyPanel.producing=Ƿyrceþ:
 colonyPanel.reducePopulation=Gif þu gelytlie þa leodrædne sƿa þæt heo sie læsse þonne %number%, þonne ne cuðe %colony% %buildable% timbrian.
 colonyPanel.unitChange=Þǣr þū inēodest on þīn landbūnesse þīn %oldType% hafaþ ȝeƿorden %newType%.
@@ -1854,7 +1882,9 @@ colonyPanel.notBestTile=%unit% cuðe ƿyrcan ma %goods% on %tile%.
 confirmDeclarationDialog.areYouSure.no=Meahtlīce hēræfter
 confirmDeclarationDialog.areYouSure.text=Ƿuton onsecȝan þæt unrihtƿīse nȳdȝeƿeald of %monarch% and bēodan þā ānstandendnesse ūrra landbūnessa fram þǣm cynecynne!
 confirmDeclarationDialog.areYouSure.yes=Frēodōm oþþe Dēaþ!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Ȝeāndu Rīce of %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Alȳs %nation%
 confirmDeclarationDialog.enterCountry=Hēræfter, ūre land biþ ȝecūþ sƿā
 confirmDeclarationDialog.enterNation=and ǣlc burȝmann on ūrum þrymfæstan lande biþ ƿlanc tō ƿesenne ȝecūþ sƿā
@@ -1863,8 +1893,10 @@ constructionPanel.turnsToComplete=(Stapas oþ fulfylednesse: %number%)
 negotiationDialog.accept=Andfo
 negotiationDialog.add=Besette
 negotiationDialog.cancel=Onƿende
+# Fuzzy
 negotiationDialog.demand=Þa %nation% asciaþ þa %otherNation%
 negotiationDialog.exchange=ƿiþ
+# Fuzzy
 negotiationDialog.offer=Þa %nation% abeodaþ þæm %otherNation%
 negotiationDialog.send=Sende
 negotiationDialog.title.contact=Metung mid oðrum Europiscum
@@ -1883,8 +1915,6 @@ findSettlementPanel.displayAll=Finde eall setlu
 findSettlementPanel.displayOnlyEuropean=Finde synderlice Europisc setlu
 findSettlementPanel.displayOnlyNatives=Finde synderlice inlendisc setlu
 findSettlementPanel.name=Finde setl
-firstContactDialog.meeting.AZTEC=Seo Astecaþeod...
-firstContactDialog.meeting.INCA=Þæt Incena rice...
 firstContactDialog.welcomeOffer.text=Þā %nation% ƿilcumiaþ ēoƿic. Ƿē sind þrymfæst þēod %camps% %settlementType%. Tō ȝebrēmenne ūrne frēondscipe, ƿē holde abēodaþ ēoƿ þæt lond þæt ȝē nū healdaþ, tō ȝiefe. Andfōþ ȝē ūre ȝriþ and ƿuniaþ mid ūs on friðe sƿā brōðru?
 firstContactDialog.welcomeSimple.text=Þā %nation% ƿilcumiaþ ēoƿ. Ƿe sind þrymfæst þēod %camps% %settlementType%. Andfōþ ȝē ūre ȝriþ and ƿuniaþ ȝē mid ūs on friðe sƿā brōðru?
 abandonColony.no=Onƿende
diff --git a/data/strings/FreeColMessages_ar.properties b/data/strings/FreeColMessages_ar.properties
index cfd152d53..129e0dd8b 100644
--- a/data/strings/FreeColMessages_ar.properties
+++ b/data/strings/FreeColMessages_ar.properties
@@ -215,7 +215,6 @@ colopediaAction.goods.name=بضائع
 colopediaAction.nations.name=أمم
 colopediaAction.nationTypes.name=مميزات وطنية
 colopediaAction.resources.name=موارد الجائزة
-colopediaAction.skills.name=مهارات
 colopediaAction.terrain.name=أنواع الأرض
 colopediaAction.units.name=وحدات
 declareIndependenceAction.name=أعلن الاستقلال
@@ -1162,6 +1161,7 @@ model.building.locationLabel=في %location%
 model.colony.badGovernment=حكومة %colony% غير كفء. عقوبات إنتاج تطبق.
 model.colony.governmentImproved1=حكومة %colony% تحسنت، لكنها مازالت غير كفؤة. عقوبات الإنتاج مازالت سارية.
 model.colony.governmentImproved2=حكومة %colony% تحسنت. عقوبات الإنتاج لم تعد منطبقة.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% أكثر %outputType% يمكن إنتاجه في %colony%، فقط لو كنا نملك %inputAmount% أكثر %inputType% زائد.
 model.colony.minimumColonySize=%object% يمنع تخفيض السكان أكثر من هذا.
 model.colony.unbuildable=%colony%ويمكن بناء %object% في هذا الوقت. %object% تمت إزالة من قائمة انتظار الإنشاء.
@@ -1175,18 +1175,25 @@ model.direction.SW.name=جنوب-غرب
 model.direction.W.name=غرب
 model.direction.NW.name=شمال-غرب
 model.historyEventType.abandonColony.description=أنت تهجر مستعمرة %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=أنت تكتشف %city%, واحدة من مدن الذهب السبعة, وكنز من %treasure% ذهب.
+# Fuzzy
 model.historyEventType.colonyConquered.description=مستعمرتك %colony% تم غزوها بواسطة %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=مستعمرتك %colony% تم تدميرها بواسطة %nation%.
 # Fuzzy
 model.historyEventType.declareIndependence.description=أنت تدمر مستوطنة %settlement% %nation%الخاصة ب.
+# Fuzzy
 model.historyEventType.destroyNation.description=أنت تدمر %nation%.
 model.historyEventType.discoverNewWorld.description=أنت تكتشف العالم الجديد.
+# Fuzzy
 model.historyEventType.discoverRegion.description=أنت تكتشف %region%.
 model.historyEventType.foundColony.description=أنت تؤسس مستعمرة %colony%.
 model.historyEventType.foundingFather.description=%father% ينضم إلى الكونجرس القاري.
 model.historyEventType.independence.description=أنت تحقق الاستقلال عن التاج.
+# Fuzzy
 model.historyEventType.meetNation.description=أنت تلتقي ب%nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=ال%nation% مدمّرة.
 model.indianSettlement.mostHatedNone=لا شيء
 model.indianSettlement.nameUnknown=غير معروف
@@ -1230,6 +1237,7 @@ model.nationState.notAvailable.name=غير متوفر
 model.player.forces=قوات %nation%
 model.player.independentMarket=أوروبا
 model.player.startGame=بعض قضاء أشهر عديدة في البحر، وصلت أخيرا إلى شاطئ مجهول. أبحر {{tag:%direction%|west=غربا|east=شرقا|default=في اتجاه الرياح}} من أجل أستكشاف العالم الجديد وانتهازه من أجل العرش.
+# Fuzzy
 model.player.waitingFor=بانتظار: %nation%
 model.regionType.coast.name=ساحل
 model.regionType.coast.unknown=منطقة ساحلية غير معروفة
@@ -1282,9 +1290,9 @@ model.unit.underRepair=إصلاح(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1308,6 +1316,7 @@ model.colony.warehouseOverfull=مستودعك في %colony% وصل إلى سعت
 model.colony.warehouseSoonFull=مستودعك في %colony% سيتجاوز سعته من %goods% خلال الدور التالي. %amount% وحدة من %goods% ستهدر.
 model.colony.warehouseWaste=مستودعك في %colony% تجاوز سعته ل %goods%. %waste% وحدة تم إهدارها.
 model.colonyTile.resourceExhausted=المورد %resource% تم إجهاده في %colony%
+# Fuzzy
 model.game.spanishSuccession=سعادتك، انتهت حرب الوراثة الإسبانية في أوروبا. وأجبرت %loserNation% على تسليم كل المستعمرات في العالم الجديد ل%nation% تحت معاهدة أوتريخت!
 model.player.colonyGoodsParty.harbour=مستعمروك في %colony% ألقوا %amount% وحدة من %goods% إلى الميناء احتجاجا على هذه الضريبة غير العادلة بواسطة التاج!
 model.player.colonyGoodsParty.horses=مستعمروك في %colony% أطلقوا %amount% حصان احتجاج على ضرائبهم غير العادلة بواسطة التاج!
@@ -1316,12 +1325,16 @@ model.player.emigrate=في %europe%، %unit% قررت الهجرة.
 model.player.foundingFatherJoinedCongress=%foundingFather% انضم للكونجرس!\n\n%description%
 model.player.soLDecrease=عضوية أبناء الحرية في مستعمراتك انخفضت إلى %newSoL% في المائة!
 model.player.soLIncrease=عضوية أبناء الحرية في مستعمراتك ارتفعت إلى %newSoL% في المائة!
+# Fuzzy
 model.player.stance.alliance.declared=جلالتك، %nation% في تحالف معنا!
 model.player.stance.alliance.others=جلالتك، %attacker% في تحالف مع %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=جلالتك، %nation% وافقت على وقف إطلاق النار معنا!
 model.player.stance.ceaseFire.others=جلالتك، %attacker% وافقت على وقف إطلاق النار مع %defender%.
+# Fuzzy
 model.player.stance.peace.declared=جلالتك، %nation% في سلام معنا!
 model.player.stance.peace.others=جلالتك، %attacker% في سلام مع %defender%.
+# Fuzzy
 model.player.stance.war.declared=أخبار سيئة، فخامتك، %nation% أعلنوا الحرب علينا!
 model.player.stance.war.others=فخامتك، %attacker% أعلنت الحرب على %defender%.
 combat.automaticDefence=%unit% في %colony% أخذت أسلحة لتدافع عن المستعمرة!
@@ -1336,6 +1349,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% تفادت هجوما بواس
 combat.enemyShipSunk=%unit% أغرقت %enemyNation% %enemyUnit%!
 combat.equipmentCaptured=احترس، شجعان %nation% اكتسبوا %equipment%!
 combat.goodsStolen=%enemyNation% %enemyUnit% تسرق %amount% %goods% في %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% بلندر %amount% من %colony%.
 combat.indianTreasure=أنت تأخذ %amount% من %settlement%.
 combat.nativeCapitalBurned=أنت أحرقت %name%، عاصمة %nation%. %nation% تستسلم لقوتك!
@@ -1383,6 +1397,7 @@ error.couldNotLoad=حدث خطأ أثناء محاولة تحميل اللعبة
 # Fuzzy
 error.couldNotSave=حدث خطأ أثناء محاولة حفظ اللعبة!
 main.defaultPlayerName=اسم اللاعب
+# Fuzzy
 client.choicePlayer=من فضلك اختر لاعبا:
 metaServer.couldNotConnect=عذرا، لم يمكن الاتصال بخادم-ميتا. من فضلك حاول ثانية فيما بعد.
 metaServer.communicationError=حدث خطأ أثناء الاتصال مع خادم الميتا. من فضلك حاول مرة ثانية فيما بعد.
@@ -1391,8 +1406,11 @@ boycottedGoods.text=بما أن %goods% تمت مقاطعتها بواسطة ا
 buy.moreGold=سل عن السعر الأرخص
 buy.takeOffer=اقبل العرض
 buy.text=%nation% يودون بيع %goods% مقابل %gold%:
+# Fuzzy
 confirmHostile.alliance=أنت لا يمكنك مهاجمة أمة حليفة! هل ترغب فعلا في كسر تحالفك مع %nation% وإعلان الحرب؟
+# Fuzzy
 confirmHostile.ceaseFire=أنت وقعت وقفا لإطلاق النار مع %nation%. هل تود فعلا الهجوم؟
+# Fuzzy
 confirmHostile.peace=أنت في سلام مع %nation%. هل ترغب فعلا في إعلان الحرب؟
 error.noSuchFile=الملف المحدد غير موجود أو ليس ملفا عاديا.
 # Fuzzy
@@ -1440,7 +1458,9 @@ clearSpeciality.areYouSure=هل أنت متأكد أنك تريد تنزيل %ol
 clearSpeciality.impossible=%unit% لا يمكن تنزيلها!
 defeated.text=لقد هزمت! هل تريد:
 defeated.yes=ابق و راقب
+# Fuzzy
 diplomacy.offerAccepted=%nation% قبلوا عرضك الكريم.
+# Fuzzy
 diplomacy.offerRejected=%nation% رفضوا عرضك الكريم.
 disbandUnit.text=هل أنت متأكد أنك تريد نزع هذه الوحدة؟
 disbandUnit.yes=أزل المعدات
@@ -1560,6 +1580,7 @@ colopedia.unit.price=السعر في أوروربا:
 # Fuzzy
 colopedia.unit.productionBonus=معدل الإنتاج (معدلو الإنتاج):
 colopedia.unit.requirements=المتطلبات:
+# Fuzzy
 colopedia.unit.school=المدرسة المطلوبة للتدريب:
 colopedia.unit.skill=المهارة:
 report.labour.allColonists=كل المستعمرين
@@ -1627,12 +1648,14 @@ report.requirements.surplus=المستعمرات التالية تنتج فائ
 report.trade.afterTaxes=الدخل بعد الضرائب
 report.trade.beforeTaxes=الدخل قبل الضرائب
 report.trade.cargoUnits=الوحدات في الحمولة
+# Fuzzy
 report.trade.hasCustomHouse=* هذه المستعمرة لديها منزل معدل؛ هذه البضائع تصدر.
 report.trade.totalDelta=إجمالي الإنتاج
 report.trade.totalUnits=إجمالي الوحدات
 report.trade.unitsSold=الوحدات المشتراة أو المباعة
 report.turn.filter=لا تعرض هذا النوع من الرسائل (%type%)
 report.turn.ignore=تجاهل هذه الرسالة (المستعمرة: %colony%، البضائع: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% الخاصة ب%player%
 # Fuzzy
 aboutPanel.copyright=حقوق التأليف والنشر محفوظة © 2002-2013  فريق فري كول
@@ -1664,7 +1687,9 @@ colonyPanel.notBestTile=%unit% يمكن أن تنتج المزيد من %goods%
 confirmDeclarationDialog.areYouSure.no=ربما فيما بعد
 confirmDeclarationDialog.areYouSure.text=لنترك استبداد %monarch% الظالم ولنعلن استقلال مستعمراتنا من التاج!
 confirmDeclarationDialog.areYouSure.yes=الحرية أو الموت!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=الولايات المتحدة ل%nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% الحرة
 confirmDeclarationDialog.enterCountry=من الآن فصاعدا، ستُعرف دولتنا باسم
 confirmDeclarationDialog.enterNation=وكل مواطن من أمتنا المجيدة سيفتخر بأن يُدعى
@@ -1674,8 +1699,10 @@ difficultyDialog.name=صعوبة
 negotiationDialog.accept=قبول
 negotiationDialog.add=أضف
 negotiationDialog.cancel=إلغاء
+# Fuzzy
 negotiationDialog.demand=%nation% يتطلب من %otherNation%
 negotiationDialog.exchange=في مقابل
+# Fuzzy
 negotiationDialog.offer=%nation% يعرض على %otherNation%
 negotiationDialog.send=أرسل
 editSettlementDialog.removeSettlement=إزالة مستوطنة
diff --git a/data/strings/FreeColMessages_arz.properties b/data/strings/FreeColMessages_arz.properties
index bd3219ebe..4cef2ee4b 100644
--- a/data/strings/FreeColMessages_arz.properties
+++ b/data/strings/FreeColMessages_arz.properties
@@ -160,7 +160,6 @@ colopediaAction.goods.name=بضائع
 colopediaAction.nations.name=أمم
 colopediaAction.nationTypes.name=مميزات وطنية
 colopediaAction.resources.name=موارد الجائزة
-colopediaAction.skills.name=مهارات
 colopediaAction.terrain.name=أنواع الأرض
 colopediaAction.units.name=وحدات
 declareIndependenceAction.name=أعلن الاستقلال
@@ -1083,22 +1082,30 @@ model.building.locationLabel=فى %location%
 model.colony.badGovernment=حكومه %colony% غير كفء. عقوبات إنتاج تطبق.
 model.colony.governmentImproved1=حكومه %colony% تحسنت، لكنها مازالت غير كفؤه. عقوبات الإنتاج مازالت ساريه.
 model.colony.governmentImproved2=حكومه %colony% تحسنت. عقوبات الإنتاج لم تعد منطبقه.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% أكثر %outputType% يمكن إنتاجه فى %colony%، فقط لو كنا نملك %inputAmount% أكثر %inputType% زائد.
 model.colony.minimumColonySize=%object% يمنع تخفيض السكان أكثر من هذا.
 model.colony.veryBadGovernment=حكومه %colony% غير كفء جدا. عقوبات إنتاج عاليه تطبق.
 model.historyEventType.abandonColony.description=أنت تهجر مستعمره %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=أنت تكتشف %city%, واحده من مدن الذهب السبعة, وكنز من %treasure% ذهب.
+# Fuzzy
 model.historyEventType.colonyConquered.description=مستعمرتك %colony% تم غزوها بواسطه %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=مستعمرتك %colony% تم تدميرها بواسطه %nation%.
 # Fuzzy
 model.historyEventType.declareIndependence.description=أنت تدمر مستوطنه %settlement% %nation%الخاصه ب.
+# Fuzzy
 model.historyEventType.destroyNation.description=أنت تدمر %nation%.
 model.historyEventType.discoverNewWorld.description=أنت تكتشف العالم الجديد.
+# Fuzzy
 model.historyEventType.discoverRegion.description=أنت تكتشف %region%.
 model.historyEventType.foundColony.description=أنت تؤسس مستعمره %colony%.
 model.historyEventType.foundingFather.description=%father% ينضم إلى الكونجرس القارى.
 model.historyEventType.independence.description=أنت تحقق الاستقلال عن التاج.
+# Fuzzy
 model.historyEventType.meetNation.description=أنت تلتقى ب%nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=ال%nation% مدمّره.
 model.indianSettlement.mostHatedNone=لا شيء
 model.indianSettlement.nameUnknown=غير معروف
@@ -1140,6 +1147,7 @@ model.nationState.notAvailable.name=غير متوفر
 model.player.forces=قوات %nation%
 model.player.independentMarket=أوروبا
 model.player.startGame=بعد شهور فى البحر، وصلت أخيرا إلى ساحل قاره غير معروفه. ابحر غربا لاستكشاف العالم الجديد ولتطالب به للتاج.
+# Fuzzy
 model.player.waitingFor=بانتظار: %nation%
 model.regionType.coast.name=ساحل
 model.regionType.coast.unknown=منطقه ساحليه غير معروفة
@@ -1187,9 +1195,9 @@ model.unit.underRepair=تحت الإصلاح (%turns% يدور لليسار)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1213,6 +1221,7 @@ model.colony.warehouseOverfull=مستودعك فى %colony% وصل إلى سعت
 model.colony.warehouseSoonFull=مستودعك فى %colony% سيتجاوز سعته من %goods% خلال الدور التالى. %amount% وحده من %goods% ستهدر.
 model.colony.warehouseWaste=مستودعك فى %colony% تجاوز سعته ل %goods%. %waste% وحده تم إهدارها.
 model.colonyTile.resourceExhausted=المورد %resource% تم إجهاده فى %colony%
+# Fuzzy
 model.game.spanishSuccession=سعادتك، انتهت حرب الوراثه الإسبانيه فى أوروبا. وأجبرت %loserNation% على تسليم كل المستعمرات فى العالم الجديد ل%nation% تحت معاهده أوتريخت!
 model.player.colonyGoodsParty.harbour=مستعمروك فى %colony% ألقوا %amount% وحده من %goods% إلى الميناء احتجاجا على هذه الضريبه غير العادله بواسطه التاج!
 model.player.colonyGoodsParty.horses=مستعمروك فى %colony% أطلقوا %amount% حصان احتجاج على ضرائبهم غير العادله بواسطه التاج!
@@ -1221,12 +1230,16 @@ model.player.emigrate=فى %europe%، %unit% قررت الهجره.
 model.player.foundingFatherJoinedCongress=%foundingFather% انضم للكونجرس!\n\n%description%
 model.player.soLDecrease=عضويه أبناء الحريه فى مستعمراتك انخفضت إلى %newSoL% فى المائة!
 model.player.soLIncrease=عضويه أبناء الحريه فى مستعمراتك ارتفعت إلى %newSoL% فى المائة!
+# Fuzzy
 model.player.stance.alliance.declared=جلالتك، %nation% فى تحالف معنا!
 model.player.stance.alliance.others=جلالتك، %attacker% فى تحالف مع %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=جلالتك، %nation% وافقت على وقف إطلاق النار معنا!
 model.player.stance.ceaseFire.others=جلالتك، %attacker% وافقت على وقف إطلاق النار مع %defender%.
+# Fuzzy
 model.player.stance.peace.declared=جلالتك، %nation% فى سلام معنا!
 model.player.stance.peace.others=جلالتك، %attacker% فى سلام مع %defender%.
+# Fuzzy
 model.player.stance.war.declared=أخبار سيئه، فخامتك، %nation% أعلنوا الحرب علينا!
 model.player.stance.war.others=فخامتك، %attacker% أعلنت الحرب على %defender%.
 combat.automaticDefence=%unit% فى %colony% أخذت أسلحه لتدافع عن المستعمرة!
@@ -1241,6 +1254,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% تفادت هجوما بواس
 combat.enemyShipSunk=%unit% أغرقت %enemyNation% %enemyUnit%!
 combat.equipmentCaptured=احترس، شجعان %nation% اكتسبوا %equipment%!
 combat.goodsStolen=%enemyNation% %enemyUnit% تسرق %amount% %goods% فى %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% بلندر %amount% من %colony%.
 combat.indianTreasure=أنت تأخذ %amount% من %settlement%.
 combat.nativeCapitalBurned=أنت أحرقت %name%، عاصمه %nation%. %nation% تستسلم لقوتك!
@@ -1288,6 +1302,7 @@ error.couldNotLoad=حدث خطأ أثناء محاوله تحميل اللعبة
 # Fuzzy
 error.couldNotSave=حدث خطأ أثناء محاوله حفظ اللعبة!
 main.defaultPlayerName=اسم اللاعب
+# Fuzzy
 client.choicePlayer=من فضلك اختر لاعبا:
 metaServer.couldNotConnect=عذرا، لم يمكن الاتصال بخادم-ميتا. من فضلك حاول ثانيه فيما بعد.
 metaServer.communicationError=حدث خطأ أثناء الاتصال مع خادم الميتا. من فضلك حاول مره ثانيه فيما بعد.
@@ -1296,8 +1311,11 @@ boycottedGoods.text=بما أن %goods% تمت مقاطعتها بواسطه ا
 buy.moreGold=سل عن السعر الأرخص
 buy.takeOffer=اقبل العرض
 buy.text=%nation% يودون بيع %goods% مقابل %gold%:
+# Fuzzy
 confirmHostile.alliance=أنت لا يمكنك مهاجمه أمه حليفة! هل ترغب فعلا فى كسر تحالفك مع %nation% وإعلان الحرب؟
+# Fuzzy
 confirmHostile.ceaseFire=أنت وقعت وقفا لإطلاق النار مع %nation%. هل تود فعلا الهجوم؟
+# Fuzzy
 confirmHostile.peace=أنت فى سلام مع %nation%. هل ترغب فعلا فى إعلان الحرب؟
 error.noSuchFile=الملف المحدد غير موجود أو ليس ملفا عاديا.
 # Fuzzy
@@ -1347,7 +1365,9 @@ clearSpeciality.areYouSure=هل أنت متأكد أنك تريد تنزيل %ol
 clearSpeciality.impossible=%unit% لا يمكن تنزيلها!
 defeated.text=لقد هزمت! هل تريد:
 defeated.yes=ابق و راقب
+# Fuzzy
 diplomacy.offerAccepted=%nation% قبلوا عرضك الكريم.
+# Fuzzy
 diplomacy.offerRejected=%nation% رفضوا عرضك الكريم.
 disbandUnit.text=هل أنت متأكد أنك تريد نزع هذه الوحدة؟
 disbandUnit.yes=أزل المعدات
@@ -1473,6 +1493,7 @@ colopedia.unit.price=السعر فى أوروربا:
 # Fuzzy
 colopedia.unit.productionBonus=معدل الإنتاج (معدلو الإنتاج):
 colopedia.unit.requirements=المتطلبات:
+# Fuzzy
 colopedia.unit.school=المدرسه المطلوبه للتدريب:
 colopedia.unit.skill=المهارة:
 report.labour.allColonists=كل المستعمرين
@@ -1541,12 +1562,14 @@ report.requirements.surplus=المستعمرات التاليه تنتج فائ
 report.trade.afterTaxes=الدخل بعد الضرائب
 report.trade.beforeTaxes=الدخل قبل الضرائب
 report.trade.cargoUnits=الوحدات فى الحمولة
+# Fuzzy
 report.trade.hasCustomHouse=* هذه المستعمره لديها منزل معدل؛ هذه البضائع تصدر.
 report.trade.totalDelta=إجمالى الإنتاج
 report.trade.totalUnits=إجمالى الوحدات
 report.trade.unitsSold=الوحدات المشتراه أو المباعة
 report.turn.filter=لا تعرض هذا النوع من الرسائل (%type%)
 report.turn.ignore=تجاهل هذه الرساله (المستعمرة: %colony%، البضائع: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% الخاصه ب%player%
 # Fuzzy
 aboutPanel.copyright=حقوق التأليف والنشر محفوظه © 2002-2013 فريق فرى كول
@@ -1568,7 +1591,9 @@ colonyPanel.royalistLabel=الملكيون: %number%
 confirmDeclarationDialog.areYouSure.no=ربما فيما بعد
 confirmDeclarationDialog.areYouSure.text=لنترك استبداد %monarch% الظالم ولنعلن استقلال مستعمراتنا من التاج!
 confirmDeclarationDialog.areYouSure.yes=الحريه أو الموت!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=الولايات المتحده ل%nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% الحرة
 confirmDeclarationDialog.enterCountry=من الآن فصاعدا، ستُعرف دولتنا باسم
 confirmDeclarationDialog.enterNation=وكل مواطن من أمتنا المجيده سيفتخر بأن يُدعى
diff --git a/data/strings/FreeColMessages_be-tarask.properties b/data/strings/FreeColMessages_be-tarask.properties
index e348360ac..2527a8e7a 100644
--- a/data/strings/FreeColMessages_be-tarask.properties
+++ b/data/strings/FreeColMessages_be-tarask.properties
@@ -218,7 +218,6 @@ colopediaAction.goods.name=Тавары
 colopediaAction.nations.name=Нацыі
 colopediaAction.nationTypes.name=Нацыянальныя перавагі
 colopediaAction.resources.name=Бонусныя рэсурсы
-colopediaAction.skills.name=Умеласьці
 colopediaAction.terrain.name=Тыпы мясцовасьці
 colopediaAction.units.name=Адзінкі
 colopediaAction.name=%object% (Калапэдыя)
@@ -1309,6 +1308,7 @@ model.building.locationLabel=У %location%
 model.colony.badGovernment=Урад %colony% неэфэктыўны. Уводзяцца штрафы на вытворчасьць.
 model.colony.governmentImproved1=Урад %colony% палепшаны, але ўсё яшчэ неэфэктыўны. Штрафы на вытворчасьць захоўваюцца.
 model.colony.governmentImproved2=Урад %colony% палепшаны. Штрафы на вытворчасьць скасоўваюцца.
+# Fuzzy
 model.colony.insufficientProduction=Можна зрабіць на %outputAmount% болей %outputType% у %colony%, калі там было на %inputAmount% %inputType% болей.
 model.colony.minimumColonySize=%object% робіць немагчымым зьмяншэньне насельніцтва.
 model.colony.unbuildable=%colony% ня можа пабудаваць %object% за гэты час. %object% быў выдалены з чаргі на будоўлю.
@@ -1322,21 +1322,29 @@ model.direction.SW.name=паўднёвы захад
 model.direction.W.name=захад
 model.direction.NW.name=паўночны захад
 model.historyEventType.abandonColony.description=Вы пакінулі калёнію %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation% знайшлі %city%, адзін з Сямі Залатых Гарадоў, здабыча склала %treasure% золата.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Ваша калёнія %colony% была захопленая %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Ваша калёнія %colony% была зьнішчаная %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Вы пасьмелі прыняць нашыя літасныя ўмовы, але яшчэ не заплацілі? Такая дурасьць можа выклікаць нашую незадаволенасьць.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Вы зьнішчылі паселішча %settlement%, якое належала %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Вы зьнішчылі %nation%.
 model.historyEventType.discoverNewWorld.description=Вы адкрылі Новы Сьвет.
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation% адкрылі %region%.
 model.historyEventType.foundColony.description=Вы заснавалі калёнію %colony%.
 model.historyEventType.foundingFather.description=%father% далучыўся да Кантынэнтальнага Кангрэсу.
 model.historyEventType.independence.description=Вы дасягнулі незалежнасьці ад Кароны.
+# Fuzzy
 model.historyEventType.meetNation.description=Вы сустрэлі %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=%nation% болей няма ў Новым сьвеце.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% перадалі ўсе свае калёніі ў Новым Сьвеце нацыі %nation%.
 model.indianSettlement.mostHatedNone=Нічога
 model.indianSettlement.nameUnknown=Невядомая
@@ -1380,6 +1388,7 @@ model.messageType.warehouseCapacity.name=Умяшчальнасьць схові
 model.messageType.warning.name=Папярэджаньні
 model.monarch.action.addToRef.text=Карона дадала %number% {{plural:%number%|%unit%}} да Каралеўскіх экспэдыцыйных сілаў. Каляніяльныя лідэры занепакоеныя.
 model.monarch.action.addToRef.no=Выканана
+# Fuzzy
 model.monarch.action.declareWar.text=Нахабства %nation% прымушае нас абвясьціць ім вайну!
 model.monarch.action.declareWar.no=Выканана
 # Fuzzy
@@ -1422,6 +1431,7 @@ model.noClaimReason.worked.description=Іншае паселішча ўжо вы
 model.player.forces=Сілы %nation%
 model.player.independentMarket=Эўропа
 model.player.startGame=Пасьля некалькіх месяцаў плаваньня, Вы нарэшце прыбылі да ўзьбярэжжа невядомага кантынэнту. Плывіце {{tag:%direction%|west=на захад|east=на ўсход|default=па ветры}}, каб дасьледаваць Новы Сьвет і абвесьціць яго ўласнасьцю Кароны.
+# Fuzzy
 model.player.waitingFor=Чакаем: %nation%
 model.regionType.coast.name=Узьбярэжжа
 model.regionType.coast.unknown=Невядомае ўзьбярэжжа
@@ -1475,9 +1485,9 @@ model.unit.underRepair=Рамантуецца (%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=Ф
 model.unit.unitState.fortifying=Ф
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=К
 model.unit.unitState.sentry=В
+# Fuzzy
 model.unit.unitState.skipped=П
 model.unit.unitState.toAmerica=Н
 model.unit.unitState.toEurope=Н
@@ -1514,23 +1524,29 @@ model.colony.warehouseOverfull=Вашае сховішча ў %colony% дася
 model.colony.warehouseSoonFull=Вашае сховішча ў %colony% перавысіць максымальную ўмяшчальнасьць для %goods% на працягу наступнага ходу. %amount% адзінак %goods% будуць выкінутыя.
 model.colony.warehouseWaste=Вашае сховішча ў %colony% утрымлівала зашмат %goods%. %waste% адзінак давялося выкінуць.
 model.colonyTile.resourceExhausted=У %colony% скончыўся рэсурс %resource%
+# Fuzzy
 model.game.spanishSuccession=Ваша Сьветласьць, у Эўропе скончылася вайна за Гішпанскую спадчыну. Згодна з Утрыхцкай мірнай дамовай, %loserNation% вымушаныя перадаць %nation% усе свае калёніі ў Новым Сьвеце!
 model.indianSettlement.mission.denounced=Ваш місіянэр у %settlement% быў асуджаны і пакараны сьмерцю!
 model.player.colonyGoodsParty.harbour=Вашыя каляністы ў %colony% выкінулі %amount% адзінак %goods% у затоку ў знак пратэсту супраць несправядлівага падаткаабкладаньня з боку Кароны!
 model.player.colonyGoodsParty.horses=Вашыя каляністы ў %colony% выпусьцілі на волю %amount% коней у знак пратэсту супраць несправядлівага падаткаабкладаньня Каронай!
 model.player.colonyGoodsParty.landLocked=Вашыя каляністы ў %colony% спалілі %amount% адзінак %goods% на кірмашы ў знак пратэсту супраць несправядлівага падаткаабкладаньня з боку Кароны!
+# Fuzzy
 model.player.dead.european=Ваша Сьветласьць, %nation% абвясьцілі, што поўнасьцю выходзяць са справаў у Новым Сьвеце!
 model.player.dead.native=Ваша Сьветласьць, %nation% былі зьнішчаныя.
 model.player.emigrate=У %europe%, %unit% вырашыла эмігрыраваць.
 model.player.foundingFatherJoinedCongress=%foundingFather% далучыўся да кангрэсу!\n\n%description%
 model.player.soLDecrease=Колькасьць Сыноў Свабоды ў Вашых калёніях зьнізілася да %newSoL% адсоткаў!
 model.player.soLIncrease=Колькасьць Сыноў Свабоды ў Вашых калёніях павялічылася да %newSoL% адсоткаў!
+# Fuzzy
 model.player.stance.alliance.declared=Ваша Сьветласьць, %nation% у саюзе з намі!
 model.player.stance.alliance.others=Ваша Сьветласьць, %attacker% у саюзе з %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Ваша Сьветласьць, %nation% дамовіліся пра спыненьне агню з намі!
 model.player.stance.ceaseFire.others=Ваша Сьветласьць, %attacker% дамовіліся пра спыненьне агню з %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Ваша Сьветласьць, %nation% маюць мірную дамову з намі!
 model.player.stance.peace.others=Ваша Сьветласьць, %attacker% маюць мірную дамову з %defender%.
+# Fuzzy
 model.player.stance.war.declared=Дрэнныя навіны, Ваша Сьветласьць, %nation% абвясьцілі нам вайну!
 model.player.stance.war.others=Ваша Сьветласьць, %attacker% абвясьцілі вайну супраць %defender%.
 combat.automaticDefence=Вашая %unit% у %colony% узяла зброю для абароны калёніі!
@@ -1546,6 +1562,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% пазьбегнуў атакі
 combat.enemyShipSunk=%unit% патапіла %enemyNation% %enemyUnit%!
 combat.equipmentCaptured=Увага, ваяры %nation% атрымалі %equipment%!
 combat.goodsStolen=%enemyNation% %enemyUnit% скрала %amount% %goods% у %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% нарабавала %amount% у %colony%.
 combat.indianRaid=Нашыя выведчыкі паведамляюць, што %nation% зьдзейсьнілі напад на калёнію %colonyNation% %colony%.
 combat.indianSurprise=%nation% зьдзейсьніла нечаканы напад на %colony%, які ўсхваляваў нашых каляністаў. Уладар %nation% адмаўляе гэты факт.
@@ -1597,6 +1614,7 @@ error.couldNotLoad=Адбылася памылка пад час спробы з
 # Fuzzy
 error.couldNotSave=Адбылася памылка пад час спробы захаваньня гульні!
 main.defaultPlayerName=Імя гульца
+# Fuzzy
 client.choicePlayer=Калі ласка, выберыце гульца:
 metaServer.couldNotConnect=Прабачце, немагчыма далучыцца да мэта-сэрвэра. Калі ласка, паспрабуйце пазьней.
 metaServer.communicationError=Пад час далучэньня з мэта-сэрвэрам адбылася памылка. Калі ласка, паспрабуйце пазьней.
@@ -1606,8 +1624,11 @@ buy.moreGold=Папрасіць зьнізіць цану
 buy.takeOffer=Прыняць прапанову
 buy.text=%nation% жадаюць прадаць іх %goods% за %gold%:
 clearTradeRoute.text=Ваша %unit% прызначаная ў гандлёвы маршрут %route%. Устаноўка мэтавага пункту зьніме яе з гандлёвага маршруту. Вы ўпэўнены, што жадаеце гэта зрабіць?
+# Fuzzy
 confirmHostile.alliance=Вы ня можаце атакаваць саюзьнікаў! Вы сапраўды жадаеце разарваць саюз з %nation% і абвясьціць вайну?
+# Fuzzy
 confirmHostile.ceaseFire=Вы падпісалі дамову пра прыпыненьне вайсковых дзеяньняў з %nation%. Вы сапраўды жадаеце атакаваць?
+# Fuzzy
 confirmHostile.peace=Вы ў міры з %nation%. Вы сапраўды жадаеце абвясьціць вайну?
 error.noSuchFile=Пазначаны файл няслушны альбо не існуе.
 # Fuzzy
@@ -1656,7 +1677,9 @@ clearSpeciality.areYouSure=Вы ўпэўнены, што жадаеце пані
 clearSpeciality.impossible=%unit% ня можа быць паніжаны!
 defeated.text=Вы пераможаны! Ці жадаеце Вы:
 defeated.yes=Застацца і назіраць
+# Fuzzy
 diplomacy.offerAccepted=%nation% прынялі Вашу шчодрую прапанову.
+# Fuzzy
 diplomacy.offerRejected=%nation% адмовіліся ад Вашай шчодрай прапановы.
 disbandUnit.text=Вы ўпэўнены, што жадаеце распусьціць гэтую адзінку?
 disbandUnit.yes=Расфарміраваць
@@ -1699,7 +1722,9 @@ move.noAccessContact=Ваша Сьветласьць, спачатку нам н
 move.noAccessGoods=%nation% ня будзе гандляваць з пустой %unit%.
 move.noAccessSettlement=%nation% не дазваляюць нашаму %unit% уваходзіць у іх паселішчы.
 move.noAccessSkill=Наша %unit% ня можа вучыцца ў тубыльцаў.
+# Fuzzy
 move.noAccessTrade=Мы ня маем дазволу гандляваць з іншымі эўрапейскімі нацыямі, такімі як %nation%.
+# Fuzzy
 move.noAccessWar=Мы ня можам гандляваць з %nation% пад час вайны.
 move.noAccessWater=Наш %unit% павінен высадзіцца на бераг перад тым як уваходзіць у паселішча.
 move.noAttackWater=Нашая %unit% павінна высадзіцца перад тым як атакаваць.
@@ -1814,6 +1839,7 @@ colopedia.unit.price=Цана ў Эўропе:
 # Fuzzy
 colopedia.unit.productionBonus={{plural:%number%|one=Мадыфікатар вытворчасьці|few=Мадыфікатары вытворчасьці|many=Мадыфікатараў вытворчасьці}}
 colopedia.unit.requirements=Патрабаваньні:
+# Fuzzy
 colopedia.unit.school=Неабходная школа для трэніроўкі:
 colopedia.unit.skill=Вопыт:
 report.labour.allColonists=Усе каляністы
@@ -1855,13 +1881,13 @@ report.colony.making.noconstruction.description=%colony%: Не занятая б
 report.colony.making.noteach.description=%colony%: %teacher% ня мае навучэнцаў
 report.colony.name.description=Сьпіс калёніяў
 report.colony.name.header=Калёнія
-report.colony.plow.description=Колькасьць клетак калёніі, якія прынясуць прыбытак ад ўзараньня
+# Fuzzy
 report.colony.production.description=%colony%: агульная вытворчасьць %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: агульная вытворчасьць %goods% %amount% (экспартуецца звыш %export%)
 report.colony.production.header=Агульная вытворчасьць %goods%
+# Fuzzy
 report.colony.production.waste.description=%colony%: агульная вытворчасьць %goods% = %amount%, сховішча будзе перапоўненае, %waste% будзе страчана
-report.colony.road.description=Колькасьць клетак калёніі, якія прынясуць прыбытак ад пабудовы дарогі
-report.colony.roadBuilding.description=%colony% атрымае прыбытак ад пабудовы {{plural:%amount%|one=%amount% дарогі|few=%amount% дарогаў|many=%amount% дарогаў}}
 # Fuzzy
 report.continentalCongress.elected=Выбраныя:
 report.continentalCongress.none=(няма)
@@ -1903,27 +1929,26 @@ report.production.selectGoods=Выбар тавараў
 report.production.update=Абнавіць
 report.requirements.badAssignment=%colony% мае %expert%, які зараз працуе як %expertWork%, у той час як %nonExpert% працуе як %nonExpertWork%. Вытворчасьць павялічыцца, калі каляністы памяняюцца працамі.
 report.requirements.canTrainExperts={{plural:2|%unit%}} можна навучыць у
-report.requirements.clearTile=%type% на %direction% ад %colony% прынясе прыбытак ад расчысткі.
+# Fuzzy
 report.requirements.exploreTile=%type% на %direction% ад %colony% прынясе прыбытак ад распрацоўкі.
 report.requirements.met=Усе патрабаваньні выкананыя.
 report.requirements.missingGoods=%colony% вырабляе %goods%, але неабходна болей %input%.
 # Fuzzy
 report.requirements.misusedExperts=Ёсьць {{plural:2|%unit%}}, якія не працуюць як %work% знаходзяцца ў
 report.requirements.noExpert=%colony% вырабляе %goods%, але там няма %unit%.
-report.requirements.plowCenter=%colony% атрымае прыбытак, калі гэтая клетка будзе ўзараная.
-report.requirements.plowTile=%type% на %direction% ад %colony% прынясе прыбытак ад узараньня.
-report.requirements.roadTile=%type% на %direction% ад %colony% прынясе прыбытак ад пабудовы дарогі.
 report.requirements.severalExperts=Некалькі {{plural:2|%unit%}} знаходзіцца ў
 report.requirements.surplus=Лішак %goods% вырабляецца ў
 report.trade.afterTaxes=Прыбытак пасьля падаткаў
 report.trade.beforeTaxes=Прыбытак да падаткаў
 report.trade.cargoUnits=Адзінак у перавозцы
+# Fuzzy
 report.trade.hasCustomHouse=* Гэтая калёнія мае мытню; гэтыя тавары экспартуюцца.
 report.trade.totalDelta=Агульная вытворчасьць
 report.trade.totalUnits=Усяго адзінак
 report.trade.unitsSold=Адзінак куплена ці прададзена
 report.turn.filter=Не выводзіць гэты тып паведамленьняў (%type%)
 report.turn.ignore=Ігнараваць гэтае паведамленьне (Калёнія: %colony%, Тавары: %goods%)
+# Fuzzy
 report.turn.playerNation=%player% %nation%
 # Fuzzy
 aboutPanel.copyright=Аўтарскія правы © 2002-2013 каманда FreeCol
@@ -1957,7 +1982,9 @@ colonyPanel.notBestTile=%unit% можа вырабляць болей %goods% н
 confirmDeclarationDialog.areYouSure.no=Можа потым.
 confirmDeclarationDialog.areYouSure.text=Адкінем несправядлівую тыранію %monarch% і абвясьцім незалежнасьць нашых калёніяў ад Кароны!
 confirmDeclarationDialog.areYouSure.yes=Свабода альбо сьмерць!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=%nation% Злучаныя Штаты
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Свабодныя %nation%
 confirmDeclarationDialog.enterCountry=З гэтага моманту наша краіна будзе вядома як
 confirmDeclarationDialog.enterNation=кожны грамадзянін нашай вялікай нацыі павінен ганарыцца тым, што ён будзе вядомы як
@@ -1966,8 +1993,10 @@ constructionPanel.turnsToComplete=(Хадоў да выкананьня: %number
 negotiationDialog.accept=Прыняць
 negotiationDialog.add=Дадаць
 negotiationDialog.cancel=Адмяніць
+# Fuzzy
 negotiationDialog.demand=%nation% патрабуюць ад %otherNation%
 negotiationDialog.exchange=у абмен на
+# Fuzzy
 negotiationDialog.offer=%nation% прапануюць %otherNation%
 negotiationDialog.send=Даслаць
 editSettlementDialog.removeSettlement=Зруйнаваць паселішча
diff --git a/data/strings/FreeColMessages_br.properties b/data/strings/FreeColMessages_br.properties
index a622e18d2..3967d8833 100644
--- a/data/strings/FreeColMessages_br.properties
+++ b/data/strings/FreeColMessages_br.properties
@@ -229,6 +229,7 @@ menuBar.debug.addLiberty=Ouzhpennañ frankiz da bep trevadenn
 menuBar.debug.compareMaps.checkComplete=Kontroll echu. Disinkroneladur ebet dizoloet.
 menuBar.debug.compareMaps.problem=Kudennoù a c'hell bezañ. Lennit an titouroù skrivet war ar skramm, mar plij.
 menuBar.debug.compareMaps=O kontrollañ disinkroneladur ar gartenn
+menuBar.debug.displayAIMissions=Diskwel an holl gefridioù
 menuBar.debug.displayErrorMessage=Diskwel ar c'hemennad fazi
 menuBar.debug.displayEuropeStatus=Diskouez statud Europa
 menuBar.debug.displayMonarchPanel=Diskwel panell ar Roue
@@ -267,7 +268,6 @@ colopediaAction.goods.name=Madoù
 colopediaAction.nations.name=Broadoù
 colopediaAction.nationTypes.name=Perzhioù mat broadel
 colopediaAction.resources.name=Danvezioù bonuz
-colopediaAction.skills.name=Barregezhioù
 colopediaAction.terrain.name=Doare an dachenn
 colopediaAction.units.name=Unvezioù
 colopediaAction.name=%object% (Colopedia)
@@ -1552,6 +1552,7 @@ model.improvement.road.description=Hent
 model.improvement.road.name=Hent
 model.improvement.road.occupationString=H
 model.limit.independence.coastalColonies.name=Bevenn trevaennoù war an aod
+# Fuzzy
 model.limit.independence.coastalColonies.description=Rankout a reot kaout %limit% trevadenn war an aod da nebeutañ evit disklêriañ ho tizalc'hiezh.
 model.limit.independence.rebels.name=Bevenn a emsavidi
 model.limit.independence.rebels.description=D'an nebeutañ %limit%% eus ho entrevidi a rank souten an dizalc'hiezh.
@@ -1900,6 +1901,7 @@ model.colony.badGovernment=Diefedus eo gouarnamant %colony%. Kastizoù zo lakaet
 model.colony.goodGovernment=Gwellaet eo efedusted ar gouarnamant! Mibien ar frankiz n'eo ket mui par pe a ya bremañ d'ober muioc'h eget %number% dre gant ar gumuniezh e %colony%.
 model.colony.governmentImproved1=Gwellaet eo gouarnamant %colony%, daoust dezhañ chom diefedus. Kastizoù a zo lakaet war ar produerezh c'hoazh.
 model.colony.governmentImproved2=Gwellaet eo gouarnamant %colony%. Lamet eo bet ar c'hastizoù war ar produerezh.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% %outputType% muioc'h a c'hellfe bezañ produet e %colony% gant ma vefe un dreistad a %inputAmount% %inputType% ganeomp.
 model.colony.lostGoodGovernment=Koazhet eo efedusted ar gouarnamant! Mibien ar frankiz n'eo ket mui par pe a ya bremañ d'ober muioc'h eget %number% dre gant ar gumuniezh e %colony%. N'eus bonuz produiñ ebet ken gant an drevadenn.
 model.colony.lostVeryGoodGovernment=Koazhet eo efedusted ar gouarnamant! Mibien ar frankiz n'eo ket mui par pe a ya bremañ d'ober nebeutoc'h eget %number% dre gant ar gumuniezh e %colony%. Kollet ez eus bet holl he bonuzoù produiñ gant an drevadenn.
@@ -1914,12 +1916,17 @@ model.colony.veryBadGovernment=Diefedus a-grenn eo gouarnamant %colony%. Kastizo
 model.colony.veryGoodGovernment=Gwellaet eo bet efedusted ar gournamant! Par eo ar santadur disuj er %colony% pe mont a ra dreist bremañ da %number% dre gant...
 model.colonyTile.claim=(%direction% ar goulenn)
 model.diplomaticTrade.receive.contact=Gant hor gwellañ gourc'hemennoù a-berzh ar vroad illur %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Kevraouomp gant %nation%.
 model.diplomaticTrade.receive.trade=Roomp studi da ginnig kenwerzhel %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=%nation% zo o c'houlenn un truaj diganeoc'h !
 model.diplomaticTrade.send.contact=Kejet hon eus ouzh izili eus ar vroad %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Roomp studi d'hor stad diplomatel gant %nation%
+# Fuzzy
 model.diplomaticTrade.send.trade=Roomp studi d'ur c'henwerzh gant %nation% e %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Goulenn a reomp un truaj digant %nation% e % %settlement%.
 model.direction.N.name=norzh
 model.direction.NE.name=biz
@@ -1930,27 +1937,39 @@ model.direction.SW.name=mervent
 model.direction.W.name=kornôg
 model.direction.NW.name=gwalarn
 model.historyEventType.abandonColony.description=Dilezel a rit trevadenn %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Un harz-tennañ zo bet sinet gant %nation%
+# Fuzzy
 model.historyEventType.cityOfGold.description=An %nation%  a zizolo %city%, unan eus ar Seizh Keoded aour Kollet, hag un teñzor a %treasure% unanenn aour.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Aloubet eo bet ho trevadenn %colony% gant %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Distrujet eo bet ho trevadenn %colony% gant %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Krediñ a reot degemer hon aozioù brokus ha tremen a rit, koulskoude, hep paeañ ? Aze ez eus trubarderezh ! Setu perak n'omp ket plijet gant hoc'h emzaclc'h.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Distrujañ a rit kêriadenn %settlement% %nation%.
+# Fuzzy
 model.historyEventType.declareWar.description=Disklêriet eo ar brezel gant %nation%
+# Fuzzy
 model.historyEventType.destroyNation.description=Gant an %nation% eo bet distrujet an %nativeNation%.
 # Fuzzy
 model.historyEventType.destroySettlement.description=Distrujañ a rit ar gêriadenn %settlement e %nation%
 model.historyEventType.discoverNewWorld.description=Dizoleiñ a rit an Douar Nevez.
+# Fuzzy
 model.historyEventType.discoverRegion.description=An %nation% a zizolo %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Un emglev zo bet siner gant %nation%
 model.historyEventType.foundColony.description=Sevel a rit trevadenn %colony%.
 model.historyEventType.foundingFather.description=Emezelañ a ra %father% ouzh ar C'hendalc'h Kevandirel.
 model.historyEventType.independence.description=An Dizalc'hiezh ho peus gounezet diouzh ar Gurunenn.
+# Fuzzy
 model.historyEventType.makePeace.description=Un emglev peoc'h zo bet sinet gant %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=En em gavout a rit gant %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=N'eus ket mui eus !!%nation% er Bed Nevez.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% a lez holl o zrevadennoù en Douar Nevez da %nation%.
 model.indianSettlement.mostHatedNone=Hini ebet
 model.indianSettlement.mostHatedUnknown=Dianav
@@ -2004,8 +2023,10 @@ model.messageType.warehouseCapacity.name=Barregezh ar sanailh
 model.messageType.warning.name=Kemennoù diwall
 model.monarch.action.addToRef.text=Ouzhpennet eo bet gant ar Gurunenn {{plural:%number%|%unit%}} d'ar Bagad Brezel Roueel. Ankeniet eo renerien an trevadennoù.
 model.monarch.action.addToRef.no=Graet
+# Fuzzy
 model.monarch.action.declarePeace.text=Asantet hon eus skoulmañ un emglev peoc'h gant an %nation%.
 model.monarch.action.declarePeace.no=Graet
+# Fuzzy
 model.monarch.action.declareWar.text=Rediet omp, abalamour d'ho rogoni, da zisklêriañ brezel d'an %nation% !
 model.monarch.action.declareWar.no=Graet
 # Fuzzy
@@ -2066,6 +2087,7 @@ model.player.colonialIndependence=N'eus nemet ar c'hoarierien drevadennel a c'ha
 model.player.forces=Nerzhioù %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Goude mizioù war vor emaoc'h degouezhet a-vaez da aodoù ur c'hevandir dianav. Lakait penn {{tag:%direction%|west=d'ar C'hornôg|east=ar Reter|default=dindan an avel}} evit dizoleiñ an Douar Nevez ha piaouañ anezhañ en anv ar Gurunenn.
+# Fuzzy
 model.player.waitingFor=O c'hortoz ma vo echuet o zro gant : %nation%
 model.regionType.coast.name=Aod
 model.regionType.coast.unknown=Rannvro arvorek dianav
@@ -2105,6 +2127,7 @@ model.tradeItem.gold.name=Aour
 model.tradeItem.gold.description=ar sammad a %amount% aour
 model.tradeItem.goods.name=Marc'hadourezh
 model.tradeItem.incite.name=Disklêriañ ar brezel da
+# Fuzzy
 model.tradeItem.incite.description=brezel a-enep an %nation%
 model.tradeItem.stance.name=Darempredoù
 model.tradeItem.unit.name=Unvez
@@ -2127,9 +2150,9 @@ model.unit.underRepair=Dresañ (%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=K
 model.unit.unitState.fortifying=K
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=L
 model.unit.unitState.sentry=G
+# Fuzzy
 model.unit.unitState.skipped=T
 model.unit.unitState.toAmerica=B
 model.unit.unitState.toEurope=B
@@ -2170,6 +2193,7 @@ model.colony.warehouseSoonFull=Ho sanailh e %colony% a yay en tu all d'he barreg
 model.colony.warehouseWaste=Ho sanailh e %colony% a zo aet en tu all d'he barregezh sanailhañ %goods%. Foranet eo bet %waste% unanenn.
 model.colony.workersEvicted=E %colony% ne c'hall ket ho trevadennerien labourat war %location% abalamour ma'z eus %enemyUnit% war al lec'h.
 model.colonyTile.resourceExhausted=Danvez %resource% kaset da get e %colony%
+# Fuzzy
 model.game.spanishSuccession=Ho Meurdez, ar Brezel Hêrezh Spagnol a zo echuet en Europa. Hervez Skrid-emglev Utrecht eo bet rediet ar vroad %loserNation% da lezel holl he zrevadennoù en Douar Nevez da %nation%!
 model.indianSettlement.mission.denounced=Ho misioner a oa e %settlement% a zo bet diskulhiet ha kaset d'ar marv!
 model.indianSettlement.mission.destroyed=Marvet eo ho misioner e %settlement% pa'z eo bet distrujet ar c'hampadur-se.
@@ -2179,6 +2203,7 @@ model.player.autoRecruit=An trubuilhoù relijiel en %europe% a laka %unit% da zi
 model.player.colonyGoodsParty.harbour=Ho trevadennerien a %colony% o deus bannet %amount% unanenn %goods% er porzh da reiñ mouezh a-enep an taosoù direizh savet gant ar Gurunenn !
 model.player.colonyGoodsParty.horses=Ho trevadennerien a %colony% o deus dieubet %amount% marc'h da reiñ mouezh a-enep an taosoù direizh savet gant ar Gurunenn !
 model.player.colonyGoodsParty.landLocked=Ho trevadennerien a %colony% o deus devet %amount% unvez %goods% war blasenn ar marc'had da reiñ mouezh a-enep an taosoù direizh savet gant ar Gurunenn!
+# Fuzzy
 model.player.dead.european=Ho Meurdez, %nation% o deus disklêriet bezañ aet maez aferioù an Douar Nevez krenn ha krak!
 model.player.dead.native=Ho Meurdez, distrujet eo bet an %nation%.
 model.player.disaster.bankruptcy.start=N'ho peus paeet mann ebet evit derc'hel kempenn an holl savadurioù. Lakaet e viot da baeañ maluzoù produiñ bras.
@@ -2191,12 +2216,16 @@ model.player.ignoredTax=Lakaet eo bet ar feur tellañ da greskiñ a %amount%%, e
 model.player.interventionForceArrives=Ar Bagad emellout prometet zo oc'h erruout !
 model.player.soLDecrease=Koazhet eo ar feur emezelañ ouzh Mibien ar Frankiz betek %newSoL% % !
 model.player.soLIncrease=Kresket eo ar feur emezelañ ouzh Mibien ar Frankiz betek %newSoL% %!
+# Fuzzy
 model.player.stance.alliance.declared=Ho Meurdez, an %nation% a zo kevredet ganeomp!
 model.player.stance.alliance.others=Ho Meurdez, %attacker% a zo kevredet gant %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Ho Meurdez, %nation% o deus skoulmet un arsav-tennañ ganeomp!
 model.player.stance.ceaseFire.others=Ho Meurdez, %attacker% en deus skoulmet un arsav-tennañ gant %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Ho Meurdez, an %nation% a zo e peoc'h ganeomp!
 model.player.stance.peace.others=Ho Meurdez, %attacker% a zo e peoc'h gant %defender%.
+# Fuzzy
 model.player.stance.war.declared=Keloù fall, Ho Meurdez, disklêriet eo bet ar brezel a-enep deomp gant %nation% !
 model.player.stance.war.others=Ho Meurdez, %attacker% o deus disklêriet ar brezel da %defender%.
 combat.automaticDefence=Tapet eo bet e armoù gant ho %unit% e %colony% evit he zifenn!
@@ -2212,6 +2241,7 @@ combat.enemyShipEvaded=%enemyUnit% %enemyNation% a zo tremenet hebiou d'un dagad
 combat.enemyShipSunk=%enemyUnit% %enemyNation% zo aet d'ar strad abalamour da %unit%!
 combat.equipmentCaptured=Diwallit, paotred dispont %nation% o deus tapet %equipment%!
 combat.goodsStolen=%enemyUnit% %enemyNation% a laer %amount% %goods% digant %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyUnit% %enemyNation% en deus preizhet %amount% e %colony%.
 combat.indianRaid=Hor spierien a ro dimp da c'houzout he deus graet ar %nation% ur raid e %colonyNation% %colony%.
 combat.indianSurprise=%nation% he deus graet ur raid dic'hortoz e %colony%, o trechalañ hon trevadennerien. Penn %nation% a lavar n'eo ket bet rouestlet er raid-se.
@@ -2267,6 +2297,7 @@ main.javaVersion=An doare %minVersion% eus Java pe un doare gwelloc'h egetañ zo
 main.memory=Rankout a reot deverkañ muioc'h %memory% okted memor d'ar JVM.\nAdloc'hit FreeCol gant java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=Ne c'hall ket Freecol kavout kavlec'hioù a zere evit saveteiñ roadennoù enno. Kenderc'hel, met bezit war soñj kaout trubuilhoù.
 client.baseData=Dibosupl eo kavout ar c'havlec'h roadennoù tarzh%dir%. Ar restroù roadennoù ne c'hallont ket bezañ kavet gant FreeCol. Bezit sur ez eus anezho. Ma klask FreeCol er c'havlec'h fall, lañsit ar jeu gant un arventenn el linenn urzhiañ : -freecol-data <kavlec'h-roadennoù>
+# Fuzzy
 client.choicePlayer=Dibabit ur c'hoarier mar plij :
 client.classic=C'hwitet eo bet pa'z eo bet karget kartennouriezh ar roadennoù adal ar rummad reolennoù "klasel".
 client.debugConnect=Ne c'hallit ket kevreañ ouzh ur bartiad zo anezhi er mod dizreinañ.
@@ -2279,8 +2310,10 @@ metaServer.couldNotConnect=Hon digarez, n'eus ket bet tu da gevreañ ouzh ar met
 metaServer.communicationError=Ur fazi zo bet e-ser mont e darempred gant ar meta-servijer. Klaskit en-dro diwezhatoc'h mar plij.
 abandonEducation.action.studying=o studiañ
 abandonEducation.action.teaching=O kelenn
+# Fuzzy
 abandonEducation.no=Nann, kenderc'hel ar stummadur
 abandonEducation.text=Ma ya ho %unit% kuit eus %colony% e tilezo %action% er %building% ; ha c'hoant ho peus e lezfe anezhañ ennañ ?
+# Fuzzy
 abandonEducation.yes=Ya, kuitait an drevadenn
 abandonTeaching.text=Ma ya ho %unit% kuit eus ar %building% e paouezo da gelenn, ha sur eo ho peus c'hoant da vont kuit ?
 armedUnitSettlement.attack=Tagañ
@@ -2292,10 +2325,14 @@ buy.takeOffer=Asantiñ d'ar c'hinnig
 buy.text=%nation% a venn gwerzhañ %goods% evit %gold%:
 clearTradeRoute.text=Deverket eo ho %unit% d'an hent kenwerzh %route%. Arventenniñ penn e hent a ray dezhañ bezañ lakaet maez eus an hent. Ha sur oc'h e fell deoc'h en ober?
 client.fullScreen=Ne vez ket embreget ar mod skramm leun evit an drobarzell c'hrafik-mañ.\nDistriñ d'ar mod prenestret.
+# Fuzzy
 confirmHostile.alliance=N'oc'h ket evit tagañ ur vroad kevredet ! Ha fellout a ra deoc'h terriñ ho emglev gant %nation% ha disklêriañ ar brezel ?
+# Fuzzy
 confirmHostile.ceaseFire=Sinet hoc'h eus un harz-brezel gant ar %nation%. Ha sur oc'h e fell deoc'h tagañ anezho?
+# Fuzzy
 confirmHostile.peace=E peoc'h emaoc'h gant %nation%. Ha sur oc'h e fell deoc'h disklêriañ ar brezel?
 confirmHostile.yes=Ya,distagomp ar chas-brezel !
+# Fuzzy
 confirmTribute.broke=Hor spierien a ro dimp da c'houzout emañ kras an traoù gant ar %nation%. Arabat dimp koll hon amzer gant goulennoù truajoù.
 confirmTribute.european=Ar %nation% %danger%, ha %finance%.\nPegement e rankomp goulenn groñs diganto ?
 confirmTribute.happy=Mignoned vat ganeomp eo an %nation% e %settlement%. Pec'hed e vefe ober gaou ouzh hon emglev.
@@ -2316,6 +2353,7 @@ indianLand.cancel=Kuitaat an douar
 indianLand.pay=Kinnig %amount% aour evit an douar
 indianLand.take=Kemer ar pezh zo deoc'h ent gwir
 indianLand.text=Perc'hennet eo an douar-mañ gant ar %player%. Ha fellout a ra deoc'h :
+# Fuzzy
 indianLand.unknown=Tud dianav zo o vevañ war an douaroù-mañ. C'hoant ho peus da :
 info.autodetectLanguageSelected=Dibabet hoc'h eus emdetektiñ ar yezh. Ret e vo deoc'h adlañsañ ar c'hoari evit lakaat ar cheñchamant da dalvezout.
 info.enterSomeText=Skrivit un tamm skrid.
@@ -2361,7 +2399,9 @@ defeated.text=Faezhet oc'h bet ! Ha fellout a ra deoc'h :
 defeated.yes=Chom da sellet
 defeatedSinglePlayer.text=Trec'het oc'h bet !\n\nSetu deuet amzer strobinellus an noz, pa zigor ar bezioù ha pa zic'hwezh an ifern e anal flaerius war ar bed. Adalek bremañ e c'hellimp evañ gwad ha derc'hel d'hol labour ken euzhus ma kreno ar bed ken nemet gant gwelet ac'hanomp !
 defeatedSinglePlayer.yes=Ober gant ar mod Dial
+# Fuzzy
 diplomacy.offerAccepted=Degemeret eo bet ho kinnig brokus gant an %nation%
+# Fuzzy
 diplomacy.offerRejected=Distaolet eo bet ho kinnig brokus gant an %nation%
 disbandUnit.text=Ha sur oc'h e fell deoc'h divodañ an unanenn-mañ ?
 disbandUnit.yes=Divodañ
@@ -2407,7 +2447,9 @@ move.noAccessGoods=Ne genwerzho ket %nation% gant un %unit% goullo.
 move.noAccessMissionBan=Nac'hañ a ran ar %nation% mont e darempred gant holl ho misionerien.
 move.noAccessSettlement=Ne aotre ket an %nation% e yafe hor %unit% en o zrevadenn.
 move.noAccessSkill=Ne c'hell ket hor %unit% deskiñ gant an henvroad.
+# Fuzzy
 move.noAccessTrade=N'emañ ket an aotrouniezh ganeomp evit kenwerzh gant Europiz all evel %nation%.
+# Fuzzy
 move.noAccessWar=Ne c'hellomp ket kenwerzhañ gant %nation% p' emaomp o brezeliñ
 move.noAccessWater=Hor %unit% a rank mont war an douar a-raok mont e-barzh an trevadenn.
 move.noAttackWater=Ret eo da %unit% douarañ a-raok gallout tagañ.
@@ -2474,6 +2516,7 @@ server.timeOut=Re bell eo padet ar c'hlask kevreañ ouzh ar servijer.
 server.userNameInUse=Implijet eo an anv implijer spisaet dija.
 server.userNameNotPresent=N'eo ket spisaet an anv implijer er c'hoari-mañ.
 server.wrongFreeColVersion=Stummoù pratik ha servijer Freecol ne glotont ket an eil gant egile.
+# Fuzzy
 buildColony.others=Ar "%nation% o deus diazezet trevadenn nevez %colony% e %region%.
 cashInTreasureTrain.colonial=Un teñzor a %amount% pezh aour a zo bet dilestret en Europa. %cashInAmount% pezh aour a zo bet enkefiet ganeoc'h.
 cashInTreasureTrain.independent=Un teñzor a %amount% a zo bet ouzhpennet d'o teñzor broadel.
@@ -2578,6 +2621,7 @@ colopedia.unit.offensivePower=Galloud tagañ :
 colopedia.unit.price=Priz en Europa :
 colopedia.unit.productionBonus={{plural:%number%|one=Kemmer|other=Kemmerien}} produiñ :
 colopedia.unit.requirements=Redioù:
+# Fuzzy
 colopedia.unit.school=Skol rekis evit deskiñ :
 colopedia.unit.skill=Barregezh :
 report.labour.allColonists=Holl an drevadennerien
@@ -2613,8 +2657,8 @@ report.colony.growing.description=Ne c'hall ket %colony% kreskiñ a {{plural:%am
 # Fuzzy
 report.colony.improve.description=Unvezioù a c'hallfe gwellaat ar produadur e-keñver an unvez zo oc'h ober al labour
 report.colony.improve.header=Gwellaat
+# Fuzzy
 report.colony.improving.description=%colony% : Evit produiñ %amount% %goods% ouzhpenn, lakait %unit% e-lec'h %oldUnit%
-report.colony.wanting.description=%colony% : Evit produiñ %amount% muioc'h a %goods%, ouzhpennit %unit%
 report.colony.making.blocking.description=%colony%: nevez:%amount% %goods%  ret evit %buildable% {{plural:%turns%|one=er c'hentañ tro|other=e %turns% tro}}
 report.colony.making.constructing.description=%colony%: nevez: %buildable% echuet  {{plural:%turns%|one=er c'hentañ tro|other=e %turns% tro}}
 report.colony.making.description=Petra emañ an drevadenenn-mañ o fardañ
@@ -2624,21 +2668,22 @@ report.colony.making.noconstruction.description=%colony% :N'emeur o sevel mann e
 report.colony.making.noteach.description=%colony%: %teacher% n'en deus studier ebet
 report.colony.name.description=Roll an trevadennoù
 report.colony.name.header=Trevadenn
-report.colony.plow.description=Niver a garrezennoù trevadenn a denno splet eus an arat
-report.colony.plow.header=P
-report.colony.plowing.description=Interest he defe %colony% da labourat douar en {{plural:%amount%|one=ur  garrezenn|other=%amount% karrezenn}}
+# Fuzzy
 report.colony.production.description=%colony% : produadur rik a %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony% : ar produadur rik a %goods% zo %amount% (ezporzhiet en tu all da %export%)
 report.colony.production.header=Produadur rik a %goods%
+# Fuzzy
 report.colony.production.high.description=%colony% : produadur rik a %goods% = %amount%, aet da netra {{plural:%turns%|one=er ch'entañ tro|other=e %turns% tro}}
+# Fuzzy
 report.colony.production.low.description=%colony% : produadur rik a %goods% = %amount%, aet da netra {{plural:%turns%|one=kentañ tro|other=a-benn %turns% tro}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: produadur kriz a %goods%= %amount%. Leun-chouk eo ar sanailh, %waste% a vo kollet.
-report.colony.road.description=Niver a garrezennoù a denno splet eus savidigezh un hent
-report.colony.road.header=R
-report.colony.roadBuilding.description=Mat e vefe da %colony% sevel {{plural:%amount%|one=un hent|other=%amount% hentoù}}
 report.colony.shrinking.description=Ne c'hall ket %colony% kreskiñ a {{plural:%amount%|one=un unvez|other=%amount% unvez}} hep ober gaou ouzh he froduadur.
 report.colony.starving.description=%colony%: naonegezh {{plural:%turns%|one=er c'hentañr|other=a-benn%turns% tro}}
 # Fuzzy
+report.colony.wanting.description=%colony% : Evit produiñ %amount% muioc'h a %goods%, ouzhpennit %unit%
+# Fuzzy
 report.continentalCongress.elected=Dilennet: %tum%
 report.continentalCongress.none=(hini ebet)
 report.continentalCongress.recruiting=O tuta
@@ -2681,26 +2726,25 @@ report.production.selectGoods=Dibab madoù
 report.production.update=Hizivaat
 report.requirements.badAssignment=%colony% en deus ur %expert% a labour bremañ evel %expertWork%, tra ma labour ur %nonExpert% evel %nonExpertWork%. Produet e vefe muioc'h ma eskemme ar drevadennerien o implijoù an eil re gant ar re all.
 report.requirements.canTrainExperts={{plural:2|%unit%}} a c'hall bezañ gourdonet e  :
-report.requirements.clearTile=%type% war-zu %direction% %colony% a vefe dedennus evit an difraostañ.
+# Fuzzy
 report.requirements.exploreTile=%type% war-zu %direction% de %colony%
 report.requirements.met=Holl an amplegadoù a zo gwalc'het.
 report.requirements.missingGoods=Emañ %colony% o produiñ %goods%, hogen he deus ezhomm muioc'h a %input%.
 report.requirements.misusedExperts=Bez' ez eus {{plural:2|%unit%} na labouront ket evel %work% zo e
 report.requirements.noExpert=Emañ %colony% o produiñ %goods%, hogen n'he deus %unit% ebet.
-report.requirements.plowCenter=Mat e vefe da %colony% arat he c'harrezenn.
-report.requirements.plowTile=%type% war-zu %direction% %colony% a vefe dedennus evit an difraostañ.
-report.requirements.roadTile=%type% war-zu %direction% %colony% a vefe emsav dezhi sevel un hent.
 report.requirements.severalExperts=Meur a {{plural:2|%unit%}} a gaver e
 report.requirements.surplus=An trevadennoù da-heul a brodu ur revec'h a %goods% e:
 report.trade.afterTaxes=Korvoder goude an taosoù
 report.trade.beforeTaxes=Korvoder a-raok an taosoù
 report.trade.cargoUnits=Unvezioù karget
+# Fuzzy
 report.trade.hasCustomHouse=* An drevadenn-se a zo enni un Ti ar valtouterien; ar marc'hadourezhioù-se a zo ezporzhiet.
 report.trade.totalDelta=Hollad ar produerezh
 report.trade.totalUnits=Hollad an unvezioù
 report.trade.unitsSold=Unvezioù prenet pe gwerzhet
 report.turn.filter=Ober a-seurt ne vo ket diskouezet ken an doare kemennoù-se (%type%)
 report.turn.ignore=Ober van eus ar gemenadenn-se (Trevadenn : %colony%, Marc'hadourezh : %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% ar %player%
 aboutPanel.copyright=Copyright © 2002-2014 Skipailh FreeCol
 aboutPanel.legalDisclaimer=FreeCol a zo ur c'hoari digor an tarzh anezhañ : gallout a rit addasparzhañ ha/pe kemmañ anezhañ diwar termenoù diferadennoù ar GNU Aotre-implijout Foran Hollek, evel m'eo embannet gant ar Free Software Foundation en e stumm 2 pe en ur stumm nevesoc'h.
@@ -2726,6 +2770,7 @@ colonyPanel.buildQueue=Lostad sevel
 colonyPanel.colonyUnits=Unvevzioù an Drevadenn
 colonyPanel.inPort=Er porzh
 colonyPanel.outsideColony=E-maez an drevadenn
+# Fuzzy
 colonyPanel.producing=O produiñ :
 colonyPanel.reducePopulation=Ma tigreskit ar boblañs dindan %number%, ne vo ket gouest %colony% da sevel %buildable% ken.
 colonyPanel.setGoods=Hollad madoù
@@ -2741,7 +2786,9 @@ confirmDeclarationDialog.areYouSure.no=Diwezhatoc'hik marteze
 confirmDeclarationDialog.areYouSure.text=Hol leuskit da dreiñ kein da diranterezh direizh %monarch% ha da zisklêriañ hon dizalc'hiezh diouzh ar gurunenn!
 confirmDeclarationDialog.areYouSure.yes=Bezañ dieub pe mervel !
 confirmDeclarationDialog.createFlag=hag hon enebourien da grenañ gant ar spont pa welint hor banniel disuj.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Stadoù Unanet %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% dieub
 confirmDeclarationDialog.enterCountry=Adal bremañ e vo anavezet ho pro evel
 confirmDeclarationDialog.enterNation=ha kement keodedour hor broad klodus a dlefe bezañ lorc'h ennañ da vezañ anavezet evel
@@ -2792,9 +2839,11 @@ negotiationDialog.add=Ouzhpennañ
 negotiationDialog.cancel=Nullañ
 negotiationDialog.clear=Diverkañ
 negotiationDialog.contact.tutorial=Kejañ a rit ouzh Europiz all. Keveziñ a raint ganeoc'h da gaout douaroù ha pinvidigezhioù, ha brezeliñ ouzhoc'h marteze. Kerkent hag anvet Jan a Witt er C'hendalc'h Kevandirel e c'helloc'h ober kenwerzh ganto.
+# Fuzzy
 negotiationDialog.demand=%nation% a c'houlenn groñs digant %otherNation%
 negotiationDialog.exchange=en eskemm ouzh
 negotiationDialog.goldAvailable=(%amount% aour a c'haller kaout)
+# Fuzzy
 negotiationDialog.offer=%nation% a ginnig da %otherNation%
 negotiationDialog.send=Kas
 negotiationDialog.title.contact=Kejañ ouzh Europiz all
@@ -2817,10 +2866,9 @@ findSettlementPanel.displayAll=Kavout ar c'hampadurioù
 findSettlementPanel.displayOnlyEuropean=Kavout ar c'hampadurioù europat hepken
 findSettlementPanel.displayOnlyNatives=Ganet er c'hampadurioù henvroat
 findSettlementPanel.name=Klask ur gêriadenn
+# Fuzzy
 firstContactDialog.meeting.natives=Kejañ ouzh ar pobloù henvroat. . .
 firstContactDialog.meeting.natives.tutorial=Kejañ a rit ouzh henvroidi. Kasit ho sklêrijennerien d'o c'hêriadennoù evit gouzout hiroc'h diwar o fenn,hag ho mevelien kevratet hag ho trevadennerien evit deskiñ traoù diganto. Kasit ho pigi hag ho Trenioù davet o c'hêriadennoù ma fell deoc'h ober kenwerzh ganto.
-firstContactDialog.meeting.AZTEC=Ar vroad Aztek...
-firstContactDialog.meeting.INCA=An impalaeriezh inka. . .
 firstContactDialog.welcomeOffer.text=%nation% ho salud. Broad klodus kamp %camps% %settlementType% emomp-ni. Da lidañ hor mignoniezh e profomp deoc'h an douaroù emaoc'h warno. Hag asantiñ a rit d'hor feur-emglev ? Hag asantiñ a rit chom ganeomp da vevañ e peoc'h evel breudeur?
 firstContactDialog.welcomeSimple.text=%nation% ho salud. Broad klodus kamp %camps% %settlementType% omp-ni. Hag a santiñ a rit d'hor feur-emglev hag asantiñ a rit chom ganeomp da vevañ e peoc'h evel breudeur?
 abandonColony.no=Nullañ
diff --git a/data/strings/FreeColMessages_ca.properties b/data/strings/FreeColMessages_ca.properties
index 8fd96ca20..e79c49461 100644
--- a/data/strings/FreeColMessages_ca.properties
+++ b/data/strings/FreeColMessages_ca.properties
@@ -271,7 +271,6 @@ colopediaAction.goods.name=Mercaderies
 colopediaAction.nations.name=Nacions
 colopediaAction.nationTypes.name=Avantatges Nacionals
 colopediaAction.resources.name=Recursos Addicionals
-colopediaAction.skills.name=Aptituds
 colopediaAction.terrain.name=Tipus de Terreny
 colopediaAction.units.name=Unitats
 colopediaAction.name=%object% (Colopèdia)
@@ -1399,6 +1398,7 @@ model.improvement.road.description=Carretera
 model.improvement.road.name=Carretera
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Límit costaner de la colònia
+# Fuzzy
 model.limit.independence.coastalColonies.description=Com a mínim necessiteu %limit% de colònies costaneres per declarar la independència.
 model.limit.independence.rebels.name=Límit dels Rebels
 model.limit.independence.rebels.description=Com a mínim un %limit%% del vostres colons ha de donar suport a la Independència.
@@ -1733,6 +1733,7 @@ model.colony.badGovernment=El govern de %colony% és ineficient. S'apliquen pena
 model.colony.goodGovernment=L'eficiència del govern ha millorat! El sentiment rebel a %colony% és ara igual o superior a un %number% per cent.
 model.colony.governmentImproved1=El govern de %colony% ha millorat, però encara és ineficient. Les penalitzacions a la producció es mantenen.
 model.colony.governmentImproved2=El govern de %colony% ha millorat. Desapareixen les penalitzacions a la producció.
+# Fuzzy
 model.colony.insufficientProduction=Es podrien produir %outputAmount% %outputType% de més a %colony%, si tinguéssim %inputAmount% unitats de %inputType% de més per torn.
 model.colony.lostVeryGoodGovernment=L'eficiència del govern ha disminuït! El sentiment rebel a %colony% ja no iguala o supera un %number% per cent.
 model.colony.minimumColonySize=%object% impedeix la reducció de la població.
@@ -1746,12 +1747,17 @@ model.colony.veryBadGovernment=El govern de %colony% és molt ineficient. S'apli
 model.colony.veryGoodGovernment=L'eficiència del govern ha millorat! El sentiment rebel a %colony% és ara igual o superior a un %number% per cent.
 model.colonyTile.claim=(reclamar %direction%)
 model.diplomaticTrade.receive.contact=Salutacions fraternal de la gloriosa nació %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Anem a negociar amb els %nation%.
 model.diplomaticTrade.receive.trade=Anem a considerar l'oferta de comerç dels %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=Els %nation% ens demanen impostos!
 model.diplomaticTrade.send.contact=Hem trobat membres de la nació %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Hem de considerar la nostra situació diplomàtica amb els %nation%
+# Fuzzy
 model.diplomaticTrade.send.trade=Proposem-nos comerç amb els %nation% a %settlement%
+# Fuzzy
 model.diplomaticTrade.send.tribute=Exigim un impost als %nation% a %settlement%
 model.direction.N.name=nord
 model.direction.NE.name=nord-est
@@ -1762,23 +1768,35 @@ model.direction.SW.name=sud-oest
 model.direction.W.name=oest
 model.direction.NW.name=nord-oest
 model.historyEventType.abandonColony.description=Abandoneu la colònia de  %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Alto el foc amb %nation%
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation% descobreix %city%, una de les Set Ciutats d'Or, i un tresor de %treasure% peces d'or.
+# Fuzzy
 model.historyEventType.colonyConquered.description=La vostra colònia de %colony% és conquerida per %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=La vostra colònia de %colony% és destruïda per %nation%.
 model.historyEventType.conquerColony.description=Has conquerit la colònia %nation% de %colony%.
 model.historyEventType.declareIndependence.description=Declareu la independència de la Corona.
+# Fuzzy
 model.historyEventType.declareWar.description=Guerra declarada amb %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Els %nation% destrueix els %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Descobriu el Nou Món.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Els %nation% descobreixen %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Aliança negociada amb %nation%
 model.historyEventType.foundColony.description=Establiu la colònia de %colony%.
 model.historyEventType.foundingFather.description=%father% s'uneix al Congrés Continental.
 model.historyEventType.independence.description=He aconseguit la Independència de la Corona.
+# Fuzzy
 model.historyEventType.makePeace.description=Acord de pau amb %nation%
+# Fuzzy
 model.historyEventType.meetNation.description=Has conegut la %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Els %nation% ja no estan presents en el Nou Món.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% cedeix totes les seves colònies en el Nou Món a %nation%.
 model.indianSettlement.mostHatedNone=Cap
 model.indianSettlement.mostHatedUnknown=Desconegut
@@ -1828,8 +1846,10 @@ model.messageType.warehouseCapacity.name=Capacitat del Magatzem
 model.messageType.warning.name=Avisos
 model.monarch.action.addToRef.text=La Corona ha afegit %number% {{plural:%number%|%unit%}} a la Reial Força Expedicionària. Els líders colonials expressen la seva preocupació.
 model.monarch.action.addToRef.no=Fet
+# Fuzzy
 model.monarch.action.declarePeace.text=Amablement hem acordat  un tractat de pau amb els %nation%.
 model.monarch.action.declarePeace.no=Fet
+# Fuzzy
 model.monarch.action.declareWar.text=La insolència dels %nation% ens obliga a declarar-los la guerra!
 model.monarch.action.declareWar.no=Fet
 model.monarch.action.displeasure.text=T'atreveixes a acceptar els nostres generosos terminis i encara vols eludir el pagament? Aquesta duplicitat recollirà l'amarga recompensa de la nostra contrarietat.
@@ -1887,6 +1907,7 @@ model.player.colonialIndependence=Únicament els jugadors colonials poden declar
 model.player.forces=Exèrcit de %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Després de mesos al mar, finalment has arribat a la costa d'un continent desconegut. Navega cap {{tag:%direction%|west=a l'oest|east=a l'est|default=al vent}} per descobrir el Nou Món i reclamar-lo per a la Corona.
+# Fuzzy
 model.player.waitingFor=Esperant a: %nation%
 model.regionType.coast.name=Costa
 model.regionType.coast.unknown=Regió costanera desconeguda
@@ -1926,6 +1947,7 @@ model.tradeItem.gold.name=Or
 model.tradeItem.gold.description=La quantitat de %amount% monedes d'or
 model.tradeItem.goods.name=Mercaderies
 model.tradeItem.incite.name=Declarar la guerra contra
+# Fuzzy
 model.tradeItem.incite.description=guerra amb els %nation%
 model.tradeItem.stance.name=Postura
 model.tradeItem.unit.name=Unitat
@@ -1948,9 +1970,9 @@ model.unit.underRepair=Reparar(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1990,6 +2012,7 @@ model.colony.warehouseOverfull=El vostre magatzem a %colony% no pot guardar més
 model.colony.warehouseSoonFull=El magatzem de %colony% superarà la capacitat per guardar %goods% durant el següent torn. Es perdran %amount% unitats de %goods%.
 model.colony.warehouseWaste=El magatzem de %colony% ha sobrepassat la seva capacitat per guardat %goods%. S'han perdut %waste% unitats.
 model.colonyTile.resourceExhausted=S'ha esgotat el recurs %resource% a %colony%
+# Fuzzy
 model.game.spanishSuccession=Sa Exceŀlència, la Guerra de Successió Española ha acabat a Europa. En el Tractat d'Utrech, els %loserNation% han estat forçats a cedir totes les seves colònies del Nou Món als %nation%.
 model.indianSettlement.mission.denounced=El vostre missioner a %settlement% ha estat denunciat i executat!
 model.indianSettlement.mission.destroyed=El missioner a %settlement%  ha mort en la destrucció del assentament.
@@ -1997,6 +2020,7 @@ model.player.autoRecruit=Disturbis religiosos a %europe% demanda que %unit% emig
 model.player.colonyGoodsParty.harbour=Els vostres colons a %colony% han llançat %amount% unitats de %goods% al port en protesta per aquest impost injust per part de la Corona!
 model.player.colonyGoodsParty.horses=Els seus colons a %colony% han alliberat %amount% cavalls en senyal de protesta per aquest impost injust de la Corona!
 model.player.colonyGoodsParty.landLocked=Els vostres colons a %colony% han cremat %amount% unitats de %goods% a la plaça del mercat per aquest impost injust per part de la Corona!
+# Fuzzy
 model.player.dead.european=Sa Exceŀlència, els %nation% han declarat la seva retirada incondicional dels assumptes del Nou Món!
 model.player.dead.native=Sa Exceŀlència, els %nation% han estat destruïts.
 model.player.disaster.bankruptcy.start=No heu pogut pagar el manteniment de tots els edificis. S'apliquen sancions greus a la producció.
@@ -2008,12 +2032,16 @@ model.player.foundingFatherJoinedCongress=%foundingFather% s'ha unit al Congrés
 model.player.interventionForceArrives=La força d'intervenció promesa ha arribat!
 model.player.soLDecrease=Els membres dels Fills de la Llibertat a les vostres colònies ha disminuït al %newSoL% per cent!
 model.player.soLIncrease=Els membres dels Fills de la Llibertat a les vostres colònies han augmentat al %newSoL% per cent!
+# Fuzzy
 model.player.stance.alliance.declared=Sa Exceŀlència, els %nation% són aliats nostres!
 model.player.stance.alliance.others=Sa Exceŀlència, els %attacker% són aliats dels %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Sa Exceŀlència, els %nation% han acordat un cessament de les hostilitats amb nosaltres!
 model.player.stance.ceaseFire.others=Sa Exceŀlència, els %attacker% han acordat un cessament de les hostilitats amb els %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Sa Exceŀlància, els %nation% estan en pau amb nosaltres!
 model.player.stance.peace.others=Sa Exceŀlència, els %attacker% estan en pau amb els %defender%.
+# Fuzzy
 model.player.stance.war.declared=Males notícies, sa Exceŀlència, els %nation% ens han declarat la guerra!
 model.player.stance.war.others=Sa Exceŀlència, els %attacker% han declarat la guerra als %defender%
 combat.automaticDefence=Vostre %unit% a %colony% ha pres les armes per defensar la colònia!
@@ -2029,6 +2057,7 @@ combat.enemyShipEvaded=%enemyUnit% %enemyNation% aconsegueix escapar a un atac p
 combat.enemyShipSunk=%unit% ha enfonsat %enemyUnit% %enemyNation%!
 combat.equipmentCaptured=Vigileu, els guerrers dels %nation% han aconseguit %equipment%!
 combat.goodsStolen=%enemyUnit% %enemyNation% roba %amount% %goods% a %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyUnit% %enemyNation% saqueja %amount% de %colony%.
 combat.indianRaid=Els nostres espies informen %nation% ha saquejat el %colonyNation% colònia de %colony%.
 combat.indianSurprise=Els %nation% fan una batuda sorpresa a %colony%, alarmant els nostres colons. El cap dels %nation% nega la seva participació.
@@ -2082,6 +2111,7 @@ main.defaultPlayerName=Nom del jugador
 main.javaVersion=Es recomana la versió de Java %minVersion% o superior per poder jugar a FreeCol (s'ha detectat la versió %version%, useu --no-java-check per obviar aquesta verificació).
 main.memory=És necessari assignar més de %memory% bytes de memòria a la JVM. Reinicia FreeCol amb:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol no ha pogut trobar els directoris adequats per desar les dades d'usuari. Continua, però potser hi ha problemes.
+# Fuzzy
 client.choicePlayer=Per favor escolliu un jugador:
 client.classic=No s'ha pogut carregar l'assignació de recursos del conjunt de regles 'clàssic'.
 client.debugConnect=No podeu connectar a un joc existent en mode de depuració.
@@ -2094,8 +2124,10 @@ metaServer.couldNotConnect=Disculpeu, no es pot connectar el meta-servidor. Prov
 metaServer.communicationError=Hi ha hagut un error en comunicar amb el meta-servidor. Torneu-ho a provar més tard.
 abandonEducation.action.studying=estudiant
 abandonEducation.action.teaching=ensenyant
+# Fuzzy
 abandonEducation.no=No, continuar l'educació
 abandonEducation.text=Si el teu %unit% marxa de %colony% abandonarà %action% en el %building%, esteu segurs que ha de marxar?
+# Fuzzy
 abandonEducation.yes=Sí, deixar la colònia
 abandonTeaching.text=Si el teu %unit% deixa el %building%, pararà l'ensenyament, esteu segurs que ha de marxar?
 armedUnitSettlement.attack=Atacar
@@ -2107,9 +2139,13 @@ buy.takeOffer=Accepta la oferta
 buy.text=Els %nation% us voldrien vendre %goods% per %gold%:
 clearTradeRoute.text=Vostre %unit% és assignada a la ruta de comerç %route%. Si establiu la seva destinació farà que surti d'aquesta ruta. Esteu segur de voler fer-ho?
 client.fullScreen=El mode de pantalla complerta no està suportat per aquest dispositiu gràfic.\nTornant al mode de finestra.
+# Fuzzy
 confirmHostile.alliance=No podeu atacar una nació aliada! De debò voleu trencar la nostra aliança amb els %nation% i declarar la guerra?
+# Fuzzy
 confirmHostile.ceaseFire=Vós heu signat un alto el foc amb %nation%. De debò voleu atacar-los?
+# Fuzzy
 confirmHostile.peace=Estem en pau amb els %nation%. De debò voleu declarar la guerra?
+# Fuzzy
 confirmTribute.broke=Els nostres espies informen que els %nation% estan totalment escurats. No cal perdre el temps exigent tributs.
 confirmTribute.european=Els %nation% %danger%, i %finance%. Quina quantitat de tributs els hem d'exigir?
 confirmTribute.happy=Els %nation% a %settlement% són bons amics, seria una llàstima estroncar la nostra amistat.
@@ -2171,7 +2207,9 @@ defeated.text=Heu estat derrotat! Què voldríeu:
 defeated.yes=Ens Quedem i Mirem
 defeatedSinglePlayer.text=L'han derrotat!\n\nAra és el moment de les bruixes de la nit, quan els cementiris badallen i el mateix infern contagia aquest món, ara podria beure sang calenta! i realitzaria actes tant amargs, que el mateix dia tremolaria de veure'ls.
 defeatedSinglePlayer.yes=Iniciar Mode de Revenja
+# Fuzzy
 diplomacy.offerAccepted=Els %nation% han acceptat la vostra generosa oferta.
+# Fuzzy
 diplomacy.offerRejected=Els %nation% han refusat la vostra generosa oferta.
 disbandUnit.text=Esteu segur que voleu dissoldre aquesta unitat ?
 disbandUnit.yes=Dissol
@@ -2217,7 +2255,9 @@ move.noAccessGoods=Els %nation%  no comerciaran amb %unit%s sense càrrega.
 move.noAccessMissionBan=Els %nation% rebutgen tot contacte amb els teus missioners.
 move.noAccessSettlement=Els %nation% no permet que nostre %unit% entri al seu assentament.
 move.noAccessSkill=Nostre %unit% no pot aprendre dels indígenes.
+# Fuzzy
 move.noAccessTrade=No tenim l'autoritat necessària per comerciar amb altres nacions Europees com els %nation%.
+# Fuzzy
 move.noAccessWar=No podem comerciar amb els %nation% mentre hi estiguem en guerra.
 move.noAccessWater=Nostre %unit% ha de desembarcar abans d'entrar a l'assentament.
 move.noAttackWater=Nostra %unit% ha de desembarcar abans d'atacar.
@@ -2279,6 +2319,7 @@ server.timeOut=El temps d'espera per connectar-se al servidor s'ha exhaurit.
 server.userNameInUse=El nom d'usuari especificat ja està en ús.
 server.userNameNotPresent=El nom d'usuari especificat no està en aquest joc.
 server.wrongFreeColVersion=Les versions de client i de servidor de FreeCol no coincideixen.
+# Fuzzy
 buildColony.others=Els %nation% han fundat una nova colònia de %colony% a %region%.
 cashInTreasureTrain.colonial=Un tresor amb %amount% peces d'or ha desembarcat a Europa. Es troben disponibles %cashInAmount% peces d'or més.
 cashInTreasureTrain.independent=Un tresor de %amount% ha estat afegit al tresor nacional.
@@ -2378,6 +2419,7 @@ colopedia.unit.offensivePower=Potència Ofensiva:
 colopedia.unit.price=Preu a Europa:
 colopedia.unit.productionBonus={{plural:%number%|one=modificador|other=modificadors}} de producció:
 colopedia.unit.requirements=Requeriments
+# Fuzzy
 colopedia.unit.school=Centre requerit per ensenyar:
 colopedia.unit.skill=Nivell d'habilitat:
 report.labour.allColonists=Tots els Colons
@@ -2412,8 +2454,8 @@ report.colony.grow.header=+
 report.colony.growing.description=%colony% pot créixer en {{plural:%amount%|one=una unitat|altres=%amount% unitats}} sense danyar la producció
 report.colony.improve.description=Unitats que podrien millorar la producció.
 report.colony.improve.header=Millora
+# Fuzzy
 report.colony.improving.description=%colony%: Per fer %amount% %goods% més, substituïu %oldUnit% per %unit%
-report.colony.wanting.description=%colony%: per fer %amount% %goods%més, afegiu %unit%
 report.colony.making.blocking.description=%colony%: es necessitaran %amount% %goods% per %buildable% {{plural:%turns%|one=el proper torn|other=en %turns% torns}}
 report.colony.making.constructing.description=%colony%: %buildable% es completa {{plural:%turns%|one=en un torn|other=en %turns% torns}}
 report.colony.making.description=Què està fent aquesta colònia
@@ -2423,20 +2465,21 @@ report.colony.making.noconstruction.description=%colony% : Actualment no s'està
 report.colony.making.noteach.description=%colony%: %teacher% no té estudiants
 report.colony.name.description=La llista de colònies
 report.colony.name.header=Colònia
-report.colony.plow.description=Nombre de caselles de la Colònia que es beneficiarien al ser llaurades
-report.colony.plow.header=L
-report.colony.plowing.description=%colony% es beneficiaria de llaurar {{plural:%amount%|one=una casella|other=%amount% caselles}}
+# Fuzzy
 report.colony.production.description=%colony%: producció neta de %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: producció neta de %goods% is %amount% (exportant %export%)
 report.colony.production.header=Producció neta de %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: producció neta de %goods% = %amount%, complet {{plural:%turns%|one=en un torn|other=en %turns% torns}}
+# Fuzzy
 report.colony.production.low.description=%colony%: producció neta de %goods% = %amount%, desapareix {{plural:%turns%|one=en un torn|other=en %turns% torns}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: producció neta de %goods% = %amount%, el magatzem es desbordarà,  {{plural:%waste%|one=1 és malgastarà|other=es malgastaran %waste%}}
-report.colony.road.description=Nombre de caselles de la Colònia que es beneficiarien de construir una carretera.
-report.colony.road.header=C
-report.colony.roadBuilding.description=%colony% es beneficiaria de construir {{plural:%amount%|one=una caretera|other=%amount% carreteres}}
 report.colony.shrinking.description=%colony% s'ha de reduir en {{plural:%amount%|one=una unitat|other=%amount% unitats}} per millorar la producció
 report.colony.starving.description=%colony%: inanició {{plural:%turns%|one=en un torn|other=en %turns% torns}}
+# Fuzzy
+report.colony.wanting.description=%colony%: per fer %amount% %goods%més, afegiu %unit%
 report.continentalCongress.available=Disponible
 report.continentalCongress.elected=Elegit: %turn%
 report.continentalCongress.none=(cap)
@@ -2480,26 +2523,25 @@ report.production.selectGoods=Seleccionar les mercaderies
 report.production.update=Actualitza
 report.requirements.badAssignment=%colony% compta amb un %expert% que actualment treballa com a %expertWork%, mentre que un %nonExpert% està treballant de %nonExpertWork%. La producció seria major si els colons intercanviessin els llocs de treball.
 report.requirements.canTrainExperts={{plural:2|%unit%}} es pot educar a
-report.requirements.clearTile=%type% al %direction% de %colony% es beneficiaria d'una desforestació
+# Fuzzy
 report.requirements.exploreTile=%type% al %direction% de %colony% mereixerien una exploració.
 report.requirements.met=Es compleixen tots els requisits.
 report.requirements.missingGoods=%colony% està produint %goods%, però requereix més %input%.
 report.requirements.misusedExperts=Actualment hi ha {{plural:2|%unit%}} no treballant com a %work% a
 report.requirements.noExpert=%colony% està produint %goods%, però no té %unit%.
-report.requirements.plowCenter=%colony% es beneficiaria de llaurar la seva casella.
-report.requirements.plowTile=%type% al %direction% de %colony% es beneficiaria de ser llaurada.
-report.requirements.roadTile=%type% al %direction% de %colony% es beneficiaria de construir una carretera.
 report.requirements.severalExperts=Diversos {{plural:2|%unit%}} estan presents a
 report.requirements.surplus=Un excés de %goods% s'està produint a
 report.trade.afterTaxes=Benefici després d'impostos
 report.trade.beforeTaxes=Beneficis abans d'impostos
 report.trade.cargoUnits=Unitats Transportades
+# Fuzzy
 report.trade.hasCustomHouse=* Aquesta colònia té una duana; aquestes mercaderies s'han exportat
 report.trade.totalDelta=Producció Total
 report.trade.totalUnits=Unitats Totals
 report.trade.unitsSold=Unitats comprades o venudes
 report.turn.filter=No mostris aquest tipus de missatge ( %type% )
 report.turn.ignore=Ignora aquest missatge (Colònia: %colony%, Mercaderies: %goods%)
+# Fuzzy
 report.turn.playerNation=Els %nation% de %player%
 aboutPanel.copyright=© 2002–2015 de l’equip del FreeCol
 aboutPanel.legalDisclaimer=FreeCol és programari lliure: podeu redistribuir i/o modificar-lo sota els termes de la Llicència Pública General GNU publicada per la Free Software Foundation, versió 2 de la Llicència, o qualsevol versió posterior.
@@ -2524,6 +2566,7 @@ chooseFoundingFatherDialog.title=Nomineu un Pare de la Pàtria
 colonyPanel.colonyUnits=Unitats de colònia
 colonyPanel.inPort=Al port
 colonyPanel.outsideColony=Les afores de la colònia
+# Fuzzy
 colonyPanel.producing=Produint:
 colonyPanel.reducePopulation=Si reduïu la població per sota de %number%, %colony% ja no serà capaç de construir %buildable%.
 colonyPanel.traceWork=Rastre de treball
@@ -2538,7 +2581,9 @@ confirmDeclarationDialog.areYouSure.no=Potser més endavant
 confirmDeclarationDialog.areYouSure.text=Renunciem a la injusta tirania de %monarch% i declarem la independència de les nostres colònies de la corona!
 confirmDeclarationDialog.areYouSure.yes=Llibertat o Mort!
 confirmDeclarationDialog.createFlag=i els nostres enemics tremolaran a la vista del nostre pendó desafiant.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Estats Units de %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% lliure
 confirmDeclarationDialog.enterCountry=D'ara endavant, el nostre país es coneixerà com
 confirmDeclarationDialog.enterNation=i cada ciutadè de la nostra gloriosa nació ha d'estar orgullós de ser conegut com
@@ -2590,8 +2635,10 @@ negotiationDialog.add=Afegeix
 negotiationDialog.cancel=Canceŀla
 negotiationDialog.clear=Neteja
 negotiationDialog.contact.tutorial=Trobada amb els Europeus. Competiran amb nosaltres per la terra i les riqueses, inclús lluitant contra nosaltres. Però després d'incorporar a Jan de Witt al Congrés Continental, podrem comerciar amb ells.
+# Fuzzy
 negotiationDialog.demand=Els %nation% requereixen de la %otherNation%
 negotiationDialog.exchange=a canvi de
+# Fuzzy
 negotiationDialog.offer=Els %nation% ofereixen la %otherNation%
 negotiationDialog.send=Envia
 negotiationDialog.title.contact=Reunió companys Europeus
@@ -2614,10 +2661,9 @@ findSettlementPanel.displayAll=Trobar tots els assentaments
 findSettlementPanel.displayOnlyEuropean=Trobar només assentaments europeus
 findSettlementPanel.displayOnlyNatives=Trobar només assentaments nadius
 findSettlementPanel.name=Trobar un assentament
+# Fuzzy
 firstContactDialog.meeting.natives=Trobada amb els nadius...
 firstContactDialog.meeting.natives.tutorial=Coneixeràs als nadius. Envieu els vostres exploradors als seus assentaments per aprendre més sobre ells, i als servents contractats i colons lliures per aprendre d'ells. Envieu els vostres vaixells i caravanes als seus assentaments si voleu comerciar amb ells.
-firstContactDialog.meeting.AZTEC=La nació asteca...
-firstContactDialog.meeting.INCA=L’imperi inca...
 firstContactDialog.welcomeOffer.text=%nation% et dóna la benvinguda. Som una gloriosa nació amb %camps% %settlementType%. Per celebrar la nostra amistat, t'oferim generosament la terra que ocupes com a present actualment. Acceptes el nostre tracte i la nostra pau fraternal?
 firstContactDialog.welcomeSimple.text=Els %nation% us donem la benvinguda. Som una nació gloriosa de %camps% %settlementType%. Accepteu el nostre tracte i la nostra pau fraternal?
 abandonColony.no=Canceŀla
diff --git a/data/strings/FreeColMessages_cs_CZ.properties b/data/strings/FreeColMessages_cs_CZ.properties
index 60c4b280c..07c89348a 100644
--- a/data/strings/FreeColMessages_cs_CZ.properties
+++ b/data/strings/FreeColMessages_cs_CZ.properties
@@ -275,7 +275,6 @@ colopediaAction.goods.name=Zboží
 colopediaAction.nations.name=Národy
 colopediaAction.nationTypes.name=Národní výhody
 colopediaAction.resources.name=Bonusové zdroje
-colopediaAction.skills.name=Dovednosti
 colopediaAction.terrain.name=Typy terénu
 colopediaAction.units.name=Jednotky
 colopediaAction.name=%object% (Colopedie)
@@ -1568,6 +1567,7 @@ model.improvement.road.description=Cesta
 model.improvement.road.name=Cesta
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limit pobřežní kolonie
+# Fuzzy
 model.limit.independence.coastalColonies.description=Pro vyhlášení nezávislosti potřebuješ aspoň %limit% pobřežních kolonií.
 model.limit.independence.rebels.name=Limit Rebelů
 model.limit.independence.rebels.description=Aspoň %limit%% tvých kolonistů musí podporovat nezávislost.
@@ -1916,6 +1916,7 @@ model.colony.badGovernment=Vláda kolonie %colony% je neefektivní. Produkce byl
 model.colony.goodGovernment=Efektivita vlády se zvýšila! V %colony% se nyní sympatie k Rebelům rovnají nebo překračují %number% procent.
 model.colony.governmentImproved1=Vláda kolonie %colony% se zlepšila, ale je stále neefektivní. Penalizace produkce stále platí.
 model.colony.governmentImproved2=Vláda kolonie %colony% se zlepšila. Penalizace produkce byly zrušeny.
+# Fuzzy
 model.colony.insufficientProduction=V %colony% by mohla být produkce %outputType% vyšší o %outputAmount% kusů, pokud by tam bylo o %inputAmount% %inputType% více.
 model.colony.lostGoodGovernment=Efektivita vlády se snížila! V %colony% se sympatie k Rebelům již nerovnají či nepřekračují %number% procent. Kolonie tedy již nezískává žádné produkční bonusy.
 model.colony.lostVeryGoodGovernment=Efektivita vlády se snížila! V %colony% se sympatie k Rebelům již nerovnají či nepřekračují %number% procent. Některé produkční bonusy byly ztraceny.
@@ -1930,12 +1931,17 @@ model.colony.veryBadGovernment=Vláda kolonie %colony% je velmi neefektivní. Pr
 model.colony.veryGoodGovernment=Efektivita vlády se zvýšila! V %colony% se nyní sympatie k Rebelům rovnají nebo překračují %number% procent.
 model.colonyTile.claim=(požadavek %direction%)
 model.diplomaticTrade.receive.contact=Přátelské pozdravy od slavného %nation% národu.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Pojďme vyjednávat s %nation%.
 model.diplomaticTrade.receive.trade=Nechte nás zvážit %nation% obchodní nabídku.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=%nation% po nás požadují tribut!
 model.diplomaticTrade.send.contact=Setkali jsme se s členy %nation% národa.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Zvažme naši diplomatickou situaci s %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Dovolte nám navrhnout obchod s %nation% v %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Požadujeme tribut od %nation% z %settlement%.
 model.direction.N.name=sever
 model.direction.NE.name=severovýchod
@@ -1946,24 +1952,37 @@ model.direction.SW.name=jihozápad
 model.direction.W.name=západ
 model.direction.NW.name=severozápad
 model.historyEventType.abandonColony.description=Opustil jsi kolonii %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Zastavit palbu proti %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation% objevili %city%, jedno ze sedmi Zlatých měst a poklad v hodnotě %treasure% zlata.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Tvoji kolonii %colony% dobyli %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Tvoji kolonii %colony% zničili %nation%.
 model.historyEventType.conquerColony.description=Dobil jsi od %nation% kolonii %colony%.
 model.historyEventType.declareIndependence.description=Vyhlásil jsi nezávislost na Koruně.
+# Fuzzy
 model.historyEventType.declareWar.description=Vyhlášena válka s %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% zničili %nativeNation%.
+# Fuzzy
 model.historyEventType.destroySettlement.description=Znič %nation% osadu %settlement%.
 model.historyEventType.discoverNewWorld.description=Objevil jsi Nový svět.
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation% objevili %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Uzavřena aliance s %nation%.
 model.historyEventType.foundColony.description=Založil jsi kolonii %colony%.
 model.historyEventType.foundingFather.description=Ke kontinentálnímu kongresu se připojil %father%.
 model.historyEventType.independence.description=Dosáhl jsi nezávislosti na Koruně.
+# Fuzzy
 model.historyEventType.makePeace.description=Uzavřena mírová dohoda s %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Potkal jsi %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=V Novém Světě Již nejsou žádní %nation%.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Národ %loserNation% podstoupil všechny své kolonie v Novém světě národu %nation%.
 model.indianSettlement.mostHatedNone=Nic
 model.indianSettlement.mostHatedUnknown=Neznámo
@@ -2017,9 +2036,12 @@ model.messageType.warehouseCapacity.name=Kapacita skladiště
 model.messageType.warning.name=Varování
 model.monarch.action.addToRef.text=Koruna přidala %number% {{plural:%number%|%unit%}} ke Královským expedičním silám. Koloniální vůdci vyjadřují znepokojení.
 model.monarch.action.addToRef.no=Hotovo
+# Fuzzy
 model.monarch.action.declarePeace.text=Laskavě jsme souhlasili s uzavřením mírové smlouvy s %nation%.
 model.monarch.action.declarePeace.no=Hotovo
+# Fuzzy
 model.monarch.action.declareWar.text=%nation% nestoudnost nás nutí, abychom jim vyhlásili válku!
+# Fuzzy
 model.monarch.action.declareWarSupported.text=%nation% drzost Nás nutí vyhlásit jim válku!  Pro urychlení této věci, naši loajální vojáci (%force%) očekávají tvoje rozkazy a také suma %gold% zlata byla přidána do tvého pokladu.
 model.monarch.action.declareWar.no=Hotovo
 model.monarch.action.displeasure.text=Jak se opovažuješ akceptovat Naše velkorysé podmínky a pak se vyhýbat placení? Takové pokrytectví sklidí trpké ovoce Naší nelibosti.
@@ -2079,6 +2101,7 @@ model.player.colonialIndependence=Pouze koloniální hráči mohou vyhlásit nez
 model.player.forces=%nation% síly
 model.player.independentMarket=Evropa
 model.player.startGame=Po měsících na moři jsi konečně doplul k pobřeží neznámého kontinentu. Pluj {{tag:%direction%|west=na západ|east=na východ|default=proti větru}}, abys objevil Nový svět a nárokoval ho Koruně.
+# Fuzzy
 model.player.waitingFor=Čekání na: %nation%
 model.regionType.coast.name=Pobřeží
 model.regionType.coast.unknown=Neznámý pobřežní region
@@ -2119,6 +2142,7 @@ model.tradeItem.gold.name=Zlato
 model.tradeItem.gold.description=sumu %amount% zlata
 model.tradeItem.goods.name=Zboží
 model.tradeItem.incite.name=Vyhlásit válku proti
+# Fuzzy
 model.tradeItem.incite.description=válka proti %nation%
 model.tradeItem.stance.name=Stav
 model.tradeItem.unit.name=Jednotka
@@ -2141,9 +2165,9 @@ model.unit.underRepair=Oprava(%turns% {{plural:%turns%|one=tah|other=tahů|defau
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -2184,6 +2208,7 @@ model.colony.warehouseSoonFull=Tvoje skladiště v %colony% během příštího
 model.colony.warehouseWaste=Tvoje skladiště v %colony% přesáhlo pro %goods% svoji maximální kapacitu. %waste% jednotek bylo ztraceno.
 model.colony.workersEvicted=Tvůj kolonista v %colony% nemůže kvůli přítomnosti %enemyUnit% nadále pracovat na %location%.
 model.colonyTile.resourceExhausted=Zdroj %resource% byl v kolonii %colony% vyčerpán
+# Fuzzy
 model.game.spanishSuccession=Vaše Excelence, válka v Evropě o španělské následnictví skončila. Podle Utrechtské smlouvy byl národ %loserNation% přinucen podstoupit všechny své kolonie v Novém světě národu %nation%!
 model.indianSettlement.mission.denounced=Tvůj misionář v %settlement% byl odsouzen a popraven!
 model.indianSettlement.mission.destroyed=Tvůj misionář v %settlement% zahynul při zničení osady.
@@ -2193,6 +2218,7 @@ model.player.autoRecruit=Náboženské nepokoje v  %europe%  vyzívají  %unit%
 model.player.colonyGoodsParty.harbour=Tvoji kolonisté v %colony% hodily do moře %amount% jednotek %goods%, na protest proti nespravedlivým daním od Krále!
 model.player.colonyGoodsParty.horses=Vaši kolonisté v %colony% pustili na svobodu %amount% koní, jako protest proti nespravedlivému zdanění Korunou.
 model.player.colonyGoodsParty.landLocked=Tvoji kolonisté v %colony% spálili na tržišti %amount% jednotek %goods%, na protest proti nespravedlivým daním od Krále!
+# Fuzzy
 model.player.dead.european=Vaše Excelence, %nation% vyhlásil bezpodmínečné stažená ze záležitostí Nového světa!
 model.player.dead.native=Vaše Excelence, %nation% byli zničeni.
 model.player.disaster.bankruptcy.start=Selhal jste v platbě za údržbu všech vašich budov. Jsou použity sankce na výrobu.
@@ -2206,12 +2232,16 @@ model.player.ignoredTax=Koruna zvýšila daňovou sazbu na %amount%%, jak bylo d
 model.player.interventionForceArrives=Dorazily slíbené intervenční síly!
 model.player.soLDecrease=Počet Synů svobody ve tvých koloniích klesl na %newSoL% procent!
 model.player.soLIncrease=Počet Synů svobody ve tvých koloniích vzrostl na %newSoL% procent!
+# Fuzzy
 model.player.stance.alliance.declared=Vaše excelence, %nation% jsou s námi v alianci!
 model.player.stance.alliance.others=Vaše excelence, %attacker% jsou v alianci s %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Vaše excelence, %nation% se s námi dohodli o zastavení palby!
 model.player.stance.ceaseFire.others=Vaše excelence, %attacker% se s %defender% dohodli o zastavení palby.
+# Fuzzy
 model.player.stance.peace.declared=Vaše excelence, mezi %nation% a námi je mír!
 model.player.stance.peace.others=Vaše excelence, mezi %attacker% a %defender% je mír.
+# Fuzzy
 model.player.stance.war.declared=Špatné zprávy, vaše Excelence, %nation% nám vyhlásili válku!
 model.player.stance.war.others=Vaše Excelence, %attacker% vyhlásili válku proti %defender%.
 combat.automaticDefence=Tvá jednotka %unit% v %colony% pozvedla zbraně pro obranu kolonie!
@@ -2227,6 +2257,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% se vyhnula útoku jednotky %uni
 combat.enemyShipSunk=%unit% potopila %enemyNation% %enemyUnit%!
 combat.equipmentCaptured=Pozor, %nation% divoši získali %equipment%!
 combat.goodsStolen=%enemyNation% %enemyUnit% ukradl v kolonii %colony% %amount% kusů %goods%!
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% z kolonie %colony% vydrancoval %amount% zlata.
 combat.indianRaid=Naši špioni hlásí, že %nation% přepadli kolonii %colony%, která patří %colonyNation%.
 combat.indianSurprise=%nation% provedli překvapivý nájezd na %colony%, což znepokojilo naše kolonisty. %nation% náčelník odmítá zodpovědnost.
@@ -2282,6 +2313,7 @@ main.javaVersion=Pro spuštění FreeCol je doporučena Java verze %minVersion%
 main.memory=Pro JVM je nutné přiřadit více než %memory% bajtů paměti.\nRestartujte FreeCol s parametry: java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol nemůže najít vhodný adresář pro uložení uživatelských dat.  Pokračuji, ale lze čekat problémy.
 client.baseData=Nelze nalézt adresář %dir% pro základní data.\n  FreeCol nemůže nalézt datové soubory.\n  Prosím zkontrolujte, zda jsou přítomny.\n  Pokud FreeCol hledá ve špatném adresáři,\n  spusťte hru s parametrem:\n  --freecol-data <data-directory>
+# Fuzzy
 client.choicePlayer=Prosím zvol hráče:
 client.classic=Nepodařilo se načíst mapování zdrojů z "klasické" sady pravidel.
 client.debugConnect=V režimu ladění se nelze připojit k existující hře.
@@ -2294,8 +2326,10 @@ metaServer.couldNotConnect=Omlouvám se, nemohu se připojit k meta-serveru. Pro
 metaServer.communicationError=Při komunikaci s meta-serverem se vyskytla chyba. Prosím, zkuste to znovu později.
 abandonEducation.action.studying=studuje
 abandonEducation.action.teaching=učí
+# Fuzzy
 abandonEducation.no=Ne, pokračovat ve výuce.
 abandonEducation.text=Pokud %unit% odejde z %colony%, pak opustí %action% v %building%. Určitě má odejít?
+# Fuzzy
 abandonEducation.yes=Ano, opustit kolonii
 abandonTeaching.text=Pokud tvůj %unit% opustí %building%, tak ukončí výuku. Jsi si jistý, že má odejít?
 armedUnitSettlement.attack=Útok
@@ -2307,10 +2341,14 @@ buy.takeOffer=Souhlasit s nabídkou
 buy.text=%nation% by rádi prodali %goods% za %gold%:
 clearTradeRoute.text=Váš %unit% je přiřazen na obchodní trasu %route%. Nastavení této destinace jej stáhne z obchodní trasy. Opravdu si to přejete udělat?
 client.fullScreen=Toto Grafické zařízení nepodporuje režim celé obrazovky.\nVracím se do režimu zobrazení v okně.
+# Fuzzy
 confirmHostile.alliance=Nemůžete útočit na spojenecký národ! Opravdu si přejete zrušit naši alianci s %nation% a vyhlásit jim válku?
+# Fuzzy
 confirmHostile.ceaseFire=S %nation% bylo podepsáno příměří. Opravdu si přejete zaútočit?
+# Fuzzy
 confirmHostile.peace=Nyní s %nation% žijeme v míru. Opravdu si přejete vyhlásit válku?
 confirmHostile.yes=Ano, vypusťte psy války!
+# Fuzzy
 confirmTribute.broke=Naši špioni hlásí, že %nation% jsou naprosto na mizině. Neztrácejme čas požadavkem tributu.
 confirmTribute.european=%nation% %danger% a %finance%. Jak velký tribute od nich máme požadovat?
 confirmTribute.happy=%nation% ze %settlement% jsou naši dobří přátelé, byla by škoda poškodit naše vztahy.
@@ -2330,6 +2368,7 @@ indianLand.cancel=Opustit pozemek.
 indianLand.pay=Nabídnout %amount% zlata za pozemek
 indianLand.take=Vzít si, co nám právem patří
 indianLand.text=Tato země je vlastněna %player%. Přeješ si:
+# Fuzzy
 indianLand.unknown=V těchto zemích žijí neznámí lidé. Přejete si:
 info.autodetectLanguageSelected=Zvolena autodetekce jazyka. Autodetekce se provede při dalším restartu hry.
 info.enterSomeText=Prosím, zadej nějaký text.
@@ -2375,7 +2414,9 @@ defeated.text=Byl jsi poražen! Přeješ si:
 defeated.yes=Zůstat a sledovat
 defeatedSinglePlayer.text=Byl jsi poražen!\n\nUž je tu čarodějný noční čas, kdy z hrobů zívajících stoupá pach pekelné nákazy. Krev bych moh pít a dělat jiná zvěrstva, na něž by se den třás pomyslit.
 defeatedSinglePlayer.yes=Zahájit pomstu
+# Fuzzy
 diplomacy.offerAccepted=%nation% přijímají tvou štědrou nabídku.
+# Fuzzy
 diplomacy.offerRejected=%nation% odmítají tvou štědrou nabídku.
 disbandUnit.text=Jsi si jistý, že chceš tuto jednotku rozpustit?
 disbandUnit.yes=Rozpustit
@@ -2421,7 +2462,9 @@ move.noAccessGoods=%nation% nebudou obchodovat s prázdným %unit%.
 move.noAccessMissionBan=%nation% odmítají jakýkoliv kontakt s tvými misionáři.
 move.noAccessSettlement=%nation% nepovolili našemu %unit% vstoupit do jejich osady.
 move.noAccessSkill=Náš %unit% se nemůže učit od domorodců.
+# Fuzzy
 move.noAccessTrade=Nemáme oprávnění obchodovat s ostatními evropskými národy jako jsou %nation%.
+# Fuzzy
 move.noAccessWar=Nemůžeme obchodovat s %nation%, dokud jsme ve válce.
 move.noAccessWater=Náš %unit% se musí vylodit, než vstoupí do osady.
 move.noAttackWater=%unit% se musí před útokem vylodit.
@@ -2487,6 +2530,7 @@ server.timeOut=Při připojování k serveru došlo k Timeoutu.
 server.userNameInUse=Zadané uživatelské jméno již existuje.
 server.userNameNotPresent=Zadané uživatelské jméno v této hře neexistuje.
 server.wrongFreeColVersion=Verze FreeCol klienta a serveru nesouhlasí.
+# Fuzzy
 buildColony.others=%nation% založili v %region% novou kolonii %colony%.
 cashInTreasureTrain.colonial=Poklad v hodnotě %amount% zlata přistál v Evropě. Bylo inkasováno %cashInAmount% zlata.
 cashInTreasureTrain.independent=Poklad v hodnotě %amount% byl přidán do národní pokladnice.
@@ -2496,6 +2540,7 @@ declareIndependence.announce=Kolonie %oldNation% vyhlásily nezávislost na %rul
 declareIndependence.continentalArmyMuster=Na podporu vašeho vyhlášení nezávislosti %number% {{plural:%number%|%oldUnit%}} v %colony% {{plural:%number%|one=byl povýšen|other=bylo povýšeno}} na {{plural:%number%|%unit%}}!
 declareIndependence.interventionForce={{tag:country|%nation%}} slavnostně slibují vyslat Intervenční síly pro podporu vašeho legitimního boje za nezávislost, pokud vytvoříte %number% {{plural:%number%|one=Zvon|other=Zvonůl}} Svobody, jako důkaz svého odhodlání.
 declareIndependence.nativeSupport=%nation% prohlásili, že opovrhují %ruler% a Královskými expedičními silami a slíbili, že je při každé příležitosti napadnou.
+# Fuzzy
 declareIndependence.nativeHostile=Naši špioni hlásí, že Královské expediční síly ustavili s %nation% přátelský svazek.  Mějme se na pozoru před jejich útokem!
 declareIndependence.resolution=Dnes kongresem prošla nejdůležitější rezoluce, která kdy byla v Americe vydána.\n\nDobře si uvědomuji dřinu, krev a bohatství, které nás bude stát udržení této deklarace a podpora a obrana těchto států. Avšak přes všechnu tu temnotu vidím paprsky úchvatného světla a slávy. Vidím, že konec je důležitější než cena. A že naši potomci budou v tento den slavit triumf, i když my toho můžeme litovat, ačkoliv věřím, že nebudeme.\n\nKrálovské expediční síly zde budou brzy. Pečlivě připravte naši obranu, zatímco my získáme dobrovolníky pro naši novou Kontinentální armádu.
 declareIndependence.unitsSeized=V reakci na tvoje vyhlášení nezávislosti ti koruna v Evropě a na moři zajala následující jednotky : %units%
@@ -2594,6 +2639,7 @@ colopedia.unit.offensivePower=Útočná síla:
 colopedia.unit.price=Cena v Evropě:
 colopedia.unit.productionBonus={{plural:%number%|one=Modifikátor|other=Modifikátory}} produkce:
 colopedia.unit.requirements=Požadavky:
+# Fuzzy
 colopedia.unit.school=Škola nutná pro vyškolení:
 colopedia.unit.skill=Dovednost:
 report.labour.allColonists=Všichni kolonisté
@@ -2628,8 +2674,8 @@ report.colony.grow.header=+
 report.colony.growing.description=%colony% může vyrůst o {{plural:%amount%|one=jednu jednotku|other=%amount% jednotek}} bez penalizace produkce
 report.colony.improve.description=Jednotky, které mohou zlepšit produkci.
 report.colony.improve.header=Vylepšit
+# Fuzzy
 report.colony.improving.description=%colony%: K vytvoření o %amount% více %goods% nahraď %oldUnit% za %unit%
-report.colony.wanting.description=%colony%: K získání o %amount% více %goods% přidej %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% nutných pro %buildable% bude k dispozici {{plural:%turns%|one=příští tah|other=za %turns% tahů}}
 report.colony.making.constructing.description=%colony%: %buildable% dokončena {{plural:%turns%|one=příští tah|other=za %turns% tahů}}
 report.colony.making.description=Co kolonie staví
@@ -2639,20 +2685,21 @@ report.colony.making.noconstruction.description=%colony%: Nic se nestaví
 report.colony.making.noteach.description=%colony%: %teacher% nemá koho učit
 report.colony.name.description=Seznam kolonií
 report.colony.name.header=Kolonie
-report.colony.plow.description=Počet čtverců kolonie, které by mohly mít prospěch z polí.
-report.colony.plow.header=P
-report.colony.plowing.description=Kolonie %colony% by mohla mít prospěch ze zorání {{plural:%amount%|one=jednoho čtverce|other=%amount% čtverců}}
+# Fuzzy
 report.colony.production.description=%colony%: čistá produkce %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: čistá produkce %goods% je %amount% (exportovat nad %export%)
 report.colony.production.header=Čistá produkce %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: čistá produkce %goods% = %amount%, dosáhne maxima {{plural:%turns%|one=příští tah|other=za %turns% tahů}}
+# Fuzzy
 report.colony.production.low.description=%colony%: čistá produkce %goods% = %amount%, bude vyčerpáno {{plural:%turns%|one=příští tah|other=za %turns% tahů}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: čistá produkce %goods% = %amount%, kapacita skladiště bude překročena a %waste% %goods% bude ztraceno
-report.colony.road.description=Počet čtverců kolonie, které by mohly mít prospěch z postavení cest
-report.colony.road.header=R
-report.colony.roadBuilding.description=Kolonie %colony% by mohla mít prospěch z vybudování {{plural:%amount%|one=cesty|other=%amount% cest}}
 report.colony.shrinking.description=Pro zlepšení produkce se musí %colony% zmenšit o {{plural:%amount%|one=jednu jednotku|other=%amount% jednotek}}
 report.colony.starving.description=%colony%: hladovění {{plural:%turns%|one=příští tah|other=za %turns% tahů}}
+# Fuzzy
+report.colony.wanting.description=%colony%: K získání o %amount% více %goods% přidej %unit%
 report.continentalCongress.available=Dostupný
 report.continentalCongress.elected=Zvolen: %turn%
 report.continentalCongress.none=(nic)
@@ -2696,26 +2743,25 @@ report.production.selectGoods=Vybrat zboží
 report.production.update=Update
 report.requirements.badAssignment=%colony% má %expert% pracujícího jako %expertWork%, zatímco %nonExpert% pracuje jako %nonExpertWork%. Produkce by mohla být vyšší, pokud by si tito kolonisté vyměnili práci.
 report.requirements.canTrainExperts={{plural:2|%unit%}} mohou být školeni v
-report.requirements.clearTile=%type% na %direction% od %colony% by prospělo vymýcení.
+# Fuzzy
 report.requirements.exploreTile=%type% na %direction% od %colony% by prospěl průzkum.
 report.requirements.met=Všechny požadavky jsou splněny.
 report.requirements.missingGoods=%colony% produkuje %goods%, ale potřebuje více %input%.
 report.requirements.misusedExperts=Jsou zde {{plural:2|%unit%}} nepracující jako %work% v
 report.requirements.noExpert=%colony% produkuje %goods%, ale nemá %unit%.
-report.requirements.plowCenter=Osada %colony% by více prosperovala, kdyby bylo její políčko zoráno.
-report.requirements.plowTile=%type% na %direction% od %colony% by prospělo pole.
-report.requirements.roadTile=%type% na %direction% od %colony% by prospěla cesta.
 report.requirements.severalExperts=Několik {{plural:2|%unit%}} je přítomno v
 report.requirements.surplus=Nadbytek %goods% se produkuje v
 report.trade.afterTaxes=Příjmy po zdanění
 report.trade.beforeTaxes=Příjmy před zdaněním
 report.trade.cargoUnits=Naložené jednotky
+# Fuzzy
 report.trade.hasCustomHouse=* Tato kolonie má obchod; tato zboží jsou exportována.
 report.trade.totalDelta=Celkem produkce
 report.trade.totalUnits=Celkem jednotek
 report.trade.unitsSold=Jednotky koupené/prodané
 report.turn.filter=Nezobrazovat tento typ zpráv (%type%)
 report.turn.ignore=Ignorovat tuto zprávu (Kolonie: %colony%, Zboží: %goods%)
+# Fuzzy
 report.turn.playerNation=%player% – %nation%
 aboutPanel.copyright=Copyright © 2002-2015 FreeCol tým
 aboutPanel.legalDisclaimer=FreeCol je svobodný software: můžete jej kopírovat a/nebo upravovat v souladu s podmínkami licence GNU General Public License, tak jak byla publikována Free Software Foundation, buď ve verzi 2, nebo jakékoliv pozdější verzi.
@@ -2741,6 +2787,7 @@ colonyPanel.buildQueue=Výrobní fronta
 colonyPanel.colonyUnits=Jednotky v kolonii
 colonyPanel.inPort=V přístavu
 colonyPanel.outsideColony=Mimo kolonii
+# Fuzzy
 colonyPanel.producing=Produkuje:
 colonyPanel.reducePopulation=Pokud snížíte populaci pod %number%, %colony% již nebude schopna postavit %buildable%.
 colonyPanel.setGoods=Nastavit zboží
@@ -2756,7 +2803,9 @@ confirmDeclarationDialog.areYouSure.no=Možná později
 confirmDeclarationDialog.areYouSure.text=Dovolte nám zavrhnout nespravedlivou tyranii %monarch% a vyhlasme nezávislost našich kolonií na koruně!
 confirmDeclarationDialog.areYouSure.yes=Svobodu nebo Smrt!
 confirmDeclarationDialog.createFlag=a naši nepřátelé se musí chvět při pohledu na náš prapor vzdoru.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Spojené státy %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Svobodný %nation%
 confirmDeclarationDialog.enterCountry=Od teď musí být naše země známa jako
 confirmDeclarationDialog.enterNation=a každý občan našeho slavného národa se musí hrdě považovat za
@@ -2808,9 +2857,11 @@ negotiationDialog.add=Přidat
 negotiationDialog.cancel=Storno
 negotiationDialog.clear=Vyčistit
 negotiationDialog.contact.tutorial=Potkal jsi přátelské Evropany. Budou s tebou soupeřit o zemi a bohatství a mohou proti tobě vést válku. Až se ke kongresu připojí Jan de Witt, budeš s nimi moct také obchodovat.
+# Fuzzy
 negotiationDialog.demand=%nation% požaduje od %otherNation%
 negotiationDialog.exchange=výměnou za
 negotiationDialog.goldAvailable=(%amount% zlata k dispozici)
+# Fuzzy
 negotiationDialog.offer=%nation% nabízí pro %otherNation%
 negotiationDialog.send=Poslat
 negotiationDialog.title.contact=Setkání s přátelskými evropany
@@ -2833,10 +2884,9 @@ findSettlementPanel.displayAll=Najít všechny osady
 findSettlementPanel.displayOnlyEuropean=Najít pouze Evropské osady
 findSettlementPanel.displayOnlyNatives=Najít pouze domorodé osady
 findSettlementPanel.name=Najít osadu
+# Fuzzy
 firstContactDialog.meeting.natives=Setkání s domorodci...
 firstContactDialog.meeting.natives.tutorial=Potkal jsi domorodce. Pošli do jejich osad zvěda, aby ses o nich dozvěděl více a své smluvní sluhy a volné kolonisty, aby se od nich učili. Pošli svoje lodě a obchodní vozy do jejich osad, pokud s nimi chceš obchodovat.
-firstContactDialog.meeting.AZTEC=Národ Aztéků...
-firstContactDialog.meeting.INCA=Říše Inků...
 firstContactDialog.welcomeOffer.text=%nation% tě vítají. Jsme slavný národ %camps% %settlementType%. Na oslavu našeho přátelství vám šlechetně nabízíme darem zemi, kterou právě zabíráte. Přijímáte tuto smlouvu a budete s námi žít v míru jako bratři?
 firstContactDialog.welcomeSimple.text=%nation% tě vítají. Jsme slavný národ %camps% %settlementType%. Přijímáte tuto smlouvu a budete s námi žít v míru jako bratři?
 abandonColony.no=Zrušit
diff --git a/data/strings/FreeColMessages_da.properties b/data/strings/FreeColMessages_da.properties
index 9c1845ed8..7c436be41 100644
--- a/data/strings/FreeColMessages_da.properties
+++ b/data/strings/FreeColMessages_da.properties
@@ -261,7 +261,6 @@ colopediaAction.goods.name=Varer
 colopediaAction.nations.name=Nationer
 colopediaAction.nationTypes.name=Nationale fordele
 colopediaAction.resources.name=Bonusressurser
-colopediaAction.skills.name=Kundskaber
 colopediaAction.terrain.name=Terræntyper
 colopediaAction.units.name=Enheder
 colopediaAction.name=%object% (Colopedia)
@@ -1332,6 +1331,7 @@ model.improvement.road.description=Vej gør rejsen nemmere
 model.improvement.road.name=Vej
 model.improvement.road.occupationString=V
 model.limit.independence.coastalColonies.name=Kystnær koloni grænse
+# Fuzzy
 model.limit.independence.coastalColonies.description=Du har brug for mindst %limit% kystnære kolonier for at kunne erklære uafhængighed.
 model.limit.independence.rebels.name=Oprørergrænse
 model.limit.independence.rebels.description=Mindst %limit%% af dine kolonister skal understøtte uafhængighed.
@@ -1678,6 +1678,7 @@ model.colony.badGovernment=Forvaltningen af %colony% er ineffektiv. Produktions
 model.colony.goodGovernment=Forvaltningseffektiviteten er forbedret! Oprørsstemningen i %colony% er nu lig med, eller højere end, %number% procent.
 model.colony.governmentImproved1=Forvaltningen af %colony% er forbedret, men stadig ineffektivt. Produktions straffe gælder stadig.
 model.colony.governmentImproved2=Forvaltningen af %colony% er forbedret. Produktions straffe er ikke længere gældende.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% flere %outputType% kunne produceres i %colony%, hvis vi bare havde %inputAmount% flere %inputType% i overskud.
 model.colony.lostGoodGovernment=Forvaltningseffektiviteten er faldet! Oprørsstemningen i %colony% er nu mindre end %number% procent. Kolonien får ikke længere nogen produktionsbonusser.
 model.colony.lostVeryGoodGovernment=Forvaltningseffektiviteten er faldet! Oprørstemningen i %colony% er nu mindre end %number% procent. Nogle af produktionsbonusserne er bortfaldet.
@@ -1692,12 +1693,17 @@ model.colony.veryBadGovernment=Forvaltningen af %colony% er meget ineffektiv! H
 model.colony.veryGoodGovernment=Forvaltningseffektiviteten er blevet forbedret! Oprørsstemningen i %colony% er den samme, eller højere end, %number% procent.
 model.colonyTile.claim=(kræv %direction%)
 model.diplomaticTrade.receive.contact=Broderlige hilsner fra den gloværdige  %nation%  nation.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Lad os forhandle med  %nation% .
 model.diplomaticTrade.receive.trade=Lad os overveje   %nation%'s  tilbud.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=<Span class="notranslate" oversætte="no">%nation%</span> kræver tribut af os!
 model.diplomaticTrade.send.contact=Vi har mødt medlemmer af den  %nation%  nation.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Lad os overveje vores diplomatiske situation i forhold til  %nation% .
+# Fuzzy
 model.diplomaticTrade.send.trade=Lad os foreslå en handel med den  %nation%  på  %settlement% .
+# Fuzzy
 model.diplomaticTrade.send.tribute=Vi kræver tribut af  %nation%  på  %settlement% .
 model.direction.N.name=nord
 model.direction.NE.name=nord-øst
@@ -1708,21 +1714,29 @@ model.direction.SW.name=syd-vest
 model.direction.W.name=vest
 model.direction.NW.name=nord-vest
 model.historyEventType.abandonColony.description=Du opgiver kolonien %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation% opdager %city%, af de Syv Byer af Guld, og en skat på %treasure% guld.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Din koloni %colony% er eroberet af %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Din koloni %colony% er ødelagt af %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Du vover at acceptere Vores generøse betingelser og alligevel unddrage dig betaling? En sådan dobbelthed skal bringe dig den bitre høst af Vores mishag.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Du ødelægger %nation% lejr %settlement%.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% udsletter %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Du opdager den nye Verden.
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation% opdager %region%.
 model.historyEventType.foundColony.description=Du opretter kolonien %colony%.
 model.historyEventType.foundingFather.description=%father% træder ind i kongressen.
 model.historyEventType.independence.description=Du opnår uafhængighed fra kronen.
+# Fuzzy
 model.historyEventType.meetNation.description=Du møder %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=%nation% findes ikke længere i den Nye Verden.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% overgier alle sine kolonier i den Nye Verden til %nation%.
 model.indianSettlement.mostHatedNone=Ingen
 model.indianSettlement.mostHatedUnknown=Ukendt
@@ -1773,8 +1787,10 @@ model.messageType.warehouseCapacity.name=Lagerkapacitet
 model.messageType.warning.name=Advarsler
 model.monarch.action.addToRef.text=Kronen har tilføjet %number% {{plural:%number%|%unit%}} til den Kongelige Ekspeditionsstyrke. Koloniledere udtrykker bekymring.
 model.monarch.action.addToRef.no=Udført
+# Fuzzy
 model.monarch.action.declarePeace.text=Vi har allernådigst indgået en fredsaftale med %nation%.
 model.monarch.action.declarePeace.no=Udført
+# Fuzzy
 model.monarch.action.declareWar.text=Frækheden af %nation% tvinger Os til at erklære krig mod dem!
 model.monarch.action.declareWar.no=Udført
 # Fuzzy
@@ -1830,6 +1846,7 @@ model.noClaimReason.worked.description=En anden bebyggelse bruger allerede dette
 model.player.forces=%nation% styrker
 model.player.independentMarket=Europa
 model.player.startGame=Efter måneder til søs er du endelig nået frem til kysten af et ukendt kontinent. Sejl mod {{tag:%direction%|west=vest|east=øst|default=vinden}} for at opdage den Nye Verden og gør krav på den i kongens navn.
+# Fuzzy
 model.player.waitingFor=Venter på: %nation%
 model.regionType.coast.name=Kyst
 model.regionType.coast.unknown=Ukendt kystområde
@@ -1869,6 +1886,7 @@ model.tradeItem.gold.name=Guld
 model.tradeItem.gold.description=i alt %amount% guld
 model.tradeItem.goods.name=Varer
 model.tradeItem.incite.name=Erklære krig mod
+# Fuzzy
 model.tradeItem.incite.description=krig mod den%nation%
 model.tradeItem.stance.name=Holdning
 model.tradeItem.unit.name=Enhed
@@ -1889,9 +1907,9 @@ model.unit.underRepair=Under Reparation ( %turns% )
 model.unit.unitState.active=A
 model.unit.unitState.fortified=B
 model.unit.unitState.fortifying=B
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=K
 model.unit.unitState.sentry=V
+# Fuzzy
 model.unit.unitState.skipped=V
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=E
@@ -1931,6 +1949,7 @@ model.colony.warehouseOverfull=Dit lager i %colony% har nået sin kapacitet for
 model.colony.warehouseSoonFull=Dit lager i %colony% vil overskride sin kapacitet af %goods% i næste tur. %amount% enheder af %goods% vil gå til spilde.
 model.colony.warehouseWaste=Dit lager i %colony% har overskredet sin kapacitet for %goods%. %waste% enheder gik til spilde.
 model.colonyTile.resourceExhausted=Resource %resource% udtømt i %colony%
+# Fuzzy
 model.game.spanishSuccession=Deres Excellence, krigen om den Spanske trone er nu afsluttet i Europa. I traktaten fra Utrecht, er %loserNation% tvunget til at afstå alle deres kolonier i den Nye Verson til %nation%!
 model.indianSettlement.mission.denounced=Din missionær ved %settlement% er blevet afvist og henrettet!
 model.player.alarmIncrease.tension.angry=Den  %nation%  chef på  %settlement%  advarer om, at de braves forlanger åben krig med den  %enemy% , for at befri os for dine bosættere og krigere på vores jord.
@@ -1939,6 +1958,7 @@ model.player.autoRecruit=Religiøs uro i %europe% får %unit% til at emigrere.
 model.player.colonyGoodsParty.harbour=Dine kolonister i %colony% har kastet %amount% enheder af %goods% i havnen i protest mod den uretfærdige skat fra Kronen!
 model.player.colonyGoodsParty.horses=Dine kolonister i %colony% har frigivet %amount% heste i protest mod den uretfærdige skat fra Kronen!
 model.player.colonyGoodsParty.landLocked=Dine kolonister i %colony% har brændt %amount% enheder af %goods% på markedspladsen i protest mod den uretfærdige skat fra Kronen!
+# Fuzzy
 model.player.dead.european=Deres højhed, %nation% har erklæret en betingelsesløs tilbagetrækning fra Den Nye Verden's affærer!
 model.player.dead.native=Deres højhed, %nation% er blevet udryddet.
 model.player.disaster.bankruptcy.start=Du betalte ikke for vedligehold af alle bygninger. Strenge produktionsstraffe er nu i værk.
@@ -1950,12 +1970,16 @@ model.player.foundingFatherJoinedCongress=%foundingFather% har sluttet sig til k
 model.player.interventionForceArrives=Den lovede interventionsstyrke ankommer!
 model.player.soLDecrease=Frihedens sønner medlemskab i dine kolonier er faldet til %newSoL% procent!
 model.player.soLIncrease=Frihedens sønner medlemskab i dine kolonier er steget til %newSoL% procent!
+# Fuzzy
 model.player.stance.alliance.declared=Deres Excellence, %nation% er nu allieret med os!
 model.player.stance.alliance.others=Deres Excellence, %attacker% er nu i alliance med %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Deres Excellence, %nation% er gået med til en våbenhvile med os!
 model.player.stance.ceaseFire.others=Deres Excellence, %attacker% er gået med til en våbenhvile med %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Deres Excellence, %nation% har nu fred med os!
 model.player.stance.peace.others=Deres Excellence, %attacker% har nu fred med %defender%.
+# Fuzzy
 model.player.stance.war.declared=Dårlige nyheder, Deres Højhed, %nation% har erklæret krig mod os!
 model.player.stance.war.others=Deres Højhed, %attacker% har erklæret krig mod %defender%.
 combat.automaticDefence=Din %unit% i %colony% har taget våben for at forsvare kolonien!
@@ -1971,6 +1995,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% har undveget angreb fra %unit%.
 combat.enemyShipSunk=%unit% har sunket %enemyNation% %enemyUnit%!
 combat.equipmentCaptured=Vær på vagt, krigerne fra %nation% har fået fat i %equipment%!
 combat.goodsStolen=%enemyNation% %enemyUnit% stjæler %amount% %goods% fra %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% plyndrer %amount% fra %colony%.
 combat.indianRaid=Vores spioner rapporterer at %nation% har plyndret %colonyNation%'s %colony%.
 combat.indianSurprise=%nation% har lavet en overraskelses angreb på %colony%, hvilket har alarmeret vores kolonister. %nation%'s høvding benægter at være ansvarlig.
@@ -2025,13 +2050,16 @@ main.defaultPlayerName=Spillernavn
 main.javaVersion=Java version  %minVersion%  eller bedre anbefales for at køre FreeCol\n( %version%  fundet, bruge--nr-java-check at springe denne check).
 main.memory=Du skal tildele mere end  %memory%  bytes af hukommelse til JVM.\n  Genstart FreeCol med: java - Xmx %minMemory% M-jar FreeCol.jar
 main.userDir.fail=FreeCol kan ikke finde egnede mapper til at gemme brugerdata i.  Fortsætter, men forvent problemer.
+# Fuzzy
 client.choicePlayer=Vælg en spiller:
 metaServer.couldNotConnect=Kunne ikke forbinde til meta-server. Prøv igen senere.
 metaServer.communicationError=Der var en fejl ved kommunikation med meta-server. Prøv igen senere.
 abandonEducation.action.studying=oplæres
 abandonEducation.action.teaching=underviser
+# Fuzzy
 abandonEducation.no=Nej, fortsæt oplæringen
 abandonEducation.text=Hvis din %unit% forlader %colony% vil den stoppe %action% i %building%. Er du sikker på den skal forlade kolonien?
+# Fuzzy
 abandonEducation.yes=Ja, forlad kolonien
 abandonTeaching.text=Hvis din  %unit%  forlader den  %building%  det vil stoppe undervisning, er du sikker på, at den bør efterlades?
 armedUnitSettlement.attack=Angrib
@@ -2041,9 +2069,13 @@ buy.moreGold=Bed om en mindre pris
 buy.takeOffer=Accepter tilbudet
 buy.text=%nation% vil gerne sælge deres %goods% for %gold%.
 clearTradeRoute.text=Enheden %unit% er på handelsrute %route%. At sætte dets bestemmelsessted vil fjerne den fra handelsruten. Er du sikker på at du vil gøre det?
+# Fuzzy
 confirmHostile.alliance=Du kan ikke angribe en allieret nation! Ønsker du virkelig at bryde vores alliance med %nation% og erklærer krig?
+# Fuzzy
 confirmHostile.ceaseFire=Du har indgået våbenhvile med %nation%. Vil du virkelig angribe?
+# Fuzzy
 confirmHostile.peace=Du har fred med %nation%. Vil du virkelig erklære krig?
+# Fuzzy
 confirmTribute.broke=Vores spioner rapport, at  %nation%  er fuldstændig fallit.  Lad os ikke spilde vores tid med stille krav.
 confirmTribute.european=The %nation% %danger%, and %finance%.  Hvor meget tribut bør vi kræve af dem?
 confirmTribute.happy=Den  %nation%  på  %settlement%  er gode venner med os, det er en skam at skade vores kammeratskab.
@@ -2111,7 +2143,9 @@ defeated.text=Du er blevet slået! Vil du gerne:
 defeated.yes=Blive og se hvordan det går
 defeatedSinglePlayer.text=Du er blevet slået!\n\nDet er nu skumringstimen, hvor kirkegårde gaber og helvede selv spyr sin gift ud i denne verden, nu kunne jeg drikke varmt blod! og gøre så mørke gernninger, at dagen ville ryste ved at kigge på.
 defeatedSinglePlayer.yes=Gå på hævntogt
+# Fuzzy
 diplomacy.offerAccepted=%nation% accepterer dit gavmilde tilbud.
+# Fuzzy
 diplomacy.offerRejected=%nation% afslår dit gavmilde tilbud.
 disbandUnit.text=Er du sikker på at du vil opløse denne enhed?
 disbandUnit.yes=Opløs
@@ -2155,7 +2189,9 @@ move.noAccessContact=Vi skal etablere kontakt med %nation% først, Deres højhed
 move.noAccessGoods=%nation% vil ikke handle med tomme %unit%.
 move.noAccessSettlement=%nation% tillader ikke vores %unit% at komme ind i deres bebyggelse.
 move.noAccessSkill=Vores %unit% kan ikke lære af de indfødte.
+# Fuzzy
 move.noAccessTrade=Vi har ikke autoritet til at handle med andre europæiske nationer så som %nation%.
+# Fuzzy
 move.noAccessWar=Vi kan ikke handle med %nation% sålænge vi er i krig.
 move.noAccessWater=Vores %unit% må i land før vi kan gå ind i bebyggelsen.
 move.noAttackWater=Vores %unit% skal lande før den kan angribe.
@@ -2215,6 +2251,7 @@ server.reject=Serveren kan ikke gøre dette.
 server.timeOut=Timeout, mens forbindelse prøves oprettet.
 server.userNameInUse=Det angivne brugernavn er allerede i brug
 server.wrongFreeColVersion=Klient og server versionerne af FreeCol passer ikke sammen.
+# Fuzzy
 buildColony.others=%nation%  har grundlagt den nye koloni af  %colony%  i  %region% .
 cashInTreasureTrain.colonial=En skat på %amount% guld er ankommet til Europa. %cashInAmount% guld er lagt i skattekammeret.
 cashInTreasureTrain.independent=En skat på %amount% er blevt tilføjet den nationale skatte kiste.
@@ -2311,6 +2348,7 @@ colopedia.unit.offensivePower=Angrebsstyrke:
 colopedia.unit.price=Pris i Europa:
 colopedia.unit.productionBonus=Produktions {{plural:%number%|one=modifikator|other=modifikatorer}}:
 colopedia.unit.requirements=Forudsætninger:
+# Fuzzy
 colopedia.unit.school=Skole krævet for uddannelse:
 colopedia.unit.skill=Kundskabsniveau:
 report.labour.allColonists=Alle kolonister
@@ -2346,8 +2384,8 @@ report.colony.growing.description=%colony% kan vokse med {{plural:%amount%|one=e
 # Fuzzy
 report.colony.improve.description=Enheder der kunne forbedre produktionen i forhold til enheden der udfører jobbet nu
 report.colony.improve.header=Forbedre
+# Fuzzy
 report.colony.improving.description=%colony%: For at få %amount% mere %goods%, så erstat %oldUnit% med %unit%
-report.colony.wanting.description=%colony%: For at producere %amount% mere %goods%, så tilføj %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% mangler til %buildable% {{plural:%turns%|one=i næste tur|other=om %turns% ture}}
 report.colony.making.constructing.description=%colony%: %buildable% bliver færdigt {{plural:%turns%|one=i næste tur|other=om %turns% ture}}
 report.colony.making.description=Hvad laver denne koloni
@@ -2357,21 +2395,22 @@ report.colony.making.noconstruction.description=%colony%: Intet er under konstru
 report.colony.making.noteach.description=%colony%: %teacher% mangler en elev
 report.colony.name.description=Listen over kolonier
 report.colony.name.header=Koloni
-report.colony.plow.description=Antallet af kolonifelter, som ville blive bedre af at blive pløjet
-report.colony.plow.header=P
-report.colony.plowing.description=%colony% ville blive forbedret ved at pløje {{plural:%amount%|one=et felt|other=%amount% felter}}
+# Fuzzy
 report.colony.production.description=%colony%: nettoproduktion af %goods%  = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: netto %goods%, produktion er %amount% (eksport over %export%)
 report.colony.production.header=Nettoproduktion af %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: nettoproduktion af %goods% = %amount%, fyldt {{plural:%turns%|one=i næste tur|other=om %turns% ture}}
+# Fuzzy
 report.colony.production.low.description=%colony%: nettoproduktion af %goods% production = %amount%, indtil {{plural:%turns%|one=næste runde|other=%turns%. runde}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: nettoproduktion af %goods% = %amount%, varehuset vil blive overfyldt, %waste% vil blive kasseret
-report.colony.road.description=Antallet af kolonifelter, som ville blive forbedret ved at anlægge en vej
-report.colony.road.header=V
-report.colony.roadBuilding.description=%colony% ville blive forbedret af at anlægge {{plural:%amount%|one=en vej|other=%amount% veje}}
 report.colony.shrinking.description=%colony% skal formindskes med {{plural:%amount%|one=en enhed|other=%amount% enheder}} for at forbedre produktiviteten
 report.colony.starving.description=%colony%: hungersnød {{plural:%turns%|one=i næste tur|other=om %turns% ture}}
 # Fuzzy
+report.colony.wanting.description=%colony%: For at producere %amount% mere %goods%, så tilføj %unit%
+# Fuzzy
 report.continentalCongress.elected=Valgt:
 report.continentalCongress.none=(ingen)
 report.continentalCongress.recruiting=Rekruter
@@ -2412,26 +2451,25 @@ report.production.selectGoods=Vælg varer
 report.production.update=Opdater
 report.requirements.badAssignment=%colony% har en %expert% arbejdende som %expertWork%, mens en %nonExpert% arbejder som %nonExpertWork%. Produktionen ville være større, hvis de byttede job.
 report.requirements.canTrainExperts={{plural:2|%unit%}} kan undervises i
-report.requirements.clearTile=%type% %direction%for %colony% ville blive forbedret af at blive ryddet.
+# Fuzzy
 report.requirements.exploreTile=%type% %direction%for %colony% ville blive forbedret af at blive undersøgt.
 report.requirements.met=Alle forudsætninger er tilstede.
 report.requirements.missingGoods=%colony% producerer %goods%, men kræver mere %input%.
 report.requirements.misusedExperts=Der er  {{plural:2|%unit%}}, der ikke arbejder som %work% i
 report.requirements.noExpert=%colony% producerer %goods%, men har ingen %unit%.
-report.requirements.plowCenter=%colony% ville blive forbedret af at pløje dets felt.
-report.requirements.plowTile=%type% %direction% for %colony% ville blive forbedret af at blive pløjet.
-report.requirements.roadTile=%type%  %direction% for %colony% kunne blive forbedret ved at bygge en vej.
 report.requirements.severalExperts=Several {{plural:2|%unit%}} er tilstede i
 report.requirements.surplus=Overskud af %goods% bliver produceret i:
 report.trade.afterTaxes=Indkomst efter skatter
 report.trade.beforeTaxes=Indkomst før skatter
 report.trade.cargoUnits=Enheder i last
+# Fuzzy
 report.trade.hasCustomHouse=* Denne koloni har et told hus; disse varer er eksporteret.
 report.trade.totalDelta=Total produktion
 report.trade.totalUnits=Total enheder
 report.trade.unitsSold=Enheder købt eller solgt
 report.turn.filter=Vis ikke denne slags besked (%type%)
 report.turn.ignore=Ignorer denne besked (koloni: %colony%, vare: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% for %player%
 # Fuzzy
 aboutPanel.copyright=Copyright © 2002-2013  FreeCol-teamet
@@ -2458,6 +2496,7 @@ chooseFoundingFatherDialog.title=Nominer landsfader
 colonyPanel.colonyUnits=Kolonienheder
 colonyPanel.inPort=I havn
 colonyPanel.outsideColony=Udenfor kolonien
+# Fuzzy
 colonyPanel.producing=Producerer:
 colonyPanel.reducePopulation=Hvis du reducere befolkningen under %number%, vil %colony% ikke længere kunne bygge %buildable%.
 colonyPanel.unitChange=Ved ankomst til din koloni er %oldType% blevet til en %newType%.
@@ -2470,7 +2509,9 @@ confirmDeclarationDialog.areYouSure.no=Måske senere
 confirmDeclarationDialog.areYouSure.text=Lad os forsage den uretfærdige tyran af %monarch% og erklære vores koloniers uafhængighed fra kronen!
 confirmDeclarationDialog.areYouSure.yes=Frihed eller døden!
 confirmDeclarationDialog.createFlag=og vores fjender skal skælve ved synet af vores  banner.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=De forende stater af %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Frie %nation%
 confirmDeclarationDialog.enterCountry=For fremtiden skal vores land være kendt som
 confirmDeclarationDialog.enterNation=og enhver borger af vores glorværdige nation skal være stolte af at være kendt som
@@ -2521,8 +2562,10 @@ negotiationDialog.add=Tilføj
 negotiationDialog.cancel=Afbryd
 negotiationDialog.clear=Ryd
 negotiationDialog.contact.tutorial=Du møder andre europæere. De vil konkurrere med dig om jord og rigdom og måske indlede krig mod dig. Men efter Jan de Witt har tilsluttet sig den kontinentale kongress, kan du handle med dem.
+# Fuzzy
 negotiationDialog.demand=Den  %nation%  kræver af den %otherNation%
 negotiationDialog.exchange=i bytte for
+# Fuzzy
 negotiationDialog.offer=Den  %nation%  tilbyder den%otherNation%
 negotiationDialog.send=Send
 negotiationDialog.title.contact=Møde andre europæere
@@ -2545,10 +2588,9 @@ findSettlementPanel.displayAll=Find alle bosættelser
 findSettlementPanel.displayOnlyEuropean=Find kun europæiske bosættelser
 findSettlementPanel.displayOnlyNatives=Kun indfødte bosættelser
 findSettlementPanel.name=Find bosættelse
+# Fuzzy
 firstContactDialog.meeting.natives=Møde de indfødte...
 firstContactDialog.meeting.natives.tutorial=Du møder indfødte. Send dine spejdere til deres bosættelser for at lære mere om dem, og din  tjenere og frie kolonister for at lære af dem. Send dine skibe og vogntog til deres byer, hvis du ønsker at handle med dem.
-firstContactDialog.meeting.AZTEC=Aztec nationen
-firstContactDialog.meeting.INCA=Inkariget...
 firstContactDialog.welcomeOffer.text=%nation% hilser dig. Vi er en storslået nation på %camps% %settlementType%. For at fejre vores venskab, tilbyder vi dig generøst den jord som du optager nu, som en gave. Vil du accepterer vores regler og leve med os i fred som brødre?
 firstContactDialog.welcomeSimple.text=%nation% hilser dig. Vi er en storslået nation bestående af %camps% %settlementType%. Vil du accepterer vores regler og leve med os i fred som brødre?
 abandonColony.no=Afbryd
diff --git a/data/strings/FreeColMessages_de.properties b/data/strings/FreeColMessages_de.properties
index 01be0fa6e..4e1510a3a 100644
--- a/data/strings/FreeColMessages_de.properties
+++ b/data/strings/FreeColMessages_de.properties
@@ -297,7 +297,6 @@ colopediaAction.goods.name=Waren
 colopediaAction.nations.name=Nationen
 colopediaAction.nationTypes.name=Nationale Vorteile
 colopediaAction.resources.name=Bonus-Ressourcen
-colopediaAction.skills.name=Fähigkeiten
 colopediaAction.terrain.name=Terraintypen
 colopediaAction.units.name=Einheiten
 colopediaAction.name=%object% (Colopedia)
@@ -1546,6 +1545,7 @@ model.improvement.road.description=Straße
 model.improvement.road.name=Straße
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limit Küstenkolonien
+# Fuzzy
 model.limit.independence.coastalColonies.description=Für eine Unabhängigkeitserklärung brauchst du mindestens %limit% Küstenkolonien.
 model.limit.independence.rebels.name=Rebellenlimit
 model.limit.independence.rebels.description=Zumindest %limit%% der Kolonisten müssen die Unabhängigkeit unterstützen.
@@ -1894,6 +1894,7 @@ model.colony.badGovernment=Die Regierung in %colony% ist ineffizient. Bei der Pr
 model.colony.goodGovernment=Die Effizienz der Regierung hat sich verbessert! Die Stimmung der Rebellen in %colony% entspricht jetzt %number% Prozent oder liegt darüber.
 model.colony.governmentImproved1=Die Regierung in %colony% hat sich verbessert, ist aber weiterhin ineffizient. Bei der Produktivität ergeben sich weiterhin Abzüge.
 model.colony.governmentImproved2=Die Regierung in %colony% hat sich verbessert. Bei der Produktivität ergeben sich keine Abzüge mehr.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% %outputType% mehr könnten in %colony% produziert werden, wenn wir %inputAmount% mehr %inputType% hätten.
 model.colony.lostGoodGovernment=Die Effizienz der Regierung ist zurückgegangen! Die Stimmung der Rebellen in %colony% entspricht nicht länger %number% Prozent oder liegt darunter. Die Kolonie erzielt keine Produktionsboni mehr.
 model.colony.lostVeryGoodGovernment=Die Effizienz der Regierung ist zurückgegangen! Die Stimmung der Rebellen in %colony% entspricht nicht länger %number% Prozent oder liegt darunter. Einige Produktionsboni sind verloren gegangen.
@@ -1908,12 +1909,17 @@ model.colony.veryBadGovernment=Die Regierung in %colony% ist sehr ineffizient. B
 model.colony.veryGoodGovernment=Die Effizienz der Regierung hat sich verbessert! Die Stimmung der Rebellen in %colony% entspricht jetzt %number% Prozent oder liegt darüber.
 model.colonyTile.claim=(beanspruche %direction%)
 model.diplomaticTrade.receive.contact=Brüderliche Grüße von den glorreichen %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Lasst uns mit den %nation% verhandeln.
 model.diplomaticTrade.receive.trade=Lasst uns das Handelsangebot der %nation% prüfen.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=Die %nation% fordern Tribut von uns!
 model.diplomaticTrade.send.contact=Wir sind Mitgliedern der %nation% begegnet.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Lasst uns unsere diplomatische Situation mit den %nation% prüfen.
+# Fuzzy
 model.diplomaticTrade.send.trade=Lasst uns einen Handel mit den %nation% bei %settlement% vorschlagen.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Wir fordern Tribut von den %nation% bei %settlement%.
 model.direction.N.name=nördlich
 model.direction.NE.name=nordöstlich
@@ -1924,24 +1930,37 @@ model.direction.SW.name=südwestlich
 model.direction.W.name=westlich
 model.direction.NW.name=nordwestlich
 model.historyEventType.abandonColony.description=Ihr gebt die Kolonie %colony% auf.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Feuer mit %nation% einstellen.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Die %nation% haben %city% entdeckt - eine der sieben goldenen Städte - und Schätze im Wert von %treasure% erbeutet.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Eure Kolonie %colony% wird durch die %nation% eingenommen.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Eure Kolonie %colony% wird durch die %nation% niedergebrannt.
 model.historyEventType.conquerColony.description=Du eroberst die %nation% Kolonie von %colony%.
 model.historyEventType.declareIndependence.description=Du erklärst die Unabhängigkeit von der Krone.
+# Fuzzy
 model.historyEventType.declareWar.description=Krieg erklärt mit %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Die %nation% löschen die %nativeNation% aus.
+# Fuzzy
 model.historyEventType.destroySettlement.description=Du zerstörst die %nation% Siedlung %settlement%.
 model.historyEventType.discoverNewWorld.description=Ihr entdeckt die Neue Welt.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Die %nation% entdecken %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Bündnis mit %nation% ausgehandelt.
 model.historyEventType.foundColony.description=Ihr gründet die Kolonie %colony%.
 model.historyEventType.foundingFather.description=%father% tritt dem Kontinentalkongress bei.
 model.historyEventType.independence.description=Ihr erlangt Eure Unabhängigkeit von der Krone.
+# Fuzzy
 model.historyEventType.makePeace.description=Frieden mit %nation% vereinbart.
+# Fuzzy
 model.historyEventType.meetNation.description=Ihr trefft die %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Die %nation% ist nicht länger in der Neuen Welt anwesend.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Die %loserNation% übergeben alle ihre Kolonien in der neuen Welt an die %nation%.
 model.indianSettlement.mostHatedNone=nichts
 model.indianSettlement.mostHatedUnknown=Unbekannt
@@ -1995,9 +2014,12 @@ model.messageType.warehouseCapacity.name=Lagerkapazität
 model.messageType.warning.name=Warnungen
 model.monarch.action.addToRef.text=Die Krone hat dem königlichen Expeditionskorps %number% {{plural:%number%|%unit%}} hinzugefügt. Die Anführer der Kolonien äußern sich besorgt.
 model.monarch.action.addToRef.no=Fertig
+# Fuzzy
 model.monarch.action.declarePeace.text=Wir haben gnädigerweise einem Friedensvertrag mit %nation% zugestimmt.
 model.monarch.action.declarePeace.no=Vereinbart
+# Fuzzy
 model.monarch.action.declareWar.text=Die Anmaßungen der %nation% zwingen Uns dazu, ihnen den Krieg zu erklären!
+# Fuzzy
 model.monarch.action.declareWarSupported.text=Die Anmaßungen der %nation% zwingen Uns, den Krieg gegen sie zu erklären! Zur Beschleunigung dieser Sache warten unsere loyalen Truppen (%force%) auf deine Befehle und weitere Summen an %gold% wurden deinem Schatz hinzugefügt.
 model.monarch.action.declareWar.no=Fertig
 model.monarch.action.displeasure.text=Du wagst es, Unsere großzügigen Bedingungen zu akzeptieren und weichst sogar einer Bezahlung aus? Solche Doppelzüngigkeit soll den bitteren Lohn Unseres Unmutes ernten.
@@ -2057,6 +2079,7 @@ model.player.colonialIndependence=Nur Spieler mit einer Kolonie können eine Una
 model.player.forces=%nation% Streitkräfte
 model.player.independentMarket=Europa
 model.player.startGame=Nach Monaten auf See habt Ihr schließlich die Küste eines unbekannten Kontinents erreicht. Segelt weiter {{tag:%direction%|west=westwärts|east=ostwärts|default=mit dem Wind}}, um die Neue Welt zu entdecken und sie für die Krone in Anspruch zu nehmen.
+# Fuzzy
 model.player.waitingFor=Warten auf: %nation%
 model.regionType.coast.name=Küste
 model.regionType.coast.unknown=Unbekannte Küstenregion
@@ -2097,6 +2120,7 @@ model.tradeItem.gold.name=Gold
 model.tradeItem.gold.description=die Summe von %amount% Gold
 model.tradeItem.goods.name=Waren
 model.tradeItem.incite.name=Krieg erklären gegen
+# Fuzzy
 model.tradeItem.incite.description=Krieg gegen die %nation%
 model.tradeItem.stance.name=Haltung
 model.tradeItem.unit.name=Einheit
@@ -2119,9 +2143,9 @@ model.unit.underRepair=Reparatur(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -2162,6 +2186,7 @@ model.colony.warehouseSoonFull=Unser Lagerhaus in %colony% wird seine Kapazität
 model.colony.warehouseWaste=Unser Lagerhaus in %colony% hat seine Kapazität für %goods% überschritten. %waste% Einheiten wurden verschwendet.
 model.colony.workersEvicted=Deine Kolonisten können wegen der Anwesenheit von %enemyUnit% nicht länger %location% bei %colony% arbeiten.
 model.colonyTile.resourceExhausted=Die Ressource %resource% in %colony% ist erschöpft!
+# Fuzzy
 model.game.spanishSuccession=Eure Exzellenz, der spanische Erbfolgekrieg in Europa ist beendet. Im Vertrag von Utrecht wurden die %loserNation% dazu gezwungen alle Kolonien in der Neuen Welt den %nation% zu überlassen!
 model.indianSettlement.mission.denounced=Euer Missionar in %settlement% wurde denunziert und hingerichtet!
 model.indianSettlement.mission.destroyed=Dein Missionar in %settlement% ist in der Zerstörung der Siedlung gestorben.
@@ -2171,6 +2196,7 @@ model.player.autoRecruit=Religiöse Unruhen in %europe% veranlassen %unit% zur A
 model.player.colonyGoodsParty.harbour=Unsere Kolonisten in %colony% haben %amount% %goods% in den Hafen geworfen, um gegen diese unfaire Besteuerung durch die Krone zu protestieren!
 model.player.colonyGoodsParty.horses=Die Bevölkerung in %colony% hat %amount% Pferde freigelassen um gegen die unfaire Besteuerung durch die Krone zu protestieren!
 model.player.colonyGoodsParty.landLocked=Unsere Kolonisten in %colony% haben %amount% %goods% auf dem Marktplatz verbrannt, um gegen diese unfaire Besteuerung durch die Krone zu protestieren!
+# Fuzzy
 model.player.dead.european=Eure Exzellenz, die %nation% haben einen vollständigen Rückzug aus der Neuen Welt verkündet!
 model.player.dead.native=Eure Exzellenz, die %nation% wurden vernichtet.
 model.player.disaster.bankruptcy.start=Du hast nicht für die Instandhaltung aller Gebäude gezahlt. Schwere Produktionsstrafen wurden verhängt.
@@ -2184,12 +2210,16 @@ model.player.ignoredTax=Die Krone hat den Steuersatz wie zuvor angekündigt auf
 model.player.interventionForceArrives=Die versprochenen Eingreiftruppe trifft ein!
 model.player.soLDecrease=Die Mitgliederzahl der Söhne der Freiheit in unseren Kolonien ist auf %newSoL% Prozent gesunken!
 model.player.soLIncrease=Die Mitgliederzahl der Söhne der Freiheit in unseren Kolonien ist auf %newSoL% Prozent gestiegen!
+# Fuzzy
 model.player.stance.alliance.declared=Eure Exzellenz, die %nation% haben ein Bündnis mit uns!
 model.player.stance.alliance.others=Eure Exzellenz, die %attacker% sind in Allianz mit den %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Eure Exzellenz, die %nation% haben einem Waffenstillstand mit uns zugestimmt.
 model.player.stance.ceaseFire.others=Eure Exzellenz, die %attacker% haben einem Waffenstillstand mit %defender% zugestimmt.
+# Fuzzy
 model.player.stance.peace.declared=Eure Exzellenz, die %nation% haben Frieden mit uns!
 model.player.stance.peace.others=Eure Exzellenz, die %attacker% haben Frieden mit den %defender%.
+# Fuzzy
 model.player.stance.war.declared=Schlechte Neuigkeiten, Eure Exzellenz, das Volk der %nation% hat uns den Krieg erklärt!
 model.player.stance.war.others=Eure Exzellenz, die %attacker% haben den %defender% den Krieg erklärt.
 combat.automaticDefence=Ein %unit% in %colony% hat sich bewaffnet um die Kolonie zu verteidigen!
@@ -2205,6 +2235,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% ist einem Angriff durch %unit%
 combat.enemyShipSunk=%unit% versenkt %enemyNation% %enemyUnit%!
 combat.equipmentCaptured=Vorsicht, die Krieger der %nation% sind in den Besitz von %equipment% gelangt!
 combat.goodsStolen=%enemyNation% %enemyUnit% stehlen %amount% %goods% aus %colony%.
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% plünderten %amount% in %colony%.
 combat.indianRaid=Unsere Spione melden, dass die %nation% die %colony% der %colonyNation% überfallen haben.
 combat.indianSurprise=Die %nation% hat %colony% überraschend überfallen und so unsere Kolonisten alarmiert. Der Häuptling der %nation% leugnet jegliche Beteiligung.
@@ -2260,6 +2291,7 @@ main.javaVersion=Zur korrekten Ausführung von FreeCol wird die Java-Version %mi
 main.memory=Es muss für JVM ein Speicher von mehr als %memory% Byte zugewiesen werden.\nFreeCol neu starten mit „java -Xmx%minMemory%M -jar FreeCol.jar“
 main.userDir.fail=FreeCol konnte keine passenden Verzeichnisse zum Speichern der Benutzerdaten finden. Fahre fort, aber es werden Probleme erwartet.
 client.baseData=Das Basisdatenverzeichnis %dir% konnte nicht gefunden werden.\nDie Datendateien konnten von FreeCol nicht gefunden werden.\nStelle sicher, dass sie vorhanden sind.\nFalls FreeCol im falschen Verzeichnis sucht,\nführe das Spiel mit einem Kommandozeilenparameter aus:\n--freecol-data <Datenverzeichnis>
+# Fuzzy
 client.choicePlayer=Bitte Spieler wählen:
 client.classic=Fehler beim Laden der Quellkarte von Regelsatz „classic“.
 client.debugConnect=Du kannst dich nicht mit einem vorhandenen Spiel im Fehlerbehebungsmodus verbinden.
@@ -2272,8 +2304,10 @@ metaServer.couldNotConnect=Verbindung mit Meta-Server nicht möglich. Bitte vers
 metaServer.communicationError=Fehler bei der Kommunikation mit dem Meta-Server. Bitte versuchen Sie es später noch einmal.
 abandonEducation.action.studying=das Studium
 abandonEducation.action.teaching=die Ausbildung
+# Fuzzy
 abandonEducation.no=Nein, die Ausbildung fortsetzen
 abandonEducation.text=Sofern deine %unit% die Kolonie %colony% verlässt, wird sie %action% in der %building% aufgeben. Bist du sicher, dass sie aufbrechen soll?
+# Fuzzy
 abandonEducation.yes=Ja, die Kolonie verlassen
 abandonTeaching.text=Falls deine %unit% das %building% verlässt, wird die Ausbildung abgebrochen. Bist du sicher, dass das Gebäude verlassen werden soll?
 armedUnitSettlement.attack=Angriff
@@ -2285,10 +2319,14 @@ buy.takeOffer=Angebot annehmen
 buy.text=Die %nation% würden ihre %goods% gerne für %gold% verkaufen:
 clearTradeRoute.text=%unit% ist der Handelsroute %route% zugewiesen. Wenn der Zielort verändert wird, wird die Zuweisung entfernt. Bist du sicher, dass du das tun willst?
 client.fullScreen=Der Vollbildmodus wird für dieses Grafikgerät nicht unterstützt.\nZurück zum Fenstermodus.
+# Fuzzy
 confirmHostile.alliance=Ihr könnt keine verbündete Nation angreifen! Möchtet Ihr wirklich die Allianz mit %nation% brechen und Ihnen den Krieg erklären?
+# Fuzzy
 confirmHostile.ceaseFire=Ihr habt einen Waffenstillstand mit den %nation% unterzeichnet. Möchtet Ihr wirklich angreifen?
+# Fuzzy
 confirmHostile.peace=Sie sind im Frieden mit %nation%. Möchtet Ihr wirklich den Krieg erklären?
 confirmHostile.yes=Ja, lasst die Kriegshunde los!
+# Fuzzy
 confirmTribute.broke=Unsere Spione melden, dass die %nation% völlig pleite sind. Lasst uns nicht unsere Zeit mit Tributforderungen verschwenden.
 confirmTribute.european=Die %nation% %danger% und %finance%. Wie viel Tribut sollten wir von ihnen fordern?
 confirmTribute.happy=Die %nation% bei %settlement% sind für uns gute Freunde. Es ist schade, unsere Kameradschaft zu beschädigen.
@@ -2308,6 +2346,7 @@ indianLand.cancel=Das Land verlassen
 indianLand.pay=%amount% Gold für das Land anbieten
 indianLand.take=Nehmen, was uns rechtmäßig zusteht
 indianLand.text=Dieses Land gehört den %player%. Möchtet Ihr:
+# Fuzzy
 indianLand.unknown=Einige unbekannte Menschen leben in diesen Ländern. Möchtest du:
 info.autodetectLanguageSelected=Sie haben die automatische Spracherkennung gewählt. Bitte starten Sie das Spiel neu, damit diese durchgeführt werden kann.
 info.enterSomeText=Bitte einen Text eingeben.
@@ -2353,7 +2392,9 @@ defeated.text=Ihr wurdet besiegt! Möchtet Ihr:
 defeated.yes=Bleiben und zusehen
 defeatedSinglePlayer.text=Ihr wurdet besiegt!\n\nNun ist die wahre Geisterstunde, in der Friedhöfe gähnen und die Hölle Verderben in diese Welt bringt. Nun tränk’ ich wohl heiß’ Blut, und täte manch’ Ding, dass beim bloßen Anblick der Tag schon schaudern würd’.
 defeatedSinglePlayer.yes=Revanche-Modus starten
+# Fuzzy
 diplomacy.offerAccepted=Die %nation% haben Euer großzügiges Angebot angenommen.
+# Fuzzy
 diplomacy.offerRejected=Die %nation% haben Euer großzügiges Angebot abgelehnt.
 disbandUnit.text=Seid Ihr sicher, dass Ihr diese Einheit auflösen wollt?
 disbandUnit.yes=Auflösen
@@ -2399,7 +2440,9 @@ move.noAccessGoods=%nation% wird nicht mit einer unbeladenen %unit% handeln.
 move.noAccessMissionBan=Die %nation% lehnen jeglichen Kontakt mit unseren Missionaren ab.
 move.noAccessSettlement=Die %nation% verweigern unserem %unit% den Zutritt zu ihrer Siedlung.
 move.noAccessSkill=Unsere %unit% Einheit kann nichts von den Ureinwohnern lernen.
+# Fuzzy
 move.noAccessTrade=Wir sind nicht berechtigt mit anderen europäischen Nationen - wie die %nation% - Handel zu treiben.
+# Fuzzy
 move.noAccessWar=Wir können mit den %nation% nicht handeln solange wir im Krieg sind.
 move.noAccessWater=Unser %unit% muss zuerst an Land gehen bevor er die Siedlung betreten kann.
 move.noAttackWater=Unsere %unit% muss vor dem Angriff an Land gehen.
@@ -2465,6 +2508,7 @@ server.timeOut=Zeitüberschreitung beim Versuch mit dem Server zu verbinden.
 server.userNameInUse=Der angegebene Spielername wird bereits verwendet.
 server.userNameNotPresent=Der angegebene Benutzername ist nicht in diesem Spiel.
 server.wrongFreeColVersion=Die Versionen des Spiels auf dem Client sowie dem Server stimmen nicht überein.
+# Fuzzy
 buildColony.others=Die %nation% haben die neue Kolonie %colony% in %region% gegründet.
 cashInTreasureTrain.colonial=Ein Schatz mit %amount% Gold ist in Europa angekommen. Unsere Schatzkammer ist um %cashInAmount% Gold reicher!
 cashInTreasureTrain.independent=Ein Schatz im Wert von %amount% wurde unserem Nationalschatz hinzugefügt.
@@ -2474,6 +2518,7 @@ declareIndependence.announce=Die %oldNation% Kolonien haben ihre Unabhängigkeit
 declareIndependence.continentalArmyMuster=Um euch bei eurem Kampf für die Unabhängigkeit zu unterstützen {{plural:%number%|one=wurde|other=wurden}} %number% {{plural:%number%|%oldUnit%}} in %colony% zu {{plural:%number%|%unit%}} befördert!
 declareIndependence.interventionForce={{tag:country|%nation%}} verspricht feierlich ein Eingreiftruppe zur Unterstützung eures legitimen Kampfes für die Unabhängigkeit zu entsenden, sofern ihr %number% {{plural:%number%|one=Freiheitsglocke|other=Freiheitsglocken}} produziert, um eure Entschlossenheit zu beweisen.
 declareIndependence.nativeSupport=Die %nation% erklären ihre Verachtung für %ruler% und das königliche Expeditionskorps und versprechen, sie bei jeder Gelegenheit anzugreifen.
+# Fuzzy
 declareIndependence.nativeHostile=Unsere Spione berichten, dass das königliche Expeditionskorps Freundschaftsbeziehungen mit den %nation% gegründet haben. Achtung, sie könnten einen Angriff planen!
 declareIndependence.resolution=An diesem Tag hat der Kongress die wichtigste Resolution verabschiedet, die jemals in Amerika vorgenommen wurde.\n\nIch bin mir der Mühe und dem Blut und den Reichtümern sehr wohl bewusst, die es uns kosten wird, diese Erklärung zu behaupten, unsere Staaten zu unterstützen und zu verteidigen. Dennoch kann ich jenseits der Finsternis Strahlen von Licht und Ruhm sehen. Ich kann sehen, dass das Ende die Mittel mehr als aufwiegt. Und dass die Nachwelt in jenen Tagen siegen wird, selbst wenn wir es bedauern sollten, was wir bei Gott nicht werden.\n\nDas Königliche Expeditionskorps wird bald eintreffen. Bereitet unsere Verteidigung sorgfältig vor, während wir Freiwillige für eine neue Kontinentalarmee ausheben.
 declareIndependence.unitsSeized=Als Reaktion auf die Unabhängigkeitserklärung hat der König die folgenden Truppen in Europa und auf See beschlagnahmt: %units%
@@ -2572,6 +2617,7 @@ colopedia.unit.offensivePower=Angriffsstärke:
 colopedia.unit.price=Preis in Europa:
 colopedia.unit.productionBonus=Produktions{{plural:%number%|one=änderungsfaktor|other=änderungsfaktoren}}
 colopedia.unit.requirements=Vorraussetzungen:
+# Fuzzy
 colopedia.unit.school=Zur Ausbildung benötigtes Gebäude:
 colopedia.unit.skill=Fertigkeit:
 report.labour.allColonists=Alle Kolonisten
@@ -2606,8 +2652,8 @@ report.colony.grow.header=+
 report.colony.growing.description=%colony% kann um {{plural:%amount%|one=eine Einheit|other=%amount% Einheiten}} wachsen, ohne dass die Produktion beeinträchtigt wird
 report.colony.improve.description=Einheiten welche die Produktion verbessern könnten.
 report.colony.improve.header=Verbessert
+# Fuzzy
 report.colony.improving.description=%colony%: Um %amount% %goods% zusätzlich herstellen zu können: %oldUnit% durch %unit% austauschen
-report.colony.wanting.description=%colony%: Um %amount% %goods% zusätzlich herstellen zu können: %unit% hinzufügen
 report.colony.making.blocking.description=%colony%: %amount% %goods% werden {{plural:%turns%|one=in der nächsten Runde|other=in %turns% Runden}} für %buildable% benötigt.
 report.colony.making.constructing.description=%colony%: %buildable% wird {{plural:%turns%|one=in der nächsten Runde|other=in %turns% Runden}} fertiggestellt
 report.colony.making.description=Was diese Kolonie macht
@@ -2617,20 +2663,21 @@ report.colony.making.noconstruction.description=%colony% : Es finden keine Bauar
 report.colony.making.noteach.description=%colony%: %teacher% ohne Student
 report.colony.name.description=Die Liste der Kolonien
 report.colony.name.header=Kolonie
-report.colony.plow.description=Anzahl der Felder einer Kolonie, die sich durch Pflügen verbessern ließen
-report.colony.plow.header=P
-report.colony.plowing.description=%colony% würde vom Pflügen von {{plural:%amount%|one=einem Feld|other=%amount% Feldern}} profitieren
+# Fuzzy
 report.colony.production.description=%colony%: %goods% Produktion (netto) = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: %goods% Produktion (netto) beträgt %amount% (exportiere ab über %export%)
 report.colony.production.header=%goods% Produktion (netto)
+# Fuzzy
 report.colony.production.high.description=%colony%: %goods% Produktion (netto) = %amount%, voll bis {{plural:%turns%|one = nächste Runde|other = in %turns% Runden}}
+# Fuzzy
 report.colony.production.low.description=%colony%: %goods% Produktion (netto) = %amount%, leer bis {{plural:%turns%|one = nächste Runde|other = in %turns% Runden}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: %goods% Produktion (netto) = %amount%. Das Warenlager wird überquellen, %waste% wird verschwendet
-report.colony.road.description=Anzahl der Felder einer Kolonie, die sich durch das Bauen von Straßen verbessern ließen
-report.colony.road.header=S
-report.colony.roadBuilding.description=%colony% würde vom Bauen von {{plural:%amount%|one=einer Straße|other=%amount% Straßen}} profitieren
 report.colony.shrinking.description=%colony% muss um {{plural:%amount%|one=eine Einheit|other=%amount% Einheiten}} schrumpfen, um die Produktion zu verbessern
 report.colony.starving.description=%colony%: Hungersnot {{plural:%turns%|one=in der nächsten Runde|other=in %turns% Runden}}
+# Fuzzy
+report.colony.wanting.description=%colony%: Um %amount% %goods% zusätzlich herstellen zu können: %unit% hinzufügen
 report.continentalCongress.available=Verfügbar
 report.continentalCongress.elected=Gewählt wurde: %turn%
 report.continentalCongress.none=(keine)
@@ -2675,26 +2722,25 @@ report.production.selectGoods=Güter auswählen
 report.production.update=Aktualisieren
 report.requirements.badAssignment=%colony% hat einen %expert%, der derzeit als %expertWork% arbeitet, während ein %nonExpert% als %nonExpertWork% tätig ist. Die Produktion würde größer sein, sofern beide Kolonisten ihre Arbeitsplätze tauschten.
 report.requirements.canTrainExperts={{plural:2|%unit%}} können ausgebildet werden, und zwar als
-report.requirements.clearTile=%type% in %direction% %colony% würden von einer Rodung profitieren.
+# Fuzzy
 report.requirements.exploreTile=%type% in %direction% %colony% würden von einer Erforschung profitieren.
 report.requirements.met=Alle Bedingungen sind erfüllt.
 report.requirements.missingGoods=%colony% produziert %goods% benötigt dafür aber mehr %input%.
 report.requirements.misusedExperts=Es sind {{plural:2|%unit%}} vorhanden, die nicht als %work% arbeiten:
 report.requirements.noExpert=%colony% produziert %goods%, hat aber keinen %unit%.
-report.requirements.plowCenter=%colony% würde vom Pflügen seiner Felder profitieren.
-report.requirements.plowTile=%type% in %direction% %colony% würden vom Pflügen profitieren.
-report.requirements.roadTile=%type% in %direction% %colony% würden von Straßen profitieren.
 report.requirements.severalExperts=Mehrere {{plural:2|%unit%}} befinden sich in
 report.requirements.surplus=Ein Überangebot an %goods% wird produziert, und zwar in
 report.trade.afterTaxes=Einkommen nach Steuern
 report.trade.beforeTaxes=Einkommen vor Steuern
 report.trade.cargoUnits=Transportierte Einheiten
+# Fuzzy
 report.trade.hasCustomHouse=* Diese Kolonie hat ein Zollhaus; diese Waren werden exportiert.
 report.trade.totalDelta=Gesamt Produktion
 report.trade.totalUnits=Gesamt Einheiten
 report.trade.unitsSold=Gekaufte oder verkaufte Einheiten
 report.turn.filter=Diese Art von Meldung nicht anzeigen (%type%)
 report.turn.ignore=Ignoriere diese Meldung (Kolonie: %colony%, Waren: %goods%)
+# Fuzzy
 report.turn.playerNation=%player%s %nation%
 aboutPanel.copyright=Copyright © 2002–2015  Das FreeCol-Team
 aboutPanel.legalDisclaimer=FreeCol ist Freie Software: Sie dürfen es weiter verteilen und/oder verändern unter Berücksichtigung der Regeln zur GNU General Public License wie veröffentlicht durch die Free Software Foundation, entweder Version 2 der Lizenz, oder jede höhere Version.
@@ -2720,6 +2766,7 @@ colonyPanel.buildQueue=Bauwarteschlange
 colonyPanel.colonyUnits=Kolonieeinheiten
 colonyPanel.inPort=Im Hafen
 colonyPanel.outsideColony=Außerhalb der Kolonie
+# Fuzzy
 colonyPanel.producing=Herstellung:
 colonyPanel.reducePopulation=Wenn Ihr die Einwohnerzahl unter %number% vermindert wird %colony% nicht mehr in der Lage sein %buildable% zu bauen.
 colonyPanel.setGoods=Waren festlegen
@@ -2735,7 +2782,9 @@ confirmDeclarationDialog.areYouSure.no=Vielleicht später
 confirmDeclarationDialog.areYouSure.text=Lasst uns der ungerechten Tyrannei des Monarchen von %monarch% entsagen und die Unabhängigkeit unserer Kolonien von der Krone erklären!
 confirmDeclarationDialog.areYouSure.yes=Freiheit oder Tod!
 confirmDeclarationDialog.createFlag=und unsere Feinde werden beim Anblick unserer aufsässigen Fahne zittern.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Vereinigte Staaten von %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Freie %nation%
 confirmDeclarationDialog.enterCountry=Von diesem Tag an soll unser Land bekannt sein als
 confirmDeclarationDialog.enterNation=und jeder Bürger unserer glorreichen Nation möge stolz sein, bekannt zu sein als
@@ -2787,9 +2836,11 @@ negotiationDialog.add=Hinzufügen
 negotiationDialog.cancel=Abbrechen
 negotiationDialog.clear=Löschen
 negotiationDialog.contact.tutorial=Du triffst Europäische Kameraden. Sie werden mit dir um Land und Reichtümer wetteifern und es wohl wagen, Krieg gegen dich zu führen. Aber nachdem Jan de Witt dem Kontinentalkongress beigetreten ist, kannst du mit ihnen handeln.
+# Fuzzy
 negotiationDialog.demand=Die %nation% fordern von den %otherNation%
 negotiationDialog.exchange=im Gegenzug für
 negotiationDialog.goldAvailable=(%amount% Gold verfügbar)
+# Fuzzy
 negotiationDialog.offer=Die %nation% bieten den %otherNation%
 negotiationDialog.send=Abschicken
 negotiationDialog.title.contact=Europäische Kameraden treffen
@@ -2813,10 +2864,9 @@ findSettlementPanel.displayOnlyEuropean=Nur Europäische Siedlungen finden
 findSettlementPanel.displayOnlyNatives=Nur Eingeborenensiedlungen finden
 findSettlementPanel.name=Siedlung finden
 findSettlementPanel.settlement=%name%%capital% (%nation%)
+# Fuzzy
 firstContactDialog.meeting.natives=Treffen mit den Ureinwohnern...
 firstContactDialog.meeting.natives.tutorial=Du triffst Ureinwohner. Sende deine Späher zu ihren Siedlungen, um mehr über sie zu erfahren und deine Schuldknechte und freien Kolonisten, um mehr von ihnen zu lernen. Sende deine Schiffe und Wagenzüge zu ihren Siedlungen, wenn du vorhast, mit ihnen zu handeln.
-firstContactDialog.meeting.AZTEC=Das Reich der Azteken...
-firstContactDialog.meeting.INCA=Das Reich der Inka...
 firstContactDialog.welcomeOffer.text=Die %nation% grüßen Euch. Wir sind eine glorreiche Nation die %camps% %settlementType% umfasst. Um unsere Freundschaft zu feiern bieten wir Euch das Land welches Ihr derzeit besetzt als Geschenk an. Werdet Ihr diesen Vertrag akzeptieren und mit uns in Frieden als Brüder leben?
 firstContactDialog.welcomeSimple.text=Die %nation% grüßen Euch. Wir sind eine glorreiche Nation die %camps% %settlementType% umfasst. Werdet Ihr unseren Vertrag akzeptieren und mit uns in Frieden als Brüder leben?
 abandonColony.no=Abbrechen
diff --git a/data/strings/FreeColMessages_el.properties b/data/strings/FreeColMessages_el.properties
index 120e1f4d1..4b703e4a8 100644
--- a/data/strings/FreeColMessages_el.properties
+++ b/data/strings/FreeColMessages_el.properties
@@ -204,7 +204,6 @@ colopediaAction.goods.name=Αγαθά
 colopediaAction.nations.name=Ἐθνη
 colopediaAction.nationTypes.name=Εθνικά Πλεονεκτήματα
 colopediaAction.resources.name=Μπόνους Πόροι
-colopediaAction.skills.name=Ικανότητες
 colopediaAction.terrain.name=Τύποι εδάφους
 colopediaAction.units.name=Μονάδες
 declareIndependenceAction.name=Διακύρηξε την Ανεξαρτησία σου
@@ -885,18 +884,25 @@ model.direction.SW.name=νοτιοδυτικά
 model.direction.W.name=δυτικά
 model.direction.NW.name=βορειοδυτικά
 model.historyEventType.abandonColony.description=Εγκαταλείπεις την αποικία του %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Ανακαλύπτεις μια %city%, μια από τις Επτά Πόλεις του Χρυσού, και έναν θησαυρό χρυσού %treasure%.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Η αποικία %colony% κυριεύεται από το %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Η αποικία %colony% καταστρέφεται από το %nation%.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Καταστρέφεις τον %nation% καταυλισμό %settlement%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Καταστρέφεις το %nation%.
 model.historyEventType.discoverNewWorld.description=Ανακάλυψες το Νέο Κόσμο.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Ανακαλύπτεις το %region%.
 model.historyEventType.foundColony.description=Κατοχυρώνεις την αποικία του %colony%.
 model.historyEventType.foundingFather.description=Ο %father% λαμβάνει μέρος στο Ηπειρωτικό Κογκρέσο.
 model.historyEventType.independence.description=Επιτυγχάνεις ανεξαρτησία από το Στέμμα.
+# Fuzzy
 model.historyEventType.meetNation.description=Συναντάς το %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Το %nation% καταστρέφεται.
 model.indianSettlement.mostHatedNone=Κανένα
 model.indianSettlement.nameUnknown=Άγνωστο
@@ -929,6 +935,7 @@ model.nationState.available.shortDescription=Κυριεύεις την %nation%
 model.nationState.notAvailable.name=μη διαθέσιμοι
 model.player.independentMarket=Ευρώπη
 model.player.startGame=Μετά από μήνες στη θάλασσα, έχεις φτάσει στην ακτή μιας άγνωστης ηπείρου. Πλεύσε δυτικά προκειμένου να ανακαλύψεις τον νέο κόσμο και να τον διεκδικήσεις για τον λαό σου.
+# Fuzzy
 model.player.waitingFor=Αναμονή για: %nation%
 model.regionType.coast.name=Ακτή
 model.regionType.desert.name=Έρημος
@@ -980,9 +987,9 @@ model.unit.underRepair=Υπό επισκευή (%turns% {{plural:%turns%|one=tur
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1010,6 +1017,7 @@ error.couldNotLoad=Παρουσιάστηκε σφάλμα κατά την πρ
 # Fuzzy
 error.couldNotSave=Παρουσιάστηκε ένα σφάλμα κατά την προσπάθεια να αποθηκεύσετε το παιχνίδι!
 main.defaultPlayerName=Όνομα Παίχτη
+# Fuzzy
 client.choicePlayer=Παρακαλώ επιλέξτε έναν παίκτη:
 metaServer.couldNotConnect=Λυπούμαστε, αλλά δεν μπόρεσε  να συνδεθεί με το μετα-διακομιστή. Παρακαλώ δοκιμάστε αργότερα.
 metaServer.communicationError=Παρουσιάστηκε ένα σφάλμα κατά την επικοινωνία με το μετα-διακομιστή. Παρακαλούμε προσπαθήστε ξανά αργότερα.
@@ -1055,7 +1063,9 @@ cashInTreasureTrain.free=Ο βασιλιάς σου θα μεταφέρει το
 cashInTreasureTrain.pay=Ο βασιλιάς θα μεταφέρει το θησαυρό σου αν πάρει το 50% της αξίας του.
 defeated.text=Ηττηθήκατε! Τί θέλετε τώρα;
 defeated.yes=Ας μείνω να παρακολουθήσω
+# Fuzzy
 diplomacy.offerAccepted=Οι %nation% αποδέχθηκαν τη γενναιόδωρη προσφορά σας.
+# Fuzzy
 diplomacy.offerRejected=Οι %nation% αρνήθηκαν τη γενναιόδωρη προσφορά σας.
 disbandUnit.text=Σίγουρα θέλετε να διαλύσετε αυτή τη μονάδα;
 disbandUnit.yes=Αποστράτευση
@@ -1138,6 +1148,7 @@ colopedia.unit.price=Τιμή στην Ευρώπη:
 # Fuzzy
 colopedia.unit.productionBonus=Τροποποιητές παραγωγής:
 colopedia.unit.requirements=Απαιτήσεις:
+# Fuzzy
 colopedia.unit.school=Σχολείο που απαιτείται για την εκπαίδευση:
 colopedia.unit.skill=Ικανότητα:
 report.labour.allColonists=Όλοι οι άποικοι
@@ -1179,6 +1190,7 @@ report.production.update=Ενημέρωση
 report.trade.totalDelta=Συνολική Παραγωγή
 report.trade.totalUnits=Συνολικές Μονάδες
 report.turn.ignore=Αγνόησή αυτού του μηνύματος (Αποικία: %colony%, Αγαθά: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% του %player%
 # Fuzzy
 aboutPanel.copyright=Copyright (C) 2002-2014  Η ομάδα του FreeCol
@@ -1205,7 +1217,9 @@ colonyPanel.notBestTile=%unit% θα μπορούσε να παράγει περ
 confirmDeclarationDialog.areYouSure.no=Ίσως Αργότερα
 confirmDeclarationDialog.areYouSure.text=Ας αποκηρύξουμε την άδικη τυραννία του %monarch% και ας διακηρύξουμε την \nανεξαρτησία των αποικιών μας από το στέμμα!
 confirmDeclarationDialog.areYouSure.yes=Ελευθερία ή Θάνατος!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Ηνωμένες Πολιτείες %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Ελεύθερο %nation%
 confirmDeclarationDialog.enterCountry=Εφεξής, η χώρα μας θα είναι γνωστή ως
 confirmDeclarationDialog.enterNation=και κάθε πολίτης του ένδοξου έθνους μας θα είναι υπερήφανοι που θα αποκαλούνται
diff --git a/data/strings/FreeColMessages_eo.properties b/data/strings/FreeColMessages_eo.properties
index af6f828d2..32aff2191 100644
--- a/data/strings/FreeColMessages_eo.properties
+++ b/data/strings/FreeColMessages_eo.properties
@@ -251,7 +251,6 @@ colopediaAction.goods.name=Varoj
 colopediaAction.nations.name=Nacioj
 colopediaAction.nationTypes.name=Naciaj Avantaĝoj
 colopediaAction.resources.name=Bonusaj Rimedoj
-colopediaAction.skills.name=Fakuloj
 colopediaAction.terrain.name=Tipoj de tereno
 colopediaAction.units.name=Unuoj
 colopediaAction.name=%object% (Kolopedio)
@@ -1185,6 +1184,7 @@ model.improvement.road.description=Vojo
 model.improvement.road.name=Vojo
 model.improvement.road.occupationString=V
 model.limit.independence.coastalColonies.name=Limo de marborda kolonio
+# Fuzzy
 model.limit.independence.coastalColonies.description=Vi bezonas almenaŭ %limit% marbordajn koloniojn por proklami sendependecon.
 model.limit.independence.rebels.name=Limo de ribeluloj
 model.limit.independence.rebels.description=Almenaŭ %limit%% de viaj koloniistoj devas subteni sendependecon.
@@ -1512,18 +1512,24 @@ model.building.locationLabel=En %location%
 model.colony.badGovernment=La estraro de %colony% estas rendimenta. Minusoj por produktado estas aplikita.
 model.colony.governmentImproved1=La registaro de %colony% pliboniĝis, se ĝi ankoraŭ estas malrendimenta. Minusoj por produktado ankoraŭ aplikas.
 model.colony.governmentImproved2=La registaro de %colony% pliboniĝis. Minusoj por produktado ne jam aplikas.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% pliaj %outputType%j estus produktata en %colony%, se nur ni havus %inputAmount% pliajn unuojn de %inputType%.
 model.colony.minimumColonySize=%object% malhelpas malpligrandante la loĝantaron.
 model.colony.unbuildable=%colony% ne povas konstrui %object%n ĉi-momente. %object% estis forigita de la konstrulisto.
 model.colony.veryBadGovernment=La registaro de %colony% estas tre malrendimenta. Altaj minusoj por produktado estas aplikataj.
 model.colonyTile.claim=(depostula %direction%)
 model.diplomaticTrade.receive.contact=Fratecajn salutojn de la glora nacio de %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Ni negocu kun la %nation%.
 model.diplomaticTrade.receive.trade=Ni konsideru la komercoferto de %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=La %nation% postulas tributon de ni!
 model.diplomaticTrade.send.contact=Ni renkontas membrojn de la nacio %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Ni konsideru nian diplomatian situacion kun la %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Ni proponu komercon kun la %nation% ĉe %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Ni postulas tributon de la %nation% ĉe %settlement%.
 model.direction.N.name=norden
 model.direction.NE.name=nordorienten
@@ -1534,21 +1540,29 @@ model.direction.SW.name=sudokcidenten
 model.direction.W.name=okcidenten
 model.direction.NW.name=nordokcidenten
 model.historyEventType.abandonColony.description=Vi forlasas la kolonion %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=La %nation% malkovras %city%n, unu el la sep urboj de oro, kaj trezoron de ora %treasure%.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Via kolonio %colony% estas venkita de la %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Via kolonio %colony% estas detruita de la %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Ĉu vi aŭdacas akcepti Niajn malavarajn preskribojn kaj tamen eviti pagi? Por tia ruzemo vi rikoltos la maldolĉan rekompencon de Nia malplezuro.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Vi detruis %settlement%n de %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=La %nation% detruis la %nativeNation%n.
 model.historyEventType.discoverNewWorld.description=Vi malkovris la Novan Mondon.
+# Fuzzy
 model.historyEventType.discoverRegion.description=La %nation% malkovras %region%n.
 model.historyEventType.foundColony.description=Vi establi la kolonion %colony%.
 model.historyEventType.foundingFather.description=%father% aligas la Kontinentan Kongreson.
 model.historyEventType.independence.description=Vi atingas sendependeco de la Krono.
+# Fuzzy
 model.historyEventType.meetNation.description=Vi renkontas la %nation%n.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=La %nation% ne plu existas en la Nova Mondo.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=La %loserNation% cedas ĉiujn iliajn koloniojn en la Nova Mondo al la %nation%.
 model.indianSettlement.mostHatedNone=Neniu
 model.indianSettlement.mostHatedUnknown=Nekonata
@@ -1634,6 +1648,7 @@ model.noClaimReason.worked.description=Alia vilaĝo jam pretendas ĉi tiun areon
 model.player.forces=Trupoj de %nation%
 model.player.independentMarket=Eŭropo
 model.player.startGame=Post monatoj ĉe maro, vi finfine aliĝas apud la marlimo de nekonata kontinento. Vojaĝu {{tag:%direction%|west=okcidenten|east=orienten|default=laŭventen}} por malkovri la Novan Mondon kaj ekposedi ĝin por la Kronestro.
+# Fuzzy
 model.player.waitingFor=Atendas: %nation%n
 model.regionType.coast.name=Marlimo
 model.regionType.coast.unknown=Nekonata Marlimo
@@ -1673,6 +1688,7 @@ model.tradeItem.gold.name=Orpecoj
 model.tradeItem.gold.description=la sumo de %amount% orpecoj
 model.tradeItem.goods.name=Varoj
 model.tradeItem.incite.name=Deklari militon kontraŭ
+# Fuzzy
 model.tradeItem.incite.description=milito kontraŭ la %nation%.
 model.tradeItem.stance.name=Sinteno
 model.tradeItem.unit.name=Unuo
@@ -1691,9 +1707,9 @@ model.unit.underRepair=Riparante (%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=G
+# Fuzzy
 model.unit.unitState.skipped=~
 model.unit.unitState.toAmerica=A
 model.unit.unitState.toEurope=E
@@ -1724,10 +1740,12 @@ model.colony.warehouseOverfull=Via vardomo en %colony% atingis ĝian maksimumon
 model.colony.warehouseSoonFull=Via vardomo en %colony% troigos ĝian tenkapablon de %goods% dum la posta vico. %amount% unuoj de %goods% estas malŝparitaj.
 model.colony.warehouseWaste=Via vardomo en %colony% atingis ĝian maksimumon de %goods%. %waste% unuoj malŝpariĝis.
 model.colonyTile.resourceExhausted=Rimedo %resource% estas forkonsumita en %colony%.
+# Fuzzy
 model.game.spanishSuccession=Moŝto, la Milito de Hispana Sinsekvo finiĝis en Eŭropo. En la Traktato de Utrecht, la %loserNation% devis cedi ĉiujn koloniojn en la Nova Mondo al la %nation%!
 model.player.colonyGoodsParty.harbour=Viaj koloniistoj en %colony% forĵetis %amount% de %goods% en la maro por protesti la maljusta impostado de la Krono!
 model.player.colonyGoodsParty.horses=Viaj koloniistoj en %colony% liberigas %amount% ĉevalojn por protesti la nejustan impostadon de la Krono!
 model.player.colonyGoodsParty.landLocked=Viaj koloniistoj en %colony% bruligis %amount% unuojn de %goods% en la komercejo por protesti ĉi tiun maljustan impostadon de la Krono!
+# Fuzzy
 model.player.dead.european=Moŝto, la %nation% estas deklarita nekondiĉan eligon de Mondaj aferoj!
 model.player.dead.native=Moŝto, la %nation% estis detruita.
 model.player.disaster.effect.colonyDestroyed=%colony% tute detruiĝis.
@@ -1737,12 +1755,16 @@ model.player.foundingFatherJoinedCongress=%foundingFather% kunigas la Kongreson!
 model.player.interventionForceArrives=La promesita Intervena Armeo alvenas!
 model.player.soLDecrease=Membreco en la Filoj de Libereco en viaj kolonioj malaltiĝis al %newSoL% procentoj!
 model.player.soLIncrease=Membreco en la Filoj de Libereco en viaj kolonioj altiĝis al %newSoL% procentoj!
+# Fuzzy
 model.player.stance.alliance.declared=Moŝto, la %nation% alianciĝis kun ni!
 model.player.stance.alliance.others=Moŝto, la %attacker% estas aliancaj kun la %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Moŝto, la %nation% konsentas paciĝi kun ni!
 model.player.stance.ceaseFire.others=Moŝto, la %attacker% konstentas ĉesigi batalon kun la %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Moŝto, la %nation% estas pacema kun ni!
 model.player.stance.peace.others=Moŝto, la %attacker% estas paca kun la %defender%.
+# Fuzzy
 model.player.stance.war.declared=Bedaŭrinde, Moŝto, la %nation% deklaris militon kontraŭ ni!
 model.player.stance.war.others=Moŝto, la %attacker% deklaris militon kontraŭ la %defender%.
 combat.automaticDefence=Via %unit% en %colony% ektenas pafilojn por defendi la kolonion!
@@ -1758,6 +1780,7 @@ combat.enemyShipEvaded=%enemyUnit% de %enemyNation% evitis atakon de %unit%.
 combat.enemyShipSunk=%enemyNation% %enemyUnit% estas sinkita de %unit%!
 combat.equipmentCaptured=Avertu: la tribanoj de la %nation% akiris %equipment%n!
 combat.goodsStolen=%enemyUnit% de %enemyNation% ŝtelas %amount% %goods%n ĉe %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyUnit% de %enemyNation% ŝtelis %amount% orpecojn de %colony%.
 combat.indianTreasure=Vi ŝtelas %amount% de la vilaĝo de %settlement%.
 combat.nativeCapitalBurned=Vi bruligis %name%, la ĉefvilaĝo de la %nation%. La %nation% kapitulacas al via fortegeco!
@@ -1810,12 +1833,15 @@ main.defaultPlayerName=Nomo de ludanto
 main.javaVersion=La versio de Java %minVersion% aŭ pli nova estas rekomenda por funkcii FreeCol\n(%version% detektiĝis. Uzu --no-java-check por ignori ĉi tiun kontrolon).
 main.memory=Vi devas asigni pli ol %memory% bitokojn da memoro al la JVM.\n  Restartu FreeCol-on per:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol ne eblas trovi taŭgajn dosierujojn por konservi datumojn. Kontinuante, sed atentante problemojn.
+# Fuzzy
 client.choicePlayer=Bonvolu elekti ludanton:
 metaServer.couldNotConnect=Bedaŭrinde, la metaservilo ne estas konektebla. Bonvolu reprovi poste.
 metaServer.communicationError=Okazis eraro dum komunikado kun la meta-servilo. Bonvolu reprovi baldaŭ.
 abandonEducation.action.studying=lernante
 abandonEducation.action.teaching=instruante
+# Fuzzy
 abandonEducation.no=Ne, kontinuu la edukadon.
+# Fuzzy
 abandonEducation.yes=Jes, forlasu la kolonion.
 armedUnitSettlement.attack=Ataki
 armedUnitSettlement.tribute=Postuli tributon
@@ -1824,8 +1850,11 @@ boycottedGoods.text=Ĉar %goods% estis bojkotita de la Krono, vi ne povas vendi
 buy.moreGold=Negocii por pli malalta prezo
 buy.takeOffer=Akcepti la proponon
 buy.text=La %nation% volus vendi ties %goods% por %gold%:
+# Fuzzy
 confirmHostile.alliance=Vi ne povas ataki aliancan nacion! Ĉu vi ja volas rompi vian aliancon kun la %nation% kaj deklari militon?
+# Fuzzy
 confirmHostile.ceaseFire=Vi antaŭe subskribis pactraktaton kun la %nation%. Ĉu vi ja volas ataki?
+# Fuzzy
 confirmHostile.peace=Vi estas pacema kun la %nation%. Ĉu vi ja volas deklari militon?
 confirmTribute.no=Eble ni ne faros tion.
 # Fuzzy
@@ -1885,7 +1914,9 @@ defeated.text=Vi estis venkita! Ĉu vi volas:
 defeated.yes=Resti kaj spekti
 defeatedSinglePlayer.text=Vi estis venkita!\n\nĜi estas nun la tre sorĉa tempo de nokto. Kiam kirkkortaj tombejoj faŭkas kaj infero mem elspiras kontaĝon al ĉi tiu mondo, nun mi trinkus varman sangon kaj fari tiajn maldolĉan farojn kiel la tago tremus rigardi.
 defeatedSinglePlayer.yes=Eniri Venĝeman Modalon
+# Fuzzy
 diplomacy.offerAccepted=La %nation% akceptis vian malavaran proponon.
+# Fuzzy
 diplomacy.offerRejected=La %nation% malakceptis vian malavaran proponon.
 disbandUnit.text=Ĉu vi ja volas disigi ĉi tiun unuon?
 disbandUnit.yes=Disigi
@@ -1929,7 +1960,9 @@ move.noAccessContact=Ni unue establu kontakton kun la %nation%, Moŝto.
 move.noAccessGoods=La %nation% ne komercos kun malplena %unit%.
 move.noAccessSettlement=La %nation% ne permesas al nia %unit% por eniri ties vilaĝon.
 move.noAccessSkill=Nia %unit% ne povas lerni de la indiĝenoj.
+# Fuzzy
 move.noAccessTrade=Aŭtoritato mankas de ni komerci kun aliaj eŭropaj nacioj kiel %nation%.
+# Fuzzy
 move.noAccessWar=Ni ne povas komerci kun la %nation% dum ni militas.
 move.noAccessWater=Nia %unit% devas surlandigi antaŭ enirante la kolonion.
 move.noAttackWater=Nia %unit% surlandiĝu antaŭ atakante.
@@ -2067,6 +2100,7 @@ colopedia.unit.offensivePower=Ataka Potenco:
 colopedia.unit.price=Prezo en Eŭropo
 colopedia.unit.productionBonus={{plural:%number%|one=Modifigo|other=Modifigoj}} de produktado:
 colopedia.unit.requirements=Necesoj:
+# Fuzzy
 colopedia.unit.school=Lernejo bezonita por trejni:
 colopedia.unit.skill=Spertnivelo:
 report.labour.allColonists=Ĉiuj Kolonistoj
@@ -2097,26 +2131,27 @@ report.colony.explore.header=E
 report.colony.exploring.description=Esplori {{plural:%amount%|one=unu kahelon|other=%amount% kahelojn}} helpus %colony%n
 report.colony.grow.header=+
 report.colony.improve.header=Plibonigi
+# Fuzzy
 report.colony.improving.description=<HTML>%colony%: Por fari %amount% pli de %goods%<BR>anstataŭigu %oldUnit%n kun %unit%n</HTML>
-report.colony.wanting.description=%colony%: Por fari %amount% pli da %goods%, aldonu %unit%n
 report.colony.making.description=Kion ĉi tiu kolonio faras.
 report.colony.making.educating.description=%colony%: %teacher% diplomiĝos {{plural:%turns%|one=dum la sekva vico|other=en %turns% vicoj}}
 report.colony.making.header=Faras
 report.colony.making.noteach.description=%colony%: %teacher% mankas studenton
 report.colony.name.description=La listo de kolonioj
 report.colony.name.header=Kolonio
-report.colony.plow.description=Nombro de kolonio-kaheloj kiun plugado helpus.
-report.colony.plow.header=R
-report.colony.plowing.description=Plugi {{plural:%amount%|one=unu kahelon|other=%amount% kahelojn}} helpus %colony%n
+# Fuzzy
 report.colony.production.description=%colony%: neta produktado de %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: neta produktado de %goods% estas %amount% (eksportado superas %export%)
 report.colony.production.header=Neta produktado de %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: neta produktado de %goods% = %amount%, pleniĝos {{plural:%turns%|one=en sekva vico|other=en %turns% vicoj}}
+# Fuzzy
 report.colony.production.low.description=%colony%: neta produktado de %goods% = %amount%, malpleniĝos {{plural:%turns%|one=en sekva vico|other=en %turns% vicoj}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: neta produktado de %goods% = %amount%, la staplo superfluos, %waste% estos malŝparita.
-report.colony.road.description=Nombro de kolonio-kaheloj kiun vojkonstruado helpus.
-report.colony.road.header=V
-report.colony.roadBuilding.description=Konstrui {{plural:%amount%|one=vojon|other=%amount% vojojn}} helpus %colony%n
+# Fuzzy
+report.colony.wanting.description=%colony%: Por fari %amount% pli da %goods%, aldonu %unit%n
 # Fuzzy
 report.continentalCongress.elected=Deputita:
 report.continentalCongress.none=(nenio)
@@ -2166,12 +2201,14 @@ report.requirements.surplus=Troaĵon de %goods% estas produktita ĉe
 report.trade.afterTaxes=Enspezo post imposto
 report.trade.beforeTaxes=Enspezo antaŭ imposto
 report.trade.cargoUnits=Unuoj en Kargo
+# Fuzzy
 report.trade.hasCustomHouse=* Ĉi tiu kolonio havas doganan domon; ĉi tiuj varoj estas eksportitaj.
 report.trade.totalDelta=Ĉiu Produktado
 report.trade.totalUnits=Ĉiuj Unuoj
 report.trade.unitsSold=Unuoj aĉetitaj aŭ venditaj
 report.turn.filter=Ne montri ĉi tian mesaĝon (%type%)
 report.turn.ignore=Ignori ĉi tiun mesaĝon: (Kolonio: %colony%, Varoj: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% de %player%
 aboutPanel.copyright=Aŭtorrajto © 2002–2015 La Teamo FreeCol
 aboutPanel.legalDisclaimer=FreeCol estas libera programaro: vi rajtas distribui kaj/aŭ modifi ĝin laŭ la reguloj de la GNU Ĝenerala Publika Permesilo kiel ĝi estas publikigita de la Fondaĵo de Libera Programaro, aŭ versio 2 de la Permesilo, aŭ iu posta versio.
@@ -2195,6 +2232,7 @@ chooseFoundingFatherDialog.title=Kandidatigu naciofondonton
 colonyPanel.colonyUnits=Koloniaj unuoj
 colonyPanel.inPort=En havenurbo
 colonyPanel.outsideColony=Ekster la kolonio
+# Fuzzy
 colonyPanel.producing=Produktas:
 colonyPanel.reducePopulation=Se vi malpligrandigus sub %number% la loĝantaron en %colony%, %buildable% ne plu estus konstrueble tie.
 colonyPanel.bonusLabel=Bonuso: %number%%extra%
@@ -2205,7 +2243,9 @@ colonyPanel.notBestTile=%unit% ne povis produkti pliajn %goods%n en %tile%.
 confirmDeclarationDialog.areYouSure.no=Eble baldaŭ
 confirmDeclarationDialog.areYouSure.text=Ni forlasu la maljustan tiranon de %monarch% kaj deklaru la sendependecon de niaj kolonioj for la krono!
 confirmDeclarationDialog.areYouSure.yes=Libereco aŭ Morto!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Unigitaj Ŝtatoj de %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Libera %nation%
 confirmDeclarationDialog.enterCountry=Ekde nun, nia lando estas konata kiel
 confirmDeclarationDialog.enterNation=kaj ĉiu civitano de nia glora lando fiere estos konata kiel
@@ -2256,8 +2296,10 @@ negotiationDialog.add=Aldoni
 negotiationDialog.cancel=Nuligi
 negotiationDialog.clear=Nuligi
 negotiationDialog.contact.tutorial=Vi renkontas aliajn eŭropanojn. Ili rivalas vin por teritorio kaj riĉaĵoj, kaj eble militos kontraŭ vi. Sed post Jan de Witt aligas la Kontinentan Kongreson, vi povas komerci kun ili.
+# Fuzzy
 negotiationDialog.demand=La %nation% postulas de la %otherNation%
 negotiationDialog.exchange=kompense por
+# Fuzzy
 negotiationDialog.offer=La %nation% proponas al la %otherNation%
 negotiationDialog.send=Sendi
 negotiationDialog.title.contact=Renkontante aliajn eŭropanojn.
@@ -2280,9 +2322,8 @@ findSettlementPanel.displayAll=Trovi ĉiujn loĝejoj
 findSettlementPanel.displayOnlyEuropean=Trovi nur eŭropajn loĝejojn
 findSettlementPanel.displayOnlyNatives=Trovi nur indiĝenajn loĝejojn
 findSettlementPanel.name=Trovi Loĝejojn
+# Fuzzy
 firstContactDialog.meeting.natives=Renkontante la indiĝenulojn...
-firstContactDialog.meeting.AZTEC=La Azteka nacio...
-firstContactDialog.meeting.INCA=La Inkaa imperio...
 abandonColony.no=Nuligi
 abandonColony.text=Ĉu ni ja forlasos nian kolonion?
 abandonColony.yes=Dislasi
diff --git a/data/strings/FreeColMessages_es_ES.properties b/data/strings/FreeColMessages_es_ES.properties
index a7ee8b13d..d5d831080 100644
--- a/data/strings/FreeColMessages_es_ES.properties
+++ b/data/strings/FreeColMessages_es_ES.properties
@@ -293,7 +293,6 @@ colopediaAction.goods.name=Bienes
 colopediaAction.nations.name=Naciones
 colopediaAction.nationTypes.name=Ventajas Nacionales
 colopediaAction.resources.name=Recursos Bonificados
-colopediaAction.skills.name=Habilidades
 colopediaAction.terrain.name=Tipos de Terreno
 colopediaAction.units.name=Unidades
 colopediaAction.name=%object% (Colopedia)
@@ -1511,6 +1510,7 @@ model.improvement.road.description=Camino
 model.improvement.road.name=Camino
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Límite de colonia costera
+# Fuzzy
 model.limit.independence.coastalColonies.description=Necesitas al menos %limit% colonias costeras para declarar la independencia.
 model.limit.independence.rebels.name=Límite de rebeldes
 model.limit.independence.rebels.description=Al menos %limit%% de tus colonos debe apoyar la independencia.
@@ -1846,6 +1846,7 @@ model.colony.badGovernment=El gobierno de %colony% es ineficiente. Hay penalizac
 model.colony.goodGovernment=¡Ha mejorado la eficiencia gubernamental! El sentimiento rebelde en %colony% ahora es igual o superior al %number% por ciento.
 model.colony.governmentImproved1=El gobierno de %colony% ha mejorado, pero todavía es ineficiente. Todavía hay penalizaciones a la producción.
 model.colony.governmentImproved2=El gobierno de %colony% ha mejorado. Ya no hay penalizaciones a la producción.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% más de %outputType% se podrían producir en %colony%, si tuviéramos %inputAmount% más de %inputType%.
 model.colony.lostGoodGovernment=¡La eficiencia gubernamental ha disminuido! El sentimiento rebelde en %colony% ya no es igual o superior a  %number% por ciento. La colonia ya no consigue bonificaciones de producción.
 model.colony.lostVeryGoodGovernment=La eficiencia gubernamental ha disminuido! El sentimiento rebelde en %colony% ya no es igual o superior al %number%  por ciento. Algunas bonificaciones de producción se han perdido.
@@ -1860,12 +1861,17 @@ model.colony.veryBadGovernment=El gobierno de %colony% es muy ineficiente. Hay e
 model.colony.veryGoodGovernment=¡Ha mejorado la eficiencia del Gobierno! El sentimiento rebelde en  %colony%  ahora es igual o superior a  %number%  por ciento.
 model.colonyTile.claim=(reivindicar %direction%)
 model.diplomaticTrade.receive.contact=Saludos fraternos de la gloriosa nación %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Negociemos con la %nation%.
 model.diplomaticTrade.receive.trade=Consideremos la oferta de comercio de %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=¡Los %nation% están exigiendo tributo de nosotros!
 model.diplomaticTrade.send.contact=Nos hemos encontrado con los miembros de la nación %nation%
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Consideremos nuestra situación diplomática con el  %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Vamos a proponer un negocio con el %nation% en %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Exigimos tributo de %nation% en %settlement%.
 model.direction.N.name=norte
 model.direction.NE.name=noreste
@@ -1876,23 +1882,35 @@ model.direction.SW.name=suroeste
 model.direction.W.name=oeste
 model.direction.NW.name=noroeste
 model.historyEventType.abandonColony.description=Abandona la colonia de %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Alto el fuego con %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=La %nation% descubre %city%, una de la siete ciudades de oro, y un tesoro de %treasure% oro.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Su colonia %colony% ha sido conquistada por el gorbenante %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Su colonia %colony% ha sido destruida por los %nation%.
 model.historyEventType.conquerColony.description=Conquistaste la colonia %nation% de %colony%.
 model.historyEventType.declareIndependence.description=Declaras independencia de la Corona.
+# Fuzzy
 model.historyEventType.declareWar.description=Guerra declarada con %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Los  %nation%  destruyen a  los %nativeNation% .
 model.historyEventType.discoverNewWorld.description=Descubres el Nuevo Mundo.
+# Fuzzy
 model.historyEventType.discoverRegion.description=La %nation% descubre %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Alianza negociada con %nation%.
 model.historyEventType.foundColony.description=Establece la colonia de %colony%.
 model.historyEventType.foundingFather.description=%father% se une al Congreso Continental.
 model.historyEventType.independence.description=Consigue la independencia de la Corona.
+# Fuzzy
 model.historyEventType.makePeace.description=Acuerdo de paz con %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Encuentra la %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=La %nation% no está más presente en el nuevo mundo.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=La %loserNation% cede todas sus colonias en el Nuevo Mundo a la %nation%.
 model.indianSettlement.mostHatedNone=Ninguno
 model.indianSettlement.mostHatedUnknown=Desconocido
@@ -1946,9 +1964,12 @@ model.messageType.warehouseCapacity.name=Capacidad del almacén
 model.messageType.warning.name=Avisos
 model.monarch.action.addToRef.text=La Corona ha añadido %number% {{plural:%number%|%unit%}} a la Real Fuerza Expedicionaria. Los líderes coloniales expresan su preocupación.
 model.monarch.action.addToRef.no=Hecho
+# Fuzzy
 model.monarch.action.declarePeace.text=Hemos acordado amablemente un tratado de paz con los  %nation%.
 model.monarch.action.declarePeace.no=Hecho
+# Fuzzy
 model.monarch.action.declareWar.text=¡La insolencia de %nation% nos obliga a declararles la guerra!
+# Fuzzy
 model.monarch.action.declareWarSupported.text=La insolencia de la %nation% ¡Nos obliga a declararles la guerra! Para agilizar este asunto, nuestras tropas leales (%force%) esperan sus órdenes y una nueva suma de %gold% ha sido añadido a su tesoro.
 model.monarch.action.declareWar.no=Hecho
 model.monarch.action.displeasure.text=Te atreves a aceptar Nuestros generosos términos y, sin embargo, evadir el pago? Tal duplicidad cosechará la amarga recompensa de Nuestro desagrado.
@@ -2007,6 +2028,7 @@ model.player.colonialIndependence=Solamente los jugadores coloniales pueden decl
 model.player.forces=Ejército %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Después de meses en el mar, ha llegado finalmente a la costa de un continente desconocido. Navegue {{tag:%direction%|west=hacia el oeste|east=hacia el este|default=de cara al viento}} para descubrir el Nuevo Mundo y reclámelo para la Corona.
+# Fuzzy
 model.player.waitingFor=Esperando a: %nation%
 model.regionType.coast.name=Costa
 model.regionType.coast.unknown=Región Costera Desconocida
@@ -2046,6 +2068,7 @@ model.tradeItem.gold.name=Oro
 model.tradeItem.gold.description=La suma de %amount% de oro
 model.tradeItem.goods.name=Mercancías
 model.tradeItem.incite.name=Declarar la guerra contra
+# Fuzzy
 model.tradeItem.incite.description=la guerra en contra de %nation%
 model.tradeItem.stance.name=Postura
 model.tradeItem.unit.name=Unidad
@@ -2068,9 +2091,9 @@ model.unit.underRepair=Reparación(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -2111,6 +2134,7 @@ model.colony.warehouseSoonFull=El almacén de %colony% excederá su capacidad de
 model.colony.warehouseWaste=El almacén de %colony% ha excedido su capacidad de %goods%. %waste% unidades se han perdido.
 model.colony.workersEvicted=En %colony%, tus colonos no pueden trabajar en %location%, debido a la presencia de %enemyUnit%.
 model.colonyTile.resourceExhausted=Se ha agotado el recurso %resource% en %colony%
+# Fuzzy
 model.game.spanishSuccession=Su excelencia, la guerra de sucesión española ha terminado en Europa. En el tratado de Utrecht, la %loserNation% fue forzada a ceder todas las colonias en el Nuevo Mundo a la %nation%!
 model.indianSettlement.mission.denounced=Tu misionero en %settlement% ha sido denunciado y ejecutado!
 model.indianSettlement.mission.destroyed=Tu misionero en %settlement% ha muerto en la destrucción del asentamiento.
@@ -2120,6 +2144,7 @@ model.player.autoRecruit=Disturbios religiosos en  %europe%  provocan que  %unit
 model.player.colonyGoodsParty.harbour=¡Sus colonos de %colony% han arrojado %amount% unidades de %goods% al mar en protesta por este impuesto injusto de la Corona!
 model.player.colonyGoodsParty.horses=¡Sus colonos de %colony% han liberado %amount% caballos en protesta por este impuesto injusto de la Corona!
 model.player.colonyGoodsParty.landLocked=¡Sus colonos de %colony% han quemado la cantidad de %amount% de %goods% en el mercado en protesta de este impuesto injusto de la Corona!
+# Fuzzy
 model.player.dead.european=Su excelencia, la %nation% ha declarado una retirada incondicional de los asuntos del Nuevo Mundo!
 model.player.dead.native=Su Excelencia, la %nation% ha sido destruída.
 model.player.disaster.bankruptcy.start=No has podido pagar el mantenimiento de todos los edificios. Se aplicarán sanciones de producción severas.
@@ -2133,12 +2158,16 @@ model.player.ignoredTax=La Corona ha elevado la tasa de impuesto a %amount%% com
 model.player.interventionForceArrives=¡Llega la fuerza de intervención prometida!
 model.player.soLDecrease=¡Los Hijos de la Libertad en sus colonias han disminuido al %newSoL% por ciento!
 model.player.soLIncrease=¡Los Hijos de la Libertad en sus colonias han aumentado al %newSoL% por ciento!
+# Fuzzy
 model.player.stance.alliance.declared=Su Excelencia, ¡El gobernante %nation% es nuestro aliado!
 model.player.stance.alliance.others=Su Excelencia, ¡los gobernantes %attacker% y %defender% son aliados!.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Su Excelencia, ¡el gobernante %nation% ha accedido a un alto el fuego con nosotros!
 model.player.stance.ceaseFire.others=Su Excelencia, el %attacker% ha accedido a un alto el fuego con el %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Su Excelencia, ¡estamos en paz con el gobernante %nation%!
 model.player.stance.peace.others=Su Excelencia, los gobernantes %attacker% y %defender% están en paz.
+# Fuzzy
 model.player.stance.war.declared=Malas noticias, Su Excelencia, ¡el gobernador %nation% nos ha declarado la guerra!
 model.player.stance.war.others=Su Excelencia, el gobernador %attacker% le ha declarado la guerra al %defender%.
 combat.automaticDefence=¡Su %unit% en %colony% ha tomado armas para defender la colonia!
@@ -2154,6 +2183,7 @@ combat.enemyShipEvaded=Un %enemyUnit% %enemyNation% ha evadido el ataque de %uni
 combat.enemyShipSunk=¡Un %unit% ha hundido un %enemyUnit% %enemyNation%!
 combat.equipmentCaptured=¡Precaución, los guerreros %nation% han conseguido %equipment%!
 combat.goodsStolen=¡Un %enemyUnit% %enemyNation% roba %amount% unidades de %goods% en %colony%!
+# Fuzzy
 combat.indianPlunder=Un %enemyUnit% %enemyNation% saquea %amount% de %colony%.
 combat.indianRaid=Nuestros espías informan que %nation% ha invadido la colonia %colonyNation% de %colony%.
 combat.indianSurprise=%nation%  hace un ataque sorpresa en %colony%, asustando a nuestros colonos. El jefe de %nation% niega su participación.
@@ -2208,6 +2238,7 @@ main.javaVersion=La versión de Java %minVersion% o mejor es recomendada para po
 main.memory=Necesitas asignar más de %memory% bytes de memoria para JVM.\n  Reinicia FreeCol con:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol no puede encontrar directorios adecuados para guardar los datos de usuario. Procediendo, pero se esperan problemas.
 client.baseData=No se encontró el directorio de la base de datos %dir%.\n  No se encontraron los archivos de datos de FreeCol.\n  Por favor, asegúrate de que existen.\n  Si FreeCol está buscando en el directorio equivocado,\n  ejecuta el juego con el parámentro de línea de comando:\n  --freecol-data <data-directory>
+# Fuzzy
 client.choicePlayer=Elija un jugador:
 client.classic=Error al cargar la asignación de recursos del conjunto de reglas 'clásico'.
 client.ending=La partida está terminándose.
@@ -2219,8 +2250,10 @@ metaServer.couldNotConnect=No se pudo conectar al meta-server. Por favor, pruebe
 metaServer.communicationError=Hubo un error al comunicarse con el meta-server. Por favor, pruebe otra vez.
 abandonEducation.action.studying=estudiando
 abandonEducation.action.teaching=enseñando
+# Fuzzy
 abandonEducation.no=No, continuar la educación
 abandonEducation.text=Si tu %unit% abandona %colony% abandonará %action% en el %building%, ¿estás seguro que desea abandonar?
+# Fuzzy
 abandonEducation.yes=Sí, salir de la colonia
 abandonTeaching.text=Si tu %unit% deja el %building%, dejará de enseñanzar, ¿estás seguro que debe irse?
 armedUnitSettlement.attack=Atacar
@@ -2232,10 +2265,14 @@ buy.takeOffer=Aceptar la oferta
 buy.text=Los %nation% querríamos vender nuestros %goods% por %gold%:
 clearTradeRoute.text=Tu %unit% esta asignada para comerciar la ruta %route%. Configurando su destino lo cambiara por la ruta de comercio.¿Estás seguro de querer hacerlo?
 client.fullScreen=El modo en pantalla completa no es compatible con este GraphicsDevice.\nVolver al modo de ventana.
+# Fuzzy
 confirmHostile.alliance=No puedes atacar una nación aliada! Realmente deseas romper tu alianza con el %nation% y declarar la guerra?
+# Fuzzy
 confirmHostile.ceaseFire=Habéis firmado un alto el fuego con el gobernador %nation%. ¿Realmente queréis atacar?
+# Fuzzy
 confirmHostile.peace=Estás en paz con el %nation%. Realmente deseas declarar la guerra?
 confirmHostile.yes=¡Si, evitemos los perros de la guerra!
+# Fuzzy
 confirmTribute.broke=Nuestros espías informan que los %nation% están totalmente arruinados. No perdamos nuestro tiempo exigiendo tributos.
 confirmTribute.european=Los %nation% %danger%, y %finance%. ¿Cuánto tributo debemos de exigir de ellos?
 confirmTribute.happy=Los %nation% en %settlement% son buenos amigos, es una lástima dañar nuestra amistad.
@@ -2255,6 +2292,7 @@ indianLand.cancel=Abandonar las tierras
 indianLand.pay=Ofrecer %amount% de oro por las tierras
 indianLand.take=Tomar lo que es nuestro por derecho
 indianLand.text=Estas tierras son de %player%. Querría:
+# Fuzzy
 indianLand.unknown=Gentes desconocidas viven en estas tierras. Quieres:
 info.autodetectLanguageSelected=Ha elegido autodetectar el idioma. Esto se realizará la próxima vez que inicie el juego.
 info.enterSomeText=Por favor, introduzca texto.
@@ -2300,7 +2338,9 @@ defeated.text=¡Ha sido derrotado!. Quiere:
 defeated.yes=Permanecer y Mirar
 defeatedSinglePlayer.text=¡Has sido derrotado!\n\nAhora es el período oscuro de la noche, cuando los campanarios bostezan y el mismo infierno inunda este mundo., ¡Ahora podrías beber sangre caliente! y realizar actos tan abominables que el mismo día temblaría al verlos.
 defeatedSinglePlayer.yes=Entrar en modo de venganza
+# Fuzzy
 diplomacy.offerAccepted=Los %nation% han aceptado su generosa oferta.
+# Fuzzy
 diplomacy.offerRejected=Los %nation% han rechazado su generosa oferta.
 disbandUnit.text=¿Está seguro de querer eliminar esta unidad?
 disbandUnit.yes=Disolver
@@ -2346,7 +2386,9 @@ move.noAccessGoods=La  %nation%  no comercia con una %unit% vacía .
 move.noAccessMissionBan=Los %nation% rechazan tener cualquier contacto con tus misioneros.
 move.noAccessSettlement=La %nation% no permite a nuestra %unit% entrar en su asentamiento.
 move.noAccessSkill=Nuestra %unit% no puede aprender de los nativos.
+# Fuzzy
 move.noAccessTrade=No tenemos autoridad para comerciar con otras naciones europeas tales como la %nation%.
+# Fuzzy
 move.noAccessWar=No podemos comerciar con la %nation% mientras haya guerra.
 move.noAccessWater=Nuestra %unit% debe desembarcar primero antes de entrar al asentamiento.
 move.noAttackWater=Nuestra  %unit%  debe aterrizar antes de atacar.
@@ -2408,6 +2450,7 @@ server.timeOut=Se excedió el tiempo al conectarse al servidor.
 server.userNameInUse=El nombre de usuario especificado ya está en uso.
 server.userNameNotPresent=El nombre de usuario especificado no está en esta partida.
 server.wrongFreeColVersion=No coinciden las versiones cliente y servidor de FreeCol.
+# Fuzzy
 buildColony.others=La %nation%  han fundado la nueva colonia de %colony% en  %region%.
 cashInTreasureTrain.colonial=Un tesoro de %amount% doblones de oro ha llegado a Europa. %cashInAmount% doblones de oro más están disponibles.
 cashInTreasureTrain.independent=Un tesoro de %amount% ha sido agregado al tesoro nacional.
@@ -2515,6 +2558,7 @@ colopedia.unit.offensivePower=Poder Ofensivo:
 colopedia.unit.price=Precio en Europa:
 colopedia.unit.productionBonus={{plural:%number%|one=modificador|other=modificadores}} de producción:
 colopedia.unit.requirements=Requerimientos:
+# Fuzzy
 colopedia.unit.school=Centro requerido para enseñar:
 colopedia.unit.skill=Habilidad:
 report.labour.allColonists=Todos los Colonos
@@ -2549,8 +2593,8 @@ report.colony.grow.header=+
 report.colony.growing.description=%colony% puede aumentar {{plural:%amount%|one=en una unidad|other=en %amount% unidades}} sin perjudicar la producción
 report.colony.improve.description=Unidades que podrían mejorar la producción.
 report.colony.improve.header=Mejorar
+# Fuzzy
 report.colony.improving.description=%colony%: Para producir %amount% más %goods%, substituye %oldUnit% por %unit%
-report.colony.wanting.description=%colony%: Para producir %amount% más %goods%, añade %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% necesarios para %buildable% {{plural:%turns%|one=en el siguiente turno|other=en %turns% turnos}}
 report.colony.making.constructing.description=%colony%: %buildable% se completa {{plural:%turns%|one=en el siguiente turno|other=en %turns% turnos}}
 report.colony.making.description=Lo que está haciendo esta colonia
@@ -2560,20 +2604,21 @@ report.colony.making.noconstruction.description=%colony%: No hay construcciones
 report.colony.making.noteach.description=%colony%: %teacher% no tiene estudiantes
 report.colony.name.description=La lista de colonias
 report.colony.name.header=Colonia
-report.colony.plow.description=Número de cuadrantes de la colonia que se beneficiarían del arado
-report.colony.plow.header=P
-report.colony.plowing.description=%colony% se beneficiaría de arar {{plural:%amount%|one=un cuadrante|other=%amount%  cuadrantes}}
+# Fuzzy
 report.colony.production.description=%colony%: produción neta de %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: la produción neta de %goods% es de %amount% (exportación superior a %export%)
 report.colony.production.header=Produción neta de %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: produción neta de %goods% = %amount%; completa {{plural:%turns%|one=en el siguiente turno|other=en %turns% turnos}}
+# Fuzzy
 report.colony.production.low.description=%colony%: produción neta de %goods% = %amount%; desaparecerá {{plural:%turns%|one=en el siguiente turno|other=en %turns% turnos}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: produción neta de %goods% = %amount%; el almacén se desbordará, se perderán %waste%
-report.colony.road.description=Número de cuadrantes de la colonia que se beneficiarían de construir carreteras
-report.colony.road.header=R
-report.colony.roadBuilding.description=%colony% se beneficiaría de construir {{plural:%amount%|one=una carretera|other=%amount%  carreteras}}
 report.colony.shrinking.description=%colony% debe disminuir {{plural:%amount%|one=en una unidad|other=en %amount% unidades}} para mejorar la producción
 report.colony.starving.description=%colony%: hambre {{plural:%turns%|one=en el siguiente turno|other=en %turns% turnos}}
+# Fuzzy
+report.colony.wanting.description=%colony%: Para producir %amount% más %goods%, añade %unit%
 report.continentalCongress.available=Disponible
 report.continentalCongress.elected=Elegido: %turn%
 report.continentalCongress.none=(ninguno)
@@ -2617,26 +2662,25 @@ report.production.selectGoods=Seleccionar bienes
 report.production.update=Actualizar
 report.requirements.badAssignment=La colonia %colony% tiene un %expert% trabajando como %expertWork%, mientras un %nonExpert% está trabajando como %nonExpertWork%. La producción sería mayor si los colonos intercambiaran funciones.
 report.requirements.canTrainExperts={{plural:2|%unit%}} pueden ser entrenadas en
-report.requirements.clearTile=%type% hacia la %direction% de %colony%  se beneficiaría de la limpieza.
+# Fuzzy
 report.requirements.exploreTile=%type% hacia la %direction% de %colony% se beneficiaría de la exploración.
 report.requirements.met=Posee todo lo necesario.
 report.requirements.missingGoods=En %colony% se producen %goods%, pero necesita más %input%.
 report.requirements.misusedExperts=Hay {{plural:2|%unit%}} que no están trabajando como %work% en
 report.requirements.noExpert=En %colony% se producen %goods%, pero no tiene %unit%.
-report.requirements.plowCenter=%colony% se beneficiaría de arar su cuadrante.
-report.requirements.plowTile=%type% hacia la %direction% de %colony% se beneficiaría de arar.
-report.requirements.roadTile=%type% hacia la %direction% de %colony%  se beneficiaría de construir carreteras.
 report.requirements.severalExperts=Varias {{plural:2|%unit%}} están presentes en
 report.requirements.surplus=Un excedente de %goods%: está siendo producido en
 report.trade.afterTaxes=Beneficio después de impuestos
 report.trade.beforeTaxes=Beneficio antes de impuestos
 report.trade.cargoUnits=Unidades en Transporte
+# Fuzzy
 report.trade.hasCustomHouse=* Esta colonia tiene una aduana; estos bienes se exportan.
 report.trade.totalDelta=Producción Total
 report.trade.totalUnits=Unidades Totales
 report.trade.unitsSold=Unidades compradas o vendidas
 report.turn.filter=No mostrar este tipo de mensaje: (%type%)
 report.turn.ignore=Ignorar este mensaje (Colonia: %colony%, Bienes: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% de %player%
 aboutPanel.copyright=Derechos de autor © 2002-2015 del equipo de FreeCol
 aboutPanel.legalDisclaimer=Freecol es software libre: Puede redistribuirlo y/o modificarlo bajo los términos de LPG Licencia Pública General tal y como se ha publicado por la Fundación del Software Libre, bien por la versión 2 de la Licencia, o cualquier versión posterior.
@@ -2662,6 +2706,7 @@ colonyPanel.buildQueue=Edificios en espera
 colonyPanel.colonyUnits=Unidades de la colonia
 colonyPanel.inPort=En el puerto
 colonyPanel.outsideColony=Fuera de la colonia
+# Fuzzy
 colonyPanel.producing=Produciendo:
 colonyPanel.reducePopulation=Si reduces la población debajo de %number%, %colony% no será más capaz de contruir %buildable%.
 colonyPanel.unitChange=En %colony%, un %oldType% se ha convertido en un %newType%.
@@ -2675,7 +2720,9 @@ confirmDeclarationDialog.areYouSure.no=Quizá más tarde
 confirmDeclarationDialog.areYouSure.text=Renunciemos a la injusta tiranía de %monarch% y declaremos la independencia de nuestras colonias de la corona!
 confirmDeclarationDialog.areYouSure.yes=¡Libertad o Muerte!
 confirmDeclarationDialog.createFlag=y nuestros enemigos temblarán a la vista de nuestro estandarte desafiante.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Estados Unidos de %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% libre
 confirmDeclarationDialog.enterCountry=De ahora en adelante, nuestro país deberá ser conocido como
 confirmDeclarationDialog.enterNation=y todo ciudadano de nuestra gloriosa nación deberá estar orgulloso de ser conocido como
@@ -2726,8 +2773,10 @@ negotiationDialog.add=Añadir
 negotiationDialog.cancel=Cancelar
 negotiationDialog.clear=Vaciar
 negotiationDialog.contact.tutorial=Encuentra colegas Europeos.Competirá con usted por tierras y riquezas, y pueden posiblemente declararle la guerra. Pero después de que Jan de Witt se haya unido al Congreso Continental, puede comerciar con ellos.
+# Fuzzy
 negotiationDialog.demand=Los %nation% exigen de los %otherNation%
 negotiationDialog.exchange=a cambio de
+# Fuzzy
 negotiationDialog.offer=Los %nation% ofrecen los %otherNation%
 negotiationDialog.send=Enviar
 negotiationDialog.title.contact=Encuentro de compañeros europeos
@@ -2751,10 +2800,9 @@ findSettlementPanel.displayOnlyEuropean=Encontrar solo asentamientos europeos
 findSettlementPanel.displayOnlyNatives=Encontrar solo asentamientos nativos
 findSettlementPanel.name=Encontrar asentamiento
 findSettlementPanel.settlement=%name%%capital% (%nation%)
+# Fuzzy
 firstContactDialog.meeting.natives=Conociendo a los nativos...
 firstContactDialog.meeting.natives.tutorial=Conocerás a los nativos. Envía a tus exploradores a sus asentamientos para aprender más sobre ellos y a tus sirvientes contratados y colonos libres con el fin de aprender de ellos. Envía tus barcos y trenes de carro a sus asentamientos si deseas comerciar con ellos.
-firstContactDialog.meeting.AZTEC=La Nación Azteca...
-firstContactDialog.meeting.INCA=El Imperio Inca...
 firstContactDialog.welcomeOffer.text=La %nation% te da la bienvenida.Somos una gloriosa nación de %camps% %settlementType%. Para celebrar nuestra amistad, Nosotros generosamente te ofrecemos la tierra que ahora ocupas como un regalo. Aceptarás nuestro tratado y estarás en paz con nosotros como hermanos?
 firstContactDialog.welcomeSimple.text=La %nation% te da la bienvenida. Somos una gloriosa nación de %camps% %settlementType%. Aceptarás nuestro tratado y vivirás con nosotros en paz como hermanos?
 abandonColony.no=Cancelar
diff --git a/data/strings/FreeColMessages_fi.properties b/data/strings/FreeColMessages_fi.properties
index dd598eb24..c52e1eac4 100644
--- a/data/strings/FreeColMessages_fi.properties
+++ b/data/strings/FreeColMessages_fi.properties
@@ -45,6 +45,7 @@ all=Kaikki
 and=ja
 browse=Selaa...
 cancel=Peruuta
+client=Asiakasohjelma
 close=Sulje
 color=Väri
 connect=Yhdistä
@@ -225,7 +226,6 @@ colopediaAction.goods.name=Tavarat
 colopediaAction.nations.name=Kansat
 colopediaAction.nationTypes.name=Kansalliset edut
 colopediaAction.resources.name=Luonnonvarat
-colopediaAction.skills.name=Taidot
 colopediaAction.terrain.name=Maaston tyypit
 colopediaAction.units.name=Yksiköt
 colopediaAction.name=%object% (Colopedia)
@@ -1248,6 +1248,7 @@ model.building.locationLabel=rakennuksessa %location%
 model.colony.badGovernment=%colony%: Hallitus on tehoton. Tuotantomäärät laskevat.
 model.colony.governmentImproved1=%colony%: Hallituksen tehokkuus on parantunut, mutta se on silti tehoton. Tuotantomäärät ovat alhaisia.
 model.colony.governmentImproved2=%colony%: Hallituksen tehokkuus on parantunut. Tuotantomäärät ovat palanneet normaalille tasolle.
+# Fuzzy
 model.colony.insufficientProduction=Siirtokunnassa %colony% voitaisiin tuottaa %outputAmount% %outputType% lisää, jos meillä olisi %inputAmount% %inputType% enemmän ylimääräistä.
 model.colony.minimumColonySize=%object% estää siirtokunnan väkimäärän vähentämisen nykyistä vähemmäksi.
 model.colony.unbuildable=%colony% ei voi rakentaa kohdetta %object% tällä hetkellä. %object% poistettiin rakennusjonosta.
@@ -1261,18 +1262,25 @@ model.direction.SW.name=lounas
 model.direction.W.name=länsi
 model.direction.NW.name=luode
 model.historyEventType.abandonColony.description=Hylkäät siirtokunnan %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Löydät kadonneen kaupungin, jonka uumenista löytyy %treasure% kultarahan arvosta aarteita.
+# Fuzzy
 model.historyEventType.colonyConquered.description=%nation% valloittaa siirtokunnan %colony%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=%nation% tuhoaa siirtokunnan %colony%.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Tuhoat %nation%-kansan intiaanikylän.
+# Fuzzy
 model.historyEventType.destroyNation.description=Tuhoat %nation%-kansan.
 model.historyEventType.discoverNewWorld.description=Löydät uuden maailman.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Kansa %nation% löysi alueen %region%.
 model.historyEventType.foundColony.description=Perustat uuden siirtokunnan %colony%.
 model.historyEventType.foundingFather.description=%father% liittyy mannermaakongressiin.
 model.historyEventType.independence.description=Saavutat itsenäisyyden.
+# Fuzzy
 model.historyEventType.meetNation.description=Tapaat kansan %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=%nation% on kukistettu.
 model.indianSettlement.mostHatedNone=–
 model.indianSettlement.nameUnknown=Tuntematon
@@ -1317,6 +1325,7 @@ model.nationState.notAvailable.name=kyllä
 model.player.forces={{tag:gen|%nation%}} sotajoukot
 model.player.independentMarket=Eurooppa
 model.player.startGame=Kuukausien merellä purjehtimisen jälkeen olet viimein saapunut tuntemattoman mantereen rannikolle. Purjehdi länteen löytääksesi Uuden maailman ja julistaaksesi sen Kruunun omaisuudeksi.
+# Fuzzy
 model.player.waitingFor=%nation%
 model.regionType.coast.name=Rannikko
 model.regionType.coast.unknown=Tuntematon rannikkoalue
@@ -1371,9 +1380,9 @@ model.unit.underRepair=Korjauksessa (%turns% {{plural:%turns%|one=vuoro|other=vu
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1403,6 +1412,7 @@ model.player.emigrate=Yksikkö %unit% on muuttanut Euroopasta.
 model.player.foundingFatherJoinedCongress=%foundingFather% on liittynyt kongressiin!\n\n%description%
 model.player.soLDecrease=Itsenäisyyden kannattajien jäsenmäärä siirtokunnissa on laskenut %newSoL% prosenttiin.
 model.player.soLIncrease=Itsenäisyyden kannattajien jäsenmäärä siirtokunnissa on noussut %newSoL% prosenttiin.
+# Fuzzy
 model.player.stance.war.declared=Huonoja uutisia! %nation% on julistanut sodan meitä vastaan.
 model.player.stance.war.others=%attacker% on julistanut sodan. %defender% valmistautuu puolustamaan alueitaan.
 combat.buildingDamaged=%enemyUnit% (%enemyNation%) on tuhonnut rakennuksen %building% siirtokunnassa %colony%!
@@ -1413,6 +1423,7 @@ combat.colonyCapturedBy=Pelaaja %player% on valloittanut siirtokunnan %colony%.
 combat.enemyShipDamaged=Merellä käydyssä taistelussa, jonka osapuolina olivat %unit% ja %enemyUnit% (%enemyNation%), %unit% vahingoitti vihollisaluksen korjauskuntoon.
 combat.enemyShipDamagedByBombardment=Siirtokunnasta %colony% pommitettiin laivaa. %unit% (%nation%) sai pahoja vaurioita, jonka takia sen täytyy palata korjattavaksi.
 combat.goodsStolen=%enemyUnit% (%enemyNation%) varastaa %amoun% %goods% siirtokunnasta %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyUnit% (%enemyNation%) ryöstää %amoun% siirtokunnasta %colony%!
 combat.indianTreasure=Ryöstösaalis %indian%-kylästä on %amount% kultarahaa.
 combat.newConvertFromAttack=Pelokas %nation%käännynnäinen liittyy sinun joukkoihin!
@@ -1453,6 +1464,7 @@ error.couldNotLoad=Pelin lataus päättyi virheeseen!
 # Fuzzy
 error.couldNotSave=Pelin tallennus päättyi virheeseen!
 main.defaultPlayerName=Pelaajan nimi
+# Fuzzy
 client.choicePlayer=Pelaaja
 client.headlessDebug=Palvelintila vaatii vianjäljitysajon.
 client.headlessRequires=Palvelintila vaatii tallennuksen tai sääntömääritelmän.
@@ -1462,8 +1474,11 @@ metaServer.communicationError=Keskustelu metapalvelimen kanssa päättyi virhees
 buy.moreGold=Pyydä alhaisempaa hintaa
 buy.takeOffer=Hyväksy tarjous
 buy.text=%nation% haluaisi myydä sinulle tuotteensa %goods% hintaan %gold% kultaa:
+# Fuzzy
 confirmHostile.alliance=Et voi hyökätä liittoutuneen pelaajan %nation% kimppuun. Liitto täytyy ensin purkaa.
+# Fuzzy
 confirmHostile.ceaseFire=Olet solminut tulitauon pelaajan %nation% kanssa. Haluatko hyökätä?
+# Fuzzy
 confirmHostile.peace=Haluatko julistaa sodan pelaajalle %nation%?
 error.noSuchFile=Valittua tiedostoa ei ole olemassa tai se ei kelpaa.
 # Fuzzy
@@ -1511,7 +1526,9 @@ cashInTreasureTrain.free=Kuningas voi kuljettaa aarteesi Eurooppaan maksutta –
 cashInTreasureTrain.pay=Kuningas voi kuljettaa aarteesi Eurooppaan, jos hän saa puolet ryöstösaaliista.
 defeated.text=Sinut on päihitetty! Haluatko:
 defeated.yes=jäädä katsomaan
+# Fuzzy
 diplomacy.offerAccepted=%nation% on hyväksynyt anteliaan tarjouksenne.
+# Fuzzy
 diplomacy.offerRejected=%nation% on kieltäytynyt anteliaasta tarjouksestanne.
 disbandUnit.text=Haluatko kotiuttaa tämän yksikön?
 disbandUnit.yes=Lakkauta
@@ -1639,6 +1656,7 @@ colopedia.unit.offensivePower=Hyökkäysvoima
 colopedia.unit.price=Hinta Euroopassa
 colopedia.unit.productionBonus={{plural:%number%|one=Tuotantomuuttuja|other=Tuotantomuuttujat}}:
 colopedia.unit.requirements=Vaatimukset:
+# Fuzzy
 colopedia.unit.school=Koulutus mahdollista
 colopedia.unit.skill=Taidot
 report.labour.allColonists=Kaikki siirtolaiset
@@ -1704,12 +1722,14 @@ report.requirements.surplus=Seuraavat siirtokunnat tuottavat ylimäärin {{tag:a
 report.trade.afterTaxes=Tulot verojen jälkeen
 report.trade.beforeTaxes=Tulot ennen veroja
 report.trade.cargoUnits=Yksikköä lastina
+# Fuzzy
 report.trade.hasCustomHouse=* Tässä siirtokunnassa on tullilaitos; näitä tuotteita viedään.
 report.trade.totalDelta=Kokonaistuotanto
 report.trade.totalUnits=Yksiköitä yhteensä
 report.trade.unitsSold=Ostettu tai myyty
 report.turn.filter=Älä näytä tämäntyyppisiä viestejä jatkossa (%type%)
 report.turn.ignore=Älä näytä tätä viestiä jatkossa (siirtokunta: %colony%, tuote: %goods%)
+# Fuzzy
 report.turn.playerNation=%player% (%nation%)
 aboutPanel.copyright=Tekijänoikeudet © 2002–2015 FreeCol-ryhmä
 aboutPanel.legalDisclaimer=FreeCol on vapaa ohjelma: voit levittää sitä edelleen ja/tai muokata sitä GNU General Public Licensen ehtojen mukaan sellaisina kuin Free Software Foundation ne on julkaissut, joko lisenssin versio 2, tai minkä tahansa myöhempi versio.
@@ -1737,6 +1757,7 @@ colonyPanel.notBestTile=%unit% tuottaisi enemmän {{tag:acc|%goods%}} ruudussa %
 confirmDeclarationDialog.areYouSure.no=Ehkä myöhemmin
 confirmDeclarationDialog.areYouSure.text=Haluatko julistaa itsenäisyyden?
 confirmDeclarationDialog.areYouSure.yes=Itsenäisyys tai kuolema!
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Vapaa %nation%
 constructionPanel.clickToBuild=Valitse rakennettava rakennus tai yksikkö napsauttamalla rakennustyömaata.
 constructionPanel.turnsToComplete=(%number% {{plural:%number%|one=vuoro|other=vuoroa}} valmistumiseen)
diff --git a/data/strings/FreeColMessages_fr.properties b/data/strings/FreeColMessages_fr.properties
index d33b291e2..f7c873cb0 100644
--- a/data/strings/FreeColMessages_fr.properties
+++ b/data/strings/FreeColMessages_fr.properties
@@ -308,7 +308,6 @@ colopediaAction.goods.name=Marchandises
 colopediaAction.nations.name=Nations
 colopediaAction.nationTypes.name=Atouts nationaux
 colopediaAction.resources.name=Ressources bonifiées
-colopediaAction.skills.name=Métiers
 colopediaAction.terrain.name=Terrains
 colopediaAction.units.name=Unités
 colopediaAction.name=%object% (Colopedia)
@@ -1560,6 +1559,7 @@ model.improvement.road.description=Route
 model.improvement.road.name=Route
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limite de colonies côtières
+# Fuzzy
 model.limit.independence.coastalColonies.description=Vous devez disposer d’au moins %limit% colonies côtières pour déclarer votre indépendance.
 model.limit.independence.rebels.name=Limite de rebelles
 model.limit.independence.rebels.description=Au moins %limit%% de vos colons doivent soutenir l’indépendance.
@@ -1912,6 +1912,7 @@ model.colony.badGovernment=Le Gouvernement de %colony% est inefficace. Des péna
 model.colony.goodGovernment=L’efficacité du gouvernement s’est améliorée! Le sentiment rebelle dans %colony% est égal ou dépasse désormais %number% pour cent.
 model.colony.governmentImproved1=Le Gouvernement de %colony% s’est amélioré mais reste inefficace. Des pénalités continuent à s’appliquer à la production.
 model.colony.governmentImproved2=Le Gouvernement de %colony% s’est amélioré. Les pénalités ne s’appliquent plus à la production.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% %outputType% de plus auraient pu être produit par la %colony%, si seulement nous avions eu %inputAmount% %inputType% de plus.
 model.colony.lostGoodGovernment=L’efficacité du gouvernement a décru! Le sentiment rebelle dans %colony% n'est désormais plus égal ou supérieur à  %number% pour cent. La colonie n'a désormais plus de bonus de production..
 model.colony.lostVeryGoodGovernment=L’efficacité du gouvernement a décru! Le sentiment rebelle dans %colony% n’est désormais plus égal ou supérieur à %number% pour cent. Certains bonus de production ont été perdus.
@@ -1926,12 +1927,17 @@ model.colony.veryBadGovernment=Le Gouvernement de %colony% est très inefficace.
 model.colony.veryGoodGovernment=L’efficacité du gouvernement s’est améliorée! Le sentiment rebelle dans %colony% est égal ou dépasse maintenant %number% pour cent..
 model.colonyTile.claim=(%direction% de la demande)
 model.diplomaticTrade.receive.contact=Salutations fraternelles de la part de la glorieuse nation %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Négocions avec les %nation%.
 model.diplomaticTrade.receive.trade=Prenons en considération l’offre commerciale des %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=Les %nation% nous demandent un tribut !
 model.diplomaticTrade.send.contact=Nous avons rencontré des membres de la nation %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Considérons notre situation diplomatique avec les %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Proposons un commerce avec les %nation% à %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Nous demandons un tribut des %nation% à %settlement%.
 model.direction.N.name=nord
 model.direction.NE.name=nord-est
@@ -1942,24 +1948,37 @@ model.direction.SW.name=sud-ouest
 model.direction.W.name=ouest
 model.direction.NW.name=nord-ouest
 model.historyEventType.abandonColony.description=Vous abandonnez la colonie de %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Un cessez-le-feu a été signé avec %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=La %nation% découvre %city%, l’une des sept cités d’or, et un trésor de %treasure% d’or.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Votre colonie %colony% est conquise par les %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Votre colonie %colony% est détruite par les %nation%.
 model.historyEventType.conquerColony.description=Vous avez conquis la colonie %colony% des %nation%.
 model.historyEventType.declareIndependence.description=Vous déclarez l’indépendance vis-à-vis de la Couronne.
+# Fuzzy
 model.historyEventType.declareWar.description=La guerre a été déclarée avec %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Le %nation% a détruit les %nativeNation%.
+# Fuzzy
 model.historyEventType.destroySettlement.description=Vous détruisez le campement %settlement% de %nation%.
 model.historyEventType.discoverNewWorld.description=Vous découvrez le Nouveau Monde.
+# Fuzzy
 model.historyEventType.discoverRegion.description=La %nation% découvre %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Un accord d'alliance a été signé avec %nation%.
 model.historyEventType.foundColony.description=Vous établissez la colonie de %colony%.
 model.historyEventType.foundingFather.description=%father% rejoint le Congrès Continental.
 model.historyEventType.independence.description=Vous avez atteint l’indépendance de la Couronne.
+# Fuzzy
 model.historyEventType.makePeace.description=Un accord de paix a été signé avec %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Vous rencontrez les %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=La %nation% n'est plus présente dans le Nouveau Monde.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Les %loserNation% cédent l’ensemble de leurs colonies dans le Nouveau Monde aux %nation%.
 model.indianSettlement.mostHatedNone=Aucun
 model.indianSettlement.mostHatedUnknown=Inconnu
@@ -2013,9 +2032,12 @@ model.messageType.warehouseCapacity.name=Capacité des entrepôts
 model.messageType.warning.name=Alertes
 model.monarch.action.addToRef.text=La Couronne a ajouté %number% {{plural:%number%|%unit%}} à la force expéditionnaire royale. Les chefs coloniaux expriment leur inquiétude.
 model.monarch.action.addToRef.no=Fait
+# Fuzzy
 model.monarch.action.declarePeace.text=Nous avons gracieusement accepté un traité de paix avec les %nation%.
 model.monarch.action.declarePeace.no=Fait
+# Fuzzy
 model.monarch.action.declareWar.text=L'insolence des forces de %nation% nous oblige à leur déclarer la guerre!
+# Fuzzy
 model.monarch.action.declareWarSupported.text=L’insolence des %nation% Nous force à leur déclarer la guerre ! Pour accélérer cela, nos troupes loyales (%force%) attendent vos ordres, et une somme supplémentaire de %gold% a été ajoutée à votre trésor.
 model.monarch.action.declareWar.no=Fait
 model.monarch.action.displeasure.text=Vous osez accepter Nos généreuses conditions et tentez d’éviter leur paiement ? Une telle duplicité récoltera l’amère récompense de Notre déplaisir.
@@ -2075,6 +2097,7 @@ model.player.colonialIndependence=Seuls les joueurs coloniaux peuvent déclarer
 model.player.forces=Forces de %nation%
 model.player.independentMarket=Europe
 model.player.startGame=Après des mois passés à voguer sur l’océan, vous arrivez enfin au large des côtes d’un continent inconnu. Faites voile vers {{tag:%direction%|west=l'ouest|east=l'est|default=sous le vent}} pour découvrir le Nouveau Monde et le revendiquer au nom de la Couronne.
+# Fuzzy
 model.player.waitingFor=Les %nation% terminent leur tour.
 model.regionType.coast.name=Côte
 model.regionType.coast.unknown=Région côtière inconnue
@@ -2115,6 +2138,7 @@ model.tradeItem.gold.name=Or
 model.tradeItem.gold.description=la somme de %amount% or
 model.tradeItem.goods.name=Marchandises
 model.tradeItem.incite.name=Déclarer la guerre à
+# Fuzzy
 model.tradeItem.incite.description=guerre contre les %nation%
 model.tradeItem.stance.name=Relations
 model.tradeItem.unit.name=Unité
@@ -2137,9 +2161,9 @@ model.unit.underRepair=Réparation (%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -2180,6 +2204,7 @@ model.colony.warehouseSoonFull=Votre entrepôt de %colony% va excéder sa capaci
 model.colony.warehouseWaste=Votre entrepôt de %colony% a dépassé sa capacité en %goods%. %waste% unités ont été détruites.
 model.colony.workersEvicted=À %colony%, vos colonisateurs ne peuvent plus travailler sur %location% à cause de la présence de %enemyUnit%.
 model.colonyTile.resourceExhausted=Ressource %resource% épuisée à %colony%
+# Fuzzy
 model.game.spanishSuccession=Votre Excellence, la guerre de succession d’Espagne s’est terminée en Europe. Par le traité d’Utrecht, les %loserNation% ont été obligés de céder toutes leurs colonies dans le Nouveau Monde aux %nation% !
 model.indianSettlement.mission.denounced=Votre missionnaire à %settlement% a été dénoncé et exécuté !
 model.indianSettlement.mission.destroyed=Votre missionnaire à %settlement% est mort dans la destruction de ce campement.
@@ -2189,6 +2214,7 @@ model.player.autoRecruit=Les troubles religieux en %europe% poussent %unit% à 
 model.player.colonyGoodsParty.harbour=Les colons de %colony% ont jeté %amount% unités de %goods% dans le port, en signe de protestation contre les taxes imposées par la Couronne.
 model.player.colonyGoodsParty.horses=Vos colons à %colony% ont libéré %amount% chevaux en protestation contre les impôts injustes imposés par la Couronne !
 model.player.colonyGoodsParty.landLocked=Les colons de %colony% ont brûlé %amount% unités de %goods% sur la place du marché, en signe de protestation contre les taxes imposées par la Couronne.
+# Fuzzy
 model.player.dead.european=Votre Excellence, les %nation% ont déclaré un retrait inconditionnel des affaires du Nouveau Monde !
 model.player.dead.native=Votre Excellence, les %nation% ont été détruits.
 model.player.disaster.bankruptcy.start=Vous n'avez pas payé pour l'entretien de tous les bâtiments. De gros malus de production s'appliquent.
@@ -2202,12 +2228,16 @@ model.player.ignoredTax=La couronne a augmenté le taux de taxation à %amount%%
 model.player.interventionForceArrives=La Force d'intervention promise arrive!
 model.player.soLDecrease=L’appartenance aux Fils de Liberté dans vos colonies a chuté à %newSoL% %.
 model.player.soLIncrease=L’appartenance aux Fils de Liberté dans vos colonies a atteint %newSoL% %.
+# Fuzzy
 model.player.stance.alliance.declared=Votre Excellence, %nation% est alliée avec nous !
 model.player.stance.alliance.others=Votre Excellence, %attacker% est alliée avec %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Votre Excellence, les %nation% ont convenu d’un cessez-le-feu avec nous!
 model.player.stance.ceaseFire.others=Votre Excellence, les %attacker% ont convenu d’un cessez-le-feu avec les %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Votre Excellence, les %nation% sont en paix avec nous !
 model.player.stance.peace.others=Votre Excellence, les %attacker% sont en paix avec les %defender%.
+# Fuzzy
 model.player.stance.war.declared=Mauvaise nouvelle, Excellence, les %nation% nous ont déclaré la guerre !
 model.player.stance.war.others=Excellence, les %attacker% ont déclaré la guerre aux %defender%.
 combat.automaticDefence=Votre %unit% à %colony% a pris les armes pour défendre la colonie !
@@ -2223,6 +2253,7 @@ combat.enemyShipEvaded=Un(e) %enemyUnit% des %enemyNation% a échappé à une at
 combat.enemyShipSunk=Votre %unit% a coulé un(e) %enemyUnit% des %enemyNation% !
 combat.equipmentCaptured=Prenez garde, les braves %nation% ont acquis des %equipment% !
 combat.goodsStolen=Un(e) %enemyUnit% des %enemyNation% vole %amount% %goods% à %colony% !
+# Fuzzy
 combat.indianPlunder=Un(e) %enemyUnit% des %enemyNation% a pillé %amount% de %colony%.
 combat.indianRaid=Nos espions nous rapportent que la %nation% a fait un raid sur la colonie %colonyNation% de %colony%.
 combat.indianSurprise=La %nation% a fait un raid surprise sur %colony%, jetant l'alarme parmi nos colons. Le chef de %nation% nie toute implication.
@@ -2278,6 +2309,7 @@ main.javaVersion=La version %minVersion% de Java ou mieux est recommandée pour
 main.memory=Vous devez assigner plus de %memory% octets de mémoire à la JVM.\n  Redémarrez FreeCol avec:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol ne peut pas trouver de répertoires appropriés pour enregistrer les données utilisateur. Exécution en cours, mais attendez-vous à des problèmes.
 client.baseData=Impossible de trouver le répertoire des données de base %dir%.\n  Les fichiers de données ne peuvent pas être trouvés par FreeCol.\n  Veuillez vous assurer qu’ils existent.\n  Si FreeCol cherche dans le mauvais répertoire, lancez alors le jeu avec un paramètre en ligne de commande:\n  --freecol-data <répertoire-données>
+# Fuzzy
 client.choicePlayer=Veuillez choisir un joueur :
 client.classic=Échec au chargement de la cartographie des données depuis le jeu de règles 'classic'.
 client.debugConnect=Vous ne pouvez pas vous connecter à une partie existante en mode débogage.
@@ -2290,8 +2322,10 @@ metaServer.couldNotConnect=Désolé. Impossible de se connecter au méta-serveur
 metaServer.communicationError=Erreur durant la communication avec le méta-serveur. Réessayez ultérieurement.
 abandonEducation.action.studying=étudiant
 abandonEducation.action.teaching=enseignement
+# Fuzzy
 abandonEducation.no=Non, continuer la formation
 abandonEducation.text=Si votre  %unit% quitte %colony%, il abandonnera %action% dans le %building%; êtes-vous sûr qu'il doive le laisser?
+# Fuzzy
 abandonEducation.yes=Oui, quitter la colonie
 abandonTeaching.text=Si votre %unit% quitte le %building%, elle cessera d’enseigner; êtes-vous sûr de la faire partir?
 armedUnitSettlement.attack=Attaquer
@@ -2303,10 +2337,14 @@ buy.takeOffer=Accepter l’offre
 buy.text=Le %nation% propose de vous vendre %goods% pour %gold% :
 clearTradeRoute.text=Votre %unit% est assigné à la route d’échanges %route%. Configurer sa destination le fera sortir de cette route. Voulez-vous vraiment faire cela ?
 client.fullScreen=Le mode plein écran n’est pas supporté pour ce périphérique graphique.\nRetour au mode fenêtré.
+# Fuzzy
 confirmHostile.alliance=Vous ne pouvez attaquer une nation alliée ! Voulez-vous briser votre alliance avec les %nation% et déclarer la guerre ?
+# Fuzzy
 confirmHostile.ceaseFire=Vous avez signé un cessez-le-feu avec les %nation%. Voulez-vous vraiment les attaquer ?
+# Fuzzy
 confirmHostile.peace=Vous êtes en paix avec %nation%. Voulez-vous réellement déclarer la guerre ?
 confirmHostile.yes=Oui, lâchons les chiens de guerre !
+# Fuzzy
 confirmTribute.broke=Nos espions rapportent que les %nation% sont complètement à sec. Ne perdons pas notre temps avec des demandes de tribut.
 confirmTribute.european=Les %nation% %danger%, et %finance%. Quel montant de tribut devons-nous exiger d’eux ?
 confirmTribute.happy=Les %nation% à %settlement% sont bons amis avec nous, il serait dommage de porter atteinte à notre entente.
@@ -2326,6 +2364,7 @@ indianLand.cancel=Abandonner le pays
 indianLand.pay=Offrir %amount% or pour la terre
 indianLand.take=Prendre ce qui est à vous de droit
 indianLand.text=Cette terre est détenue par les %player%. Voulez vous :
+# Fuzzy
 indianLand.unknown=Des inconnus vivent sur ces terres. Voulez-vous :
 info.autodetectLanguageSelected=Vous avez choisi l’autodétection de la langue. Vous devez redémarrer le jeu pour que ce changement prenne effet.
 info.enterSomeText=Entrez un texte S.V.P.
@@ -2371,7 +2410,9 @@ defeated.text=Vous avez été écrasé ! Voulez-vous :
 defeated.yes=Rester et regarder
 defeatedSinglePlayer.text=Vous avez été vaincu!\n\nVoici l’heure propice aux sorcelleries nocturnes, où les tombes bâillent, et où l’enfer lui-même souffle la contagion sur le monde. Maintenant, je pourrais boire du sang tout chaud, et faire une de ces actions amères que le jour tremblerait de regarder.
 defeatedSinglePlayer.yes=Entrer dans le monde de la Vengeance
+# Fuzzy
 diplomacy.offerAccepted=Le %nation% a accepté votre offre généreuse.
+# Fuzzy
 diplomacy.offerRejected=Le %nation% a refusé votre offre mesquine.
 disbandUnit.text=Êtes-vous certain de vouloir dissoudre cette unité ?
 disbandUnit.yes=supprimer
@@ -2417,7 +2458,9 @@ move.noAccessGoods=La %nation% ne commercera pas avec un %unit% vide.
 move.noAccessMissionBan=Les %nation% refusent tout contact avec vos missionnaires.
 move.noAccessSettlement=Les %nation% ne permettent pas à nos %unit% d’entrer dans leur colonie.
 move.noAccessSkill=Nos %unit% ne peuvent rien apprendre des indigènes.
+# Fuzzy
 move.noAccessTrade=Nous n’avons pas l’autorité pour commercer avec d’autres nations européennes comme les %nation%.
+# Fuzzy
 move.noAccessWar=Nous ne pouvons pas commercer avec les %nation% lorsque nous sommes en guerre.
 move.noAccessWater=Nos %unit% doivent accoster avant d’entrer dans la colonie.
 move.noAttackWater=Notre %unit% doit atterrir avant d'attaquer.
@@ -2483,6 +2526,7 @@ server.timeOut=Temps d’attente dépassé lors de la connexion avec le serveur.
 server.userNameInUse=Le nom d'utilisateur spécifié est déjà utilisé.
 server.userNameNotPresent=Le nom d'utilisateur spécifié n'est pas dans ce jeu.
 server.wrongFreeColVersion=Les versions client et serveur de FreeCol ne concordent pas.
+# Fuzzy
 buildColony.others=Les %nation% ont fondé la nouvelle colonie de %colony% dans %region%.
 cashInTreasureTrain.colonial=Un trésor d’un montant de %amount% or a été envoyé en Europe. %cashInAmount% pièces d’or vous ont été versées.
 cashInTreasureTrain.independent=Un trésor de %amount% a été ajouté au trésor national.
@@ -2492,6 +2536,7 @@ declareIndependence.announce=Les colonies de %oldNation% ont déclaré leur ind
 declareIndependence.continentalArmyMuster=À l'appui de votre déclaration d’indépendance, %number% {{plural:%number%|%oldUnit%}}s à %colony% {{plural:%number%|one=a été promue|other=ont été promues}} à {{plural:%number%|%unit%}}s!
 declareIndependence.interventionForce={{tag:country|%nation%}} s'engage solennellement à envoyer une Force d'Intervention pour appuyer votre combat légitime pour l'indépendance, pour vu que vous génériez  %number% {{PLURAL:%number%|one=cloche|other=cloches}} de la liberté afin de prouver votre détermination.
 declareIndependence.nativeSupport=Les %nation% déclarer leur mépris envers %ruler% et la Force Royale Expéditionnaire, et promettent de les attaquer à la moindre occasion.
+# Fuzzy
 declareIndependence.nativeHostile=Nos espions signalent que la Force Royale Expéditionnaire a établi des relations amicales avec les %nation%. Méfiez-vous qu’ils pourraient préparer une attaque !
 declareIndependence.resolution=Aujourd’hui, le Congrès a approuvé la plus importante Résolution qui n'ait jamais été prise en Amérique.\n\nJe suis bien conscient que cela va Nous demander beaucoup de Labeur, de Sang et d’Or pour pouvoir maintenir cette Déclaration et pour soutenir et défendre ces États. Déjà je peux discerner au travers de toute cette Obscurité les superbes Rayons de la Lumière et de la Gloire. Je peux prédire que la Fin vaudra bien mieux que tous les Moyens. Et que la Postérité triomphera des Tractations de nos Jours, qui nous pousseraient à nous ruer ou à fuir, ce dont je crois que Dieu saura absolument nous préserver.\n\nLe Corps expéditionnaire royal tombera bientôt sur nous. Préparez nos défenses avec soin pendant que nous réunissons des volontaires pour une nouvelle Armée Continentale.
 declareIndependence.unitsSeized=En réaction à votre déclaration d’indépendance, la Couronne a saisi les unités suivantes en Europe et en mer : %units%
@@ -2590,6 +2635,7 @@ colopedia.unit.offensivePower=Potentiel offensif :
 colopedia.unit.price=Prix en Europe :
 colopedia.unit.productionBonus={{plural:%number%|one=Modificateur|other=Modificateurs}} de production :
 colopedia.unit.requirements=Exigences :
+# Fuzzy
 colopedia.unit.school=Établissement de formation :
 colopedia.unit.skill=Compétence :
 report.labour.allColonists=Tous les colons
@@ -2624,8 +2670,8 @@ report.colony.grow.header=+
 report.colony.growing.description=%colony% peut croître de {{plural:%amount%|one=une unité|other=%amount% unités}} sans nuire à sa production
 report.colony.improve.description=Unités qui pourraient améliorer la production.
 report.colony.improve.header=Améliorer
+# Fuzzy
 report.colony.improving.description=%colony%: Pour produire %amount% de plus de %goods%, remplacez %oldUnit% par %unit%
-report.colony.wanting.description=%colony%: Pour produire %amount% de plus de %goods%, ajoutez %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% nécessaires pour %buildable% {{plural:%turns%|one=au prochain tour|other=dans %turns% tours}}
 report.colony.making.constructing.description=%colony%: %buildable% terminé {{plural:%turns%|one=au prochain tour|other=dans %turns% tours}}
 report.colony.making.description=Ce que cette colonie fait
@@ -2635,20 +2681,21 @@ report.colony.making.noconstruction.description=%colony%: Pas de construction en
 report.colony.making.noteach.description=%colony%: %teacher% n'a pas d'étudiant
 report.colony.name.description=La liste des colonies
 report.colony.name.header=Colonie
-report.colony.plow.description=Nombre de cases de colonie qui bénéficieront du Labourage
-report.colony.plow.header=P
-report.colony.plowing.description=%colony% aurait intérêt à labourer {{plural:%amount%|one=une case|other=%amount% cases}}
+# Fuzzy
 report.colony.production.description=%colony%: production nette de %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: la production nette de %goods% est de %amount% (exporté au-dessus de %export%)
 report.colony.production.header=Production net de %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: production nette de %goods% = %amount%, totale {{plural:%turns%|one=le prochain tour|other=dans %turns% tours}}
+# Fuzzy
 report.colony.production.low.description=%colony%: production nette de %goods% = %amount%, disparue {{plural:%turns%|one=le prochain tour|other=dans %turns% tours}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: production nette de %goods% = %amount%, l'entrepôt va déborder, %waste% sera perdu
-report.colony.road.description=Nombre de cases de colonie qui bénéficieraient d'une construction de route
-report.colony.road.header=R
-report.colony.roadBuilding.description=%colony% aurait intérêt à construire {{plural:%amount%|one=une route|other=%amount% routes}}
 report.colony.shrinking.description=%colony% doit être réduite de {{plural:%amount%|one=une unité|other=%amount% unités}} pour améliorer sa production
 report.colony.starving.description=%colony%: famine {{plural:%turns%|one=au prochain tour|other=dans %turns% tours}}
+# Fuzzy
+report.colony.wanting.description=%colony%: Pour produire %amount% de plus de %goods%, ajoutez %unit%
 report.continentalCongress.available=Disponible
 report.continentalCongress.elected=Élu : %turn%
 report.continentalCongress.none=(aucun)
@@ -2692,26 +2739,25 @@ report.production.selectGoods=Sélectionner les biens
 report.production.update=Mettre à jour
 report.requirements.badAssignment=%colony% a un %expert% qui travaille actuellement comme %expertWork%, alors qu’un %nonExpert% travaille comme %nonExpertWork%. La production serait plus importante si les colons échangeaient leurs emplois.
 report.requirements.canTrainExperts={{plural:2|%unit%}} peuvent être formées à
-report.requirements.clearTile=%type% vers %direction% de %colony% serait intéressant pour le défrichage.
+# Fuzzy
 report.requirements.exploreTile=%type% vers %direction% de %colony% serait intéressant pour l'exploration.
 report.requirements.met=Toutes les conditions sont réunies.
 report.requirements.missingGoods=%colony% fabrique des %goods%, mais elle a besoin de plus de %input%.
 report.requirements.misusedExperts=Il y a des {{plural:2|%unit%}} qui ne travaillent pas comme %work% à
 report.requirements.noExpert=%colony% fabrique des %goods%, mais elle n’a pas de %unit%.
-report.requirements.plowCenter=%colony% aurait intérêt à labourer sa case.
-report.requirements.plowTile=%type% vers %direction% de %colony% aurait intérêt à être labouré
-report.requirements.roadTile=%type%vers %direction% de %colony% aurait intérêt à construire une route.
 report.requirements.severalExperts=Plusieurs {{plural:2|%unit%}} sont présentes à
 report.requirements.surplus=Un surplus de %goods% est produit à
 report.trade.afterTaxes=Solde après taxes
 report.trade.beforeTaxes=Solde avant taxes
 report.trade.cargoUnits=Unités en transit
+# Fuzzy
 report.trade.hasCustomHouse=* Cette colonie a une douane ; ces marchandises sont exportées.
 report.trade.totalDelta=Total de la production
 report.trade.totalUnits=Total des unités
 report.trade.unitsSold=Nb acheté/vendu
 report.turn.filter=Ne pas afficher ce type de message (%type%)
 report.turn.ignore=Ignorer ce message (Colonie : %colony% ; marchandises : %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% de %player%
 aboutPanel.copyright=Copyright © 2002-2015  L’équipe FreeCol
 aboutPanel.legalDisclaimer=FreeCol est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier au titre des clauses de la Licence Publique Générale GNU, telle qu’elle est publiée par la Free Software Foundation dans sa version 2, ou dans une version ultérieure.
@@ -2737,6 +2783,7 @@ colonyPanel.buildQueue=Créer la playlist
 colonyPanel.colonyUnits=Unités de la colonie
 colonyPanel.inPort=Au port
 colonyPanel.outsideColony=Hors de la colonie
+# Fuzzy
 colonyPanel.producing=Production en cours :
 colonyPanel.reducePopulation=Si vous réduisez la population à une valeur inférieure à %number%, %colony% ne pourra plus construire de %buildable%.
 colonyPanel.setGoods=Ensemble de biens
@@ -2752,7 +2799,9 @@ confirmDeclarationDialog.areYouSure.no=Peut-être plus tard
 confirmDeclarationDialog.areYouSure.text=Permettez-nous de nous affranchir de la tyrannie injuste de %monarch% et déclarer l’indépendance de nos colonies de la couronne !
 confirmDeclarationDialog.areYouSure.yes=Vivre libre ou mourir !
 confirmDeclarationDialog.createFlag=et nos ennemis trembleront à la vue de notre bannière rebelle.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=États-Unis de %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% libre
 confirmDeclarationDialog.enterCountry=Désormais, notre pays doit être connu comme
 confirmDeclarationDialog.enterNation=et chaque citoyen de notre glorieuse nation doit être fier d’être connu comme
@@ -2804,9 +2853,11 @@ negotiationDialog.add=Ajouter
 negotiationDialog.cancel=Annuler
 negotiationDialog.clear=Nettoyer
 negotiationDialog.contact.tutorial=Vous rencontrez d’autres Européens. Ils seront en compétition avec vous pour les terres et les richesses, et peuvent même partir en guerre contre vous. Mais une fois que Jan de Witt a rejoint le Congrès continental, vous pourrez commercer avec eux.
+# Fuzzy
 negotiationDialog.demand=Le %nation% exige de %otherNation%
 negotiationDialog.exchange=en échange de
 negotiationDialog.goldAvailable=(%amount% or disponible)
+# Fuzzy
 negotiationDialog.offer=Le %nation% offre à %otherNation%
 negotiationDialog.send=Envoyer
 negotiationDialog.title.contact=Rencontre des autres européens
@@ -2829,10 +2880,9 @@ findSettlementPanel.displayAll=Trouver tous les campements
 findSettlementPanel.displayOnlyEuropean=Trouver uniquement les campements européens
 findSettlementPanel.displayOnlyNatives=Trouver uniquement les campements indigènes
 findSettlementPanel.name=Trouver un campement
+# Fuzzy
 firstContactDialog.meeting.natives=Rencontre avec les indigènes...
 firstContactDialog.meeting.natives.tutorial=Vous avez rencontré des indigènes. Envoyez vos éclaireurs à leurs campements afin d’en savoir plus sur eux, et vos domestiques contractuels et vos colons libres pour apprendre de leur part. Envoyez vos navires et vos convois de charriot à leurs campements si vous voulez commercer avec eux.
-firstContactDialog.meeting.AZTEC=La nation aztèque...
-firstContactDialog.meeting.INCA=L’empire inca...
 firstContactDialog.welcomeOffer.text=Les %nation% vous accueillent. Nous sommes une glorieuse nation de %camps% %settlementType%. Pour célébrer notre amitié, nous vous offrons généreusement en cadeau la terre que vous occupez actuellement. Acceptez-vous notre traité et de demeurer avec nous en paix fraternelle ?
 firstContactDialog.welcomeSimple.text=Les %nation% vous accueillent. Nous sommes une glorieuse nation de %camps% %settlementType%. Acceptez-vous notre traité et de demeurer avec nous en paix fraternelle ?
 abandonColony.no=Annuler
diff --git a/data/strings/FreeColMessages_gl.properties b/data/strings/FreeColMessages_gl.properties
index 8df03e861..c3b08cfb8 100644
--- a/data/strings/FreeColMessages_gl.properties
+++ b/data/strings/FreeColMessages_gl.properties
@@ -262,7 +262,6 @@ colopediaAction.goods.name=Produtos
 colopediaAction.nations.name=Nacións
 colopediaAction.nationTypes.name=Vantaxes nacionais
 colopediaAction.resources.name=Bonificacións por recursos
-colopediaAction.skills.name=Habilidades
 colopediaAction.terrain.name=Tipos de terreo
 colopediaAction.units.name=Unidades
 colopediaAction.name=%object% (Colopedia)
@@ -1305,6 +1304,7 @@ model.improvement.road.description=Camiño
 model.improvement.road.name=Camiño
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Límite de colonia costeira
+# Fuzzy
 model.limit.independence.coastalColonies.description=Necesitas, polo menos, %limit% colonias costeiras para poder declarar a independencia.
 model.limit.independence.rebels.name=Límite de rebeldes
 model.limit.independence.rebels.description=Polo menos, o %limit%% dos teus colonos debe apoiar a independencia.
@@ -1640,6 +1640,7 @@ model.colony.badGovernment=O goberno de %colony% é ineficiente. Hai penalizaci
 model.colony.goodGovernment=A eficiencia do goberno mellorou! O asentamento rebelde en %colony% agora iguala ou supera o %number% por cento.
 model.colony.governmentImproved1=O goberno de %colony% mellorou, pero aínda é moi ineficiente. Aínda hai penalizacións á produción.
 model.colony.governmentImproved2=O goberno de %colony% mellorou. Xa non hai penalizacións á produción.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% máis de %outputType% poderían ser producidos por %colony%, se só tivésemos %inputAmount% máis de %inputType%.
 model.colony.lostGoodGovernment=A eficiencia do goberno diminuíu! O asentamento rebelde en %colony% xa non iguala ou supera o %number% por cento. A colonia xa non consigue bonificacións de produción.
 model.colony.lostVeryGoodGovernment=A eficiencia do goberno diminuíu! O asentamento rebelde en %colony% xa non iguala ou supera o %number% por cento. Perdéronse algunhas bonificacións de produción.
@@ -1657,21 +1658,29 @@ model.direction.SW.name=suroeste
 model.direction.W.name=oeste
 model.direction.NW.name=noroeste
 model.historyEventType.abandonColony.description=Abandonaches a colonia de %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Os %nation% descubriron %city%, unha das sete cidades de ouro, e mais un tesouro de %treasure% de ouro.
+# Fuzzy
 model.historyEventType.colonyConquered.description=A túa colonia %colony% é conquistada polos %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=A túa colonia %colony% é destruída polos %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Atréveste a aceptar as nosas xenerosas condicións e evitas os pagamentos? Esta duplicidade segará a amarga recompensa do noso descontento.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Destruíches o asentamento %settlement% dos %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Os %nation% destrúen os %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Descubriches o Novo Mundo.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Os %nation% descubriron %region%.
 model.historyEventType.foundColony.description=Estableciches a colonia de %colony%.
 model.historyEventType.foundingFather.description=%father% únese ao congreso continental.
 model.historyEventType.independence.description=Conseguiches a independencia da Coroa.
+# Fuzzy
 model.historyEventType.meetNation.description=Coñeciches os %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Os %nation% xa non están presentes no Novo Mundo.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Os %loserNation% ceden o conxunto de todas as súas colonias que teñen no Novo Mundo aos %nation%.
 model.indianSettlement.mostHatedNone=Ningún
 model.indianSettlement.mostHatedUnknown=Descoñecida
@@ -1722,8 +1731,10 @@ model.messageType.warehouseCapacity.name=Capacidade do almacén
 model.messageType.warning.name=Avisos
 model.monarch.action.addToRef.text=A Coroa engadiu %number% {{plural:%number%|%unit%}} á forza expedicionaria real. Os líderes coloniais expresan preocupación.
 model.monarch.action.addToRef.no=Feito
+# Fuzzy
 model.monarch.action.declarePeace.text=Aceptamos de boa gana un tratado de paz cos %nation%.
 model.monarch.action.declarePeace.no=Feito
+# Fuzzy
 model.monarch.action.declareWar.text=A insolencia dos %nation% obríganos a declarar a guerra contra eles!
 model.monarch.action.declareWar.no=Feito
 # Fuzzy
@@ -1775,6 +1786,7 @@ model.noClaimReason.worked.description=Xa hai outro asentamento usando estas ter
 model.player.forces=Forzas de %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Despois de meses no mar, finalmente chegaches á costa dun continente descoñecido. Navega {{tag:%direction%|west=ao oeste|east=ao leste|default=cara ao vento}} a fin de descubrir o Novo Mundo e reclamar a Coroa.
+# Fuzzy
 model.player.waitingFor=Agardando por: %nation%
 model.regionType.coast.name=Litoral
 model.regionType.coast.unknown=Rexión costeira descoñecida
@@ -1829,9 +1841,9 @@ model.unit.underRepair=Reparación (%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=V
+# Fuzzy
 model.unit.unitState.skipped=S
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1872,6 +1884,7 @@ model.colony.warehouseSoonFull=O teu almacén de %colony% superará a súa capac
 model.colony.warehouseWaste=O teu almacén de %colony% superou a súa capacidade de %goods%. Desbotáronse %waste% unidades.
 model.colony.workersEvicted=En %colony%, os teus colonos non poden seguir traballando en %location% debido á presenza de %enemyUnit%.
 model.colonyTile.resourceExhausted=Recurso %resource% esgotado en %colony%
+# Fuzzy
 model.game.spanishSuccession=Súa Excelencia, a Guerra de Sucesión Española acabou en Europa. No Tratado de Utrecht, os %loserNation% foi forzado a ceder todas as colonias do Novo Mundo aos %nation%!
 model.indianSettlement.mission.denounced=O teu misioneiro en %settlement% foi denunciado e executado!
 model.indianSettlement.mission.destroyed=O teu misioneiro en %settlement% morreu na destrución do asentamento.
@@ -1881,6 +1894,7 @@ model.player.autoRecruit=Os disturbios relixiosos en %europe% provocan a emigrac
 model.player.colonyGoodsParty.harbour=Os teus colonos de %colony% desbotaron %amount% unidades de %goods% no porto en protesta polas taxas de impostos da Coroa!
 model.player.colonyGoodsParty.horses=Os teus colonos de %colony% liberaron %amount% cabalos en protesta contra os impostos inxustos da Coroa!
 model.player.colonyGoodsParty.landLocked=Os teus colonos de %colony% queimaron %amount% unidades de %goods% no mercado local en protesta polas taxas de impostos da Coroa!
+# Fuzzy
 model.player.dead.european=Súa Excelencia, os %nation% declararon unha retirada incondicional dos asuntos do Novo Mundo!
 model.player.dead.native=Súa Excelencia, os %nation% foron destruídos.
 model.player.disaster.bankruptcy.start=Non pagaches polo mantemento de todas as construcións. Hanse aplicar penalizacións de produción.
@@ -1892,12 +1906,16 @@ model.player.foundingFatherJoinedCongress=%foundingFather% uniuse ao congreso!\n
 model.player.interventionForceArrives=Chega a forza de intervención prometida!
 model.player.soLDecrease=Diminuíron ata o %newSoL% por cento os membros dos Fillos da Liberdade nas túas colonias!
 model.player.soLIncrease=O número de membros dos Fillos da Liberdade nas túas colonias aumentou un %newSoL% por cento!
+# Fuzzy
 model.player.stance.alliance.declared=Súa Excelencia, os %nation% teñen unha alianza connosco!
 model.player.stance.alliance.others=Súa Excelencia, o  %attacker% ten unha alianza con %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Súa Excelencia, os %nation% aceptaron un alto o fogo connosco!
 model.player.stance.ceaseFire.others=Súa Excelencia, o %attacker% aceptou un alto o fogo con %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Súa Excelencia, os %nation% están en paz connosco!
 model.player.stance.peace.others=Súa Excelencia, o %attacker% está en paz con %defender%.
+# Fuzzy
 model.player.stance.war.declared=Malas novas, súa Excelencia, os %nation% declaráronnos a guerra!
 model.player.stance.war.others=Súa Excelencia, o %attacker% declarou a guerra con %defender%.
 combat.automaticDefence=O teu %unit% en %colony% tomou as armas para defender a colonia!
@@ -1913,6 +1931,7 @@ combat.enemyShipEvaded=%enemyUnit% %enemyNation% librouse dun ataque de %unit%.
 combat.enemyShipSunk=%unit% afundiu aos %enemyUnit% %enemyNation%!
 combat.equipmentCaptured=Coidado, os guerreiros %nation% adquiriron %equipment%!
 combat.goodsStolen=%enemyUnit% %enemyNation% rouba %amount% de %goods% a %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyUnit% %enemyNation% saquea %amount% de %colony%.
 combat.indianRaid=Os nosos espías informan de que os %nation% invadiron a colonia %colonyNation% de %colony%.
 combat.indianSurprise=Os %nation% fixeron un ataque sorpresa en %colony%, que alarmou os nosos colonos. Os xefes dos %nation% rexeitan calquera implicación.
@@ -1969,6 +1988,7 @@ main.javaVersion=Recoméndase a versión %minVersion% do Java para executar o Fr
 main.memory=Debes asignar máis de %memory% bytes de memoria para o JVM.\n  Reinicia o FreeCol con:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=O FreeCol non pode atopar os directorios axeitados para gardar os datos de usuario. O programa pode continuar, pero posiblemente encontrarás algún erro.
 client.baseData=Non se puido atopar o directorio de datos de base %dir%.\n  O FreeCol non puido atopar os ficheiros de datos.\n  Asegúrate de que están presentes.\n  Se o FreeCol está buscando nun directorio incorrecto, entón\n  executa o xogo cun parámetro na liña de comandos:\n  --freecol-data <directorio-de-datos>
+# Fuzzy
 client.choicePlayer=Por favor, escolle un xogador:
 client.classic=Erro ao cargar o recurso de cartografía desde o conxunto de regras "classic".
 client.headlessDebug=O modo sen cabeza necesita unha execución de depuración.
@@ -1978,8 +1998,10 @@ metaServer.couldNotConnect=Sentímolo, non se pode conectar co servidor meta. In
 metaServer.communicationError=Houbo un erro ao comunicarse co servidor meta. Inténtao de novo máis tarde.
 abandonEducation.action.studying=estudando
 abandonEducation.action.teaching=ensinando
+# Fuzzy
 abandonEducation.no=Non, continuar a educación
 abandonEducation.text=Se a túa %unit% deixa %colony%, abandonará %action% no %building%. Estás seguro de querer marchar?
+# Fuzzy
 abandonEducation.yes=Si, deixar a colonia
 abandonTeaching.text=Se a túa %unit% abandona o %building% deixará de educar. Estás seguro de querer marchar?
 armedUnitSettlement.attack=Atacar
@@ -1990,8 +2012,11 @@ buy.takeOffer=Aceptar a oferta
 buy.text=Os %nation% queren vender os seus %goods% por %gold%:
 clearTradeRoute.text=Á túa %unit% asignóuselle a ruta comercial %route%. Ao definir o seu destino retirarase da ruta actual. Estás seguro de querer facelo?
 client.fullScreen=O modo en pantalla completa non está soportado por este dispositivo gráfico.\nVolvendo ao modo en ventá.
+# Fuzzy
 confirmHostile.alliance=Non podes atacar unha nación aliada! Realmente queres romper as túas alianzas cos %nation% e declarar a guerra?
+# Fuzzy
 confirmHostile.ceaseFire=Asinaches un alto o fogo cos %nation%. Realmente queres atacar?
+# Fuzzy
 confirmHostile.peace=Estás en paz cos %nation%. Realmente queres declarar a guerra?
 error.noSuchFile=O ficheiro especificado non existe ou non é un ficheiro normal.
 # Fuzzy
@@ -2045,7 +2070,9 @@ defeated.text=Fuches derrotado! Queres:
 defeated.yes=Quedar e mirar
 defeatedSinglePlayer.text=Fuches derrotado!\n\nAgora é tempo de noite e tebras, cando os campanarios das igrexas bocexan e o inferno inunda este mundo. Agora podería beber sangue quente e levar a cabo actos que o mesmo día tremería ao ver.
 defeatedSinglePlayer.yes=Entrar no modo vinganza
+# Fuzzy
 diplomacy.offerAccepted=Os %nation% aceptaron a túa xenerosa oferta.
+# Fuzzy
 diplomacy.offerRejected=Os %nation% rexeitaron a túa xenerosa oferta.
 disbandUnit.text=Estás seguro de querer disolver esta unidade?
 disbandUnit.yes=Disolverse
@@ -2089,7 +2116,9 @@ move.noAccessContact=Debemos establecer contacto cos %nation% primeiro, súa Exc
 move.noAccessGoods=Os %nation% non han comerciar cunha %unit% baleira.
 move.noAccessSettlement=Os %nation% non permiten que a nosa %unit% entre no seu asentamento.
 move.noAccessSkill=A nosa %unit% non pode aprender dos nativos.
+# Fuzzy
 move.noAccessTrade=Non temos a autoridade necesaria para comerciar con outras nacións europeas como os %nation%.
+# Fuzzy
 move.noAccessWar=Non podemos comerciar cos %nation% durante a guerra.
 move.noAccessWater=A nosa %unit% debe desembarcar antes de entrar no seu asentamento.
 move.noAttackWater=A nosa %unit% debe estar en terra antes de atacar.
@@ -2151,6 +2180,7 @@ server.timeOut=Superouse o tempo límite ao conectar co servidor.
 server.userNameInUse=O nome de usuario especificado xa está en uso.
 server.userNameNotPresent=O nome de usuario especificado non está neste xogo.
 server.wrongFreeColVersion=As versións do cliente e do servidor do FreeCol non coinciden.
+# Fuzzy
 buildColony.others=Os %nation% fundaron a nova colonia de %colony% en %region%.
 cashInTreasureTrain.colonial=Un tesouro formado por %amount% doblóns de ouro desembarcou en Europa. Están dispoñibles %cashInAmount% doblóns de ouro máis.
 cashInTreasureTrain.independent=Un tesouro formado por %amount% doblóns de ouro engadiuse ao tesouro nacional.
@@ -2254,6 +2284,7 @@ colopedia.unit.offensivePower=Poder de ofensa:
 colopedia.unit.price=Prezo en Europa:
 colopedia.unit.productionBonus={{plural:%number%|one=Modificador|other=Modificadores}} de produción:
 colopedia.unit.requirements=Requirimentos:
+# Fuzzy
 colopedia.unit.school=Centro esixido para adestrar:
 colopedia.unit.skill=Nivel de habilidade:
 report.labour.allColonists=Todos os colonos
@@ -2289,8 +2320,8 @@ report.colony.growing.description=%colony% pode medrar {{plural:%amount%|one=nun
 # Fuzzy
 report.colony.improve.description=Unidades que poderían mellorar a produción con respecto á unidade que fai o traballo arestora
 report.colony.improve.header=Mellorar
+# Fuzzy
 report.colony.improving.description=%colony%: Para producir %amount% máis de %goods%, substitúe %oldUnit% por %unit%
-report.colony.wanting.description=%colony%: Para producir %amount% máis de %goods%, engade %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% necesarios para %buildable% {{plural:%turns%|one=na vindeira quenda|other=en %turns% quendas}}
 report.colony.making.constructing.description=%colony%: %buildable% remata {{plural:%turns%|one=na vindeira quenda|other=en %turns% quendas}}
 report.colony.making.description=O que esta colonia está facendo
@@ -2300,21 +2331,22 @@ report.colony.making.noconstruction.description=%colony%: Non hai construcións
 report.colony.making.noteach.description=%colony%: %teacher% bota en falta un estudante
 report.colony.name.description=A lista de colonias
 report.colony.name.header=Colonia
-report.colony.plow.description=Número de cadrantes de colonia que se beneficiarían de arar
-report.colony.plow.header=A
-report.colony.plowing.description=%colony% beneficiarase de arar {{plural:%amount%|one=un cadrante|other=%amount% cadrantes}}
+# Fuzzy
 report.colony.production.description=%colony%: produción neta de %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: a produción neta de %goods% é %amount% (exportación superior a %export%)
 report.colony.production.header=Produción neta de %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: produción neta de %goods% = %amount%; completa {{plural:%turns%|one=na vindeira quenda|other=en %turns% quendas}}
+# Fuzzy
 report.colony.production.low.description=%colony%: produción neta de %goods% = %amount%; desaparecerá {{plural:%turns%|one=na vindeira quenda|other=en %turns% quendas}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: produción neta de %goods% = %amount%; o almacén vai desbordar, perderanse %waste%
-report.colony.road.description=Número de cadrantes de colonia que se beneficiarían de construír estradas
-report.colony.road.header=C
-report.colony.roadBuilding.description=%colony% beneficiarase da construción {{plural:%amount%|one=dunha estrada|other=de %amount% estradas}}
 report.colony.shrinking.description=%colony% pode minguar {{plural:%amount%|one=nunha unidade|other=en %amount% unidades}} para mellorar a produción
 report.colony.starving.description=%colony%: fame {{plural:%turns%|one=na vindeira quenda|other=en %turns% quendas}}
 # Fuzzy
+report.colony.wanting.description=%colony%: Para producir %amount% máis de %goods%, engade %unit%
+# Fuzzy
 report.continentalCongress.elected=Elixidos:
 report.continentalCongress.none=(ningún)
 report.continentalCongress.recruiting=Recrutando
@@ -2356,26 +2388,25 @@ report.production.selectGoods=Seleccionar as mercadorías
 report.production.update=Actualizar
 report.requirements.badAssignment=%colony% ten un %expert% traballando como %expertWork%, mentres que un %nonExpert% traballa como %nonExpertWork%. A produción iría mellor se os colonos trocasen os traballos.
 report.requirements.canTrainExperts=As {{plural:2|%unit%}} pódense adestrar en
-report.requirements.clearTile=%type% cara a %direction% de %colony% beneficiaríase da limpeza.
+# Fuzzy
 report.requirements.exploreTile=%type% cara a %direction% de %colony% beneficiaríase da exploración.
 report.requirements.met=Cúmprense todas as esixencia.
 report.requirements.missingGoods=%colony% está producindo %goods%, pero precisa dun maior %input%.
 report.requirements.misusedExperts=Hai {{plural:2|%unit%}} non traballando como %work% presentes en
 report.requirements.noExpert=%colony% está producindo %goods%, pero non ten %unit%.
-report.requirements.plowCenter=%colony% beneficiaríase de arar o seu cuadrante.
-report.requirements.plowTile=%type% cara a %direction% de %colony% beneficiaríase de arar.
-report.requirements.roadTile=%type% cara a %direction% de %colony% beneficiaríase da construción de estradas.
 report.requirements.severalExperts=Varias {{plural:2|%unit%}} están presentes en
 report.requirements.surplus=Estanse producindo excedentes de %goods% en
 report.trade.afterTaxes=Beneficios despois dos impostos
 report.trade.beforeTaxes=Beneficios antes dos impostos
 report.trade.cargoUnits=Unidades en transporte
+# Fuzzy
 report.trade.hasCustomHouse=* Esta colonia ten unha aduana; as mercadorías son exportadas.
 report.trade.totalDelta=Produción total
 report.trade.totalUnits=Total de unidades
 report.trade.unitsSold=Unidades compradas ou vendidas
 report.turn.filter=Non mostrar este tipo de mensaxes (%type%)
 report.turn.ignore=Ignorar esta mensaxe (Colonia: %colony%, Bens: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% de %player%
 # Fuzzy
 aboutPanel.copyright=Copyright © 2002-2013 O equipo do FreeCol
@@ -2401,6 +2432,7 @@ chooseFoundingFatherDialog.title=Nomear o pai fundador
 colonyPanel.colonyUnits=Unidades da colonia
 colonyPanel.inPort=No porto
 colonyPanel.outsideColony=Aforas da colonia
+# Fuzzy
 colonyPanel.producing=Producindo:
 colonyPanel.reducePopulation=Se reduces a poboación a menos de %number%, %colony% xa non será capaz de construír %buildable%.
 colonyPanel.setGoods=Definir os produtos
@@ -2414,7 +2446,9 @@ colonyPanel.notBestTile=%unit% podería producir máis %goods% en %tile%.
 confirmDeclarationDialog.areYouSure.no=Talvez logo
 confirmDeclarationDialog.areYouSure.text=Deixádenos renunciar á inxusta tiranía de %monarch% e declarar a independencia das nosas colonias da Coroa!
 confirmDeclarationDialog.areYouSure.yes=Liberdade ou morte!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Estados Unidos de %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% libre
 confirmDeclarationDialog.enterCountry=De agora en diante, o noso país deberá ser coñecido como
 confirmDeclarationDialog.enterNation=e todo cidadán da nosa gloriosa nación deberá estar orgulloso de ser coñecido como
diff --git a/data/strings/FreeColMessages_he.properties b/data/strings/FreeColMessages_he.properties
index cfc09e916..16da5b425 100644
--- a/data/strings/FreeColMessages_he.properties
+++ b/data/strings/FreeColMessages_he.properties
@@ -201,7 +201,6 @@ colopediaAction.goods.name=סחורות
 colopediaAction.nations.name=אומות
 colopediaAction.nationTypes.name=יתרונות לאומיים
 colopediaAction.resources.name=משאבי בונוס
-colopediaAction.skills.name=מיומנויות
 colopediaAction.terrain.name=סוגי שטחים
 colopediaAction.units.name=יחידות
 debugAction.name=החלף למצב בדיקת באגים
@@ -886,6 +885,7 @@ model.building.locationLabel=נמצא ב-%location%
 model.colony.badGovernment=הממשל ב%colony% לא יעיל. המושבה סובלת מקנסות ייצור.
 model.colony.governmentImproved1=הממשל ב%colony% התייעל, אך עדיין אינו יעיל לחלוטין. קנסות ייצור עדיין חלים עליו.
 model.colony.governmentImproved2=הממשל ב%colony% התייעל. קנסות הייצור לא חלים עליו עוד.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% %outputType% יותר היו יכולים להיות מופקים ב%colony%, לו רק היה לנו %inputAmount% %inputType% במאגר.
 model.colony.minimumColonySize=%object% מונע מהצטמצמות יתרה של האוכלוסיה.
 model.colony.unbuildable=%colony% לא יכולה לבנות %object% בזמן זה. %object% הוסר מרשימת הבנייה.
@@ -918,6 +918,7 @@ model.nationState.available.name=זמין
 model.nationState.notAvailable.name=לא זמין
 model.player.independentMarket=אירופה
 model.player.startGame=לאחר חודשים בים, הגעתם לבסוף לחופה של יבשת בלתי נודעת. הפליגו {{tag:%direction%|west=מערבה|east=מזרחה|default=אל תוך הרוח}} כדי לגלות את העולם החדש ולתת אותו לכתר.
+# Fuzzy
 model.player.waitingFor=בהתמנה ל־: %nation%
 model.stance.alliance.name=ברית
 model.stance.ceaseFire.name=הפסקת אש
@@ -992,6 +993,7 @@ combat.enemyShipEvaded=ה%enemyUnit% של %enemyNation% חמקה מהתקפה ש
 combat.enemyShipSunk=%unit% גרמה ל%enemyUnit% של %enemyNation% לשקוע בים!
 combat.equipmentCaptured=היזהר, לוחמי %nation% השיגו כעת %equipment%!
 combat.goodsStolen=%enemyUnit% של %enemyNation% גנב %amount% %goods% ב%colony%!
+# Fuzzy
 combat.indianPlunder=%enemyUnit% של %enemyNation% בזז %amount% זהב מ%colony%.
 combat.indianTreasure=שדדת %amount% מ%settlement%.
 combat.nativeCapitalBurned=העלית באש את %name%, בירת ה%nation%. ה%nation% נכנעים לעוצמתך.
@@ -1032,6 +1034,7 @@ error.couldNotLoad=ארעה שגיאה בעת הנסיון לטעינת המשח
 # Fuzzy
 error.couldNotSave=ארעה שגיאה בעת הנסיון לשמירת המשחק!
 main.defaultPlayerName=שם השחקן
+# Fuzzy
 client.choicePlayer=אנא בחרו בשחקן:
 metaServer.couldNotConnect=לא ניתן להתחבר אל שרת המטא, עמכם הסליחה. אנא נסו שוב מאוחר יותר.
 metaServer.communicationError=ארעה שגיאה בעת יצירת הקשר עם שרת המטא. אנא נסו שוב מאוחר יותר.
@@ -1089,7 +1092,9 @@ clearSpeciality.areYouSure=האם אתה בטוח שאתה רוצה להוריד
 clearSpeciality.impossible=היחידה %unit% לא יכולה לרדת בדרגה!
 defeated.text=הובסת! האם ברצונך:
 defeated.yes=הישאר וצפה במשחק
+# Fuzzy
 diplomacy.offerAccepted=האומה %nation% קיבלה את הצעתכם הנדיבה.
+# Fuzzy
 diplomacy.offerRejected=האומה %nation% דחתה את הצעתכם הנדיבה.
 disbandUnit.text=האם אתה בטוח שברצונך לפרק את היחידה?
 disbandUnit.yes=פרק
@@ -1132,7 +1137,9 @@ move.noAccessBeached=הספינה של %nation% חוסמת את הדרך שלנ
 move.noAccessContact=אנחנו חייבים ליצור קשר עם %nation% לפני כן, הוד מעלתו.
 move.noAccessSettlement=ה%nation% לא מרשים ל%unit% שלנו להכנס להתיישבות שלהם.
 move.noAccessSkill=ה%unit% שלנו אינו יכול ללמוד מהילידים.
+# Fuzzy
 move.noAccessTrade=אין לנו רשות לסחור עם מדינות אירופאיות אחרות כמו %nation%.
+# Fuzzy
 move.noAccessWar=איננו יכולים לסחור עם ה%nation% בזמן מלחמה.
 move.noAccessWater=ה%unit% שלנו חייב לרדת לחוף לפני שהוא יכול להיכנס להתיישבות.
 nameRegion.text=גילית %type% ורשמת את הבעלות עליו על שם הממלכה! לפי המנהג, אתה רשאי לתת לו שם:
@@ -1191,6 +1198,7 @@ report.labour.workingAs=עובד כ-
 report.foreignAffair.stance=עמדה
 report.turn.filter=אל תציג הודעה מסוג זה (%type%)
 report.turn.ignore=התעלם מהודעה זו (מושבה: %colony%, סחורות: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% של %player%
 aboutPanel.version=גרסה:
 buildQueuePanel.buildings=מבנים
@@ -1209,6 +1217,7 @@ chooseFoundingFatherDialog.title=למנות האב המייסד
 colonyPanel.colonyUnits=יחידות המושבה
 colonyPanel.inPort=בנמל
 colonyPanel.outsideColony=מחוץ למושבה
+# Fuzzy
 colonyPanel.producing=בהפקת:
 colonyPanel.reducePopulation=אם כמות התושבים יורדת מתחת ל-%number%, %colony% לא תוכל עוד לבנות %buildable%
 colonyPanel.unitChange=עם הכניסה למושבה ה%oldType% שלך הפך ל%newType%.
@@ -1220,6 +1229,7 @@ colonyPanel.notBestTile=%unit% יכול לייצר יותר %goods% על %tile%
 confirmDeclarationDialog.areYouSure.no=אולי מאוחר יותר
 confirmDeclarationDialog.areYouSure.text=בואו נתנער מהעריצות הלא הוגנת של %monarch% ונכריז על עצמאות המושבות שלנו מהמלך!
 confirmDeclarationDialog.areYouSure.yes=חירות או מוות!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=ארצות הברית של %nation%
 confirmDeclarationDialog.enterCountry=מעתה ואילך, ארצנו תיקרא בשם
 confirmDeclarationDialog.enterNation=וכל אזרח של המדינה המפוארת שלנו יהיה גאה להיקרא
diff --git a/data/strings/FreeColMessages_hsb.properties b/data/strings/FreeColMessages_hsb.properties
index ea54f64e3..68fd5d9e1 100644
--- a/data/strings/FreeColMessages_hsb.properties
+++ b/data/strings/FreeColMessages_hsb.properties
@@ -201,7 +201,6 @@ colopediaAction.goods.name=Twory
 colopediaAction.nations.name=Nacije
 colopediaAction.nationTypes.name=Narodne lěpšiny
 colopediaAction.resources.name=Bonusowe resursy
-colopediaAction.skills.name=Kmanosće
 colopediaAction.terrain.name=Terenowe typy
 colopediaAction.units.name=Jednotki
 colopediaAction.name=%object% (Colopedia)
@@ -1032,16 +1031,22 @@ model.direction.SW.name=juhozapad
 model.direction.W.name=zapad
 model.direction.NW.name=sewjerozapad
 model.historyEventType.abandonColony.description=Wopušćeće koloniju %colony%.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Waša kolonija %colony% so wot %nation% dobywa.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Waša kolonija %colony% so wot %nation% niči.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Ničiće sydlišćo %settlement% %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% niči %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Wuslědźujeće Nowy swět.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Narody %nation% wotkrywaja region %region%.
 model.historyEventType.foundColony.description=Załožujeće koloniju kolonije %colony%.
 model.historyEventType.independence.description=Docpěwaće njewotwisnosć wot Króny.
+# Fuzzy
 model.historyEventType.meetNation.description=Zetkawaće %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=%nation% hižo w Nowym swěće přitomne njejsu.
 model.indianSettlement.mostHatedNone=Žadyn
 model.indianSettlement.mostHatedUnknown=Njeznaty
@@ -1107,6 +1112,7 @@ model.noClaimReason.water.description=Nježadamy wody.
 model.noClaimReason.worked.description=Tutón kraj so hižo wot druheho sydlišća wužiwa.
 model.player.forces=Wójska %nation%
 model.player.independentMarket=Europa
+# Fuzzy
 model.player.waitingFor=Čakanje na: %nation%
 model.regionType.coast.name=Pobrjóh
 model.regionType.coast.unknown=Njeznaty pobrjóžny region
@@ -1155,9 +1161,9 @@ model.unit.occupation.unknown=?
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1178,6 +1184,7 @@ model.player.disaster.effect.colonyDestroyed=%colony% je so dospołnje zničił.
 model.player.disaster.strikes=Twoja kolonija %colony% je so přez %disaster% domapytała.
 model.player.emigrate=W %europe% je so jednotka %unit% rozsudźiła emigrować.
 model.player.foundingFatherJoinedCongress=%foundingFather% je kongresej přistupił!\n\n%description%
+# Fuzzy
 model.player.stance.war.declared=Špatne nowinki, waša ekscelenca, narod %nation% je nam wójnu připowědźił!
 model.region.north.name=Sewjer
 model.region.northEast.name=Sewjerowuchod
@@ -1202,12 +1209,15 @@ error.couldNotLoad=Při startowanju hry je zmylk wustupił.
 # Fuzzy
 error.couldNotSave=Při pospyće hru składować je zmylk wustupił!
 main.defaultPlayerName=Mjeno hrajerja
+# Fuzzy
 client.choicePlayer=Wuzwolće prošu hrajerja:
 metaServer.couldNotConnect=Wodajće zwisk z metaserwerom njeje móžno był. Prošu spytajće pozdźišo hišće raz.
 metaServer.communicationError=Při komunikaciji z metaserwerom je zmylk wustupił. Prošu spytaj pozdźišo hišće raz.
 abandonEducation.action.studying=studij
 abandonEducation.action.teaching=wukubłanje
+# Fuzzy
 abandonEducation.no=Ně, wukubłanje dale wjesć
+# Fuzzy
 abandonEducation.yes=Haj, koloniju wopušćić
 boycottedGoods.dumpGoods=Twory wotkłasć
 buy.moreGold=Nišu płaćiznu sej žadać
@@ -1252,7 +1262,9 @@ buildColony.yes=Połož fundamenty!
 buyProposition.text=Chceće twory kupić?
 defeated.yes=Wostać a přihladować
 defeatedSinglePlayer.yes=Rewanšowy modus zapodać
+# Fuzzy
 diplomacy.offerAccepted=%nation% su waš šćedriwy poskitk přiwzali.
+# Fuzzy
 diplomacy.offerRejected=%nation% su waš šćedriwy poskitk wotpokazali.
 disbandUnit.yes=Rozpušćić
 event.firstLanding=Prěnje přistaće w %name%!
@@ -1273,6 +1285,7 @@ learnSkill.no=Ně, dźakuju so, snano pozdźišo
 learnSkill.yes=Haj, to chcu
 missionarySettlement.cancel=Wostajće nas w měrje žiwi być!
 move.noAccessSkill=Naša jednotka %unit% njemóže wot domoródnych wuknyć.
+# Fuzzy
 move.noAccessWar=Za čas wójny njemóžemy z narodom %nation% wikować.
 move.noTile=Naša %unit% na karće njeje!
 newLand.text=Prošu pomjenujće nowy kraj:
@@ -1360,6 +1373,7 @@ colopedia.unit.offensivePower=Ofensiwna móc:
 colopedia.unit.price=Płaćizna w Europje:
 colopedia.unit.productionBonus={{plural:%number%|one=Produkciski modifikator|two=Produkciskej modifikatoraj|few=Produkciske modifikatory|other=Produkciskich modifikatorow|default=Produkciske modifikatory}}
 colopedia.unit.requirements=Potrěbnosće:
+# Fuzzy
 colopedia.unit.school=Za wukubłanje trěbna šula:
 colopedia.unit.skill=Stopjeń kmanosće:
 report.labour.allColonists=Wšitcy kolonisća
@@ -1390,12 +1404,9 @@ report.colony.making.noconstruction.description=%colony%: Twarske dźěła njejs
 report.colony.making.noteach.description=%colony%: %teacher% nima studenta
 report.colony.name.description=Lisćina kolonijow
 report.colony.name.header=Kolonija
-report.colony.plow.description=Ličba polow kolonije, kotrež bychu so  přez woranje polěpšili
-report.colony.plow.header=L
+# Fuzzy
 report.colony.production.description=%colony%: produkcija %goods% (netto) = %amount%
 report.colony.production.header=Produkcija %goods% (netto)
-report.colony.road.description=Ličba polow kolonije, kotrež bychu so přez dróhotwar woranje polěpšili
-report.colony.road.header=D
 # Fuzzy
 report.continentalCongress.elected=Wuzwoleny:
 report.continentalCongress.none=(žadyn)
@@ -1443,12 +1454,14 @@ report.requirements.surplus=Nadbytk %goods% produkuje so w
 report.trade.afterTaxes=Dochody po dawkach
 report.trade.beforeTaxes=Dochody před dawkami
 report.trade.cargoUnits=Wjezwowe jednotki
+# Fuzzy
 report.trade.hasCustomHouse=* Tuta kolonija ma cłownju; tute twory so eksportuja.
 report.trade.totalDelta=Cyłkowna produkcija
 report.trade.totalUnits=Jednotki dohromady
 report.trade.unitsSold=Kupjene abo předate jednotki
 report.turn.filter=Tutón typ powěsće (%type%) njezwobraznić
 report.turn.ignore=Tutu powěsć ignorować (kolonija: %colony%, twory: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% hrajerja %player%
 # Fuzzy
 aboutPanel.copyright=Copyright © 2002-2013 Team FreeCol
@@ -1471,6 +1484,7 @@ chooseFoundingFatherDialog.title=Załožerskeho wótca nominować
 colonyPanel.colonyUnits=Kolonijowe jdnotki
 colonyPanel.inPort=W přistawje
 colonyPanel.outsideColony=Zwonka kolonije
+# Fuzzy
 colonyPanel.producing=Zhotowjenje:
 colonyPanel.bonusLabel=Bonus: %number%%extra%
 colonyPanel.populationLabel=Populacija: %number%
@@ -1480,7 +1494,9 @@ colonyPanel.notBestTile=Jednotka %unit% móhła wjace %goods% na polu %tile% pro
 confirmDeclarationDialog.areYouSure.no=Snano pozdźišo
 confirmDeclarationDialog.areYouSure.text=Wzdajmy so njesprawneho tyranstwa %monarch% a deklarujmy njewotwisnosć našich kolonijow wot króny!
 confirmDeclarationDialog.areYouSure.yes=Swoboda abo Smjerć!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Zjednoćene staty %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Swobodny %nation%
 confirmDeclarationDialog.enterCountry=Wotnětka ma naš kraj znaty być jako
 confirmDeclarationDialog.enterNation=a kóždy krajan našeho sławneho naroda budź hordy, zo je znaty jako
@@ -1490,8 +1506,10 @@ negotiationDialog.accept=Akceptować
 negotiationDialog.add=Přidać
 negotiationDialog.cancel=Přetorhnyć
 negotiationDialog.clear=wuprózdnić
+# Fuzzy
 negotiationDialog.demand=%nation% žadaja sej wot %otherNation%
 negotiationDialog.exchange=jako wotrunanje za
+# Fuzzy
 negotiationDialog.offer=%nation% poskićeja %otherNation%
 negotiationDialog.send=Pósłać
 negotiationDialog.title.tribute=žadanje za tributom
diff --git a/data/strings/FreeColMessages_hu.properties b/data/strings/FreeColMessages_hu.properties
index 4a3863ef3..092d8e530 100644
--- a/data/strings/FreeColMessages_hu.properties
+++ b/data/strings/FreeColMessages_hu.properties
@@ -54,7 +54,6 @@ load=Betöltés
 many=sok
 medium=Közepes
 more=többet...
-# Fuzzy
 music=Zene
 name=Név
 no=Nem
@@ -73,7 +72,6 @@ save=Mentés
 # Fuzzy
 server=Kiszolgáló neve:
 small=Kicsi
-# Fuzzy
 test=Teszt
 true=Igaz
 unload=Kirakodás
@@ -102,7 +100,6 @@ inPort=Kikötőben
 mission=Küldetés
 modifiers=Módosítók
 nation=Nemzet
-# Fuzzy
 newWorld=Új Világ
 notApplicable=N/A
 payArrears=Megfizetem a hátralékot
@@ -247,7 +244,6 @@ colopediaAction.goods.name=Termékek
 colopediaAction.nations.name=Nemzetek
 colopediaAction.nationTypes.name=Nemzeti erősségek
 colopediaAction.resources.name=Nyersanyag bónuszok
-colopediaAction.skills.name=Mesterségek
 colopediaAction.terrain.name=Tereptípusok
 colopediaAction.units.name=Egységek
 continueAction.name=A játék folytatása
@@ -1457,6 +1453,7 @@ model.building.locationLabel=Itt állomásozik: %location%
 model.colony.badGovernment=A %colony%i önkormányzat nagyon nehézkes, ezért termelési megszorítások sújtják a települést.
 model.colony.governmentImproved1=A %colony%i önkormányzat bár javult, de még mindig nem hatékony. A termelési levonások továbbra is érvényesek.
 model.colony.governmentImproved2=A %colony%i önkormányzat fejlődik, a termelés már a megszokott hatékonysággal működik.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% egységgel több %outputType% készülhetne %colony% kolóniában, ha %inputAmount% egységgel nagyobb %inputType% készletünk lenne.
 model.colony.minimumColonySize=A %object% miatt nem tudjuk tovább csökkenteni a népességet.
 model.colony.unbuildable=%colony% jelenleg nem építhet %object%-t. A(z) %object% kikerült az építési sorból.
@@ -1470,21 +1467,29 @@ model.direction.SW.name=délnyugat
 model.direction.W.name=nyugat
 model.direction.NW.name=északnyugat
 model.historyEventType.abandonColony.description=A(z) %colony% gyarmat elhagyása.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Felfedezted %city% városát, az Arany Hét Városa közül az egyiket; és a falak között %treasure% aranyat!
+# Fuzzy
 model.historyEventType.colonyConquered.description=A(z) %colony% kolónit meghódítja a(z) %nation% nép.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=A(z) %colony% kolóniát elpusztítja a gaz %nation% nép.
 # Fuzzy
 model.historyEventType.conquerColony.description=Hogy mered elfogadni nagylelkű ajánlatunkat, majd elkerülni a fizetést? Ez a kétszínűség el fogja nyerni királyi nemtetszésünk keserű jutalmát!
 # Fuzzy
 model.historyEventType.declareIndependence.description=A(z) %nation% %settlement% település elpusztítása katonáink által.
+# Fuzzy
 model.historyEventType.destroyNation.description=Elpusztítottad a %nation% népet.
 model.historyEventType.discoverNewWorld.description=Az Új Világ felfedezése.
+# Fuzzy
 model.historyEventType.discoverRegion.description=A(z) %region%t feledezése.
 model.historyEventType.foundColony.description=A(z) %colony% gyarmat megalapítása.
 model.historyEventType.foundingFather.description=%father% csatlakozott a Kontinentális Kongresszushoz.
 model.historyEventType.independence.description=Elnyerted függetlenségedet a Koronától.
+# Fuzzy
 model.historyEventType.meetNation.description=Első találkozás a(z) %nation% néppel.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=A(z) %nation% nép kipusztult.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=A(z) %loserNation% nemzet minden újvilági gyarmata mától %nation% fennhatóság alá kerül.
 model.indianSettlement.mostHatedNone=Nincs
 model.indianSettlement.mostHatedUnknown=Ismeretlen
@@ -1524,8 +1529,10 @@ model.messageType.warehouseCapacity.name=Raktár férőhely
 model.messageType.warning.name=Figyelmeztetések
 model.monarch.action.addToRef.text=%number% {{plural:%number%|%unit%}} csatlakozott a Királyi Expedíciós Erőkhöz a Király parancsára. A gyarmatok vezetői aggodalmukat fejezik ki.
 model.monarch.action.addToRef.no=Rendben!
+# Fuzzy
 model.monarch.action.declarePeace.text=Kegyesen elfogadtuk a békeszerződést a(z) %nation% nemzettel.
 model.monarch.action.declarePeace.no=Rendben!
+# Fuzzy
 model.monarch.action.declareWar.text=A(z) %nation% nemzet pimaszsága arra kényszerít minket, hogy hadat üzenjünk nekik!
 model.monarch.action.declareWar.no=Rendben!
 # Fuzzy
@@ -1571,6 +1578,7 @@ model.noClaimReason.worked.description=Egy másik település már használja ez
 model.player.forces=%nation% Erők
 model.player.independentMarket=Európa
 model.player.startGame=Több hónapos hajóút után végre megérkeztünk egy ismeretlen földrész partjaihoz. Hajózzunk {{tag:%direction%|west=nyugatra|east=keletre|default=tovább}, hogy felfedezhessük és a Korona nevében a magunkénak nyilvánítsuk ezt az Új Világot!
+# Fuzzy
 model.player.waitingFor=A(z) %nation% játékos lép...
 model.regionType.coast.name=Part
 model.regionType.coast.unknown=Ismeretlen partvidék
@@ -1625,9 +1633,9 @@ model.unit.underRepair=Javítás (%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=E
 model.unit.unitState.fortifying=E
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=K
 model.unit.unitState.sentry=Ő
+# Fuzzy
 model.unit.unitState.skipped=V
 model.unit.unitState.toAmerica=M
 model.unit.unitState.toEurope=M
@@ -1653,11 +1661,13 @@ model.colony.warehouseOverfull=Uram, a %colony%i raktárban megtelt a(z) %goods%
 model.colony.warehouseSoonFull=Uram, %colony% raktárának %goods% férőhelyei a következő körben megtelnek, %amount% %goods% kárba fog veszni.
 model.colony.warehouseWaste=Uram! %colony% raktárában túl sok %goods% van, %waste% egység kárba veszett!
 model.colonyTile.resourceExhausted=Uram, kimerült az %resource% forrás a %colony%i kolóniában.
+# Fuzzy
 model.game.spanishSuccession=Exellenciás Uram, a Spanyol Örökösödési háború véget ért az Óvilágban! Az Utrechti Egyezmény szerint az összes újvilági %loserNation% gyarmat mától %nation% kézre kerül.
 model.indianSettlement.mission.denounced=Misszionáriusodat lefogták és kivégezték a(z) %settlement%i faluban!
 model.player.colonyGoodsParty.harbour=%amount% %goods% vált a halak vacsorájává a %colony%i kikötőben. A lakosság így tiltakozik a Korona által kirótt igazságtalan adók ellen!
 model.player.colonyGoodsParty.horses=A %colony%i lakosok szélnek eresztettek %amount% lovat, így tiltakozva a Korona által kirótt igazságtalan adók ellen!
 model.player.colonyGoodsParty.landLocked=A %colony%i piactéren %amount% %goods% vált a lángok martalékává. A lakosság ezzel tiltakozik a Korona által kirótt igazságtalan adók ellen!
+# Fuzzy
 model.player.dead.european=Excellenciás Uram, a(z) %nation% nemzet bejelentette kivonulását az újvilági ügyekből!
 model.player.dead.native=Excellenicás Uram, a(z) %nation% nép elpusztult.
 model.player.disaster.effect.colonyDestroyed=%colony% teljesen elpusztult.
@@ -1666,12 +1676,16 @@ model.player.foundingFatherJoinedCongress=%foundingFather% csatlakozott a Kongre
 model.player.interventionForceArrives=Az ígért intervenciós hadsereg megérkezik!
 model.player.soLDecrease=A Szabaság Fiai mozgalom tagjainak száma a gyarmataidon %newSoL% százalékra csökkent!
 model.player.soLIncrease=A Szabaság Fiai mozgalom tagjainak száma a gyarmataidon %newSoL% százalékra emelkedett!
+# Fuzzy
 model.player.stance.alliance.declared=Exellenciás uram, a(z) %nation% nép szövetségesünk!
 model.player.stance.alliance.others=Exellenciás uram, a(z) %attacker% és %defender% népek szövetségben vannak.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Exellenciás uram, a(z) %nation% nép tűzszünetet kötött velünk!
 model.player.stance.ceaseFire.others=Exellenciás uram, a(z) %attacker% támadók tűszünetet írtak alá a %defender% néppel.
+# Fuzzy
 model.player.stance.peace.declared=Exellenciás uram, a(z) %nation% néppel békében vagyunk!
 model.player.stance.peace.others=Exellenciás uram, a(z) %attacker% és %defender% népek békét kötöttek egymással.
+# Fuzzy
 model.player.stance.war.declared=Rossz hírem van Exellenciás Uram, a %nation% nemzet hadat üzent nekünk!
 model.player.stance.war.others=Exellenciás Uram a(z) %attacker% nemzet hadat üzent a %defender% nemzetnek.
 combat.automaticDefence=A(z) %unit% %colony%i kolóniában fegyvert ragadt otthona védelmében!
@@ -1686,6 +1700,7 @@ combat.enemyShipEvaded=A %enemyNation% %enemyUnit% elhárította a(z) %unit% tá
 combat.enemyShipSunk=A(z) %unit% hajónk elsüllyeszetett egy %enemyNation% %enemyUnit% hajót!
 combat.equipmentCaptured=Vigyázz, a %nation% indiánok felszerelték magukat ezekkel: %equipment%!
 combat.goodsStolen=Egy aljas %enemyNation% %enemyUnit% ellopott %amount% egységet a %colony%i %goods% készletből!
+# Fuzzy
 combat.indianPlunder=A(z) %enemyNation% %enemyUnit% %amount% aranypénzt zsákmányolt a %colony%i kolóniától.
 combat.indianTreasure=%amount% aranyat zsákmányoltál a %settlement% településből.
 combat.nativeCapitalBurned=Porig égetted a(z) %nation% fővárost, %name%-t. A(z) %nation% nép behódol erődnek!
@@ -1738,13 +1753,16 @@ main.defaultPlayerName=Játékos neve
 main.javaVersion=%minVersion% vagy jobb Java verzió javasolt a FreeCol futtatásához (%version% verziójút találtunk, ennek az ellenőrzésnek a kihagyásához használd a --no-java-check paramétert).
 main.memory=%memory% bájtnál több memóriát kell hozzárendelned a JVM-hez.\n Indítsd újra a FreeColt ezekkel a paraméterekkel:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=A FreeCol nem talált megfelelő könyvtárat a felhasználói adatok elmentéséhez. A program folytatódik, de problémákra számíthatsz.
+# Fuzzy
 client.choicePlayer=Válassz ki egy játékost:
 metaServer.couldNotConnect=Nem tudok csatlakozni a meta-kiszolgálóhoz. Próbáld újra később.
 metaServer.communicationError=Hibát észleltem a meta-kiszolgálón. Próbáld újra később.
 abandonEducation.action.studying=tanulással
 abandonEducation.action.teaching=tanítással
+# Fuzzy
 abandonEducation.no=Nem, folytassa a képzést!
 abandonEducation.text=Ha a %unit% elhagyja %colony% kolóniáját, felhagy a %action% a(z) %building%ban. Biztos vagy benne, hogy mennie kell?
+# Fuzzy
 abandonEducation.yes=Igen, hagyja el a kolóniát!
 boycottedGoods.dumpGoods=A tengerbe vele!
 boycottedGoods.text=Mivel a %goods% kereskedelmét bojkottálta a Korona, ezért nem adható el a(z) %europe%i piacon. Megfizeted a hátralékod (%amount% aranyat) vagy inkább a tengerbe vetteted az árut, ezzel megsemmisítve azt?
@@ -1752,8 +1770,11 @@ buy.moreGold=Alacsonyabb árat kérek
 buy.takeOffer=Elfogadom az ajánlatot
 buy.text=A %nation% nép szeretne %goods%t eladni neked %gold% aranyért:
 clearTradeRoute.text=%unit% egysége a(z) %route% útvonalat követi. Az új cél beállítása eltéríti az útvonalról. Biztosan ezt szeretné?
+# Fuzzy
 confirmHostile.alliance=Nem támadhatsz meg egy szövetségest! Valóban felbontod a szövetséget a %nation% nemzettel és hadat üzensz nekik?
+# Fuzzy
 confirmHostile.ceaseFire=A %nation% hadakkal tűzszünetet kötöttél. Biztos hogy támadni akarsz?
+# Fuzzy
 confirmHostile.peace=A %nation% nemzettel jelenleg békében vagyunk. Biztos hogy hadat akarsz üzenni nekik?
 error.noSuchFile=Ez az állomány nem létezik vagy nem megfelelő az állomány tipusa.
 # Fuzzy
@@ -1804,7 +1825,9 @@ clearSpeciality.areYouSure=Biztosan lefokozod a(z) %oldUnit% egységed %unit% eg
 clearSpeciality.impossible=%unit% egységedet nem lehet lefokozni!
 defeated.text=Isten legyen irgalmas, elvesztünk! Mihez kezdjünk most?
 defeated.yes=Szemlélőként maradok
+# Fuzzy
 diplomacy.offerAccepted=Uram, a %nation% nép elfogadta nagylelkű ajánlatát.
+# Fuzzy
 diplomacy.offerRejected=Uram, a %nation% nép elutasította nagylelkű ajánlatát.
 disbandUnit.text=Biztosan feloszlatod ezt az egységet?
 disbandUnit.yes=Oszolj!
@@ -1846,7 +1869,9 @@ move.noAccessContact=Excellenciás uram, előbb föl kell vennünk a kapcsolatot
 move.noAccessGoods=A %nation% nem keresekedik egy üres %unit%-val.
 move.noAccessSettlement=A(z) %nation% nemzet nem engedi %unit% egységünket a kolóniája területére.
 move.noAccessSkill=%unit% egységünk nem tanulhat az őslakóktól.
+# Fuzzy
 move.noAccessTrade=Nincs felhatalmazásunk kereskedni más Óvilágiakkal, mint például a %nation% nemzettel.
+# Fuzzy
 move.noAccessWar=Nem kereskedhetünk a %nation% nemzettel háború idején.
 move.noAccessWater=A(z) %unit% egységnek partra kell szállnia mielőtt beléphet a településre.
 move.noAttackWater=A(z) %unit% partra kell szálljon, mielőtt támad.
@@ -1949,6 +1974,7 @@ colopedia.unit.offensivePower=Támadó erő:
 colopedia.unit.price=Óvilági ára:
 colopedia.unit.productionBonus=Termelési {{plural:%number%|one=módosító|other=módosítók}}:
 colopedia.unit.requirements=Előfeltételek:
+# Fuzzy
 colopedia.unit.school=Képzéshez szükséges iskola:
 colopedia.unit.skill=Szakértelem szintje:
 report.labour.allColonists=Összes telepes
@@ -2022,12 +2048,14 @@ report.requirements.surplus=Az alábbi kolóniák termelnek %goods% felesleget:
 report.trade.afterTaxes=Bevétel adózás után
 report.trade.beforeTaxes=Bevétel adózás előtt
 report.trade.cargoUnits=Egységek berakodva
+# Fuzzy
 report.trade.hasCustomHouse=* Ez a kolónia rendelkezik vámházzal; az árukat exportálják.
 report.trade.totalDelta=Teljes termelés
 report.trade.totalUnits=Egységek össesen
 report.trade.unitsSold=Eladott/vett egységek
 report.turn.filter=Ne mutasd ezt a fajta üzenetet (%type%)
 report.turn.ignore=Üzenet figyelmen kívül hagyása (Kolónia: %colony%, Javak: %goods%)
+# Fuzzy
 report.turn.playerNation=%player% %nation%(ja)i
 # Fuzzy
 aboutPanel.copyright=Copyright © 2002-2014  A FreeCol Csapat
@@ -2052,6 +2080,7 @@ chooseFoundingFatherDialog.title=Alapító Atya választása
 colonyPanel.colonyUnits=Egységek a kolóniában
 colonyPanel.inPort=A kikötőben
 colonyPanel.outsideColony=Településen kívül
+# Fuzzy
 colonyPanel.producing=Előállítás alatt:
 colonyPanel.reducePopulation=Ha %number% alá csökkented a lakosságot, %colony% már nem építhet %buildable%-t.
 colonyPanel.unitChange=A kolóniádba lépve a(z) %oldType% %newType% lett.
@@ -2063,7 +2092,9 @@ colonyPanel.notBestTile=%unit% több %goods% árut termelhetne a %tile% mezőn.
 confirmDeclarationDialog.areYouSure.no=Inkább később
 confirmDeclarationDialog.areYouSure.text=Rázzuk le magunkról %monarch% zsarnoki uralmát és kiáltsuk a koronától való függetlenségünket!
 confirmDeclarationDialog.areYouSure.yes=Szabadság vagy Halál!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=%nation% Egyesült Államok
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Szabad %nation%
 confirmDeclarationDialog.enterCountry=Legyen mától fogva államunk neve
 confirmDeclarationDialog.enterNation=és dicső nemzetségünk minden lakója nevezze magát büszkén
diff --git a/data/strings/FreeColMessages_ia.properties b/data/strings/FreeColMessages_ia.properties
index 9515f709d..5c2899598 100644
--- a/data/strings/FreeColMessages_ia.properties
+++ b/data/strings/FreeColMessages_ia.properties
@@ -37,14 +37,13 @@ all=Totes
 and=e
 browse=Percurrer
 cancel=Cancellar
+client=Cliente
 close=Clauder
 color=Color
 connect=Connecter
-# Fuzzy
 current=Actual
 false=False
-# Fuzzy
-fill=Resultato final
+fill=Plenar
 height=Altitude
 help=Adjuta
 high=Alte
@@ -55,7 +54,6 @@ low=Basse
 many=multes
 medium=Medie
 more=plus...
-# Fuzzy
 music=Musica
 name=Nomine
 no=No
@@ -256,7 +254,6 @@ colopediaAction.goods.name=Benes
 colopediaAction.nations.name=Nationes
 colopediaAction.nationTypes.name=Avantages national
 colopediaAction.resources.name=Ressources de bonus
-colopediaAction.skills.name=Mestieros
 colopediaAction.terrain.name=Typos de terreno
 colopediaAction.units.name=Unitates
 colopediaAction.name=%object% (Colopedia)
@@ -1327,6 +1324,7 @@ model.improvement.road.description=Cammino/Strata/Via
 model.improvement.road.name=Cammino
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limite de colonia litoral
+# Fuzzy
 model.limit.independence.coastalColonies.description=Tu debe disponer de al minus %limit% colonias litoral pro poter declarar le independentia.
 model.limit.independence.rebels.name=Limite de rebellos
 model.limit.independence.rebels.description=Al minus %limit%% de tu colonos debe supportar le independentia.
@@ -1639,6 +1637,7 @@ model.colony.badGovernment=Le governamento de %colony% es inefficiente. Penalita
 model.colony.goodGovernment=Le efficientia del governamento se ha meliorate! Le sentimento rebelle in %colony% es ora equal o superior a %number% per cento.
 model.colony.governmentImproved1=Le governamento de %colony% ha meliorate, ma es ancora inefficiente. Penalitates continua a esser applicate al production.
 model.colony.governmentImproved2=Le governamento de %colony% ha meliorate. Le penalitates non es plus applicate al production.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% plus de %outputType% poterea esser producite in %colony%, si solmente nos habeva %inputAmount% additional %inputType% in surplus.
 model.colony.lostGoodGovernment=Le efficientia del governamento ha diminuite! Le sentimento rebelle in %colony% non plus es equal o superior a %number% per cento. Le colonia non plus gania un bonus de production.
 model.colony.lostVeryGoodGovernment=Le efficientia del governamento ha diminuite! Le sentimento rebelle in %colony% non plus es equal o superior a %number% per cento. Alcun bonuses de production ha essite perdite.
@@ -1653,12 +1652,17 @@ model.colony.veryBadGovernment=Le governamento de %colony% es multo inefficiente
 model.colony.veryGoodGovernment=Le efficientia del governamento se ha meliorate! Le sentimento rebelle in %colony% es ora equal o superior a %number% per cento.
 model.colonyTile.claim=(revindicar %direction%)
 model.diplomaticTrade.receive.contact=Salutationes fraterne del gloriose nation %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Que nos negotia con le %nation%.
 model.diplomaticTrade.receive.trade=Que nos considera le offerta de commercio del %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=Le %nation% exige un tributo de nos!
 model.diplomaticTrade.send.contact=Nos ha incontrate membros del nation %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Que nos considera nostre situation diplomatic con le %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Que nos propone un commercio con le %nation% in %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Nos exige un tributo del %nation% in %settlement%.
 model.direction.N.name=nord
 model.direction.NE.name=nord-est
@@ -1669,25 +1673,37 @@ model.direction.SW.name=sud-west
 model.direction.W.name=west
 model.direction.NW.name=nord-west
 model.historyEventType.abandonColony.description=Tu abandona le colonia de %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Cessa-le-foco signate con %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Le %nation% discoperi %city%, un del Septe Citates de Auro, e un tresor de %treasure% de auro.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Tu colonia %colony% es conquirite per le %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Tu colonia %colony% es destruite per le %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Vos osa acceptar Nostre conditiones generose e totevia evader pagamento? Tal duplicitate recoltara le recompensa amar de Nostre displacer.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Tu destrue le stabilimento %settlement% del %nation%.
+# Fuzzy
 model.historyEventType.declareWar.description=Guerra declarate con %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Le %nation% destrue le %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Tu discoperi le Nove Mundo.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Le %nation% discoperi %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Alliantia negotiate con %nation%.
 model.historyEventType.foundColony.description=Tu funda le colonia de %colony%.
 model.historyEventType.foundingFather.description=%father% se junge al Congresso Continental.
 model.historyEventType.independence.description=Tu realisa le independentia del Corona.
+# Fuzzy
 model.historyEventType.makePeace.description=Accordo de pace signate con %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Tu incontra le %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Le %nation% non plus es presente in le Nove Mundo.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Le %loserNation% cede tote lor colonias in le Nove Mundo al %nation%.
 model.indianSettlement.mostHatedNone=Nulle
 model.indianSettlement.mostHatedUnknown=Incognite
@@ -1738,8 +1754,10 @@ model.messageType.warehouseCapacity.name=Capacitate del depositos
 model.messageType.warning.name=Advertimentos
 model.monarch.action.addToRef.text=Le Corona ha addite %number% {{plural:%number%|%unit%}} al Fortia Expeditionari Regal. Le governatores colonial exprime lor preoccupation.
 model.monarch.action.addToRef.no=Finite
+# Fuzzy
 model.monarch.action.declarePeace.text=Nos ha gratiosemente acceptate un tractato de pace con le %nation%.
 model.monarch.action.declarePeace.no=Facite
+# Fuzzy
 model.monarch.action.declareWar.text=Le insolentia del %nation% Nos constringe a declarar les le guerra!
 model.monarch.action.declareWar.no=Finite
 # Fuzzy
@@ -1799,6 +1817,7 @@ model.player.colonialIndependence=Solmente jocatores colonial pote declarar inde
 model.player.forces=Fortias de %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Post menses de navigation, tu ha finalmente arrivate al costa de un continente incognite. Naviga {{tag:%direction%|west=verso le west|east=verso le est|default=contra le vento}} pro discoperir le Nove Mundo e reclamar lo pro le Corona.
+# Fuzzy
 model.player.waitingFor=Attendente: %nation%
 model.regionType.coast.name=Costa
 model.regionType.coast.unknown=Region costari incognite
@@ -1838,6 +1857,7 @@ model.tradeItem.gold.name=Auro
 model.tradeItem.gold.description=le summa de %amount% de auro
 model.tradeItem.goods.name=Benes
 model.tradeItem.incite.name=Declarar le guerra a
+# Fuzzy
 model.tradeItem.incite.description=guerra contra le %nation%
 model.tradeItem.stance.name=Postura
 model.tradeItem.unit.name=Unitate
@@ -1858,9 +1878,9 @@ model.unit.underRepair=Reparation(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1901,6 +1921,7 @@ model.colony.warehouseSoonFull=Tu deposito in %colony% excedera tu capacitate pr
 model.colony.warehouseWaste=Tu deposito in %colony% ha excedite su capacitate de %goods%. %waste% unitates ha essite perdite.
 model.colony.workersEvicted=A %colony%, vostre colonos non pote plus laborar in %location% a causa del presentia de %enemyUnit%.
 model.colonyTile.resourceExhausted=Ressource %resource% exhaurite in %colony%
+# Fuzzy
 model.game.spanishSuccession=Vostre Excellentia, le Guerra de Succession Espaniol ha finite in Europa. In le Tractato de Utrecht, le %loserNation% ha essite fortiate a ceder tote le colonias in le Nove Mundo al %nation%!
 model.indianSettlement.mission.denounced=Tu missionario a %settlement% ha essite denunciate e executate!
 model.indianSettlement.mission.destroyed=Vostre missionario a %settlement% ha morite in le destruction del stabilimento.
@@ -1910,6 +1931,7 @@ model.player.autoRecruit=Tensiones religiose in %europe% incita le %unit% a emig
 model.player.colonyGoodsParty.harbour=Vostre colonos in %colony% ha jectate %amount% unitates de %goods% in le porto in protesto contra iste injuste taxation per le Corona!
 model.player.colonyGoodsParty.horses=Tu colonos in %colony% ha liberate %amount% cavallos in protesto contra iste taxation injuste per le Corona!
 model.player.colonyGoodsParty.landLocked=Vostre colonos in %colony% ha comburite %amount% unitates de %goods% super le placia del mercato in protesto contra iste injuste taxation per le Corona!
+# Fuzzy
 model.player.dead.european=Vostre Excellentia, le %nation% ha declarate un retiro inconditional del affaires del Nove Mundo!
 model.player.dead.native=Vostre Excellentia, le %nation% ha essite destruite.
 model.player.disaster.bankruptcy.start=Vos non ha pagate pro le mantenentia de tote le edificios. Sanctiones sever essera imponite al production.
@@ -1923,12 +1945,16 @@ model.player.ignoredTax=Le Corona ha augmentate le taxa de imposto a %amount%% c
 model.player.interventionForceArrives=Le promittite Fortia de Intervention arriva!
 model.player.soLDecrease=Le adhesion al Filios del Libertate in tu colonias ha diminuite a %newSoL% per cento!
 model.player.soLIncrease=Le adhesion al Filios del Libertate in tu colonias ha augmentate a %newSoL% per cento!
+# Fuzzy
 model.player.stance.alliance.declared=Vostre Excellentia, le %nation% es in alliantia con nos!
 model.player.stance.alliance.others=Vostre Excellentia, le %attacker% es in alliantia con le %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Vostre Excellentia, le %nation% ha acceptate un cessa-le-foco con nos!
 model.player.stance.ceaseFire.others=Vostre Excellentia, le %attacker% ha acceptate un cessa-le-foco con le %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Vostre Excellentia, le %nation% es in pace con nos!
 model.player.stance.peace.others=Vostre Excellentia, le %attacker% es in pace con le %defender%.
+# Fuzzy
 model.player.stance.war.declared=Mal novas, Vostre Excellentia, le %nation% nos ha declarate le guerra!
 model.player.stance.war.others=Vostre Excellentia, le %attacker% ha declarate le guerra al %defender%.
 combat.automaticDefence=Tu %unit% in %colony% ha prendite le armas pro defender le colonia!
@@ -1944,6 +1970,7 @@ combat.enemyShipEvaded=Le %enemyUnit% del %enemyNation% ha evadite un attacco pe
 combat.enemyShipSunk=%unit% ha affundate un %enemyUnit% del %enemyNation%!
 combat.equipmentCaptured=Attention, le bravos del %nation% ha acquirite %equipment%!
 combat.goodsStolen=Un %enemyUnit% del %enemyNation% fura %amount% %goods% in %colony%!
+# Fuzzy
 combat.indianPlunder=Un %enemyUnit% del %enemyNation% rapina %amount% ex %colony%.
 combat.indianRaid=Nostre spias reporta que le %nation% ha assaltate le colonia %colonyNation% de %colony%.
 combat.indianSurprise=Le %nation% attacca %colony% per surprisa, alarmante nostre colonos. Le chef del %nation% nega tote responsabilitate.
@@ -2000,6 +2027,7 @@ main.javaVersion=Java version %minVersion% o melior es recommendate pro executar
 main.memory=Es necessari assignar plus de %memory% bytes de memoria pro usar le JVM.\nReinitia FreeCol con:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol non ha trovate directorios apte pro salveguardar le datos de usator. Le programma pote continuar, ma tu debe expectar problemas.
 client.baseData=Impossibile trovar le directorio de datos %dir%.\n  FreeCol non ha potite trovar su files de datos.\n  Per favor assecura que illos sia presente.\n  Si FreeCol cerca in le mal directorio, alora\n  adjunge un parametro al commando de execution:\n  --freecol-data <data-directory>
+# Fuzzy
 client.choicePlayer=Selige un jocator:
 client.classic=Impossibile cargar le mappa de ressources ab le insimul de regulas 'classic'.
 client.headlessDebug=Le modo sin capite necessita un execution in modo debugging.
@@ -2009,8 +2037,10 @@ metaServer.couldNotConnect=Pardono, non poteva connecter al meta-servitor. Per f
 metaServer.communicationError=Error durante le communication con le meta-servitor. Per favor reproba plus tarde.
 abandonEducation.action.studying=studio
 abandonEducation.action.teaching=inseniamento
+# Fuzzy
 abandonEducation.no=No, continua le education
 abandonEducation.text=Si tu %unit% quita %colony%, le %action% in le %building% essera abandonate. Es tu secur que illo debe quitar?
+# Fuzzy
 abandonEducation.yes=Si, quita le colonia
 abandonTeaching.text=Si tu %unit% quita le %building% ille cessara de inseniar. Es tu secur que ille debe partir?
 armedUnitSettlement.attack=Attaccar
@@ -2022,9 +2052,13 @@ buy.takeOffer=Acceptar le offerta
 buy.text=Le %nation% vole vender lor %goods% pro %gold%:
 clearTradeRoute.text=Tu %unit% es assignate a commerciar in le route %route%. Si tu selige su destination, illo abandonara iste route de commercio. Es tu secur de voler facer isto?
 client.fullScreen=Le modo de schermo plen non es supportate pro iste dispositivo graphic.\nLe programma retorna al modo de fenestra.
+# Fuzzy
 confirmHostile.alliance=Tu non pote attaccar un nation alliate! Vole tu vermente rumper tu alliantia con le %nation% e declarar le guerra?
+# Fuzzy
 confirmHostile.ceaseFire=Tu ha signate un cessa-le-foco con le %nation%. Vole tu vermente attaccar les?
+# Fuzzy
 confirmHostile.peace=Tu es in pace con le %nation%. Vole tu vermente declarar le guerra?
+# Fuzzy
 confirmTribute.broke=Nostre spias reporta que le %nation% es completemente sin moneta. Que nos non perde nostre tempore con demandas de tributo.
 confirmTribute.european=Le %nation% %danger% e %finance%. Quante tributo debe nos exiger de illes?
 confirmTribute.happy=Le %nation% a %settlement% es bon amicos a nos; il esserea regrettabile damnificar nostre cameraderia.
@@ -2092,7 +2126,9 @@ defeated.text=Tu ha essite vincite! Vole tu:
 defeated.yes=Restar e mirar
 defeatedSinglePlayer.text=Tu ha essite vincite!\n\nNunc es le tempore del nocte obscur, quando le cemeterios oscita e le inferno ipse suffla le contagion super le mundo, ora pote io biber sanguine calide! e facer tal affaires amar, que le die tremerea de vider.
 defeatedSinglePlayer.yes=Entrar in modo de vindicantia
+# Fuzzy
 diplomacy.offerAccepted=Le %nation% ha acceptate tu offerta generose.
+# Fuzzy
 diplomacy.offerRejected=Le %nation% ha rejectate tu offerta generose.
 disbandUnit.text=Es tu secur de voler dissolver iste unitate?
 disbandUnit.yes=Dissolver
@@ -2137,7 +2173,9 @@ move.noAccessContact=Nos debe establir contacto con le %nation% primo, Vostre Ex
 move.noAccessGoods=Le %nation% non commerciara con un %unit% vacue.
 move.noAccessSettlement=Le %nation% non permitte a nostre %unit% de entrar in lor stabilimento.
 move.noAccessSkill=Nostre %unit% non pote apprender del indigenas.
+# Fuzzy
 move.noAccessTrade=Nos non ha le autoritate pro commerciar con altere nationes europee como le %nation%.
+# Fuzzy
 move.noAccessWar=Nos non pote commerciar con le %nation% durante le guerra.
 move.noAccessWater=Nostre %unit% debe abbordar ante de entrar in le stabilimento.
 move.noAttackWater=Nostre %unit% debe atterrar ante de attaccar.
@@ -2199,6 +2237,7 @@ server.timeOut=Tempore limite excedite pro tentar connecter al servitor.
 server.userNameInUse=Le nomine de usator specificate es jam in uso.
 server.userNameNotPresent=Le nomine de usator specificate non es in iste joco.
 server.wrongFreeColVersion=Le versiones del cliente e del servitor de FreeCol non corresponde.
+# Fuzzy
 buildColony.others=Le %nation% ha fundate le nove colonia %colony% in %region%.
 cashInTreasureTrain.colonial=Un tresor de %amount% de auro ha arrivate in Europa. %cashInAmount% de auro ha essite incassate.
 cashInTreasureTrain.independent=Un tresor de %amount% ha essite addite al tresoreria national.
@@ -2302,6 +2341,7 @@ colopedia.unit.offensivePower=Poter offensive:
 colopedia.unit.price=Precio in Europa:
 colopedia.unit.productionBonus={{plural:%number%|one=Modificator|other=Modificatores}} de production:
 colopedia.unit.requirements=Requisitos:
+# Fuzzy
 colopedia.unit.school=Schola necessari pro formation:
 colopedia.unit.skill=Competentia:
 report.labour.allColonists=Tote le colonos
@@ -2337,8 +2377,8 @@ report.colony.growing.description=%colony% pote crescer de {{plural:%amount%|one
 # Fuzzy
 report.colony.improve.description=Unitates que poterea meliorar le production respectivemente al unitate que actualmente exeque le carga
 report.colony.improve.header=Meliorar
+# Fuzzy
 report.colony.improving.description=%colony%: Pro facer %amount% plus %goods%, reimplacia %oldUnit% per %unit%
-report.colony.wanting.description=%colony%: Pro facer %amount% plus %goods%, adde %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% necessari pro %buildable% {{plural:%turns%|one=proxime torno|other=in %turns% tornos}}
 report.colony.making.constructing.description=%colony%: %buildable% se completa {{plural:%turns%|one=le proxime torno|other=in %turns% tornos}}
 report.colony.making.description=Lo que iste colonia actualmente produce
@@ -2348,21 +2388,22 @@ report.colony.making.noconstruction.description=%colony%: Nulle construction in
 report.colony.making.noteach.description=%colony%: %teacher% non ha studentes
 report.colony.name.description=Le lista de colonias
 report.colony.name.header=Colonia
-report.colony.plow.description=Numero de tegulas colonial que beneficiarea de Arar
-report.colony.plow.header=A
-report.colony.plowing.description=%colony% beneficiarea de arar {{plural:%amount%|one=1 tegula|other=%amount% tegulas}}
+# Fuzzy
 report.colony.production.description=%colony%: production nette de %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: production nette de %goods% is %amount% (exportation si plus de %export%)
 report.colony.production.header=Production nette de %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: production nette de %goods% = %amount%, plen {{plural:%turns%|one=le proxime torno|other=in %turns% tornos}}
+# Fuzzy
 report.colony.production.low.description=%colony%: production nette de %goods% = %amount%, exhaurite {{plural:%turns%|one=le proxime torno|other=in %turns% tornos}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: production nette de %goods% = %amount%, le magazin disbordara, %waste% essera dissipate
-report.colony.road.description=Numero de tegulas colonial que beneficiarea del construction de Camminos
-report.colony.road.header=C
-report.colony.roadBuilding.description=%colony% beneficiarea de construer {{plural:%amount%|one=1 cammino|other=%amount% camminos}}
 report.colony.shrinking.description=%colony% debe discrescer de {{plural:%amount%|one=1 unitate|other=%amount% unitates}} pro meliorar le production
 report.colony.starving.description=%colony%: fame {{plural:%turns%|one=le proxime torno|other=in %turns% tornos}}
 # Fuzzy
+report.colony.wanting.description=%colony%: Pro facer %amount% plus %goods%, adde %unit%
+# Fuzzy
 report.continentalCongress.elected=Eligite:
 report.continentalCongress.none=(nulle)
 report.continentalCongress.recruiting=Recrutamento
@@ -2404,26 +2445,25 @@ report.production.selectGoods=Selige benes
 report.production.update=Actualisar
 report.requirements.badAssignment=%colony% ha un %expert% qui labora actualmente como %expertWork%, durante que un %nonExpert% labora como %nonExpertWork%. Le production augmentarea si le colonos excambiarea lor empleos.
 report.requirements.canTrainExperts={{plural:2|%unit%}} pote esser trainate a
-report.requirements.clearTile=%type% al %direction% de %colony% beneficiarea de vacuation.
+# Fuzzy
 report.requirements.exploreTile=%type% al %direction% de %colony% beneficiarea de exploration.
 report.requirements.met=Tote le requisitos es satisfacite.
 report.requirements.missingGoods=%colony% produce %goods%, ma require plus %input%.
 report.requirements.misusedExperts=Il ha {{plural:2|%unit%}} non laborante como %work% presente a
 report.requirements.noExpert=%colony% produce %goods%, ma non ha %unit%.
-report.requirements.plowCenter=%colony% beneficiarea de arar su tegula.
-report.requirements.plowTile=%type% al %direction% de %colony% beneficiarea de arar.
-report.requirements.roadTile=%type% al %direction% de %colony% beneficiarea del construction de camminos.
 report.requirements.severalExperts=Plure {{plural:2|%unit%}} es presente a
 report.requirements.surplus=Un surplus de %goods% es producite a
 report.trade.afterTaxes=Receptas post taxas
 report.trade.beforeTaxes=Receptas ante taxas
 report.trade.cargoUnits=Unitates in cargo
+# Fuzzy
 report.trade.hasCustomHouse=* Iste colono ha un officio de doana; iste benes es exportate.
 report.trade.totalDelta=Total de production
 report.trade.totalUnits=Total de unitates
 report.trade.unitsSold=Unitates acquirite o vendite
 report.turn.filter=Non monstrar iste typo de message (%type%)
 report.turn.ignore=Ignorar iste message (Colonia: %colony%, Benes: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% de %player%
 # Fuzzy
 aboutPanel.copyright=Copyright © 2002-2013  Le equipa de FreeCol
@@ -2449,6 +2489,7 @@ chooseFoundingFatherDialog.title=Nominar patre fundator
 colonyPanel.colonyUnits=Unitates del colonia
 colonyPanel.inPort=In porto
 colonyPanel.outsideColony=Foras del colonia
+# Fuzzy
 colonyPanel.producing=Produce:
 colonyPanel.reducePopulation=Si tu reduce le population a sub %number%, %colony% non potera plus construer %buildable%.
 colonyPanel.unitChange=Al entrar in tu colonia, tu %oldType% ha devenite un %newType%.
@@ -2461,7 +2502,9 @@ confirmDeclarationDialog.areYouSure.no=Forsan plus tarde
 confirmDeclarationDialog.areYouSure.text=Que nos renuncia al tyrannia injuste de %monarch% e declara le independentia de nostre colonias del corona!
 confirmDeclarationDialog.areYouSure.yes=Libertate o morte!
 confirmDeclarationDialog.createFlag=e nostre inimicos tremera al vista de nostre bandiera defiante.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Statos Unite de %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% libere
 confirmDeclarationDialog.enterCountry=Ab nunc, nostre pais se appellara
 confirmDeclarationDialog.enterNation=e omne citatano de nostre gloriose nation essera fer de esser cognoscite como
@@ -2512,8 +2555,10 @@ negotiationDialog.add=Adder
 negotiationDialog.cancel=Cancellar
 negotiationDialog.clear=Vacuar
 negotiationDialog.contact.tutorial=Tu incontra co-europeos. Illes competera con te pro terra e ricchessas, e pote mesmo facer le guerra contra te. Ma post que Jan de Witt ha devenite membro del Congresso Continental, tu potera commerciar con illes.
+# Fuzzy
 negotiationDialog.demand=Le %nation% exige del %otherNation%
 negotiationDialog.exchange=in excambio de
+# Fuzzy
 negotiationDialog.offer=Le %nation% offere al %otherNation%
 negotiationDialog.send=Inviar
 negotiationDialog.title.contact=Incontra altere europeos
@@ -2536,10 +2581,9 @@ findSettlementPanel.displayAll=Cercar tote le stabilimentos
 findSettlementPanel.displayOnlyEuropean=Cercar solmente stabilimentos europee
 findSettlementPanel.displayOnlyNatives=Cercar solmente stabilimentos indigena
 findSettlementPanel.name=Cercar stabilimento
+# Fuzzy
 firstContactDialog.meeting.natives=Incontro con le indigenas...
 firstContactDialog.meeting.natives.tutorial=Tu incontra indigenas. Invia tu Exploratores a lor stabilimentos pro discoperir plus super illes, e tu Servos a Contracto e Colonos Libere pro apprender de illes. Invia tu naves e caravanas a lor stabilimentos si tu vole commerciar con illes.
-firstContactDialog.meeting.AZTEC=Le nation Aztec...
-firstContactDialog.meeting.INCA=Le imperio Inca...
 firstContactDialog.welcomeOffer.text=Le %nation% te saluta. Nos es un gloriose nation de %camps% %settlementType%. Pro celebrar nostre amicitate, nos te offere generosemente in dono le terra que tu ora occupa. Vole tu acceptar nostre tractato e viver con nos in pace como fratres?
 firstContactDialog.welcomeSimple.text=Le %nation% te saluta. Nos es un gloriose nation de %camps% %settlementType%. Vole tu acceptar nostre tractato e viver con nos in pace como fratres?
 abandonColony.no=Cancellar
diff --git a/data/strings/FreeColMessages_it_IT.properties b/data/strings/FreeColMessages_it_IT.properties
index 9ce542837..41bf11022 100644
--- a/data/strings/FreeColMessages_it_IT.properties
+++ b/data/strings/FreeColMessages_it_IT.properties
@@ -272,7 +272,6 @@ colopediaAction.goods.name=Beni
 colopediaAction.nations.name=Nazioni
 colopediaAction.nationTypes.name=Vantaggi Nazionali
 colopediaAction.resources.name=Risorse Bonus
-colopediaAction.skills.name=Abilità
 colopediaAction.terrain.name=Tipo di terreno
 colopediaAction.units.name=Unità
 colopediaAction.name=%object% (Colopedia)
@@ -1301,6 +1300,7 @@ model.improvement.road.description=Strada
 model.improvement.road.name=Strada
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limite della Colonia Costiera
+# Fuzzy
 model.limit.independence.coastalColonies.description=Hai bisogno di almeno %limit% colonie costiere per dichiarare l'indipendenza.
 model.limit.independence.rebels.name=Limite Ribelli
 model.limit.independence.rebels.description=Almeno %limit% dei tuoi coloni devono appoggiare l'indipendenza.
@@ -1634,6 +1634,7 @@ model.colony.badGovernment=Il governo di %colony% è inefficiente. Verranno appl
 model.colony.goodGovernment=L'efficienza del Governo è migliorata! Il sentimento di ribellione in %colony% adesso supera il %number% per cento.
 model.colony.governmentImproved1=Il governo di %colony% è migliorato, ma è ancora inefficiente. Le penalità di produzione rimangono applicate.
 model.colony.governmentImproved2=Il governo di %colony% è migliorato. Le penalità di produzione cessano di essere applicate.
+# Fuzzy
 model.colony.insufficientProduction=Nella colonia di %colony% potrebbero essere prodotte altre %outputAmount% unità di %outputType%, se disponessimo di %inputAmount% unità di %inputType% in più per turno.
 model.colony.lostGoodGovernment=L'efficienza del governo è diminuita! Il sentimento di ribellione in %colony% è ora al di sotto del %number% per cento. La colonia non guadagnerà più i bonus di produzione.
 model.colony.lostVeryGoodGovernment=L'efficienza del governo è diminuita! Il sentimento di ribellione in %colony% non è più pari o superiore al %number% per cento. Alcuni bonus di produzione sono andati perduti.
@@ -1651,20 +1652,28 @@ model.direction.SW.name=sud-ovest
 model.direction.W.name=ovest
 model.direction.NW.name=nord-ovest
 model.historyEventType.abandonColony.description=Hai abbandonato la colonia di %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation% ha scoperto %city%, una delle Sette Città dell'Oro, e un tesoro di %treasure% unità d'oro.
+# Fuzzy
 model.historyEventType.colonyConquered.description=La tua colonia di %colony% è stata conquistata dal giocatore %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=La tua colonia di %colony% è stata distrutta dal giocatore %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Stai conquistando la colonia %nazione% di %colonia%.
 model.historyEventType.declareIndependence.description=Stai dichiarando l'indipendenza dalla Corona.
+# Fuzzy
 model.historyEventType.destroyNation.description=La %nation% ha distrutto la %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Hai scoperto il Nuovo Mondo.
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation% ha scoperto %region%.
 model.historyEventType.foundColony.description=Hai fondato la colonia di %colony%.
 model.historyEventType.foundingFather.description=%father% si è unito al Congresso Continentale.
 model.historyEventType.independence.description=Hai ottenuto l'indipendenza dalla Corona.
+# Fuzzy
 model.historyEventType.meetNation.description=Hai incontrato il popolo %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Il contingente %nation% non è più presente nel Nuovo Mondo.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Il contingente %loserNation% cede tutte le sue colonie nel Nuovo Mondo al contingente %nation%.
 model.indianSettlement.mostHatedNone=Nessuno
 model.indianSettlement.mostHatedUnknown=Sconosciuta
@@ -1717,8 +1726,10 @@ model.messageType.warehouseCapacity.name=Capacità Deposito
 model.messageType.warning.name=Avvisi
 model.monarch.action.addToRef.text=La Corona ha aggiunto %number% {{plural:%number%|%unit%}} al Corpo di Spedizione Reale. I Governatori delle colonie esprimono preoccupazione.
 model.monarch.action.addToRef.no=Fatto
+# Fuzzy
 model.monarch.action.declarePeace.text=Abbiamo benignamente acconsentito ad un trattato di pace con %nation%.
 model.monarch.action.declarePeace.no=Fatto
+# Fuzzy
 model.monarch.action.declareWar.text=L'insolenza del governo %nation% Ci costringe a dichiarargli guerra!
 # Fuzzy
 model.monarch.action.declareWarSupported.text=L'insolenza delle forse della %nazione% Ci costringe a dichiarare loro guerra! Per accelerare questa vicenda, le nostre fedeli truppe (%forza%) aspettano i tuoi ordini, e un'ulteriore somma di di %oro% è stata aggiunto al tuo tesoro.
@@ -1775,6 +1786,7 @@ model.noClaimReason.worked.description=Un altro insediamento sta già utilizzand
 model.player.forces=Esercito %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Dopo mesi di navigazione, finalmente hai avvistato la costa di un continente sconosciuto. Veleggia {{tag:%direction%|west=verso Ovest|east=verso Est|default=nel vento}} per scoprire il Nuovo Mondo, e reclamarlo in nome della Corona.
+# Fuzzy
 model.player.waitingFor=In attesa del giocatore %nation%
 model.regionType.coast.name=Costa
 model.regionType.coast.unknown=Regione Costiera Sconosciuta
@@ -1833,9 +1845,9 @@ model.unit.underRepair=Riparazione(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1873,6 +1885,7 @@ model.colony.warehouseOverfull=Il nostro deposito di %colony% ha raggiunto la su
 model.colony.warehouseSoonFull=Il nostro deposito di %colony% supererà la sua quota massima di %goods% durante il prossimo turno. %amount% unità di %goods% andranno sprecate.
 model.colony.warehouseWaste=Il nostro deposito di %colony% ha superato la sua quota massima di %goods%. Sprecate %waste% unità.
 model.colonyTile.resourceExhausted=Nella colonia di %colony% la risorsa %resource% è esaurita
+# Fuzzy
 model.game.spanishSuccession=Eccellenza, in Europa la Guerra di Successione Spagnola è terminata. Per il trattato di Utrecht, lo stato %loserNation% è costretto a cedere tutte le sue colonie nel Nuovo Mondo al contingente %nation%!
 model.indianSettlement.mission.denounced=Il tuo missionario di %settlement% è stato accusato e giustiziato!
 model.indianSettlement.mission.destroyed=Il missionario a %settlement% è morto nella distruzione dell'insediamento.
@@ -1880,6 +1893,7 @@ model.player.autoRecruit=Tensioni religiose in %europe% richiedono a %unit% di e
 model.player.colonyGoodsParty.harbour=I tuoi coloni di %colony% hanno gettato %amount% unità di %goods% nella baia in segno di protesta contro questa ingiusta tassazione da parte della Corona!
 model.player.colonyGoodsParty.horses=I coloni di %colony% hanno liberato %amount% cavalli in segno di protesta contro questa ingiusta tassazione da parte della Corona!
 model.player.colonyGoodsParty.landLocked=I vostri coloni di %colony% hanno bruciato %amount% unità di %goods% sulla piazza del mercato in segno di protesta contro questa ingiusta tassazione da parte della Corona!
+# Fuzzy
 model.player.dead.european=Eccellenza, il governo %nation% ha dichiarato un ritiro incondizionato dal Nuovo Mondo!
 model.player.dead.native=Eccellenza, il popolo %nation% è stato sterminato.
 model.player.disaster.bankruptcy.start=Non siete riusciti a pagare per la manutenzione di tutti gli edifici. Saranno applicate sanzioni severe alla produzione.
@@ -1891,12 +1905,16 @@ model.player.foundingFatherJoinedCongress=%foundingFather% si è unito al Congre
 model.player.interventionForceArrives=Le forze d'intervento promesse stanno arrivando!
 model.player.soLDecrease=Le adesioni ai Patrioti nelle tue colonie sono scese al %newSoL% per cento!
 model.player.soLIncrease=Le adesioni ai Patrioti nelle tue colonie sono salite al %newSoL% per cento!
+# Fuzzy
 model.player.stance.alliance.declared=Eccellenza, il Governo %nation% è nostro alleato!
 model.player.stance.alliance.others=Eccellenza, il Governo %attacker% è alleato del Governo %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Eccellenza, il Governo %nation% ha siglato un "cessate il fuoco" con noi!
 model.player.stance.ceaseFire.others=Eccellenza, il Governo %attacker% ha siglato un "cessate il fuoco" col Governo %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Eccellenza, il Governo %nation% è in pace con noi!
 model.player.stance.peace.others=Eccellenza, il Governo %attacker% è in pace col Governo %defender%.
+# Fuzzy
 model.player.stance.war.declared=Cattive notizie, Eccellenza, il Governo %nation% ci ha dichiarato guerra!
 model.player.stance.war.others=Eccellenza, il Governo %attacker% ha dichiarato guerra al Governo %defender%.
 combat.automaticDefence=Un tuo %unit% di %colony% ha imbracciato le armi per difendere la colonia!
@@ -1912,6 +1930,7 @@ combat.enemyShipEvaded=%enemyUnit% %enemyNation% riesce a sfuggire a un attacco
 combat.enemyShipSunk=%unit% ha affondato %enemyUnit% %enemyNation%!
 combat.equipmentCaptured=Attenzione, i guerrieri %nation% ora dispongono di %equipment%!
 combat.goodsStolen=%enemyUnit% %enemyNation% ruba %amount% unità di %goods% alla colonia di %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyUnit% %enemyNation% rapina %amount% pezzi d'oro dalla colonia di %colony%!
 combat.indianRaid=Le nostre spie riportano chela nazione %nation% ha assaltato la %colony% della nazione %colonyNation%.
 combat.indianSurprise=La nazione %nation% ha assaltato a sorpresa la colonia di %colony%, allarmando i coloni. Il capo %nation% nega ogni coinvolgimento.
@@ -1963,14 +1982,17 @@ error.couldNotLoad=Si è verificato un errore durante il caricamento della parti
 error.couldNotSave=Si è verificato un errore durante il salvataggio della partita nel file %name%!
 main.defaultPlayerName=Nome del Giocatore
 main.userDir.fail=FreeCol non riesce a trovare una directory idonea per salvarci dentro i dati utente. Si può procedere, ma ci sono da attendersi problemi.
+# Fuzzy
 client.choicePlayer=Scegli un giocatore:
 client.classic=Impossibile caricare la mappatura delle risorse dal set di regole 'classic'.
 metaServer.couldNotConnect=Spiacente, impossibile connettersi al meta-server. Riprovare più tardi.
 metaServer.communicationError=Errore di comunicazione col meta-server. Riprovare più tardi.
 abandonEducation.action.studying=studiando
 abandonEducation.action.teaching=insegnando
+# Fuzzy
 abandonEducation.no=No, continua la formazione
 abandonEducation.text=Se la tua %unit% lascia %colony% cesserà l' %action% nella %building%, sei sicuro di voler abbandonare?
+# Fuzzy
 abandonEducation.yes=Sì, lascia la colonia
 armedUnitSettlement.attack=Attacca
 armedUnitSettlement.tribute=Chiedi un tributo
@@ -1981,8 +2003,11 @@ buy.takeOffer=Accetta l'offerta
 buy.text=Il presidio %nation% vorrebbe vendere %goods% per %gold% unità d'oro:
 clearTradeRoute.text=%unit% percorre la rotta commerciale %route%.  Modificare la sua destinazione comporta l'esclusione dalla rotta commerciale.  Sei sicuro di voler fare questo?
 client.fullScreen=La modalità a schermo intero non è supportata per questa scheda grafica.\nRipristino della modalità finestra.
+# Fuzzy
 confirmHostile.alliance=Non puoi attaccare una Nazione alleata! Davvero vuoi rompere la tua alleanza col governo %nation% e dichiarare guerra?
+# Fuzzy
 confirmHostile.ceaseFire=Abbiamo firmato un Cessate il Fuoco con il Governo %nation%. Davvero dobbiamo attaccare?
+# Fuzzy
 confirmHostile.peace=Sei in pace col governo %nation%. Davvero vuoi dichiarare guerra?
 danger.low=non sono una minaccia per noi
 error.noSuchFile=Il file specificato non esiste o non è quello corretto.
@@ -2037,7 +2062,9 @@ defeated.text=Sei stato sconfitto! Vuoi:
 defeated.yes=Rimanere e guardare
 defeatedSinglePlayer.text=Sei stato sconfitto!\n\nQuesta è l'ora più malefica della notte, quando i cimiteri sbadigliano e l'inferno stesso alita il suo contagio nel mondo... Ora potrei bere sangue ancora caldo, e fare cose che il giorno tremerebbe nel vedere.
 defeatedSinglePlayer.yes=Entra in modalità vendetta
+# Fuzzy
 diplomacy.offerAccepted=Il contingente %nation% ha accettato la tua generosa offerta.
+# Fuzzy
 diplomacy.offerRejected=Il contingente %nation% ha rifiutato la tua generosa offerta.
 disbandUnit.text=Sei sicuro di voler eliminare/smantellare questa unità?
 disbandUnit.yes=Elimina
@@ -2081,7 +2108,9 @@ move.noAccessContact=Dobbiamo prima stabilire un contatto con il governo %nation
 move.noAccessGoods=%nation% non commercerà con una %unit% vuota.
 move.noAccessSettlement=Il governo %nation% non permette al nostro %unit% di accedere al loro insediamento.
 move.noAccessSkill=Il nostro %unit% non può imparare dai nativi.
+# Fuzzy
 move.noAccessTrade=Non abbiamo l'autorizzazione per commerciare con altre nazioni europee, come il governo %nation%.
+# Fuzzy
 move.noAccessWar=Non possiamo commerciare con il governo %nation% mentre siamo in guerra.
 move.noAccessWater=Il nostro %unit% deve sbarcare prima di accedere all'insediamento.
 move.noAttackWater=La nostra %unit% deve sbarcare prima di attaccare.
@@ -2238,6 +2267,7 @@ colopedia.unit.offensivePower=Potenza offensiva:
 colopedia.unit.price=Prezzo in Europa:
 colopedia.unit.productionBonus={{plural:%number%|one=modificatore|other=modificatori}} di produzione:
 colopedia.unit.requirements=Requisiti:
+# Fuzzy
 colopedia.unit.school=Si addestra in:
 colopedia.unit.skill=Abilità:
 report.labour.allColonists=Tutti i Coloni
@@ -2272,8 +2302,8 @@ report.colony.grow.header=+
 report.colony.growing.description=%colony% può crescere di {{plural:%amount%|one=una unità|other=%amount% unità}} senza nuocere alla produzione
 report.colony.improve.description=Unità che potrebbero migliorare la produzione.
 report.colony.improve.header=Miglioramento
+# Fuzzy
 report.colony.improving.description=%colony%: per produrre %amount% %goods% in più, sostituire %oldUnit% con %unit%
-report.colony.wanting.description=%colony%: per produrre %amount% %goods% in più, aggiungi %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% necessari per %buildable% {{plural:%turns%|one=il prossimo turno|other=fra %turns% turni}}
 report.colony.making.constructing.description=%colony%: %buildable% verrà completato {{plural:%turns%|one=il prossimo turno|other=fra %turns% turni}}
 report.colony.making.description=Cosa sta facendo questa colonia
@@ -2283,20 +2313,21 @@ report.colony.making.noconstruction.description=%colony%: Nessuna costruzione in
 report.colony.making.noteach.description=%colony%: %teacher% non ha allievi
 report.colony.name.description=Elenco delle colonie
 report.colony.name.header=Colonia
-report.colony.plow.description=Numero di caselle della colonia che avrebbero benefici dall'aratura
-report.colony.plow.header=P
-report.colony.plowing.description=%colony% avrebbe benefici dall'aratura di  {{plural:%amount%|one=una casella|other=%amount% caselle}}
+# Fuzzy
 report.colony.production.description=%colony%: Produzione netta di %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: la produzione netta di %goods% è %amount% (verranno esportati oltre %export%)
 report.colony.production.header=Produzione netta di %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: produzione netta di %goods% = %amount%, pieno {{plural:%turns%|one=il prossimo turno|other=fra %turns% turni}}
+# Fuzzy
 report.colony.production.low.description=%colony%: produzione netta di %goods% = %amount%, terminati {{plural:%turns%|one=il prossimo turno|other=fra %turns% turni}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: produzione netta di %goods% = %amount%, il deposito sarà pieno, %waste% verranno sprecati.
-report.colony.road.description=Numero di caselle della colonia che avrebbero benefici dalla costruzione di una strada
-report.colony.road.header=R
-report.colony.roadBuilding.description=%colony% avrebbe benefici dalla costruzione di  {{plural:%amount%|one=una strada|other=%amount% strade}}
 report.colony.shrinking.description=%colony% deve diminuire di {{plural:%amount%|one=una unità|other=%amount% unità}} per migliorare la produzione
 report.colony.starving.description=%colony%: morte di fame {{plural:%turns%|one=il prossimo turno|other=fra %turns% turni}}
+# Fuzzy
+report.colony.wanting.description=%colony%: per produrre %amount% %goods% in più, aggiungi %unit%
 report.continentalCongress.available=Disponibile
 # Fuzzy
 report.continentalCongress.elected=Eletto:
@@ -2340,26 +2371,25 @@ report.production.selectGoods=Scegli le merci
 report.production.update=Aggiorna
 report.requirements.badAssignment=%colony% dispone di un %expert% che attualmente lavora come %expertWork%, mentre un %nonExpert% sta lavorando come %nonExpertWork%. La produzione sarebbe maggiore se i posti di lavoro venissero scambiati.
 report.requirements.canTrainExperts={{plural:2|%unit%}} possono essere addestrate a
-report.requirements.clearTile=%type% in direzione %direction% rispetto alla colonia di  %colony% riceverebbe benefici dalla pulitura.
+# Fuzzy
 report.requirements.exploreTile=%type% in direzione %direction% rispetto alla colonia di  %colony% riceverebbe benefici dall'esplorazione.
 report.requirements.met=Tutti i requisiti sono soddisfatti.
 report.requirements.missingGoods=%colony% sta producendo %goods%, ma ha bisogno di più %input%.
 report.requirements.misusedExperts=Ci sono {{plural:2|%unit%}} che non lavorano come %work% si trovano a
 report.requirements.noExpert=%colony% sta producendo %goods%, ma non ha alcun %unit%.
-report.requirements.plowCenter=%colony% riceverebbe benefici dall'aratura della propria casella.
-report.requirements.plowTile=%type% in direzione %direction% rispetto alla colonia di  %colony% riceverebbe benefici dall'aratura.
-report.requirements.roadTile=%type% in direzione %direction% rispetto alla colonia di  %colony% riceverebbe benefici dalla costruzione di una strada.
 report.requirements.severalExperts=Diverse {{plural:2|%unit%}} si trovano a
 report.requirements.surplus=Un eccesso di %goods% viene prodotto a:
 report.trade.afterTaxes=Ricavi dopo le tasse
 report.trade.beforeTaxes=Ricavi prima delle tasse
 report.trade.cargoUnits=Unità Trasportate
+# Fuzzy
 report.trade.hasCustomHouse=* Questa colonia dispone di un Porto Franco; vengono esportati questi beni:
 report.trade.totalDelta=Produzione Totale
 report.trade.totalUnits=Unità Totali
 report.trade.unitsSold=Unità comprate o vendute
 report.turn.filter=Non mostrare questo tipo di messaggio (%type%)
 report.turn.ignore=Ignora questo messaggio (Colonia: %colony%, Beni: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% di %player%
 aboutPanel.copyright=Copyright © 2002-2015 Il team di FreeCol
 aboutPanel.legalDisclaimer=FreeCol è un software libero: puoi ridistribuirlo e/o modificarlo nei termini stabiliti dalla GNU General Public License così come pubblicati dalla Free Software Foundation, nella versione 2 della Licenza, o in qualsiasi versione successiva.
@@ -2386,6 +2416,7 @@ colonyPanel.buildQueue=Coda di costruzione
 colonyPanel.colonyUnits=Unità della colonia
 colonyPanel.inPort=Nel porto
 colonyPanel.outsideColony=Fuori dalla colonia
+# Fuzzy
 colonyPanel.producing=Produzione di:
 colonyPanel.reducePopulation=Se si riduce la popolazione al di sotto di %number%, %colony% non sarà più in grado di costruire %buildable%.
 colonyPanel.unitChange=Entrando nella tua colonia il tuo %oldType% è diventato un %newType%.
@@ -2397,7 +2428,9 @@ colonyPanel.notBestTile=%unit% potrebbe produrre più %goods% in %tile%.
 confirmDeclarationDialog.areYouSure.no=Forse più tardi
 confirmDeclarationDialog.areYouSure.text=Rinunciamo all'ingiusta tirannide di %monarch% e dichiariamo l'indipendenza delle nostre colonie dalla corona!
 confirmDeclarationDialog.areYouSure.yes=Libertà o Morte!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Stati Uniti di %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Libero Stato %nation%
 confirmDeclarationDialog.enterCountry=D'ora in poi, la nostra nazione si chiamerà
 confirmDeclarationDialog.enterNation=e ogni cittadino della nostra gloriosa nazione sarà orgoglioso di definirsi
@@ -2406,8 +2439,10 @@ constructionPanel.turnsToComplete=(Turni al termine: %number%)
 negotiationDialog.accept=Accetta
 negotiationDialog.add=Aggiungi
 negotiationDialog.cancel=Annulla
+# Fuzzy
 negotiationDialog.demand=La %nation% richiede %otherNation%
 negotiationDialog.exchange=in cambio di
+# Fuzzy
 negotiationDialog.offer=La %nation% offre %otherNation%
 negotiationDialog.send=Invia
 editSettlementDialog.removeSettlement=Rimuovi insediamento
@@ -2426,9 +2461,9 @@ findSettlementPanel.displayAll=Trova tutti gli insediamenti
 findSettlementPanel.displayOnlyEuropean=Trovare solo insediamenti europei
 findSettlementPanel.displayOnlyNatives=Trovare solo insediamenti nativi
 findSettlementPanel.name=Trova insediamento
+# Fuzzy
 firstContactDialog.meeting.natives=Incontro coi Nativi. . .
 firstContactDialog.meeting.natives.tutorial=Abbiamo incontrato dei Nativi. Invia i tuoi Esploratori nei loro villaggi per saperne di più sul loro conto, e i tuoi Servitori a Contratto e Coloni Liberi affinchè imparino da essi. Invia le tue navi e le tue diligenze nei loro insediamenti, se desideri commerciare.
-firstContactDialog.meeting.INCA=L'impero Inca. . .
 firstContactDialog.welcomeOffer.text=Il popolo %nation% vi porge il benvenuto. Siamo una gloriosa nazione di %camps% %settlementType%. Per celebrare la nostra amicizia, generosamente vi offriamo in dono la terra che state occupando. Accettate il nostro trattato impegnandovi a rimanere in pace con noi come fratelli?
 firstContactDialog.welcomeSimple.text=Il popolo %nation% vi porge il benvenuto. Siamo una gloriosa nazione di %camps% %settlementType%. Accettate un trattato con noi per rimanere in pace come fratelli?
 abandonColony.no=Annulla
diff --git a/data/strings/FreeColMessages_ja.properties b/data/strings/FreeColMessages_ja.properties
index 9c644a028..7587ebb1c 100644
--- a/data/strings/FreeColMessages_ja.properties
+++ b/data/strings/FreeColMessages_ja.properties
@@ -1,6 +1,7 @@
 # Messages for Japanese (日本語)
 # Exported from translatewiki.net
 # Author: Aotake
+# Author: Azeha
 # Author: Dude1717
 # Author: Fievarsty
 # Author: Fryed-peach
@@ -51,11 +52,9 @@ cancel=中止
 close=閉じる
 color=色
 connect=接続
-# Fuzzy
 current=現在
 false=無効
-# Fuzzy
-fill=最終結果
+fill=フィル
 height=高さ
 help=ヘルプ
 host=ホスト
@@ -64,7 +63,6 @@ load=読み込み
 many=多くの
 medium=中
 more=もっと...
-# Fuzzy
 music=音楽
 name=名前
 no=いいえ
@@ -244,7 +242,6 @@ colopediaAction.goods.name=商品
 colopediaAction.nations.name=国
 colopediaAction.nationTypes.name=国の特徴
 colopediaAction.resources.name=ボーナス資源
-colopediaAction.skills.name=スキル
 colopediaAction.terrain.name=地形タイプ
 colopediaAction.units.name=ユニット
 colopediaAction.name=%object% (コロペディア)
@@ -729,8 +726,7 @@ model.ability.bombardShips.shortDescription=水域タイルに隣接する敵の
 model.ability.build.name=建設
 # Fuzzy
 model.ability.build.shortDescription=ユニットや施設や建築物を建設する能力です。
-# Fuzzy
-model.ability.buildCustomHouse.name=税関を建設する能力
+model.ability.buildCustomHouse.name=税関を建設する
 model.ability.buildFactory.name=工場を建設
 model.ability.canRecruitUnit.name=ユニットの勧誘
 model.ability.canRecruitUnit.shortDescription=この国はユニットを勧誘する能力があります。
@@ -751,33 +747,27 @@ model.ability.export.shortDescription=商品を直接ヨーロッパへ輸出で
 model.ability.foundColony.name=植民地の発見
 model.ability.foundColony.shortDescription=このユニットは新しい植民地を発見する能力を持っています
 model.ability.hasPort.name=海にアクセス
-# Fuzzy
-model.ability.hasPort.shortDescription=この地は海に直接、もしくは間接的にアクセスできます
+model.ability.hasPort.shortDescription=この地は海に直接もしくは間接的にアクセスできます
 model.ability.independenceDeclared.name=独立宣言
 model.ability.independenceDeclared.shortDescription=この国は独立を宣言しています
 model.ability.independentNation.shortDescription=独立国家
 model.ability.moveToEurope.name=ヨーロッパに移動
-# Fuzzy
-model.ability.moveToEurope.shortDescription=このタイルはユニットをヨーロッパへ移動させることができます。
+model.ability.moveToEurope.shortDescription=このタイルはユニットをヨーロッパへ移動させることができます
 model.ability.native.name=インディアン
 model.ability.native.shortDescription=アメリカの原住民
 model.ability.navalUnit.name=海軍ユニット
 model.ability.navalUnit.shortDescription=このユニットは海軍ユニットです。
 model.ability.negotiate.name=交渉
 model.ability.plunderNatives.name=略奪の原住民
-# Fuzzy
-model.ability.plunderNatives.shortDescription=原住民の入植地を破壊して得られる略奪品の量が増加します。
+model.ability.plunderNatives.shortDescription=原住民の入植地を破壊して得られる略奪品の量が向上します
 model.ability.produceInWater.name=水域で生産
-# Fuzzy
-model.ability.produceInWater.shortDescription=ユニットは陸地タイルと同じように水域タイルを利用できます
+model.ability.produceInWater.shortDescription=ユニットは陸地タイルと同じように水域タイルが利用できます
 model.ability.repairUnits.name=ユニットの修理
-# Fuzzy
-model.ability.repairUnits.shortDescription=特定種の破損したユニットを修理することができます。
+model.ability.repairUnits.shortDescription=特定種の破損したユニットを修理することができます
 model.ability.royalExpeditionaryForce.name=王立遠征軍
 model.ability.royalExpeditionaryForce.shortDescription=王立遠征軍の国。
 model.ability.selectRecruit.shortDescription=新兵を選抜する能力
 model.ability.teach.name=伝授スキル
-# Fuzzy
 model.ability.teach.shortDescription=ベテランユニットは別の人へスキルを教えることがあります
 model.ability.undead.name=アンデッド
 # Fuzzy
@@ -899,8 +889,7 @@ model.building.weaverShop.name=織工の店
 model.building.weaverShop.description=織物工場にアップグレードすることができる織工の店は、綿花から布を生産するために使います。植民地の人口が8に達してから、Adam Smithが大陸会議に参加することで織物工場にアップグレードすることができます。織工の店は布の生産を増やします。
 model.event.declareIndependence.name=独立宣言
 model.foundingFather.adamSmith.name=アダム・スミス
-# Fuzzy
-model.foundingFather.adamSmith.description=工場が原料1つに対して1.5倍の製品を生産する
+model.foundingFather.adamSmith.description=工場の建築を有効にする。
 model.foundingFather.adamSmith.text=近代経済の父として有名なSmithは、もっとも有名な教科書である国富論をはじめとする経済理論関係の教科書をいくつも執筆した。
 model.foundingFather.adamSmith.birthAndDeath=1723年-1790年
 model.foundingFather.jacobFugger.description=現在発生しているボイコットがすべて無くなる
@@ -915,8 +904,7 @@ model.foundingFather.peterStuyvesant.description=税関の建設が可能にな
 model.foundingFather.peterStuyvesant.text=後にNew YorkとなるNew Netherlandの総督に任命される。イギリスのNew Netherland侵攻を食い止めることができなかった。
 model.foundingFather.peterStuyvesant.birthAndDeath=1592年-1672年
 model.foundingFather.janDeWitt.name=ヨハン・デ・ウィット
-# Fuzzy
-model.foundingFather.janDeWitt.description=外国の植民地と交易が可能になる
+model.foundingFather.janDeWitt.description=外国の植民地と交易が可能になり、植民地ライバルのより多くの情報が表示されます。
 model.foundingFather.janDeWitt.text=De Wittは偉大なるオランダの政治家。商人を代表して産業と商業を推奨した。また彼はオランダがイギリスとの戦争を終結する際の重要な条約の交渉を行った。
 model.foundingFather.janDeWitt.birthAndDeath=1625年-1672年
 model.foundingFather.ferdinandMagellan.name=フェルディナンド・マゼラン
@@ -1007,8 +995,7 @@ model.foundingFather.political=政治
 model.foundingFather.religious=宗教
 model.goods.bells.name={{plural:%amount%|one=自由の鐘|other=自由の鐘|default=自由の鐘}}
 model.goods.bells.description=自由の鐘は入植者の独立機運を現しています。
-# Fuzzy
-model.goods.bells.workAs=政治家 (自由の鐘 %amount%)
+model.goods.bells.workAs=政治家%claim%として作業 (自由の鐘 %amount%)
 model.goods.bells.workingAs=政治家
 model.goods.cigars.name={{plural:%amount%|one=葉巻タバコ|other=葉巻タバコ|default=葉巻タバコ}}
 model.goods.cigars.description=葉巻タバコはタバコから作られます。ぜいたく品として高い価値があります。
@@ -1441,18 +1428,26 @@ model.direction.SW.name=南西
 model.direction.W.name=西
 model.direction.NW.name=北西
 model.historyEventType.abandonColony.description=あなたは植民地 %colony% を放棄しました。
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation%は黄金の七都市のうちの一つである%city%を発見し、%treasure%ゴールドの財宝を入手しました。
+# Fuzzy
 model.historyEventType.colonyConquered.description=あなたの植民地%colony%は%nation%によって征服されました。
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=あなたの植民地%colony%は%nation%によって破壊されました。
 model.historyEventType.declareIndependence.description=あなたはクラウンからの独立を宣言する。
+# Fuzzy
 model.historyEventType.destroyNation.description=あなたは%nation%を破壊しました。
 model.historyEventType.discoverNewWorld.description=あなたは新世界を発見しました。
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation%は%region%を発見しました。
 model.historyEventType.foundColony.description=あなたは植民地%colony%を設立しました。
 model.historyEventType.foundingFather.description=%father%が大陸会議に参加しました。
 model.historyEventType.independence.description=あなたは国王から独立を成し遂げました。
+# Fuzzy
 model.historyEventType.meetNation.description=あなたは%nation%に出会いました。
+# Fuzzy
 model.historyEventType.nationDestroyed.description=%nation%は破壊されました。
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation%は新世界の植民地すべてを%nation%に譲り渡しました。
 model.indianSettlement.mostHatedNone=なし
 model.indianSettlement.mostHatedUnknown=不明
@@ -1519,6 +1514,7 @@ model.noClaimReason.terrain.description=この地は植民地に適していま
 model.player.forces=%nation%軍
 model.player.independentMarket=ヨーロッパ
 model.player.startGame=数か月の航海の末、あなたはついに未知の大陸の沖に到達しました。新世界を発見するため{{tag:%direction%|west=西|east=東|default=風が吹く方}}に航路を向け、国王に発見報告をしましょう。
+# Fuzzy
 model.player.waitingFor=%nation%の行動を待っています
 model.regionType.coast.name=沿岸
 model.regionType.coast.unknown=未知の沿岸地方
@@ -1570,9 +1566,9 @@ model.unit.underRepair=修理(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1601,11 +1597,13 @@ model.colony.warehouseOverfull=%colony%にある%goods%の量が倉庫一杯に
 model.colony.warehouseSoonFull=次のターンで%colony%の%goods%の倉庫容量を超えてしまいます。%amount%単位の%goods%が廃棄されます。
 model.colony.warehouseWaste=%colony%にある%goods%が倉庫容量を超えています。%waste%単位が廃棄されました。
 model.colonyTile.resourceExhausted=%colony%で資源%resource%が枯渇しました
+# Fuzzy
 model.game.spanishSuccession=閣下、ヨーロッパでスペイン継承戦争が終結しました。ユトレヒト条約により、%loserNation%が新世界に持っていたすべての植民地を%nation%へ強制割譲することになりました！
 model.indianSettlement.mission.denounced=あなたの宣教師は%settlement%で非難され、処刑されました！
 model.player.colonyGoodsParty.harbour=国王の不当な課税に抗議するため、%colony%の入植者は%amount%単位の%goods%を港に投げ捨てました。
 model.player.colonyGoodsParty.horses=国王の不当な課税に抗議して、%colony%の入植者は%amount%頭の馬を解放しました！
 model.player.colonyGoodsParty.landLocked=国王の不当な課税に抗議するため、%colony%の入植者は%amount%単位の%goods%を市場で焼き払いました。
+# Fuzzy
 model.player.dead.european=閣下、%nation%は新世界の場から無条件撤退を宣言しました！
 model.player.dead.native=閣下、%nation%は破壊されました。
 model.player.disaster.effect.colonyDestroyed=%colony%は完全に破壊されました。
@@ -1614,12 +1612,16 @@ model.player.emigrate=%europe%から、%unit%が移住することを決めま
 model.player.foundingFatherJoinedCongress=%foundingFather%が会議に参加しました！\n\n%description%
 model.player.soLDecrease=植民地の独立推進派の会員数が%newSoL%パーセントに下降しました。
 model.player.soLIncrease=植民地の独立推進派の会員数が%newSoL%パーセントに上昇しました。
+# Fuzzy
 model.player.stance.alliance.declared=閣下、%nation%は我々と同盟を結びました！
 model.player.stance.alliance.others=閣下、%attacker%は%defender%と同盟を結びました。
+# Fuzzy
 model.player.stance.ceaseFire.declared=閣下、%nation%は我々との停戦に合意しました！
 model.player.stance.ceaseFire.others=閣下、%attacker%は%defender%との停戦に合意しました。
+# Fuzzy
 model.player.stance.peace.declared=閣下、%nation%は我々と和平を結びました！
 model.player.stance.peace.others=閣下、%attacker%は%defender%と和平を結びました。
+# Fuzzy
 model.player.stance.war.declared=閣下、悪いニュースです。%nation%が我々に宣戦を布告しました！
 model.player.stance.war.others=閣下、%attacker%が%defender%に宣戦を布告しました。
 combat.automaticDefence=%colony%のあなたの%unit%が植民地を守るため、武器を手に取って立ち上がった！
@@ -1633,6 +1635,7 @@ combat.enemyShipEvaded=%enemyNation%の%enemyUnit%は%unit%からの攻撃を回
 combat.enemyShipSunk=%unit%は%enemyNation%の%enemyUnit%を撃沈しました！
 combat.equipmentCaptured=気をつけてください。%nation%の騎兵は%equipment%を手に入れました！
 combat.goodsStolen=%enemyNation%の%enemyUnit%が%colony%で%goods%%amount%を盗みました！
+# Fuzzy
 combat.indianPlunder=%enemyNation%の%enemyUnit%が%colony%から%amount%を略奪しました。
 combat.indianTreasure=%settlement%から%amount%ゴールドを略奪しました。
 combat.nativeCapitalBurned=あなたは%nation%の首都、%name%を焼き払いました。%nation%はあなたの実力に対して降伏しました！
@@ -1670,20 +1673,18 @@ model.region.atlantic.name=大西洋
 model.region.northAtlantic.name=北大西洋
 model.region.southAtlantic.name=南大西洋
 model.unit.arriveInEurope=閣下、我々の船が%europe%に到着しました！
-# Fuzzy
-model.unit.attrition=%unit%は%loation%で大自然の中に飲み込まれました！
+model.unit.attrition=%unit%は%location%で大自然の中に飲み込まれました！
 model.unit.experience=%colony%では、%oldName%が経験を積んで%unit% に変わりました。
 model.unit.noMoreTools=%location%: 開拓者が持っていたすべての道具を使い果たし、%unit%に戻りました。
 model.unit.slowed=%enemyNation%の%enemyUnit%は%unit%の動きを遅くします。
 model.unit.unitRepaired=%unit%は%repairLocation%での修理が終わりました。
 model.unit.hardyPioneer.noMoreTools=%location%: ベテラン開拓者は所持していた道具を使い果たしました。
-# Fuzzy
-error.couldNotLoad=ゲームロード中にエラーが発生しました！
-# Fuzzy
-error.couldNotSave=ゲーム保存中にエラーが発生しました！
+error.couldNotLoad=ファイル%name%からのゲームロード中にエラーが発生しました！
+error.couldNotSave=ファイル%name%のゲーム保存中にエラーが発生しました！
 main.defaultPlayerName=プレイヤー名
 main.javaVersion=FreeCol を動作させるには Java バージョン %minVersion% 以降をお勧めします\n(%version% を検出しました。このチェックをスキップするには --no-java-check を使用してください。)
 main.memory=JVM に %memory% バイト以上のメモリを割り当てる必要があります。\n  FreeCol を以下のように指定して再起動してください:  java -Xmx%minMemory%M -jar FreeCol.jar
+# Fuzzy
 client.choicePlayer=プレイヤーを選択してください:
 client.ending=そのゲームは終了。
 metaServer.couldNotConnect=申し訳ありません。メタ・サーバーに接続できませんでした。後でもう一度試してください。
@@ -1697,8 +1698,11 @@ buy.moreGold=安くならないか交渉する
 buy.takeOffer=申し出を受け入れる
 buy.text=%nation%が彼らの所有している%goods%を%gold%で売りたいそうです:
 clearTradeRoute.text=%unit%には交易路%route%を割り当てます。交易路から目的地の設定がなくなりますが、行ってもよろしいですか？
+# Fuzzy
 confirmHostile.alliance=同盟国を攻撃することはできません！ 本当に%nation%との同盟を破棄して宣戦布告しますか？
+# Fuzzy
 confirmHostile.ceaseFire=あなたは%nation%との停戦に署名しています。本当に攻撃するのですか？
+# Fuzzy
 confirmHostile.peace=現在、%nation%とは平和を保っています。宣戦布告しますか？
 error.noSuchFile=指定したファイルが存在しないか、通常のファイルではありません。
 finance.high=財政的に安全であります。
@@ -1749,7 +1753,9 @@ clearSpeciality.impossible=%unit%は降格できません！
 defeated.text=あなたは敗北しました！ どうしますか:
 defeated.yes=引き続き観察する
 defeatedSinglePlayer.yes=リベンジモードに入る
+# Fuzzy
 diplomacy.offerAccepted=%nation%はあなたの寛大な提案を受け入れました。
+# Fuzzy
 diplomacy.offerRejected=%nation%はあなたの寛大な提案を拒否しました。
 disbandUnit.text=本当にこのユニットを解散しますか？
 disbandUnit.yes=解散
@@ -1790,7 +1796,9 @@ move.noAccessBeached=接近した%nation%の船がが我々の進路を妨害し
 move.noAccessContact=閣下、まずは%nation%に接触関係を持つ必要があります。
 move.noAccessSettlement=%nation%は%unit%がその入植地に入る許可を与えていません。
 move.noAccessSkill=%unit%が原住民から学ぶことはできません。
+# Fuzzy
 move.noAccessTrade=%nation%といった他のヨーロッパ諸国と交易をする権限を持っていません。
+# Fuzzy
 move.noAccessWar=戦争中は%nation%と交易ができません。
 move.noAccessWater=%unit%は入植地に入る前に上陸が必要です。
 move.noAttackWater=%unit%は攻撃する前に着陸する必要があります。
@@ -1805,12 +1813,10 @@ renameUnit.text=ユニットにつける新しい名前を入れてください:
 scoutSettlement.expertScout=あなたの斥候は%unit%になりました。
 scoutSettlement.speakBeads=ようこそ旅行者よ。平和の証として、この価値あるビーズの髪飾りを君たちの族長に届けてくれないか。(価値%amount%ゴールド)
 scoutSettlement.speakDie=あなたは部族の神聖なタブーを犯した！我々は射撃訓練のためあなたと提携しなければならない。
-# Fuzzy
-scoutSettlement.speakNothing=我々はいつでも旅行者を歓迎している。
+scoutSettlement.speakNothing=我々はいつでも%nation%の旅行者を歓迎している。
 scoutSettlement.speakTales=我々は遠方からの旅行者を招くことができて嬉しいです。火の近くに座ってください、近辺の土地についての物語をあなたにお話しましょう。
 sellProposition.text=道具を売りますか？
-# Fuzzy
-trade.noTrade=貿易を拒否した。
+trade.noTrade=%settlement%で貿易を拒否した。
 trade.noTradeGoods=すまない、もうこれ以上の%goods%は結構だ！
 trade.noTradeHostile=お前とその商品を軽蔑する。立ち去れ！
 trade.nothingToSell=すまないが、まだ売るものが何もないんだ！
@@ -1890,10 +1896,8 @@ colopedia.nationType.regions=入植地域:
 colopedia.nationType.skills=習得技能:
 colopedia.nationType.typeOfSettlements=入植地の種類:
 colopedia.nationType.units=開始ユニット:
-# Fuzzy
 colopedia.terrain.defenseBonus=防御ボーナス
 colopedia.terrain.description=説明
-# Fuzzy
 colopedia.terrain.movementCost=移動コスト
 colopedia.terrain.resource=資源
 colopedia.terrain.terrainImage=地形図
@@ -1909,6 +1913,7 @@ colopedia.unit.offensivePower=攻撃力:
 colopedia.unit.price=欧州での価格:
 colopedia.unit.productionBonus=生産物の{{plural:%number%|one=修正|other=修正}}:
 colopedia.unit.requirements=要件:
+# Fuzzy
 colopedia.unit.school=訓練に必要な学校:
 colopedia.unit.skill=技能レベル:
 report.labour.allColonists=全入植者
@@ -1939,8 +1944,6 @@ report.colony.improve.header=改善
 report.colony.making.header=メイキング
 report.colony.name.description=植民地の一覧
 report.colony.name.header=植民地
-report.colony.plow.header=P
-report.colony.road.header=R
 report.continentalCongress.available=利用可能
 report.continentalCongress.none=(なし)
 report.continentalCongress.recruiting=新規勧誘
@@ -1981,17 +1984,18 @@ report.requirements.met=すべての要件が満たされています。
 report.requirements.missingGoods=%colony%は%goods%を生産していますが、%input%が不足しています。
 report.requirements.noExpert=%colony%は%goods%を生産していますが、%unit%がいません。
 report.requirements.severalExperts=次の植民地には複数の{{plural:2|%unit%}}がいます:
-# Fuzzy
-report.requirements.surplus=次の植民地は%goods%を余剰生産しています:
+report.requirements.surplus=%goods%の余剰が生産されているのは
 report.trade.afterTaxes=税引き後の収入
 report.trade.beforeTaxes=税引き前の収入
 report.trade.cargoUnits=運搬中のユニット
+# Fuzzy
 report.trade.hasCustomHouse=* この植民地には税関があります。これらの品物は輸出されます。
 report.trade.totalDelta=総生産
 report.trade.totalUnits=総ユニット
 report.trade.unitsSold=売買されたユニット
 report.turn.filter=この種類のメッセージを表示しない (%type%)
 report.turn.ignore=このメッセージの無視 (植民地: %colony%, 品物: %goods%)
+# Fuzzy
 report.turn.playerNation=%player%の%nation%
 aboutPanel.copyright=Copyright © 2002-2015 The FreeCol Team
 aboutPanel.legalDisclaimer=FreeColはフリーソフトウェアです: あなたはこれを、フリーソフトウェア財団によって発行された GNU 一般公衆利用許諾契約書 (バージョン2もしくはそれ以降のバージョン) の定める条件の下で再頒布または改変することができます。
@@ -2023,7 +2027,9 @@ colonyPanel.notBestTile=%unit%は%tile%よりも多くの%goods%を生産でき
 confirmDeclarationDialog.areYouSure.no=あとで
 confirmDeclarationDialog.areYouSure.text=我々は%monarch%の不当な専制政治を放棄し、国王から植民地の独立を宣言した！
 confirmDeclarationDialog.areYouSure.yes=自由を！さもなくば死を！
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=%nation%合衆国
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation%自由主義国
 confirmDeclarationDialog.enterCountry=今後、我々の国は次のようになる:
 flag.unionPosition.LEFT=左
diff --git a/data/strings/FreeColMessages_ko.properties b/data/strings/FreeColMessages_ko.properties
index 2eb7432e9..eedd49db9 100644
--- a/data/strings/FreeColMessages_ko.properties
+++ b/data/strings/FreeColMessages_ko.properties
@@ -232,7 +232,6 @@ colopediaAction.fathers.name=건국 아버지
 colopediaAction.goods.name=상품
 colopediaAction.nations.name=국가
 colopediaAction.resources.name=보너스 자원
-colopediaAction.skills.name=기술
 colopediaAction.terrain.name=지형 유형
 colopediaAction.units.name=유닛
 debugAction.name=디버그 모드 전환
@@ -965,6 +964,7 @@ model.nationState.available.name=사용가능한
 model.nationState.notAvailable.name=사용가능하지 않은
 model.player.independentMarket=유럽
 model.player.startGame=몇 개월의 항해 끝에, 마침내 미지의 대륙의 연안 도착했습니다. 신세계를 발견하기 위해 {{tag:%direction%|west=서쪽|east=동쪽|default=바람 부는 쪽}}으로 항해해 국왕에게 발견을 보고합시다.
+# Fuzzy
 model.player.waitingFor=대기중: %nation%
 model.regionType.ocean.name=대양
 model.regionType.river.name=강
@@ -1000,10 +1000,13 @@ model.colony.famineFeared=%colony% 내 기근이 걱정됩니다. %number%턴 
 model.colony.warehouseWaste=%colony%내 당신의 창고의 %goods% 용량이 초과했습니다. %waste% 유닛이 낭비되었습니다.
 model.colonyTile.resourceExhausted=%colony% 내 %resource% 자원 고갈
 model.indianSettlement.mission.denounced=당신의 선교사가 %settlement%에서 고발당해 처형되었습니다!
+# Fuzzy
 model.player.stance.alliance.declared=각하, %nation%이 우리와 동맹을 맺었습니다!
 model.player.stance.alliance.others=각하, %attacker%이 %defender%과 동맹을 맺었습니다.
+# Fuzzy
 model.player.stance.ceaseFire.declared=각하, %nation%이 우리와 휴전하는데 동의했습니다!
 model.player.stance.ceaseFire.others=각하, %attacker%이 %defender%과 휴전하는데 동의했습니다.
+# Fuzzy
 model.player.stance.war.declared=나쁜 소식입니다, 각하, %nation%이 우리에게 전쟁을 선포했습니다!
 model.player.stance.war.others=각하, %attacker%이 %defender%에 전쟁을 선포했습니다.
 combat.nativeCapitalBurned=당신은 %nation%의 수도, %name%(을)를 불태웠 버렸습니다. %nation%(은)는 당신의 힘에 항복했습니다.
@@ -1031,6 +1034,7 @@ error.couldNotLoad=게임 불러오기를 시도하는 도중 오류가 발생
 # Fuzzy
 error.couldNotSave=게임 저장을 시도하는 동안 오류가 발생했습니다!
 main.defaultPlayerName=플레이어 이름
+# Fuzzy
 client.choicePlayer=플레이어를 선택하십시오 :
 metaServer.couldNotConnect=죄송합니다, 메타 서버에 접속할 수 없습니다. 나중에 다시 시도해주세요.
 metaServer.communicationError=메타 서버와 통신하는 중 오류가 발생했습니다. 나중에 다시 시도하십시오.
@@ -1038,6 +1042,7 @@ boycottedGoods.dumpGoods=상품 폐기
 boycottedGoods.text=왕실에 의해 %goods%(이)가 구매거부되어 %europe% 내 에서 그것들을 판매할 수 없습니다. 귀하의 체납금(황금 %amount%)을 지불하길 원하시거나 항구에서 상품을 버려 폐기하길 원하십니까?
 buy.moreGold=더 낮은 가격을 제시
 buy.takeOffer=제안 수락
+# Fuzzy
 confirmHostile.ceaseFire=%nation%과 휴전조약을 맺은 상태입니다. 정말 공격하시겠습니까?
 confirmTribute.no=그러지 않는 것이 나을 수 있습니다
 error.noSuchFile=지정된 파일이 존재하지 않거나 일반 파일이 아닙니다.
@@ -1076,7 +1081,9 @@ buyProposition.text=어떤 상품을 구입하길 원하십니까?
 cashInTreasureTrain.free=당신의 왕이 (세금 제외) 추가 비용없이 유럽으로 보물을 수송 할겁니다!
 defeated.text=당신은 패배했습니다! 어떻게 하시겠습니까 :
 defeated.yes=그대로 지켜본다.
+# Fuzzy
 diplomacy.offerAccepted=%nation%이 당신의 너그러운 호의를 받아들였습니다.
+# Fuzzy
 diplomacy.offerRejected=%nation%이 당신의 너그러운 호의를 거절했습니다.
 disbandUnit.text=정말로 이 유닛을 해산하길 원하십니까?
 disbandUnit.yes=해산
@@ -1144,6 +1151,7 @@ colopedia.unit.movement=이동력:
 colopedia.unit.offensivePower=공격력:
 colopedia.unit.price=유럽에서의 가격 :
 colopedia.unit.requirements=필요 조건:
+# Fuzzy
 colopedia.unit.school=훈련에 필요한 학교:
 colopedia.unit.skill=기술 수준:
 report.labour.allColonists=모든 식민지
@@ -1167,6 +1175,7 @@ report.indian.tradeInterests=무역 관심사:
 report.indian.typeOfSettlements=부락 종류:
 report.turn.filter=이러한 유형의 메시지(%type%) 표시하지 않음
 report.turn.ignore=이 메시지 무시 (식민지: %colony%, 상품: %goods%)
+# Fuzzy
 report.turn.playerNation=%player%의 %nation%
 aboutPanel.officialSite=공식 사이트:
 aboutPanel.sfProject=SourceForge 프로젝트:
@@ -1187,6 +1196,7 @@ chooseFoundingFatherDialog.title=건국의 아버지 지명
 colonyPanel.colonyUnits=식민지 유닛
 colonyPanel.inPort=항구 안
 colonyPanel.outsideColony=식민지 외곽
+# Fuzzy
 colonyPanel.producing=생산중:
 colonyPanel.reducePopulation=만약 %number% 아래로 인구를 줄일 경우, %colony%는 더 이상 %buildable%를 건설할 수 없습니다.
 colonyPanel.bonusLabel=보너스: %number%%extra%
@@ -1204,7 +1214,9 @@ negotiationDialog.accept=수락
 negotiationDialog.add=추가
 negotiationDialog.cancel=취소
 negotiationDialog.clear=지우기
+# Fuzzy
 negotiationDialog.demand=%nation%은(는) %otherNation%이(가) 필요합니다.
+# Fuzzy
 negotiationDialog.offer=%nation%가 %otherNation%을 제공합니다
 negotiationDialog.send=전송
 negotiationDialog.title.trade=교환 협상
@@ -1216,7 +1228,6 @@ europePanel.transaction.net=넷:\t%gold%
 europePanel.transaction.price=가격:\t%gold%
 europePanel.transaction.purchase=%goods% %amount% 개 @%gold%에 구매
 europePanel.transaction.sale=%goods% %amount% 개 @%gold%에 판매
-firstContactDialog.meeting.INCA=잉카 제국...
 abandonColony.no=취소
 abandonColony.text=정말로 우리 식민지를 포기합니까?
 abandonColony.yes=포기
diff --git a/data/strings/FreeColMessages_lt.properties b/data/strings/FreeColMessages_lt.properties
index 41a85f263..394d2e24c 100644
--- a/data/strings/FreeColMessages_lt.properties
+++ b/data/strings/FreeColMessages_lt.properties
@@ -224,7 +224,6 @@ colopediaAction.goods.name=Prekės
 colopediaAction.nations.name=Tautos
 colopediaAction.nationTypes.name=Tautų privalumai
 colopediaAction.resources.name=Bonusiniai resursai
-colopediaAction.skills.name=Įgūdžiai
 colopediaAction.terrain.name=Vietovės tipai
 colopediaAction.units.name=Padaliniai
 colopediaAction.name=%object% (Kolopėdija)
@@ -1334,6 +1333,7 @@ model.building.locationLabel=Vietovėje: %location%
 model.colony.badGovernment=Kolonijos %colony% valdymas yra neefektyvus. Taikoma bauda gamybai.
 model.colony.governmentImproved1=Kolonijos %colony% valdymas pagerėjo, tačiau vis dar yra neefektyvus. Bauda gamybai vis dar taikoma.
 model.colony.governmentImproved2=Kolonijos %colony% valdymas pagerėjo. Bauda gamybai nebetaikoma.
+# Fuzzy
 model.colony.insufficientProduction=Kolonijoje %colony% galėtų būti papildomai pagaminta: %outputAmount% %outputType%, jei ten būtų papildomai: %inputAmount% %inputType%.
 model.colony.minimumColonySize=%object% neleidžia sumažinti gyventojų skaičių.
 model.colony.unbuildable=%colony% negali pastatyti %object% šiuo metu. %object% buvo pašalintas iš statybų eilės.
@@ -1347,19 +1347,27 @@ model.direction.SW.name=pietvakariai
 model.direction.W.name=vakarai
 model.direction.NW.name=šiaurės vakarai
 model.historyEventType.abandonColony.description=Jūs pametėte koloniją %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation% atrasti %city% , vienu iš septynių miestų aukso, ir lobis %treasure% aukso.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Jūsų kolonija %colony% yra užkariauta tauta %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Jūsų kolonija %colony% yra sunaikinta tauta %nation%.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Jūs sunaikinote tautos %nation% gyvenvietę %settlement%.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% sunaikino %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Jūs atrandate Naująjį Pasaulį.
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation% atrasti %region% .
 model.historyEventType.foundColony.description=Jūs įkurėte koloniją %colony%.
 model.historyEventType.foundingFather.description=%father% prisijungia Kontinentinio kongreso.
 model.historyEventType.independence.description=Jūs pasiekėt nepriklausomybę nuo Karūnos.
+# Fuzzy
 model.historyEventType.meetNation.description=Jūs susitikote tautą %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Tauta %nation% yra sunaikinta.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% atiduoda visas savo kolonijas Naujame Pasaulyje tautai %nation%.
 model.indianSettlement.mostHatedNone=Nėra
 model.indianSettlement.mostHatedUnknown=Nežinomas
@@ -1426,6 +1434,7 @@ model.nationState.notAvailable.name=nėra prieinamas
 model.player.forces=%nation% pajėgos
 model.player.independentMarket=Europa
 model.player.startGame=Po kelių mėnesių jūroje, jūs pagaliau atvykote prie nežinomo žemyno pakrantės. Plaukit {{tag:%direction%|west=westward|east=eastward|default=į vėją}} siekiant atrasti Naują Pasaulį ir paskelbti jį Karūnos nuosavybę.
+# Fuzzy
 model.player.waitingFor=Laukiama: %nation%
 model.regionType.coast.name=Pakrantė
 model.regionType.coast.unknown=Nežinoma pakrantė
@@ -1479,6 +1488,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1506,11 +1516,13 @@ model.colony.warehouseOverfull=Jūsų kolonijos %colony% sandėlis pasiekė jo t
 model.colony.warehouseSoonFull=Jūsų kolonijos %colony% sandėlis viršijs jo talpą prekei %goods% per sekantį ciklą. %amount% vienetų bus iššvaistyta.
 model.colony.warehouseWaste=Jūsų kolonijos %colony% sandėlis viršijo jo talpą prekei %goods%. %waste% vienetų buvo iššvaistyta.
 model.colonyTile.resourceExhausted=Ištekliai %resource% išnaudotos kolonijoje %colony%
+# Fuzzy
 model.game.spanishSuccession=Jūsų Ekscelencija, Europoje baigėsi karas už Ispanijos įpėdinystę. Atsižvelgiant į Utrechto sutartį, %loserNation% buvo priversti perduoti visas Naujojo pasaulio kolonijas tautai %nation%!
 model.indianSettlement.mission.denounced=Jūsų misionierius gyvenvietėje %settlement% buvo pasmerktas ir nužudytas!
 model.player.colonyGoodsParty.harbour=Jūsų kolonistai %colony% kolonijoje išmetė į jūrą %amount% vienetus prekės %goods% protestuodami prieš nesąžiningus Karūnos mokesčius!
 model.player.colonyGoodsParty.horses=Jūsų kolonistai %colony% kolonijoje išleido %amount% arklių protestuodami prieš nesąžiningus Karūnos mokesčius!
 model.player.colonyGoodsParty.landLocked=Jūsų kolonistai %colony% kolonijoje sudegino %amount% vienetus prekės %goods% protestuodami prieš nesąžiningus Karūnos mokesčius!
+# Fuzzy
 model.player.dead.european=Jūsų Ekscelencija, %nation% pareiškė besąlygišką atitraukimą iš Naujojo pasaulio!
 model.player.dead.native=Jūsų Ekscelencija, %nation% buvo sunaikinti.
 model.player.disaster.effect.colonyDestroyed=%colony% buvo visiškai sunaikintas.
@@ -1518,12 +1530,16 @@ model.player.emigrate=%unit% nusprendė emigruoti iš Europos uosto %europe%.
 model.player.foundingFatherJoinedCongress=%foundingFather% prisidėjo prie kongreso!\n\n%description%
 model.player.soLDecrease=Laisvės Sūnų narystė jūsų kolonijose sumažėjo iki %newSoL% procentų!
 model.player.soLIncrease=Laisvės Sūnų narystė jūsų kolonijose pakilo iki %newSoL% procentų!
+# Fuzzy
 model.player.stance.alliance.declared=Jūsų Ekscelencija, %nation% yra koalicijoje su mumis!
 model.player.stance.alliance.others=Jūsų Ekscelencija, %attacker% yra koalicijoje su tauta %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Jūsų Ekscelencija, %nation% sutiko nutraukti ugnį su mumis!
 model.player.stance.ceaseFire.others=Jūsų Ekscelencija, %attacker% sutiko nutraukti ugnį su tauta %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Jūsų Ekscelencija, %nation% yra taikoje su mumis!
 model.player.stance.peace.others=Jūsų Ekscelencija, %attacker% yra taikoje su tauta %defender%.
+# Fuzzy
 model.player.stance.war.declared=Blogos naujienos, Jūsų Ekscelencija, %nation% paskelbė mums karą!
 model.player.stance.war.others=Jūsų Ekscelencija, %attacker% paskelbė karą tautai %defender%.
 combat.automaticDefence=Jūsų %unit% kolonijoje %colony% ėmėsi ginklų apginti savo koloniją!
@@ -1539,6 +1555,7 @@ combat.enemyShipEvaded=Tautos %enemyNation% %enemyUnit% išvengė laivo %unit% a
 combat.enemyShipSunk=%unit% nuskandino tautos %enemyNation% laivą %enemyUnit%!
 combat.equipmentCaptured=Saugokitės, %nation% gavo %equipment%!
 combat.goodsStolen=%enemyNation% %enemyUnit% pavogė %amount% %goods% iš kolonijos %colony%.
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% prigrobė %amount% aukso iš kolonijos %colony%.
 combat.indianTreasure=Jūs prigrobėte %amount% aukso gyvenvietėje %settlement%.
 combat.nativeCapitalBurned=Jūs sudeginot %name%, tautos %nation% sostinę. %nation% pasiduoda jūsų galiai!
@@ -1589,12 +1606,15 @@ error.couldNotLoad=Įvyko klaida bandant įkelti į žaidimą!
 # Fuzzy
 error.couldNotSave=Įvyko klaida bandant išsaugoti žaidimą!
 main.defaultPlayerName=Žaidėjo vardas
+# Fuzzy
 client.choicePlayer=Prašome pasirinkti žaidėją:
 metaServer.couldNotConnect=Deja, nepavyko susisiekti su meta-serveriumi. Bandykite dar kartą vėliau.
 metaServer.communicationError=Įvyko klaida bendraujant su meta-serveriumi. Bandykite dar kartą vėliau.
 abandonEducation.action.studying=studijuoja
 abandonEducation.action.teaching=mokymas
+# Fuzzy
 abandonEducation.no=Ne, tęsti švietimą
+# Fuzzy
 abandonEducation.yes=Taip, palikti koloniją
 boycottedGoods.dumpGoods=Išmesti prekes
 boycottedGoods.text=Kadangi %goods% yra boikotojami Karūna, jūs negalite parduoti juos uoste %europe%. Ar norėtumet išmokėti savo įsiskolinimą (%amount% aukso), ar norėsit išmesti prekes į jūrą, juos sunaikinant?
@@ -1602,8 +1622,11 @@ buy.moreGold=Prašyti sumažinti kainą
 buy.takeOffer=Priimti pasiūlymą
 buy.text=Tauta %nation% norėtų parduoti savo prekė %goods% už %gold%:
 clearTradeRoute.text=Jūsų padalinys %unit% yra priskirtas prekių maršrutui %route%. Nustatant jo paskirtį nuims jį nuo prekių maršruto. Ar tikrai norite tai padaryti?
+# Fuzzy
 confirmHostile.alliance=Jūs negalite atakuoti koalicinė tauta! Ar jūs tikrai norite nutraukti savo koaliciją su tauta %nation% ir paskelbti karą?
+# Fuzzy
 confirmHostile.ceaseFire=Jūs pasirašėt paliaubas su tauta %nation%. Ar tikrai norite atakuot?
+# Fuzzy
 confirmHostile.peace=Jūs esate taikoje su tauta %nation%. Ar tikrai norite paskelbti karą?
 error.noSuchFile=Nurodytas failas neegzistuoja arba yra klaidingas.
 # Fuzzy
@@ -1653,7 +1676,9 @@ clearSpeciality.impossible=%unit% negali buti paprastintas!
 defeated.text=Jūs buvote nugalėtas! Ar norėtumėte:
 defeated.yes=Pasilikti stebėjimui
 defeatedSinglePlayer.yes=Įeiti į Keršto režimą
+# Fuzzy
 diplomacy.offerAccepted=%nation% priėmė jūsų dosnų pasiūlymą.
+# Fuzzy
 diplomacy.offerRejected=%nation% atmetė jūsų dosnų pasiūlymą.
 disbandUnit.text=Ar tikrai norite išformuoti šį padalinį?
 disbandUnit.yes=Išformuoti
@@ -1696,7 +1721,9 @@ move.noAccessContact=Pradžiai mes turime užmegzti ryšius su tautą %nation%,
 move.noAccessGoods=%nation% nesimainys už tuščią %unit%.
 move.noAccessSettlement=Tauta %nation% neleidžiame mūsų padaliniui %unit% įeiti į jų gyvenvietę.
 move.noAccessSkill=Mūsų %unit%, negali mokytis iš indėnų.
+# Fuzzy
 move.noAccessTrade=Mes neturime teisių prekybai su kitomis Europos tautomis, tokiomis kaip %nation%.
+# Fuzzy
 move.noAccessWar=Mes negalime prekiauti su tauta %nation%, kol mes su jais kariaujam.
 move.noAccessWater=Mūsų %unit% turėtu išsilaipinti prieš įeinant į gyvenvietę.
 move.noAttackWater=Mūsų %unit% turi žemę iki puola.
@@ -1826,6 +1853,7 @@ colopedia.unit.offensivePower=Puolimo galia:
 colopedia.unit.price=Kaina Europoje:
 colopedia.unit.productionBonus=Gamybos {{PLURAL: %number% | vienas = modifikatorius | kitas = modifikatorius}}:
 colopedia.unit.requirements=Reikalavimai:
+# Fuzzy
 colopedia.unit.school=Mokyklos reikia kad mokyti:
 colopedia.unit.skill=Įgūdžių lygis:
 report.labour.allColonists=Visi kolonistai
@@ -1855,8 +1883,6 @@ report.colony.grow.header=+
 report.colony.improve.header=Pagerinti
 report.colony.name.description=Kolonijų sąrašas
 report.colony.name.header=Kolonija
-report.colony.plow.header=P
-report.colony.road.header=R
 # Fuzzy
 report.continentalCongress.elected=Išrinkti:
 report.continentalCongress.none=(jokių)
@@ -1907,12 +1933,14 @@ report.requirements.surplus=Yra gaminamas prekės %goods% perteklius:
 report.trade.afterTaxes=Pelnas atskaičius mokesčius
 report.trade.beforeTaxes=Pelnas prieš mokesčius
 report.trade.cargoUnits=Padaliniai transportavimui
+# Fuzzy
 report.trade.hasCustomHouse=* Šioje kolonijoje yra muitinė; šios prekės yra eksportuojamos.
 report.trade.totalDelta=Gamybos iš viso
 report.trade.totalUnits=Padalinių iš viso
 report.trade.unitsSold=Nupirkti ar parduoti padaliniai
 report.turn.filter=Nerodyti šio tipo pranešimų (%type%)
 report.turn.ignore=Ignoruoti šį pranešimą (Kolonija:%colony%, Prekės:%goods%)
+# Fuzzy
 report.turn.playerNation=%player%'o %nation%
 aboutPanel.copyright=Autorinės teisės © 2002-2015 FreeCol komanda
 aboutPanel.legalDisclaimer=FreeCol yra nemokama kompiuterinė programa: Jūs galite ją platinti ir/arba modifikuoti pagal "GNU General Public License", kaip paskelbia "Free Software Foundation"; taip pat licenzijos versiją 2, arba bet kurią vėlesnę versiją.
@@ -1936,6 +1964,7 @@ chooseFoundingFatherDialog.title=Paskirti steigiamąjį tėvą
 colonyPanel.colonyUnits=Kolonijos Vienetai
 colonyPanel.inPort=Uoste
 colonyPanel.outsideColony=Už kolonijos ribų
+# Fuzzy
 colonyPanel.producing=Gaminama:
 colonyPanel.reducePopulation=Jei sumažinsit gyventojus žemiau %number% ,%colony% nebegalės statyti %buildable%.
 colonyPanel.unitChange=Įeinant į kolonija jūsų %oldType% tapo padaliniu %newType%.
@@ -1947,7 +1976,9 @@ colonyPanel.notBestTile=%unit% galėtų gaminti daugiau %goods% ant %tile%.
 confirmDeclarationDialog.areYouSure.no=Gal vėliau
 confirmDeclarationDialog.areYouSure.text=Atsisakykime neteisią monarcho %monarch% tironiją ir deklaruokime mūsų kolonijų nepriklausomybę nuo karūnos!
 confirmDeclarationDialog.areYouSure.yes=Laisvė arba mirtis!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Jungtinės Valstijos tautos %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Laisvi %nation%
 confirmDeclarationDialog.enterCountry=Nuo šiol mūsų šalis bus žinoma, kaip
 confirmDeclarationDialog.enterNation=ir kiekvienas mūsų šlovingos tautos pilietis turi didžiuotis, kad yra žinomas kaip
diff --git a/data/strings/FreeColMessages_mk.properties b/data/strings/FreeColMessages_mk.properties
index 016a1cf4f..f141e4697 100644
--- a/data/strings/FreeColMessages_mk.properties
+++ b/data/strings/FreeColMessages_mk.properties
@@ -267,7 +267,6 @@ colopediaAction.goods.name=Стока
 colopediaAction.nations.name=Нации
 colopediaAction.nationTypes.name=Национални предности
 colopediaAction.resources.name=Бонус ресурси
-colopediaAction.skills.name=Занаети
 colopediaAction.terrain.name=Видови терен
 colopediaAction.units.name=Единици
 colopediaAction.name=%object% (Колопедија)
@@ -1605,6 +1604,7 @@ model.improvement.road.description=Пат
 model.improvement.road.name=Пат
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Граница за крајбрежни колонии
+# Fuzzy
 model.limit.independence.coastalColonies.description=Ви требаат барем %limit% крајбрежни колонии за да прогласите независност.
 model.limit.independence.rebels.name=Ограничување за бунтовници
 model.limit.independence.rebels.description=Барем %limit%% ваши доселеници мора да поддржуваат независност.
@@ -1960,6 +1960,7 @@ model.colony.badGovernment=Управата на %colony% е неефиканс
 model.colony.goodGovernment=Ефикасноста на управата е подобрена! Бунтовничкото расположение во %colony% сега изнесува или надминува %number% проценти.
 model.colony.governmentImproved1=Управата %colony% е подобрена, но сè уште е неефикасна. Следат казни за производството.
 model.colony.governmentImproved2=Управата на %colony% е подобрена. Веќе нема да следат казни за производството.
+# Fuzzy
 model.colony.insufficientProduction=Може да се произведе уште %outputAmount% %outputType% во %colony%, ако имаме повеќе %inputAmount% %inputType% surplus.
 model.colony.lostGoodGovernment=Ефикасноста на управата е влошена! Бунтовничкото расположение во %colony% падна под %number% проценти. Колонијата повеќе не добива производствен бонус.
 model.colony.lostVeryGoodGovernment=Ефикасноста на управата е влошена! Бунтовничкото расположение во %colony% повеќе не изнесува или надминува %number% проценти. Изгубени се и некои бонуси за производство.
@@ -1974,12 +1975,17 @@ model.colony.veryBadGovernment=Управата на %colony% е многу не
 model.colony.veryGoodGovernment=Ефикасноста на управата е подобрена! Бунтовничкото расположение во %colony% сега изнесува над %number% проценти.
 model.colonyTile.claim=(положи право на %direction%)
 model.diplomaticTrade.receive.contact=Братски поздрав од величествените %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Да преговараме со %nation%те.
 model.diplomaticTrade.receive.trade=Да ја разгледаме понудата на %nation%те.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=%nation%те ни бараат данок!
 model.diplomaticTrade.send.contact=Наидовме на %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Да ја разгледаме нашата дипломатска ситуација со %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Да им предложиме трговија на %nation% во %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Побаруваме данок од %nation% во %settlement%.
 model.direction.N.name=север
 model.direction.NE.name=североисток
@@ -1990,24 +1996,37 @@ model.direction.SW.name=југозапад
 model.direction.W.name=запад
 model.direction.NW.name=северозапад
 model.historyEventType.abandonColony.description=Ја напуштивте колонијата  %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Примирје со %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation%те го открија градот  %city% - еден од Седумте Златни Градови и во него богатство од  %treasure% злато.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Вашата колонија %colony% ја освоија %nation%те.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Вашата колонија %colony% е уништена од %nation%те.
 model.historyEventType.conquerColony.description=Ја освоивте колонијата %colony% на %nation%те.
 model.historyEventType.declareIndependence.description=Прогласивте независност од Круната.
+# Fuzzy
 model.historyEventType.declareWar.description=Објавена е војна со %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation%те ги уништија %nativeNation%те.
+# Fuzzy
 model.historyEventType.destroySettlement.description=Ја уништивте населбата  на %nation%те, %settlement%.
 model.historyEventType.discoverNewWorld.description=Го откривте Новиот Свет.
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation%те ја открија областа %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Склучен сојуз со %nation%.
 model.historyEventType.foundColony.description=Ја основавте колонијата %colony%.
 model.historyEventType.foundingFather.description=%father% му се придружува на Континенталниот конгрес.
 model.historyEventType.independence.description=Постигнавте независност од Круната.
+# Fuzzy
 model.historyEventType.makePeace.description=Договорен мир со %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Се сретнавте со %nation%те.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=%nation%те повеќе не се присутни во Новиот свет.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation%те им ги предаваат своите колонии во Новиот Свет на %nation%те.
 model.indianSettlement.mostHatedNone=Нема
 model.indianSettlement.mostHatedUnknown=непозната
@@ -2061,9 +2080,12 @@ model.messageType.warehouseCapacity.name=Капацитет на магацин
 model.messageType.warning.name=Предупредувања
 model.monarch.action.addToRef.text=Круната придодаде %number% {{plural:%number%|%unit%}} кон Кралските експедициони сили. Колонијалните лидери изразуваат загриженост.
 model.monarch.action.addToRef.no=Готово
+# Fuzzy
 model.monarch.action.declarePeace.text=Милозливо се согласувме да склучиме мировен договор со %nation%те.
 model.monarch.action.declarePeace.no=Готово
+# Fuzzy
 model.monarch.action.declareWar.text=Дрскоста на %nation%те Не принудува да им објавиме војна!
+# Fuzzy
 model.monarch.action.declareWarSupported.text=Дрскоста на силите на %nation%те Нè принуди да им објавиме војна! За да се забрза оваа работа, Нашите верни единици (%force%) чекаат на вашите заповеди. Во вашата благајна се додадени %gold% злато.
 model.monarch.action.declareWar.no=Готово
 model.monarch.action.displeasure.text=Се осмелувате да ја прифатите Нашата великодушна понуда, но да не плаќате? Дебело ќе зажалите за ваквото лицемерие.
@@ -2123,6 +2145,7 @@ model.player.colonialIndependence=Само колонијални играчи 
 model.player.forces=Сили на %nation%те
 model.player.independentMarket=Европа
 model.player.startGame=По месеци пловидба, конечно пристигнавте на брегот на непознат континент. Запловите на {{tag:%direction%|west=запад|east=исток|default=со ветерот}} за да го откриете Новиот Свет и да го прогласите за посед на Круната.
+# Fuzzy
 model.player.waitingFor=Ги чекаме: %nation%те
 model.regionType.coast.name=Крајбрежје
 model.regionType.coast.unknown=Непознато крајбрежје
@@ -2163,6 +2186,7 @@ model.tradeItem.gold.name=Злато
 model.tradeItem.gold.description=во износ од %amount% злато
 model.tradeItem.goods.name=Стока
 model.tradeItem.incite.name=Објави војна на
+# Fuzzy
 model.tradeItem.incite.description=војна против %nation%
 model.tradeItem.stance.name=Став
 model.tradeItem.unit.name=Единица
@@ -2186,9 +2210,9 @@ model.unit.underRepair=Поправка (%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -2229,6 +2253,7 @@ model.colony.warehouseSoonFull=Вашиот магацин во %colony% ќе г
 model.colony.warehouseWaste=Вашиот магацин во %colony% го надмина својот капацитет за %goods%. Мораше да се фрлат %waste% единици.
 model.colony.workersEvicted=Во %colony%, вашите колонисти повеќе не можат да работат %location% поради присуството на %enemyUnit%.
 model.colonyTile.resourceExhausted=Ресурсот %resource% се исцрпи во %colony%
+# Fuzzy
 model.game.spanishSuccession=Ваше Превосходство, Војната за Шпанското наследство во Европа заврши. По Договорот од Утрехт, %loserNation%те беа принудени да им ги предадат сите нивни колонии во Новиот Свет на %nation%те!
 model.indianSettlement.mission.denounced=Вашиот мисионер во %settlement% е осуден и погубен!
 model.indianSettlement.mission.destroyed=Вашиот мисионер во %settlement% загина во уништувањето на местото.
@@ -2238,6 +2263,7 @@ model.player.autoRecruit=Поради верските немири во %europe
 model.player.colonyGoodsParty.harbour=Вашите колонисти во %colony% фрлија %amount% единици %goods% во пристаништето во знак за протест против неправедните даноци на Круната!
 model.player.colonyGoodsParty.horses=Вашите колонисти во %colony% пуштија на слобода %amount% коњи во знак на протест против ова неправедно оданочување од Круната!
 model.player.colonyGoodsParty.landLocked=Вашите колонисти во %colony% изгореа %amount% единици %goods% на пазариштето во знак за протест против неправедните даноци на Круната!
+# Fuzzy
 model.player.dead.european=Ваше Превосходство, %nation%те прогласија безусловно повлекување од Новиот Свет.
 model.player.dead.native=Ваше Превосходство, %nation%те се уништени.
 model.player.disaster.bankruptcy.start=Не плативте за одржување на зградите. Следува тешка производствена казна.
@@ -2251,12 +2277,16 @@ model.player.ignoredTax=Круната ја накачи даночната ст
 model.player.interventionForceArrives=Пристигнаа ветените интервенциони сили!
 model.player.soLDecrease=Членството во Синовите на Слободата во вашите колонии се намали на %newSoL% проценти!
 model.player.soLIncrease=Членството во Синовите на Слободата во вашите колонии порасна на %newSoL% проценти!
+# Fuzzy
 model.player.stance.alliance.declared=Ваше Превосходство, %nation%те се во сојуз со нас!
 model.player.stance.alliance.others=Ваше Превосходство, %attacker%те имаат склучено сојуз со %defender%те.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Ваше Превосходство, %nation%те се сложија на примирје со нас.
 model.player.stance.ceaseFire.others=Ваше Превосходство, %attacker%те се сложија на примирје со %defender%те.
+# Fuzzy
 model.player.stance.peace.declared=Ваше Превосходство, %nation%те се во мир со нас.
 model.player.stance.peace.others=Ваше Превосходство, %attacker%те се во мир со %defender%те.
+# Fuzzy
 model.player.stance.war.declared=Лоши вести, Ваше Превосходство. %nation%те ни објавија војна!
 model.player.stance.war.others=Ваше Превосходство, %attacker%те им објавија војна на %defender%те.
 combat.automaticDefence=Вашиот %unit% во %colony% грабна оружје за да ја одбрани колонијата!
@@ -2272,6 +2302,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% избегна напад од
 combat.enemyShipSunk=%unit% потопи %enemyNation% %enemyUnit%!
 combat.equipmentCaptured=Внимавајте, %nation%те набавија %equipment%!
 combat.goodsStolen=%enemyNation% %enemyUnit% украде %amount% %goods% од %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% ограби %amount% од %colony%.
 combat.indianRaid=Нашите шпиони известуваат дека %nation%те ја нападнале и ограбиле колонијата %colony% на %colonyNation%те.
 combat.indianSurprise=%nation%те извршија ненадеен напад врз %colony%, и ова ги растревожи нашите колонисти. Поглавицата на %nation%те вели дека тие не се вмешани.
@@ -2327,6 +2358,7 @@ main.javaVersion=За FreeCol се препорачува Java-верзија %m
 main.memory=Треба да зададете повеќе од %memory% бајти склад за JVM.\n  Пуштете го FreeCol одново со:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol не може да најде соодветни папки за да ги зачува корисничките податоци. Продолжувам понатаму, но очекувајте проблем.
 client.baseData=Не можев да ја пронајдам основната папка %dir%.\n  FreeCol не можеше да ги најде податоците.\n  Проверете дали се присутни таму.\n  Ако FreeCol бара во погрешна папка, тогаш\n  пуштете ја играта со наредбениот параметар:\n  --freecol-data <data-directory>
+# Fuzzy
 client.choicePlayer=Одберете играч:
 client.classic=Не можев да го вчитам пресликувањето од правилникот „класично“.
 client.debugConnect=Не можете да се поврзете на постоечка игра во режимот за отстранување гршеки.
@@ -2339,8 +2371,10 @@ metaServer.couldNotConnect=Жалам, не можам да се поврзам
 metaServer.communicationError=Се појави грешка при поврзувањето со метасерверот. Обидете се поодоцна.
 abandonEducation.action.studying=учи
 abandonEducation.action.teaching=обучува
+# Fuzzy
 abandonEducation.no=Не, нека продолжи со обуката
 abandonEducation.text=Доколку вашиот %unit% ја напушти колонијата %colony%, тоа значи дека ќе прстане да %action% во %building%. Дали сте сигурни дека сакате да напушти?
+# Fuzzy
 abandonEducation.yes=Да, нека ја напушти колонијата
 abandonTeaching.text=Вашиот %unit% ќе престане да предава ако напушти од %building%. Дали сте сигурни дека треба да напушти?
 armedUnitSettlement.attack=Нападни
@@ -2352,10 +2386,14 @@ buy.takeOffer=Прифати ја понудата
 buy.text=%nation%те сакаат да продадат %goods% за %gold%:
 clearTradeRoute.text=На вашиот %unit% му е доделен трговскиот пат %route%.  Ако му ја зададете оваа одредница, тогаш ќе го оттргнете од таа маршрута.  Дали сте сигурни?
 client.fullScreen=Овој графички уред не поддржува целоекранско играње.\nВраќам на прозорски режим.
+# Fuzzy
 confirmHostile.alliance=Не можете да напаѓате сојузници! Дали навистина сакате да го растурите сојузот со %nation%те и да им објавите војна?
+# Fuzzy
 confirmHostile.ceaseFire=Имате потпишано примирје со %nation%те. Дали навистина сакате да ги нападнете?
+# Fuzzy
 confirmHostile.peace=Сега сте во мирни односи со %nation%те. Дали навистина сакате да ијм објавите војна?
 confirmHostile.yes=Да, пушти ги пците на војната!
+# Fuzzy
 confirmTribute.broke=Нашите шпиони нè известуваат дека %nation%те се сосема шворц. Да не си го губиме времето барајќи дарови.
 confirmTribute.european=%nation%те %danger% и %finance%. Колку да им побараме да даруваат?
 confirmTribute.happy=%nation%те во %settlement% ни се добри побратими и ќе биде неубаво да го расипеме другарството.
@@ -2375,6 +2413,7 @@ indianLand.cancel=Напушти ја земјата
 indianLand.pay=Понуди %amount% злато за земјата
 indianLand.take=Да го земеме она што со право ни следува
 indianLand.text=Оваа земја ја поседува %player%. Дали би сакале да:
+# Fuzzy
 indianLand.unknown=Земјава е населена со некој непознат народ. Дали би сакале да:
 info.autodetectLanguageSelected=Избравте автоматско распознавање на јазикот. Ова ќе биде извршено кога ќе ја превклучите играта одново.
 info.enterSomeText=Внесете некаков текст.
@@ -2420,7 +2459,9 @@ defeated.text=Претрпевте пораз! Дали би сакале да:
 defeated.yes=Останете и набљудувате
 defeatedSinglePlayer.text=Претрпевте пораз!\n\nСега настапи едно многу глуво доба, кога црквите спијат и самиот пекол издишува болести во светов, кога можам да пијам топла крв! и да правам такви работи, што денот од нив ќе затрепери од еден поглед на нив.
 defeatedSinglePlayer.yes=Влези во одмазднички режим
+# Fuzzy
 diplomacy.offerAccepted=%nation%те ја прифатија вашата великодушна понуда.
+# Fuzzy
 diplomacy.offerRejected=%nation%те ја одбија вашата великодушна понуда.
 disbandUnit.text=Дали сигурно сакате да ја распуштите оваа единица?
 disbandUnit.yes=Распушти
@@ -2466,7 +2507,9 @@ move.noAccessGoods=%nation%те нема да тргуваат со празен
 move.noAccessMissionBan=%nation%те одбиваат секаков контакт со вашите мисионери.
 move.noAccessSettlement=%nation%те не му дозволуваат на нашиот %unit% да влезе во нивната населба.
 move.noAccessSkill=Нашиот %unit% не може да учи од домородците.
+# Fuzzy
 move.noAccessTrade=Не сме овластени да тргуваме со други европски земји како %nation%те.
+# Fuzzy
 move.noAccessWar=Не можеме да тргуваме со %nation%те додка сме во војна.
 move.noAccessWater=Нашиот %unit% мора да се искрца за да може да влезе во населбата.
 move.noAttackWater=Нашиот %unit% мора да се истовари на копно пред да нападне.
@@ -2532,6 +2575,7 @@ server.timeOut=Времето за поврзување со северот ис
 server.userNameInUse=Наведеното корисничко име е зафатено.
 server.userNameNotPresent=Внесеното корисничко име го нема во играта.
 server.wrongFreeColVersion=Верзијата на FreeCol кај клиентот не се совпаѓа со верзијата на опслужувачот.
+# Fuzzy
 buildColony.others=%nation% ја основаше новата колонија %colony% во %region%.
 cashInTreasureTrain.colonial=Во Европа пристигна богатство од %amount% злато. Со ова заработивте %cashInAmount% злато.
 cashInTreasureTrain.independent=Во државната каса беше придодадено богатство од %amount%.
@@ -2541,6 +2585,7 @@ declareIndependence.announce=Колониите на %oldNation%те прогл
 declareIndependence.continentalArmyMuster=Како поддршка на вашето прогласување на независност, %number% {{plural:%number%|%oldUnit%}} во %colony% {{plural:%number%|one=е унапреден|other=се унапредени}} во {{plural:%number%|%unit%}}!
 declareIndependence.interventionForce={{tag:country|%nation%}} свечено изјавува дека ќе испрати интервенциони сили во поддршка на вашата праведна борба за независност, доколку создадете %number% {{plural:%number%|one=Ѕвоно на слободата|other=Ѕвона на слободата}}, со што би ја докажале вашата решителност.
 declareIndependence.nativeSupport=%nation% ја огласи својата омраза кон %ruler% И Кралската експедициска сила. Ветија дека ќе ги напаѓаат во секоја прилика.
+# Fuzzy
 declareIndependence.nativeHostile=Нашите шпиони известуваат дека Кралската експедициска сила воспостави пријателски односи со %nation%. Имајте на ум дека можеби планираат да нападнат!
 declareIndependence.resolution=На овој ден Конгресот го донесе најважното Решение на сите времиња во Америка.\n\nДобро знам колку Пот, Крв и Богатство ќе нè чини за да ја одржиме оваа Декларација, и да ги поддржиме и одбраниме овие Држави. Сепак, преку сета оваа Темнина ги гледам Зраците на занесната Светлина и Слава. Гледам дека Целта и тоа како ги оправдува Средствата. И дека Потомството ќе ликува во тие Денови, макар и Ние да зажалиме, што верувам во Бога, нема да се случи. \n\nНаскоро ќе надојдат Кралските експедициони сили. Внимателно подгответе се за одбрана додека собереме доброволци за нова Континентална Армија.
 declareIndependence.unitsSeized=Како реакција на вашето прогласување на независност, Круната ги конфискуваше следниве ваши единици во Европа и на море: %units%
@@ -2639,6 +2684,7 @@ colopedia.unit.offensivePower=Нападна моќ:
 colopedia.unit.price=Цена во Европа:
 colopedia.unit.productionBonus={{plural:%number%|one=Изменител|other=Изменители}} на производството:
 colopedia.unit.requirements=Барања:
+# Fuzzy
 colopedia.unit.school=Потребно училиште за обука:
 colopedia.unit.skill=Вештина:
 report.labour.allColonists=Сите колонисти
@@ -2673,8 +2719,8 @@ report.colony.grow.header=+
 report.colony.growing.description=%colony% може да се зголеми за {{plural:%amount%|one=една единица|other=%amount% единици}} без тоа да му наштети на производството
 report.colony.improve.description=Единици што можат да го подобрат производството.
 report.colony.improve.header=Подобрување
+# Fuzzy
 report.colony.improving.description=%colony%: За да правите уште %amount% %goods%, заменете го %oldUnit% со %unit%
-report.colony.wanting.description=%colony%: За да правите уште %amount% %goods%, додајте %unit%
 report.colony.making.blocking.description=%colony%: Се бара %amount% %goods% %buildable% {{plural:%turns%|one=за следниот потег|other=во рок од %turns% потези}}
 report.colony.making.constructing.description=%colony%: %buildable% завршува {{plural:%turns%|one=следниот потег|other=за %turns% потези}}
 report.colony.making.description=Што изработува колонијата
@@ -2684,20 +2730,21 @@ report.colony.making.noconstruction.description=%colony%: Не се одвива
 report.colony.making.noteach.description=%colony%: %teacher% нема ученик
 report.colony.name.description=Списокот на колонии
 report.colony.name.header=Колонија
-report.colony.plow.description=Број на полиња во колонијата што ќе имаат корист од Орање
-report.colony.plow.header=О
-report.colony.plowing.description=%colony% ќе има корист од орање на {{plural:%amount%|one=едно поле|other=%amount% полиња}}
+# Fuzzy
 report.colony.production.description=%colony%: нето производство на %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: нето производството на %goods% изнесува %amount% (го извезуваме остатокот над %export%)
 report.colony.production.header=Нето производство на %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: нето производство на %goods% = %amount%, што ќе се наполни {{plural:%turns%|one=со следниот потег|other=во рок од %turns% потези}}
+# Fuzzy
 report.colony.production.low.description=%colony%: нето производство на %goods% = %amount%, што ќе го снема {{plural:%turns%|one=со следниот потег|other=во рок од %turns% потези}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: нето производство на %goods% = %amount% - складиштето ќе се прелее, со загуба од %waste%
-report.colony.road.description=Број на полиња во колонијата што ќе имаат корист од изградба на Патишта
-report.colony.road.header=П
-report.colony.roadBuilding.description=%colony% ќе има корист од изградба на {{plural:%amount%|one=пат|other=%amount% патишта}}
 report.colony.shrinking.description=%colony% мора да се намали за {{plural:%amount%|one=една единица|other=%amount% единици}} за да го подобри производството
 report.colony.starving.description=%colony%: прегладнување {{plural:%turns%|one=со следниот потег|other=за %turns% потези}}
+# Fuzzy
+report.colony.wanting.description=%colony%: За да правите уште %amount% %goods%, додајте %unit%
 report.continentalCongress.available=Достапно
 report.continentalCongress.elected=Избрани: %turn%
 report.continentalCongress.none=(нема)
@@ -2742,26 +2789,25 @@ report.production.selectGoods=Изберете стока
 report.production.update=Надградби
 report.requirements.badAssignment=%colony% има %expert% што моментално работи како %expertWork% и %nonExpert% што работи како %nonExpertWork%. Производството ќе се зголеми ако тие си ги сменат занаетите.
 report.requirements.canTrainExperts={{plural:2|%unit%}} можат да се обучат во
-report.requirements.clearTile=Би било корисно да се исчисти %type% на %direction% од %colony%.
+# Fuzzy
 report.requirements.exploreTile=Би било корисно да се истражи %type% на %direction% од %colony%.
 report.requirements.met=Сите услови се задоволени.
 report.requirements.missingGoods=%colony% произведува %goods%, но им треба повеќе %input%.
 report.requirements.misusedExperts={{plural:2|%unit%}} што не работат како %work% се во
 report.requirements.noExpert=%colony% произведува %goods%, но нема %unit%.
-report.requirements.plowCenter=Би било корисно да се изора полето на %colony%.
-report.requirements.plowTile=Би било корисно да се изора %type% на %direction% од %colony%.
-report.requirements.roadTile=Би било корисно да се направат патишта во %type% на %direction% од %colony%.
 report.requirements.severalExperts=Неколку {{plural:2|%unit%}} се наоѓаат во
 report.requirements.surplus=Вишок %goods% се произведува во
 report.trade.afterTaxes=Приход по оданочување
 report.trade.beforeTaxes=Приход пред оданочување
 report.trade.cargoUnits=Единици за превоз
+# Fuzzy
 report.trade.hasCustomHouse=* Оваа колонија има царинарница; овие стоки се извезуваат.
 report.trade.totalDelta=Вкупно производство
 report.trade.totalUnits=Вкупно единици
 report.trade.unitsSold=Единици купени или продадени
 report.turn.filter=Не прикажувај пораки од овој тип (%type%)
 report.turn.ignore=Ингорирај ја оваа порака (Колонија: %colony%, Стока: %goods%)
+# Fuzzy
 report.turn.playerNation=%player% - %nation%
 aboutPanel.copyright=Авторски права © 2002-2015 Екипата на FreeCol
 aboutPanel.legalDisclaimer=FreeCol е слободен програм: можете да го распространувате и /или менувате во согласност со условите на ГНУ-овата општа јавна лиценца, објавена од Фондацијата за слободна програмска опрема, верзија 2 и сите понови верзии.
@@ -2787,6 +2833,7 @@ colonyPanel.buildQueue=Ред на чекање за изградба
 colonyPanel.colonyUnits=Единици на колонијата
 colonyPanel.inPort=На пристаништето
 colonyPanel.outsideColony=Вон колонијата
+# Fuzzy
 colonyPanel.producing=Произведува:
 colonyPanel.reducePopulation=Ако го намалите насленението под %number%, %colony% повеќе нема да може да гради %buildable%.
 colonyPanel.setGoods=Задај стоки
@@ -2802,7 +2849,9 @@ confirmDeclarationDialog.areYouSure.no=Можеби подоцна
 confirmDeclarationDialog.areYouSure.text=Ајде да ја отфрлиме оваа неправедна тиранија на %monarch% и да прогласиме независност на нашите колонии од круната!
 confirmDeclarationDialog.areYouSure.yes=Слобода или смрт!
 confirmDeclarationDialog.createFlag=и душманите ќе треперат кога ќе го здогледаат нашиот смел бајрак.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Соединети Држави на %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Слободни %nation%
 confirmDeclarationDialog.enterCountry=Отсега нашата земја ќе се нарекува
 confirmDeclarationDialog.enterNation=и секој граѓанин на нашата славна нација ќе се гордее со тоа што ќе се нарекува
@@ -2854,9 +2903,11 @@ negotiationDialog.add=Додај
 negotiationDialog.cancel=Откажи
 negotiationDialog.clear=Исчисти
 negotiationDialog.contact.tutorial=Сретнавте Европејци како вас. Тие ќе се натпреваруваат со вас за земја и богатства, а може и против вас да започнат војна. Но откако Јан де Вит ќе стапи во Континенталниот конгрес, вие ќе можете да тргувате со нив.
+# Fuzzy
 negotiationDialog.demand=%nation%те од %otherNation%те бараат
 negotiationDialog.exchange=во замена за
 negotiationDialog.goldAvailable=(%amount% злато на располагање)
+# Fuzzy
 negotiationDialog.offer=%nation%те им нудат на %otherNation%те
 negotiationDialog.send=Испрати
 negotiationDialog.title.contact=Средба со други Европејци.
@@ -2880,10 +2931,9 @@ findSettlementPanel.displayOnlyEuropean=Пронајди само европск
 findSettlementPanel.displayOnlyNatives=Пронајди само домородни населби
 findSettlementPanel.name=Пронајди населба
 findSettlementPanel.settlement=%name%%capital% (%nation%)
+# Fuzzy
 firstContactDialog.meeting.natives=Се среќавате со домородците...
 firstContactDialog.meeting.natives.tutorial=Се сретнавте со домородци. Испратете ги вашите извидници за да дознаат повеќе за нив, а наемните слуги и слободните колонисти за да учат од нив. Испратете ги вашите бродови и каравани во нивните населби ако сакате да тргувате со нив.
-firstContactDialog.meeting.AZTEC=Ацтеките
-firstContactDialog.meeting.INCA=Царството на Инките
 firstContactDialog.welcomeOffer.text=%nation%те ви пожелуваат добредојде. Ние сме славен народ со %camps% %settlementType%. Во чест на нашето пријателство великодушно ви ја нудиме земјата на којашто сега престојувате. Дали ќе ја прифатите нашата спогодба, за да живееме мирно и братски?
 firstContactDialog.welcomeSimple.text=%nation%те ви пожелуваат добредојде. Ние сме славен народ со %camps% %settlementType%. Дали ќе ја прифатите нашата спогодба, за да живееме мирно и братски?
 abandonColony.no=Откажи
@@ -3165,6 +3215,7 @@ model.nation.dutch.ship.47=Ку
 model.nation.dutch.ship.48=Лифде
 model.nation.dutch.ship.49=Макрел
 model.nation.dutch.ship.50=Мехт ван Енкхејзен
+# Fuzzy
 model.nation.dutch.ship.51=Малкејт или Мелкмејт
 model.nation.dutch.ship.52=Маргрит
 model.nation.dutch.ship.53=Мевкен
@@ -3554,6 +3605,7 @@ model.nation.french.settlementName.classic.62=Авр Сен Пјер
 model.nation.french.settlementName.classic.63=Порт Мение
 model.nation.french.settlementName.classic.64=Портаж ла Прери
 model.nation.french.settlementName.classic.65=Сен Бонифас
+# Fuzzy
 model.nation.french.settlementName.freecol.0=Вил де Кебек
 model.nation.french.settlementName.freecol.1=Шарлфор
 model.nation.french.settlementName.freecol.2=Микелон
@@ -3977,15 +4029,25 @@ model.nation.portuguese.region.river.21=Потенги
 model.nation.portuguese.region.river.22=Сао Франсиско
 model.nation.portuguese.region.river.23=Паранаиба
 model.nation.portuguese.region.river.24=Тјете
+# Fuzzy
 model.nation.portuguese.region.mountain.1=Сера да Естрела
+# Fuzzy
 model.nation.portuguese.region.mountain.2=Сера до Морио
+# Fuzzy
 model.nation.portuguese.region.mountain.3=Сера де Санта Барбара
+# Fuzzy
 model.nation.portuguese.region.mountain.4=Сера да Рибериња
+# Fuzzy
 model.nation.portuguese.region.mountain.5=Сера да Боа Вијажем
+# Fuzzy
 model.nation.portuguese.region.mountain.6=Сера да Марофа
+# Fuzzy
 model.nation.portuguese.region.mountain.7=Сера до Бусако
+# Fuzzy
 model.nation.portuguese.region.mountain.8=Сера да Короа
+# Fuzzy
 model.nation.portuguese.region.mountain.9=Сера де Синтра
+# Fuzzy
 model.nation.portuguese.region.mountain.10=Монте Паскоал
 model.nation.portuguese.region.mountain.11=Сера Жерал
 model.nation.portuguese.region.mountain.12=Сера до Мар
diff --git a/data/strings/FreeColMessages_ms.properties b/data/strings/FreeColMessages_ms.properties
index d6b67ee71..43555dd89 100644
--- a/data/strings/FreeColMessages_ms.properties
+++ b/data/strings/FreeColMessages_ms.properties
@@ -255,7 +255,6 @@ colopediaAction.goods.name=Barangan
 colopediaAction.nations.name=Bangsa
 colopediaAction.nationTypes.name=Kelebihan Bangsa
 colopediaAction.resources.name=Sumber Bonus
-colopediaAction.skills.name=Kemahiran
 colopediaAction.terrain.name=Jenis Rupa Bumi
 colopediaAction.units.name=Unit
 colopediaAction.name=%object% (Colopedia)
@@ -1362,6 +1361,7 @@ model.improvement.road.description=Jalan
 model.improvement.road.name=Jalan
 model.improvement.road.occupationString=J
 model.limit.independence.coastalColonies.name=Had Koloni Pantai
+# Fuzzy
 model.limit.independence.coastalColonies.description=Anda memerlukan sekurang-kurangnya %limit% koloni pinggir pantai untuk mengisytiharkan kemerdekaan.
 model.limit.independence.rebels.name=Had Pemberontak
 model.limit.independence.rebels.description=Sekurang-kurangnya %limit%% kolonis anda mesti menyokong kemerdekaan.
@@ -1682,6 +1682,7 @@ model.colony.badGovernment=Pemerintahan %colony% tidak cekap dan berdepan dengan
 model.colony.goodGovernment=Kecekapan pemerintahan telah bertambah! Sentimen pemberontak di %colony% kini bersamaan atau melebihi %number% peratus.
 model.colony.governmentImproved1=Kecekapan pemerintahan %colony% bertambah baik tetapi masih tidak memuaskan, oleh itu ia masih berdepan dengan denda pengeluaran.
 model.colony.governmentImproved2=Kecekapan pemerintahan %colony% telah meningkat dan tidak berdepan dengan denda pengeluaran.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% lagi %outputType% boleh dihasilkan di %colony%, kalaulah kita dapat lebihan %inputAmount% lagi %inputType%.
 model.colony.lostGoodGovernment=Kecekapan pemerintahan telah merosot! Sentimen pemberontak di %colony% tidak lagi bersamaan atau melebihi %number% peratus. Koloni tidak lagi meraih bonus pengeluaran.
 model.colony.lostVeryGoodGovernment=Kecekapan pemerintahan telah merosot! Sentimen pemberontak di %colony% tidak lagi bersamaan atau melebihi %number% peratus. Bonus pengeluaran pun susut.
@@ -1696,12 +1697,17 @@ model.colony.veryBadGovernment=Pemerintahan %colony% tidak cekap sekali dan berd
 model.colony.veryGoodGovernment=Kecekapan pemerintahan telah bertambah! Sentimen pemberontak di %colony% kini bersamaan atau melebihi %number% peratus.
 model.colonyTile.claim=(menuntut %direction%)
 model.diplomaticTrade.receive.contact=Salam persaudaraan dari bangsa %nation% yang luhur.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Mari kita berunding dengan %nation%.
 model.diplomaticTrade.receive.trade=Mari kita pertimbangkan tawaran perdagangan oleh %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=%nation% menuntut ufti daripada kita!
 model.diplomaticTrade.send.contact=Kita telah bertemu dengan suku-sakat bangsa %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Mari kita pertimbangkan situasi diplomatik kami dengan %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Mari kita usulkan perdagangan dengan %nation% di %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Kami menuntut ufti daripada %nation% di %settlement%.
 model.direction.N.name=utara
 model.direction.NE.name=timur laut
@@ -1712,25 +1718,37 @@ model.direction.SW.name=barat daya
 model.direction.W.name=barat
 model.direction.NW.name=barat laut
 model.historyEventType.abandonColony.description=Anda meninggalkan koloni %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Gencatan senjata dengan %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation% menemui %city%, salah satu daripada Tujuh Kota Emas, dan harta karun %treasure% emas.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Koloni anda, %colony% ditakluki oleh %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Koloni anda, %colony% dimusnahkan oleh %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Tergamak kamu menerima syarat-syarat beta yang baik hati dan mengelak daripada pembayaran? Kependuaan sebegini akan menerima padah daripada kemurkaan beta.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Anda memusnahkan penempatan %nation%, %settlement%.
+# Fuzzy
 model.historyEventType.declareWar.description=Perang diisytiharkan terhadap %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% menghancurkan %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Anda menemui Dunia Baru.
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation% menemui %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Perikatan dirundingkan dengan %nation%.
 model.historyEventType.foundColony.description=Anda menubuhkan koloni %colony%.
 model.historyEventType.foundingFather.description=%father% menyertai Kongres Kebenuaan.
 model.historyEventType.independence.description=Anda mencapai kemerdekaan daripada Kerajaan.
+# Fuzzy
 model.historyEventType.makePeace.description=Perdamaian dicapai dengan %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Anda bertemu dengan %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=%nation% tiada lagi wujud di Dunia Baru.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% menyerahkan semua koloninya di Dunia Baru kepada %nation%.
 model.indianSettlement.mostHatedNone=Tiada
 model.indianSettlement.mostHatedUnknown=Tidak diketahui
@@ -1781,8 +1799,10 @@ model.messageType.warehouseCapacity.name=Muatan Gudang
 model.messageType.warning.name=Amaran
 model.monarch.action.addToRef.text=Kerajaan telah menambahkan %number% {{plural:%number%|%unit%}} ke dalam Angkatan Ekspedisi Diraja. Ketua koloni meluahkan kebimbangan.
 model.monarch.action.addToRef.no=Siap
+# Fuzzy
 model.monarch.action.declarePeace.text=Beta dengan segala baik budi telah bersetuju untuk memeterai perjanjian damai bersama %nation%.
 model.monarch.action.declarePeace.no=Siap
+# Fuzzy
 model.monarch.action.declareWar.text=Keangkuhan angkatan %nation% memaksa beta untuk mengisytiharkan perang ke atas mereka!
 model.monarch.action.declareWar.no=Siap
 # Fuzzy
@@ -1842,6 +1862,7 @@ model.player.colonialIndependence=Pemain koloni sahaja boleh mengisytiharkan kem
 model.player.forces=Angkatan %nation%
 model.player.independentMarket=Eropah
 model.player.startGame=Selepas berbulan-bulan di lautan, akhirnya anda tiba di pantai sebuah benua yang tidak dikenali. Berlayar ke {{tag:%direction%|west=arah barat|east=arah timur|default=dalam angin}} untuk menemui Dunia Baru dan menuntutnya bagi pihak Kerajaan.
+# Fuzzy
 model.player.waitingFor=Menunggu: %nation%
 model.regionType.coast.name=Pantai
 model.regionType.coast.unknown=Kawasan Pantai yang Tidak Dikenali
@@ -1881,6 +1902,7 @@ model.tradeItem.gold.name=Emas
 model.tradeItem.gold.description=jumlah %amount% emas
 model.tradeItem.goods.name=Barangan
 model.tradeItem.incite.name=Isytiharkan perang terhadap
+# Fuzzy
 model.tradeItem.incite.description=perang terhadap %nation%
 model.tradeItem.stance.name=Pendirian
 model.tradeItem.unit.name=Unit
@@ -1901,6 +1923,7 @@ model.unit.unitState.fortified=K
 model.unit.unitState.fortifying=K
 model.unit.unitState.inColony=K
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=L
 model.unit.unitState.toAmerica=P
 model.unit.unitState.toEurope=P
@@ -1941,6 +1964,7 @@ model.colony.warehouseSoonFull=Gudang anda di %colony% akan mencecah muatannya u
 model.colony.warehouseWaste=Gudang anda di %colony% telah mencecah muatannya untuk %goods%. %waste% unit terbazir.
 model.colony.workersEvicted=Di %colony%, ahli-ahli koloni anda tidak boleh bekerja di %location% lagi disebabkan kehadiran %enemyUnit%.
 model.colonyTile.resourceExhausted=Sumber %resource% yang kehabisan di %colony%
+# Fuzzy
 model.game.spanishSuccession=Yang Mulia, Perang Rebut Takhta Sepanyol telah berakhir di Eropah. Mengikut Perjanjian Utrecht, %loserNation% terpaksa menyerahkan semua koloninya di Dunia Baru kepada %nation%!
 model.indianSettlement.mission.denounced=Mubaligh anda di %settlement% telah dikecam dan dihukum mati!
 model.indianSettlement.mission.destroyed=Mubaligh anda di %settlement% terkorban dalam kemusnahan petempatan tersebut.
@@ -1950,6 +1974,7 @@ model.player.autoRecruit=Ketegangan agama di %europe% mendorong %unit% supaya be
 model.player.colonyGoodsParty.harbour=Para kolonis anda di %colony% telah mencampak %amount% unit %goods% ke dalam pelabuhan sebagai tanda bantahan terhadap pencukaian yang tidak adil oleh Kerajaan!
 model.player.colonyGoodsParty.horses=Kolonis-kolonis anda di %colony% telah melepaskan %amount% sebagai tanda membantah pencukaian Kerajaan yang tidak adil!
 model.player.colonyGoodsParty.landLocked=Para kolonis anda di %colony% telah membakar %amount% unit %goods% di medan pasar sebagai tanda bantahan terhadap pencukaian yang tidak adil oleh Kerajaan!
+# Fuzzy
 model.player.dead.european=Yang Mulia, %nation% telah mengisytiharkan pengunduran diri tanpa syarat daripada hal ehwal Dunia Baru!
 model.player.dead.native=Yang Mulia, %nation% telah hancur.
 model.player.disaster.bankruptcy.start=Anda gagal menanggung penyelenggaraan semua bangunan, oleh itu anda akan dikenakan penalti pengeluaran yang berat.
@@ -1963,12 +1988,16 @@ model.player.ignoredTax=Kerajaan telah menaikkan kadar cukai kepada %amount%% se
 model.player.interventionForceArrives=Angkatan Pengantaraan yang dijanjikan sudah tiba!
 model.player.soLDecrease=Keahlian Putera Kebebasan di koloni-koloni anda telah merosot kepada %newSoL% peratus!
 model.player.soLIncrease=Keahlian Putera Kebebasan di koloni-koloni anda telah meningkat kepada %newSoL% peratus!
+# Fuzzy
 model.player.stance.alliance.declared=Yang Mulia, %nation% bersekutu dengan kita!
 model.player.stance.alliance.others=Yang Mulia, %attacker% sedang bersekutu dengan %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Yang Mulia, %nation% telah bersetuju untuk menggencat senjata dengan kita!
 model.player.stance.ceaseFire.others=Yang Mulia, %attacker% telah bersetuju untuk menggencat senjata dengan %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Yang Mulia, %nation% berdamai dengan kita!
 model.player.stance.peace.others=Yang Mulia, %attacker% sedang berdamai dengan %defender%.
+# Fuzzy
 model.player.stance.war.declared=Ada berita buruk, Yang Mulia. %nation% telah mengisytiharkan perang terhadap kita!
 model.player.stance.war.others=Yang Mulia, %attacker% telah mengisytiharkan perang terhadap %defender%.
 combat.automaticDefence=%unit% anda di %colony% telah mengangkat senjata untuk mempertahankan koloni!
@@ -1984,6 +2013,7 @@ combat.enemyShipEvaded=%enemyUnit% %enemyNation%telah mengelak serangan oleh %un
 combat.enemyShipSunk=%unit% telah menenggelamkan %enemyUnit% %enemyNation%!
 combat.equipmentCaptured=Awas, pahlawan %nation% telah memperoleh %equipment%!
 combat.goodsStolen=%enemyUnit% %enemyNation% merampas %amount% %goods% di %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyUnit% %enemyNation% menjarah %amount% dari %colony%.
 combat.indianRaid=Perisik kita melaporkan bahawa %nation% telah menceroboh koloni %colonyNation% di %colony%.
 combat.indianSurprise=%nation% melakukan serangan mengejut di %colony%, menyebabkan kolonis kita cemas.  Ketua %nation% menafikan dirinya terlibat.
@@ -2040,6 +2070,7 @@ main.javaVersion=Java versi %minVersion% ke atas disyorkan untuk menjalankan Fre
 main.memory=Anda perlu menggunakan lebih daripada %memory% bait ingatan pada JVM.\n  Lancarkan semula FreeCol dengan:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol tidak dapat menjumpai direktori yang sesuai untuk menyimpan data pengguna.  Tetap meneruskan, tetapi mungkin ada masalah.
 client.baseData=Direktori data pangkalan %dir% tidak dapat dijumpai.\n  Fail-fail data tidak dapat dijumpai oleh FreeCol.\n  Sila pastikan fail-fail itu ada.\n  Jika FreeCol tercari dalam direktori yang salah, maka\n  jalankan permainan dengan parameter baris perintah:\n  --freecol-data <data-directory>
+# Fuzzy
 client.choicePlayer=Sila pilih pemain:
 client.classic=Pemetaan sumber gagal dimuatkan dari set peraturan 'classic'.
 client.debugConnect=Anda tidak boleh bersambung dengan permainan sedia ada dalam mod nyahpepijat.
@@ -2052,8 +2083,10 @@ metaServer.couldNotConnect=Maaf, tidak dapat bersambung dengan meta-pelayan. Sil
 metaServer.communicationError=Ralat dialami ketika berhubung dengan meta-pelayan. Sila cuba lagi nanti.
 abandonEducation.action.studying=belajar
 abandonEducation.action.teaching=mengajar
+# Fuzzy
 abandonEducation.no=Tidak, teruskan pendidikan
 abandonEducation.text=Jika %unit% anda meninggalkan %colony%, ia akan berhenti %action% di %building%. Adakah anda benar-benar mahu ia pergi?
+# Fuzzy
 abandonEducation.yes=Ya, tinggalkan koloni
 abandonTeaching.text=Jika %unit% anda meninggalkan %building%, dia akan berhenti mengajar. Adakah anda benar-benar mahu dia pergi?
 armedUnitSettlement.attack=Serang
@@ -2065,9 +2098,13 @@ buy.takeOffer=Terima tawaran
 buy.text=%nation% hendak menjual %goods%nya untuk %gold%:
 clearTradeRoute.text=%unit% anda ditugaskan ke laluan perdagangan %route%. Menetapkan destinasinya akan menggugurkannya daripada laluan perdagangan. Adakah anda pasti ingin berbuat demikian?
 client.fullScreen=Mod skrin penuh tidak disokong untuk peranti grafik ini.\nKembali ke mod tetingkap.
+# Fuzzy
 confirmHostile.alliance=Anda tidak boleh menyerang negara sekutu! Adakah anda benar-benar ingin memutuskan perikatan anda dengan  %nation% dan mengisytiharkan perang?
+# Fuzzy
 confirmHostile.ceaseFire=Anda telah menandatangani gencatan senjata dengan %nation%. Adakah anda benar-benar ingin menyerang?
+# Fuzzy
 confirmHostile.peace=Anda sedang berdamai dengan %nation%. Adakah anda benar-benar ingin mengisytiharkan perang?
+# Fuzzy
 confirmTribute.broke=Pengintip-pengintip kami melaporkan bahawa %nation% kehabisan dana sama sekali. Baik kita jangan buang masa dengan tuntutan ufti.
 confirmTribute.european=%nation% %danger%, malah %finance%. Berapa banyakkah ufti yang harus kita tuntut daripada mereka?
 confirmTribute.happy=%nation% di %settlement% bersahabat baik dengan kita, sayanglah jika setiakawan antara kita menjadi tegang.
@@ -2091,6 +2128,7 @@ indianLand.pay=Menawarkan %amount% emas untuk membeli tanah.
 # Fuzzy
 indianLand.take=Ambillah apa yang sah milik kita.
 indianLand.text=Tanah ini milik %player%. Adakah anda ingin:
+# Fuzzy
 indianLand.unknown=Ada kaum tidak dikenali yang tinggal di kawasan ini. Adakah anda ingin:
 info.autodetectLanguageSelected=Anda telah memilih untuk mengesan bahasa secara automatik. Ini akan dilakukan lain kali anda membuka semula permainan ini.
 info.enterSomeText=Sila isikan teks.
@@ -2136,7 +2174,9 @@ defeated.text=Anda telah tewas! Anda hendak:
 defeated.yes=Berdiam dan Perhatikan
 defeatedSinglePlayer.text=Anda telah tewas!\n\nSekarang di tengah malam buta ini, apabila laman gereja menguap dan neraka menghembuskan penyakitnya ke dunia ini, barulah daku menggogok darah panas sambil bernestapa kerana siang hari kita akan menggeletar sambil memandang ke depan.
 defeatedSinglePlayer.yes=Gunakan Mod Balas Dendam
+# Fuzzy
 diplomacy.offerAccepted=%nation% telah menerima tawaran anda.
+# Fuzzy
 diplomacy.offerRejected=%nation% telah menolak tawaran anda.
 disbandUnit.text=Adakah anda benar-benar ingin membubarkan unit ini?
 disbandUnit.yes=Bubarkan
@@ -2182,7 +2222,9 @@ move.noAccessGoods=%nation% tidak akan berdagang dengan %unit% kosong.
 move.noAccessMissionBan=%nation% enggan sama sekali bertemu dengan mubaligh anda.
 move.noAccessSettlement=%nation% tidak membenarkan %unit% kita untuk memasuki petempatan mereka.
 move.noAccessSkill=%unit% kami tidak dapat belajar apa-apa daripada orang pribumi.
+# Fuzzy
 move.noAccessTrade=Kami tiada kebenaran untuk berdagang dengan bangsa-bangsa Eropah lain seperti %nation%.
+# Fuzzy
 move.noAccessWar=Kita tidak boleh berdagang dengan %nation% ketika berperang.
 move.noAccessWater=%unit% kita mesti mendarat sebelum memasuki petempatan itu.
 move.noAttackWater=%unit% kita mesti mendarat sebelum menyerang.
@@ -2244,6 +2286,7 @@ server.timeOut=Timeout berlaku apabila bersambung dengan pelayan.
 server.userNameInUse=Nama pengguna yang dinyatakan sudah dipakai.
 server.userNameNotPresent=Nama pengguna yang dinyatakan itu tiada dalam permainan.
 server.wrongFreeColVersion=Versi FreeCol pelanggan dan pelayan tidak sepadan.
+# Fuzzy
 buildColony.others=%nation% telah menubuhkan koloni baru %colony% di %region%.
 cashInTreasureTrain.colonial=Harta %amount% emas telah sampai di Eropah. %cashInAmount% telah disimpan.
 cashInTreasureTrain.independent=Harta bernilai %amount% telah diisikan ke dalam perbendaharaan negara.
@@ -2348,6 +2391,7 @@ colopedia.unit.offensivePower=Kuasa Serangan:
 colopedia.unit.price=Harga di Eropah:
 colopedia.unit.productionBonus={{plural:%number%|one=Pengubah suai|other=Pengubah suai}} pengeluaran:
 colopedia.unit.requirements=Keperluan:
+# Fuzzy
 colopedia.unit.school=Sekolah yang diperlukan untuk latihan:
 colopedia.unit.skill=Tahap Kemahiran:
 report.labour.allColonists=Semua Kolonis
@@ -2383,8 +2427,8 @@ report.colony.growing.description=%colony% boleh tumbuh {{plural:%amount%|one=sa
 # Fuzzy
 report.colony.improve.description=Unit yang boleh meningkatkan pengeluaran berkenaan dengan unit yang sedang melakukan tugas itu
 report.colony.improve.header=Peningkatan
+# Fuzzy
 report.colony.improving.description=%colony%: Untuk membuat %amount% lagi %goods%, ganti %oldUnit% dengan %unit%
-report.colony.wanting.description=%colony%: Untuk membuat %amount% lagi %goods%, tambahkan %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% diperlukan untuk %buildable% {{plural:%turns%|one=giliran seterusnya|other=dalam %turns% giliran seterusnya}}
 report.colony.making.constructing.description=%colony%: %buildable% siap dalam {{plural:%turns%|one=giliran seterusnya|other=%turns% giliran seterusnya}}
 report.colony.making.description=Apakah yang dibuat oleh koloni ini
@@ -2394,21 +2438,22 @@ report.colony.making.noconstruction.description=%colony%: Tiada kerja pembinaan
 report.colony.making.noteach.description=%colony%: %teacher% kekurangan pelajar
 report.colony.name.description=Senarai koloni
 report.colony.name.header=Koloni
-report.colony.plow.description=Bilangan jubin koloni yang akan mendapat manfaat daripada pemBajakan
-report.colony.plow.header=B
-report.colony.plowing.description=%colony% akan mendapat manfaat daripada membajak {{plural:%amount%|one=satu jubin|other=%amount% jubin}}
+# Fuzzy
 report.colony.production.description=%colony%: pengeluaran %goods% bersih = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: pengeluaran %goods% bersih adalah %amount% (lebih %export% dieksport)
 report.colony.production.header=Pengeluaran %goods% bersih
+# Fuzzy
 report.colony.production.high.description=%colony%: pengeluaran %goods% bersih = %amount%, penuh dalam {{plural:%turns%|one=giliran seterusnya|other=%turns% giliran seterusnya}}
+# Fuzzy
 report.colony.production.low.description=%colony%: pengeluaran %goods% bersih = %amount%, habis dalam {{plural:%turns%|one=giliran seterusnya|other=%turns% giliran seterusnya}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: pengeluaran %goods% bersih = %amount%, gudang akan penuh padat, %waste% akan terbazir
-report.colony.road.description=Bilangan jubin koloni yang akan mendapat manfaat daripada pembinaan Jalan
-report.colony.road.header=J
-report.colony.roadBuilding.description=%colony% akan mendapat manfaat daripada membina {{plural:%amount%|one=sebatang jalan|other=%amount% batang jalan}}
 report.colony.shrinking.description=%colony% mesti susut {{plural:%amount%|one=satu unit|other=%amount% unit}} untuk meningkatkan pengeluaran
 report.colony.starving.description=%colony%: kebuluran dalam {{plural:%turns%|one=giliran seterusnya|other=%turns% giliran seterusnya}}
 # Fuzzy
+report.colony.wanting.description=%colony%: Untuk membuat %amount% lagi %goods%, tambahkan %unit%
+# Fuzzy
 report.continentalCongress.elected=Dipilih:
 report.continentalCongress.none=(tiada)
 report.continentalCongress.recruiting=Merekrut
@@ -2451,26 +2496,25 @@ report.production.selectGoods=Pilih barangan
 report.production.update=Kemas kini
 report.requirements.badAssignment=%colony% ada seorang %expert% yang kini bekerja sebagai %expertWork%, manakala seorang %nonExpert% bekerja sebagai %nonExpertWork%. Pengeluaran ditingkatkan lagi jika kolonis-kolonis itu saling bertukar pekerjaan.
 report.requirements.canTrainExperts={{plural:2|%unit%}} boleh dilatih di
-report.requirements.clearTile=%type% ke %direction% dari %colony% mendapat faedah daripada penebangan.
+# Fuzzy
 report.requirements.exploreTile=%type% ke %direction% dari %colony% mendapat faedah daripada penjelajahan.
 report.requirements.met=Semua keperluan dipenuhi.
 report.requirements.missingGoods=%colony% sedang menghasilkan %goods%, tetapi memerlukan lebih %input%.
 report.requirements.misusedExperts=Terdapat {{plural:2|%unit%}} yang tidak bekerja sebagai %work% yang berada di
 report.requirements.noExpert=%colony% sedang menghasilkan %goods%, tetapi tiada %unit%.
-report.requirements.plowCenter=%colony% akan mendapat manfaat dengan membajak jubinnya.
-report.requirements.plowTile=%type% ke %direction% dari %colony% mendapat faedah daripada pembajakan.
-report.requirements.roadTile=%type% ke %direction% dari %colony% mendapat faedah daripada pembinaan jalan.
 report.requirements.severalExperts=Terdapat {{plural:2|%unit%}} yang berada di
 report.requirements.surplus=Lebihan %goods% sedang dihasilkan di
 report.trade.afterTaxes=Pendapatan selepas cukai
 report.trade.beforeTaxes=Pendapatan sebelum cukai
 report.trade.cargoUnits=Unit dalam Muatan
+# Fuzzy
 report.trade.hasCustomHouse=* Koloni ini telah menjadi pejabat kastam; barang-barangan ini dieksport.
 report.trade.totalDelta=Jumlah Pengeluaran
 report.trade.totalUnits=Jumlah Unit
 report.trade.unitsSold=Unit yang dibeli atau dijual
 report.turn.filter=Jangan paparkan jenis pesanan ini (%type%)
 report.turn.ignore=Abaikan pesanan ini (Koloni: %colony%, Barangan: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% %player%
 aboutPanel.copyright=Hakcipta © 2002-2015 The FreeCol Team
 aboutPanel.legalDisclaimer=FreeCol ialah sebuah perisian bebas: anda boleh mengedarkannya semula dan/atau mengubahsuainya berlandaskan syarat-syarat Lesen Awam Am GNU seperti yang diterbitkan oleh Yayasan Perisian Bebas, sama ada versi 2 Lesen atau mana-mana versi selanjutnya.
@@ -2496,6 +2540,7 @@ chooseFoundingFatherDialog.title=Lantik Bapa Pengasas
 colonyPanel.colonyUnits=Unit Koloni
 colonyPanel.inPort=Di Pelabuhan
 colonyPanel.outsideColony=Di Luar Koloni
+# Fuzzy
 colonyPanel.producing=Menghasilkan:
 colonyPanel.reducePopulation=Jika anda mengurangkan jumlah penduduk ke bawah %number%, %colony% tidak dapat lagi membina %buildable%.
 colonyPanel.unitChange=Apabila memasuki koloni anda, %oldType% anda menjadi %newType%.
@@ -2508,7 +2553,9 @@ confirmDeclarationDialog.areYouSure.no=Mungkin Nanti
 confirmDeclarationDialog.areYouSure.text=Ayuh kita meninggalkan kezaliman %monarch% yang tidak mengenal keadilan, dan mengisytiharkan kemerdekaan koloni-koloni kita daripada cengkaman raja!
 confirmDeclarationDialog.areYouSure.yes=Kebebasan atau Maut!
 confirmDeclarationDialog.createFlag=dan musuh-musuh kita akan gentar melihat sepanduk penentangan kita.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=%nation% Syarikat
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Bebaskan %nation%
 confirmDeclarationDialog.enterCountry=Mulai sekarang, negara kita akan dikenali sebagai
 confirmDeclarationDialog.enterNation=dan setiap warga negara yang gemilang ini akan berbangga kerana dikenali sebagai
@@ -2559,8 +2606,10 @@ negotiationDialog.add=Tambahkan
 negotiationDialog.cancel=Batalkan
 negotiationDialog.clear=Padamkan
 negotiationDialog.contact.tutorial=Anda bertemu dengan bangsa-bangsa Eropah lain yang akan bersaing dengan anda demi tanah dan kekayaan, dan mungkin akan berperang dengan anda. Tetapi selepas Jan de Witt menyertai Kongres Kebenuaan, anda boleh berdagang dengan mereka.
+# Fuzzy
 negotiationDialog.demand=%nation% menuntut %otherNation%
 negotiationDialog.exchange=sebagai balasan kepada
+# Fuzzy
 negotiationDialog.offer=%nation% menawarkan kepada %otherNation%
 negotiationDialog.send=Hantar
 negotiationDialog.title.contact=Pertemuan dengan Bangsa Eropah Lain
@@ -2582,10 +2631,9 @@ findSettlementPanel.displayAll=Cari semua petempatan
 findSettlementPanel.displayOnlyEuropean=Cari petempatan Eropah sahaja
 findSettlementPanel.displayOnlyNatives=Cari petempatan pribumi sahaja
 findSettlementPanel.name=Cari Petempatan
+# Fuzzy
 firstContactDialog.meeting.natives=Bertemu dengan pribumi...
 firstContactDialog.meeting.natives.tutorial=Anda bertemu dengan kaum pribumi. Hantar Peninjau anda ke petempatan pribumi untuk mempelajari lebih lanjut mengenai pribumi. Utus juga Orang Gaji Kontrak dan Kolonis Bebas anda untuk belajar ilmu pribumi. Hantar kapal dan Deretan Pedati ke petempatan mereka jika anda ingin berdagang dengan mereka.
-firstContactDialog.meeting.AZTEC=Bangsa Aztek...
-firstContactDialog.meeting.INCA=Empayar Inca...
 firstContactDialog.welcomeOffer.text=Bangsa %nation% mengalu-alukan tuan-tuan dan puan-puan sekalian. Kami ialah bangsa gemilang %camps% %settlementType%. Untuk meraikan persahabatan kita, kami dengan senang hatinya menawarkan tanah yang kalian duduki sekarang sebagai hadiah. Sudikah kalian menerima perjanjian kami dan hidup berdamai bersama kami sebagai saudara-mara?
 firstContactDialog.welcomeSimple.text=Bangsa %nation% mengalu-alukan tuan-tuan dan puan-puan sekalian. Kami ialah bangsa gemilang %camps% %settlementType%. Sudikah kalian menerima perjanjian kami dan hidup berdamai bersama kami sebagai saudara-mara?
 abandonColony.no=Batalkan
diff --git a/data/strings/FreeColMessages_nl.properties b/data/strings/FreeColMessages_nl.properties
index 199955185..ee17efaf3 100644
--- a/data/strings/FreeColMessages_nl.properties
+++ b/data/strings/FreeColMessages_nl.properties
@@ -13,6 +13,7 @@
 # Author: Rangekill
 # Author: Rcdeboer
 # Author: Robin0van0der0vliet
+# Author: Rvlieshout
 # Author: SPQRobin
 # Author: Saruman
 # Author: Siebrand
@@ -277,7 +278,6 @@ colopediaAction.goods.name=Goederen
 colopediaAction.nations.name=Naties
 colopediaAction.nationTypes.name=Nationale voordelen
 colopediaAction.resources.name=Bonusmiddelen
-colopediaAction.skills.name=Beroepen
 colopediaAction.terrain.name=Terreintypes
 colopediaAction.units.name=Eenheden
 colopediaAction.name=%object% (Colopedia)
@@ -1527,6 +1527,7 @@ model.improvement.road.description=Weg
 model.improvement.road.name=Weg
 model.improvement.road.occupationString=W
 model.limit.independence.coastalColonies.name=Limiet voor kustkolonies
+# Fuzzy
 model.limit.independence.coastalColonies.description=U moet tenminste %limit% kustkolonies hebben voordat u de onafhankelijkheid kunt afkondigen.
 model.limit.independence.rebels.name=Rebellenlimiet
 model.limit.independence.rebels.description=Tenminste %limit%% van uw kolonisten moet onafhankelijkheid ondersteunen.
@@ -1863,6 +1864,7 @@ model.colony.badGovernment=Het bestuur van %colony% is inefficiënt. De producti
 model.colony.goodGovernment=De efficiëntie van het bestuur is verbeterd! Het rebellensentiment in %colony% is nu gelijk aan of groter dan %number% procent.
 model.colony.governmentImproved1=Het bestuur van %colony% is verbeterd, maar is nog inefficient. De productiviteit is nog steeds gedaald.
 model.colony.governmentImproved2=Het bestuur van %colony% is verbeterd. De productiviteit is gestegen.
+# Fuzzy
 model.colony.insufficientProduction=In %colony% zou %outputAmount% meer %outputType% geproduceerd kunnen worden als er maar %inputAmount% meer %inputType% beschikbaar was.
 model.colony.lostGoodGovernment=De efficiëntie van het bestuur is afgenomen! Het rebellensentiment in %colony% is niet langer groter of gelijk aan %number% procent. Er is niet langer een productiebonus voor de kolonie.
 model.colony.lostVeryGoodGovernment=De efficiëntie van het bestuur is afgenomen! Het rebellensentiment in %colony% is niet langer groter of gelijk aan %number% procent. Een aantal productiebonussen zijn verloren gegaan.
@@ -1877,12 +1879,17 @@ model.colony.veryBadGovernment=Het bestuur van %colony% is erg inefficient. De p
 model.colony.veryGoodGovernment=De efficiëntie van het bestuur is verbeterd! Het rebellensentiment in %colony% is nu gelijk aan of groter dan %number% procent.
 model.colonyTile.claim=(claim %direction%)
 model.diplomaticTrade.receive.contact=Broederlijke groeten uit van de glorieuze natie der %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Laten we onderhandelen met de %nation%.
 model.diplomaticTrade.receive.trade=Laten we het handelsvoorstel van de %nation% overwegen.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=De %nation% eisen eerbetoon van ons!
 model.diplomaticTrade.send.contact=We zijn leden van de natie der %nation% tegengekomen.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Laat ons onze diplomatieke situatie met de %nation% heroverwegen.
+# Fuzzy
 model.diplomaticTrade.send.trade=Laat ons handel met de %nation% voorstellen bij %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Wij eisen eerbetoon van de %nation% bij %settlement%.
 model.direction.N.name=noord
 model.direction.NE.name=noordoost
@@ -1893,25 +1900,36 @@ model.direction.SW.name=zuidwest
 model.direction.W.name=west
 model.direction.NW.name=noordwest
 model.historyEventType.abandonColony.description=U hebt de kolonie %colony% verlaten.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Staakt het vuren met de %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=De %nation% hebben %city% ontdekt, een van de zeven Gouden Steden. De schat bedraagt %treasure% goud.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Uw kolonie %colony% is veroverd door de %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Uw kolonie %colony% is verwoest door de %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=U durft Onze genereuze voorwaarden te aanvaarden en dan nog de betaling te ontwijken? Een dergelijke dubbelhartigheid oogsten van Ons een bittere beloning.
+model.historyEventType.declareIndependence.description=U verklaart onafhankelijkheid van de Kroon.
 # Fuzzy
-model.historyEventType.declareIndependence.description=U hebt de nederzetting %settlement% van de %nation% verwoest.
 model.historyEventType.declareWar.description=Oorlog verklaard met de %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=De %nation% vernietigen de %nativeNation%.
 model.historyEventType.discoverNewWorld.description=U hebt de Nieuwe Wereld ontdekt.
+# Fuzzy
 model.historyEventType.discoverRegion.description=De %nation% hebben %region% ontdekt.
+# Fuzzy
 model.historyEventType.formAlliance.description=Bondgenootschap onderhandeld met de %nation%.
 model.historyEventType.foundColony.description=U hebt de kolonie %colony% gevestigd.
 model.historyEventType.foundingFather.description=%father% treedt toe tot het Continentale Congres
 model.historyEventType.independence.description=U bereikt onafhankelijkheid van de Kroon.
+# Fuzzy
 model.historyEventType.makePeace.description=Vrede overeengekomen met de %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=U ontmoet de %nation%
+# Fuzzy
 model.historyEventType.nationDestroyed.description=De %nation% zijn niet meer aanwezig in de Nieuwe Wereld.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=De %loserNation% staan al hun kolonies in de Nieuwe Wereld af aan de %nation%.
 model.indianSettlement.mostHatedNone=Geen
 model.indianSettlement.mostHatedUnknown=Onbekend
@@ -1962,8 +1980,10 @@ model.messageType.warehouseCapacity.name=Pakhuiscapaciteit
 model.messageType.warning.name=Waarschuwingen
 model.monarch.action.addToRef.text=De Kroon heeft %number% {{plural:%number%|%unit%}} toegevoegd aan de Koninklijke Verkenningsmacht. Koloniale leiders uiten hun bezorgdheid.
 model.monarch.action.addToRef.no=Afgerond
+# Fuzzy
 model.monarch.action.declarePeace.text=We hebben genadig ingestemd met een vredesverdrag met de %nation%.
 model.monarch.action.declarePeace.no=Afgerond
+# Fuzzy
 model.monarch.action.declareWar.text=De brutaliteit van %nation% dwingt ons om de oorlog te verklaren!
 model.monarch.action.declareWar.no=Afgerond
 # Fuzzy
@@ -2023,6 +2043,7 @@ model.player.colonialIndependence=Alleen koloniale spelers kunnen onafhankelijkh
 model.player.forces=%nation% strijdkrachten
 model.player.independentMarket=Europa
 model.player.startGame=Na maanden op zee bent u eindelijk aangekomen bij de kust van een onbekend continent. Zeil naar {{tag:%direction%|west=naar het westen|east=naar het oosten|default=tegen de wind in}} om de Nieuwe Wereld te ontdekken en deze te claimen voor de Kroon.
+# Fuzzy
 model.player.waitingFor=Aan het wachten op: %nation%
 model.regionType.coast.name=Kust
 model.regionType.coast.unknown=Onbekend kustgebied
@@ -2062,6 +2083,7 @@ model.tradeItem.gold.name=Goud
 model.tradeItem.gold.description=het totaal van %amount% goud
 model.tradeItem.goods.name=Goederen
 model.tradeItem.incite.name=Oorlog verklaren aan
+# Fuzzy
 model.tradeItem.incite.description=oorlog tegen de %nation%
 model.tradeItem.stance.name=Houding
 model.tradeItem.unit.name=Eenheid
@@ -2082,9 +2104,9 @@ model.unit.underRepair=Repareren(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=W
+# Fuzzy
 model.unit.unitState.skipped=O
 model.unit.unitState.toAmerica=E
 model.unit.unitState.toEurope=E
@@ -2125,6 +2147,7 @@ model.colony.warehouseSoonFull=Het pakhuis in %colony% zit bij de volgende beurt
 model.colony.warehouseWaste=Het pakhuis in %colony% zit overvol met %goods%. %waste% eenheden zijn weggegooid.
 model.colony.workersEvicted=Bij %colony% kunnen uw kolonisten niet langer werken bij %location% vanwege de aanwezigheid van %enemyUnit%.
 model.colonyTile.resourceExhausted=De grondstof %resource% is op in %colony%
+# Fuzzy
 model.game.spanishSuccession=Excellentie, de Spaanse Successieoorlog in Europa is beëindigd. In het Verdrag van Utrecht worden de %loserNation% gedwongen om alle kolonies in de Nieuwe Wereld af te staan aan de %nation%!
 model.indianSettlement.mission.denounced=Uw missionaris in %settlement% is uit de gratie gevallen en geëxecuteerd!
 model.indianSettlement.mission.destroyed=Uw missionaris in de nederzetting %settlement% is overleden tijdens de vernietiging van die nederzetting.
@@ -2134,6 +2157,7 @@ model.player.autoRecruit=Religieuze onrust in %europe% zet %unit% aan tot emigra
 model.player.colonyGoodsParty.harbour=Uw kolonisten in %colony% hebben %amount% eenheden van %goods% in de haven gegooid in protest tegen de oneerlijke belastingen van de koning!
 model.player.colonyGoodsParty.horses=Uw kolonisten in %colony% hebben %amount% paarden vrijgelaten uit protest tegen deze oneerlijke belasting door de Kroon!
 model.player.colonyGoodsParty.landLocked=Uw kolonisten in %colony% hebben %amount% eenheden van %goods% verbrand op het marktplein in protest tegen de oneerlijke belastingen van de koning!
+# Fuzzy
 model.player.dead.european=Uwe Hoogheid. De %nation% hebben verklaard zich onvoorwaardelijk terug te trekken uit gelegenheden aangaande de Nieuwe Wereld!
 model.player.dead.native=Uwe Hoogheid. De %nation% zijn vernietigd.
 model.player.disaster.bankruptcy.start=U heeft niet betaald voor het onderhoud van alle gebouwen. Er worden zware productiesancties opgelegd.
@@ -2147,12 +2171,16 @@ model.player.ignoredTax=De Kroon heeft het belastingpercentage verhoogd naar %am
 model.player.interventionForceArrives=De beloofde interventiemacht is gearriveerd!
 model.player.soLDecrease=Het patriottisme in uw kolonies is gedaalt naar %newSoL% procent!
 model.player.soLIncrease=Het patriottisme in uw kolonies is gestegen naar %newSoL% procent!
+# Fuzzy
 model.player.stance.alliance.declared=Uwe Hoogheid, de %nation% vormen nu een alliantie met ons!
 model.player.stance.alliance.others=Uwe Hoogheid, de %attacker% vormen nu een alliantie met de %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Uwe Hoogheid, de %nation% hebben toegestemd in een staakt het vuren met ons!
 model.player.stance.ceaseFire.others=Uwe Hoogheid, de %attacker% hebben toegestemd in een staakt het vuren met de %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Uwe Hoogheid, de %nation% hebben de vrede met ons getekend!
 model.player.stance.peace.others=Uwe Hoogheid, de %attacker% hebben de vrede met de %defender% getekend.
+# Fuzzy
 model.player.stance.war.declared=Slecht nieuws Uwe Hoogheid. De %nation% hebben ons de oorlog verklaard!
 model.player.stance.war.others=Uwe Hoogheid, de %attacker% hebben de oorlog verklaard aan %defender%.
 combat.automaticDefence=Uw %unit% in %colony% heeft de wapens opgenomen on de kolonie te verdedigen!
@@ -2168,6 +2196,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% heeft de aanval door %unit% ont
 combat.enemyShipSunk=%unit% heeft %enemyNation% %enemyUnit% tot zinken gebracht!
 combat.equipmentCaptured=Opgepast. De moedige %nation% hebben %equipment% buitgemaakt!
 combat.goodsStolen=%enemyNation% %enemyUnit% steelt %amount% %goods% in %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% plundert %amount% van %colony%.
 combat.indianRaid=Onze spionnen melden dat de %nation% een inval hebben in de kolonie %colony% van de %colonyNation%.
 combat.indianSurprise=De %nation% voeren een verrassingsaanval uit op %colony%, waardoor onze kolonisten gealarmeerd worden. Het hoofd van de %nation% ontkent betrokkenheid.
@@ -2224,6 +2253,7 @@ main.javaVersion=Voor FreeCol wordt een Javaversie van %minVersion% of later aan
 main.memory=U moet meer dan %memory% bytes geheugen aan de JVM toekennen.\n  Herstart FreeCol met: java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol kan geen geschikt mappen vinden om gebruikersgegevens in op te slaan. Het programma blijft uitgevoerd worden, maar verwacht problemen.
 client.baseData=De map %dir% voor de basisgegevens kon niet gevonden worden.\n  De gegevensbestanden kunnen niet worden gevonden door FreeCol.\n  Zorg ervoor dat ze aanwezig zijn.\n  Als FreeCol in de verkeerde map zoekt,\n  start het spel dan met de volgende opdrachtregelparameter:\n  --freecol-data <data-directory>
+# Fuzzy
 client.choicePlayer=Selecteer een speler:
 client.classic=Het laden van de resourcemapping voor regelset "classic" is mislukt.
 client.debugConnect=U kunt geen verbinding maken met een bestaand spel in de debug modus.
@@ -2236,8 +2266,10 @@ metaServer.couldNotConnect=Er kon geen verbinding worden gemaakt met de metaserv
 metaServer.communicationError=Er is een fout opgetreden in de verbinding met de metaserver. Probeer het later nog eens.
 abandonEducation.action.studying=aan het studeren
 abandonEducation.action.teaching=aan het opleiden
+# Fuzzy
 abandonEducation.no=Nee, ga door met opleiden
 abandonEducation.text=Als uw %unit% %colony% verlaat, stopt deze met %action% in het gebouw %building%. Weet u het zeker?
+# Fuzzy
 abandonEducation.yes=Ja, deze eenheid kan de kolonie verlaten
 abandonTeaching.text=Als uw %unit% het gebouw %building% verlaat, stopt deze met opleiden. Weet u zeker dat u dit wilt doen?
 armedUnitSettlement.attack=Aanvallen
@@ -2249,9 +2281,13 @@ buy.takeOffer=Het aanbod aanvaarden
 buy.text=De %nation% wil graag hun %goods% voor %gold% verkopen:
 clearTradeRoute.text=Uw %unit% is toegewezen aan de handelsroute %route%. Door een bestemming in te stellen haalt u deze van de handelsroute af. Weet u zeker dat u dit wilt doen?
 client.fullScreen=De modus volledig scherm wordt niet ondersteund voor dit apparaat.\nHet programma wordt uitgevoerd in venstermodus.
+# Fuzzy
 confirmHostile.alliance=U kunt geen geallieerde natie aanvallen! Wilt u echt de alliantie met de %nation% verbreken en dan de oorlog verklaren?
+# Fuzzy
 confirmHostile.ceaseFire=We hebben een staak het vuren getekend met %nation%. Wilt u echt aanvallen?
+# Fuzzy
 confirmHostile.peace=U leeft in vrede met de %nation%. Weet u zeker dat u de oorlog wilt verklaren?
+# Fuzzy
 confirmTribute.broke=Onze spionnen melden dat de %nation% volkomen blut zijn. Laten we onze tijd niet verspillen met het eisen van eerbetoon.
 confirmTribute.european=De %nation% %danger% en %finance%. Hoeveel eerbetoon gaan we van ze eisen?
 confirmTribute.happy=De %nation% bij %settlement% zijn goede vrienden van ons. Het zou jammer zijn om onze kameraadschap te beschadigen.
@@ -2272,9 +2308,9 @@ finance.normal=hebben een kleine goudreserve
 indianLand.cancel=Verlaat het land.
 # Fuzzy
 indianLand.pay=Bied %amount% goud voor het land.
-# Fuzzy
-indianLand.take=Neem wat ons rechtens toekomt.
+indianLand.take=Neem wat ons toekomt.
 indianLand.text=Dit land is in bezit van de %player%. Wat wilt u doen:
+# Fuzzy
 indianLand.unknown=Een aantal onbekende mensen wonen in dit land. Zou u graag:
 info.autodetectLanguageSelected=U hebt gekozen voor het automatisch detecteren van de taal. Dit gebeurt de eerstvolgende keer dat u het spel start.
 info.enterSomeText=Vul tekst in.
@@ -2320,7 +2356,9 @@ defeated.text=U bent verslagen! Wat wilt u doen:
 defeated.yes=Blijf kijken
 defeatedSinglePlayer.text=U bent verslagen!
 defeatedSinglePlayer.yes=Start de wraak
+# Fuzzy
 diplomacy.offerAccepted=De natie %nation% heeft uw vrijgevige aanbod geaccepteerd.
+# Fuzzy
 diplomacy.offerRejected=The natie %nation% heeft uw vrijgevige aanbod afgewezen.
 disbandUnit.text=Weet u zeker dat u deze eenheid wilt opheffen?
 disbandUnit.yes=Opheffen
@@ -2365,7 +2403,9 @@ move.noAccessContact=We moeten eerst contact maken met de %nation%, Excellentie.
 move.noAccessGoods=De %nation% zal geen handel drijven met een lege %unit%.
 move.noAccessSettlement=De %nation% laten onze %unit% hun nederzetting niet binnen.
 move.noAccessSkill=Onze %unit% kan  niets leren van de inheemse bevolking.
+# Fuzzy
 move.noAccessTrade=We heben geen volmacht handel te drijven met andere Europeanen zoals de %nation%.
+# Fuzzy
 move.noAccessWar=We kunnen geen handel drijven met de %nation% als we in oorlog zijn.
 move.noAccessWater=Onze %unit% moet eerst aan land komen voor die de nederzetting binnen kan treden.
 move.noAttackWater=Onze eenheid %unit% moet landen voordat deze kan aanvallen.
@@ -2426,6 +2466,7 @@ server.timeOut=Verbinden met de server duurde te lang.
 server.userNameInUse=De opgegeven gebruikersnaam is al in gebruik.
 server.userNameNotPresent=De opgegeven gebruikersnaam is niet bekend in dit spel.
 server.wrongFreeColVersion=De client- en serverversies van Freecol verschillen.
+# Fuzzy
 buildColony.others=De %nation% hebben de nieuwe kolonie %colony% gesticht in %region%.
 cashInTreasureTrain.colonial=Een schat ter waarde van %amount% goud is in Europa aangekomen. Er is %cashInAmount% goud voor ontvangen.
 cashInTreasureTrain.independent=Er is een schat van %amount% toegevoegd aan de nationale schatkist.
@@ -2529,6 +2570,7 @@ colopedia.unit.offensivePower=Aanvalskracht:
 colopedia.unit.price=Prijs in Europa:
 colopedia.unit.productionBonus=productie{{plural:%number%|one=modifier|other=modifiers}}:
 colopedia.unit.requirements=Vereisten:
+# Fuzzy
 colopedia.unit.school=School nodig voor training:
 colopedia.unit.skill=Niveau:
 report.labour.allColonists=Alle kolonisten
@@ -2561,11 +2603,10 @@ report.colony.exploring.description=%colony% heeft baat bijhet verkennen van {{p
 report.colony.grow.description=Aantal eenheden dat de kolonie kan groeien zonder nadelige gevolgen voor productie
 report.colony.grow.header=+
 report.colony.growing.description=%colony% kan nog groeien met {{plural:%amount%|one=één eenheid|other=%amount% eenheden}} zonder nadelige gevolgen voor de productie
-# Fuzzy
-report.colony.improve.description=Eenheden die meer kunnen produceren dan de eenheid die op dit moment het werk uitvoert
+report.colony.improve.description=Eenheden die de productie kunnen verbeteren.
 report.colony.improve.header=Verbeteren
+# Fuzzy
 report.colony.improving.description=%colony%: vervang de %oldUnit% door %unit% om %amount% meer %goods% te maken
-report.colony.wanting.description=%colony%: voeg een %unit% toe om %amount% meer %goods% te maken
 report.colony.making.blocking.description=%colony%: er is %amount% %goods% nodig voor %buildable% {{plural:%turns%|one=in de volgende beurt|other=over %turns% beurten}}
 report.colony.making.constructing.description=%colony%: %buildable% is {{plural:%turns%|one=de volgende beurt|other=over %turns% beurten}} af
 report.colony.making.description=Wat maakt deze kolonie
@@ -2575,20 +2616,21 @@ report.colony.making.noconstruction.description=%colony%: Er vindt geen nieuwbou
 report.colony.making.noteach.description=%colony%: %teacher% heeft geen leerling
 report.colony.name.description=De lijst met kolonies
 report.colony.name.header=Kolonie
-report.colony.plow.description=Aantal kolonietegels dat baat zou hebben bij ploegen
-report.colony.plow.header=P
-report.colony.plowing.description=%colony% heeft baat bij het ploegen van {{plural:%amount%|one=een tegel|other=%amount% tegels}}
+# Fuzzy
 report.colony.production.description=%colony%: netto %goods% productie = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: netto %goods% productie is %amount% (er wordt geëxporteerd boven %export%)
 report.colony.production.header=Netto productie van %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: netto %goods% productie = %amount%, vol {{plural:%turns%|one=in de volgende beurt|other=over %turns% beurten}}
+# Fuzzy
 report.colony.production.low.description=%colony%: netto %goods% productie = %amount%, op {{plural:%turns%|one=in volgende beurt|other=over %turns% beurten}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: netto %goods% productie = %amount%, het pakhuis knalt uit zijn voegen, er gaat %waste% verloren
-report.colony.road.description=Aantal kolonietegels dat baat heeft bij het bouwen van wegen
-report.colony.road.header=W
-report.colony.roadBuilding.description=%colony% heeft baat bij het verkennen van {{plural:%amount%|one=een tegel|other=%amount% tegels}}
 report.colony.shrinking.description=%colony% moet krimpen met {{plural:%amount%|one=één eenheid|other=%amount% eenheden}} om de productie te verbeteren
 report.colony.starving.description=%colony%: {{plural:%turns%|one=volgende beurt|other=over %turns% beurten}} uitgehongerd
+# Fuzzy
+report.colony.wanting.description=%colony%: voeg een %unit% toe om %amount% meer %goods% te maken
 report.continentalCongress.elected=Gekozen: %turn%
 report.continentalCongress.none=(geen)
 report.continentalCongress.recruiting=Trainen
@@ -2630,26 +2672,25 @@ report.production.selectGoods=Goederen selecteren
 report.production.update=Bijwerken
 report.requirements.badAssignment=%colony% heeft een %expert% die op het moment werkt als %expertWork%, terwijl een %nonExpert% werkt als %nonExpertWork%. De productie wordt hoger als de kolonisten van baan ruilen.
 report.requirements.canTrainExperts={{plural:2|%unit%}} kunnen opgeleid worden bij
-report.requirements.clearTile=%type% in het %direction% van %colony% heeft baat bij kaalslag.
+# Fuzzy
 report.requirements.exploreTile=%type% in het %direction% van %colony% heeft baat bij verkenning.
 report.requirements.met=Alle voorwaarden zijn ingevuld.
 report.requirements.missingGoods=%colony% produceert %goods%, maar kan meer %input% gebruiken.
 report.requirements.misusedExperts=Er zijn {{plural:2|%unit%}} niet aan het werk als %work% bij
 report.requirements.noExpert=%colony% produceert %goods%, maar heeft geen %unit%.
-report.requirements.plowCenter=%colony% heeft baat bij het omploegen van de tegel.
-report.requirements.plowTile=%type% in het %direction% van %colony% heeft baat bij omploegen.
-report.requirements.roadTile=%type% in het %direction% van %colony% heeft baat bij het bouwen van een weg.
 report.requirements.severalExperts=Er zijn meerdere {{plural:2|%unit%}} aanwezig bij
 report.requirements.surplus=Er wordt een overschot %goods% geproduceerd bij
 report.trade.afterTaxes=Inkomsten na belasting
 report.trade.beforeTaxes=Inkomsten voor belasting
 report.trade.cargoUnits=Eenheden in vracht
+# Fuzzy
 report.trade.hasCustomHouse=* Deze kolonie heeft een handelshuis; deze goederen worden geëxporteerd.
 report.trade.totalDelta=Totale productie
 report.trade.totalUnits=Aantal eenheden
 report.trade.unitsSold=Eenheden gekocht of verkocht
 report.turn.filter=Laat dit type bericht (%type%) niet meer zien
 report.turn.ignore=Negeer dit bericht (Kolonie: %colony%, Goederen: %goods%)
+# Fuzzy
 report.turn.playerNation=%player%'s %nation%
 aboutPanel.copyright=Copyright (C) 2002-2015 Het FreeCol-team
 aboutPanel.legalDisclaimer=FreeCol is vrije software: u kunt het herdistribueren en/of aanpassen volgens de voorwaarden van de GNU General Public License zoals gepubliceerd door de Free Software Foundation, versie 2 van de Licentie, of enige latere versie.
@@ -2675,6 +2716,7 @@ colonyPanel.buildQueue=Wachtrij bouwen
 colonyPanel.colonyUnits=Kolonieeenheden
 colonyPanel.inPort=In de haven
 colonyPanel.outsideColony=Buiten kolonie
+# Fuzzy
 colonyPanel.producing=Produceert:
 colonyPanel.reducePopulation=Als u de bevolking tot onder %number% laat slinken, dan is %colony% niet langer in staat een %buildable% te bouwen.
 colonyPanel.unitChange=Bij het betreden van uw kolonie is uw %oldType% een %newType% geworden.
@@ -2688,7 +2730,9 @@ confirmDeclarationDialog.areYouSure.no=Misschien een andere keer
 confirmDeclarationDialog.areYouSure.text=Laat ons de onrechtvaardige tirannie van %monarch% afwijzen en laat ons de onafhankelijkheid van onze kolonies van de kroon verklaren!
 confirmDeclarationDialog.areYouSure.yes=Vrijheid of de dood!
 confirmDeclarationDialog.createFlag=en onze vijanden zullen sidderen bij de aanblik van onze uitdagende banier.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Verenigde Staten van %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Vrije %nation%
 confirmDeclarationDialog.enterCountry=Voortaan staat ons land bekend als
 confirmDeclarationDialog.enterNation=en elke burger van ons glorierijke land zal trots zijn om bekend te staan als
@@ -2738,8 +2782,10 @@ negotiationDialog.add=Toevoegen
 negotiationDialog.cancel=Annuleren
 negotiationDialog.clear=Wissen
 negotiationDialog.contact.tutorial=U komt mede-Europeanen tegen. Zij wedijveren met u om land en rijkdommen, en voeren mogelijk zelfs oorlog met u. Maar nadat Jan de Witt is toegetreden tot het Continentale Congres, kunt u handel met ze drijven.
+# Fuzzy
 negotiationDialog.demand=De %nation% eisen van de %otherNation%
 negotiationDialog.exchange=in ruil voor
+# Fuzzy
 negotiationDialog.offer=De %nation% bieden de %otherNation% aan
 negotiationDialog.send=Verzenden
 negotiationDialog.title.contact=Kennis maken met mede-Europeanen
@@ -2762,10 +2808,9 @@ findSettlementPanel.displayAll=Alle nederzettingen vinden
 findSettlementPanel.displayOnlyEuropean=Alleen Europese nederzettingen vinden
 findSettlementPanel.displayOnlyNatives=Alleen inheemse nederzettingen vinden
 findSettlementPanel.name=Nederzetting zoeken
+# Fuzzy
 firstContactDialog.meeting.natives=Ontmoetingen met de inheemsen...
 firstContactDialog.meeting.natives.tutorial=U ontmoet de inheemse bevolking. Stuur uw verkenners naar hun nederzettingen om meer over ze te leren en stuur ook uw bedienden en vrije kolonisten zodat ze meer over hun kunnen leren. Stuur uw schepen en huifkarren als u handel met ze wil drijven.
-firstContactDialog.meeting.AZTEC=De Azteekse natie...
-firstContactDialog.meeting.INCA=Het Inca koningkijk...
 firstContactDialog.welcomeOffer.text=De %nation% verwelkomen u. Wij zijn de glorieuze natie van %camps% %settlementType%. Om onze vriendschap te vieren, bieden wij het land dat u nu bezet aan als gift. Accepteert u ons voorstel en leeft u met ons samen als broeders?
 firstContactDialog.welcomeSimple.text=De %nation% verwelkomen u. Wij zijn de glorieuze natie van %camps% %settlementType%. Accepteert u ons voorstel en leeft u met ons samen als broeders?
 abandonColony.no=Annuleren
diff --git a/data/strings/FreeColMessages_nl_BE.properties b/data/strings/FreeColMessages_nl_BE.properties
index 24ed6a7cf..d7af86364 100644
--- a/data/strings/FreeColMessages_nl_BE.properties
+++ b/data/strings/FreeColMessages_nl_BE.properties
@@ -231,7 +231,6 @@ colopediaAction.goods.name=Goederen
 colopediaAction.nations.name=Naties
 colopediaAction.nationTypes.name=Nationale Voordelen
 colopediaAction.resources.name=Bonusmiddelen
-colopediaAction.skills.name=Vaardigheden
 colopediaAction.terrain.name=Tereintypes
 colopediaAction.units.name=Eenheden
 debugAction.name=Debug modus in/uitschakelen
@@ -1293,6 +1292,7 @@ model.building.locationLabel=In %location%
 model.colony.badGovernment=Het beleid in %colony% is inefficiënt. De productie lijdt hieronder.
 model.colony.governmentImproved1=Het beleid in %colony% is verbeterd, maar nog altijd on-efficiënt. De productie leidt nog steeds.
 model.colony.governmentImproved2=Het beleid in %colony% is verbeterd. De productie is weer op peil.
+# Fuzzy
 model.colony.insufficientProduction=Er zouden %outputAmount% extra %outputType% geproduceerd kunnen worden in %colony%, als we maar %inputAmount% extra %inputType% hadden.
 model.colony.minimumColonySize=%object% verhindert dat de populatie nog verkleint.
 model.colony.unbuildable=%colony% kan nu geen %object% bouwen. %object% is verwijderd uit de bouwplannen.
@@ -1306,19 +1306,27 @@ model.direction.SW.name=Zuidwest
 model.direction.W.name=West
 model.direction.NW.name=Noordwest
 model.historyEventType.abandonColony.description=Je verlaat de kolonie %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Je ontdekt %city%, één van de Zeven Steden van Goud, en een schat ter waarde van %treasure% goudstukken.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Je kolonie %colony% is veroverd door de %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Je kolonie %colony% is vernietigd door de %nation%.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Je vernielt %settlement%, een nederzetting van de %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Je vernietigd de %nation%.
 model.historyEventType.discoverNewWorld.description=Je ontdekt de Nieuwe Wereld.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Je ontdekt %region%.
 model.historyEventType.foundColony.description=Je legt de basis van de kolonie %colony%.
 model.historyEventType.foundingFather.description=%father% zetelt vanaf nu in het Continentaal Congres.
 model.historyEventType.independence.description=Je bereikt onafhankelijkheid van de Kroon.
+# Fuzzy
 model.historyEventType.meetNation.description=Je ontmoet de %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=De %nation% zijn vernietigd.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=De %loserNation% staan al hun koloniën in de Nieuwe Wereld af aan de %nation%.
 model.indianSettlement.mostHatedNone=Geen
 model.indianSettlement.nameUnknown=Onbekend
@@ -1369,6 +1377,7 @@ model.nationState.notAvailable.name=niet beschikbaar
 model.player.forces=%nation% troepen
 model.player.independentMarket=Europa
 model.player.startGame=Na maanden op zee heb je eindelijk de kust van een onbekend continent bereikt. Zeil {{tag:%direction%|west=westwaards|east=oostwaards|default=met de wind mee}} om zo de nieuwe wereld te ontdekken en het op te vorderen voor de kroon.
+# Fuzzy
 model.player.waitingFor=Wachten op: %nation%
 model.regionType.coast.name=Kust
 model.regionType.coast.unknown=Onbekend Kustgebied
@@ -1423,9 +1432,9 @@ model.unit.underRepair=In herstelling (nog %turns% {{plural:%turns%|one=beurt|ot
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1449,23 +1458,29 @@ model.colony.warehouseOverfull=Je magazijn in %colony% heeft zijn capaciteit voo
 model.colony.warehouseSoonFull=Je magazijn in %colony% zal zijn capaciteit van %goods% overschreiden gedurende de volgende ronde. %amount% eenheden %goods% zullen verspild worden.
 model.colony.warehouseWaste=Je magazijn in %colony% heeft zijn capaciteit voor %goods% overschreden. %waste% eenheden zijn verspild.
 model.colonyTile.resourceExhausted=Grondstof %resource% is opgebruikt in %colony%
+# Fuzzy
 model.game.spanishSuccession=Excellentie, de Spaanse Opvolgingsoorlog is beëindigd in Europa.  In het Verdrag van Utrecht werden de %loserNation% gedwongen al hun koloniën in de Nieuwe Wereld af te staan aan de %nation%!
 model.indianSettlement.mission.denounced=Je missionaris in %settlement% is verworpen en geëxecuteerd!
 model.player.colonyGoodsParty.harbour=Je kolonisten in %colony% hebben %amount% eenheden %goods% in de dokken gegooid uit protest tegen de oneerlijke uitbuiting door de Kroon!
 model.player.colonyGoodsParty.horses=Je kolonisten in %colony% hebben %amount% paarden vrijgeladen als protest voor deze oneerlijke belasting door de Kroon!
 model.player.colonyGoodsParty.landLocked=Je kolonisten in %colony% hebben %amount% eenheden %goods% verbrand op het marktplein uit protest tegen de oneerlijke uitbuiting door de Kroon!
+# Fuzzy
 model.player.dead.european=Excellentie, de %nation% hebben een onconditionele aftocht uit de Nieuwe Wereld afgekondigd!
 model.player.dead.native=Excellentie, de %nation% zijn vernietigd.
 model.player.emigrate=In %europe% heeft een %unit% beslist te emigreren.
 model.player.foundingFatherJoinedCongress=%foundingFather% zetelt in het Congres!\n\n%description%
 model.player.soLDecrease=Lidmaatschap van de Vrijheidsbeweging in je kolonie is gedaald tot %newSoL% percent!
 model.player.soLIncrease=Lidmaatschap van de Vrijheidsbeweging in je kolonie is gestegen tot %newSoL% percent!
+# Fuzzy
 model.player.stance.alliance.declared=Uwe Excellentie, de %nation% sluiten een bondgenoodschap met ons!
 model.player.stance.alliance.others=Uwe Excellentie, de %attacker% sluiten een bondgenoodschap met de %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Excellentie, de %nation% gaan akkoord met een staakt het vuren met ons!
 model.player.stance.ceaseFire.others=Hoogheid, de %attacker% gaan akkoord met een staakt het vuren met de %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Uwe Hoogheid, de %nation% sluiten vrede met ons!
 model.player.stance.peace.others=Uwe Hoogheid, de %attacker% sluiten vrede met de %defender%.
+# Fuzzy
 model.player.stance.war.declared=Slecht nieuws, Excellentie, de %nation% hebben ons de oorlog verklaart!
 model.player.stance.war.others=Excellentie, de %attacker% hebben de oorlog verklaard aan de %defender%.
 combat.automaticDefence=Je %unit% in %colony% heeft de wapens opgenomen om de kolonie te verdedigen!
@@ -1480,6 +1495,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% heeft een aanval van %unit% ont
 combat.enemyShipSunk=%unit% heeft %enemyNation% %enemyUnit% gekelderd!
 combat.equipmentCaptured=Opgepast, de krijgers van de %nation% hebben %equipment% vergaard!
 combat.goodsStolen=Een %enemyUnit% van %enemyNation% steelt %amount% %goods% in %colony%!
+# Fuzzy
 combat.indianPlunder=Een %enemyUnit% van %enemyNation% plundert %amount% in %colony%.
 combat.indianTreasure=Je rooft %amount% in %settlement%.
 combat.nativeCapitalBurned=Je hebt %name%, de hoofdstad van de %nation%, platgebrand. De %nation% geven zich over aan jou genade!
@@ -1529,6 +1545,7 @@ main.defaultPlayerName=Spelernaam
 main.javaVersion=Java versie %minVersion% of better is aangeraden om FreeCol uit te voeren.\n(%version% gedetecteerd, gebruikt --no-java-check om deze controle over te slaan).
 main.memory=Je moet meer dan %memory% bytes of geheugen voor JVM toe te wijzen.\n  Herstart FreeCol met:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol kan geen geschikte directorie vinden om de gebruikers gegevens op te slaan.  Wordt uitgevooerd, maar verwacht problemen.
+# Fuzzy
 client.choicePlayer=Kies een speler:
 metaServer.couldNotConnect=Sorry, kan geen verbinding maken met de meta-server. Probeer later opnieuw.
 metaServer.communicationError=Er was een communicatie-fout met de meta-server. Probeer later opnieuw.
@@ -1538,8 +1555,11 @@ buy.moreGold=Een lagere prijs vragen
 buy.takeOffer=Het bod aanvaarden
 buy.text=De %nation% willen hun %goods% verkopen voor %gold%:
 clearTradeRoute.text=Je %unit% is toegewezen aan handelsroute %route%.  Door een nieuwe bestemming te geven zal hij de handelsroute verlaten.  Ben je zeker dat je dat wil doen ?
+# Fuzzy
 confirmHostile.alliance=Je kan geen bondgenoot aanvallen! Wens je echt je bondgenootschap met de %nation% te verbreken en hen de oorlog te verklaren?
+# Fuzzy
 confirmHostile.ceaseFire=Je hebt een staakt het vuren ondertekend met %nation%. Wil je echt aanvallen?
+# Fuzzy
 confirmHostile.peace=Je leeft in vrede met de %nation%. Wil je hen echt de oorlog verklaren?
 error.noSuchFile=Het opgegeven bestand bestaat niet of is geen normaal bestand.
 # Fuzzy
@@ -1589,7 +1609,9 @@ clearSpeciality.areYouSure=Ben je zeker dat je %oldUnit% wil degraderen tot %uni
 clearSpeciality.impossible=%unit% kan degraderen!
 defeated.text=Je bent verslagen! Wil je:
 defeated.yes=Blijven en toekijken
+# Fuzzy
 diplomacy.offerAccepted=De %nation% aanvaarden je vrijgevig bod.
+# Fuzzy
 diplomacy.offerRejected=De %nation% verwerpen je vrijgevig bod.
 disbandUnit.text=Ben je zeker dat je deze eenheid wil ontslaan ?
 disbandUnit.yes=Achterlaten
@@ -1629,7 +1651,9 @@ move.noAccessBeached=Een gestrand %nation% schip blokkeert ons pad.
 move.noAccessContact=We moeten eerst contact opnemen met de %nation%, Excellentie.
 move.noAccessSettlement=De %nation% laten je %unit% niet toe in hun nederzetting.
 move.noAccessSkill=Onze %unit% kan niets leren van de inboorlingen.
+# Fuzzy
 move.noAccessTrade=We hebben niet de bevoegdheid om te handelen met andere Europese naties zoals de %nation%.
+# Fuzzy
 move.noAccessWar=We kunnen niet handelen met de %nation% terwijl we in oorlog zijn.
 move.noAccessWater=Onze %unit% moeten landen voor ze de nederzetting kunnen betreden.
 nameRegion.text=Je hebt een %type% ontdekt en claimt deze voor de Kroon! Zoals gebruikelijk mag je het naam geven:
@@ -1729,6 +1753,7 @@ colopedia.unit.price=Prijs in Europa:
 # Fuzzy
 colopedia.unit.productionBonus=Productie verbetering(en):
 colopedia.unit.requirements=Vereisten:
+# Fuzzy
 colopedia.unit.school=Een school voor de opleiding van:
 colopedia.unit.skill=Vaardigheid:
 report.labour.allColonists=Alle kolonisten
@@ -1799,12 +1824,14 @@ report.requirements.surplus=De volgende kolonies produceren een overschot aan %g
 report.trade.afterTaxes=Neto inkomst
 report.trade.beforeTaxes=Bruto inkomst
 report.trade.cargoUnits=Eenheden in het Ruim
+# Fuzzy
 report.trade.hasCustomHouse=* Deze kolonie heeft een exporthuis; deze goederen worden geëxporteerd:
 report.trade.totalDelta=Totale Productie
 report.trade.totalUnits=Totaal Aantal
 report.trade.unitsSold=Eenheden gekocht of verkocht
 report.turn.filter=Toon dit type boodschap niet meer (%type%)
 report.turn.ignore=Negeer deze boodschap (Kolonie: %colony%, Goederen: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% van %player%
 # Fuzzy
 aboutPanel.copyright=Auteursrechten (C) 2002-2013  Het FreeCol Team
@@ -1829,6 +1856,7 @@ chooseFoundingFatherDialog.title=Benoem Stichter
 colonyPanel.colonyUnits=Kolonie eenheden
 colonyPanel.inPort=In de haven
 colonyPanel.outsideColony=Buiten de kolonie
+# Fuzzy
 colonyPanel.producing=Produceerd
 colonyPanel.reducePopulation=Als je de bevolking verminderd tot onder %number% zal %colony% niet meer in staat zijn een %buildable% te bouwen.
 colonyPanel.bonusLabel=Bonus: %number%%extra%
@@ -1839,7 +1867,9 @@ colonyPanel.notBestTile=%unit% zou meer %goods% kunnen produceren op %tile%.
 confirmDeclarationDialog.areYouSure.no=Misschien later
 confirmDeclarationDialog.areYouSure.text=Laat ons de onrechtmatige tirannie van %monarch% afgooien en de onafhankelijkheid van onze kolonies ten opzichte van de kroon uitroepen!
 confirmDeclarationDialog.areYouSure.yes=Vrijheid of de Dood!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Verenigde Staten van %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=De Vrije %nation%
 confirmDeclarationDialog.enterCountry=Voortaan zal onze kolonie gekend zijn als
 confirmDeclarationDialog.enterNation=en elke burger van onze glorieuze natie zal met trots gekend zijn als
diff --git a/data/strings/FreeColMessages_oc.properties b/data/strings/FreeColMessages_oc.properties
index 56bbcf7d5..b97359caa 100644
--- a/data/strings/FreeColMessages_oc.properties
+++ b/data/strings/FreeColMessages_oc.properties
@@ -261,7 +261,6 @@ colopediaAction.goods.name=Merças
 colopediaAction.nations.name=Nacions
 colopediaAction.nationTypes.name=Atots nacionals
 colopediaAction.resources.name=Bonus de ressorsas
-colopediaAction.skills.name=Mestièrs
 colopediaAction.terrain.name=Terrenhs
 colopediaAction.units.name=Unitats
 colopediaAction.name=%object% (Colopèdia)
@@ -1704,18 +1703,24 @@ model.building.locationLabel=a %location%
 model.colony.badGovernment=Lo Govèrn de %colony% es ineficaç. De penalitats son aplicadas sus la produccion.
 model.colony.governmentImproved1=Lo Govèrn de %colony% s'es melhorat mas demòra ineficaç. Las penalitats contunhan de s'aplicar sus la produccion.
 model.colony.governmentImproved2=Lo Govèrn de %colony% s'es melhorat. Las penalitats sus la produccion s'aplican pas pus.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% %outputType% de mai s'aurián pogut produire per la %colony%, se solament aviam agut %inputAmount% %inputType% de mai.
 model.colony.minimumColonySize=%object% empacha de redusir la populacion encara mai.
 model.colony.unbuildable=%colony% pòt pas construite %object% actualament. %object% es estat levat de la fila d’espèra de construccion.
 model.colony.veryBadGovernment=Lo Govèrn de %colony% es fòrça ineficaç. De penalitats fòrtas son aplicadas sus la produccion.
 model.colonyTile.claim=(%direction% de la demanda)
 model.diplomaticTrade.receive.contact=Salutacions frairalas de la part de la gloriosa nacion %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Negociacions amb los %nation%.
 model.diplomaticTrade.receive.trade=Prenèm en consideracion l’ofèrta comerciala dels %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=Los %nation% nos demandan un tribut !
 model.diplomaticTrade.send.contact=Avèm rencontrat de membres de la nacion %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Consideram nòstra situacion diplomatica amb los %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Prepausam un comèrci amb los %nation% a %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Demandam un tribut dels %nation% a %settlement%.
 model.direction.N.name=nòrd
 model.direction.NE.name=nòrd-èst
@@ -1726,22 +1731,33 @@ model.direction.SW.name=sud-èst
 model.direction.W.name=oèst
 model.direction.NW.name=nòrd-oèst
 model.historyEventType.abandonColony.description=Abandonatz la colonia de %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=La %nation% descobrís %city%, una de las sèt ciutats d’aur, e un tresaur de %treasure% d’aur.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Vòstra colonia %colony% es conquistada pels %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Vòstra colonia %colony% es destrucha pels %nation%.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Destruisètz lo campament %settlement% dels %nation%.
+# Fuzzy
 model.historyEventType.declareWar.description=La guèrra es estada declarada amb %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Lo %nation% a destruch los %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Descobrètz lo Novèl Monde.
+# Fuzzy
 model.historyEventType.discoverRegion.description=La %nation% descobrís %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Un acòrd d'aligança es estat signat amb %nation%.
 model.historyEventType.foundColony.description=Establissètz la colonia de %colony%.
 model.historyEventType.foundingFather.description=%father% rejonh lo Congrès Continental.
 model.historyEventType.independence.description=Avètz efectuat l'independéncia a la corona.
+# Fuzzy
 model.historyEventType.makePeace.description=Un acòrd de patz es estat signat amb %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Rencontratz los %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=La %nation% es pas mai presenta dins lo Novèl Mond.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Los %loserNation% cedisson l’ensemble de lors colonias dins lo Monde Novèl als %nation%.
 model.indianSettlement.mostHatedNone=Pas cap
 model.indianSettlement.mostHatedUnknown=Desconegut
@@ -1784,8 +1800,10 @@ model.messageType.unitLost.name=Pèrdas d'unitats
 model.messageType.warehouseCapacity.name=Capacitat dels entrepauses
 model.messageType.warning.name=Alèrtas
 model.monarch.action.addToRef.no=Fach
+# Fuzzy
 model.monarch.action.declarePeace.text=Avèm acceptat graciosament un tractat de patz amb los %nation%.
 model.monarch.action.declarePeace.no=Fach
+# Fuzzy
 model.monarch.action.declareWar.text=L'insoléncia de las fòrças de %nation% nos obliga a lor declarar la guèrra !
 model.monarch.action.declareWar.no=Fach
 # Fuzzy
@@ -1832,6 +1850,7 @@ model.noClaimReason.worked.description=Un autre vilatge utiliza ja aqueste terri
 model.player.forces=Fòrças de %nation%
 model.player.independentMarket=Euròpa
 model.player.startGame=Aprèp de meses a vogar sus l'ocean, arribatz enfin al larg de las còstas d'un continent desconegut. Fasètz vela cap a {{tag:%direction%|west=l'oèst|east=l'èst|default=jol vent}} per descobrir lo Mond Novèl e lo reïvindicar al nom de la Corona.
+# Fuzzy
 model.player.waitingFor=Los %nation% acaban lor torn.
 model.regionType.coast.name=Còsta
 model.regionType.coast.unknown=Region costièra desconeguda
@@ -1871,6 +1890,7 @@ model.tradeItem.gold.name=Aur
 model.tradeItem.gold.description=la soma de %amount% aur
 model.tradeItem.goods.name=Merças
 model.tradeItem.incite.name=Declarar la guèrra a
+# Fuzzy
 model.tradeItem.incite.description=guèrra contra los %nation%
 model.tradeItem.stance.name=Relacions
 model.tradeItem.unit.name=Unitat
@@ -1890,9 +1910,9 @@ model.unit.underRepair=Reparacion (%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1931,6 +1951,7 @@ model.colony.warehouseOverfull=Vòstre entrepaus de %colony% a atench sa capacit
 model.colony.warehouseSoonFull=Vòstre entrepaus de %colony% va excedir sa capacitat de %goods% al torn que ven. %amount% unitats de %goods% van èsser degalhadas.
 model.colony.warehouseWaste=Vòstre entrepaus de %colony% a depassat sa capacitat en %goods%. %waste% unitats son estadas destruchas.
 model.colonyTile.resourceExhausted=Ressorsa %resource% agotada a %colony%
+# Fuzzy
 model.game.spanishSuccession=Vòtre excelléncia, la guèrra de succession d'Espanha s'es acabada en Euròpa. Dins lo tractat d'Utrecht, los %loserNation% son estats obligats de cedir totas lors colonias dins lo Mond Novèl als %nation% !
 model.indianSettlement.mission.denounced=Vòstre missionari a %settlement% es estat denonciat e executat !
 model.indianSettlement.mission.destroyed=Vòstre missionari a %settlement% es mòrt dins la destruccion d'aqueste campament.
@@ -1938,6 +1959,7 @@ model.player.autoRecruit=Lo trebolum religiós en %europe% butan %unit% a emigra
 model.player.colonyGoodsParty.harbour=Los colons de %colony% an getat %amount% unitats de %goods% dins lo pòrt, en signe de protestacion contra las taxas impausadas per la Corona.
 model.player.colonyGoodsParty.horses=Vòstres colons a %colony% an liberat %amount% cavals en protestacion contra los impòstets injustes impausats per la corona!
 model.player.colonyGoodsParty.landLocked=Los colons de %colony% an brutlat %amount% unitats de %goods% sus la plaça del mercat, en signe de protestacion contra las taxas impausadas per la Corona.
+# Fuzzy
 model.player.dead.european=Vòstra excelléncia, los %nation% an declarat un retirament incondicional dels afars del Novèl Mond !
 model.player.dead.native=Vòstra Excelléncia, los %nation% son estats destruches.
 model.player.disaster.effect.colonyDestroyed=%colony% es estat destruch completament.
@@ -1947,12 +1969,16 @@ model.player.foundingFatherJoinedCongress=%foundingFather% a rejunt lo Congrès!
 model.player.interventionForceArrives=La Fòrça d'intervencion promesa arriba !
 model.player.soLDecrease=L'apartenéncia als Filhs de Libertat dins vòstras colonias es tombada a %newSoL% %.
 model.player.soLIncrease=L'apartenéncia als Filhs de Libertat dins vòstras colonias es montada a %newSoL% %.
+# Fuzzy
 model.player.stance.alliance.declared=Vòstra excelléncia, %nation% es aligada amb nosautres !
 model.player.stance.alliance.others=Vòstra excelléncia, %attacker% es aligada amb %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Vòstra Excellénciz, los %nation% an convengut d'un cessatz-lo-fuòc amb nosautres !
 model.player.stance.ceaseFire.others=Vòstra Excelléncia, los %attacker% an convengut d'un cessatz-lo-fuòc amb los %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Vòstra Excelléncia, los %nation% son en patz amb nosautres !
 model.player.stance.peace.others=Vòstra Excelléncia, los %attacker% son en patz amb los %defender%.
+# Fuzzy
 model.player.stance.war.declared=Marrida novèla, Excelléncia, los %nation% nos an declarat la guèrra !
 model.player.stance.war.others=Excelléncia, los %attacker% an declarat la guèrra als %defender%.
 combat.automaticDefence=Vòstra %unit% a %colony% a pres las armas per defendre la colonia !
@@ -1967,6 +1993,7 @@ combat.enemyShipEvaded=Un(a) %enemyUnit% dels %enemyNation% a escapat a un atac
 combat.enemyShipSunk=Vòstra %unit% a colat un(a) %enemyUnit% dels %enemyNation%!
 combat.equipmentCaptured=Mèfi, los braves %nation% an aqués de %equipment% !
 combat.goodsStolen=Un(a) %enemyUnit% dels %enemyNation% pana %amount% %goods% a %colony% !
+# Fuzzy
 combat.indianPlunder=Un(a) %enemyUnit% del %enemyNation% a pilhat %amount% de %colony%.
 combat.indianTreasure=Sasissètz %amount% dins lo campament %settlement%.
 combat.nativeCapitalBurned=Avètz brutlat %name%, la capitala de %nation%. %nation% es remesa a vòstre poder !
@@ -2017,6 +2044,7 @@ main.defaultPlayerName=Nom del jogaire
 main.javaVersion=La version %minVersion% de Java o melhor es recomandada per far foncionar FreeCol\n(%version% detectat, utilizatz --no-java-check per sautar aquesta verificacion).
 main.memory=Vos cal assignar mai de %memory% octets de memòria a la JVM.\n  Reaviatz FreeCol amb :  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol pòt pas trobar cap de repertòris apropriats per enregistrar las donadas d'utilizaire. Execucion en cors, mas benlèu qu'i aurà de problèmas.
+# Fuzzy
 client.choicePlayer=Causissètz un jogaire :
 client.classic=Fracàs al cargament de la cartografia de las donadas dempuèi lo jòc de règlas 'classic'.
 client.ending=La partida es acabada.
@@ -2027,8 +2055,10 @@ metaServer.couldNotConnect=O planhèm, es impossible de se connectar al metaserv
 metaServer.communicationError=Error durant la comunicacion amb lo metaservidor. Ensajatz tornamai ulteriorament.
 abandonEducation.action.studying=estudiant
 abandonEducation.action.teaching=ensenhament
+# Fuzzy
 abandonEducation.no=Non, contunhar la formacion
 abandonEducation.text=Se vòstre  %unit% quita %colony%, abandonarà %action% dins lo %building%; sètz segur que lo li calga daissar ?
+# Fuzzy
 abandonEducation.yes=Òc, quitar la colonia
 abandonTeaching.text=Se vòstre %unit% quita lo %building%, daissarà d’ensenhar; sètz segur que la volètz far partir ?
 armedUnitSettlement.attack=Atacar
@@ -2038,8 +2068,11 @@ boycottedGoods.text=Lo(a) %goods% es jol còp d'un boicotatge reial e pòt pas 
 buy.moreGold=Negociar lo prètz a la baissa
 buy.takeOffer=Acceptar l'ofèrta
 buy.text=Lo %nation% prepausa de vos vendre %goods% per %gold% :
+# Fuzzy
 confirmHostile.alliance=Podètz pas atacar una nacion aligada ! Volètz rompre vòstra aligança amb los %nation% e declarar la guèrra ?
+# Fuzzy
 confirmHostile.ceaseFire=Avètz signat un cessatz-lo-fuòc amb los %nation%. Los volètz vertadièrament atacar ?
+# Fuzzy
 confirmHostile.peace=Sètz en patz amb %nation%. Sètz segur que volètz declarar la guèrra ?
 confirmTribute.no=Benlèu que caldriá evitar
 # Fuzzy
@@ -2101,7 +2134,9 @@ clearSpeciality.impossible=%unit% pòt pas èsser abaissada !
 defeated.text=Sètz estat espotit ! Volètz :
 defeated.yes=Demorar e agachar
 defeatedSinglePlayer.yes=Entrar dins lo mond de la Vengança
+# Fuzzy
 diplomacy.offerAccepted=Lo %nation% a acceptat vòstra ofèrta generosa.
+# Fuzzy
 diplomacy.offerRejected=Lo %nation% a refusat vòstra ofèrta mesquina.
 disbandUnit.text=Sètz segur que volètz dissòlvre aquesta unitat ?
 disbandUnit.yes=suprimir
@@ -2143,7 +2178,9 @@ move.noAccessContact=Nos cal, d’en primièr, entrar en contacte amb los %natio
 move.noAccessGoods=La %nation% comerçarà pas amb un %unit% void.
 move.noAccessSettlement=Los %nation% permeton pas a nòstres %unit% d'entrar dins lor colonia.
 move.noAccessSkill=Nòstres %unit% pòdon pas aprene res dels indigènas.
+# Fuzzy
 move.noAccessTrade=Avèm pas l'autoritat per comerçar amb d'autras nacions europèas coma los %nation%.
+# Fuzzy
 move.noAccessWar=Podèm pas comerçar amb los %nation% quand sèm en guèrra.
 move.noAccessWater=Nòstres %unit% devon acostar abans d'entrar dins la colonia.
 move.noAttackWater=Nòstre %unit% deu aterrir abans d'atacar.
@@ -2204,6 +2241,7 @@ server.timeOut=Temps d'espèra depassat al moment de la connexion amb lo servido
 server.userNameInUse=Lo nom d'utilizaire especificat es ja utilizat.
 server.userNameNotPresent=Lo nom d'utilizaire especificat es pas dins aqueste jòc.
 server.wrongFreeColVersion=Las versions client e servidor de FreeCol concòrdan pas.
+# Fuzzy
 buildColony.others=Los %nation% an fondat la novèla colonia de %colony% dins %region%.
 cashInTreasureTrain.colonial=Un tresaur d'una soma de %amount% aur es estat mandat en Euròpa. %cashInAmount% pèças d'aur vos son estadas balhadas.
 cashInTreasureTrain.independent=Un tresaur de %amount% es estat apondut al tresaur nacional.
@@ -2297,6 +2335,7 @@ colopedia.unit.offensivePower=Potencial ofensiu :
 colopedia.unit.price=Prètz en Euròpa :
 colopedia.unit.productionBonus={{plural:%number%|one=Modificador|other=Modificadors}} de produccion :
 colopedia.unit.requirements=Exigéncias :
+# Fuzzy
 colopedia.unit.school=Establiment de formacion :
 colopedia.unit.skill=Competéncia :
 report.labour.allColonists=Totes los colons
@@ -2328,6 +2367,7 @@ report.colony.explore.header=E
 report.colony.exploring.description=%colony% auriá interès a explorar {{plural:%amount%|one=una casa|other=%amount% casas}}
 report.colony.grow.header=+
 report.colony.improve.header=Melhorar
+# Fuzzy
 report.colony.improving.description=%colony%: Per produsir %amount% de mai de %goods%, remplaçatz %oldUnit% per %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% necessaris per %buildable% {{plural:%turns%|one=al torn que ven|other=dins %turns% torns}}
 report.colony.making.constructing.description=%colony%: %buildable% acabat {{plural:%turns%|one=al torn que ven|other=dins %turns% torns}}
@@ -2338,11 +2378,9 @@ report.colony.making.noconstruction.description=%colony%: Pas de construccion en
 report.colony.making.noteach.description=%colony%: %teacher% a pas cap d'estudiant
 report.colony.name.description=La lista de las colonias
 report.colony.name.header=Colonia
-report.colony.plow.description=Nombre de casas de colonia que beneficiaràn de la Laura
-report.colony.plow.header=P
+# Fuzzy
 report.colony.production.description=%colony%: produccion neta de %goods% = %amount%
 report.colony.production.header=Produccion neta de %goods%
-report.colony.road.header=R
 report.colony.starving.description=%colony%: famina {{plural:%turns%|one=al torn que ven|other=dins %turns% torns}}
 # Fuzzy
 report.continentalCongress.elected=Elegit :
@@ -2388,19 +2426,19 @@ report.requirements.met=Totas las condicions son acampadas.
 report.requirements.missingGoods=%colony% fabrica %goods%, mas a besonh de mai de %input%.
 report.requirements.misusedExperts=I a {{plural:2|%unit%}} que trabalhan pas coma %work% son presentas a
 report.requirements.noExpert=%colony% fabrica %goods%, mas a pas de %unit%.
-report.requirements.plowCenter=%colony% auriá interès a laurar sa casa.
-report.requirements.plowTile=%type% cap a %direction% de %colony% auriá interès a èsser laurat
 report.requirements.severalExperts=Maitas {{plural:2|%unit%}} son presentas a
 report.requirements.surplus=Un susplús de %goods% es produch a
 report.trade.afterTaxes=Sòld aprèp talhas
 report.trade.beforeTaxes=Sòld abans talhas
 report.trade.cargoUnits=Unitats en transit
+# Fuzzy
 report.trade.hasCustomHouse=* Aquesta colonia a una doana ; aquestas merças son exportadas.
 report.trade.totalDelta=Total de la produccion
 report.trade.totalUnits=Total de las unitats
 report.trade.unitsSold=Nb comprat/vendut
 report.turn.filter=Afichar pas aqueste tipe de messatge (%type%)
 report.turn.ignore=Ignorar aqueste messatge (Colonia : %colony% ; merças : %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% de %player%
 aboutPanel.copyright=Copyright © 2002-2015  L’equipa FreeCol
 aboutPanel.legalDisclaimer=FreeCol es un logicial liure ; o podètz tornar distribuir e/o lo modificar al títol de las clausas de la Licéncia Publica Generala GNU, tala coma es publicada per la Free Software Foundation dins sa version 2, o dins una version ulteriora.
@@ -2426,6 +2464,7 @@ chooseFoundingFatherDialog.title=Designatz un paire fondator
 colonyPanel.colonyUnits=Unitats de la Colonia
 colonyPanel.inPort=Al pòrt
 colonyPanel.outsideColony=En defòra de la colonia
+# Fuzzy
 colonyPanel.producing=que produtz
 colonyPanel.reducePopulation=Se reduisètz la populacion a una valor inferiora a %number%, %colony% poirà pas pus produire de %buildable%.
 colonyPanel.setGoods=Ensemble de dequés
@@ -2440,7 +2479,9 @@ colonyPanel.notBestTile=%unit% poiriá produire mai de %goods% sus %tile%.
 confirmDeclarationDialog.areYouSure.no=Benlèu mai tard....
 confirmDeclarationDialog.areYouSure.text=Permetètz-nos de nos afranquir de la tirania injusta de %monarch% e de declarar l'independéncia de nòstras colonias de la corona !
 confirmDeclarationDialog.areYouSure.yes=Viure liure o Morir !
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Estats Units de %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% liura
 confirmDeclarationDialog.enterCountry=D'ara enlà, nòstre país deu èsser conegut coma
 confirmDeclarationDialog.enterNation=e cada ciutadan de nòstra nacion gloriosa deu èsser fièr d'èsser conegut coma
@@ -2489,8 +2530,10 @@ negotiationDialog.add=Apondre
 negotiationDialog.cancel=Anullar
 negotiationDialog.clear=Netejar
 negotiationDialog.contact.tutorial=Rencontratz d'amics europèus. Seràn en competicion amb vos per las tèrras e las riquesas, e atal, pòdon menar una guèrra contra vos. Mas aprèp que Jan de Witt a rejonch lo Congrès continental, poiretz comerçar amb eles.
+# Fuzzy
 negotiationDialog.demand=Lo %nation% exigís de %otherNation%
 negotiationDialog.exchange=en escambi de
+# Fuzzy
 negotiationDialog.offer=Lo %nation% ofrís %otherNation%
 negotiationDialog.send=Mandar
 negotiationDialog.title.contact=Rencontre d'autres europèus.
@@ -2513,9 +2556,8 @@ findSettlementPanel.displayAll=Trobar totes los campaments
 findSettlementPanel.displayOnlyEuropean=Trobar unicament los campaments europèus
 findSettlementPanel.displayOnlyNatives=Trobar unicament los campaments indigènas
 findSettlementPanel.name=Trobar un campament
+# Fuzzy
 firstContactDialog.meeting.natives=Rencontre amb los indigènas. . .
-firstContactDialog.meeting.AZTEC=La nacion Astèca...
-firstContactDialog.meeting.INCA=L'empèri Inca. . .
 abandonColony.no=Anullar
 abandonColony.text=Nos cal vertadièrament abandonar aquesta colonia ?
 abandonColony.yes=Abandonar
diff --git a/data/strings/FreeColMessages_pl_PL.properties b/data/strings/FreeColMessages_pl_PL.properties
index 5264fc0fe..997f8b4ca 100644
--- a/data/strings/FreeColMessages_pl_PL.properties
+++ b/data/strings/FreeColMessages_pl_PL.properties
@@ -273,7 +273,6 @@ colopediaAction.goods.name=Towary
 colopediaAction.nations.name=Narody
 colopediaAction.nationTypes.name=Przewagi narodowe
 colopediaAction.resources.name=Surowce bonusowe
-colopediaAction.skills.name=Umiejętności
 colopediaAction.terrain.name=Rodzaje terenu
 colopediaAction.units.name=Jednostki
 colopediaAction.name=%object% (Colopedia)
@@ -1389,6 +1388,7 @@ model.improvement.road.description=Droga
 model.improvement.road.name=Droga
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Ograniczenie kolonii nadmorskich
+# Fuzzy
 model.limit.independence.coastalColonies.description=Potrzebujesz co najmniej %limit% kolonii nadmorskich, aby ogłosić niepodległość.
 model.limit.independence.rebels.name=Limit buntu
 model.limit.independence.rebels.description=Co najmniej %limit%% kolonistów musi popierać niepodległość.
@@ -1720,6 +1720,7 @@ model.colony.badGovernment=Rządy w %colony% są nieefektywne, co oznacza ograni
 model.colony.goodGovernment=Poprawiła się wydajność rządów! Poparcie dla buntu w %colony% wynosi albo przewyższa teraz %number%%.
 model.colony.governmentImproved1=Rządy w %colony% poprawiły się, ale nie dość, by znieść ograniczenia w produkcji.
 model.colony.governmentImproved2=Dzięki poprawie rządów w %colony% produkcja znów ruszyła pełną parą.
+# Fuzzy
 model.colony.insufficientProduction=Ekscelencjo! W %colony% moglibyśmy wytwarzać %outputAmount% więcej %outputType%, gdybyśmy mogli dostarczyć %inputAmount% sztuk więcej %inputType%.
 model.colony.lostGoodGovernment=Pogorszyła się wydajność rządów! Poparcie dla buntu w %colony% spadło poniżej %number%%. Kolonia traci wszelkie bonusy produkcji.
 model.colony.lostVeryGoodGovernment=Pogorszyła się jakość rządów! Poparcie dla buntu w %colony% spadło poniżej %number%%. Kolonia traci część bonusu produkcyjnego.
@@ -1737,21 +1738,29 @@ model.direction.SW.name=południowy zachód
 model.direction.W.name=zachód
 model.direction.NW.name=północny zachód
 model.historyEventType.abandonColony.description=Opuściłeś osadę: %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Naród %nation% odkrył %city%, jedno z siedmiu miast ze złota, a w nim skarb (%treasure% sztuk złota).
+# Fuzzy
 model.historyEventType.colonyConquered.description=Twoja osada: %colony% została zdobyta. Teraz należy do %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Twoja osada: %colony% została zniszczona przez %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Ośmielasz się akceptować nasze hojne warunki równocześnie unikając opłat? Taka obłuda zbierze gorzką zapłatę naszego niezadowolenia.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Zniszczyłeś osadę %settlement% należącą do %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% niszczy %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Odkryłeś Nowy Świat.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Naród %nation% odkrył %region%.
 model.historyEventType.foundColony.description=Założyłeś kolonię: %colony%.
 model.historyEventType.foundingFather.description=%father% dołączył do Kongresu Kontynetalnego.
 model.historyEventType.independence.description=Uzyskałeś niepodległość!!!
+# Fuzzy
 model.historyEventType.meetNation.description=Spotkałeś inną nację (%nation%).
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Nie ma już %nation% w Nowym Świecie.
+# Fuzzy
 model.historyEventType.spanishSuccession.description={{tag:people|%nation%}} przejmują wszystkie kolonie w nowym świecie, które założyli {{tag:people|%loserNation%}}.
 model.indianSettlement.mostHatedNone=Żadne
 model.indianSettlement.mostHatedUnknown=Nieznane
@@ -1802,8 +1811,10 @@ model.messageType.warehouseCapacity.name=Pojemność magazynów
 model.messageType.warning.name=Ostrzeżenia
 model.monarch.action.addToRef.text=Korona dodała %number% {{plural:%number%|one=jednostkę|few=jednostki|many=jednostek}} %unit% do Królewskiego Korpusu Ekspedycyjnego. Przywódcy kolonialni wyrażają zaniepokojenie.
 model.monarch.action.addToRef.no=Gotowe
+# Fuzzy
 model.monarch.action.declarePeace.text=Wyrażamy łaskawą zgodę na traktat pokojowy z {{tag:people|%nation%}}.
 model.monarch.action.declarePeace.no=Gotowe
+# Fuzzy
 model.monarch.action.declareWar.text={{tag:people|%nation%}} ze swoim zuchwalstwem zmuszają nas do wypowiedzenia im wojny!
 model.monarch.action.declareWar.no=Gotowe
 # Fuzzy
@@ -1853,6 +1864,7 @@ model.noClaimReason.worked.description=Inna osada korzysta już z tej ziemi.
 model.player.forces=Siły narodu %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Po miesiącach żeglugi dotarłeś do wybrzeży nieznanego lądu. Płyń na {{tag:%direction%|west=na zachód|east=na wschód|default=z wiatrem}}, by odkryć Nowy Świat i zdobyć go dla Korony.
+# Fuzzy
 model.player.waitingFor=Czekaj na %nation%
 model.regionType.coast.name=Wybrzeże
 model.regionType.coast.unknown=Nieznane wybrzeże
@@ -1907,9 +1919,9 @@ model.unit.underRepair=Trwa naprawa ({{plural:%turns%|one=pozostała|other=pozos
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1948,6 +1960,7 @@ model.colony.warehouseSoonFull=Twoje magazyny w %colony% zostaną zapełnione %g
 model.colony.warehouseWaste=Magazyny %colony% przepełniły się %goods%. %waste% sztuk zostało zniszczonych.
 model.colony.workersEvicted=W %colony%, twoi osadnicy nie mogą dłużej pracować %location% z powodu obecności %enemyUnit%.
 model.colonyTile.resourceExhausted=W kolonii %colony% wyczerpały się zasoby %resource%
+# Fuzzy
 model.game.spanishSuccession=Ekscelencjo, wojna o hiszpańską sukcesję w Europie zakończyła się. Zawarto pokój utrechcki, na mocy którego {{tag:people|%loserNation%}} skapitulowali, {{tag:people|%nation%}} przejmują we władanie ich wszystkie kolonie!
 model.indianSettlement.mission.denounced=Twój misjonarz w osadzie %settlement% został potępiony i stracony!
 model.indianSettlement.mission.destroyed=Twój misjonarz w osadzie %settlement% zginął.
@@ -1957,6 +1970,7 @@ model.player.autoRecruit=Niepokoje religijne w %europe% skłaniają %unit% do em
 model.player.colonyGoodsParty.harbour=Twoi koloniści w %colony% wyrzucili w proteście przeciwko niesprawiedliwym podatkom nałożonym przez Koronę %amount% sztuk %goods% do zatoki!
 model.player.colonyGoodsParty.horses=Twoi koloniści w %colony% oburzeni niesprawiedliwymi podatkami wypuścili na wolność %amount% hodowane/ych koni/e!
 model.player.colonyGoodsParty.landLocked=Mieszkańcy %colony% w proteście przeciwko niesprawiedliwym podatkom spalili %amount% sztuk %goods% na głównym placu kolonii!
+# Fuzzy
 model.player.dead.european=Ekscelencjo, {{tag:people|%nation%}} ogłosili, że bezwarunkowo wycofują się z Nowego Świata!
 model.player.dead.native={{tag:people|%nation%}} zostali unicestwieni, Ekcelencjo.
 model.player.disaster.bankruptcy.start=Nie uregulowałeś opłat za utrzymanie wszystkich budynków. Podlegasz poważnym karom.
@@ -1968,12 +1982,16 @@ model.player.foundingFatherJoinedCongress=%foundingFather% dołącza do Kongresu
 model.player.interventionForceArrives=Obiecane siły interwencyjne nadciągają!
 model.player.soLDecrease=Poparcie dla niepodległości w twoich koloniach spadło do %newSoL%%!
 model.player.soLIncrease=Poparcie dla niepodległości w twoich koloniach wzrosło do %newSoL%%!
+# Fuzzy
 model.player.stance.alliance.declared=Ekscelencjo, {{tag:people|%nation%}} zawarli z nami sojusz!!!
 model.player.stance.alliance.others=Ekscelencjo, dwaj nasi przeciwnicy (%attacker% i %defender%) zawarli sojusz!!!
+# Fuzzy
 model.player.stance.ceaseFire.declared=Ekscelencjo, {{tag:people|%nation%}} zgodziła się na zawieszenie broni!
 model.player.stance.ceaseFire.others=Ekscelencjo, zawieszono działania wojenne pomiędzy %attacker% oraz %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Ekscelencjo, zawarliśmy porozumienie pokojowe z %nation%!
 model.player.stance.peace.others=Ekscelencjo, zawarto pokój pomiędzy %attacker% i %defender%.
+# Fuzzy
 model.player.stance.war.declared=Ekscelencjo! Jesteśmy w stanie wojny z %nation%!
 model.player.stance.war.others=Ekscelencjo, %attacker% i %defender% są w stanie wojny.
 combat.automaticDefence=%unit% chwycił za broń, by bronić %colony%!
@@ -1989,6 +2007,7 @@ combat.enemyShipEvaded=Okręt %enemyUnit% (%enemyNation%) uniknął ataku ze str
 combat.enemyShipSunk=Nasz okręt %unit% zatopił %enemyUnit% (%enemyNation%)!
 combat.equipmentCaptured=Uważaj, wojownicy narodu {{tag:people|%nation%}} uzyskali dostęp do %equipment%!
 combat.goodsStolen=%amount% %goods% z %colony% zostało skradzione przez %enemyUnit% ({{tag:country|%enemyNation%}})!
+# Fuzzy
 combat.indianPlunder=%amount% z %colony% zostało zrabowane przez %enemyUnit% ({{tag:country|%enemyNation%}}).
 combat.indianRaid=Nasi szpiedzy informują, że %nation% najechali %colonyNation% kolonię %colony%.
 combat.indianSurprise={{tag:people|%nation%}} zrobili niespodziewany nalot w %colony%, alarmując naszych kolonistów.  Przywódca {{tag:people|%nation%}} odmawia zaangażowania.
@@ -2044,13 +2063,16 @@ main.defaultPlayerName=Nazwa gracza
 main.javaVersion=Wersja Java  %minVersion%  lub wyższa jest zalecana, aby uruchomić FreeCol\n( %version%  wykryte, użyj --no-java-check aby pominąć sprawdzanie wersji).
 main.memory=Musisz przydzielić więcej niż %memory%  bajtów pamięci dla JVM. Uruchom ponownie FreeCol z parametrem: java -Xmx%minMemory%M -jar FreeCol.jar
 client.baseData=Nie można odnaleźć bazy danych katalogu  %dir% .\n  Nie można odnaleźć plików danych przez FreeCol.\n  Upewnij się, że są one obecne.\n  Jeśli następnie FreeCol szuka w katalogu źle\n  Uruchom grę z parametrem wiersza polecenia:\n  --freecol-dane<data-directory></data-directory>
+# Fuzzy
 client.choicePlayer=Wybierz gracza:
 metaServer.couldNotConnect=Nie można połączyć się z meta-serwerem. Spróbuj jeszcze raz później.
 metaServer.communicationError=Wystąpił błąd podczas połączenia z meta-serwerem. Spróbuj jeszcze raz później.
 abandonEducation.action.studying=studiowanie
 abandonEducation.action.teaching=nauczanie
+# Fuzzy
 abandonEducation.no=Nie, kontynuować edukację
 abandonEducation.text=Gdy twoja jednostka %unit% opuści %colony% porzuci %action% w %building%, czy na pewno tego chcesz?
+# Fuzzy
 abandonEducation.yes=Tak, opuścić kolonię
 abandonTeaching.text=Jeśli twój %unit% opuści %building% przestanie nauczać, czy na pewno chcesz to porzucić?
 boycottedGoods.dumpGoods=Wyrzuć ładunek
@@ -2060,8 +2082,11 @@ buy.takeOffer=Przyjmij ofertę
 buy.text=%nation% chcą sprzedać %goods% za %gold%
 clearTradeRoute.text=Twój %unit% jest przypisany do szlaku %route%. Jeśli ustawisz mu cel, przestanie on podążać tym szlakiem. Czy na pewno chcesz to zrobić?
 client.fullScreen=Karta graficzna lub sterownik do niej nie obsługuje trybu pełnoekranowego.\nPowrót do trybu okienkowego.
+# Fuzzy
 confirmHostile.alliance=Nie możesz atakować swych sojuszników! Czy jesteś pewien, że chcesz zerwać sojusz i wypowiedzieć wojnę {{tag:people|%nation%}}?
+# Fuzzy
 confirmHostile.ceaseFire={{tag:people|%nation%}} zawarli z tobą rozejm. Jesteś pewny, że chcesz zaatakować?
+# Fuzzy
 confirmHostile.peace={{tag:people|%nation%}} mają z tobą pokojowe stosunki. Jesteś pewien, że chcesz wypowiedzieć wojnę?
 error.noSuchFile=Podany plik nie istnieje lub jest niewłaściwy.
 # Fuzzy
@@ -2115,7 +2140,9 @@ defeated.text=Zostałeś pokonany! Co chcesz teraz zrobić:
 defeated.yes=Zostać i popatrzeć
 defeatedSinglePlayer.text=Zostałeś pokonany!\n\nTeraz jest właśnie czarodziejska, straszna godzina nocy, w której się podnoszą groby i same piekła wyziewają na świat zarazę. O, teraz bym gotów pić krew i takie rzeczy wykonywać, na których widok dzień by zbladł!
 defeatedSinglePlayer.yes=Przejdź w tryb odwetu
+# Fuzzy
 diplomacy.offerAccepted=%nation% zaakceptowali twoją wspaniałomyślną propozycję.
+# Fuzzy
 diplomacy.offerRejected=%nation% odrzucili twoją wspaniałomyślną ofertę.
 disbandUnit.text=Czy naprawdę chcesz rozwiązać tę jednostkę?
 disbandUnit.yes=Rozwiąż
@@ -2158,7 +2185,9 @@ move.noAccessContact=Ekscelencjo, musimy najpierw nawiązać kontakt z {{tag:peo
 move.noAccessGoods={{tag:people|%nation%}} nie będą handlować %unit% o pustych ładowniach.
 move.noAccessSettlement=%nation% zabrania naszej jednostce (%unit%) wjazdu do swojej osady.
 move.noAccessSkill=Nasz %unit% nie może uczyć się od tubylców.
+# Fuzzy
 move.noAccessTrade=Nie mamy prawa do handlu z innymi Europejczykami, jak np. %nation%.
+# Fuzzy
 move.noAccessWar=Nie wolno nam handlować z %nation% w trakcie wojny.
 move.noAccessWater=Nasz %unit% musi zejść na ląd przed wejściem do osady.
 move.noAttackWater=Nasza jednostka (%unit%) musi atakować z ziemi.
@@ -2214,6 +2243,7 @@ server.timeOut=Przekroczenie czasu podczas łączenia z serwerem.
 server.userNameInUse=Podana nazwa użytkownika jest już używana.
 server.userNameNotPresent=Użytkownika o tym imieniu nie ma w tej grze.
 server.wrongFreeColVersion=Wersja klienta i serwera gry FreeCol nie są ze sobą kompatybilne.
+# Fuzzy
 buildColony.others=%nation% założyła nową kolonię %colony% w %region%.
 cashInTreasureTrain.colonial=Skrzynie z %amount% sztuk złota dotarły do Europy. Do twojego skarbca wpłynęło %cashInAmount% sztuk złota.
 cashInTreasureTrain.independent=%amount% złota z łupów oddano do skarbu państwa.
@@ -2313,6 +2343,7 @@ colopedia.unit.offensivePower=Siła ataku:
 colopedia.unit.price=Cena w Europie:
 colopedia.unit.productionBonus={{plural:%number%|one=Modyfikator|few=Modyfikatory|many=Modyfikatorów}} produkcji:
 colopedia.unit.requirements=Wymagania:
+# Fuzzy
 colopedia.unit.school=Kształci się w:
 colopedia.unit.skill=Umiejętność:
 report.labour.allColonists=Wszyscy koloniści
@@ -2347,8 +2378,8 @@ report.colony.grow.header=+
 report.colony.growing.description=%colony% może powiększać się o {{plural:%amount%|one=jedną jednostkę|other=%amount% jednostek}} bez szkody dla produkcji
 report.colony.improve.description=Jednostki, które mogłyby poprawić produkcję.
 report.colony.improve.header=Popraw
+# Fuzzy
 report.colony.improving.description=<HTML>%colony%: Aby produkować o %amount% więcej %goods%,<BR>zastąp %oldUnit% tą jednostką: %unit%</HTML>
-report.colony.wanting.description=<HTML>%colony%: Aby produkować o %amount% więcej %goods%,<BR>dodaj %unit%</HTML>
 report.colony.making.blocking.description=%colony% potrzebuje %amount% %goods% aby dokończyć budowę %buildable% {{plural:%turns%|one=w kolejnej turze|few=za %turns% tury|many=za %turns% tur}}
 report.colony.making.constructing.description=%colony% dokończy budowę %buildable% {{plural:%turns%|one=w kolejnej turze|few=za %turns% tury|many=za %turns% tur}}
 report.colony.making.description=Co ta kolonia produkuje
@@ -2358,21 +2389,22 @@ report.colony.making.noconstruction.description=%colony%: Nic się nie buduje
 report.colony.making.noteach.description=%colony%: %teacher% nie ma ucznia
 report.colony.name.description=Lista kolonii
 report.colony.name.header=Kolonia
-report.colony.plow.description=Liczba płytek kolonii, które mogłyby skorzystać z zaorania
-report.colony.plow.header=P
-report.colony.plowing.description=Kolonia %colony% skorzystałaby z orki {{plural:%amount%|one=jednej płytki|other=%amount% płytek}}
+# Fuzzy
 report.colony.production.description=%colony%: produkcja netto %goods% wynosi %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: produkcja netto %goods% wynosi %amount% (eksport na poziomie %export%)
 report.colony.production.header=%goods% - produkcja netto
+# Fuzzy
 report.colony.production.high.description=%colony%: produkcja netto %goods% wynosi %amount%, pełna {{plural:%turns%|one=w następnej turze|few=za %turns% tury|many=za %turns% tur}}
+# Fuzzy
 report.colony.production.low.description=%colony%: produkcja netto %goods% wynosi %amount%, minie {{plural:%turns%|one=w następnej turze|few=za %turns% tury|many=za %turns% tur}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: produkcja netto %goods% wynosi %amount%, magazyn się przepełni, %waste% się {{plural:%waste%|few=zmarnują|other=zmarnuje}}
-report.colony.road.description=Liczba płytek kolonii, które mogłyby skorzystać z budowy dróg
-report.colony.road.header=R
-report.colony.roadBuilding.description=Kolonia %colony% skorzystałaby z budowy dróg {{plural:%amount%|one=jednej płytki|other=%amount% płytek}}
 report.colony.shrinking.description=%colony% musi pomniejszyć się o {{plural:%amount%|one=jedną jednostkę|few=%amount% jednostki|many=%amount% jednostek}}, aby zwiększyć produkcję
 report.colony.starving.description=%colony%: śmierć głodowa {{plural:%turns%|one=w następnej turze|few=za %turns% tury|many=za %turns% tur}}
 # Fuzzy
+report.colony.wanting.description=<HTML>%colony%: Aby produkować o %amount% więcej %goods%,<BR>dodaj %unit%</HTML>
+# Fuzzy
 report.continentalCongress.elected=Wybrany:
 report.continentalCongress.none=(brak)
 report.continentalCongress.recruiting=Pozyskiwanie
@@ -2414,26 +2446,25 @@ report.production.selectGoods=Wybierz towary
 report.production.update=Uaktualnij
 report.requirements.badAssignment=%colony% ma %expert%, który obecnie pracuje jako %expertWork%, podczas gdy %nonExpert% pracuje jako %nonExpertWork%. Produkcja byłaby wyższa, gdyby się zamienili miejscami.
 report.requirements.canTrainExperts=Możesz szkolić {{plural:2|%unit%}} w
-report.requirements.clearTile=%type% na %direction% od %colony% skorzystał(a)by na wycince.
+# Fuzzy
 report.requirements.exploreTile=%type% na %direction% od %colony% skorzystał(a)by na eksploracji.
 report.requirements.met=Spełniono wszystkie wymagania.
 report.requirements.missingGoods=%colony% produkuje %goods%, ale potrzebuje więcej %input%.
 report.requirements.misusedExperts=Są {{plural:2|%unit%}}, którzy nie pracują jako %work% w
 report.requirements.noExpert=%colony% produkuje %goods%, ale nie ma %unit%.
-report.requirements.plowCenter=Kolonia %colony% skorzystałaby z orki na swojej płytce.
-report.requirements.plowTile=%type% na %direction% od %colony% skorzystał(a)by na orki.
-report.requirements.roadTile=%type% na %direction% od %colony% skorzystał(a)by na budowie drogi.
 report.requirements.severalExperts=Kliku {{plural:2|%unit%}} jest w
 report.requirements.surplus=Nadmierne ilości %goods% są produkowane w
 report.trade.afterTaxes=Zysk netto
 report.trade.beforeTaxes=Zysk brutto
 report.trade.cargoUnits=Liczba jednostek w ładunku
+# Fuzzy
 report.trade.hasCustomHouse=* Ta kolonia ma skład celny; te towary są eksportowane.
 report.trade.totalDelta=Cała produkcja
 report.trade.totalUnits=Wszystkie jednostki
 report.trade.unitsSold=Sztuki kupione lub sprzedane
 report.turn.filter=Nie pokazuj tego typu wiadomości (%type%)
 report.turn.ignore=Zignoruj tę wiadomość. (Kolonia: %colony%, Towary: %goods%)
+# Fuzzy
 report.turn.playerNation=%player% (%nation%)
 aboutPanel.copyright=Wszelkie prawa zastrzeżone © 2002-2015 Zespół FreeCol
 aboutPanel.legalDisclaimer=FreeCol jest oprogramowaniem darmowym: możesz je rozdawać i/lub modyfikować zgodnie z warunkami GNU General Public License opublikowanej przez Free Software Foundation w wersji 2 lub dowolnej późniejszej.
@@ -2457,6 +2488,7 @@ chooseFoundingFatherDialog.title=Nominuj Ojca Założyciela
 colonyPanel.colonyUnits=Jednostki kolonii
 colonyPanel.inPort=W porcie
 colonyPanel.outsideColony=Poza osadą
+# Fuzzy
 colonyPanel.producing=Produkcja:
 colonyPanel.reducePopulation=Jeśli ludności będzie mniej niż %number%, w %colony% nie uda się zbudować %buildable%.
 colonyPanel.unitChange=Podczas wejścia do kolonii twoja jednostka %oldType% została %newType%.
@@ -2468,7 +2500,9 @@ colonyPanel.notBestTile=%unit% może produkować więcej %goods% na polu %tile%.
 confirmDeclarationDialog.areYouSure.no=Może później
 confirmDeclarationDialog.areYouSure.text=Odrzućmy tyranię w której kajdany zakuł nas %monarch% i ogłośmy naszą niepodległość!
 confirmDeclarationDialog.areYouSure.yes=Wolność albo Śmierć!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Stany Zjednoczone Narodu %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Wolny naród %nation%
 confirmDeclarationDialog.enterCountry=Od tej pory, nasz kraj będzie się nazywał
 confirmDeclarationDialog.enterNation=a każdy obywatel naszego wielkiego narodu będzie rozpoznawany jako
diff --git a/data/strings/FreeColMessages_pt_BR.properties b/data/strings/FreeColMessages_pt_BR.properties
index ba817c743..e55a2fd59 100644
--- a/data/strings/FreeColMessages_pt_BR.properties
+++ b/data/strings/FreeColMessages_pt_BR.properties
@@ -30,6 +30,7 @@
 # Author: Thi.henrike
 # Author: Tiago Aquino <tiagoaquino007@hotmail.com>
 # Author: Tuliouel
+# Author: Walesson
 # Author: 555
 
 model.option.recruitable.slot0.name=Primeiro imigrante
@@ -69,11 +70,9 @@ client=Cliente
 close=Fechar
 color=Cor
 connect=Conectar
-# Fuzzy
 current=Atual
 false=Falso
-# Fuzzy
-fill=Resultado Final
+fill=preencher
 height=Altura
 help=Ajuda
 high=Alto
@@ -84,7 +83,6 @@ low=Baixo
 many=muitos
 medium=Médio
 more=mais...
-# Fuzzy
 music=Música
 name=Nome
 no=Não
@@ -102,12 +100,10 @@ rename=Renomear
 reset=Reiniciar
 save=Salvar
 select=Selecionar
-# Fuzzy
-server=Nome do Servidor:
+server=Servidor
 skip=Pular
 small=Pequeno
 statistics=Estatísticas
-# Fuzzy
 test=Teste
 true=Verdadeiro
 unknown=Desconhecido
@@ -126,6 +122,7 @@ cargoOnCarrier=Carga a Bordo
 cashInTreasureTrain=Dinheiro no vagão de tesouro
 clearOrders=Apagar ordens
 colonists=Colonos
+colopedia=Colonizopedia
 difficulty=Dificuldade
 docks=Docas
 dumpCargo=Jogar a carga fora
@@ -180,6 +177,7 @@ cli.arg.dimensions=LARGURAxALTURA
 cli.arg.directory=DIRETÓRIO
 cli.arg.europeans=EUROPEUS
 cli.arg.file=ARQUIVO
+cli.arg.gui-scale=ESCALA
 cli.arg.locale=LOCALIDADE
 cli.arg.loglevel=NIVELDOREGISTRO
 cli.arg.name=NOME
@@ -192,6 +190,7 @@ cli.error.clientOptions=Ignorando o arquivo ilegível de opções do cliente: %s
 cli.error.debug=Modo da lista de conserto de erros (%modes%) esperados.
 cli.error.difficulties=Níveis de dificuldade (%difficulties%) achados, esperados: %arg%
 cli.error.europeans=Número de nações europeias deve ser no mínimo %min%
+cli.error.gui-scale=Porcentaxe de escala da GUI (%scales%) esperada, atopouse: %arg%
 cli.error.home.noRead=Impossível ler de %string%.
 cli.error.home.noWrite=Impossível gravar em %string%.
 cli.error.home.notDir=%string% não é um diretório.
@@ -213,6 +212,9 @@ cli.european-count=Escolha o número de nações habilitadas (colônias Européi
 cli.fast=pular todos os diálogos de configurações
 cli.font=definir a fonte padrão
 cli.freecol-data=define o DIRETÓRIO de dados do FreeCol (tem um subdiretório chamado 'base')
+cli.full-screen=executar FreeCol em modo de tela cheia
+cli.gui-scale=elementos escala GUI, com a escala opcional (%scales%)
+cli.headless=\nexecutado no modo sem cabeça
 cli.help=exibe esta tela de ajuda
 cli.load-savegame=carrega o ARQUIVO de jogo salvo dado
 cli.log-console=registra também no terminal além de em arquivo
@@ -234,8 +236,7 @@ cli.user-cache-directory=Defina o diretório poara o cache de usuário do Freeco
 cli.user-config-directory=definir o DIRETÓRIO para configurações do usuário do FreeCol
 cli.user-data-directory=definir o DIRETÓRIO para dados do usuário do FreeCol
 cli.version=exibe o número de versão e encerra
-# Fuzzy
-cli.windowed=executa o FreeCol em modo janela, em vez de modo tela cheia
+cli.windowed=FreeCol executado no modo de janela, com dimensões opcionais
 menuBar.colopedia=Colonizopedia
 menuBar.game=Jogo
 menuBar.orders=Ordens
@@ -252,6 +253,8 @@ menuBar.debug.addLiberty=Adicionar liberdade para cada colônia
 menuBar.debug.compareMaps.checkComplete=Busca completa. Dessincronização não encontrada.
 menuBar.debug.compareMaps.problem=Provável problema descoberto. Por favor leia as informações para entender o erro.
 menuBar.debug.compareMaps=Procurar dessincronização no mapa.
+menuBar.debug.displayAIMissions=Mostrar missões AI
+menuBar.debug.displayAdditionalAIMissionInfo=Exibir informações adicionais missão AI
 menuBar.debug.displayErrorMessage=Mostrar mensagem de erro
 menuBar.debug.displayEuropeStatus=Mostrar a situação da Europa
 menuBar.debug.displayMonarchPanel=Mostrar o painel do Monarca
@@ -290,7 +293,6 @@ colopediaAction.goods.name=Produtos
 colopediaAction.nations.name=Nações
 colopediaAction.nationTypes.name=Vantagens das Nações
 colopediaAction.resources.name=Recursos Bônus
-colopediaAction.skills.name=Habilidades
 colopediaAction.terrain.name=Tipo de terreno
 colopediaAction.units.name=Unidades
 colopediaAction.name=%object% (Colonizopedia)
@@ -353,8 +355,7 @@ renameAction.name=Renomear
 reportCargoAction.name=Relatório de Carga
 reportColonyAction.name=Relatório de Colônias
 reportCongressAction.name=Congresso Continental
-# Fuzzy
-reportEducationAction.name=Educação
+reportEducationAction.name=Relatório educação
 reportExplorationAction.name=Relatório de Exploração
 reportForeignAction.name=Relatório das Relações Exteriores
 reportHighScoresAction.name=Melhores Pontuações
@@ -436,8 +437,15 @@ model.option.buildOnNativeLand.never.shortDescription=Não é permitida a constr
 model.option.settlementNumber.name=Número de acampamentos dos nativos
 model.option.settlementNumber.shortDescription=Defina o número de acampamentos dos nativos nos mapas gerados.
 model.option.settlementNumber.verySmall.name=Muito pequeno
+model.option.settlementNumber.verySmall.shortDescription=Muito poucos assentamentos indígenas
 model.option.settlementNumber.small.name=Pequeno
+model.option.settlementNumber.small.shortDescription=Pequeno número de assentamentos indígenas
 model.option.settlementNumber.medium.name=Médio
+model.option.settlementNumber.medium.shortDescription=Número médio de assentamentos indígenas
+model.option.settlementNumber.large.name=grande
+model.option.settlementNumber.large.shortDescription=Grande número de assentamentos indígenas
+model.option.settlementNumber.veryLarge.name=Muito grande
+model.option.settlementNumber.veryLarge.shortDescription=Assentamentos nativos abundantes
 model.difficulty.monarch.name=Monarca
 model.option.monarchMeddling.name=Interferência do Monarca
 model.option.monarchMeddling.shortDescription=Aumenta o número e gravidade das interferências do Monarca.
@@ -490,10 +498,15 @@ model.option.unitsThatUseNoBells.shortDescription=O número de colonos em uma co
 model.option.tileProduction.name=Produção dos terrenos
 model.option.tileProduction.shortDescription=A variação da quantidade da produção
 model.option.tileProduction.veryLow.name=Muito baixo
+model.option.tileProduction.veryLow.shortDescription=Muito baixa produção de telhas
 model.option.tileProduction.low.name=Baixo
+model.option.tileProduction.low.shortDescription=Baixa produção de telha
 model.option.tileProduction.medium.name=Médio
+model.option.tileProduction.medium.shortDescription=Produção de ladrilhos Médio
 model.option.tileProduction.high.name=Alto
+model.option.tileProduction.high.shortDescription=A alta produção de telha
 model.option.tileProduction.veryHigh.name=Muito alto
+model.option.tileProduction.veryHigh.shortDescription=Produção muito elevada telha
 model.option.badRumour.name=Chance de rumor ruim
 model.option.badRumour.decription=Porcentagem de chance de um rumor ter resultado ruim.
 model.option.goodRumour.name=Chance de bons  rumores
@@ -532,6 +545,8 @@ model.option.settlementActionsContactChief.name=Contacto com o chefe
 model.option.settlementActionsContactChief.shortDescription=Todas as interações com um acampamento nativo contactam o chefe e consomem o bônus de reconhecimento.
 model.option.enhancedMissionaries.name=Missionários melhorados
 model.option.enhancedMissionaries.shortDescription=Missões missionárias melhoram o comércio, habilidades ensinadas e dar visibilidade ao redor.
+model.option.missionInfluence.name=Missão Influência
+model.option.missionInfluence.shortDescription=A força da influência de uma missão para o nível de alarme dos nativos em um acordo.
 model.option.giftProbability.name=Probabilidade de receber presente
 model.option.giftProbability.shortDescription=Porcentagem por turno de chance que uma assentamento nativo pacífico oferecer os excedentes de produção como um presente para um assentamento europeu amigável nas proximidades.
 model.option.demandProbability.name=Probabilidade de demanda
@@ -560,14 +575,26 @@ model.option.equipEuropeanRecruits.name=Equipar recrutas Europeus
 model.option.equipEuropeanRecruits.shortDescription=Treinados recentemente ou recrutas na Europa estão equipados de acordocom a configuração padrão
 gameOptions.colony.name=Opcões da Colônia
 gameOptions.colony.shortDescription=Contém opções relacionadas ao comportamento das colônias.
+model.option.bellAccumulationCapped.name=Acumulação de Bell tampado
+model.option.bellAccumulationCapped.shortDescription=Colônias não pode acumular mais uma vez sinos 100% rebeldes são atingidos
+model.option.captureUnitsUnderRepair.name=Unidades de captura em reparação
+model.option.captureUnitsUnderRepair.shortDescription=Capturar unidades em reparação quando uma colônia é conquistada.
 model.option.customIgnoreBoycott.name=Casa de Comércio ignora boicote
 model.option.customIgnoreBoycott.shortDescription=A Casa de Comércio venderá produtos sob boicote.
+model.option.customsOnCoast.name=Alfândegas na costa
+model.option.customsOnCoast.shortDescription=Alfândegas só podem ser construídas nas colônias costeiras.
+model.option.disembarkInColony.name=Desembarque em Colônia
+model.option.disembarkInColony.shortDescription=Todas as unidades desembarcar quando um veículo chega numa colónia.
 model.option.expertsHaveConnections.name=Experts possuem contatos
 model.option.expertsHaveConnections.shortDescription=Profissionais podem usar seus contatos para prover quantidades mínimas para manter a produção nas fábricas.
 model.option.foundColonyDuringRebellion.name=Colonias fundadas durante  a rebelião
 model.option.foundColonyDuringRebellion.shortDescription=O jogador pode continuar fundadndo colonias durante a guerra da independencia.
+model.option.payForBuilding.name=Pagar para a construção
+model.option.payForBuilding.shortDescription=Buildables pode ser concluída rapidamente, pagando para as mercadorias em falta.
 model.option.saveProductionOverflow.name=Guardar o excedenta da produção
 model.option.saveProductionOverflow.shortDescription=Guardar o excedente de martelos, sinos e cruzes.
+model.option.clearHammersOnConstructionSwitch.name=Martelos claras sobre interruptor de construção
+model.option.clearHammersOnConstructionSwitch.shortDescription=Zero os martelos acumulados se as mudanças atuais edificáveis.
 model.option.allowStudentSelection.name=Permitir seleção de estudantes
 model.option.allowStudentSelection.shortDescription=Permite a atribuição de estudantes manual, em vez de automática
 model.option.enableUpkeep.name=Edifícios precisam de manutenção (EXPERIMENTAL)
@@ -596,6 +623,7 @@ model.option.lastYear.name=Último ano do jogo
 model.option.lastYear.shortDescription=O último ano do jogo.
 model.option.lastColonialYear.name=Último ano colonial do jogo
 model.option.lastColonialYear.shortDescription=O último ano do jogo para um jogador colonial.
+model.option.independenceTurn.name=independência Ligue
 model.option.seasons.name=Sessões
 gameOptions.prices.name=Opções de Preços
 gameOptions.prices.shortDescription=Contem opições geradas no jogo que controlam o preço inicial dos itens.
@@ -1459,6 +1487,7 @@ model.improvement.road.description=Estrada
 model.improvement.road.name=Estrada
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limite de Colônias Costeiras
+# Fuzzy
 model.limit.independence.coastalColonies.description=Você precisa de pelo menos %limit% colônias costeiras para declarar a independência.
 model.limit.independence.rebels.name=Limite de Filhos da Liberdade
 model.limit.independence.rebels.description=Pelo menos %limit%% do seus colonos devem apoiar a independência.
@@ -1804,6 +1833,7 @@ model.colony.badGovernment=O governo de %colony% é ineficiente. Foram aplicadas
 model.colony.goodGovernment=Eficiência governamental foi melhorada! A comunidade de Filhos da Liberdade em %colony% é igual ou superior a %number%% da população.
 model.colony.governmentImproved1=O governo de %colony% melhorou, mas ainda é ineficiente. As penas à produção ainda vigoram.
 model.colony.governmentImproved2=O governo de %colony% melhorou. As penas à produção cessaram.
+# Fuzzy
 model.colony.insufficientProduction=Mais %outputAmount% de %outputType% poderia ser produzidos em %colony% se tivéssemos mais %inputAmount% %inputType%.
 model.colony.lostGoodGovernment=A eficiência do governo diminuiu! A comunidade dos Filhos da Liberdade em %colony% é inferior a %number%%. Alguns bônus de produção foram perdidos.
 model.colony.lostVeryGoodGovernment=A eficiência do governo diminuiu! A comunidade dos Filhos da Liberdade em %colony% já não é de %number%%. Alguns bônus de produção foram perdidos.
@@ -1818,12 +1848,17 @@ model.colony.veryBadGovernment=O governo de %colony% é muito ineficiente. Foram
 model.colony.veryGoodGovernment=Eficiência governamental foi melhorada! A comunidade de Filhos da Liberdade em %colony% já ultrapassa os %number%% da população.
 model.colonyTile.claim=(reivindicar %direction%)
 model.diplomaticTrade.receive.contact=Comprimentos fraternais da gloriosa nação %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Negociemos com a nação %nation%.
 model.diplomaticTrade.receive.trade=Consideremos a  oferta de comércio de %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=A %nation% está exigindo tributos de nós!
 model.diplomaticTrade.send.contact=Nós encontramos menbros da nação %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Consideremos a nossa situação diplomatica com %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Vamos propor uma troca com %nation% em %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Exigimos tributo de %nation% em %settlement%.
 model.direction.N.name=norte
 model.direction.NE.name=nordeste
@@ -1834,25 +1869,37 @@ model.direction.SW.name=sudoeste
 model.direction.W.name=oeste
 model.direction.NW.name=noroeste
 model.historyEventType.abandonColony.description=Você abandonou a colônia de %colony%
+# Fuzzy
 model.historyEventType.ceaseFire.description=Cessar-fogo com %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Os %nation% descobriram a %city%, uma das Setes Eldorado, e um tesouro de %treasure% moedas de ouro.
+# Fuzzy
 model.historyEventType.colonyConquered.description=A sua colônia %colony% foi conquistada pelos %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=A sua colônia %colony% foi destruída pelos %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Você ousa aceitar os nossos Termos generosos e ainda fugir do pagamento? Essa duplicidade deve colher a recompensa amarga de nosso desagrado.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Você destruiu o acampamento %settlement% dos %nation%.
+# Fuzzy
 model.historyEventType.declareWar.description=Guerra declarada com %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Os %nation% destruíram os %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Você descobriu o Novo Mundo.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Os %nation% descobriram %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Aliança negociada com %nation%.
 model.historyEventType.foundColony.description=Você fundou a colônia de %colony%.
 model.historyEventType.foundingFather.description=%father% entrou no Congresso Continental.
 model.historyEventType.independence.description=Você conquistou a independência da Coroa!
+# Fuzzy
 model.historyEventType.makePeace.description=Acordo de paz com %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Você encontrou os %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Os %nation% já não estão mais presentes no Novo Mundo.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% cedeu todas as suas colônias do Novo Mundo para %nation%.
 model.indianSettlement.mostHatedNone=Nenhum
 model.indianSettlement.mostHatedUnknown=Desconhecido
@@ -1905,8 +1952,10 @@ model.messageType.warehouseCapacity.name=Capacidade do Armazém
 model.messageType.warning.name=Avisos
 model.monarch.action.addToRef.text=A coroa adicionou %number% {{plural:%number%|%unit%}} para a Força Real Expedicionária. Líderes coloniais manifestam preocupação.
 model.monarch.action.addToRef.no=Feito
+# Fuzzy
 model.monarch.action.declarePeace.text=Fizemos graciosamente um acordo de tratado de paz com %nation%.
 model.monarch.action.declarePeace.no=Feito
+# Fuzzy
 model.monarch.action.declareWar.text=A insolência da %nation% nos obriga a declarar guerra a eles!
 model.monarch.action.declareWar.no=Feito
 # Fuzzy
@@ -1966,6 +2015,7 @@ model.player.colonialIndependence=Somente jogadores coloniais podem declarar ind
 model.player.forces=Forças %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Depois de meses nos mares, você finalmente avistou a costa de um continente desconhecido. Navegue {{tag:%direction%|west=para oeste|east=para leste|default=contra o vento}} para descobrir o Novo Mundo e conquistá-lo para sua Coroa.
+# Fuzzy
 model.player.waitingFor=Esperando por: %nation%
 model.regionType.coast.name=Costa
 model.regionType.coast.unknown=Região Costeira desconhecida
@@ -2005,6 +2055,7 @@ model.tradeItem.gold.name=Ouro
 model.tradeItem.gold.description=a soma de %amount% moedas de ouro
 model.tradeItem.goods.name=Produtos
 model.tradeItem.incite.name=Declarar guerra contra
+# Fuzzy
 model.tradeItem.incite.description=Guerra contra a nação de  %nation%
 model.tradeItem.stance.name=Estado
 model.tradeItem.unit.name=Unidade
@@ -2026,9 +2077,9 @@ model.unit.underRepair=Em reparação (%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -2069,6 +2120,7 @@ model.colony.warehouseSoonFull=O seu armazém em %colony% excederá a capacidade
 model.colony.warehouseWaste=Seu armazém em %colony% excedeu sua capacidade para %goods%. %waste% unidades se perderam.
 model.colony.workersEvicted=Na %colony%, os colonos não podem mais trabalhar %location% devido à presença de %enemyUnit%.
 model.colonyTile.resourceExhausted=Estamos sem %resource% em %colony%
+# Fuzzy
 model.game.spanishSuccession=Vossa Excelência, a Guerra de Sucessão Espanhola acabou na Europa. No Tratado de Utrecht, os %loserNation% foram forçados a ceder todas as colônias no Novo Mundo aos %nation%!
 model.indianSettlement.mission.denounced=O seu missionário em %settlement% foi acusado e executado!
 model.indianSettlement.mission.destroyed=O seu missionário em %settlement% morreu na destruição do povoado.
@@ -2078,6 +2130,7 @@ model.player.autoRecruit=A agitação religiosa em %europe% forçam a emigraçã
 model.player.colonyGoodsParty.harbour=Seus colonos em %colony% jogaram %amount% unidades de %goods% ao mar, em protesto à taxação injusta pretendida pela Coroa!
 model.player.colonyGoodsParty.horses=Os seus colonos de %colony% libertaram %amount% cavalos em protesto contra estes impostos injustos da Coroa!
 model.player.colonyGoodsParty.landLocked=Seus colonos em %colony% queimaram %amount% unidades de %goods% no mercado em protesto a esta taxação injusta da Coroa!
+# Fuzzy
 model.player.dead.european=Vossa Excelência, os %nation% declararam a sua retirada incondicional dos assuntos do Novo Mundo!
 model.player.dead.native=Vossa Excelência, os %nation% foram destruídos.
 model.player.disaster.bankruptcy.start=Você deixou de pagar a manutenção de todos os edifícios. Severas penalidades serão aplicadas na produção.
@@ -2091,12 +2144,16 @@ model.player.ignoredTax=A coroa aumentou a taxa para %amount%% como foi previame
 model.player.interventionForceArrives=Chega a prometida Força de Intervenção!
 model.player.soLDecrease=Os Filhos da Liberdade em suas colônias caíram para %newSoL% por cento!
 model.player.soLIncrease=Os Filhos da Liberdade em suas colônias já aumentaram para %newSoL% por cento!
+# Fuzzy
 model.player.stance.alliance.declared=Vossa Excelência, %nation% formaram uma aliança connosco!
 model.player.stance.alliance.others=Vossa Excelência, os %attacker% estão em aliança com os %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Vossa Excelência, os %nation% aceitaram um acordo de cessar-fogo connosco!
 model.player.stance.ceaseFire.others=Vossa Excelência, o exército %attacker% acordaram um cessar-fogo com o exército %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Vossa Excelência, os %nation% estão em paz connosco!
 model.player.stance.peace.others=Vossa Excelência, o exército %attacker% está em paz com o exército %defender%.
+# Fuzzy
 model.player.stance.war.declared=Más notícias, Vossa Excelência. A Nação %nation% declarou guerra contra nós!
 model.player.stance.war.others=Vossa Excelência, os %attacker% declararam guerra contra os %defender%.
 combat.automaticDefence=O(A) %unit% em %colony% pegou em armas para defender a colônia!
@@ -2112,6 +2169,7 @@ combat.enemyShipEvaded=%enemyUnit% de %enemyNation% escapou de um ataque por %un
 combat.enemyShipSunk=%unit% afundou %enemyUnit% de %enemyNation%!
 combat.equipmentCaptured=Atenção, os bravos de %nation% adquiriram %equipment%!
 combat.goodsStolen=O %enemyUnit% %enemyNation% roubou %amount% %goods% em %colony%!
+# Fuzzy
 combat.indianPlunder=O %enemyUnit% %enemyNation% saqueou %amount% em %colony%.
 combat.indianRaid=Nossos espiões relataram que os %nation% invadiram a %colony% dos %colonyNation%.
 combat.indianSurprise=Os %nation% fazem um ataque surpresa à colónia %colony%, alarmando nossos colonos. O chefe dos %nation% nega qualquer envolvimento.
@@ -2168,6 +2226,7 @@ main.javaVersion=É recomendada a versão do Java %minVersion% ou mais recente p
 main.memory=É necessário atribuir mais de %memory% bytes de memória para a JVM.\n  Reinicie o FreeCol com:  java - Xmx %minMemory% M-jar FreeCol.jar
 main.userDir.fail=FreeCol não pode encontrar os diretórios adequados para salvar dentro dos dados do usuário.Prosseguindo, mas espera problemas.
 client.baseData=Não foi possível encontrar o diretório de base de dados %dir%.\nOs arquivos de dados não foram encontrados pelo FreeCol.\nPor favor, certifique-se de que eles estão presentes.\nSe o FreeCol está procurando no diretório errado, então rode o jogo com um parâmetro de linha de comando:\n--freecol-data <diretório-dos-dados>
+# Fuzzy
 client.choicePlayer=Por favor, escolha um jogador:
 client.classic=Falha ao carregar o mapeamento de recursos do conjunto de regras `clássico '.
 client.debugConnect=Você não pode se conectar a um jogo existente no modo de debug.
@@ -2180,8 +2239,10 @@ metaServer.couldNotConnect=Desculpe, não foi possível conectar-se ao meta-serv
 metaServer.communicationError=Houve um erro enquanto comunicava-se com o meta-servidor. Por favor, tente novamente mais tarde.
 abandonEducation.action.studying=estudar
 abandonEducation.action.teaching=ensinar
+# Fuzzy
 abandonEducation.no=Não, continuar na educação
 abandonEducation.text=Se sua %unit% sair da %colony% irá deixar de %action% na %building%, tem certeza que ele deve abandonar?
+# Fuzzy
 abandonEducation.yes=Sim, deixar a colônia
 abandonTeaching.text=Se sua %unit% deixar a %building%, ele parará de ensinar, você tem certeza de que deve retira-la?
 armedUnitSettlement.attack=Atacar
@@ -2193,9 +2254,13 @@ buy.takeOffer=Aceitar a oferta
 buy.text=A Nação %nation% gostaria de vender %goods% por %gold% moedas de ouro:
 clearTradeRoute.text=%unit% está atribuído à rota comercial %route%. Definir o seu destino vai removê-lo da rota comercial. Tem certeza que deseja fazer isso?
 client.fullScreen=Modo de tela cheia não é suportado para este GraphicsDevice.\nVoltando para o modo de janela.
+# Fuzzy
 confirmHostile.alliance=Você não pode atacar uma nação aliada! Tem a certeza de que pretende quebrar a sua aliança com os %nation% e declarar guerra?
+# Fuzzy
 confirmHostile.ceaseFire=Você assinou um cessar-fogo com os %nation%. Você realmente quer atacar?
+# Fuzzy
 confirmHostile.peace=Você está em paz com os %nation%. Deseja realmente declarar guerra?
+# Fuzzy
 confirmTribute.broke=Nossos espiões reportam que a nação %nation% estão completamente arruinados. Melhor que não percamos tempo exigindo tributos deles.
 confirmTribute.european=A %nation% %danger%, and %finance%. Quanto de tributo devemos exigir deles?
 confirmTribute.happy=A %nation% no assentamento %settlement% são bons amigos, é uma pena machucar nossa amizade.
@@ -2263,7 +2328,9 @@ defeated.text=Você foi derrotado! Você prefere:
 defeated.yes=Ficar e assistir
 defeatedSinglePlayer.text=Foi derrotado!\n\nEis chegada a terrível hora da noite, quando se escancaram os cemitérios e o inferno expele a sua pestilência sobre o mundo. Agora podia eu matar e cometer atos tão lúgubres que ao vê-los o dia tremeria.
 defeatedSinglePlayer.yes=Entrar no Modo Vingança
+# Fuzzy
 diplomacy.offerAccepted=A Nação %nation% aceitou sua oferta generosa.
+# Fuzzy
 diplomacy.offerRejected=A Nação %nation% rejeitou sua oferta generosa.
 disbandUnit.text=Tem certeza que quer eliminar esta unidade?
 disbandUnit.yes=Dispersar
@@ -2308,7 +2375,9 @@ move.noAccessContact=Excelência, primeiro devemos estabelecer contato com os %n
 move.noAccessGoods=Os %nation% não negociarão com um %unit% vazio.
 move.noAccessSettlement=Os %nation% não permitem que a unidade %unit% entre no seu acampamento.
 move.noAccessSkill=%unit% não pode aprender com os nativos.
+# Fuzzy
 move.noAccessTrade=Não temos autoridade necessária para efetuar trocas comerciais com outras nações europeias, como os %nation%.
+# Fuzzy
 move.noAccessWar=Não podemos fazer trocas comerciais com os %nation% enquanto estivermos em guerra.
 move.noAccessWater=%unit% tem de desembarcar antes de entrar no acampamento.
 move.noAttackWater=A nossa unidade %unit% tem de estar em terra para atacar.
@@ -2372,6 +2441,7 @@ server.timeOut=Tempo limite esgotado para tentar conectar ao servidor.
 server.userNameInUse=O nome de usuário especificado já se encontra em uso.
 server.userNameNotPresent=O usuário específico não está neste jogo.
 server.wrongFreeColVersion=As versões do cliente e servidor do jogo não coincidem.
+# Fuzzy
 buildColony.others=A %nation% tem fundado a nova colônia de %colony% em %region%.
 cashInTreasureTrain.colonial=Um tesouro com %amount% moedas de ouro chegou na Europa. %cashInAmount% moedas de ouro foram depositadas.
 cashInTreasureTrain.independent=Um tesouro de %amount% foi adicionado ao caixa nacional.
@@ -2472,6 +2542,7 @@ colopedia.unit.offensivePower=Poder Ofensivo:
 colopedia.unit.price=Preço na Europa:
 colopedia.unit.productionBonus={{plural:%number%|one=Modificador|other=Modificadores}} de produção:
 colopedia.unit.requirements=Requerimentos:
+# Fuzzy
 colopedia.unit.school=Estrutura requerida para treinar:
 colopedia.unit.skill=Habilidade:
 report.labour.allColonists=Todos os Colonos
@@ -2507,8 +2578,8 @@ report.colony.growing.description=%colony% pode crescer por abrigar mais {{plura
 # Fuzzy
 report.colony.improve.description=Colonos que poderiam melhorar a produção no que diz respeito a unidade que atualmente esta fazendo o trabalho
 report.colony.improve.header=Melhorar
+# Fuzzy
 report.colony.improving.description=%colony%: Para fazer %amount% de %goods%, substitua %oldUnit% por %unit%
-report.colony.wanting.description=%colony%: Para produzir mais %amount% de %goods% adicione %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% são necessários para %buildable% ser completada {{plural:%turns%|one=no turno seguinte|other=em %turns% turnos}}
 report.colony.making.constructing.description=%colony%: %buildable% será completada {{plural:%turns%|one=no turno seguinte|other=em %turns% turnos}}
 report.colony.making.description=O que esta colônia está produzindo
@@ -2518,20 +2589,21 @@ report.colony.making.noconstruction.description=%colony%: Não há construção
 report.colony.making.noteach.description=%colony%: %teacher% precisa de um estudante
 report.colony.name.description=A lista das colônias
 report.colony.name.header=Colônia
-report.colony.plow.description=Número de terrenos da colônia que beneficiariam da aração
-report.colony.plow.header=P
-report.colony.plowing.description=%colony% beneficiaria se arrace {{plural:%amount%|one=um terreno|other=%amount% terrenos}}
+# Fuzzy
 report.colony.production.description=%colony%: produção líquida de %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: produção líquida de %goods% é de %amount% (acima de exportação de %export%)
 report.colony.production.header=Produção líquida de %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: produção líquida de %goods% = %amount%; completa {{plural:%turns%|one=no turno seguinte|other=em %turns% turnos}}
+# Fuzzy
 report.colony.production.low.description=%colony%: produção líquida de %goods% = %amount%;\ndesaparecerá {{plural:%turns%|one=no turno seguinte|other=em %turns% turnos}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: produção líquida de %goods% = %amount%; armazém irá atingir a sua capacidade, %waste% irão ser desperdiçados
-report.colony.road.description=Número de terrenos da colônia que beneficiariam da construção de estradas
-report.colony.road.header=R
-report.colony.roadBuilding.description=%colony% se beneficiaria da construção de  {{plural:%amount%|one=uma estrada|other=%amount% estradas}}
 report.colony.shrinking.description=%colony% deve desabrigar cerca de {{plural:%amount%|one=uma unidade|other=%amount% unidades}} para melhorar a produção
 report.colony.starving.description=%colony%: haverá fome {{plural:%turns%|one=no próximo turno|other=em %turns% turnos}}
+# Fuzzy
+report.colony.wanting.description=%colony%: Para produzir mais %amount% de %goods% adicione %unit%
 report.continentalCongress.available=Disponível
 report.continentalCongress.elected=Eleito: %turn%
 report.continentalCongress.none=(nenhum)
@@ -2574,26 +2646,25 @@ report.production.selectGoods=Selecionar bens
 report.production.update=Atualizado
 report.requirements.badAssignment=A colônia %colony% tem um %expert% trabalhando como %expertWork%, enquanto um %nonExpert% trabalha como %nonExpertWork%. A produção será maior se os colonos trocassem de funções.
 report.requirements.canTrainExperts=As unidades {{plural:2|%unit%}} podem ser treinadas em:
-report.requirements.clearTile=%type%, a %direction% de %colony% seria beneficiado por um desmatamento.
+# Fuzzy
 report.requirements.exploreTile=%type%, a %direction% de %colony%, sairia beneficiada por uma exploração.
 report.requirements.met=Todos os requeirimentos foram atingidos.
 report.requirements.missingGoods=%colony% está produzindo %goods%, mas precisa de mais %input%.
 report.requirements.misusedExperts=Há {{plural:2|%unit%}} que não estão trabalhando como %work% em
 report.requirements.noExpert=A colônia %colony% está produzindo %goods%, mas não possui um %unit%.
-report.requirements.plowCenter=%colony% seria beneficiada pela arasão.
-report.requirements.plowTile=%type%, a %direction% de %colony%, seria beneficiada pela arasão.
-report.requirements.roadTile=%type% a %direction% de %colony% seria beneficiada pela construção de uma estrada.
 report.requirements.severalExperts=As seguintes colônias têm mais de um {{plural:2|%unit%}}:
 report.requirements.surplus=As seguintes colônias estão com excedente de %goods%:
 report.trade.afterTaxes=Faturamento após o imposto
 report.trade.beforeTaxes=Faturamento antes do imposto
 report.trade.cargoUnits=Unidades na Carga
+# Fuzzy
 report.trade.hasCustomHouse=* Esta colônia possui Casa de Comério; estes bens são exportados.
 report.trade.totalDelta=Total de Produção
 report.trade.totalUnits=Total de Unidades
 report.trade.unitsSold=Unidades compradas ou vendidas
 report.turn.filter=Não exiba este tipo de mensagem (%type%)
 report.turn.ignore=Ignore esta mensagem (Colônia: %colony%, Bens: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% de %player%
 aboutPanel.copyright=Copyright © 2002-2015 A Equipe FreeCol
 aboutPanel.legalDisclaimer=FreeCol é software livre: pode redistribuí-lo e/ou modificá-lo sob os termos da GNU General Public License tal como publicada pela Free Software Foundation, versão 2 da Licença ou posterior.
@@ -2619,6 +2690,7 @@ colonyPanel.buildQueue=Fila de Construção
 colonyPanel.colonyUnits=Unidades da colônia
 colonyPanel.inPort=No porto
 colonyPanel.outsideColony=Fora da Colônia
+# Fuzzy
 colonyPanel.producing=Produzindo:
 colonyPanel.reducePopulation=Se você reduzir a população abaixo de %number%, %colony% não poderá mais construir %buildable%.
 colonyPanel.unitChange=Na colônia, um %oldType% tornou-se um %newType%.
@@ -2632,7 +2704,9 @@ confirmDeclarationDialog.areYouSure.no=Talvez depois
 confirmDeclarationDialog.areYouSure.text=Deixe-nos renunciar à tirania e injustiça de %monarch% e declarar a independência de nossas colônias!
 confirmDeclarationDialog.areYouSure.yes=Independência ou Morte!
 confirmDeclarationDialog.createFlag=e seus inimigos tremerão sobre a mira de seu estandarte desafiador
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Estados Unidos de %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% Livre
 confirmDeclarationDialog.enterCountry=A partir daí, o nosso país será conhecido como
 confirmDeclarationDialog.enterNation=e todos os cidadãos da nossa gloriosa nação terão o orgulho em serem conhecidos como
@@ -2684,9 +2758,11 @@ negotiationDialog.add=Adicionar
 negotiationDialog.cancel=Cancelar
 negotiationDialog.clear=Limpar
 negotiationDialog.contact.tutorial=Você encontrou europeus. Eles competirão com você por terras e riquezas, e poderão até declarar guerra contra você. Apenas depois que Jan de Witt entrar no congresso, você poderá comercializar com eles.
+# Fuzzy
 negotiationDialog.demand=A nação %nation% exige da nação %otherNation%
 negotiationDialog.exchange=em troca de
 negotiationDialog.goldAvailable=(%amount% ouro disponível)
+# Fuzzy
 negotiationDialog.offer=A nação %nation% oferece à nação %otherNation%
 negotiationDialog.send=Enviar
 negotiationDialog.title.contact=Encontrando os colegas europeus
@@ -2709,10 +2785,9 @@ findSettlementPanel.displayAll=Encontrar todos os acampamentos
 findSettlementPanel.displayOnlyEuropean=Buscar apenas acampamentos de europeus
 findSettlementPanel.displayOnlyNatives=Buscar apenas acampamentos de nativos
 findSettlementPanel.name=Encontrar acampamento
+# Fuzzy
 firstContactDialog.meeting.natives=Conhecendo os nativos...
 firstContactDialog.meeting.natives.tutorial=Você conheceu nativos. Mande guerreiros para o assentamento deles para conhecer mais sobre eles,e seus servos contratados e colonos livres com a finalidade de aprender com eles. Mande seus navios e carroças para seus assentamentos para realizar trocas com eles.
-firstContactDialog.meeting.AZTEC=A nação Asteca...
-firstContactDialog.meeting.INCA=O império Inca...
 firstContactDialog.welcomeOffer.text=Os %nation% dão-lhe as boas vindas. Somos uma nação gloriosa de %camps% %settlementType%. Para celebrar a nossa amizade, oferecemos-lhe como presente a terra que ocupa agora. Aceita o nosso tratado e viver em paz connosco, como irmãos?
 firstContactDialog.welcomeSimple.text=Os %nation% dão-lhe as boas vindas. Somos uma nação gloriosa de %camps% %settlementType%. Aceita o nosso tratado e viver em paz connosco, como irmãos?
 abandonColony.no=Cancelar
diff --git a/data/strings/FreeColMessages_pt_PT.properties b/data/strings/FreeColMessages_pt_PT.properties
index 91015e069..9c485c2f2 100644
--- a/data/strings/FreeColMessages_pt_PT.properties
+++ b/data/strings/FreeColMessages_pt_PT.properties
@@ -258,7 +258,6 @@ colopediaAction.goods.name=Mercadorias
 colopediaAction.nations.name=Nações
 colopediaAction.nationTypes.name=Vantagens Nacionais
 colopediaAction.resources.name=Bónus de Recursos
-colopediaAction.skills.name=Profissões
 colopediaAction.terrain.name=Tipo de Terreno
 colopediaAction.units.name=Unidades
 colopediaAction.name=%object% (Colopédia)
@@ -1188,6 +1187,7 @@ model.improvement.road.action=Construir estrada
 model.improvement.road.description=Estrada
 model.improvement.road.name=Estrada
 model.improvement.road.occupationString=E
+# Fuzzy
 model.limit.independence.coastalColonies.description=Precisa de ter, pelo menos, %limit% colónias costeiras para poder declarar a independência.
 model.limit.independence.rebels.name=Limite de Rebeldes
 model.limit.independence.rebels.description=Pelo menos %limit%% dos seus colonos têm de apoiar a independência.
@@ -1512,6 +1512,7 @@ model.colony.badGovernment=O governo de %colony% é ineficiente. Foram aplicadas
 model.colony.goodGovernment=O governo tornou-se mais eficiente! A comunidade partidária dos Filhos da Liberdade em %colony% é igual ou excede os %number%% da população.
 model.colony.governmentImproved1=O governo de %colony% melhorou, mas ainda é ineficiente. As penas à produção ainda vigoram.
 model.colony.governmentImproved2=O governo de %colony% melhorou. As penas à produção cessaram.
+# Fuzzy
 model.colony.insufficientProduction=Podiam ser produzidos mais %outputAmount% de %outputType% na colónia %colony% se tivéssemos mais %inputAmount% de %inputType%.
 model.colony.lostGoodGovernment=O governo já não é tão eficiente. A comunidade partidária dos Filhos da Liberdade em %colony% já não é igual, nem excede, %number%% da população. A colónia já não recebe qualquer bónus de produção.
 model.colony.lostVeryGoodGovernment=O governo já não é tão eficiente. A comunidade partidária dos Filhos da Liberdade em %colony% já não é igual, nem excede, %number%% da população. Perderam-se alguns bónus de produção.
@@ -1521,12 +1522,17 @@ model.colony.veryBadGovernment=O governo de %colony% é muito ineficiente. Foram
 model.colony.veryGoodGovernment=O governo tornou-se mais eficiente! A comunidade partidária dos Filhos da Liberdade em %colony% é igual ou excede os %number%% da população.
 model.colonyTile.claim=(reivindicar %direction%)
 model.diplomaticTrade.receive.contact=Saudações fraternas da gloriosa %nation% nação.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Negociemos com a %nation%.
 model.diplomaticTrade.receive.trade=Consideremos a oferta comercial da %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=A %nation% está exigindo tributos de nós!
 model.diplomaticTrade.send.contact=Encontramos membros da nação %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Consideremos a nossa situação diplomática com a %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Proponhamos uma troca com a %nation% em %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Exigimos tributo da %nation% em %settlement%.
 model.direction.N.name=norte
 model.direction.NE.name=nordeste
@@ -1537,22 +1543,33 @@ model.direction.SW.name=sudoeste
 model.direction.W.name=oeste
 model.direction.NW.name=noroeste
 model.historyEventType.abandonColony.description=Abandonou a colónia de %colony%
+# Fuzzy
 model.historyEventType.ceaseFire.description=Cessar-fogo com %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Os %nation% descobrem a %city%, uma das Sete Cidades Douradas e um tesouro de %treasure% moedas de ouro.
+# Fuzzy
 model.historyEventType.colonyConquered.description=A sua colónia %colony% foi conquistada pelos %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=A sua colónia %colony% foi destruída pelos %nation%.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Destruiu o acampamento %settlement% dos %nation%.
+# Fuzzy
 model.historyEventType.declareWar.description=Guerra declarada com %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Os %nation% destroem os %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Descobre o Novo Mundo.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Os %nation% descobrem %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Aliança negociada com %nation%.
 model.historyEventType.foundColony.description=Fundou a colónia de %colony%.
 model.historyEventType.foundingFather.description=%father% entrou no Congresso Continental.
 model.historyEventType.independence.description=Conquistou a sua independência da Coroa!
+# Fuzzy
 model.historyEventType.meetNation.description=Encontra os %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Os %nation% já não estão presentes no Novo Mundo.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Os %loserNation% cederam todas as colónias no Novo Mundo aos %nation%.
 model.indianSettlement.mostHatedNone=Nenhum
 model.indianSettlement.mostHatedUnknown=Desconhecida
@@ -1603,6 +1620,7 @@ model.messageType.warehouseCapacity.name=Capacidade do Armazém
 model.messageType.warning.name=Avisos
 model.monarch.action.addToRef.no=Feito
 model.monarch.action.declarePeace.no=Feito
+# Fuzzy
 model.monarch.action.declareWar.text=A insolência dos %nation% obriga-nos a declarar-lhes guerra!
 model.monarch.action.declareWar.no=Feito
 # Fuzzy
@@ -1648,6 +1666,7 @@ model.noClaimReason.worked.description=Já há outro assentamento a usar estas t
 model.player.forces=Forças dos %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Depois de meses no mar, finalmente avistou a costa de um continente desconhecido. Navegue {{tag:%direction%|west=para oeste|east=para este|default=contra o vento}} para descobrir o Novo Mundo e reivindicá-lo para a Coroa.
+# Fuzzy
 model.player.waitingFor=À espera dos: %nation%
 model.regionType.coast.name=Costa
 model.regionType.coast.unknown=Zona Costeira desconhecida
@@ -1704,9 +1723,9 @@ model.unit.underRepair=Reparar(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1741,6 +1760,7 @@ model.colony.warehouseOverfull=O armazém de %colony% atingiu o limite de capaci
 model.colony.warehouseSoonFull=O seu armazém em %colony% excederá a capacidade para %goods% durante a próxima jogada. %amount% unidades de %goods% serão perdidas.
 model.colony.warehouseWaste=O seu armazém em %colony% excedeu a capacidade para %goods%. Perderam-se %waste% unidades.
 model.colonyTile.resourceExhausted=Recurso %resource% esgotado em %colony%
+# Fuzzy
 model.game.spanishSuccession=Vossa Excelência, a Guerra da Sucessão Espanhola na Europa terminou. No Tratado de Utrecht, os %loserNation% foram forçados a ceder todas as colónias do Novo Mundo aos %nation%!
 model.indianSettlement.mission.denounced=O seu missionário em %settlement% foi acusado e executado!
 model.indianSettlement.mission.destroyed=O seu missionário em %settlement% morreu na destruição do povoado.
@@ -1750,6 +1770,7 @@ model.player.autoRecruit=A agitação religiosa em %europe% forçam a emigraçã
 model.player.colonyGoodsParty.harbour=Seus colonos em %colony% jogaram %amount% unidades de %goods% ao mar, em protesto à taxação injusta pretendida pela Coroa!
 model.player.colonyGoodsParty.horses=Os seus colonos de %colony% libertaram %amount% cavalos em protesto contra estes impostos injustos da Coroa!
 model.player.colonyGoodsParty.landLocked=Seus colonos em %colony% queimaram %amount% unidades de %goods% no mercado em protesto a esta taxação injusta da Coroa!
+# Fuzzy
 model.player.dead.european=Vossa Excelência, os %nation% declararam a sua retirada incondicional dos assuntos do Novo Mundo!
 model.player.dead.native=Vossa Excelência, os %nation% foram destruídos.
 model.player.disaster.effect.colonyDestroyed=%colony% foi completamente destruída.
@@ -1759,12 +1780,16 @@ model.player.foundingFatherJoinedCongress=%foundingFather% ingressou no Congress
 model.player.interventionForceArrives=Chega a prometida Força de Intervenção!
 model.player.soLDecrease=Os partidários dos Filhos da Liberdade nas suas colónias caíram para %newSoL% por cento!
 model.player.soLIncrease=Os partidários dos Filhos da Liberdade nas suas colónias já aumentaram para %newSoL% por cento!
+# Fuzzy
 model.player.stance.alliance.declared=Vossa Excelência, os %nation% formaram uma aliança connosco!
 model.player.stance.alliance.others=Vossa Excelência, a nação %attacker% tem uma aliança com a nação %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Vossa Excelência, os %nation% aceitaram um acordo de cessar-fogo connosco!
 model.player.stance.ceaseFire.others=Vossa Excelência, a nação %attacker% acordou um cessar-fogo com os %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Vossa Excelência, os %nation% estão em paz connosco!
 model.player.stance.peace.others=Vossa Excelência, o exército %attacker% está em paz com o exército %defender%.
+# Fuzzy
 model.player.stance.war.declared=Más notícias, Vossa Excelência. Os %nation% declararam guerra contra nós!
 model.player.stance.war.others=Vossa Excelência, os %attacker% declararam guerra aos %defender%.
 combat.automaticDefence=%unit% em %colony% pegou em armas para defender a colónia!
@@ -1780,6 +1805,7 @@ combat.enemyShipEvaded=%enemyUnit% dos %enemyNation% escapou a um ataque por %un
 combat.enemyShipSunk=%unit% afundou %enemyUnit% dos %enemyNation%!
 combat.equipmentCaptured=Atenção, os guerreiros %nation% adquiriram %equipment%!
 combat.goodsStolen=%enemyUnit% dos %enemyNation% roubou %amount% %goods% de %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyUnit% dos %enemyNation% saqueou %amount% de %colony%.
 combat.indianRaid=Os nossos espiões relatam que os %nation% atacaram a colónia %colony% dos %colonyNation%.
 combat.indianSurprise=Os %nation% fazem um ataque surpresa à colónia %colony%, alarmando os nossos colonos. O chefe dos %nation% nega qualquer envolvimento.
@@ -1834,13 +1860,16 @@ error.couldNotSave=Ocorreu um erro enquanto tentava gravar o jogo!
 main.defaultPlayerName=Nome do Jogador
 main.javaVersion=É recomendada a versão do Java %minVersion% ou mais recente para iniciar o Freecol (%version% detetada, use --no-java-check para saltar esta verificação).
 main.memory=É necessário atribuir mais de %memory% bytes de memória para a JVM.\n  Reinicie o FreeCol com:  java -Xmx %minMemory%M -jar FreeCol.jar
+# Fuzzy
 client.choicePlayer=Por favor, escolha um jogador:
 metaServer.couldNotConnect=Desculpe, não foi possível ligar ao meta-servidor. Tente novamente mais tarde.
 metaServer.communicationError=Houve um erro na comunicação com o meta-servidor. Tente novamente mais tarde.
 abandonEducation.action.studying=estudas
 abandonEducation.action.teaching=ensino
+# Fuzzy
 abandonEducation.no=Não, continuar a educação
 abandonEducation.text=Se o seu %unit% abandonar %colony% irá abandonar a %action% no %building%. Tem a certeza que deseja continuar?
+# Fuzzy
 abandonEducation.yes=Sim, deixar a colónia
 abandonTeaching.text=Se o %unit% abandonar a %building% vai parar de ensinar. Tem a certeza que ele o deve fazer?
 armedUnitSettlement.attack=Atacar
@@ -1850,8 +1879,11 @@ buy.moreGold=Pedir para baixar o preço
 buy.takeOffer=Aceitar a oferta
 buy.text=Os %nation% gostariam de vender %goods% por %gold% moedas de ouro:
 clearTradeRoute.text=%unit% está atribuído à rota comercial %route%.  Definir o seu destino vai removê-lo da rota comercial.  Tem a certeza que deseja fazer isso?
+# Fuzzy
 confirmHostile.alliance=Não pode atacar uma nação aliada! Tem a certeza de que pretende quebrar a sua aliança com os %nation% e declarar guerra?
+# Fuzzy
 confirmHostile.ceaseFire=Assinou um cessar-fogo com os %nation%. Deseja mesmo atacar?
+# Fuzzy
 confirmHostile.peace=Está em paz com os %nation%. Deseja mesmo declarar guerra?
 error.noSuchFile=O ficheiro indicado não existe ou não é um ficheiro.
 # Fuzzy
@@ -1905,7 +1937,9 @@ defeated.text=Foi derrotado! Gostaria de:
 defeated.yes=Ficar e assistir
 defeatedSinglePlayer.text=Foi derrotado!\n\nEis chegada a terrível hora da noite, quando se escancaram os cemitérios e o inferno expele a sua pestilência sobre o mundo. Agora podia eu matar e cometer actos tão lúgubres que ao vê-los o dia tremeria.
 defeatedSinglePlayer.yes=Entrar no Modo de Vingança
+# Fuzzy
 diplomacy.offerAccepted=Os %nation% aceitaram a sua generosa oferta.
+# Fuzzy
 diplomacy.offerRejected=Os %nation% rejeitaram a sua generosa oferta.
 disbandUnit.text=Tem a certeza de que quer eliminar esta unidade?
 disbandUnit.yes=Dispersar
@@ -1948,7 +1982,9 @@ move.noAccessContact=Excelência, primeiro é necessário estabelecer contacto c
 move.noAccessGoods=Os %nation% não negociarão com um %unit% vazio.
 move.noAccessSettlement=Os %nation% não permitem que a unidade %unit% entre no seu acampamento.
 move.noAccessSkill=%unit% não pode aprender com os indígenas.
+# Fuzzy
 move.noAccessTrade=Não temos a autoridade necessária para efetuar trocas comerciais com outras nações europeias, como os %nation%.
+# Fuzzy
 move.noAccessWar=Não podemos fazer trocas comerciais com os %nation% enquanto estivermos em guerra.
 move.noAccessWater=O nosso %unit% tem de desembarcar antes de entrar no acampamento.
 move.noAttackWater=A nossa unidade %unit% tem de estar em terra para atacar.
@@ -2085,6 +2121,7 @@ colopedia.unit.offensivePower=Poder Ofensivo:
 colopedia.unit.price=Preço na Europa:
 colopedia.unit.productionBonus={{plural:%number%|one=Modificador|other=Modificadores}} de produção:
 colopedia.unit.requirements=Requisitos:
+# Fuzzy
 colopedia.unit.school=Escola necessária para treinar:
 colopedia.unit.skill=Nível de Profissão:
 report.labour.allColonists=Todos os Colonos
@@ -2117,19 +2154,14 @@ report.colony.exploring.description=%colony% iria beneficiar da exploração de
 report.colony.grow.description=Número de unidades que a colónia pode albergar sem prejudicar a produção
 report.colony.grow.header=+
 report.colony.improve.header=Melhorar
-report.colony.wanting.description=%colony%: Para produzir mais %amount% de %goods% adicione %unit%
 report.colony.making.description=O que esta colónia está a produzir
 report.colony.making.header=A fabricar
 report.colony.making.noconstruction.description=%colony%: Nada está a ser construído.
 report.colony.name.description=A lista de colónias
 report.colony.name.header=Colónia
-report.colony.plow.description=Número de terrenos da colónia que iriam beneficiar se fossem arados
-report.colony.plow.header=A
-report.colony.plowing.description=%colony% iria beneficiar se ara-se {{plural:%amount%|one=um terreno|other=%amount% terrenos}}
-report.colony.road.description=Número de terrenos da colónia que iriam beneficiar se fosse construída uma estrada
-report.colony.road.header=E
-report.colony.roadBuilding.description=%colony% iria beneficiar da construção de {{plural:%amount%|one=uma estrada|other=%amount% estradas}}
 report.colony.starving.description=%colony%: haverá fome {{plural:%turns%|one=no próximo turno|other=em %turns% turnos}}
+# Fuzzy
+report.colony.wanting.description=%colony%: Para produzir mais %amount% de %goods% adicione %unit%
 report.continentalCongress.available=Disponível
 # Fuzzy
 report.continentalCongress.elected=Eleito:
@@ -2173,26 +2205,25 @@ report.production.selectGoods=Selecionar bens
 report.production.update=Atualizar
 report.requirements.badAssignment=A colónia %colony% tem um %expert% a trabalhar como %expertWork%, enquanto um %nonExpert% está a trabalhar como %nonExpertWork%. A produção seria maior se os colonos trocassem de funções.
 report.requirements.canTrainExperts=As unidades {{plural:2|%unit%}} podem ser treinadas em
-report.requirements.clearTile=%type%, a %direction% de %colony% ficaria melhor com um derrube.
+# Fuzzy
 report.requirements.exploreTile=%type%, a %direction% de %colony%, sairia beneficiada com exploração.
 report.requirements.met=Todos os requisitos foram atingidos.
 report.requirements.missingGoods=%colony% está a produzir %goods%, mas precisa de mais %input%.
 report.requirements.misusedExperts=Há {{plural:2|%unit%}} que não estão a trabalhar como %work% em
 report.requirements.noExpert=A colónia %colony% está a produzir %goods%, mas não tem um %unit%.
-report.requirements.plowCenter=%colony% ficaria melhor se arasse o terreno.
-report.requirements.plowTile=%type%, a %direction% de %colony%, ficaria melhor se arasse o terreno.
-report.requirements.roadTile=%type% a %direction% de %colony% ficaria melhor com uma estrada.
 report.requirements.severalExperts=Há diversas unidades de {{plural:2|%unit%}} em
 report.requirements.surplus=Está a ser produzido um excedente de %goods% em
 report.trade.afterTaxes=Receita após os impostos
 report.trade.beforeTaxes=Receita antes dos impostos
 report.trade.cargoUnits=Unidades na Carga
+# Fuzzy
 report.trade.hasCustomHouse=* Esta colónia tem uma alfândega; estas mercadorias são exportadas.
 report.trade.totalDelta=Total de Produção
 report.trade.totalUnits=Total de Unidades
 report.trade.unitsSold=Unidades compradas ou vendidas
 report.turn.filter=Não mostrar este tipo de mensagens (%type%)
 report.turn.ignore=Ignorar esta mensagem (Colónia: %colony%, Mercadorias: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% de %player%
 aboutPanel.copyright=Copyright © 2002-2015 A Equipa do FreeCol
 aboutPanel.legalDisclaimer=O FreeCol é software livre: pode redistribuí-lo ou modificá-lo nos termos da GNU General Public License tal como publicada pela Free Software Foundation, versão 2 da Licença ou qualquer versão posterior.
@@ -2218,6 +2249,7 @@ chooseFoundingFatherDialog.title=Nomear Pais Fundadores
 colonyPanel.colonyUnits=Unidades da colónia
 colonyPanel.inPort=No porto
 colonyPanel.outsideColony=Colónia Externa
+# Fuzzy
 colonyPanel.producing=Produção:
 colonyPanel.reducePopulation=Se reduzir a população abaixo de %number%, a colónia %colony% não poderá construir %buildable%.
 colonyPanel.unitChange=Ao entrar na sua colónia, a unidade %oldType% tornou-se em %newType%.
@@ -2229,7 +2261,9 @@ colonyPanel.notBestTile=%unit% poderia produzir mais %goods% em %tile%.
 confirmDeclarationDialog.areYouSure.no=Talvez Mais Tarde
 confirmDeclarationDialog.areYouSure.text=Renunciemos à tirania injusta de %monarch% e declaremos a independência da coroa para as nossas colónias!
 confirmDeclarationDialog.areYouSure.yes=A Liberdade ou a Morte!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Estados Unidos de %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% Livre
 confirmDeclarationDialog.enterCountry=De ora em diante, o nosso país será conhecido por
 confirmDeclarationDialog.enterNation=e todos os cidadãos da nossa gloriosa nação terão orgulho em serem conhecidos por
@@ -2241,8 +2275,10 @@ negotiationDialog.add=Adicionar
 negotiationDialog.cancel=Cancelar
 negotiationDialog.clear=Limpar
 negotiationDialog.contact.tutorial=Encontras companheiros europeus. Eles competirão contigo por terras e riquezas e poderão até declarar guerra contra ti. Mas depois que Jan de Witt tenha se juntado ao Congresso Continental, poderás negociar com eles.
+# Fuzzy
 negotiationDialog.demand=Os %nation% exigem aos %otherNation%
 negotiationDialog.exchange=em troca por
+# Fuzzy
 negotiationDialog.offer=Os %nation% oferecem aos %otherNation%
 negotiationDialog.send=Enviar
 negotiationDialog.title.contact=Encontrando Companheiros Europeus
@@ -2261,8 +2297,6 @@ europePanel.transaction.price=Preço:\t%gold%
 europePanel.transaction.purchase=Comprar %amount% %goods% por %gold% de ouro
 europePanel.transaction.sale=Vender %amount% %goods% @%gold%
 europePanel.transaction.tax=-%tax%%:\t%gold%
-firstContactDialog.meeting.AZTEC=A nação Asteca...
-firstContactDialog.meeting.INCA=O império Inca...
 firstContactDialog.welcomeOffer.text=Os %nation% dão-lhe as boas vindas. Somos uma nação gloriosa de %camps% %settlementType%. Para celebrar a nossa amizade, oferecemos-lhe a terra que ocupa agora. Aceita o nosso tratado e viver em paz connosco, como irmãos?
 firstContactDialog.welcomeSimple.text=Os %nation% dão-lhe as boas vindas. Somos uma nação gloriosa de %camps% %settlementType%. Aceita o nosso tratado e viver em paz connosco, como irmãos?
 abandonColony.no=Cancelar
diff --git a/data/strings/FreeColMessages_qqq.properties b/data/strings/FreeColMessages_qqq.properties
index 50368d033..6287d569b 100644
--- a/data/strings/FreeColMessages_qqq.properties
+++ b/data/strings/FreeColMessages_qqq.properties
@@ -170,7 +170,6 @@ colopediaAction.fathers.name=[[Image:Freecol-colopedia-depot.png|thumb]]
 colopediaAction.goods.name=[[Image:Freecol-colopedia-improvements.jpg|thumb]]\n{{Identical|Goods}}
 colopediaAction.nations.name=[[Image:Freecol-colopedia-depot.png|thumb]]\n{{Identical|Nation}}
 colopediaAction.resources.name=[[Image:Freecol-colopedia-improvements.jpg|thumb]]
-colopediaAction.skills.name=[[Image:Freecol-colopedia-depot.png|thumb]]
 colopediaAction.terrain.name=[[Image:Freecol-colopedia-improvements.jpg|thumb]]
 colopediaAction.units.name=[[Image:Freecol-colopedia-prairie.jpg|thumb]]\n{{Identical|Unit}}
 continueAction.accelerator={{optional}}
@@ -452,6 +451,7 @@ model.unit.hardyPioneer.workingAs={{Identical|Pioneer}}
 model.unit.seasonedScout.workingAs={{Identical|Scout}}
 model.unit.veteranSoldier.workingAs={{Identical|Soldier}}
 model.abstractGoods.label={{optional}}
+model.colony.insufficientProduction=Consumption deficit is a comma separated list of goods labels (e.g. "2 furs")
 model.direction.N.name=Unused at this time.
 model.historyEventType.meetNation.description=Used in "History report". Format is: YYYY (message)
 model.indianSettlement.mostHatedNone={{Identical|None}}
@@ -496,7 +496,6 @@ model.unit.occupation.underRepair=A symbol; shorthand for the action a specific
 model.unit.occupation.unknown=A symbol; shorthand for the action a specific unit is doing on the map. See [http://www.freecol.org/images/screen-0.8.0-large.jpg example screenshot].
 model.unit.unitState.fortified=A symbol; shorthand for the action a specific unit is doing on the map. See [http://www.freecol.org/images/screen-0.8.0-large.jpg example screenshot].
 model.unit.unitState.fortifying=A symbol; shorthand for the action a specific unit is doing on the map. See [http://www.freecol.org/images/screen-0.8.0-large.jpg example screenshot].
-model.unit.unitState.improving=A symbol; shorthand for the action a specific unit is doing on the map. See [http://www.freecol.org/images/screen-0.8.0-large.jpg example screenshot].
 model.unit.unitState.inColony=A symbol; shorthand for the action a specific unit is doing on the map. See [http://www.freecol.org/images/screen-0.8.0-large.jpg example screenshot].
 model.unit.unitState.sentry=A symbol; shorthand for the action a specific unit is doing on the map. See [http://www.freecol.org/images/screen-0.8.0-large.jpg example screenshot].
 model.unit.unitState.skipped=A symbol; shorthand for the action a specific unit is doing on the map. See [http://www.freecol.org/images/screen-0.8.0-large.jpg example screenshot].
@@ -504,7 +503,6 @@ model.unit.unitState.toAmerica=A symbol; shorthand for the action a specific uni
 model.unit.unitState.toEurope=A symbol; shorthand for the action a specific unit is doing on the map. See [http://www.freecol.org/images/screen-0.8.0-large.jpg example screenshot].
 model.noAddReason.ownedByEnemy.description=Эта территория принадлежит другой нации.
 model.colony.customs.sale=A prefix for customs sales at a colony.  The %data% part will be multiple instances of customs.saleData messages.
-model.colony.insufficientProduction=Consumption deficit is a comma separated list of goods labels (e.g. "2 furs")
 model.region.north.name={{Identical|North}}
 model.region.center.name={{Identical|Center}}
 main.defaultPlayerName={{Identical|Player name}}
@@ -561,10 +559,8 @@ report.labour.sutdent={{Identical|Student}}
 report.labour.workingAsOther={{Identical|Other}}
 report.colony.explore.header=Very narrow column, choose a single letter from the capitalized word in report.colony.explore.description
 report.colony.improving.description=HTML has been removed from a previous version of this source message.
-report.colony.wanting.description=HTML was removed from a previous version of the source message
 report.colony.name.header={{Identical|Colony}}
-report.colony.plow.header=Very narrow column, choose a single letter from the capitalized word in report.colony.plow.description
-report.colony.road.header=Very narrow column, choose a single letter from the capitalized word in report.colony.road.description
+report.colony.wanting.description=HTML was removed from a previous version of the source message
 report.continentalCongress.none={{Identical|None}}
 report.highScores.difficulty={{Identical|Difficulty}}
 report.highScores.nation={{Identical|Nation}}
diff --git a/data/strings/FreeColMessages_ru.properties b/data/strings/FreeColMessages_ru.properties
index 5c94433c1..5e858500b 100644
--- a/data/strings/FreeColMessages_ru.properties
+++ b/data/strings/FreeColMessages_ru.properties
@@ -25,6 +25,7 @@
 # Author: Nanotranslate
 # Author: Neism
 # Author: Nirovulf
+# Author: Nzeemin
 # Author: Oashnic
 # Author: Okras
 # Author: Phhh
@@ -259,6 +260,7 @@ menuBar.debug.addLiberty=Добавить очки свободы в кажду
 menuBar.debug.compareMaps.checkComplete=Проверка завершена. Рассинхронизации не обнаружено.
 menuBar.debug.compareMaps.problem=Возможны проблемы. Пожалуйста, прочтите информацию со стандартного вывода.
 menuBar.debug.compareMaps=Проверить рассинхронизация карты
+menuBar.debug.displayAIMissions=Показать ИИ миссии
 menuBar.debug.displayErrorMessage=Отображать сообщение об ошибке
 menuBar.debug.displayEuropeStatus=Отобразить статус Европы
 menuBar.debug.displayMonarchPanel=Отображать панель Монарха
@@ -301,7 +303,6 @@ colopediaAction.goods.name=Товары
 colopediaAction.nations.name=Нации
 colopediaAction.nationTypes.name=Национальные преимущества
 colopediaAction.resources.name=Бонусные ресурсы
-colopediaAction.skills.name=Умения
 colopediaAction.terrain.name=Тип местности
 colopediaAction.units.name=Соединения
 colopediaAction.name=%object% (Колопедия)
@@ -489,10 +490,13 @@ model.option.buildOnNativeLand.never.name=Никогда
 model.option.buildOnNativeLand.never.shortDescription=Строительство на индейской земле не разрешено.
 model.option.settlementNumber.name=Количество поселений индейцев
 model.option.settlementNumber.shortDescription=Настройка количества поселений индейцев на генерируемой карте.
+model.option.settlementNumber.verySmall.name=Маленький
 model.option.settlementNumber.verySmall.shortDescription=Небольшое количество местных поселений
 model.option.settlementNumber.small.name=Маленький
 model.option.settlementNumber.small.shortDescription=Небольшое количество местных поселений
+model.option.settlementNumber.medium.name=Средний
 model.option.settlementNumber.medium.shortDescription=Среднее количество местных посеелений
+model.option.settlementNumber.large.name=Большой
 model.option.settlementNumber.large.shortDescription=Большое количество местных поселений
 model.option.settlementNumber.veryLarge.name=Очень большой
 model.option.settlementNumber.veryLarge.shortDescription=Многочисленные местные поселения
@@ -654,6 +658,8 @@ model.option.lastYear.name=Последний год игры
 model.option.lastYear.shortDescription=Самый последний год в игре.
 model.option.lastColonialYear.name=Последний год игры за колонию
 model.option.lastColonialYear.shortDescription=Самый последний год игры для колониального игрока (не объявившего о независимости).
+model.option.seasons.name=Времена года
+model.option.seasons.shortDescription=Количество времён года в году
 gameOptions.prices.name=Параметры цены
 gameOptions.prices.shortDescription=Содержит созданные игрой параметры управления начальной ценой.
 model.option.food.minimumPrice.name=Минимальная начальная цена на продовольствие
@@ -747,11 +753,13 @@ model.option.riverNumber.medium.name=Средний
 model.option.riverNumber.medium.shortDescription=Умеренное количество рек
 model.option.riverNumber.large.name=Обширный
 model.option.riverNumber.large.shortDescription=Большое количество рек
+model.option.riverNumber.veryLarge.name=Очень большой
 model.option.riverNumber.veryLarge.shortDescription=Полноводные реки
 model.option.mountainNumber.name=Процент гор
 model.option.mountainNumber.shortDescription=Настройка для определения количества гор на генерируемых картах.
 model.option.mountainNumber.verySmall.name=Очень маленький
 model.option.mountainNumber.verySmall.shortDescription=Совсем мало гор
+model.option.mountainNumber.small.name=Малый
 model.option.mountainNumber.small.shortDescription=Мало гор
 model.option.mountainNumber.medium.name=Средний
 model.option.mountainNumber.medium.shortDescription=Умеренное количество гор
@@ -761,6 +769,7 @@ model.option.mountainNumber.veryLarge.name=Очень большой
 model.option.rumourNumber.name=Процент слухов
 model.option.rumourNumber.shortDescription=Опция для настройки количества слухов о Затерянном городе на создаваемой карте.
 model.option.rumourNumber.verySmall.name=Очень маленький
+model.option.rumourNumber.small.name=Малый
 model.option.rumourNumber.small.shortDescription=Мало слухов
 model.option.rumourNumber.medium.name=Средний
 model.option.rumourNumber.large.name=Большой
@@ -780,9 +789,15 @@ model.option.forestNumber.veryLarge.shortDescription=Многочисленны
 model.option.bonusNumber.name=Процент бонусных клеток
 model.option.bonusNumber.shortDescription=Настройка для определения количества бонусных клеток на генерируемых картах.
 model.option.bonusNumber.verySmall.name=Очень маленький
+model.option.bonusNumber.verySmall.shortDescription=Очень мало бонусов
+model.option.bonusNumber.small.name=Мало
+model.option.bonusNumber.small.shortDescription=Малое количество бонусов
 model.option.bonusNumber.medium.name=Средний
+model.option.bonusNumber.medium.shortDescription=Умеренное количество бонусов
 model.option.bonusNumber.large.name=Обширный
+model.option.bonusNumber.large.shortDescription=Большое количество бонусов
 model.option.bonusNumber.veryLarge.name=Очень большой
+model.option.bonusNumber.veryLarge.shortDescription=Многочисленные бонусы
 model.option.humidity.name=Влажность
 model.option.humidity.shortDescription=Настройка средней влажности карты.
 model.option.humidity.veryDry.name=Очень Сухой
@@ -822,6 +837,7 @@ model.option.importSettlements.shortDescription=Позволяет импорт
 clientOptions.name=Настройки
 clientOptions.shortDescription=Опции клиента
 clientOptions.personal.name=Личные
+clientOptions.personal.shortDescription=Настройки специфичные для конкретного игрока.
 model.option.playerName.name=Имя игрока:
 clientOptions.gui.name=Настройки экрана
 clientOptions.gui.shortDescription=Содержит установки для настройки внешнего вида игры.
@@ -868,6 +884,10 @@ model.option.miniMapToggleBorders.name=Переключить границы н
 model.option.miniMapToggleBorders.shortDescription=Если выбрано: Рисовать границы на мини-карте.
 model.option.mapControls.name=Карта управления
 model.option.mapControls.shortDescription=Какой тип карты управления нужно отобразить?
+clientOptions.gui.mapControls.CornerMapControls.name=Углы
+clientOptions.gui.mapControls.CornerMapControls.shortDescription=Элементы управления картой занимают углы и нижний край.
+clientOptions.gui.mapControls.ClassicMapControls.name=Классический
+clientOptions.gui.mapControls.ClassicMapControls.shortDescription=Элементы управления картой занимают правый край.
 model.option.color.background.name=Цвет фона
 model.option.color.background.shortDescription=Этот цвет окружает карту на максимальном масштабе, обозначает «туман войны».
 clientOptions.minimap.color.background.black=Чёрный
@@ -971,8 +991,13 @@ model.option.guiShowNotBestTile.name=Не лучшая клетка
 model.option.guiShowNotBestTile.shortDescription=Определяет, следует ли предупреждать, что подразделение работает не на лучшей доступной клетке
 model.option.colonyReport.name=Отчет по колонии
 model.option.colonyReport.shortDescription=Краткая информация о деятельности в каждой колонии.
+clientOptions.messages.colonyReport.classic.name=Классический
+clientOptions.messages.colonyReport.compact.name=Компактный
 model.option.labourReport.name=Отчёт о труде
 model.option.labourReport.shortDescription=Краткая информация о деятельности каждого подразделения
+clientOptions.messages.labourReport.classic.name=Классический
+clientOptions.messages.labourReport.compact.name=Компактный
+clientOptions.messages.labourReport.compact.shortDescription=Более компактная версия классического отчета.
 clientOptions.savegames.name=Сохранённые игры
 clientOptions.savegames.shortDescription=Сохранённые игры
 model.option.showSavegameSettings.name=Диалог сохранения игры:
@@ -1569,6 +1594,7 @@ model.improvement.road.description=Дорога
 model.improvement.road.name=Дорога
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Лимит прибрежных колоний
+# Fuzzy
 model.limit.independence.coastalColonies.description=Для объявления независимости необходимо иметь не менее %limit% прибрежных колоний.
 model.limit.independence.rebels.name=Рубеж восстания
 model.limit.independence.rebels.description=По меньшей мере, %limit%% ваших колонистов должны поддерживать независимость.
@@ -1922,6 +1948,7 @@ model.colony.badGovernment=Правительство колонии %colony% н
 model.colony.goodGovernment=Эффективность правительства улучшена! Повстанческие настроения в колонии %colony% теперь равняются или превышают %number% процентов.
 model.colony.governmentImproved1=Правительство колонии %colony% улучшено, но всё ещё неэффективно. По-прежнему накладываются штрафы на производство.
 model.colony.governmentImproved2=Правительство колонии %colony% улучшено. Штрафы на производство больше не накладываются.
+# Fuzzy
 model.colony.insufficientProduction=На %outputAmount% %outputType% больше может быть произведено в колонии %colony%, если бы там было на %inputAmount% %inputType% больше.
 model.colony.lostGoodGovernment=Эффективность правительства снизилась! Повстанческие настроения в колонии %colony% уже не равны или не превышают %number% процентов. Колония больше не имеет производственного бонуса.
 model.colony.lostVeryGoodGovernment=Эффективность правительства снизилась! Повстанческие настроения в колонии %colony% уже не равны или не превышают %number% процентов. Некоторые производственные бонусы были потеряны.
@@ -1936,12 +1963,17 @@ model.colony.veryBadGovernment=Правительство колонии %colony
 model.colony.veryGoodGovernment=Эффективность правительства улучшена! Повстанческие настроения в колонии %colony% теперь равняются или превышают %number% процентов.
 model.colonyTile.claim=(претендует на %direction%)
 model.diplomaticTrade.receive.contact=Братский привет от славной нации %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Давайте вести переговоры с %nation%.
 model.diplomaticTrade.receive.trade=Давайте рассмотрим торговое предложение нации %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=%nation% требуют с нас дань!
 model.diplomaticTrade.send.contact=Мы встретились с представителями нации %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Давайте рассмотрим нашу дипломатическую ситуацию с нацией %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Позвольте нам предложить торговлю с нацией %nation% в поселении %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Мы требуем дани с %nation% в поселении %settlement%.
 model.direction.N.name=север
 model.direction.NE.name=северо-восток
@@ -1952,25 +1984,37 @@ model.direction.SW.name=юго-запад
 model.direction.W.name=запад
 model.direction.NW.name=северо-запад
 model.historyEventType.abandonColony.description=Вы оставили колонию %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Прекратить боевые действия против %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation% обнаружили %city%, один из Семи Золотых Городов. Добыча составила %treasure% золота.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Ваша колония %colony% захвачена {{tag:with|%nation%}}.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Ваша колония %colony% уничтожена {{tag:with|%nation%}}.
 # Fuzzy
 model.historyEventType.conquerColony.description=Вы приняли наши щедрые условия сделки и еще уклоняетесь от оплаты? Такая двойственность сильно расстраивает нас.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Вы уничтожили %settlement%, поселение {{tag:of|%nation%}}.
+# Fuzzy
 model.historyEventType.declareWar.description=Объявлена война с %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% уничтожили {{tag:of|%nativeNation%}}.
 model.historyEventType.discoverNewWorld.description=Вы открыли Новый Свет.
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation% открыли %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Альянс вел переговоры с %nation%.
 model.historyEventType.foundColony.description=Вы основали колонию %colony%.
 model.historyEventType.foundingFather.description=%father% присоединился к Континентальному конгрессу.
 model.historyEventType.independence.description=Вы достигли независимости от Короны.
+# Fuzzy
 model.historyEventType.makePeace.description=Объявлено согласие на мир с %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Вы встретили {{tag:of|%nation%}}.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=В Новом Свете больше не осталось {{tag:of|%nation%}}.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% передали все свои колонии Нового Света нации %nation%.
 model.indianSettlement.mostHatedNone=нет
 model.indianSettlement.mostHatedUnknown=Неизвестно
@@ -1984,6 +2028,8 @@ model.indianSettlement.tension.happy=Люди племени %nation% счаст
 model.indianSettlement.tension.hateful=Воины племени %nation% потрясают оружием. Они украсили свои пояса скальпами поверженных врагов, а их инструменты для пыток несут следы интенсивного использования.
 model.indianSettlement.tension.unknown=Неизвестно
 model.indianSettlement.tension.wary=Отзывчивы
+model.indianSettlement.wantedGoodsNone=Нет
+model.indianSettlement.wantedGoodsUnknown=Неизвестно
 model.lostCityRumour.burialGround.description=Вы осквернили священные кладбища {{tag:of|%nation%}}! Поэтому, вы должны умереть!
 model.lostCityRumour.cibola.description=Вы обнаружили %city%, один из Семи Золотых Городов. Стоимость добытых сокровищ составляет %money%! Доставьте обоз с сокровищами в одну из своих колоний, чтобы получить за них деньги, или отправьте его в Европу на галеоне.
 model.lostCityRumour.colonist.description=Вы встретили выживших людей из затерянной колонии. В обмен на еду они клянутся в верности престолу!
@@ -2021,8 +2067,10 @@ model.messageType.warehouseCapacity.name=Вместимость склада
 model.messageType.warning.name=Предупреждения
 model.monarch.action.addToRef.text=Король добавил %number% {{plural:%number%|%unit%}} к численности Королевского Экспедиционного Войска. Правители колоний выражают обеспокоенность.
 model.monarch.action.addToRef.no=Готово
+# Fuzzy
 model.monarch.action.declarePeace.text=Мы любезно согласились на мирный договор с {{tag:with|%nation%}}.
 model.monarch.action.declarePeace.no=Готово
+# Fuzzy
 model.monarch.action.declareWar.text=Нахальство {{tag:of|%nation%}} принуждает нас объявить им войну!
 model.monarch.action.declareWar.no=Готово
 # Fuzzy
@@ -2070,6 +2118,7 @@ model.nationState.available.name=доступна
 # Fuzzy
 model.nationState.available.shortDescription=Вы завоевали колонию %colony% у {{tag:of|%nation%}}.
 model.nationState.notAvailable.name=недоступна
+model.nationState.notAvailable.shortDescription=Эта нация не доступна
 model.noClaimReason.europeans.description=Эта земля принадлежит другой европейской нации.
 model.noClaimReason.natives.description=На эту землю претендует племя дикарей.
 model.noClaimReason.occupied.description=Эта земля оккупирована опасным врагом.
@@ -2082,6 +2131,7 @@ model.player.colonialIndependence=Только колониальные игро
 model.player.forces=Войска {{tag:of|%nation%}}
 model.player.independentMarket=Европа
 model.player.startGame=После нескольких месяцев плавания, вы прибыли, наконец, к побережью неизвестного континента. Плывите на {{tag:%direction%|west=запад|east=восток|default=по направлению ветра}}, чтобы исследовать Новый Свет и объявить его собственностью Короны.
+# Fuzzy
 model.player.waitingFor=Ждём: %nation%
 model.regionType.coast.name=Побережье
 model.regionType.coast.unknown=Неизвестное побережье
@@ -2121,6 +2171,7 @@ model.tradeItem.gold.name=Золото
 model.tradeItem.gold.description=сумма в %amount% золотых
 model.tradeItem.goods.name=Товары
 model.tradeItem.incite.name=Объявить войну
+# Fuzzy
 model.tradeItem.incite.description=война против %nation%
 model.tradeItem.stance.name=Состояние
 model.tradeItem.unit.name=Юнит
@@ -2144,9 +2195,9 @@ model.unit.underRepair=В ремонте ({{plural:%turns%|one=остался|ot
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -2187,6 +2238,7 @@ model.colony.warehouseSoonFull=Ваш склад в колонии %colony% со
 model.colony.warehouseWaste=Ваш склад в колонии %colony% содержит слишком много %goods%. %waste% пришлось выбросить.
 model.colony.workersEvicted=В %colony% ваши колонисты не могут больше работать в %location% из-за присутствия %enemyUnit%.
 model.colonyTile.resourceExhausted=В колонии %colony% исчерпан ресурс %resource%
+# Fuzzy
 model.game.spanishSuccession=Ваше Превосходительство, в Европе закончилась война за Испанское наследство. По Утрехтскому мирному договору %loserNation% были вынуждены передать все свои колонии в Новом Свете нации %nation%!
 model.indianSettlement.mission.denounced=Вашего миссионера в поселении %settlement% осудили и казнили!
 model.indianSettlement.mission.destroyed=Ваш миссионер погиб при уничтожении поселения %settlement%.
@@ -2196,6 +2248,7 @@ model.player.autoRecruit=Религиозные беспорядки в %europe%
 model.player.colonyGoodsParty.harbour=Ваши колонисты в колонии %colony% выбросили %amount% единиц %goods% в гавань в знак протеста против этого несправедливого налогообложения со стороны Короны!
 model.player.colonyGoodsParty.horses=Ваши колонисты в колонии %colony% выпустили на волю %amount% лошадей в знак протеста против несправедливого налогообложения Короной!
 model.player.colonyGoodsParty.landLocked=Ваши колонисты в колонии %colony% сожгли %amount% единиц %goods% на рынке в знак протеста против этого несправедливого налогообложения со стороны Короны!
+# Fuzzy
 model.player.dead.european=Ваше Превосходительство, %nation% заявили о безусловном выводе из дел Нового Света!
 model.player.dead.native=Ваше Превосходительство, %nation% уничтожены.
 model.player.disaster.bankruptcy.start=Вы не способны оплатить обслуживание всех зданий. Применены производственные штрафы.
@@ -2209,12 +2262,16 @@ model.player.ignoredTax=Престол повысил ставку налога
 model.player.interventionForceArrives=Обещанное подкрепление от интервенции прибыло.
 model.player.soLDecrease=Членство сыновей свободы в Ваших колониях упало до %newSoL% процентов!
 model.player.soLIncrease=Членство сыновей свободы в Ваших колониях поднялось до %newSoL% процентов!
+# Fuzzy
 model.player.stance.alliance.declared=Ваше Превосходительство, у {{tag:of|%nation%}} с нами заключен союз!
 model.player.stance.alliance.others=Ваше Превосходительство, %attacker% имеют союз с %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Ваше Превосходительство, у {{tag:of|%nation%}} с нами договор о прекращении огня!
 model.player.stance.ceaseFire.others=Ваше Превосходительство, %attacker% имеют договор о прекращении огня с %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Ваше Превосходительство, у {{tag:of|%nation%}} с нами заключен мир!
 model.player.stance.peace.others=Ваше Превосходительство, между %attacker% и %defender% мир.
+# Fuzzy
 model.player.stance.war.declared=Плохие новости, Ваше Превосходительство, %nation% объявили нам войну!
 model.player.stance.war.others=Ваше Превосходительство, %attacker% объявили войну %defender%.
 combat.automaticDefence=Ваш %unit% из колонии %colony% взялся за оружие для защиты своей колонии!
@@ -2230,6 +2287,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% удалось уклонить
 combat.enemyShipSunk=%unit% потопил %enemyNation% %enemyUnit%!
 combat.equipmentCaptured=Внимание, воины {{tag:of|%nation%}} раздобыли %equipment%!
 combat.goodsStolen=%enemyUnit% {{tag:of|%enemyNation%}} выкрал %amount% %goods% из колонии %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyUnit% {{tag:of|%enemyNation%}} награбил %amount% в колонии %colony%.
 combat.indianRaid=Наша разведка доложила, что %nation% совершили нападение на колонию {{tag:of|%colonyNation%}} %colony%.
 combat.indianSurprise=%nation% совершают неожиданный набег на колонию %colony%, встревожив наших колонизаторов. Правитель {{tag:of|%nation%}} отрицает причастность своего народа к этому набегу.
@@ -2286,6 +2344,7 @@ main.javaVersion=Для запуска FreeCol рекомендуется Java 
 main.memory=Необходимо назначить более %memory% байт памяти для JVM.\n  Перезапустите FreeCol с: java-Xmx%minMemory%М-jar FreeCol.jar
 main.userDir.fail=FreeCol не может найти подходящих каталогов для сохранения пользовательских данных. Продолжаем, но ждите неприятностей.
 client.baseData=Не удалось найти каталог базы данных  %dir%. FreeCol не удалось найти файлы данных. Убедитесь, что они существуют. Если FreeCol ищет в неверной директории, тогда запустите игру с параметром командной строки:  --freecol-data<data-directory>
+# Fuzzy
 client.choicePlayer=Выберите игрока:
 client.classic=Не удалось загрузить ресурс из набора правил `классический'.
 client.debugConnect=Вы не можете подключиться к этой игре в режиме отладки.
@@ -2298,8 +2357,10 @@ metaServer.couldNotConnect=Извините, не могу подключить
 metaServer.communicationError=Во время общения с мета-сервером возникла ошибка. Пожалуйста, поброуйте позже.
 abandonEducation.action.studying=изучение
 abandonEducation.action.teaching=обучение
+# Fuzzy
 abandonEducation.no=Нет, продолжить обучение
 abandonEducation.text=Если ваш %unit% покинет колонию %colony%, он откажется от %action% в %building%, вы уверены?
+# Fuzzy
 abandonEducation.yes=Да, покинуть колонию
 abandonTeaching.text=Если %unit% покинет %building% он прекратит обучение, вы уверены что ему пора это сделать?
 armedUnitSettlement.attack=Атаковать
@@ -2311,10 +2372,14 @@ buy.takeOffer=Принять предложение
 buy.text=%nation% желают продать %goods% за %gold%:
 clearTradeRoute.text=Ваш %unit% назначен на торговый путь %route%. Установка назначения уберёт его с торгово пути. Вы уверены, что хотите это сделать?
 client.fullScreen=Видеокарта или драйвер к ней не поддерживает полноэкранный режим.\nВозвращаюсь в оконный режим.
+# Fuzzy
 confirmHostile.alliance=Вы не можете атаковать союзников! Вы желаете расторгнуть союз с {{tag:with|%nation%}} и объявить войну?
+# Fuzzy
 confirmHostile.ceaseFire=Вы подписывали договор о прекращении огня с {{tag:with|%nation%}}. Вы действительно хотите атаковать?
+# Fuzzy
 confirmHostile.peace=Сейчас у вас мир с {{tag:with|%nation%}}. Вы действительно хотите объявить войну?
 confirmHostile.yes=Да, спустить псов войны!
+# Fuzzy
 confirmTribute.broke=Наши шпионы сообщают, что народ «%nation%» совершенно сломлены. Не стоит медлить - потребуем с них дань.
 confirmTribute.european=Народ «%nation%» %danger% и %finance%.  Какой данью стоит их обложить?
 confirmTribute.happy=Народ «%nation%» из поселения «%settlement%» - наши добрые друзья, было бы жалко разрушить узы братства.
@@ -2334,6 +2399,7 @@ indianLand.cancel=Покинуть землю
 indianLand.pay=Предложить %amount% золотых за землю
 indianLand.take=Взять то, что по праву наше
 indianLand.text=Эта земля принадлежит игроку %player%. Что вы хотите:
+# Fuzzy
 indianLand.unknown=В этих землях живут какие-то неизвестные люди. Ваши пожелания:
 info.autodetectLanguageSelected=Вы выбрали автоматическое определение языка. Это будет сделано после перезапуска игры.
 info.enterSomeText=Пожалуйста, введите текст.
@@ -2379,7 +2445,9 @@ defeated.text=Вы потерпели поражение! Хотите ли Вы
 defeated.yes=Остаться и наблюдать
 defeatedSinglePlayer.text=Вы потерпели поражение!\n\nС этого момента настало время дьявольской ночи, когда церковь спит и ад выдыхает болезни в этот мир, когда я могу пить теплую кровь! и делать такие дела, что следующий день задрожит только от одного взгляда на них.
 defeatedSinglePlayer.yes=Перейти в режим мщения
+# Fuzzy
 diplomacy.offerAccepted=%nation% приняли ваше щедрое предложение.
+# Fuzzy
 diplomacy.offerRejected=%nation% отказались от вашего щедрого предложения.
 disbandUnit.text=Вы уверены, что хотите избавиться от этого юнита?
 disbandUnit.yes=Расформировать
@@ -2425,7 +2493,9 @@ move.noAccessGoods=%nation% не станут торговать с %unit% бе
 move.noAccessMissionBan=%nation% отвергли все контакты с вашими миссионерами.
 move.noAccessSettlement=%nation% не разрешают войти в поселение нашему %unit%.
 move.noAccessSkill=Наш %unit% не может учиться у индейцев.
+# Fuzzy
 move.noAccessTrade=Мы не имеем права торговать с другими европейскими нациями, такими, как %nation%.
+# Fuzzy
 move.noAccessWar=Мы не можем торговать с {{tag:with|%nation%}} во время войны.
 move.noAccessWater=Наш %unit% должен высадиться на берег, прежде чем входить в поселение.
 move.noAttackWater=Наши  %unit%  должны высадится на землю перед атакой.
@@ -2490,6 +2560,7 @@ server.timeOut=Вышло время соединения с сервером.
 server.userNameInUse=Указанное имя пользователя уже используется.
 server.userNameNotPresent=Указанное имя пользователя отсутствует в этой игре.
 server.wrongFreeColVersion=Версии клиента и сервера FreeCol не совпадают.
+# Fuzzy
 buildColony.others=%nation% основали новую колонию %colony% в %region%.
 cashInTreasureTrain.colonial=Сундуки сокровищ с %amount% золота прибыли в Европу. %cashInAmount% золота перечислено вам.
 cashInTreasureTrain.independent=В национальную казну были включёны сокровища, стоимостью %amount%.
@@ -2593,6 +2664,7 @@ colopedia.unit.offensivePower=Сила атаки:
 colopedia.unit.price=Цена в Европе:
 colopedia.unit.productionBonus={{plural:%number%|one=Модификатор|other=Модификаторы}} производства:
 colopedia.unit.requirements=Требования:
+# Fuzzy
 colopedia.unit.school=Обучение:
 colopedia.unit.skill=Умение:
 report.labour.allColonists=Все колонисты
@@ -2628,8 +2700,8 @@ report.colony.growing.description=%colony% может быть увеличен
 # Fuzzy
 report.colony.improve.description=Средства, которые могут повысить производительность по сравнению со средствами, используемыми в настоящий момент
 report.colony.improve.header=Улучшение
+# Fuzzy
 report.colony.improving.description=%colony%: чтобы произвести еще %amount%  %goods%, замените%oldUnit% на %unit%
-report.colony.wanting.description=%colony%: Чтобы производить товар %goods% на %amount% больше, добавьте юнит %unit%
 report.colony.making.blocking.description=%colony%: необходимо %amount% {{plural:%amount%|%goods%}} для %buildable% через %turns% {{plural:%turns%|one=ход|few=хода|many=ходов}}
 report.colony.making.constructing.description=%colony%: %buildable% завершается через %turns% {{plural:%turns%|one=ход|few=хода|many=ходов}}
 report.colony.making.description=Что делает эта колония
@@ -2639,20 +2711,21 @@ report.colony.making.noconstruction.description=%colony%: Не осуществ
 report.colony.making.noteach.description=%colony%: %teacher% нуждается в ученике
 report.colony.name.description=Список колоний
 report.colony.name.header=Колония
-report.colony.plow.description=Число единиц площади в данной колонии, которые будет выгодно распахать
-report.colony.plow.header=P
-report.colony.plowing.description=%colony% извлечёт выгоду из вспахивания {{plural:%amount%|one=одной клетки|other=%amount% клеток}}
+# Fuzzy
 report.colony.production.description=%colony%: объём производства %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: объём производства товара %goods% равна %amount% (для экспорта %export%)
 report.colony.production.header=Объём производства товара %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: объём производства %goods% = %amount%, достигнет максимума через %turns% {{plural:%turns%|one=ход|few=хода|many=ходов}}
+# Fuzzy
 report.colony.production.low.description=%colony%: остаток товара %goods% = %amount%, будет исчерпан через %turns% {{plural:%turns%|one=ход|few=хода|many=ходов}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: масса нетто произведенного товара %goods% = %amount%, склад переполнен, %waste% будет утилизирован
-report.colony.road.description=Число единиц площади в колонии, на которых выгодно строительство дорог
-report.colony.road.header=R
-report.colony.roadBuilding.description=%colony% извлечёт выгоду из строительства {{plural:%amount%|one=дороги|other=%amount% дорог}}
 report.colony.shrinking.description=%colony% должна быть увеличена на {{plural:%amount%|one=одного  жителя|few=%amount% жителя|many=%amount% жителей}} для улучшения производства
 report.colony.starving.description=%colony%: голод через %turns% {{plural:%turns%|one=ход|few=хода|many=ходов}}
+# Fuzzy
+report.colony.wanting.description=%colony%: Чтобы производить товар %goods% на %amount% больше, добавьте юнит %unit%
 report.continentalCongress.available=доступно
 report.continentalCongress.elected=Выбран: %turn%
 report.continentalCongress.none=(нет)
@@ -2696,26 +2769,25 @@ report.production.selectGoods=Выбор товаров
 report.production.update=Обновление
 report.requirements.badAssignment=В %colony% есть %expert%, работающий как %expertWork%, тогда как %nonExpert% работает как %nonExpertWork%. Было бы эффективнее поменять их места работы.
 report.requirements.canTrainExperts={{plural:5|%unit%}} можно обучить в
-report.requirements.clearTile=%type% на %direction% от колонии %colony% может получить выгоду от вырубки леса.
+# Fuzzy
 report.requirements.exploreTile=%type% на %direction% от колонии %colony% может получить выгоду от разведки.
 report.requirements.met=Все требования выполнены.
 report.requirements.missingGoods=В %colony% для производства %goods% не хватает %input%.
 report.requirements.misusedExperts=У вас есть {{plural:|%unit%}}, которые не работают в качестве %work% в
 report.requirements.noExpert=В %colony% производят %goods%, но там нет %unit%.
-report.requirements.plowCenter=%colony% может получить выгоду от вспашки.
-report.requirements.plowTile=%type% на %direction% от колонии %colony% может получить выгоду от вспашки.
-report.requirements.roadTile=%type% на %direction% от колонии %colony% может получить выгоду от прокладки дороги.
 report.requirements.severalExperts=Несколько {{plural:5|%unit%}} присутствуют на
 report.requirements.surplus=Излишек %goods% производится в
 report.trade.afterTaxes=Доход после налогов
 report.trade.beforeTaxes=Доход до налогов
 report.trade.cargoUnits=Подразделений для перевозки
+# Fuzzy
 report.trade.hasCustomHouse=* В колонии есть таможня; эти товары экспортируются.
 report.trade.totalDelta=Всего производится
 report.trade.totalUnits=Всего юнитов
 report.trade.unitsSold=Единиц куплено или продано
 report.turn.filter=Не показывать этот тип сообщений (%type%)
 report.turn.ignore=Игнорировать это сообщение (Колония: %colony%, товары: %goods%)
+# Fuzzy
 report.turn.playerNation=%player% - %nation%
 aboutPanel.copyright=Авторские права © 2002—2015 Команда FreeCol
 aboutPanel.legalDisclaimer=FreeCol является свободным программным обеспечением. Вы можете распространять и/или изменять его в соответствии с условиями лицензии GNU GPL, опубликованной Фондом свободного программного обеспечения, версии 2 либо более поздней по вашему выбору.
@@ -2725,8 +2797,7 @@ aboutPanel.version=Версия:
 buildingToolTip.breeding=Вам нужно не менее %number% {{plural:%number%|%goods%}}, чтобы разводить %goods%.
 buildQueuePanel.buildings=Здания
 buildQueuePanel.buildQueue=Очередь постройки
-# Fuzzy
-buildQueuePanel.buyBuilding=Купить здание
+buildQueuePanel.buyBuilding=Купить %buildable%
 buildQueuePanel.coastalOnly=Прибрежная колония
 buildQueuePanel.compactView=Компактный вид
 buildQueuePanel.currentlyBuilding=Строится: %buildable%
@@ -2738,9 +2809,11 @@ captureGoodsDialog.title=Трофеи
 cargoPanel.cargoAndSpace=Груз на %name% (%space% {{plural:%space%|one=трюм|few=трюма|many=трюмов|default=трюмов}} свободно)
 chatPanel.message=Сообщение:
 chooseFoundingFatherDialog.title=Назначить Отца-основателя
+colonyPanel.buildQueue=Очередь постройки
 colonyPanel.colonyUnits=Колониальные юниты
 colonyPanel.inPort=В порту
 colonyPanel.outsideColony=Снаружи колонии
+# Fuzzy
 colonyPanel.producing=Производство:
 colonyPanel.reducePopulation=Если вы уменьшите население колонии ниже %number%, то %colony% не сможет больше строить %buildable%.
 colonyPanel.unitChange=В %colony% ваш %oldType% стал %newType%.
@@ -2754,7 +2827,9 @@ confirmDeclarationDialog.areYouSure.no=Может быть, позже.
 confirmDeclarationDialog.areYouSure.text=Отвергнем несправедливую тиранию монарха %monarch% и объявим независимость наших колоний от короны!
 confirmDeclarationDialog.areYouSure.yes=Свобода или смерть!
 confirmDeclarationDialog.createFlag=и наши враги должны дрожать по виду нашего дерзкого баннера.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry={{tag:adj|%nation%}} Соединённые Штаты
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Свободные %nation%
 confirmDeclarationDialog.enterCountry=Впредь наша страна будет известна, как
 confirmDeclarationDialog.enterNation=а каждый гражданин нашей выдающейся нации должен гордиться тем, что будет зваться
@@ -2805,8 +2880,10 @@ negotiationDialog.add=Добавить
 negotiationDialog.cancel=Отказаться
 negotiationDialog.clear=Очистить
 negotiationDialog.contact.tutorial=Вы встретили братских европейцев. Они будут соревноваться с вами землей и сокровищами, а также могут объявить Вам войну. Но после того, как Ян де Витт присоединился к континентальному конгрессу, вы можете торговать с ними.
+# Fuzzy
 negotiationDialog.demand=%nation% спрашивают %otherNation%
 negotiationDialog.exchange=в обмен на
+# Fuzzy
 negotiationDialog.offer=%nation% предлагают %otherNation%
 negotiationDialog.send=Послать
 negotiationDialog.title.contact=Встреча с земляками-европейцами
@@ -2829,10 +2906,9 @@ findSettlementPanel.displayAll=Найти все поселения
 findSettlementPanel.displayOnlyEuropean=Найти только европейские поселения
 findSettlementPanel.displayOnlyNatives=Найти только местные поселения
 findSettlementPanel.name=Найти поселение
+# Fuzzy
 firstContactDialog.meeting.natives=Встреча аборигенов…
 firstContactDialog.meeting.natives.tutorial=Вы встретили местных уроженцев. Посылайте ваших разведчиков к их поселениям для того, чтобы узнать о них больше, а закупов и свободных колонистов — чтобы учиться у них. Посылайте ваши корабли и обозы к их поселениям, если желаете торговать с ними.
-firstContactDialog.meeting.AZTEC=Народ ацтеков…
-firstContactDialog.meeting.INCA=Империя инков…
 firstContactDialog.welcomeOffer.text=%nation% приветствуют вас. Мы выдающаяся нация, у нас %camps% {{plural:%camps%|%settlementType%}}. Чтобы отпраздновать нашу дружбу, мы щедро дарим вам земли, которые вы сейчас занимаете. Примете ли вы наш договор, будете ли жить с нами в мире как братья?
 firstContactDialog.welcomeSimple.text=%nation% приветствуют вас. Мы выдающаяся нация, у нас %camps% {{plural:%camps%|%settlementType%}}. Примете ли вы наш договор, будите ли жить с нами в мире как братья?
 abandonColony.no=Отмена
@@ -2976,6 +3052,9 @@ nameCache.mercenaries.0=Фридрих II (ландграф Гессен-Кас
 nameCache.mercenaries.1=Фридрих Август (князь Ангальт-Цербста)
 nameCache.mercenaries.2=Карл Александр, маркграф Бранденбург-Ансбаха
 nameCache.mercenaries.3=Карл I Брауншвейг-Вольфенбюттельский
+nameCache.season.default=Время года %number%
+nameCache.season.0=Весна
+nameCache.season.1=Осень
 model.nation.dutch.region.river.1=Катскилл
 model.nation.dutch.region.mountain.1=Вильгельмбург
 model.nation.dutch.region.mountain.2=Кайзербург
@@ -3034,6 +3113,7 @@ model.nation.spanish.region.land.1=Чили
 model.nation.spanish.region.land.2=Колумбия
 model.nation.spanish.region.land.3=Эквадор
 model.nation.spanish.region.land.4=Мексика
+info.rgb=RGB-значение: %red%,%green%,%blue%
 prompt.selectDisaster=Выберите катастрофу
 prompt.selectGoodsAmount=Выберите количество товара
 prompt.selectGoodsType=Выберите тип товара
diff --git a/data/strings/FreeColMessages_sk.properties b/data/strings/FreeColMessages_sk.properties
index ba3e1cea6..3cd26557c 100644
--- a/data/strings/FreeColMessages_sk.properties
+++ b/data/strings/FreeColMessages_sk.properties
@@ -3,6 +3,7 @@
 # Author: Helix84
 # Author: Jaroslav.micek
 # Author: Kusavica
+# Author: Mark
 # Author: Mikulas1
 # Author: Rudko
 
@@ -105,7 +106,7 @@ gold=Zlato
 goldAmount=%amount% {{plural:%amount%|one=zlato|other=zlata|default=zlato}}
 goods=Tovar
 goToEurope=Ísť do Európy
-goToThisTile=Ísť na toto políčko
+goToThisTile=Ísť na toto pole
 immigrants=Prisťahovalci
 inPort=V prístave
 leaveShip=Opustiť loď
@@ -119,11 +120,11 @@ player=Hráč
 purchase=Kúpiť
 recruit=Povolať
 rules=Pravidlá
-sailingToAmerica=Plavba do Ameriky
-sailingToEurope=Plavba do Európy
+sailingToAmerica=Pláva do Ameriky
+sailingToEurope=Pláva do Európy
 sales=Predaj
 sentry=Hliadkovať
-setSail=Nastaviť plavbu
+setSail=Vyplávať do
 settlement=Osada
 showProductionModifiers=Ukázať modifikátory výroby
 skillTaught=Naučené zručnosti
@@ -143,25 +144,26 @@ status.savingGame=Čakajte prosím: Ukladanie hry
 status.startingGame=Čakajte prosím: Spúšťanie hry
 cli.arg.advantages=VÝHODY
 cli.arg.clientOptions=MOŽNOSTI SÚBORU
-cli.arg.debug=LADENIE-REŽIMY
-cli.arg.debugRun=ŤAHOV[,NÁZOV ULOŽENIA]
+cli.arg.debug=REŽIMY LADENIA
+cli.arg.debugRun=ŤAHOV[,SAVENAME]
 cli.arg.difficulty=OBTIAŽNOSŤ
 cli.arg.dimensions=ŠÍRKAxVÝŠKA
 cli.arg.directory=ADRESÁR
 cli.arg.europeans=EURÓPANIA
 cli.arg.file=SÚBOR
+cli.arg.gui-scale=MIERKA
 cli.arg.locale=MIESTNY
 cli.arg.loglevel=LOGLEVEL
 cli.arg.name=MENO
 cli.arg.port=PORT
 cli.arg.seed=SEED
 cli.arg.timeout=ČASOVÝ LIMIT
-cli.error.advantages=Očakávané výhody typu (%advantages%), založené: %arg%
+cli.error.advantages=Očakávané výhody typu (%advantages%), nájdené: %arg%
 cli.error.badTC=Chyba pri otváraní množiny pravidiel %tc%.
 cli.error.clientOptions=Ignorovanie nečitateľného súboru možností klienta: %string%
 cli.error.debug=Očakávaný zoznam režimu ladenia (%modes%).
-cli.error.difficulties=Očakávaný stupeň obtiažnosti (%difficulties%), zavedený: %arg%
-cli.error.europeans=Počet Európskych národov musí byť minimálne %min%
+cli.error.difficulties=Očakávaný stupeň obtiažnosti (%difficulties%), nájdený: %arg%
+cli.error.europeans=Počet Európskych národov musí byť najmenej %min%
 cli.error.home.noRead=Nedá sa čítať z %string%.
 cli.error.home.noWrite=Nedá sa zapisovať do %string%.
 cli.error.home.notDir=%string% nieje adresár.
@@ -173,31 +175,33 @@ cli.advantages=nastaviť typ VÝHOD (%advantages%)
 cli.check-savegame.failure=Kontrola konzistencie uloženej hry zlyhala, skontrolujte podrobnosti v denníku.
 cli.check-savegame.success=Kontrola konzistencie uloženej hry sa skončila, skontrolujte podrobnosti v denníku.
 cli.check-savegame=skontrolovať konzistenciu zvolenej uloženej hry
-cli.clientOptions=XML súbor obsahuje užívateľské možnosti klienta.
-cli.debug-run=spustiť N ťahov v režime ladenia, potom možnosť uložiť a ukončiť
-cli.debug-start=okamžite začať novú hru pre jedného hráča
-cli.debug=nastaviť FreeCol režim ladenia (%modes%)
-cli.default-locale=nastaviť predvolené miestne nastavenia(JAZYK[_ZEM[_VARIANTA]])
+cli.clientOptions=XML súbor obsahujúci užívateľské možnosti klienta.
+cli.debug-run=spustiť N ťahov v režime ladenia, potom možno uložiť a ukončiť
+cli.debug-start=okamžite začať novú hru jedného hráča
+cli.debug=nastaviť režimy ladenia (%modes%) FreeCol
+cli.default-locale=nastaviť predvolené miestne nastavenia(LANGUAGE[_COUNTRY[_VARIANT]])
 cli.difficulty=nastaviť úroveň OBTIAŽNOSTI
 cli.european-count=nastaviť počet povolených národov (koloniálny EURÓPANIA)
 cli.fast=vynechať všetky dialógy nastavenia
 cli.font=nastaviť predvolené písmo
-cli.freecol-data=nastaviť údaje ADRESÁRA FreeCOL (obsahuje priečinok 'base')
+cli.freecol-data=nastaviť údaje ADRESÁRA FreeCol (obsahuje podadresár s názvom 'base')
+cli.full-screen=spustiť FreeCol v režime celej obrazovky
+cli.gui-scale=odstupňovať prvky GUI, s voliteľnou MIERKOU (%scales%)
 cli.help=zobraziť túto obrazovku pomocníka
 cli.load-savegame=načítať daný SÚBOR uloženej hry
-cli.log-console=prihlásenie do konzoly aj súboru
-cli.log-file=nastaviť FreeCol súbor denníka (predvolené FreeCol.log)
+cli.log-console=okrem záznamu do súboru aj záznam na konzolu
+cli.log-file=nastaviť súbor záznamu FreeCol (predvolené do FreeCol.log)
 cli.log-level=nastaviť úroveň java log do LOGLEVEL
 cli.name=zadať MENO pre hráča
 cli.no-intro=vynechať úvodné video
-cli.no-java-check=vynechať kontrolu verzie jávy
+cli.no-java-check=vynechať kontrolu verzie javy
 cli.no-memory-check=vynechať kontrolu pamäte
 cli.no-sound=spustiť FreeCol bez zvuku
 cli.private=spustiť súkromný server (nepublikovaný na metaserver)
 cli.seed=zadať SEED pre pseudo generátor náhodných čísiel
 cli.server-name=zadať vlastný NÁZOV servera
-cli.server=spustiť stand-alone server na určitom porte
-cli.splash=zobraziť úvodný SÚBOR pri načítavaní hry
+cli.server=spustiť samostatný server na zadanom porte
+cli.splash=zobraziť úvodný obrázok FILE pri načítavaní hry
 cli.tc=načítať celkový prevod so zadaným MENOM
 cli.timeout=počet sekúnd, ktoré server čaká na odpoveď na otázku
 cli.user-cache-directory=nastaviť cache ADRESÁRA užívateľa FreeCol
@@ -207,7 +211,7 @@ cli.version=zobraziť číslo verzie a odísť
 # Fuzzy
 cli.windowed=spustiť FreeCol vo vlastnom okne namiesto na celú obrazovku
 menuBar.colopedia=Kolopédia
-menuBar.game=Hra
+menuBar.game=Zver
 menuBar.orders=Príkazy
 menuBar.report=Hlásenie
 menuBar.tools=Nástroje
@@ -215,14 +219,16 @@ menuBar.view=Zobrazenie
 menuBar.statusLine=Skóre: %score%    |    Zlato: %gold%    |    Daň: %tax%%    |    Rok: %year%
 menuBar.debug=Ladenie
 menuBar.debug.addBuilding=Pridať budovu do každej kolónie
-menuBar.debug.addFoundingFather=Pridať zakladateľa
+menuBar.debug.addFoundingFather=Pridať Otca zakladateľa
 menuBar.debug.addGold=Pridať zlato
 menuBar.debug.addImmigration=Pridať prisťahovalectvo
 menuBar.debug.addLiberty=Pridať slobodu do každej kolónie
 menuBar.debug.compareMaps.checkComplete=Kontrola dokončená. Žiadna nesynchronizácia nezistená.
 menuBar.debug.compareMaps.problem=Objavený možný problém. Prečítajte si prosím informácie o štandardnom výstupe.
 menuBar.debug.compareMaps=Skontrolovať desynchronizáciu mapy
-menuBar.debug.displayErrorMessage=Zobraziť hlásenia chýb
+menuBar.debug.displayAIMissions=Zobrazenie UI misie
+menuBar.debug.displayAdditionalAIMissionInfo=Zobraziť dodatočné informácie o UI misii
+menuBar.debug.displayErrorMessage=Zobraziť chybové hlásenie
 menuBar.debug.displayEuropeStatus=Zobraziť stav Európy
 menuBar.debug.displayMonarchPanel=Zobraziť panely kráľa
 menuBar.debug.displayPanels=Zobraziť panely
@@ -235,12 +241,12 @@ menuBar.debug.runMonarch=Nastaviť ďalšiu akciu kráľa
 menuBar.debug.searchTrace=Zaznamenať všetky stopy vyhľadávania
 menuBar.debug.showColonyValue=Zobraziť hodnoty kolónie
 menuBar.debug.showCoordinates=Zobraziť súradnice
-menuBar.debug.showResourceKeys=Zobraziť zdrojové kľúče
+menuBar.debug.showResourceKeys=Zobraziť kľúče zdrojov
 menuBar.debug.skipTurns=Vynechať ťah
 menuBar.debug.stepRandomNumberGenerator=Krok generátora náhodných čísiel
 menuBar.debug.stopSkippingTurns=Zastaviť vynechávanie ťahov
-menuBar.debug.useAI=Použiť AI
-aboutAction.name=O hre FreeCol
+menuBar.debug.useAI=Použiť UI
+aboutAction.name=O FreeCol
 activeAction.name=Aktivovať jednotku
 assignTradeRouteAction.name=Priradiť obchodnú trasu
 buildColonyAction.name=Vybudovať/pridať sa ku kolónii
@@ -249,19 +255,17 @@ changeAction.enterColony.name=Vstúpiť do kolónie
 changeAction.name=Ďalšia jednotka na políčku
 changeAction.nextUnitOnTile.name=Ďalšia jednotka na políčku
 changeAction.selectCarrier.name=Vybrať prepravcu
-# Fuzzy
-changeWindowedModeAction.name=Prepnúť režim na celú obrazovku
-chatAction.name=Chat/Čet
+changeWindowedModeAction.name=Celoobrazovkový režim
+chatAction.name=Pokec
 clearForestAction.name=Vyrúbať les
 clearOrdersAction.name=Vymazať príkazy
 colopediaAction.buildings.name=Budovy
 colopediaAction.concepts.name=Predstavy
-colopediaAction.fathers.name=Zakladatelia
+colopediaAction.fathers.name=Otcovia zakladatelia
 colopediaAction.goods.name=Tovar
 colopediaAction.nations.name=Národy
 colopediaAction.nationTypes.name=Výhody národov
 colopediaAction.resources.name=Bonusové zdroje
-colopediaAction.skills.name=Zručnosti
 colopediaAction.terrain.name=Druhy terénu
 colopediaAction.units.name=Jednotky
 colopediaAction.name=%object% (Colopedia)
@@ -271,7 +275,7 @@ declareIndependenceAction.name=Vyhlásiť nezávislosť
 determineHighSeasAction.name=Určiť šíre more
 difficultyAction.name=Ukázať úroveň obtiažnosti
 disbandUnitAction.name=Rozpustiť
-displayBordersAction.name=Zobraziť okraje
+displayBordersAction.name=Zobraziť hranice
 displayGridAction.name=Zobraziť mriežku
 displayTileTextAction.empty.name=Nezobrazovať text na políčkach
 displayTileTextAction.names.name=Zobraziť názvy políčok
@@ -279,7 +283,7 @@ displayTileTextAction.owners.name=Zobraziť vlastníkov políčok
 displayTileTextAction.regions.name=Zobraziť políčka regiónov
 endTurnAction.name=Ukončiť ťah
 europeAction.name=Európa
-executeGotoOrdersAction.name=Ísť k príkazom
+executeGotoOrdersAction.name=Vykonať príkaz Prejsť na ...
 findSettlementAction.name=Nájsť osadu
 fortifyAction.name=Opevniť sa
 gameOptionsAction.name=Zobraziť možnosti hry
@@ -324,16 +328,15 @@ renameAction.name=Premenovať
 reportCargoAction.name=Hlásenie o náklade
 reportColonyAction.name=Poradca kolónie
 reportCongressAction.name=Kontinentálny snem
-# Fuzzy
-reportEducationAction.name=Vzdelávanie
+reportEducationAction.name=Hlásenie o vzdelávaní
 reportExplorationAction.name=Hlásenie o prieskume
 reportForeignAction.name=Poradca pre zahraničné veci
 reportHighScoresAction.name=Najvyššie skóre
-reportHistoryAction.name=História
+reportHistoryAction.name=Hlásenie o histórii
 reportIndianAction.name=Poradca pre záležitosti indiánov
-reportLabourAction.name=Poradca pre prácu
+reportLabourAction.name=Pracovný poradca
 reportMilitaryAction.name=Vojenský poradca
-reportNavalAction.name=Poradca pre námorníctvo
+reportNavalAction.name=Námorný poradca
 reportProductionAction.name=Hlásenie o výrobe
 reportReligionAction.name=Poradca pre vierovyznanie
 reportRequirementsAction.name=Požiadavky
@@ -342,7 +345,7 @@ reportTurnAction.name=Hlásenie o ťahu
 retireAction.name=Vzdať sa
 roadAction.name=Stavať cestu
 saveAction.name=Uložiť
-saveAndQuitAction.name=Uložiť a ukončiť
+saveAndQuitAction.name=Uložiť a skončiť
 scaleMapAction.name=Mierka mapy
 sentryAction.name=Hliadkovať
 showMainAction.name=Návrat na hlavnú stránku
@@ -356,7 +359,7 @@ zoomInAction.name=Priblížiť
 zoomOutAction.name=Oddialiť
 actionManager.name=Klávesové skratky
 actionManager.shortDescription=Klávesové skratky
-difficultyLevels.name=Stupne obiažnosti
+difficultyLevels.name=Úrovne obiažnosti
 model.difficulty.veryEasy.name=Veľmi ľahká
 model.difficulty.easy.name=Ľahká
 model.difficulty.medium.name=Stredná
@@ -375,23 +378,23 @@ model.option.priceIncreasePerType.name=Zvýšenie ceny pre typ jednotky
 model.option.priceIncreasePerType.shortDescription=Zvyšovanie ceny sa uplatňuje podľa jednotlivých typov jednotiek.
 model.option.priceIncrease.artillery.name=Zvýšenie ceny pre delostrelectvo
 model.option.priceIncrease.artillery.shortDescription=Zvyšuje cenu pre každé nové delostrelectvo.
-model.option.expertStartingUnits.name=Zvoľ, ktoré začiatočné jednotky budú experti.
-model.option.expertStartingUnits.shortDescription=Urob všetky začiatočné jednotky  expertmi.
+model.option.expertStartingUnits.name=Začiatočné jednotky expertov
+model.option.expertStartingUnits.shortDescription=Urob všetky začiatočné jednotky expertmi.
 model.option.immigrants.name=Prisťahovalci
 model.option.immigrants.shortDescription=Prví prisťahovalci z Európy.
 model.difficulty.natives.name=Domorodci
 model.option.landPriceFactor.name=Faktor ceny pozemku
-model.option.landPriceFactor.shortDescription=Zvyšuje cenu kúpy domorodého pozemku.
+model.option.landPriceFactor.shortDescription=Zvyšuje náklady na nákup pozemku od domorodcov.
 model.option.nativeConvertProbability.name=Pravdepodobnosť konvertovania domorodcov
-model.option.nativeConvertProbability.shortDescription=Zvyšuje pravdepodobnosť, že domorodci zo zničených osád konvertujú.
+model.option.nativeConvertProbability.shortDescription=Zvyšuje pravdepodobnosť, že domorodci zo zničenej osady konvertujú.
 model.option.burnProbability.name=Pravdepodobnosť vypálenia osady
 model.option.burnProbability.shortDescription=Zvyšuje pravdepodobnosť, že domorodci vypália kolónie.
 model.option.nativeDemands.name=Požiadavky domorodcov
 model.option.nativeDemands.shortDescription=Zvyšuje množstvo požiadaviek domorodcov.
 model.option.rumourDifficulty.name=Obtiažnosť povestí
-model.option.rumourDifficulty.shortDescription=Čím je toto číslo vyššie, tým je pravdepodobnosť pozitívnych povestí nižšia.
-model.option.shipTradePenalty.name=Pokuta keď obchodujú lode
-model.option.shipTradePenalty.shortDescription=Percentá pokuty z ceny keď obchodujú lode sú zaplatené domorodcami.
+model.option.rumourDifficulty.shortDescription=Čím je toto číslo vyššie, tým je pravdepodobnosť pravdivosti povestí nižšia.
+model.option.shipTradePenalty.name=Postih za obchodovanie z lode
+model.option.shipTradePenalty.shortDescription=Percentá postihu z ceny ponúknutej domorodcami pri obchode s loďami.
 model.option.destroySettlementScore.name=Zničiť skóre osady
 model.option.destroySettlementScore.shortDescription=Zníženie skóre za zničenie domorodých osád
 model.option.buildOnNativeLand.name=Postaviť na území domorodcov
@@ -406,6 +409,16 @@ model.option.buildOnNativeLand.never.name=Nikdy
 model.option.buildOnNativeLand.never.shortDescription=Stavba na území domorodcov nieje povolená.
 model.option.settlementNumber.name=Počet domorodých osád
 model.option.settlementNumber.shortDescription=Možnosť nastavenie počtu domorodých osád na generovaných mapách.
+model.option.settlementNumber.verySmall.name=Veľmi malý
+model.option.settlementNumber.verySmall.shortDescription=Veľmi málo domorodých osád
+model.option.settlementNumber.small.name=Malý
+model.option.settlementNumber.small.shortDescription=Malý počet domorodých osád
+model.option.settlementNumber.medium.name=Priemerný
+model.option.settlementNumber.medium.shortDescription=Priemerný počet domorodých osád
+model.option.settlementNumber.large.name=Veľký
+model.option.settlementNumber.large.shortDescription=Veľký počet domorodých osád
+model.option.settlementNumber.veryLarge.name=Veľmi veľký
+model.option.settlementNumber.veryLarge.shortDescription=Hojne domorodých osád
 model.difficulty.monarch.name=Kráľ
 model.option.monarchMeddling.name=Zasahovanie panovníka
 model.option.monarchMeddling.shortDescription=Zvyšuje množstvo a závažnosť zásahov kráľa.
@@ -430,7 +443,7 @@ model.option.refSize.soldiers.shortDescription=Počet jednotiek pechoty.
 model.option.refSize.dragoons.name=Jazda
 model.option.refSize.dragoons.shortDescription=Počet jednotiek jazdy.
 model.option.refSize.menOfWar.name=Krížnik
-model.option.refSize.menOfWar.shortDescription=Počet vojnových lodí, alebo Krížnikov.
+model.option.refSize.menOfWar.shortDescription=Počet vojnových lodí, alebo krížnikov.
 model.option.refSize.artillery.name=Delostrelectvo
 model.option.refSize.artillery.shortDescription=Počet jednotiek delostrelectva.
 model.option.interventionForce.name=Intervenčné sily
@@ -449,32 +462,42 @@ model.option.veryGoodGovernmentLimit.shortDescription=Minimálne percento rebelo
 model.difficulty.other.name=Iné
 model.option.startingMoney.name=Peniaze na začiatku
 model.option.startingMoney.shortDescription=Množstvo peňazí s ktorými začnete hru.
-model.option.foundingFatherFactor.name=Faktor zakladateľa
-model.option.foundingFatherFactor.shortDescription=Zvyšuje náklady pre voľbu nového zakladateľa.
+model.option.foundingFatherFactor.name=Faktor Otca zakladateľa
+model.option.foundingFatherFactor.shortDescription=Zvyšuje náklady pre voľbu nového otca zakladateľa.
 model.option.arrearsFactor.name=Faktor nedoplatkov
 model.option.arrearsFactor.shortDescription=Zvyšuje Vaše európske daňové nedoplatky.
-model.option.unitsThatUseNoBells.name=Kolonisti, ktorí nepoužívajú zvony
-model.option.unitsThatUseNoBells.shortDescription=Počet kolonistov v kolónii, ktorí nepoužívajú zvony.
-model.option.tileProduction.name=Výroba políčka
-model.option.tileProduction.shortDescription=Výroba políčok s rôznymi možnosťami výroby.
+model.option.unitsThatUseNoBells.name=Kolonisti, ktorí nespotrebúvajú zvony
+model.option.unitsThatUseNoBells.shortDescription=Počet kolonistov v kolónii, ktorí nespotebúvajú zvony.
+model.option.tileProduction.name=Výroba na políčku
+model.option.tileProduction.shortDescription=Výroba na políčkach s rôznymi možnosťami výroby.
+model.option.tileProduction.veryLow.name=Veľmi nízka
+model.option.tileProduction.veryLow.shortDescription=Veľmi nízka výroba na políčku
+model.option.tileProduction.low.name=Nízka
+model.option.tileProduction.low.shortDescription=Nízka výroba na políčku
+model.option.tileProduction.medium.name=Priemerná
+model.option.tileProduction.medium.shortDescription=Priemerná výroba na políčku
+model.option.tileProduction.high.name=Vysoká
+model.option.tileProduction.high.shortDescription=Vysoká výroba na políčku
+model.option.tileProduction.veryHigh.name=Veľmi vysoká
+model.option.tileProduction.veryHigh.shortDescription=Veľmi vysoká výroba na políčku
 model.option.badRumour.name=Šanca na zlú povesť
-model.option.badRumour.decription=Percentuálna šanca na zlý výsledok povesti.
+model.option.badRumour.decription=Percento šance na zlý výsledok povesti.
 model.option.goodRumour.name=Šanca na dobrú povesť
-model.option.goodRumour.decription=Percentuálna šanca na dobrý výsledok povesti.
-model.difficulty.cheat.name=AI-podvádzanie
+model.option.goodRumour.decription=Percento šance na dobrý výsledok povesti.
+model.difficulty.cheat.name=UI-podvádzanie
 model.option.liftBoycottCheat.name=Zrušiť bojkot
-model.option.liftBoycottCheat.shortDescription=Percentuálna šanca na ťah AI hráča na zrušenie bojkotu bez zaplatenia nedoplatkov.
+model.option.liftBoycottCheat.shortDescription=Percento šance v každom ťahu UI hráča na zrušenie bojkotu bez zaplatenia nedoplatkov.
 model.option.equipScoutCheat.name=Vybaviť ako prieskumníka
-model.option.equipScoutCheat.shortDescription=Percentuálna šanca na ťah AI hráča na vybavenie jednotky v Európe ako prieskumníka zadarmo.
+model.option.equipScoutCheat.shortDescription=Percento šance v každom ťahu UI hráča na vybavenie jednotky v Európe ako prieskumníka zadarmo.
 model.option.equipPioneerCheat.name=Vybaviť ako priekopníka
-model.option.equipPioneerCheat.shortDescription=Percentuálna šanca na ťah AI hráča na vybavenie jednotky v Európe ako priekopníka zadarmo.
+model.option.equipPioneerCheat.shortDescription=Percento šance v každom ťahu UI hráča na vybavenie jednotky v Európe ako priekopníka zadarmo.
 model.option.landUnitCheat.name=Získať pozemnú jednotku
-model.option.landUnitCheat.shortDescription=Percentuálna šanca na ťah AI hráča pre získanie útočnej pozemnej jednotky zadarmo.
+model.option.landUnitCheat.shortDescription=Percento šance v každom ťahu UI hráča na získanie útočnej pozemnej jednotky zadarmo.
 model.option.offensiveLandUnitCheat.name=Získať útočnú pozemnú jednotku
 model.option.offensiveNavalUnitCheat.name=Získať útočnú námornú jednotku
-model.option.offensiveNavalUnitCheat.shortDescription=Percentuálna šanca (znížená námornou silou) na ťah AI hráča pre získanie útočnej námornej jednotky v Európe zadarmo.
+model.option.offensiveNavalUnitCheat.shortDescription=Percento šance (znížené o námornú silu) v kaďom ťahu UI hráča na získanie útočnej námornej jednotky v Európe zadarmo.
 model.option.transportNavalUnitCheat.name=Získať dopravnú námornú jednotku
-model.option.transportNavalUnitCheat.shortDescription=Percentuálna šanca na ťah AI hráča pre získanie dopravnej námornej jednotky v Európe zadarmo (ak má prácu pre viacero dopravných jednotiek).
+model.option.transportNavalUnitCheat.shortDescription=Percento šance v každom ťahu UI hráča na získanie dopravnej námornej jednotky v Európe zadarmo (ak má prácu pre viacero dopravných jednotiek).
 gameOptions.name=Možnosti hry
 gameOptions.shortDescription=Možnosti hry
 gameOptions.map.name=Mapa
@@ -484,9 +507,9 @@ model.option.turnsToSail.shortDescription=Počet ťahov potrebných na plavbu z
 model.option.settlementLimitModifier.name=Modifikátor limitu osady
 model.option.settlementLimitModifier.shortDescription=Množstvo pridané do limitu osady ako napríklad počet vozov, ktoré možno postaviť.
 model.option.fogOfWar.name=Hmla vojny
-model.option.fogOfWar.shortDescription=Mali by byť nepriateľské jednotky mimo nášho dohľadu schované?
-model.option.explorationPoints.name=Body prieskumu
-model.option.explorationPoints.shortDescription=Mali by byť body prieskumu udelené za všetky prieskumy?
+model.option.fogOfWar.shortDescription=Majú byť nepriateľské jednotky mimo nášho dohľadu schované?
+model.option.explorationPoints.name=Body za prieskum
+model.option.explorationPoints.shortDescription=Majú byť body za prieskum udelené za všetky objavy?
 model.option.amphibiousMoves.name=Obojživelné pohyby
 model.option.amphibiousMoves.shortDescription=Povoliť presun z námorných jednotiek priamo do osád.
 model.option.emptyTraders.name=Prázdne obchodné jednotky
@@ -494,15 +517,17 @@ model.option.emptyTraders.shortDescription=Povoliť prázdnym obchodným jednotk
 model.option.settlementActionsContactChief.name=Kontakt s náčelníkom
 model.option.settlementActionsContactChief.shortDescription=Všetky akcie s osadou kontaktujú jej náčelníka a spotrebujú prieskumnícky bonus.
 model.option.enhancedMissionaries.name=Vylepšení misionári
-model.option.enhancedMissionaries.shortDescription=Misionári vylepšia obchodné zručnosti osady a zobrazia okolie osady.
+model.option.enhancedMissionaries.shortDescription=Misionári vylepšia obchodné zručnosti osady, vyučovanie zručností a zobrazia okolie osady.
+model.option.missionInfluence.name=Vplyv misie
+model.option.missionInfluence.shortDescription=Sila vplyvu misie na úroveň znepokojenia domorodcov v osade.
 model.option.giftProbability.name=Pravdepodobnosť daru
-model.option.giftProbability.shortDescription=Percentuálna šanca na ťah, že mierumilovná osada s prebytkom poskytne dar priateľskej európskej osade.
+model.option.giftProbability.shortDescription=Percento šanca v každom ťahu, že mierumilovná domorodá osada s prebytkom poskytne dar blízkej priateľskej európskej osade.
 model.option.demandProbability.name=Pravdepodobnosť požiadaviek
-model.option.demandProbability.shortDescription=Percentuálna šanca na ťah, že nahnevaná domorodá osada bude požadovať poplatok od európskej osady.
-model.option.continueFoundingFatherRecruitment.name=Pokračovať v nábore zakladateľov
-model.option.continueFoundingFatherRecruitment.shortDescription=Pokračovať v nábore zakladateľov aj po udelení nezávislosti.
+model.option.demandProbability.shortDescription=Percento šanca v každom ťahu, že nahnevaná domorodá osada bude požadovať poplatok od blízkej európskej osady, ktorá spôsobuje hnev.
+model.option.continueFoundingFatherRecruitment.name=Pokračovať v nábore Otcov zakladateľov
+model.option.continueFoundingFatherRecruitment.shortDescription=Pokračovať v nábore Otcov zakladateľov aj po získaní nezávislosti.
 model.option.teleportREF.name=Teleportovať Kráľovské vojsko
-model.option.teleportREF.shortDescription=Kráľovské vojsko sa objaví v blízkosti svojho prvého cieľa.
+model.option.teleportREF.shortDescription=Kráľovské vojsko sa objaví v na pobreží blízkosti svojho prvého cieľa.
 model.option.startingPositions.name=Začiatočné pozície
 model.option.startingPositions.shortDescription=Určuje začiatočné pozície Európskych hráčov.
 model.option.startingPositions.classic.name=Klasické
@@ -510,25 +535,39 @@ model.option.startingPositions.classic.shortDescription=Európske národy začí
 model.option.startingPositions.random.name=Náhodne
 model.option.startingPositions.random.shortDescription=Európske národy začínajú na šírom mori hocikde na mape.
 model.option.startingPositions.historical.name=Historické
-model.option.startingPositions.historical.shortDescription=Európske národy začínajú na šírom mori v blízkosti ich historických prvých kolón v Novom svete.
+model.option.startingPositions.historical.shortDescription=Európske národy začínajú na šírom mori v blízkosti ich prvej historickej kolónie v Novom svete.
 model.option.initialImmigration.name=Začiatočný cieľ prisťahovalectva
 model.option.initialImmigration.shortDescription=Počet krížov, ktoré treba vyrobiť, aby sa objavil prvý Európsky prisťahovalec.
 model.option.peaceProbability.name=Pravdepodobnosť mieru
-model.option.peaceProbability.shortDescription=Percentuálna šanca na ťah na udržanie mieru s nahnevaným AI.
-model.option.europeanUnitImmigrationPenalty.name=Zníženie jednotiek európskych prisťahovalcov
-model.option.europeanUnitImmigrationPenalty.shortDescription=Zníženie výroby krížov na ťah za každú jednotku čakajúcu v Európe.
-model.option.playerImmigrationBonus.name=Zvýšenie prisťahovalcov hráča
+model.option.peaceProbability.shortDescription=Percento šance v každom ťahu na udržanie mieru s nahnevaným UI.
+model.option.europeanUnitImmigrationPenalty.name=Postih jednotiek európskych prisťahovalcov
+model.option.europeanUnitImmigrationPenalty.shortDescription=Zníženie výroby krížov v každom ťahu za každú jednotku čakajúcu v Európe.
+model.option.playerImmigrationBonus.name=Prisťahovalecký bonus hráča
 model.option.playerImmigrationBonus.shortDescription=Zvýšenie výroby krížov na ťah.
+model.option.equipEuropeanRecruits.name=Vystroj európskych nováčikov
+model.option.equipEuropeanRecruits.shortDescription=Novovycvičená alebo naverbovaná jednotka v Európe je vystrojená podľa jej predvolenej úlohy.
 gameOptions.colony.name=Možnosti kolónie
-gameOptions.colony.shortDescription=Obsahuje možnosti správania sa kolónií.
-model.option.customIgnoreBoycott.name=Vlastný dom ignoruje bojkot
-model.option.customIgnoreBoycott.shortDescription=Vlastný dom môže predávať tovar počas bojkotu.
+gameOptions.colony.shortDescription=Obsahuje možnosti, týkajúce sa správania sa kolónií.
+model.option.bellAccumulationCapped.name=Obmedzenie tvorby zvonov.
+model.option.bellAccumulationCapped.shortDescription=Kolónie nemôžu vytvárať ďalśie zvony, keď dosiahnu 100% rebelov.
+model.option.captureUnitsUnderRepair.name=Zajať opravované jednotky
+model.option.captureUnitsUnderRepair.shortDescription=Zajať jednotky, opravované v dobitej kolónii.
+model.option.customIgnoreBoycott.name=Colnica ignoruje bojkot
+model.option.customIgnoreBoycott.shortDescription=Colnica môže predávať tovar počas bojkotu.
+model.option.customsOnCoast.name=Colnice na pobreží
+model.option.customsOnCoast.shortDescription=Colnice môžu byť postavené len v pobrežných kolóniách.
+model.option.disembarkInColony.name=Vylodiť v kolónii
+model.option.disembarkInColony.shortDescription=Všetky jednotky sa vylodia, keď prepravca príde do kolónie.
 model.option.expertsHaveConnections.name=Experti majú konexie
 model.option.expertsHaveConnections.shortDescription=Experti môžu použiť svoje konexie, aby zabezpečili minimálne množstvá zdrojov pre výrobu v továrňach.
 model.option.foundColonyDuringRebellion.name=Založiť kolónie počas rebélie
-model.option.foundColonyDuringRebellion.shortDescription=Hráč môže zakladať kolónie počas vojny za nezávislosť.
+model.option.foundColonyDuringRebellion.shortDescription=Hráč môže pokračovať v zakladaní kolónií počas vojny za nezávislosť.
+model.option.payForBuilding.name=Platba za stavbu
+model.option.payForBuilding.shortDescription=Stavby môžu byť rýchlo dokončené zaplatením za chýbajúci tovar.
 model.option.saveProductionOverflow.name=Uložiť prebytok výroby
 model.option.saveProductionOverflow.shortDescription=Uložiť prebytok kladív, zvonov a krížov.
+model.option.clearHammersOnConstructionSwitch.name=Vymaž kladivá pri zmene stavby
+model.option.clearHammersOnConstructionSwitch.shortDescription=Vynuluj nazhormaždené kladivá ak sa zmení aktuálna stavba.
 model.option.allowStudentSelection.name=Povoliť výber študentov
 model.option.allowStudentSelection.shortDescription=Povoľuje manuálne priraďovanie študentov.
 model.option.enableUpkeep.name=Budovy potrebujú údržbu (EXPERIMENTÁLNE)
@@ -536,20 +575,20 @@ model.option.enableUpkeep.shortDescription=Platiť za údržbu budov alebo trpie
 model.option.onlyNaturalImprovements.name=Len prírodné vylepšenia
 model.option.onlyNaturalImprovements.shortDescription=Len prírodné vylepšenia políčok prispievajú k výrobe nepotravinárskeho tovaru na políčku v strede kolónie.
 model.option.naturalDisasters.name=Prírodné katastrofy
-model.option.naturalDisasters.shortDescription=Pravdepodobnosť prírodných katastrof na ťah.
+model.option.naturalDisasters.shortDescription=Pravdepodobnosť prírodných katastrof v každom ťahu.
 gameOptions.victoryConditions.name=Podmienky víťazstva
 gameOptions.victoryConditions.shortDescription=Nastavenie možností ako sa dá hra vyhrať.
 model.option.victoryDefeatREF.name=Prvý hráč, ktorý získa nezávislosť
 model.option.victoryDefeatREF.shortDescription=Prvý ľudský hráč, ktorý porazí Kráľovské vojsko vyhrá hru.
-model.option.victoryDefeatEuropeans.name=Všetci ostatní európsky hráči sú porazený
+model.option.victoryDefeatEuropeans.name=Porážka všetkých ostatných európskych hráčov
 model.option.victoryDefeatEuropeans.shortDescription=Hociktorý hráč, ktorý porazí všetkých ostatných európskych hráčov vyhrá hru.
-model.option.victoryDefeatHumans.name=Všetci ostatní ľudský hráči sú porazený
+model.option.victoryDefeatHumans.name=Porážka všetkých ostatných ľudských hráčov
 model.option.victoryDefeatHumans.shortDescription=Hociktorý hráč, ktorý porazí všetkých ostatných ľudských hráčov vyhrá hru.
 gameOptions.years.name=Možnosti roka
 gameOptions.years.shortDescription=Obsahuje možnosti týkajúce sa rôznych špeciálnych rokov.
 model.option.startingYear.name=Začiatočný rok
 model.option.startingYear.shortDescription=Rok v ktorom hra začína.
-model.option.seasonYear.name=Rok sezóny
+model.option.seasonYear.name=Rok sezón
 model.option.seasonYear.shortDescription=Prvý rok v ktorom sú dve sezóny.
 model.option.mandatoryColonyYear.name=Rok povinnej kolónie
 model.option.mandatoryColonyYear.shortDescription=Rok v ktorom treba vlastniť kolóniu.
@@ -557,6 +596,10 @@ model.option.lastYear.name=Posledný rok hry
 model.option.lastYear.shortDescription=Úplne posledný rok hry.
 model.option.lastColonialYear.name=Posledný rok koloniálnej hry
 model.option.lastColonialYear.shortDescription=Posledný rok hry koloniálneho hráča.
+model.option.independenceTurn.name=Ťah nezávislosti
+model.option.independenceTurn.shortDescription=Vyhlásenie nezávislosti pred týmto ťahom je ocenené bonusovým skóre.
+model.option.seasons.name=Obdobia
+model.option.seasons.shortDescription=Počet období v roku
 gameOptions.prices.name=Možnosti ceny
 gameOptions.prices.shortDescription=Obsahuje hrou generované možnosti kontroly počiatočných cien.
 model.option.food.minimumPrice.name=Minimálna počiatočná cena jedla
@@ -642,16 +685,76 @@ model.option.maximumLatitude.name=Maximálna zemepisná šírka
 model.option.maximumLatitude.shortDescription=Najjužnejšia zemepisná šírka. Kladná hodnota udáva južnú zemepisnú šírku.
 model.option.riverNumber.name=Počet riek
 model.option.riverNumber.shortDescription=Možnosť nastavenia počtu riek na generovaných mapách.
+model.option.riverNumber.verySmall.name=Veľmi malý
+model.option.riverNumber.verySmall.shortDescription=Veľmi málo riek
+model.option.riverNumber.small.name=Malý
+model.option.riverNumber.small.shortDescription=Malý počet riek
+model.option.riverNumber.medium.name=Priemerný
+model.option.riverNumber.medium.shortDescription=Priemerný počet riek
+model.option.riverNumber.large.name=Veľký
+model.option.riverNumber.large.shortDescription=Veľký počet riek
+model.option.riverNumber.veryLarge.name=Veľmi veľký
+model.option.riverNumber.veryLarge.shortDescription=Hojne riek
 model.option.mountainNumber.name=Počet hôr
 model.option.mountainNumber.shortDescription=Možnosť nastavenia počtu hôr na generovaných mapách.
+model.option.mountainNumber.verySmall.name=Veľmi malý
+model.option.mountainNumber.verySmall.shortDescription=Veľmi málo hôr
+model.option.mountainNumber.small.name=Malý
+model.option.mountainNumber.small.shortDescription=Malý počet hôr
+model.option.mountainNumber.medium.name=Priemerný
+model.option.mountainNumber.medium.shortDescription=Priemerný počet hôr
+model.option.mountainNumber.large.name=Veľý
+model.option.mountainNumber.large.shortDescription=Veľký počet hôr
+model.option.mountainNumber.veryLarge.name=Veľmi veľký
+model.option.mountainNumber.veryLarge.shortDescription=Hojnosť hôr
 model.option.rumourNumber.name=Počet povestí stratených miest.
 model.option.rumourNumber.shortDescription=Možnosť nastavenia počtu povestí stratených miest na generovaných mapách.
+model.option.rumourNumber.verySmall.name=Veľmi malý
+model.option.rumourNumber.verySmall.shortDescription=Veľmi málo povestí
+model.option.rumourNumber.small.name=Malý
+model.option.rumourNumber.small.shortDescription=Malý počet povestí
+model.option.rumourNumber.medium.name=Priemerný
+model.option.rumourNumber.medium.shortDescription=Priemerný počet povestí
+model.option.rumourNumber.large.name=Veľký
+model.option.rumourNumber.large.shortDescription=Veľký počet povestí
+model.option.rumourNumber.veryLarge.name=Veľmi veľký
+model.option.rumourNumber.veryLarge.shortDescription=Hojnosť povestí
 model.option.forestNumber.name=Percento lesov
 model.option.forestNumber.shortDescription=Možnosť nastavenia percenta lesov na generovaných mapách.
+model.option.forestNumber.verySmall.name=Veľmi malý
+model.option.forestNumber.verySmall.shortDescription=Veľmi málo lesov
+model.option.forestNumber.small.name=Malý
+model.option.forestNumber.small.shortDescription=Malý počet lesov
+model.option.forestNumber.medium.name=Priemerný
+model.option.forestNumber.medium.shortDescription=Priemerný počet lesov
+model.option.forestNumber.large.name=Veľý
+model.option.forestNumber.large.shortDescription=Veľký počet lesov
+model.option.forestNumber.veryLarge.name=Veľmi veľký
+model.option.forestNumber.veryLarge.shortDescription=Hojnosť lesov
 model.option.bonusNumber.name=Percento bonusových políčok
 model.option.bonusNumber.shortDescription=Možnosť nastavenia percenta bonusových políčok na generovaných mapách.
+model.option.bonusNumber.verySmall.name=Veľmi malý
+model.option.bonusNumber.verySmall.shortDescription=Veľmi málo bonusov
+model.option.bonusNumber.small.name=Malý
+model.option.bonusNumber.small.shortDescription=Malý počet bonusov
+model.option.bonusNumber.medium.name=Priemerný
+model.option.bonusNumber.medium.shortDescription=Priemerný počet bonusov
+model.option.bonusNumber.large.name=Veľý
+model.option.bonusNumber.large.shortDescription=Veľký počet bonusov
+model.option.bonusNumber.veryLarge.name=Veľmi veľký
+model.option.bonusNumber.veryLarge.shortDescription=Hojnosť bonusov
 model.option.humidity.name=Vlhkosť
 model.option.humidity.shortDescription=Možnosť nastavenia priemernej vlhkosti mapy.
+model.option.humidity.veryDry.name=Veľmi sucho
+model.option.humidity.veryDry.shortDescription=Veľmi nízka vlhkosť
+model.option.humidity.dry.name=Sucho
+model.option.humidity.dry.shortDescription=Nízka vlhkosť
+model.option.humidity.normal.name=Normálne
+model.option.humidity.normal.shortDescription=Normálna vlhkosť
+model.option.humidity.wet.name=Vlhko
+model.option.humidity.wet.shortDescription=Vysoká vlhkosť
+model.option.humidity.veryWet.name=Veľmi vlhko
+model.option.humidity.veryWet.shortDescription=Veľmi vysoká vlhkosť
 model.option.temperature.name=Teplota
 model.option.temperature.shortDescription=Možnosť nastavenia priemernej teploty mapy.
 mapGeneratorOptions.import.name=Import
@@ -1355,6 +1458,7 @@ model.improvement.road.description=Cesta
 model.improvement.road.name=Cesta
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limit pobrežných kolónií
+# Fuzzy
 model.limit.independence.coastalColonies.description=Potrebujete mať najmenej %limit% pobrežných kolónií pre vyhlásenie nezávislosti.
 model.limit.independence.rebels.name=Limit rebelov
 model.limit.independence.rebels.description=Najmenej %limit%% Vašich kolonistov musí podporovať nezávislosť.
@@ -1511,8 +1615,7 @@ model.tile.marsh.description=Bažina je druh mokraďovitého územia s trávou,
 model.tile.mixedForest.name=Zmiešaný les
 model.tile.mixedForest.description=Zmiešané lesy sa nachádzajú v miernom podnebí. Produkujú obilie, drevo, kožušiny a trochu bavlny. Vyrúbaním zmiešaných lesov vnikajú nížiny.
 model.tile.mountains.name=Hory
-# Fuzzy
-model.tile.mountains.description=Hory prevyšujú okolitý terén a sú všeobecne strmšie než kopce Sú ťažko dostupné a nedajú sa na nich zakladať kolónie. Sú veľmi užitočné na ťažbu železnej rudy a striebra.
+model.tile.mountains.description=Hory sa týčia na d okolitým terénom v obmedzenej oblasti. Vo všeobecnosti sú strmšie než kopce. Ťažko sa cez ne cestuje a nedajú sa na nich zakladať kolónie. Poskytujú vysoký obranný bonus ale opevnenie ho uˇz nezvýši. Baníctvo je užitočné na ťažbu železnej rudy a striebra.
 model.tile.ocean.name=Oceán
 model.tile.ocean.description=Oceány sú slané vody, výborné na chytanie rýb. Množstvo rýb sa zvyšuje prítomnosťou pôdy a najviac ich je pri ústiach riek.
 model.tile.plains.name=Nížiny
@@ -1659,6 +1762,7 @@ model.colony.badGovernment=Vláda v kolónii %colony% je málo účinná. Výrob
 model.colony.goodGovernment=Zvýšila sa výkonnosť vlády! Rebelanstvo v kolónii %colony% sa teraz rovná alebo je väčšie ako %number% percent.
 model.colony.governmentImproved1=Vláda v kolónii %colony% sa zlepšila, ale stále nieje dosť efektívna. Zníženie produkcie stále trvá.
 model.colony.governmentImproved2=Vláda v kolónii %colony% sa zlepšila. Výroba sa vrátila do normálu.
+# Fuzzy
 model.colony.insufficientProduction=V kolónii %colony% by sa dalo vyrobiť o %outputAmount% ks viac tovaru %outputType%, keby sme mali o %inputAmount% ks viac tovaru %inputType%.
 model.colony.lostGoodGovernment=Znížila sa výkonnosť vlády! Rebelanstvo v kolónii %colony% sa už teraz viac nerovná alebo nie je väčšie ako %number% percent. Výrobný bonus v kolónii skončil.
 model.colony.lostVeryGoodGovernment=Znížila sa výkonnosť vlády! Rebelanstvo v kolónii %colony% sa už teraz viac nerovná alebo nie je väčšie ako %number% percent.
@@ -1673,12 +1777,17 @@ model.colony.veryBadGovernment=Vláda v kolónii %colony% je veľmi neúčinná.
 model.colony.veryGoodGovernment=Zvýšila sa výkonnosť vlády! Rebelanstvo v kolónii %colony% sa teraz rovná alebo je väčšie ako %number% percent.
 model.colonyTile.claim=(nárokovať si %direction%)
 model.diplomaticTrade.receive.contact=Bratské pozdravy od slávneho národa %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Dovoľte nám vyjednávať s národom %nation%.
 model.diplomaticTrade.receive.trade=Uvažujme o ponuke od %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=%nation% od nás požadujú poplatok!
 model.diplomaticTrade.send.contact=Stretli sme členov národa %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Uvažujme o našej diplomatickej situácii s %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Navrhnime obchod s %nation% v %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Požadujeme poplatok od %nation% v %settlement%.
 model.direction.N.name=sever
 model.direction.NE.name=severovýchod
@@ -1689,25 +1798,35 @@ model.direction.SW.name=juhozápad
 model.direction.W.name=západ
 model.direction.NW.name=severozápad
 model.historyEventType.abandonColony.description=Opustili ste kolóniu %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=%nation% s nami podpísali dohodu o neútoční.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Národ %nation% objavili mesto %city% a v ňom poklad v hodnote %treasure% ks zlata.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Vašu kolóniu %colony% dobyli %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Vašu kolóniu %colony% zničili %nation%.
+model.historyEventType.conquerColony.description=Dobyli ste %nation% kolóniu %colony%.
+model.historyEventType.declareIndependence.description=Vyhlásili ste nezávislosť od Koruny.
 # Fuzzy
-model.historyEventType.conquerColony.description=Odvážili ste sa prijať naše podmienky a pritom sa vyhnúť platbe? Takýto čin bude žať trpkú odmenu.
-# Fuzzy
-model.historyEventType.declareIndependence.description=Zničili ste osadu %settlement% národa %nation%.
 model.historyEventType.declareWar.description=%nation% nám vyhlásili vojnu.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% zničili domorodý národ %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Objavili ste Nový svet.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Národ %nation% objavili %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=%nation% s nami uzavreli alianciu.
 model.historyEventType.foundColony.description=Založili ste kolóniu %colony%.
 model.historyEventType.foundingFather.description=Zakladateľ %father% sa pridal ku Kontinentálnemu kongresu.
 model.historyEventType.independence.description=Dosiahli ste nezávislosť od kráľovstva.
+# Fuzzy
 model.historyEventType.makePeace.description=%nation% s nami podpísali mier.
+# Fuzzy
 model.historyEventType.meetNation.description=Stretli ste príslušníkov národa %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Národ %nation% sa už v Novom svete nenachádza.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% odovzdali všetky svoje kolónie Nového sveta národu %nation%.
 model.indianSettlement.mostHatedNone=Žiadne
 model.indianSettlement.mostHatedUnknown=Neznámy
@@ -1758,12 +1877,13 @@ model.messageType.warehouseCapacity.name=Kapacita skladu
 model.messageType.warning.name=Upozornenia
 model.monarch.action.addToRef.text=Kráľovstvo pridalo %number% {{plural:%number%|%unit%}} do Kráľovských expedičných síl. Vodcovia kolonistov vyjadrujú znepokojenie.
 model.monarch.action.addToRef.no=Hotovo
+# Fuzzy
 model.monarch.action.declarePeace.text=Milostivo sme sa s národom %nation% dohodli na mierovej zmluve.
 model.monarch.action.declarePeace.no=Hotovo
+# Fuzzy
 model.monarch.action.declareWar.text=Drzosť národa %nation% Nás núti im vyhlásiť vojnu!
 model.monarch.action.declareWar.no=Hotovo
-# Fuzzy
-model.monarch.action.displeasure.text=Vyhlásili ste nezávislosť od kráľovstva.
+model.monarch.action.displeasure.text=Opovážili ste sa prijať Naše veľkorysé podmienky a teraz sa vyhýbate plateniu? Za takú neúprimnosť zožnete horkú odmenu Našej  nespokojnosti.
 model.monarch.action.displeasure.no=Hotovo
 model.monarch.action.forceTax.text=Pohŕdame Vašim pokusom vyhnúť sa plateniu daní. Výška daní je teraz %amount%%.
 model.monarch.action.forceTax.no=Hotovo
@@ -1804,8 +1924,7 @@ model.advantages.selectable.name=Voliteľné
 model.advantages.selectable.shortDescription=Výhody národov sú voliteľné a nemusia byť jedinečné.
 model.nationState.aiOnly.name=iba počítač
 model.nationState.available.name=dostupné
-# Fuzzy
-model.nationState.available.shortDescription=Dobyli ste kolóniu %colony% národa %nation%.
+model.nationState.available.shortDescription=Možete hrať ako tento národ
 model.nationState.notAvailable.name=nie je k dispozícii
 model.noClaimReason.europeans.description=Tento pozemok si nárokuje iný Európsky národ.
 model.noClaimReason.natives.description=Tento pozemok si nárokuje domorodý kmeň.
@@ -1819,6 +1938,7 @@ model.player.colonialIndependence=Len koloniálny hráči môžu vyhlásiť nez
 model.player.forces=sily národa %nation%
 model.player.independentMarket=Európa
 model.player.startGame=Po mesiacoch na mori ste konečne prišli k pobrežiu neznámeho kontinentu. Plaviť sa {{tag:%direction%|západ=západne|východ=východne|default=po vetre}} pre objavenie Nového sveta a získať ho pre kráľa.
+# Fuzzy
 model.player.waitingFor=Čakanie na: %nation%
 model.regionType.coast.name=Pobrežie
 model.regionType.coast.unknown=Neznáma pobrežná oblasť
@@ -1858,6 +1978,7 @@ model.tradeItem.gold.name=Zlato
 model.tradeItem.gold.description=suma %amount% ks zlata
 model.tradeItem.goods.name=Tovar
 model.tradeItem.incite.name=Vyhlásiť vojnu proti
+# Fuzzy
 model.tradeItem.incite.description=vojna proti %nation%
 model.tradeItem.stance.name=Postoj
 model.tradeItem.unit.name=Jednotka
@@ -1878,6 +1999,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1918,6 +2040,7 @@ model.colony.warehouseSoonFull=Váš sklad v kolónii %colony% pri ďalšom ťah
 model.colony.warehouseWaste=Váš sklad v kolónii %colony% presiahol maximálnu kapacitu tovaru %goods%. %waste% ks bolo zničených.
 model.colony.workersEvicted=Vaši kolonisti v kolónii %colony% na políčku %location% prestali pracovať pretože sa tam nachádzajú nepriateľské jednotky %enemyUnit%.
 model.colonyTile.resourceExhausted=Zdroj %resource% v kolónii %colony% vyčerpaný
+# Fuzzy
 model.game.spanishSuccession=Vaša excelencia, v Európe sa skončila vojna o španielske dedičstvo. V zmluve z Utrechtu sa %loserNation% zaviazali odovzdať všetky svoje kolónie Nového sveta národu %nation%!
 model.indianSettlement.mission.denounced=Váš misionár v osade %settlement% bol popravený.
 model.indianSettlement.mission.destroyed=Váš misionár v osade %settlement% zomrel pri zničení osady.
@@ -1927,6 +2050,7 @@ model.player.autoRecruit=Náboženské nepokoje v kraji %europe% nútia jednotku
 model.player.colonyGoodsParty.harbour=Na znak protestu proti vysokým daniam, Vaši kolonisti v kolónii %colony% vyhodili %amount% ks tovaru %goods% do mora!
 model.player.colonyGoodsParty.horses=Na protest proti nespravodlivým daniam, ktoré treba platiť kráľovstvu Vaši kolonisti v kolónii %colony% pustili na slobodu %amount% ks koní.
 model.player.colonyGoodsParty.landLocked=Na znak protestu proti vysokým daniam, Vaši kolonisti v kolónii %colony% spálili %amount% ks tovaru %goods%!
+# Fuzzy
 model.player.dead.european=Vaša excelencia, %nation% vyhlásili bezpodmienečné vysťahovanie z Nového sveta!
 model.player.dead.native=Vaša excelencia, %nation% boli zničení.
 model.player.disaster.bankruptcy.start=Nedokázali ste platiť za údržbu všetkých budov. Výroba niektorých tovarov sa znížila.
@@ -1940,12 +2064,16 @@ model.player.ignoredTax=Kráľovstvo zaviedlo avizované zvýšenie dane na  %am
 model.player.interventionForceArrives=Sľúbené intervenčné sily práve prišli!
 model.player.soLDecrease=Členský klub Synova slobody vo Vašich kolóniách klesol na %newSoL% percent!
 model.player.soLIncrease=Členský klub Synovia slobody vo Vašich kolóniách vzrástol na %newSoL% percent!
+# Fuzzy
 model.player.stance.alliance.declared=Vaša excelencia, %nation% sú naši spojenci!
 model.player.stance.alliance.others=Vaša excelencia, %attacker% uzavreli alianciu s národom %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Vaša excelencia, %nation% súhlasili s nami podpísať dohodu o neútočení!
 model.player.stance.ceaseFire.others=Vaša excelencia, %attacker% súhlasili podpísať dohodu o neútočení s národom %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Vaša excelencia, medzi nami a národom %nation% je mier!
 model.player.stance.peace.others=Vaša excelencia, %attacker% uzavreli mier s národom %defender%.
+# Fuzzy
 model.player.stance.war.declared=Zlé správy Vaša excelencia. %nation% nám vyhlásili vojnu!
 model.player.stance.war.others=Vaša excelencia, %attacker% vyhlásili vojnu národu %defender%.
 combat.automaticDefence=Vaša jednotka %unit% v kolónii %colony% pozdvihla zbrane na obranu kolónie!
@@ -1961,6 +2089,7 @@ combat.enemyShipEvaded=Nepriateľská jednotka %enemyUnit% národa %enemyNation%
 combat.enemyShipSunk=Jednotka %unit% potopila nepriateľskú jednotku %enemyUnit% národa %enemyNation%!
 combat.equipmentCaptured=Pozor, bojovníci národa %nation% získali vybavenie %equipment%!
 combat.goodsStolen=Nepriateľská jednotka %enemyUnit% národa %enemyNation% ukradla %amount% ks tovaru %goods% z kolónie %colony%!
+# Fuzzy
 combat.indianPlunder=Nepriateľská jednotka %enemyUnit% národa %enemyNation% ukoristila %amount% ks zlata z kolónie %colony%.
 combat.indianRaid=Naši špehovia hlásia, že %nation% vylúpili %colony% národa %colonyNation%.
 combat.indianSurprise=%nation% prekvapivo zaútočili na %colony%. Náčelník národa %nation% však účasť popiera.
@@ -2008,15 +2137,14 @@ model.unit.noMoreTools=%location%: Váš priekopník použil všetko svoje nára
 model.unit.slowed=Nepriateľská jednotka %enemyUnit% národa %enemyNation% spomaľuje pohyb našej jednotky %unit%.
 model.unit.unitRepaired=Jednotka %unit% bola v %repairLocation% opravená.
 model.unit.hardyPioneer.noMoreTools=%location%: Váš Majster priekopník opotreboval všetky svoje nástroje.
-# Fuzzy
-error.couldNotLoad=Pri načítaní hry došlo k chybe!
-# Fuzzy
-error.couldNotSave=Pri ukladaní hry došlo k chybe!
+error.couldNotLoad=Pri pokuse o načítanie hry zo súboru %name% nastala chyba!
+error.couldNotSave=Pri pokuse o uloženie hry do súboru %name% nastala chyba!
 main.defaultPlayerName=Meno hráča
 main.javaVersion=Java %minVersion% alebo vyššia verzia je odporúčaná na hranie FreeCol\n(%version% detekovaná, použite--no-java-check na vynechanie tejto kontroly).
 main.memory=Potrebujete priradiť viac než %memory% bytov pamäte pre JVM.\n  Reštartujte FreeCol s:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol nemôže nájsť vhodné adresáre na uloženie používateľských dát.\nPokračuje sa, ale očakávajte problémy.
 client.baseData=Nemožno nájsť základný adresár %dir%.\nHra FreeCol nemôže nájsť dátové súbory.\nUistite sa, že ich máte.\nAk hra FreeCol hľadá v zlom adresári, tak spustite hru príkazom: --freecol-data<sem napíšte adresár so súbormi>
+# Fuzzy
 client.choicePlayer=Prosím zvoľte hráča:
 client.classic=Nepodarilo sa načítať nastavenia pre "klasickú hru".
 client.headlessDebug=Bezhlavý režim vyžaduje spustenie ladenia.
@@ -2026,8 +2154,10 @@ metaServer.couldNotConnect=Ospravedlňujeme sa, nedá sa pripojiť na meta-serve
 metaServer.communicationError=Pri komunikácii s meta-serverom sa vyskytla chyba. Prosím skúste znovu neskôr.
 abandonEducation.action.studying=štúdium
 abandonEducation.action.teaching=výučba
+# Fuzzy
 abandonEducation.no=Nie, pokračovať vo vzdelávaní
 abandonEducation.text=Ak Vaša jednotka %unit% opustí kolóniu %colony% prestane %action% v %building%. Naozaj chcete, aby odišla?
+# Fuzzy
 abandonEducation.yes=Áno, opustiť kolóniu
 abandonTeaching.text=Ak Vaša jednotka %unit% opustí budovu %building% prestane sa učiť. Naozaj chcete, aby odišla?
 armedUnitSettlement.attack=Zaútočiť
@@ -2039,15 +2169,18 @@ buy.takeOffer=Prijať ponuku
 buy.text=%nation% by radi predali svoje %goods% za %gold%:
 clearTradeRoute.text=Vaša jednotka %unit% je priradená k obchodnej ceste %route%. Nastavenie jej cieľa vymaže priradenú obchodnú cestu. Ste si istý, že to chcete urobiť?
 client.fullScreen=Toto grafické zariadenie nepodporuje režim celej obrazovky.\nVracia sa späť do režimu zobrazenia v okne.
+# Fuzzy
 confirmHostile.alliance=Nemôžete zaútočiť na spojenecký národ. Naozaj chcete zrušiť alianciu s národom %nation% a vyhlásiť im vojnu?
+# Fuzzy
 confirmHostile.ceaseFire=Podpísali ste dohodu o neútočení s národom %nation%. Naozaj si prajete zaútočiť?
+# Fuzzy
 confirmHostile.peace=Medzi Vami a národom %nation% je mier. Naozaj si prajete vyhlásiť vojnu?
+# Fuzzy
 confirmTribute.broke=Naši špióni nám hlásia, že %nation% sú úplne zlomení. Nemrhajme časom na poplatky.
 confirmTribute.european=%nation% %danger%, a %finance%. Aký veľký poplatok od nich požadovať?
 confirmTribute.happy=%nation% v %settlement% sú naši dobrí priatelia. Je to škoda ničiť naše priateľstvo.
 confirmTribute.no=Možno by sme nemali
-# Fuzzy
-confirmTribute.normal=Požadovať mierny poplatok
+confirmTribute.normal=Nie je to isté, ale %nation% v %settlement% môže mať niečo hodnotné. Máme od nich požadovať daň?
 confirmTribute.unwise=%nation% sú silní a početní. Je múdre ich provokovať?
 confirmTribute.warLikely=Pozor, žiadať poplatok môže znovu vyvolať vojnu s národom %nation%.
 confirmTribute.yes=Pokračovať v požadovaní poplatku
@@ -2058,13 +2191,11 @@ error.noSuchFile=Zadaný súbor neexistuje alebo to nieje normálny súbor.
 finance.high=sú finančne zabezpečení
 finance.low=sú známy tým, že sú chudobní
 finance.normal=majú malú rezervu zlata
-# Fuzzy
 indianLand.cancel=Opustiť pozemok.
-# Fuzzy
-indianLand.pay=Ponúknuť %amount% zlata za pozemok.
-# Fuzzy
-indianLand.take=Vziať si to čo nám právom patrí.
+indianLand.pay=Ponúknuť %amount% kusov zlata za pozemok.
+indianLand.take=Vziať si, čo nám právom patrí.
 indianLand.text=Toto územie vlastní hráč %player%. Chceli by ste:
+# Fuzzy
 indianLand.unknown=V tomto kraji žijú nejaký neznámi ľudia. Chceli by ste:
 info.autodetectLanguageSelected=Vybrali ste si autodetekciu jazyka. Tá sa uskutoční po nasledujúcom reštartovaní hry.
 info.enterSomeText=Prosím, zadajte nejaký text.
@@ -2110,7 +2241,9 @@ defeated.text=Porazili Vás! Čo chcete urobiť:
 defeated.yes=Ostať a dívať sa
 defeatedSinglePlayer.text=Porazili Vás!\n\nToto je teraz čarovná noc keď kostoly spánkom zívajú a peklo závistlivo dýcha na tento svet. Teraz by som mohol preliať krv a pohľadom zatriasť zem.
 defeatedSinglePlayer.yes=Vstúpiť do režimu pomsty
+# Fuzzy
 diplomacy.offerAccepted=%nation% prijali vašu veľkorysú ponuku.
+# Fuzzy
 diplomacy.offerRejected=%nation% odmietli Vašu štedrú ponuku.
 disbandUnit.text=Naozaj chcete odstrániť túto jednotku?
 disbandUnit.yes=Rozpustiť
@@ -2153,9 +2286,12 @@ missionarySettlement.inciteQuestion=Na ktoré európske vojsko máme zaútočiť
 move.noAccessBeached=Loď národa %nation% pri brehu, blokuje našu cestu.
 move.noAccessContact=Najskôr musíme nadviazať kontakt s národom %nation%, Vaša excelencia.
 move.noAccessGoods=Národ %nation% nebude obchodovať s prázdnou jednotkou %unit%.
+move.noAccessMissionBan=%nation% odmietli všetky kontakty s našimi misionármi.
 move.noAccessSettlement=Národ %nation% nedovoľuje našej jednotke %unit% vstúpiť do ich osady.
 move.noAccessSkill=Naša jednotka %unit% sa nemôže učiť od domorodcov.
+# Fuzzy
 move.noAccessTrade=Nemáme oprávnenie na obchodovanie s inými európskymi národmi ako aj s národom %nation%.
+# Fuzzy
 move.noAccessWar=Počas vojny nemôžeme obchodovať s národom %nation%.
 move.noAccessWater=Naša jednotka %unit% musí pred vstupom do osady pristáť na pevnine.
 move.noAttackWater=Naša jednotka %unit% musí pred útokom pristáť na pevnine.
@@ -2164,6 +2300,7 @@ nameRegion.text=Objavili ste región %type% a nárokujete ho pre Vášho kráľa
 newLand.text=Prosím, pomenujte našu novú krajinu:
 payArrears.noGold=Nemáte dosť zlata na to, aby ste zaplatili daňový dlh v hodnote %amount% ks zlata.
 payArrears.text=Kráľ zablokoval tento tovar pretože ste nezaplatili daňový dlh v množstve %amount% ks zlata. Chcete ho teraz zaplatiť?
+payForBuilding.disabled=Platby za dokončenie stavieb sú v tejto hre zakázané.
 payForBuilding.text=Chcete zaplatiť %amount% zlata na dokončenie tejto budovy?
 renameColony.text=Prosím navrhnite nový názov pre našu kolóniu:
 renameUnit.text=Prosím navrhnite nový názov pre našu jednotku:
@@ -2173,8 +2310,7 @@ scoutSettlement.speakDie=Prezradili ste posvätné tajomstvá kmeňa! Priviažem
 scoutSettlement.speakNothing=Vždy radi privítame cestovateľov národa %nation%.
 scoutSettlement.speakTales=Je nám potešením privítať cestovateľov z takej diaľky. Prisadnite si k nášmu ohňu a my Vám porozprávame príbehy o okolitej krajine.
 sellProposition.text=Chcete predať nejaký tovar?
-# Fuzzy
-trade.noTrade=Obchod odmietnutý.
+trade.noTrade=%settlement% odmietol obchod.
 trade.noTradeGoods=Ospravedlňujeme sa %goods% už viac nepotrebujeme!
 trade.noTradeHaggle=Už sme unavení z Vášho neustáleho vyjednávania.
 trade.noTradeHostile=Pohŕdame Vami aj Vašim tovarom. Choďte preč!
@@ -2182,6 +2318,7 @@ trade.nothingToSell=Ospravedlňujeme sa, v túto chvíľu nemáme nič na predaj
 tradeProposition.welcome=Obchodovanie s %nation% v %settlement%
 tradeRoute.atStop=V %location%:
 tradeRoute.loadStop=Naložené %amount% %goods%.
+tradeRoute.loadStopBlocked=Na palube sa nečakane sa našlo %goods%.
 tradeRoute.loadStopExport=Naložené %amount% %goods%. %more% ostalo v sklade.
 tradeRoute.loadStopImport=Naložené %amount% %goods%. Chýba priestor pre %more% viac.
 tradeRoute.loadStopNoExport=Naložené nula %goods%. %more% ostalo v sklade.
@@ -2195,8 +2332,7 @@ tradeRoute.unloadStopImport=Vyložené %amount% %goods% a vyhodené %more%.
 tradeRoute.unloadStopNoExport=Vyložené nula %goods% a %more% ostalo na palube.
 tradeRoute.wait=Nemá prácu, čaká.
 traderoute.warehouseCapacity=Vyloženie jednotky %unit% v kolónii %colony% by presiahlo kapacitu skladu. %amount% %goods% by sa vyhodilo. Chcete napriek tomu tovar vyložiť?
-# Fuzzy
-twoTurnsPerYear=Počínajúc rokom %year% budú dva ťahy za rok namiesto jedného.
+twoTurnsPerYear=Počínajúc rokom %year% budú %amount% ťahy za rok namiesto jedného.
 server.badColor=Neplatná farba
 server.badNation=Neplatný národ
 server.badNationType=Neplatný typ národa
@@ -2217,6 +2353,7 @@ server.timeOut=Časový limit pre pripojenie k serveru.
 server.userNameInUse=Zadané užívateľské meno sa už používa.
 server.userNameNotPresent=V tejto hre sa zadané užívateľské meno nenachádza.
 server.wrongFreeColVersion=Klient a verzia hry FreeCol sa nezhodujú.
+# Fuzzy
 buildColony.others=Národ %nation% založil novú kolóniu %colony% v %region%.
 cashInTreasureTrain.colonial=Poklad s %amount% ks zlata pristál v Európe. Zinkasovali sme %cashInAmount% ks zlata.
 cashInTreasureTrain.independent=Do národnej pokladice bolo pridané %amount% ks zlata.
@@ -2300,10 +2437,8 @@ colopedia.nationType.skills=Naučené zručnosti:
 colopedia.nationType.typeOfSettlements=Druh osád:
 colopedia.nationType.units=Počiatočné jednotky:
 colopedia.terrain.colonyCenterTile=Políčko centra kolónie
-# Fuzzy
 colopedia.terrain.defenseBonus=Obranný bonus
 colopedia.terrain.description=Popis
-# Fuzzy
 colopedia.terrain.movementCost=Cena presunu
 colopedia.terrain.resource=Možný zdroj
 colopedia.terrain.terrainImage=Obrázok terénu
@@ -2320,6 +2455,7 @@ colopedia.unit.offensivePower=Útočná sila:
 colopedia.unit.price=Cena v Európe:
 colopedia.unit.productionBonus=Výrobná/é {{plural:%number%|one=úprava|other=úpravy}}:
 colopedia.unit.requirements=Požiadavky:
+# Fuzzy
 colopedia.unit.school=Požadovaná škola na výcvik:
 colopedia.unit.skill=Úroveň zručností:
 report.labour.allColonists=Všetci kolonisti
@@ -2352,11 +2488,10 @@ report.colony.exploring.description=kolónii %colony% by prospelo preskúmať {{
 report.colony.grow.description=Počet jednotiek, ktoré môže kolónia vychovať bez toho, aby sa znížila výroba
 report.colony.grow.header=+
 report.colony.growing.description=%colony% môže vychovať {{plural:%amount%|one=jednu jednotku||two=dve jednotky|three=tri jednotky|four=štyri jednotky|other=%amount% jednotiek}} bez toho, aby sa znížila výroba
-# Fuzzy
-report.colony.improve.description=Jednotky, ktoré by mohli zvýšiť výrobu s ohľadom na jednotky, ktoré už prácu vykonávajú
+report.colony.improve.description=Jednotky, ktoré môžu zvýšiť výrobu.
 report.colony.improve.header=Vylepšiť
+# Fuzzy
 report.colony.improving.description=%colony%: Aby ste vyrábali o %amount% ks viac tovaru %goods%, vymeňte jednotku %oldUnit% za jednotku %unit%
-report.colony.wanting.description=%colony%: Na vyrobenie o %amount% ks viac tovaru %goods%, pridajte jednotku %unit%
 report.colony.making.blocking.description=%colony%: %amount% ks tovaru %goods% bude treba na %buildable% {{plural:%turns%|one=na ďalší ťah|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
 report.colony.making.constructing.description=%colony%: %buildable% budova dokončená {{plural:%turns%|one=na ďalší ťah|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
 report.colony.making.description=Čo táto kolónia práve vytvára
@@ -2366,22 +2501,22 @@ report.colony.making.noconstruction.description=%colony%: žiadne prebiehajúce
 report.colony.making.noteach.description=%colony%: učiteľ %teacher% nemá študenta
 report.colony.name.description=Zoznam kolónií
 report.colony.name.header=Kolónia
-report.colony.plow.description=Počet políčok kolónie, ktoré by profitovali keby boli poorané
-report.colony.plow.header=P
-report.colony.plowing.description=kolónii %colony% by prospelo poorať {{plural:%amount%|one=jedno políčko|two=dve políčka|three=tri políčka|four=štyri políčka|other=%amount% políčok}}
+# Fuzzy
 report.colony.production.description=%colony%: čistá výroba tovaru %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: čistá výroba tovaru %goods% je %amount% (exportovať nad %export%)
 report.colony.production.header=Čistá výroba tovaru %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: čistá výroba tovaru %goods% = %amount%, plná {{plural:%turns%|one=ďalším ťahom|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
+# Fuzzy
 report.colony.production.low.description=%colony%: čistá výroba tovaru %goods% = %amount%, zmizne {{plural:%turns%|one=ďaľším ťahom|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: čistá výroba tovaru %goods% = %amount%, sklad bude preplnený, %waste% ks bude vyhodených
-report.colony.road.description=Počet políčok kolónie, ktoré by profitovali z postavenej cesty
-report.colony.road.header=R
-report.colony.roadBuilding.description=kolónii %colony% by prospelo postaviť {{plural:%amount%|one=cestu|two=dve cesty|three=tri cesty|four=štyri cesty|other=%amount% ciest}}
 report.colony.shrinking.description=Kolónia %colony% musí byť zmenšená o{{plural:%amount%|one=jednu jednotku|two=dve jednotky|three=tri jednotky|four=štyri jednotky|other=%amount% jednotiek}} pre zvýšenie výroby
 report.colony.starving.description=%colony%: hladomor {{plural:%turns%|one=na ďalší ťah|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
 # Fuzzy
-report.continentalCongress.elected=Zvolení:
+report.colony.wanting.description=%colony%: Na vyrobenie o %amount% ks viac tovaru %goods%, pridajte jednotku %unit%
+report.continentalCongress.elected=Zvolený: %turn%
 report.continentalCongress.none=(žiadny)
 report.continentalCongress.recruiting=Nábor
 report.education.students=Potenciálny študenti
@@ -2422,29 +2557,27 @@ report.production.selectGoods=Výber tovaru
 report.production.update=Aktualizovať
 report.requirements.badAssignment=V kolónii %colony% pracuje %expert% ako %expertWork%, kým %nonExpert% pracuje ako %nonExpertWork%. Keby si títo kolonisti vymenili prácu, výroba by sa zvýšila.
 report.requirements.canTrainExperts={{plural:2 jedotky|%unit%}} sa môžu vytrénovať v
-report.requirements.clearTile=%type% smerom na %direction% od kolónie %colony% bude profitovať z vyrúbania.
+# Fuzzy
 report.requirements.exploreTile=%type% smerom na %direction% od kolónie %colony% bude profitovať z prieskumu.
 report.requirements.met=Všetky požiadavky sú splnené.
 report.requirements.missingGoods=%colony% vyrába %goods%, ale potrebuje viac %input%.
 report.requirements.misusedExperts={{plural:2 jednotky|%unit%}} nepracujú ako %work% v kolónii
 report.requirements.noExpert=%colony% vyrába %goods%, ale nevyrába %unit%.
-report.requirements.plowCenter=Kolónia %colony% by profitovala z poorania políčok.
-report.requirements.plowTile=%type% smerom na %direction% od kolónie %colony% bude profitovať z poorania.
-report.requirements.roadTile=%type% smerom na %direction% od kolónie %colony% bude profitovať z výstavby ciest.
 report.requirements.severalExperts={{plural:2 jednotky|%unit%}} sú prítomné v
 report.requirements.surplus=Vyrobil sa prebytok tovaru %goods% v
 report.trade.afterTaxes=Príjem po zdanení
 report.trade.beforeTaxes=Príjem pred zdanením
 report.trade.cargoUnits=Jednotiek v náklade
+# Fuzzy
 report.trade.hasCustomHouse=* Táto kolónia má vlastný dom, tento tovar je exportovaný.
 report.trade.totalDelta=Výroba celkom
 report.trade.totalUnits=Jednotiek celkom
 report.trade.unitsSold=Kúpené alebo predané jednotky
 report.turn.filter=Nezobrazovať tento druh správ (%type%)
 report.turn.ignore=Ignorovať túto správu (Kolónia: %colony%, Tovar: %goods%)
-report.turn.playerNation=%player% %nation%
 # Fuzzy
-aboutPanel.copyright=Copyright © 2002-2014 The FreeCol Team
+report.turn.playerNation=%player% %nation%
+aboutPanel.copyright=Copyright © 2002-2015 FreeCol Team
 aboutPanel.legalDisclaimer=FreeCol je softvér zadarmo: môžete ho šíri a upravovať podľa všeobecných užívateľských podmienok publikovaných Free Software Foundation verzie 2 a viac.
 aboutPanel.officialSite=Oficiálna stránka:
 aboutPanel.sfProject=SourceForge projekt:
@@ -2452,8 +2585,7 @@ aboutPanel.version=Verzia:
 buildingToolTip.breeding=Potrebujete najmenej %number% {{plural:%number%|%goods%}} na chov %goods%.
 buildQueuePanel.buildings=Budovy
 buildQueuePanel.buildQueue=Stavebné poradie
-# Fuzzy
-buildQueuePanel.buyBuilding=Kúpiť budovu
+buildQueuePanel.buyBuilding=Kúpiť %buildable%
 buildQueuePanel.compactView=Kompaktné zobrazenie
 buildQueuePanel.currentlyBuilding=Budova: %buildable%
 buildQueuePanel.populationTooSmall=Populácia: %number%
@@ -2467,6 +2599,7 @@ chooseFoundingFatherDialog.title=Nominovať Otca zakladateľa
 colonyPanel.colonyUnits=Jednotky kolónie
 colonyPanel.inPort=V prístave
 colonyPanel.outsideColony=Mimo kolónie
+# Fuzzy
 colonyPanel.producing=Vyrába:
 colonyPanel.reducePopulation=Ak znížite populáciu pod %number%, %colony% nebude môcť vybudovať %buildable%.
 colonyPanel.unitChange=Pri vstupe do kolónie sa Vaša jednotka %oldType% stala jednotkou %newType%.
@@ -2479,7 +2612,9 @@ confirmDeclarationDialog.areYouSure.no=Možno neskôr
 confirmDeclarationDialog.areYouSure.text=Vzdajme sa nespravodlivej tyranie kráľa %monarch% a vyhlásme nezávislosť našich kolónii od kráľovstva.
 confirmDeclarationDialog.areYouSure.yes=Sloboda alebo smrť!
 confirmDeclarationDialog.createFlag=a naši nepriatelia sa budú triasť pri pohľade na náš nezlomný banner.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Spojené štáty %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Slobodný %nation%
 confirmDeclarationDialog.enterCountry=Odteraz bude naša krajina známa ako
 confirmDeclarationDialog.enterNation=a každý občan nášho slávneho národa bude hrdý na to, že je známy ako
@@ -2530,8 +2665,10 @@ negotiationDialog.add=Pridať
 negotiationDialog.cancel=Zrušiť
 negotiationDialog.clear=Vyčistiť
 negotiationDialog.contact.tutorial=Stretáte kolegov Európanov. Budú s Vami súťažiť o pôdu a bohatstvo a možno Vám aj vyhlásia vojnu. Ale potom ako sa Jan de Witt pripojil ku Kontinentálnemu kongresu môžete s nimi obchodovať.
+# Fuzzy
 negotiationDialog.demand=%nation% požaduje od %otherNation%
 negotiationDialog.exchange=výmenou za
+# Fuzzy
 negotiationDialog.offer=%nation% za %otherNation%
 negotiationDialog.send=Poslať
 negotiationDialog.title.contact=Stretnutie kolegov Európanov
@@ -2554,10 +2691,9 @@ findSettlementPanel.displayAll=Nájsť všetky osady
 findSettlementPanel.displayOnlyEuropean=Nájsť iba európske osady
 findSettlementPanel.displayOnlyNatives=Nájsť iba pôvodné osady
 findSettlementPanel.name=Nájsť osadu
+# Fuzzy
 firstContactDialog.meeting.natives=Stretnutie s domorodcami...
 firstContactDialog.meeting.natives.tutorial=Stretli ste sa s domorodcami. Pošlite do ich osád svojich prieskumníkov, aby ste sa o nich dozvedeli viac a sluhov a slobodných kolonistov, aby ste sa od nich učili. Pošlite do ich osád svoje vozy a lode ak si s nimi prajete obchodovať.
-firstContactDialog.meeting.AZTEC=Národ Aztékov...
-firstContactDialog.meeting.INCA=Ríša Inkov...
 firstContactDialog.welcomeOffer.text=Víta Vás národ %nation%. Náš slávny národ sa skladá z %camps% %settlementType%. Na oslavu nášho priateľstva Vám veľkoryso darujeme pozemok na ktorom sa práve nachádzate. Chcete s nami žiť v mieri ako bratia?
 firstContactDialog.welcomeSimple.text=Víta Vás národ %nation%. Náš slávny národ sa skladá z %camps% %settlementType%.  Chcete s nami žiť v mieri ako bratia?
 abandonColony.no=Zrušiť
diff --git a/data/strings/FreeColMessages_sv_SE.properties b/data/strings/FreeColMessages_sv_SE.properties
index 9a46f1bf5..0c4143986 100644
--- a/data/strings/FreeColMessages_sv_SE.properties
+++ b/data/strings/FreeColMessages_sv_SE.properties
@@ -262,7 +262,6 @@ colopediaAction.goods.name=Varor
 colopediaAction.nations.name=Nationer
 colopediaAction.nationTypes.name=Nationella fördelar
 colopediaAction.resources.name=Bonusresurser
-colopediaAction.skills.name=Yrkesmän
 colopediaAction.terrain.name=Terrängtyp
 colopediaAction.units.name=Trupper
 colopediaAction.name=%object% (Colopedia)
@@ -1282,6 +1281,7 @@ model.improvement.road.description=Väg
 model.improvement.road.name=Väg
 model.improvement.road.occupationString=V
 model.limit.independence.coastalColonies.name=Gränsen för den kustnära kolonin
+# Fuzzy
 model.limit.independence.coastalColonies.description=Du behöver minst %limit% kustnära kolonierna för att förklara självständighet.
 model.limit.independence.rebels.name=Rebellgräns
 model.limit.independence.rebels.description=Minst %limit%% av dina kolonister måste stödja sjävständighet.
@@ -1619,6 +1619,7 @@ model.building.locationLabel=I %location%
 model.colony.badGovernment=Ledarskapet i %colony% är odugligt. Produktionen i kolonin är reducerad.
 model.colony.governmentImproved1=Ledarskapet i %colony% har förbättrats men har fortfarande brister. Produktionen i kolonin är fortfarande reducerad.
 model.colony.governmentImproved2=Ledarskapet i %colony% är inte längre odugligt. Produktionen i kolonin är inte längre reducerad.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% mer %outputType% kan produceras i %colony%, om vi bara hade %inputAmount% mer överskott av %inputType%.
 model.colony.minimumColonySize=Tack vare %object% så kan inte befolkningen minskas mer
 model.colony.stance.alliance=%nation% är glada att se en pålitlig allierad som dig.
@@ -1630,12 +1631,17 @@ model.colony.unbuildable=%colony% kan inte bygga %object% just nu. %object% har
 model.colony.veryBadGovernment=Ledarskapet i %colony% är odugligt. Produktionen i kolonin är starkt reducerad.
 model.colonyTile.claim=(kräv %direction%)
 model.diplomaticTrade.receive.contact=Broderliga hälsningar från den ärorika %nation% nationen.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Låt oss förhandla med %nation%.
 model.diplomaticTrade.receive.trade=Låt oss överväga %nation% handelserbjudande.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=%nation% kräver en tribut av oss!
 model.diplomaticTrade.send.contact=Vi har stött på medlemmar i den %nation% nationen.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Låt oss överväga vår diplomatiska situation med %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Låt oss föreslå en handel med %nation% på  %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Vi kräver tribut av %nation% vid %settlement%.
 model.direction.N.name=norr
 model.direction.NE.name=nordöst
@@ -1646,21 +1652,31 @@ model.direction.SW.name=sydväst
 model.direction.W.name=väst
 model.direction.NW.name=nordväst
 model.historyEventType.abandonColony.description=Du ger upp kolonin %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation% upptäcker %city%, en utav de sju "Städerna av guld", och en skatt bestående av %treasure% guld.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Din koloni %colony% har erövrats av %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Din koloni %colony% är förstörd av %nation%.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Du förstör %nation%s bosättning %settlement%.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% förstör %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Du utforskar den nya världen.
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation% upptäcker %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Alliansen framförhandlad med %nation%.
 model.historyEventType.foundColony.description=Du grundar kolonin %colony%.
 model.historyEventType.foundingFather.description=%father% går med i den kontinentala kongressen.
 model.historyEventType.independence.description=Du uppnår oavhängighet från kronan.
+# Fuzzy
 model.historyEventType.makePeace.description=Fredsavtal med %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Du möter %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=!%nation% finns inte längre i Nya världen.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% avstår alla sina kolonier i den nya världen till %nation%.
 model.indianSettlement.mostHatedNone=Inga
 model.indianSettlement.mostHatedUnknown=Okänd
@@ -1743,6 +1759,7 @@ model.noClaimReason.worked.description=En annan bosättning använder redan dett
 model.player.forces=%nation%s styrkor
 model.player.independentMarket=Europa
 model.player.startGame=Efter flera månader till sjöss anländer du slutligen till kusten av en okänd kontinent. Segla {{tag:%direction%|west=westward|east=eastward|default=into the wind}} för att upptäcka den Nya Världen och hävda Kronans överhöghet över den.
+# Fuzzy
 model.player.waitingFor=Väntar på: %nation%
 model.regionType.coast.name=Kust
 model.regionType.coast.unknown=Okänd kustregion
@@ -1782,6 +1799,7 @@ model.tradeItem.gold.name=Guld
 model.tradeItem.gold.description=totalt %amount% guld
 model.tradeItem.goods.name=Varor
 model.tradeItem.incite.name=Förklara krig mot
+# Fuzzy
 model.tradeItem.incite.description=krig mot %nation%
 model.tradeItem.stance.name=Hållning
 model.tradeItem.unit.name=Trupp
@@ -1800,9 +1818,9 @@ model.unit.underRepair=Reparation(%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1834,11 +1852,13 @@ model.colony.warehouseOverfull=Ditt varulager i %colony% innehåller nu så myck
 model.colony.warehouseSoonFull=Ditt varulager i %colony% kommer efter nästa drag att innehålla så mycket %goods% som kan lagras där. %amount% enheter av %goods% kommer att gå förlorade.
 model.colony.warehouseWaste=Ditt varulager i %colony% innehåller redan så mycket %goods% som kan lagras där. %waste% enheter gick förlorade.
 model.colonyTile.resourceExhausted=Resursen %resource% är slut i %colony%.
+# Fuzzy
 model.game.spanishSuccession=Ers excellens, det spanska tronföljdskriget har tagit slut i Europa. Under Utrechtfördragets statuter tvingades %loserNation% att överlämna alla kolonier i Nya Världen till %nation%!
 model.indianSettlement.mission.denounced=Din missionär i %settlement% har avrättats!
 model.player.colonyGoodsParty.harbour=Kolonisterna i %colony% har kastat %amount% enheter av %goods% i hamnen som protest mot den orättfärdiga beskattningen från Kronan!
 model.player.colonyGoodsParty.horses=Dina kolonister i %colony% har frigivit %amount% hästar i protest mot den orättfärdiga skatten från kronan!
 model.player.colonyGoodsParty.landLocked=Kolonisterna i %colony% har bränt %amount% enheter av %goods% på marknadsplatsen som protest mot den orättfärdiga beskattningen från Kronan!
+# Fuzzy
 model.player.dead.european=Ers Excellens, %nation% har deklarerat att de fullständigt drar sig tillbaka från Nya Världen!
 model.player.dead.native=Ers excellens, %nation% har tillintetgjorts.
 model.player.disaster.bankruptcy.start=Du kunde inte betala för underhåll av alla byggnader. Omfattande sanktioner mot produktion tillämpas.
@@ -1849,12 +1869,16 @@ model.player.foundingFatherJoinedCongress=%foundingFather% ingår nu i regeringe
 model.player.interventionForceArrives=Den utlovade insatsstyrkan anländer!
 model.player.soLDecrease=Medlemsskap i Frihetens söner i dina kolonier har fallit till %newSoL% procent!
 model.player.soLIncrease=Medlemsskap i Frihetens söner i dina kolonier har stigit till %newSoL% procent!
+# Fuzzy
 model.player.stance.alliance.declared=Ers nåd, %nation% är nu våra allierade!
 model.player.stance.alliance.others=Ers nåd, %attacker% och %defender% har ingått en allians.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Ers nåd, %nation% har gått med på vapenstillestånd!
 model.player.stance.ceaseFire.others=Ers nåd, %attacker% har ingått vapenstillestånd med %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Ers nåd, det råder fred mellan oss och %nation%!
 model.player.stance.peace.others=Ers nåd, det råder nu fred mellan %attacker% och %defender%.
+# Fuzzy
 model.player.stance.war.declared=Dåliga nyheter, ers nåd, %nation% har förklarat krig mot oss!
 model.player.stance.war.others=Ers nåd, %attacker% har förklarat krig mot %defender%.
 combat.automaticDefence=Din %unit% i %colony% har tagit till vapen för att försvara kolonin!
@@ -1870,6 +1894,7 @@ combat.enemyShipEvaded=%enemyNation%s %enemyUnit% har klarat sig undan en attack
 combat.enemyShipSunk=%unit% har sänkt %enemyNation%s %enemyUnit%!
 combat.equipmentCaptured=Tag er i akt, %nation%s krigare har skaffat sig %equipment%!
 combat.goodsStolen=%enemyNation%s %enemyUnit% stjäl %amount% %goods% i %colony%!
+# Fuzzy
 combat.indianPlunder=%colony% plundras på %amount% av %enemyNation%s %enemyUnit%.
 combat.indianTreasure=Du plundrar %settlement% på %amount% guld.
 combat.nativeCapitalBurned=Du har bränt %nation%s huvudstad %name% till marken, och %nation% kapitulerar inför din makt!
@@ -1923,12 +1948,15 @@ main.defaultPlayerName=Spelarnamn
 main.javaVersion=Java version %minVersion% eller nyare rekommenderas för att köra FreeCol (%version% detected, använd --no-java-check för att hoppa över denna kontroll).
 main.memory=Du måste tilldela mer än %memory% byte minne till JVM. Starta om FreeCol med: java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol kan inte hitta lämpliga kataloger att spara användardata i. Fortsätter, men räkna med problem.
+# Fuzzy
 client.choicePlayer=Välj en spelare:
 metaServer.couldNotConnect=Kunde tyvärr inte ansluta till meta-servern. Försök senare.
 metaServer.communicationError=Fel uppstod vid kommunikation med meta-servern. Försök senare.
 abandonEducation.action.studying=studerar
 abandonEducation.action.teaching=undervisar
+# Fuzzy
 abandonEducation.no=Nej, fortsätt utbildningen
+# Fuzzy
 abandonEducation.yes=Ja, lämna kolonin
 armedUnitSettlement.attack=Attackera
 armedUnitSettlement.tribute=Kräv tribut
@@ -1938,8 +1966,11 @@ buy.moreGold=Begär lägre pris
 buy.takeOffer=Antag erbjudandet
 buy.text=%nation% skulle vilja sälja %goods% till dig för %gold% guld:
 clearTradeRoute.text=Din %unit% är tilldelad handelsrutt %route%. Att ange en destination kommer att ta den från handelsrutten. Är du säker att du vill göra detta?
+# Fuzzy
 confirmHostile.alliance=Du kan inte anfalla en allierad nation! Vill du verkligen bryta din allians med %nation% och förklara krig?
+# Fuzzy
 confirmHostile.ceaseFire=Du har undertecknat en vapenvila med %nation%. Vill du verkligen anfalla?
+# Fuzzy
 confirmHostile.peace=Du har fred med %nation%. Vill du verkligen förklara krig mot dem?
 danger.high=mycket bättre beväpnade än oss
 danger.low=är inget hot mot oss
@@ -1999,7 +2030,9 @@ defeated.text=Du har blivit besegrad! Skulle du vilja:
 defeated.yes=Stanna kvar och se hur det går
 defeatedSinglePlayer.text=Du har blivit besegrad!\n\nDet är nu den mörka nattens tid, när kyrkogårdar gäspar och själva helvetet andas ut sin smitta över denna jord, nu skulle jag kunna dricka hett blod! och göra sådana bittra dåd som skulle få dagen att skaka om den såg dem.
 defeatedSinglePlayer.yes=Aktivera hämndläge
+# Fuzzy
 diplomacy.offerAccepted=%nation% har godtagit ditt generösa erbjudande.
+# Fuzzy
 diplomacy.offerRejected=%nation% har avslagit ditt generösa erbjudande.
 disbandUnit.text=Är du säker på att du vill demobilisera denna trupp?
 disbandUnit.yes=Demobilisera
@@ -2042,7 +2075,9 @@ move.noAccessContact=Ers Excellens, vi måste först upprätta kontakt med %nati
 move.noAccessGoods=%nation% kommer inte att byteshandla med en tom %unit%.
 move.noAccessSettlement=%nation% låter inte våra trupper av typ %unit% komma in i deras bosättning.
 move.noAccessSkill=Vår trupp av typen %unit% kan inte lära sig något av urinvånarna.
+# Fuzzy
 move.noAccessTrade=Vi har inte befogenhet att handla med andra europeiska nationer som%nation%.
+# Fuzzy
 move.noAccessWar=Vi kan inte handla med%nation% medan vi är i krig med dem.
 move.noAccessWater=Vår trupp av typen %unit% måste landstiga innan den kan gå in i bosättningen.
 move.noAttackWater=Vår %unit% måste landa innan den kan attackera.
@@ -2186,6 +2221,7 @@ colopedia.unit.offensivePower=Anfallsstyrka:
 colopedia.unit.price=Pris i Europa:
 colopedia.unit.productionBonus=Produktions{{plural:%number%|one=modifierare|other=modifierare}}:
 colopedia.unit.requirements=Förutsättningar:
+# Fuzzy
 colopedia.unit.school=Skola behövs för att utbilda:
 colopedia.unit.skill=Specialkunskap:
 report.labour.allColonists=Alla kolonisatörer
@@ -2219,8 +2255,6 @@ report.colony.making.noconstruction.description=%colony%: Inget är under konstr
 report.colony.making.noteach.description=%colony%: %teacher% saknar en student
 report.colony.name.description=Listan över kolonier
 report.colony.name.header=Koloni
-report.colony.plow.header=P
-report.colony.road.header=R
 report.continentalCongress.elected=Vald: %turn%
 report.continentalCongress.none=(ingen)
 report.continentalCongress.recruiting=Rekryterar
@@ -2270,12 +2304,14 @@ report.requirements.surplus=Ett överskott av %goods% framställs i
 report.trade.afterTaxes=Inkomst efter skatt
 report.trade.beforeTaxes=Inkomst före skatt
 report.trade.cargoUnits=Enheter i last
+# Fuzzy
 report.trade.hasCustomHouse=* Denna koloni har ett tullhus; dessa varor exporteras.
 report.trade.totalDelta=Sammanlagd produktion
 report.trade.totalUnits=Totalt antal enheter
 report.trade.unitsSold=Antal köpta eller sålda enheter
 report.turn.filter=Visa inte denna typ av meddelanden (%type%)
 report.turn.ignore=Ignorera detta meddelande (Koloni: %colony%, Vara: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% för %player%
 # Fuzzy
 aboutPanel.copyright=Copyright © 2002-2014 FreeCol-teamet
@@ -2301,6 +2337,7 @@ chooseFoundingFatherDialog.title=Nominera grundare
 colonyPanel.colonyUnits=Kolonienheter
 colonyPanel.inPort=I hamn
 colonyPanel.outsideColony=Utanför kolonin
+# Fuzzy
 colonyPanel.producing=Producerar:
 colonyPanel.reducePopulation=Om du minskar befolkningen under %number%, kan inte %colony% längre bygga %buildable%.
 colonyPanel.unitChange=Vid ankomst till din koloni blev din %oldType% en %newType%.
@@ -2313,7 +2350,9 @@ colonyPanel.notBestTile=%unit% kan producera mer %goods% på %tile%.
 confirmDeclarationDialog.areYouSure.no=Kanske senare
 confirmDeclarationDialog.areYouSure.text=Låt oss kasta av oket av den tyranni som %monarch% utsätter oss för och förklara våra kolonier för oavhängiga från kronan!
 confirmDeclarationDialog.areYouSure.yes=Frihet eller döden!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=%nation%s förenta stater
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Den fria nationen %nation%
 confirmDeclarationDialog.enterCountry=Hädanefter skall vårt land vara känt som
 confirmDeclarationDialog.enterNation=och varje medborgare i vårt ärorika land skall vara stolta över att kallas för
@@ -2339,8 +2378,10 @@ negotiationDialog.add=Lägg till
 negotiationDialog.cancel=Avbryt
 negotiationDialog.clear=Rensa
 negotiationDialog.contact.tutorial=Du träffar på andra européer. De konkurrerar med dig om land och rikedomar, och kan mycket väl dra ut i krig mot dig. Men efter att Jan de Witt har anslutit sig till kolonialstyret så kan du handla med dem.
+# Fuzzy
 negotiationDialog.demand=%nation% kräver av %otherNation%
 negotiationDialog.exchange=i utbyte mot
+# Fuzzy
 negotiationDialog.offer=%nation% erbjuder %otherNation%
 negotiationDialog.send=Skicka
 negotiationDialog.title.contact=Träffar andra européer
@@ -2363,10 +2404,9 @@ findSettlementPanel.displayAll=Hitta alla bosättningar
 findSettlementPanel.displayOnlyEuropean=Hitta endast Europeiska bosättningar
 findSettlementPanel.displayOnlyNatives=Hitta endast inhemska bosättningar
 findSettlementPanel.name=Hitta bosättning
+# Fuzzy
 firstContactDialog.meeting.natives=Träffar infödingarna...
 firstContactDialog.meeting.natives.tutorial=Du träffar på indianer. Sänd dina spejare till deras bosättningar för att lära dig mer om dem, och dina kontraktarbetare och nybyggare för att lära sig mer av dem. Sänd dina skepp och konvojer till deras bosättningar om du önskar handla med dem.
-firstContactDialog.meeting.AZTEC=Azteknationen...
-firstContactDialog.meeting.INCA=Inkariket...
 firstContactDialog.welcomeOffer.text=%nation% välkomnar dig. Vi är en strålande nation på %camps% %settlementType%. För att fira vår vänskap erbjuder vi generöst det land du nu bor på som en gåva. Vill du acceptera vårt fördrag och leva i fred med oss som bröder?
 firstContactDialog.welcomeSimple.text=%nation% välkomar dig. Vi är en strålande nation på %camps% %settlementType%. Vill du leva i fred med oss som bröder?
 abandonColony.no=Avbryt
diff --git a/data/strings/FreeColMessages_tl.properties b/data/strings/FreeColMessages_tl.properties
index 73a956873..cdb14814a 100644
--- a/data/strings/FreeColMessages_tl.properties
+++ b/data/strings/FreeColMessages_tl.properties
@@ -229,7 +229,6 @@ colopediaAction.goods.name=Mabuting mga dala-dalahin
 colopediaAction.nations.name=Mga Bansa
 colopediaAction.nationTypes.name=Pambansang mga Kapakinabangan
 colopediaAction.resources.name=Karagdagang mga Mapagkukunan
-colopediaAction.skills.name=Mga kasanayan
 colopediaAction.terrain.name=Mga uri ng lupain
 colopediaAction.units.name=Mga yunit (bahagi)
 colopediaAction.name=%object% (Colopedia)
@@ -1239,6 +1238,7 @@ model.improvement.road.description=Daan
 model.improvement.road.name=Daan
 model.improvement.road.occupationString=D
 model.limit.independence.coastalColonies.name=Hangganan ng Kolonyang Pangdalampasigan
+# Fuzzy
 model.limit.independence.coastalColonies.description=Nangangailangan ka ng kahit na %limit% mga kolonyang pandalampasigan upang makapagpahayag ng kasarinlan.
 model.limit.independence.rebels.name=Hangganan ng Manghihimagsik
 model.limit.independence.rebels.description=Hindi dapat bababa sa %limit%% ng mga kolonista mo ang tatangkilik sa pagsasarili.
@@ -1568,6 +1568,7 @@ model.colony.badGovernment=Kulang sa katalaban ang pamahalaan ng %colony%. Naaan
 model.colony.goodGovernment=Uminam na ang katalaban ng pamahalaan! Katumbas na o lumampas na sa %number% bahagdan ang damdaming mapanghimagsik sa loob ng %colony%.
 model.colony.governmentImproved1=Uminam na ang pamahalaan ng %colony%, ngunit kulang pa rin sa katalaban. Naaangkop pa rin ang\nmga pagmumulta sa produksyon.
 model.colony.governmentImproved2=Uminam na ang pamahalaan ng %colony%. Hindi na naaangkop ang mga pagmumulta sa produksyon.
+# Fuzzy
 model.colony.insufficientProduction=%outputAmount% dagdag pang %outputType% ang magagawa sa %colony%, kung mayroon lamang tayong %inputAmount% dagdag pang %inputType% bilang pasobra.
 model.colony.lostGoodGovernment=Bumaba ang katalaban ng pamahalaan! Hindi na katumbas ng o lampas na sa %number% bahagdan ang damdaming mapanghimagsik sa loob ng %colony%. Hindi na nakakatamo ng anumang bonus sa produksyon ang kolonya.
 model.colony.lostVeryGoodGovernment=Bumaba ang katalaban ng pamahalaan! Hindi na katumbas o lumampas na sa %number% bahagdan ang damdaming mapanghimagsik sa loob ng %colony%. Nawala ang ilang mga bonus sa produksyon.
@@ -1585,21 +1586,29 @@ model.direction.SW.name=timog-kanluran
 model.direction.W.name=kanluran
 model.direction.NW.name=hilaga-kanluran
 model.historyEventType.abandonColony.description=Iniwanan mo ang kolonya ng %colony%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=Natuklasan ng %nation% ang %city%, isa sa Pitong mga Lungsod ng Ginto, at isang kayamanan ng gintong %treasure%.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Sinakop ng %nation% ang iyong kolonyang %colony%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Winasak ng %nation% ang iyong kolonyang %colony%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Nangangahas kang tanggapin ang Aming may kagandahang loob na katakdaan subalit umiiwas din sa pagbabayad? Ang ganyang pagdadalawang-mukha ay magtatamo ng mapait na gantimpala ng Aming pagkayamot.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Wawasakin mo ang isang maliit na pamayanang %settlement% ng %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=Wawasakin ng %nation% ang %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Tuklasin mo ang Bagong Mundo.
+# Fuzzy
 model.historyEventType.discoverRegion.description=Natuklasan ng %nation% ang %region%.
 model.historyEventType.foundColony.description=Inilunsad mo ang kolonya ng %colony%.
 model.historyEventType.foundingFather.description=Sumali si %father% sa Kongresong Kontinental.
 model.historyEventType.independence.description=Nakamit mo ang kasarinlan mula sa Korona.
+# Fuzzy
 model.historyEventType.meetNation.description=Nakaharap mo ang %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=Wala na ngayong %nation% sa Bagong Mundo.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=Isinusuko ng %loserNation% sa %nation% ang lahat ng kanilang mga kolonyang nasa Bagong Mundo.
 model.indianSettlement.mostHatedNone=Wala
 model.indianSettlement.nameUnknown=Hindi alam
@@ -1644,8 +1653,10 @@ model.messageType.warehouseCapacity.name=Sukat ng Mailululan sa Bahay-Imbakan
 model.messageType.warning.name=Mga babala
 model.monarch.action.addToRef.text=Ang Korona ay nagdagdag ng  %number% {{plural:%number%|%unit%}} sa Royal na Puwersang Pang-ekspedisyon. Nagpahayag ng pangangamba ang mga pinunong pangkolonya.
 model.monarch.action.addToRef.no=Nagawa na
+# Fuzzy
 model.monarch.action.declarePeace.text=May karikitan kaming sumasang-ayon sa isang kasunduang pangkapayapaan sa piling ng %nation%.
 model.monarch.action.declarePeace.no=Nagawa na
+# Fuzzy
 model.monarch.action.declareWar.text=Ang kawalang-hiyaan ng %nation% ang pumupuwersa sa Amin na magpahayag ng digmaan sa kanila!
 model.monarch.action.declareWar.no=Nagawa na
 # Fuzzy
@@ -1690,6 +1701,7 @@ model.noClaimReason.worked.description=Mayroon nang ibang maliit na pamayanan na
 model.player.forces=Mga Puwersa ng %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Makalipas ang ilang mga buwan habang nasa dagat, narating mo na rin sa wakas ang sa may baybayin ng isang hindi nakikilalang kontinente.  Maglayag {{tag:%direction%|west=pakanluran|east=pasilangan|default=pasagupa sa hangin}} upang matuklasan ang Bagong Mundo at angkinin ito para sa Korona.
+# Fuzzy
 model.player.waitingFor=Hinihintay ang: %nation%
 model.regionType.coast.name=Dalampasigan
 model.regionType.coast.unknown=Hindi Nalalamang Rehiyon ng Dalampasigan
@@ -1744,9 +1756,9 @@ model.unit.underRepair=Kinukumpuni (%turns% {{plural:%turns%|one=lumiliko sa|oth
 model.unit.unitState.active=-
 model.unit.unitState.fortified=P
 model.unit.unitState.fortifying=P
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=H
 model.unit.unitState.sentry=B
+# Fuzzy
 model.unit.unitState.skipped=L
 model.unit.unitState.toAmerica=P
 model.unit.unitState.toEurope=P
@@ -1783,12 +1795,14 @@ model.colony.warehouseOverfull=Umabot na sa kanyang kayang mailulang %goods% ang
 model.colony.warehouseSoonFull=Lalampas na sa kanyang kayang mailulang %goods% ang iyong bahay-imbakang nasa %colony% sa loob ng susunod na pagkakataon. Masasayang ang %amount% mga yunit ng %goods%.
 model.colony.warehouseWaste=Lumagpas na sa kanyang kayang mailulang %goods% ang iyong bahay-imbakang nasa %colony%. Nasayang ang %waste% mga yunit.
 model.colonyTile.resourceExhausted=Naubos na ang pangangailangang %resource% na nasa %colony%
+# Fuzzy
 model.game.spanishSuccession=Aming Kamahalan, nagwakas na sa Europa ang Digmaan ng Kastilang Paghahalili.  Sa Tratado ng Utrecht, ang %loserNation% ay napilitang isuko sa %nation% ang lahat ng mga kolonyang nasa Bagong Mundo!
 model.indianSettlement.mission.denounced=Pinaratangan ang iyong misyonero sa %settlement% at pinaslang!
 model.player.autoRecruit=Ang kaguluhang pangrelihiyon sa %europe% ay nag-udyok sa %unit% upang mandayuhan.
 model.player.colonyGoodsParty.harbour=Nagtapon sa daungan ang iyong mga kolonistang nasa %colony% ng %amount% ng mga yunit ng %goods% bilang pagtutol laban sa hindi patas na pagbubuwis ng Korona!
 model.player.colonyGoodsParty.horses=Nagpalaya ang mga kolonista mong nasa %colony% ng %amount% mga kabayo bilang pagtutol sa ganitong hindi patas na pagbubuwis mula sa Korona!
 model.player.colonyGoodsParty.landLocked=Nagsunog sa pook ng pamilihan ang iyong mga kolonistang nasa %colony% ng %amount% ng mga yunit ng %goods% bilang pagtutol laban sa hindi patas na pagbubuwis ng Korona!
+# Fuzzy
 model.player.dead.european=Aming Kamahalaan, nagpahayag ang %nation% ng ganap na pag-alis mula sa mga usapin ng Bagong Mundo!
 model.player.dead.native=Aming kamahalan, nawasak na ang %nation%.
 model.player.disaster.bankruptcy.start=Nabigo ka sa pagbabayad para sa pangangalaga ng lahat ng mga gusali. Ilalapat ang matinding mga multa sa produksiyon.
@@ -1800,12 +1814,16 @@ model.player.foundingFatherJoinedCongress=Nakilahok na sa kongreso si %foundingF
 model.player.interventionForceArrives=Dumating na ang ipinangakong Puwersang Pampamamagitan!
 model.player.soLDecrease=Bumaba na hanggang %newSoL% bahagdan ang kasapian sa Mga Anak na Lalaki ng Kalayaan na nasa mga kolonya mo!
 model.player.soLIncrease=Tumaas na hanggang %newSoL% bahagdan ang kasapian sa Mga Anak na Lalaki ng Kalayaan na nasa mga kolonya mo!
+# Fuzzy
 model.player.stance.alliance.declared=Aming Kamahalan, umanib na sa atin ang %nation%!
 model.player.stance.alliance.others=Aming Kamahalan, umanib sa %attacker% ang %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Aming Kamahalan, pumayag ang %nation% na makipagtigil-putukan sa atin!
 model.player.stance.ceaseFire.others=Aming Kamahalan, pumayag ang %attacker% na makipagtigil-putukan sa %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Aming Kamahalan, nakipagkasundo sa atin ng kapayapaan ang %nation%!
 model.player.stance.peace.others=Aming Kamahalan, nakipagkasundo ang %attacker% ng kapayapaan sa %defender%.
+# Fuzzy
 model.player.stance.war.declared=Masamang balita, Aming Kamahalan, nagpahayag ng digmaan laban sa atin ang %nation%!
 model.player.stance.war.others=Aming Kamahalan, nagpahayag ng digmaan ang %attacker% laban sa %defender%.
 combat.automaticDefence=Ang %unit% mo sa %colony% ay nagsigamit ng mga sandata upang maipagtanggol ang kolonya!
@@ -1821,6 +1839,7 @@ combat.enemyShipEvaded=Nakaiwas ang %enemyUnit% ng %enemyNation% mula sa isang p
 combat.enemyShipSunk=Napalubog ng %unit% ang %enemyUnit% ng %enemyNation%!
 combat.equipmentCaptured=Mag-ingat, napasakamay ng mga matatapang ng %nation% ang %equipment%!
 combat.goodsStolen=Nagnakaw ng %amount% ng mga %goods% ang %enemyUnit% ng %enemyNation% mula sa %colony%!
+# Fuzzy
 combat.indianPlunder=Nangulimbat ng %amount% ang %enemyUnit% ng %enemyNation% mula sa %colony%.
 combat.indianRaid=Nag-ulat ang aming mga espiya na nilusob ng %nation% ang kolonyang %colonyNation% ng %colony%.
 combat.indianSurprise=Nagsagawa ng hindi inaakalang paglusob ang %nation% doon sa %colony%, na nakapagpangamba sa aming mga kolonista. Ipinagkakaila ng pinuno ng %nation% ang pagiging kasangkot.
@@ -1873,13 +1892,16 @@ error.couldNotLoad=Naganap ang isang kamalian habang sinusubok na ikarga ang lar
 # Fuzzy
 error.couldNotSave=Naganap ang isang kamalian habang sinasagip ang laro!
 main.defaultPlayerName=Pangalan ng Manlalaro
+# Fuzzy
 client.choicePlayer=Pumili lamang po ng isang manlalaro:
 metaServer.couldNotConnect=Paumanhin, hindi makaugnay/makakunekta sa serbidor ng meta. Pakisubok na lang uli mamaya.
 metaServer.communicationError=Nagkaroon ng isang kamalian habang nakikipagtalastasan/nakikipag-ugnayan sa serbidor ng meta.  Pakisubok muli mamaya.
 abandonEducation.action.studying=nag-aaral
 abandonEducation.action.teaching=nagtuturo
+# Fuzzy
 abandonEducation.no=Huwag, ipagpatuloy ang edukasyon
 abandonEducation.text=Kapag nilisan ng %unit% mo ang %colony% pababayaan nito ang %action% sa loob ng %building%, nakatitiyak ka bang dapat itong umalis?
+# Fuzzy
 abandonEducation.yes=Oo, umalis mula sa kolonya
 boycottedGoods.dumpGoods=Itambak ang mabubuting mga daladalahin
 boycottedGoods.text=Dahil binoykoteo (hindi tinangkilik) ng Korona ang %goods%, hindi mo maipagbibili ang mga ito sa %europe%. Nais mo bang bayaran ang mga utang mo (%amount% ng ginto), o ibig mong itapon ang mga ito sa daungan, na wawasak sa mga ito?
@@ -1887,8 +1909,11 @@ buy.moreGold=Humiling ng mas mababa pang halaga
 buy.takeOffer=Tanggapin ang alok
 buy.text=Nais ipagbili ng %nation% ang kanilang %goods% bilang kapalit ng %gold%:
 clearTradeRoute.text=Ang %unit% mo ay itinalagang mangalakal sa rutang %route%.  Ang pagtatakda ng destinasyon nito ay makapagtatanggal nito mula sa ruta ng kalakalan.  Nakatitiyak ka bang ito ang nais mong gawin?
+# Fuzzy
 confirmHostile.alliance=Hindi mo maaaring lusubin ang isang kakamping bansa! Talaga bang nais mong putulin ang iyong pakikipagtulungan sa %nation%.
+# Fuzzy
 confirmHostile.ceaseFire=Lumagda ka ng isang tigil putukan na kasama ang %nation%. Talaga bang nais mong lumusob?
+# Fuzzy
 confirmHostile.peace=Mapayapa ang pakikitungo mo sa %nation%. Talaga bang nais mong magpahayag ng digmaan?
 error.noSuchFile=Hindi umiiral ang tinukoy na talaksan  o hindi isang pangkaraniwang talaksan.
 # Fuzzy
@@ -1942,7 +1967,9 @@ defeated.text=Natalo ka na! Nais mo bang:
 defeated.yes=Manatili at magmatyag
 defeatedSinglePlayer.text=Nagapi ka na!\n\nNgayon ay kalaliman na ng gabi, Kung kailan humihikab na ang bakuran ng mga simbahan at naghihinga ang impiyerno ng mga paminsala sa mundong ito, makainom kaya ako ngayon ng mainit na dugo?! At makagawa ng ganyang mapait na kaabalahan, habang yumayanig ang araw upang tumanaw.
 defeatedSinglePlayer.yes=Ipasok ang Gawi ng Paghihiganti
+# Fuzzy
 diplomacy.offerAccepted=Tinanggap ng %nation% ang iyong masaganang alok.
+# Fuzzy
 diplomacy.offerRejected=Tinanggap ng %nation% ang masagana mong alok.
 disbandUnit.text=Nakatitiyak ka bang nais mong pagwatak-watakin ang yunit na ito?
 disbandUnit.yes=Pagwatak-watakin na
@@ -1985,7 +2012,9 @@ move.noAccessContact=Kailangan muna nating magtatag ng ugnayan sa %nation%, Kama
 move.noAccessGoods=Ang %nation% ay hindi makikipagkalakal sa isang %unit% na walang laman.
 move.noAccessSettlement=Hindi pinapahintulutan ng %nation% ang ating %unit% na pumasok sa kanilang maliit na pamayanan.
 move.noAccessSkill=Hindi maaaring matuto mula sa mga katutubo ang ating %unit%.
+# Fuzzy
 move.noAccessTrade=Wala tayong kapangyarihang makipagkalakal sa ibang mga nasyong Europeo na katulad ng %nation%.
+# Fuzzy
 move.noAccessWar=Hindi tayo maaaring makipagkalakalan sa %nation% habang may digmaan.
 move.noAccessWater=Kailangan lumapag ng ating %unit% bago pumasok sa maliit na pamayanan.
 move.noAttackWater=Dapat na lumapag muna ang aming %unit% bago lumusob.
@@ -2112,6 +2141,7 @@ colopedia.unit.offensivePower=Lakas ng Pagsalakay:
 colopedia.unit.price=Halaga sa Europa:
 colopedia.unit.productionBonus={{plural:%number%|isa=tagapagbago|iba=mga tagapagbago}} ng produksyon:
 colopedia.unit.requirements=Mga kailangan:
+# Fuzzy
 colopedia.unit.school=Kailangang paaralan upang makapagsanay:
 colopedia.unit.skill=Antas ng Kasanayan:
 report.labour.allColonists=Lahat ng mga Kolonista
@@ -2149,8 +2179,6 @@ report.colony.improve.description=Mga yunit na makapagpapainam ng produksiyon na
 report.colony.improve.header=Painamin
 # Fuzzy
 report.colony.improving.description=<HTML>%colony%: Upang makagawa ng %amount% pang mga %goods%<BR>Palitan ang %oldUnit% ng %unit%</HTML>
-# Fuzzy
-report.colony.wanting.description=<HTML>%colony%: Upang makagawa ng %amount% mas marami pang %goods%<BR>Idagdag ang %unit%</HTML>
 report.colony.making.blocking.description=%colony%: %amount% ng %goods% ang kailangan para sa %buildable% sa {{plural:%turns%|one=susunod na pagkakataon|other=loob ng %turns% na mga pagkakataon}}
 report.colony.making.constructing.description=%colony%: ang %buildable% ang bubuo sa {{plural:%turns%|one=susunod na pagkakataon|other=loob ng %turns% na mga pagkakataon}}
 report.colony.making.description=Ano ang ginagawa ng kolonyang ito
@@ -2160,21 +2188,22 @@ report.colony.making.noconstruction.description=%colony%: Walang nagaganap na ko
 report.colony.making.noteach.description=%colony%: ang %teacher% ay kulang ng isang mag-aaral
 report.colony.name.description=Ang listahan ng mga kolonya
 report.colony.name.header=Kolonya
-report.colony.plow.description=Bilang ng mga tisa ng kolonya na makikinabang mula sa Pag-aararo
-report.colony.plow.header=P
-report.colony.plowing.description=Ang %colony% ay maaaring makinabang mula sa pang-aararo sa {{plural:%amount%|one=isang tisa|other=%amount% na mga tisa}}
+# Fuzzy
 report.colony.production.description=%colony%: netong produksiyon ng %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: ang netong produksiyon ng %goods% ay %amount% (magluluwas ng mahigit kaysa sa %export%)
 report.colony.production.header=Netong produksiyon ng %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: netong produksiyon ng %goods% = %amount%, mapupuno sa {{plural:%turns%|one=susunod na pagkakataon|other=loob ng %turns% na mga pagkakataon}}
+# Fuzzy
 report.colony.production.low.description=%colony%: netong produksiyon ng %goods% = %amount%, ubos na sa {{plural:%turns%|one=susunod na pagkakataon|other=loob ng %turns% na mga pagkakataon}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: netong produksiyon ng %goods% = %amount%, aapaw na ang bodega, masasayang ang %waste%
-report.colony.road.description=Bilang ng mga tisa ng kolonya na makikinabang mula sa pagtatayo ng Daan
-report.colony.road.header=D
-report.colony.roadBuilding.description=Ang %colony% ay maaaring makinabang mula sa paggawa ng {{plural:%amount%|one=isang lansangan|other=%amount% na mga lansangan}}
 report.colony.shrinking.description=Ang %colony% ay dapat na mapaliit ng {{plural:%amount%|one=isang yunit|other=%amount% mga yunit}} upang mapainam ang produksiyon
 report.colony.starving.description=%colony%: kagutuman sa {{plural:%turns%|one=susunod na pagkakataon|other=sa loob ng %turns% na mga pagkakataon}}
 # Fuzzy
+report.colony.wanting.description=<HTML>%colony%: Upang makagawa ng %amount% mas marami pang %goods%<BR>Idagdag ang %unit%</HTML>
+# Fuzzy
 report.continentalCongress.elected=Nahalal:
 report.continentalCongress.none=(wala)
 report.continentalCongress.recruiting=Pangangalap ng tauhan
@@ -2215,26 +2244,25 @@ report.production.selectGoods=Pumili ng mabubuting mga dala-dalahin
 report.production.update=Isapanahon
 report.requirements.badAssignment=Ang %colony% ay may isang %expert% na kasalukuyang naghahanapbuhay bilang isang %expertWork%, habang ang isang %nonExpert% ay gumaganap bilang isang %nonExpertWork%. Mas darami ang produksyon kung magpapalitan ng mga hanapbuhay ang mga kolonista.
 report.requirements.canTrainExperts=Ang mga {{plural:2|%unit%}} ay maaaring sanayin doon sa
-report.requirements.clearTile=Ang %type% na papunta sa %direction% ng %colony% ay makikinabang mula sa paghahawan.
+# Fuzzy
 report.requirements.exploreTile=Ang %type% na papunta sa %direction% ng %colony% ay makikinabang mula sa panggagalugad.
 report.requirements.met=Naabot na ang lahat ng mga kinakailangan.
 report.requirements.missingGoods=Ang %colony% ay gumagawa ng %goods%, ngunit nangangailangan ng mas marami pang %input%.
 report.requirements.misusedExperts=Mayroong mga {{plural:2|%unit%}} na hindi naghahanapbuhay bilang %work% doon sa
 report.requirements.noExpert=Ang %colony% ay gumagawa ng %goods%, ngunit walang %unit%.
-report.requirements.plowCenter=Ang %colony% ay makikinabang mula sa pag-aararo ng tisa nito.
-report.requirements.plowTile=Ang %type% na papunta sa %direction% ng %colony% ay makikinabang mula sa pag-aararo.
-report.requirements.roadTile=Ang %type% na papunta sa %direction% ng %colony% ay makikinabang mula sa paggawa ng lansangan.
 report.requirements.severalExperts=Ilang mga {{plural:2|%unit%}} ang naroroon sa
 report.requirements.surplus=Isang kalabisan ng mga %goods% ang nagagawa sa
 report.trade.afterTaxes=Kita makatapos ang mga pagbubuwis
 report.trade.beforeTaxes=Kita bago ang mga pagbubuwis
 report.trade.cargoUnits=Mga Yunit na nasa Kargada
+# Fuzzy
 report.trade.hasCustomHouse=* May isang bahay-adwana ang kolonyang ito; mga iniluwas ang mabubuting mga daladalahing ito.
 report.trade.totalDelta=Kabuoan ng Produksyon
 report.trade.totalUnits=Kabuoan ng mga Yunit
 report.trade.unitsSold=Mga yunit na nabili o naipagbili
 report.turn.filter=Huwag ipakita ang ganitong uri ng mensahe (%type%)
 report.turn.ignore=Balewalain ang mensaheng ito  (Kolonya: %colony%, Mabubuting mga Dala-dalahin: %goods%)
+# Fuzzy
 report.turn.playerNation=%nation% ng %player%
 # Fuzzy
 aboutPanel.copyright=Karapatan sa Paglalathala © 2002-2013  Ang Pangkat ng FreeCol
@@ -2267,7 +2295,9 @@ colonyPanel.notBestTile=Makagagawa ang %unit% ng marami pang %goods% sa %tile%.
 confirmDeclarationDialog.areYouSure.no=Maaaring mamaya na lamang
 confirmDeclarationDialog.areYouSure.text=Iwaksi natin ang hindi makatarungang paniniil ng %monarch% at ipahayag ang kasarinlan ng ating mga kolonya mula sa korona!
 confirmDeclarationDialog.areYouSure.yes=Kalayaan o Kamatayan!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Nagkakaisang mga Estado ng %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Malayang %nation%
 confirmDeclarationDialog.enterCountry=Mula ngayon, makikilala ang ating bansa bilang
 confirmDeclarationDialog.enterNation=at bawat mamamayan ng ating maluwalhating bansa ay magmamalaking makikilala bilang
diff --git a/data/strings/FreeColMessages_tr.properties b/data/strings/FreeColMessages_tr.properties
index 77ed66d11..67a4d82c4 100644
--- a/data/strings/FreeColMessages_tr.properties
+++ b/data/strings/FreeColMessages_tr.properties
@@ -7,8 +7,10 @@
 # Author: Erdemaslancan
 # Author: Joseph
 # Author: Karduelis
+# Author: McAang
 # Author: Meelo
 # Author: Nighteagle2000
+# Author: Rapsar
 # Author: Trockya
 # Author: Uğurkent
 # Author: Violetanka
@@ -144,7 +146,7 @@ unitType=Ünite Türü
 units=Birimler
 list.add=Ekle
 list.down=Aşağı
-list.edit=Düzenle
+list.edit=Değiştir
 list.remove=Çıkar
 list.up=Yukarı
 status.loadingGame=Lütfen bekleyin: Oyun yükleniyor
@@ -256,7 +258,6 @@ colopediaAction.goods.name=Mallar
 colopediaAction.nations.name=Uluslar
 colopediaAction.nationTypes.name=Ulus Avantajları
 colopediaAction.resources.name=Bonus Kaynaklar
-colopediaAction.skills.name=Yetenekler
 colopediaAction.terrain.name=Arazi tipleri
 colopediaAction.units.name=Birimler
 declareIndependenceAction.name=Bağımsızlık İlan Et
@@ -798,6 +799,7 @@ model.direction.S.name=güney
 model.direction.SW.name=güney-batı
 model.direction.W.name=batı
 model.direction.NW.name=kuzey-batı
+# Fuzzy
 model.historyEventType.colonyConquered.description=Koloniniz %colony%, %nation%. tarafından fethedildi.
 model.indianSettlement.mostHatedNone=Hiçbiri
 model.indianSettlement.mostHatedUnknown=Bilinmiyor
@@ -833,6 +835,7 @@ model.noClaimReason.terrain.description=Bu arazi koloni için uygun değil.
 model.noClaimReason.water.description=Sularda hak iddia etmeyiz.
 model.noClaimReason.worked.description=Zaten başka bir yerleşim bu araziyi kullanıyor.
 model.player.startGame=Denizde geçen aylardan sonra, nihayet bilinmeyen bir kıtanın sahillerine ulaştınız. {{tag:%direction%|west=Batıya|east=Doğuya|default=Rüzgara doğru}} yelken açarak Yeni Dünya'yı keşfedebilir ve Krallık adına bu toprakları sahiplenebilirsiniz.
+# Fuzzy
 model.player.waitingFor=Bekleniyor: %nation%
 model.regionType.lake.unknown=Bilinmeyen sayfa
 model.regionType.river.unknown=Bilinmeyen kullanıcı
@@ -873,6 +876,7 @@ model.noAddReason.occupiedByEnemy.description=Bu konum başka bir ulustan bir bi
 model.noAddReason.ownedByEnemy.description=Bu konum başka bir ulusa ait.
 model.noAddReason.wrongType.description=Bu konum için yanlış tür.
 model.player.alarmIncrease.tension.content=%settlement% yerleşimindeki %nation% şefi dostu %enemy% ulusunu selamlıyor. Aramızdaki dayanışmanın ilerlemesinden memnunuz fakat yerleşimcilerinin topraklarımıza sokulmasından endişe duyuyoruz.
+# Fuzzy
 model.player.stance.war.declared=Kötü haber Ekselansları, %nation% bize savaş ilan etti!
 model.region.antarctic.name=Antarktika
 error.couldNotLoad=%name% dosyasından oyunu yüklemeye çalışırken bir hata oluştu!
@@ -881,13 +885,16 @@ main.defaultPlayerName=Oyuncu Adı
 main.javaVersion=FreeCol oyununun çalıştırılabilmesi için %minVersion% veya daha üst Java sürümü önerilir (tespit edilen sürüm %version%, bu denetlemeyi atlamak için --java-denetimi-yok seçeneğini kullanın).
 main.memory=JVM'ye %memory% bayttan daha fazla bellek atamanız gerekmektedir.\n FreeCol'u şu şekilde yeniden başlatın: java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol, kullanıcı verilerini kaydetmek için uygun dizinleri bulamıyor.  Devam ediliyor fakat sorun çıkması muhtemel.
+# Fuzzy
 client.choicePlayer=Lütfen bir oyuncu seçin:
 metaServer.couldNotConnect=Üzgünüz, tanımlayıcı sunucuya bağlanılamıyor. Lütfen tekrar deneyin.
 metaServer.communicationError=Tanımlayıcı sunucuyla haberleşirken bir hata oluştu. Lütfen tekrar deneyin.
 abandonEducation.action.studying=öğreniyor
 abandonEducation.action.teaching=öğretiyor
+# Fuzzy
 abandonEducation.no=Hayır, eğitime devam et
 abandonEducation.text=Eğer %unit% birimin %colony% kolonisinden ayrılırsa, %building% binasındaki %action% eylemini terketmiş olacak, yine de ayrılsın mı?
+# Fuzzy
 abandonEducation.yes=Evet, koloniden ayrıl
 abandonTeaching.text=Eğer %unit% birimin %building% binasından ayrılırsa eğitim durur, ayırmak istediğine emin misin?
 boycottedGoods.dumpGoods=Malları Terket
@@ -926,7 +933,9 @@ cashInTreasureTrain.pay=Kral eğer ganimetten %fee%% altın pay alırsa hazineni
 defeated.text=Yenildin! Şimdi ne yapmak istersin?
 defeated.yes=Kal ve izle
 defeatedSinglePlayer.yes=Öç Alma Moduna Gir
+# Fuzzy
 diplomacy.offerAccepted=%nation% cömert teklifinizi kabul etti.
+# Fuzzy
 diplomacy.offerRejected=%nation% cömert teklifinizi reddetti.
 disbandUnit.text=Birimi terhis etmek istediğine emin misin?
 disbandUnit.yes=Dağıt
@@ -956,7 +965,9 @@ learnSkill.yes=Evet, isterim
 move.noAccessGoods=%nation% ulusu boş bir %unit% ile ticaret yapmayacak.
 move.noAccessSettlement=%nation% ulusu %unit% birimimizin yerleşim yerlerine girmesine izin vermiyor.
 move.noAccessSkill=%unit% birimimiz yerlilerden öğrenemez.
+# Fuzzy
 move.noAccessTrade=%nation% ulusu gibi diğer Avrupalı uluslarla ticaret yapacak yetkimiz yok.
+# Fuzzy
 move.noAccessWar=Savaş halindeyken %nation% ulusu ile ticaret yapamayız.
 move.noAccessWater=%unit% birimimiz yerleşime girmeden önce karaya ayak basmalı.
 move.noAttackWater=%unit% birimimiz saldırmadan önce karaya ayak basmalı.
@@ -994,6 +1005,7 @@ report.continentalCongress.none=(hiçbiri)
 report.foreignAffair.numberOfColonies=Koloni sayısı
 report.foreignAffair.stance=Durum
 report.turn.ignore=Bu mesajı yoksay (Colony: %colony%, Goods: %goods%)
+# Fuzzy
 report.turn.playerNation=%player% yönetimindeki %nation%
 aboutPanel.copyright=Telif Hakkı © 2002-2015 FreeCol Ekibi
 buildingToolTip.breeding=%goods% üretebilmen için en az %number% {{plural:%number%|%goods%}} daha lazım.
@@ -1012,6 +1024,7 @@ chooseFoundingFatherDialog.title=Kurucu Görevlendir
 colonyPanel.colonyUnits=Koloni Birimleri
 colonyPanel.inPort=Limanda
 colonyPanel.outsideColony=Dış Koloni
+# Fuzzy
 colonyPanel.producing=Üretilen:
 colonyPanel.reducePopulation=Eğer nüfus %number% seviyesinin altına düşerse %colony%, %buildable% inşa edemez.
 colonyPanel.bonusLabel=Bonus: %number%%extra%
@@ -1021,14 +1034,17 @@ colonyPanel.royalistLabel=Sadıklar: %number%
 colonyPanel.notBestTile=%unit%, %tile% alanında daha fazla %goods% üretebilir.
 confirmDeclarationDialog.areYouSure.no=Belki Daha Sonra
 confirmDeclarationDialog.areYouSure.yes=Ya Özgürlük ya Ölüm!
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=%nation% Birleşik Devletleri
 constructionPanel.clickToBuild=Bina veya birim üretmek için üretim alanına tıklayın.
 constructionPanel.turnsToComplete=(Bitirmek için gereken tur: %number%)
 negotiationDialog.accept=Kabul et
 negotiationDialog.add=Ekle
 negotiationDialog.cancel=İptal
+# Fuzzy
 negotiationDialog.demand=%nation% ulusunun isteği %otherNation%
 negotiationDialog.exchange=karşılığında
+# Fuzzy
 negotiationDialog.offer=%nation% ulusunun teklifi %otherNation%
 negotiationDialog.send=Gönder
 editSettlementDialog.removeSettlement=Yerleşimi kaldır
diff --git a/data/strings/FreeColMessages_uk.properties b/data/strings/FreeColMessages_uk.properties
index e6da54357..ba6c53a97 100644
--- a/data/strings/FreeColMessages_uk.properties
+++ b/data/strings/FreeColMessages_uk.properties
@@ -278,7 +278,6 @@ colopediaAction.goods.name=Товари
 colopediaAction.nations.name=Нації
 colopediaAction.nationTypes.name=Національні переваги
 colopediaAction.resources.name=Бонусні ресурси
-colopediaAction.skills.name=Знання
 colopediaAction.terrain.name=Типи території
 colopediaAction.units.name=Юніти
 colopediaAction.name=%object% (Колопедія)
@@ -1450,6 +1449,7 @@ model.improvement.road.description=Дорога
 model.improvement.road.name=Дорога
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Обмеження прибережених колоній
+# Fuzzy
 model.limit.independence.coastalColonies.description=Вам потрібно принаймні %limit% прибережних колоній, щоб заявити про незалежність.
 model.limit.independence.rebels.name=Межа бунтарства
 model.limit.independence.rebels.description=Принаймні  %limit%% ваших колоністів мають підтримувати незалежність.
@@ -1804,6 +1804,7 @@ model.colony.badGovernment=Уряд %colony% неефективний. Заст
 model.colony.goodGovernment=Ефективність уряду підвищилася. Бунтівні настрої в %colony% тепер рівні або перевищують %number% відсотків.
 model.colony.governmentImproved1=Уряд %colony% поліпшено, але він досі малоефективний. Все ще застовуються штрафи на виробництво.
 model.colony.governmentImproved2=Уряд %colony% поліпшено. Штрафи на виробництво вже не застосовуються.
+# Fuzzy
 model.colony.insufficientProduction=Можна виготовити на %outputAmount% більше %outputType% у %colony% за умови, що ми матимемо на %inputAmount% більше надлишку %inputType%.
 model.colony.lostGoodGovernment=Знизилася ефективність уряду! Повстанські настрої в  %colony%  більше не рівні або не перевищують  %number%  відсотків. Колонія більше не має отримує виробничих бонусів.
 model.colony.lostVeryGoodGovernment=Ефективність уряду зменшилася! Бунтівні настрої в %colony% більше не рівні або не перевищують %number% відсотків. Деякі виробничі бонуси втрачено.
@@ -1818,12 +1819,17 @@ model.colony.veryBadGovernment=Уряд %colony% дуже неефективни
 model.colony.veryGoodGovernment=Ефективність уряду підвищилася. Бунтівні настрої в %colony% тепер дорівнює або перевищують %number% відсотків.
 model.colonyTile.claim=(претендує %direction%)
 model.diplomaticTrade.receive.contact=Братський привіт від славної нації %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=Давайте домовлятися з нацією %nation%.
 model.diplomaticTrade.receive.trade=Давайте розглянемо торгову пропозицію нації %nation%.
+# Fuzzy
 model.diplomaticTrade.receive.tribute=Нація %nation% вимагає данини з нас!
 model.diplomaticTrade.send.contact=Ми зустрілись з представниками нації  %nation%.
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=Давайте розглянемо нашу дипломатичну ситуацію з нацією %nation%.
+# Fuzzy
 model.diplomaticTrade.send.trade=Дозвольте нам запропонувати торгівлю з нацією %nation% у поселенні %settlement%.
+# Fuzzy
 model.diplomaticTrade.send.tribute=Ми вимагаємо данини з %nation% у поселенні %settlement%.
 model.direction.N.name=Північ
 model.direction.NE.name=Північний Схід
@@ -1834,25 +1840,37 @@ model.direction.SW.name=Південний Захід
 model.direction.W.name=Захід
 model.direction.NW.name=Північний Захід
 model.historyEventType.abandonColony.description=Ви покинули колонію %colony%.
+# Fuzzy
 model.historyEventType.ceaseFire.description=Припинено вогонь з нацією %nation%.
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation% знайшли %city%, одне з Семи Золотих Міст. Здобич склала %treasure% золота.
+# Fuzzy
 model.historyEventType.colonyConquered.description=Вашу колонію %colony% завоювали %nation%.
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=Вашу колонію %colony% було знищено %nation%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Ви зважилися прийняти Наші щедрі умови та все ж ухиляєтеся від виплат? Така двоєдушність пожне гіркі плоди Нашого невдоволення.
 # Fuzzy
 model.historyEventType.declareIndependence.description=Ви знищили %settlement%, поселення %nation%.
+# Fuzzy
 model.historyEventType.declareWar.description=Оголошена війна нації %nation%.
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% знищує %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Ви відкрили Новий Світ.
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation% відкрили %region%.
+# Fuzzy
 model.historyEventType.formAlliance.description=Альянс вів переговори з нацією %nation%.
 model.historyEventType.foundColony.description=Ви заснували колонію %colony%.
 model.historyEventType.foundingFather.description=%father% вступив до Континентального конгресу.
 model.historyEventType.independence.description=Ви досягли незалежності від Корони.
+# Fuzzy
 model.historyEventType.makePeace.description=Мир досягнуто з нацією %nation%.
+# Fuzzy
 model.historyEventType.meetNation.description=Ви зустріли %nation%.
+# Fuzzy
 model.historyEventType.nationDestroyed.description=%nation% більше не присутні в Новому Світі.
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation% передали всі свої колонії Нового Світу нації %nation%.
 model.indianSettlement.mostHatedNone=Нічого
 model.indianSettlement.mostHatedUnknown=Невідомо
@@ -1903,8 +1921,10 @@ model.messageType.warehouseCapacity.name=Місткість складу
 model.messageType.warning.name=Застереження
 model.monarch.action.addToRef.text=Король додав %number% {{plural:%number%|%unit%}} до чисельності Королівського Експедиційного Війська. Правителі колоній висловлюють заклопотаність.
 model.monarch.action.addToRef.no=Готово
+# Fuzzy
 model.monarch.action.declarePeace.text=Ми погодилися милостиво на Мирний договір з {{tag:with|%nation%}}.
 model.monarch.action.declarePeace.no=Готово
+# Fuzzy
 model.monarch.action.declareWar.text=Зухвалість {{tag:of|%nation%}} змушує Нас оголосити їм війну!
 model.monarch.action.declareWar.no=Готово
 # Fuzzy
@@ -1964,6 +1984,7 @@ model.player.colonialIndependence=Тільки колоніальні гравц
 model.player.forces=%nation% сили
 model.player.independentMarket=Європа
 model.player.startGame=Після місяців плавання ви нарешті прибули до берегу невідомого континенту. Пливіть на {{tag:%direction%|west=захід|east=схід|default=за вітром}} щоб дослідити Новий Світ і проголосити його власністю Корони.
+# Fuzzy
 model.player.waitingFor=Чекаємо: %nation%
 model.regionType.coast.name=Узбережжя
 model.regionType.coast.unknown=Невідомий прибережний регіон
@@ -2003,6 +2024,7 @@ model.tradeItem.gold.name=Золото
 model.tradeItem.gold.description=сума %amount% золотих монет
 model.tradeItem.goods.name=Товари
 model.tradeItem.incite.name=Оголосити війну проти
+# Fuzzy
 model.tradeItem.incite.description=війна проти %nation%
 model.tradeItem.stance.name=Положення
 model.tradeItem.unit.name=Юніт
@@ -2024,9 +2046,9 @@ model.unit.underRepair=Ремонт (%turns%)
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -2067,6 +2089,7 @@ model.colony.warehouseSoonFull=Ваш склад в %colony% перевищит
 model.colony.warehouseWaste=Ваш склад в %colony% перевищив максимальну ємкість для %goods%. %waste% одиниць було втрачено.
 model.colony.workersEvicted=В %colony% ваші колоністи більше не можуть працювати на %location% через присутність %enemyUnit%.
 model.colonyTile.resourceExhausted=У %colony% вичерпався %resource%
+# Fuzzy
 model.game.spanishSuccession=Ваше Превосходительство, в Європі закінчилася війна за Іспанський спадок. За Утрехтським мирним договором %loserNation% були вимушені передати всі свої колонії в Новому Світі нації %nation%!
 model.indianSettlement.mission.denounced=Вашого місіонера у %settlement% засуджено і страчено!
 model.indianSettlement.mission.destroyed=Ваш місіонер загинув при знищенні %settlement%.
@@ -2076,6 +2099,7 @@ model.player.autoRecruit=Релігійні заворушення у  %europe%
 model.player.colonyGoodsParty.harbour=Ваш колоніст у %colony% викинув %amount% одиниць %goods% у гавань в знак протесту проти цього несправедливого оподаткування з боку корони!
 model.player.colonyGoodsParty.horses=Ваш колоніст у %colony% відпустив %amount% коней в знак протесту проти цього несправедливого оподаткування з боку корони!
 model.player.colonyGoodsParty.landLocked=Ваш колоніст у %colony% спалив %amount% одиниць %goods% на базарі в знак протесту проти цього несправедливого оподаткування з боку корони!
+# Fuzzy
 model.player.dead.european=Ваше Превосходительство, %nation% оголосили безумовне відлучення від справ Нового Світу!
 model.player.dead.native=Ваше Превосходительство, %nation% були знищені.
 model.player.disaster.bankruptcy.start=Ви не змогли оплатити утримання всіх будівель. Деякі виробничі санкції застосовуються.
@@ -2089,12 +2113,16 @@ model.player.ignoredTax=Корона підняла ставки податку
 model.player.interventionForceArrives=Обіцяні сили інтервенції прибули.
 model.player.soLDecrease=Кількість Синів Свободи у ваших колоніях опустилася до %newSoL% відсотків!
 model.player.soLIncrease=Кількість Синів Свободи у ваших колоніях піднялася до %newSoL% відсотків!
+# Fuzzy
 model.player.stance.alliance.declared=Ваше Превосходительство, між нами і %nation% затверджено союз!
 model.player.stance.alliance.others=Ваше Превосходительство, %attacker% мають союз з %defender%.
+# Fuzzy
 model.player.stance.ceaseFire.declared=Ваша ясновельможносте, %nation% погодилися на припинення вогню!
 model.player.stance.ceaseFire.others=Ваше Превосходительство, %attacker% мають договір про скорочення вогню з %defender%.
+# Fuzzy
 model.player.stance.peace.declared=Ваше Превосходительство, між нами і %nation% встановлено мир!
 model.player.stance.peace.others=Ваше Превосходительство, між %attacker% і %defender% мир.
+# Fuzzy
 model.player.stance.war.declared=Ваша світлість, погані новини, %nation% оголосила нам війну!
 model.player.stance.war.others=Ваша світлість, %attacker% оголосила війну %defender%.
 combat.automaticDefence=Ваш %unit% в %colony% взявся за зброю, щоб захистити колонію!
@@ -2110,6 +2138,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% уникнув атаки %unit
 combat.enemyShipSunk=%unit% затопив %enemyNation% %enemyUnit%.
 combat.equipmentCaptured=Стережіться, воїни %nation% отримали %equipment%!
 combat.goodsStolen=%enemyNation% %enemyUnit% украв %amount% %goods% в %colony%!
+# Fuzzy
 combat.indianPlunder=%enemyNation% %enemyUnit% пограбував %colony% на %amount%.
 combat.indianRaid=Наші шпигуни повідомляють, що %nation% здійснила напад на %colonyNation% колонії %colony%.
 combat.indianSurprise=%nation% здійснили несподіваний набіг на колонію %colony%, стривоживши наших колоністів. Правитель {{tag:of|%nation%}} заперечує причетність свого народу до цього набігу.
@@ -2166,6 +2195,7 @@ main.javaVersion=Java версії  %minVersion%  або більшої реко
 main.memory=Необхідно надати більше %memory% байт пам'яті для JVM.\n  Перезапустіть FreeCol з: java-Xmx%minMemory%М-jar FreeCol.jar
 main.userDir.fail=FreeCol не можете знайти відповідні каталоги для збереження даних користувача. Продовжуємо, але очікуємо неприємності.
 client.baseData=Не вдалося знайти каталог бази даних %dir% .\n  Файли даних не знайдені FreeCol.\n  Переконайтеся, що вони наявні.\n  Якщо FreeCol потім шукає в помилковому каталозі, то\n  запустіть гру у командному рядку з параметром:\n --freecol-data <data-directory>
+# Fuzzy
 client.choicePlayer=Будь ласка, виберіть гравця:
 client.classic=Не вдалося завантажити зіставлення ресурсів з набору правил "класичний".
 client.headlessDebug=Автоматичний режим потребує запуску налагодження.
@@ -2175,8 +2205,10 @@ metaServer.couldNotConnect=Вибачте, неможливо з’єднати
 metaServer.communicationError=Сталася помилка під час з’єднання з мета-сервером. Будь ласка, спробуйте пізніше.
 abandonEducation.action.studying=вивчення
 abandonEducation.action.teaching=навчання
+# Fuzzy
 abandonEducation.no=Ні, продовжити навчання
 abandonEducation.text=Якщо ваш %unit% покине колонію %colony%, то він відмовиться від %action% у %building%. Ви справді хочете цього?
+# Fuzzy
 abandonEducation.yes=Так, покинути поселення
 abandonTeaching.text=Якщо %unit% покине %building%, то він припине навчання. Ви справді впевнені, що йому пора це зробити?
 armedUnitSettlement.attack=Атакувати
@@ -2188,9 +2220,13 @@ buy.takeOffer=Прийняти пропозицію
 buy.text=%nation% хотіли би продати свій %goods% за %gold%:
 clearTradeRoute.text=Ваш %unit% призначений на торговий шлях %route%. Установка цілі забере його з торгового шляху. Ви справді хочете це зробити?
 client.fullScreen=Повноекранний режим не підтримується для цієї відеокарти.\nПовертаємося у віконний режим.
+# Fuzzy
 confirmHostile.alliance=Ви не можете атакувати союзників! Ви бажаєте розірвати союз із %nation% і об'явити війну?
+# Fuzzy
 confirmHostile.ceaseFire=Ви підписали припинання вогню з %nation%. Ви справді хочете атакувати?
+# Fuzzy
 confirmHostile.peace=Зараз у вас мир з %nation%. Ви дійсно бажаєте об'явити війну?
+# Fuzzy
 confirmTribute.broke=Наші шпигуни зазначають, що нація %nation%  повністю зруйнована. Давайте не гаймо часу з вимогами данини.
 confirmTribute.european=Нація %nation% %danger% та %finance%. Скільки данини нам вимагати з них?
 confirmTribute.happy=Нація %nation% у поселенні %settlement% - добрі друзі з нами. Шкода псувати наше товариство.
@@ -2258,7 +2294,9 @@ defeated.text=Ви зазнали поразки! Чи хотіли би ви:
 defeated.yes=Стояти і чекати
 defeatedSinglePlayer.text=Ви зазнали поразки!\n\nЗ цього моменту настав час диявольської ночі, коли церква спить і пекло видихає хвороби у цей світ, коли я можу пити теплу кров та робити такі справи, що наступного дня світ затремтить тільки від одного погляду на них.
 defeatedSinglePlayer.yes=Ввійти у режим помсти
+# Fuzzy
 diplomacy.offerAccepted=%nation% прийняли Вашу щедру пропозицію.
+# Fuzzy
 diplomacy.offerRejected=%nation% відхилили Вашу щедру пропозицію.
 disbandUnit.text=Ви впевнені, що хочете розпустити цього юніта?
 disbandUnit.yes=Розформувати
@@ -2303,7 +2341,9 @@ move.noAccessContact=Ваше превосходительство, ми пов
 move.noAccessGoods=%nation% не торгуватимуть з %unit% без вантажу.
 move.noAccessSettlement=%nation% не дозволяють увійти до поселення нашому %unit%.
 move.noAccessSkill=Наш %unit% не може вчитись у індіанців.
+# Fuzzy
 move.noAccessTrade=Ми не маємо права торгувати з іншими європейськими націями, такими, як %nation%.
+# Fuzzy
 move.noAccessWar=Ми не можемо торгувати з %nation% під час війни.
 move.noAccessWater=Наш %unit% повинен висадитися на берег, перш ніж входити в поселення.
 move.noAttackWater=Наші %unit% повинні висадитися на землю перед атакою.
@@ -2365,6 +2405,7 @@ server.timeOut=Перевищення часу очікування відпов
 server.userNameInUse=Вказане ім'я користувача вже використовується.
 server.userNameNotPresent=Вказане ім'я користувача є не в цій грі.
 server.wrongFreeColVersion=Версії клієнта і сервера FreeCol не збігаються.
+# Fuzzy
 buildColony.others=%nation% заснували нову колонію %colony% в %region%.
 cashInTreasureTrain.colonial=Гроші у сумі %amount% було вивантажено в Європі. %cashInAmount% золота було перетворено в готівку.
 cashInTreasureTrain.independent=У національну скарбницю були включені скарби, вартістю %amount%.
@@ -2468,6 +2509,7 @@ colopedia.unit.offensivePower=Наступальна сила:
 colopedia.unit.price=Ціна в Європі:
 colopedia.unit.productionBonus={{plural:%number%|one=Регулятор|other=Регулятори}} виробництва:
 colopedia.unit.requirements=Вимоги:
+# Fuzzy
 colopedia.unit.school=Потрібна школа, щоб тренувати:
 colopedia.unit.skill=Рівень кваліфікації:
 report.labour.allColonists=Всі колоністи
@@ -2503,8 +2545,8 @@ report.colony.growing.description=%colony% може бути збільшена
 # Fuzzy
 report.colony.improve.description=Юніти, які можуть підвищити виробницто порівняно з юнітом, що працює зараз
 report.colony.improve.header=Поліпшення
+# Fuzzy
 report.colony.improving.description=%colony%: Щоб зробити ще %amount% %goods%, замініть %oldUnit% на %unit%
-report.colony.wanting.description=%colony%: Щоб зробити ще %amount% %goods%, додайте %unit%
 report.colony.making.blocking.description=%colony%: %amount% %goods% потрібно для %buildable% {{plural:%turns%|one=наступного ходу|other=за %turns% ходів}}
 report.colony.making.constructing.description=%colony%: %buildable% завершується {{plural:%turns%|one=наступного ходу|other=за %turns% ходів}}
 report.colony.making.description=Що робить ця колонія
@@ -2514,21 +2556,22 @@ report.colony.making.noconstruction.description=%colony%: Будівництво
 report.colony.making.noteach.description=%colony%: %teacher% потребує учня
 report.colony.name.description=Список колоній
 report.colony.name.header=Поселення
-report.colony.plow.description=Кількість плиток в колонії, які виграють від Оранки
-report.colony.plow.header=О
-report.colony.plowing.description=%colony% отримає вигоду із розорювання {{plural:%amount%|one=однієї клітинки|other=%amount% клітинок}}
+# Fuzzy
 report.colony.production.description=%colony%: маса нетто вироблених %goods% = %amount%
+# Fuzzy
 report.colony.production.export.description=%colony%: маса нетто виготовленого %goods% рівна %amount% (експортуєм більше %export%)
 report.colony.production.header=Маса нетто виготовлених %goods%
+# Fuzzy
 report.colony.production.high.description=%colony%: маса нетто виготовленого %goods% = %amount%, буде заповнено {{plural:%turns%|one=наступного ходу|other=за %turns% ходів}}
+# Fuzzy
 report.colony.production.low.description=%colony%: маса нетто вироблених %goods% = %amount%, буде вичерпано {{plural:%turns%|one=в наступному ході|other=за %turns% ходів}}
+# Fuzzy
 report.colony.production.waste.description=%colony%: маса нетто виготовленого %goods% = %amount%, склад буде переповнено, %waste% змарнується
-report.colony.road.description=Кількість плиток в колонії, які виграють від Прокладання доріг
-report.colony.road.header=П
-report.colony.roadBuilding.description=%colony% отримає вигоду із будівництва {{plural:%amount%|one=дороги|other=%amount% доріг}}
 report.colony.shrinking.description=%colony% повинна вирости на {{plural:%amount%|one=один юніт|other=%amount% юнітів}} для покращення виробництва
 report.colony.starving.description=%colony%: голодування {{plural:%turns%|one=наступного ходу|other=за %turns% ходів}}
 # Fuzzy
+report.colony.wanting.description=%colony%: Щоб зробити ще %amount% %goods%, додайте %unit%
+# Fuzzy
 report.continentalCongress.elected=Обраний:
 report.continentalCongress.none=(нічого)
 report.continentalCongress.recruiting=Вербування
@@ -2570,26 +2613,25 @@ report.production.selectGoods=Вибір товарів
 report.production.update=Оновлення
 report.requirements.badAssignment=В %colony% є %expert%, який працює як %expertWork%, тоді як %nonExpert% працює як %nonExpertWork%. Було б ефективніше змінити їх місця роботи.
 report.requirements.canTrainExperts={{plural:2|%unit%}} може бути вивчений в
-report.requirements.clearTile=%type% на %direction% від %colony% виграє від зачищення.
+# Fuzzy
 report.requirements.exploreTile=%type% на %direction% від %colony% виграє від розвідки.
 report.requirements.met=Всі вимоги виконані.
 report.requirements.missingGoods=%colony% виробляє %goods%, але потребує більше %input%.
 report.requirements.misusedExperts=У вас є {{plural:2|%unit%}}, які не працюють як %work% в
 report.requirements.noExpert=%colony% виробляє %goods%, але не має %unit%.
-report.requirements.plowCenter=%colony% виграє від оранки її поля.
-report.requirements.plowTile=%type% на %direction% від %colony% виграє від оранки.
-report.requirements.roadTile=%type% на %direction% від %colony% виграє від будування доріг.
 report.requirements.severalExperts=Кілька {{plural:2|%unit%}} присутні в
 report.requirements.surplus=Надлишок виробництва %goods% в
 report.trade.afterTaxes=Прибуток після податків
 report.trade.beforeTaxes=Прибуток перед податками
 report.trade.cargoUnits=Одиниць у вантажі
+# Fuzzy
 report.trade.hasCustomHouse=* Ця колонія має митницю; ці товари експортуються.
 report.trade.totalDelta=Загальний обсяг виробництва
 report.trade.totalUnits=Всього одиниць
 report.trade.unitsSold=Продані або куплені одиниці
 report.turn.filter=Не показувати цей тип повідомлень (%type%)
 report.turn.ignore=Ігнорувати це повідомлення (Колонія: %colony%, Товари: %goods%)
+# Fuzzy
 report.turn.playerNation=%player% - %nation%
 # Fuzzy
 aboutPanel.copyright=Авторські права © 2002-2014 Команда FreeCol
@@ -2615,6 +2657,7 @@ chooseFoundingFatherDialog.title=Призначити Батьком-засно
 colonyPanel.colonyUnits=Юніти колонії
 colonyPanel.inPort=У порту
 colonyPanel.outsideColony=За межами колонії
+# Fuzzy
 colonyPanel.producing=Виробництво:
 colonyPanel.reducePopulation=Якщо ви зменшете населення колонії нижче %number%, то %colony% не зможе більше будувати %buildable%.
 colonyPanel.unitChange=На вході в вашу колонію ваш %oldType% став %newType%.
@@ -2627,7 +2670,9 @@ confirmDeclarationDialog.areYouSure.no=Можливо пізніше
 confirmDeclarationDialog.areYouSure.text=Відкинемо несправедливу тиранію %monarch% і оголосимо незалежність наших колоній від корони!
 confirmDeclarationDialog.areYouSure.yes=Свобода або смерть!
 confirmDeclarationDialog.createFlag=і наші вороги повинні тремтіти з вигляду нашого зухвалого банера.
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=Сполучені Штати %nation%
+# Fuzzy
 confirmDeclarationDialog.defaultNation=Вільні %nation%
 confirmDeclarationDialog.enterCountry=Надалі наша країна буде відома, як
 confirmDeclarationDialog.enterNation=і кожен громадянин нашої славної нації повинні гордитися тим, що надалі буде відомий як
@@ -2678,8 +2723,10 @@ negotiationDialog.add=Додати
 negotiationDialog.cancel=Скасувати
 negotiationDialog.clear=Очистити
 negotiationDialog.contact.tutorial=Ви зустріли братніх європейців. Вони будуть змагатися з вами за землю та скарби, і можуть оголосити Вам війну. Але після того, як Ян де Вітт приєднався до континентального конгресу, ви можете торгувати з ними.
+# Fuzzy
 negotiationDialog.demand=%nation% вимагають від нації %otherNation%
 negotiationDialog.exchange=в обмін на
+# Fuzzy
 negotiationDialog.offer=%nation% пропонують нації %otherNation%
 negotiationDialog.send=Послати
 negotiationDialog.title.contact=Зустріч із земляками-європейцями
@@ -2702,10 +2749,9 @@ findSettlementPanel.displayAll=Знайти всі населені пункти
 findSettlementPanel.displayOnlyEuropean=Знайти тільки європейські поселення
 findSettlementPanel.displayOnlyNatives=Знайти тільки туземні поселення
 findSettlementPanel.name=Знайти поселення
+# Fuzzy
 firstContactDialog.meeting.natives=Зустріч із корінними мешканцями. . .
 firstContactDialog.meeting.natives.tutorial=Ви зустріли корінних мешканців. Пошліть своїх скаутів до їхніх поселень, щоб дізнатися про них більше та своїх контрактих службовців і вільних колоністів, щоб навчатися у них. Якщо Ви хочете з ними торгувати, пошліть свої торгівельні судна і фургонний поїзд до їхніх поселень.
-firstContactDialog.meeting.AZTEC=Нація ацтеків. . .
-firstContactDialog.meeting.INCA=Імперія інків. . .
 firstContactDialog.welcomeOffer.text=%nation% вітають вас. Ми славетна нація, у нас %camps% {{plural:%camps%|%settlementType%}}. Для відзначення нашої дружби ми щедро даруємо вам землі, які ви зараз займаєте. Приймаєте наш договір і будете жити з нами у мирі як брати?
 firstContactDialog.welcomeSimple.text=%nation% вітають вас. Ми славетна нація, у нас %camps% {{plural:%camps%|%settlementType%}}. Приймаєте наш договір і будете жити з нами у мирі як брати?
 abandonColony.no=Скасувати
diff --git a/data/strings/FreeColMessages_zh-hant.properties b/data/strings/FreeColMessages_zh-hant.properties
index bb23fba0c..3072a7ef4 100644
--- a/data/strings/FreeColMessages_zh-hant.properties
+++ b/data/strings/FreeColMessages_zh-hant.properties
@@ -271,7 +271,6 @@ colopediaAction.goods.name=貨物
 colopediaAction.nations.name=國家
 colopediaAction.nationTypes.name=國家特長
 colopediaAction.resources.name=特產
-colopediaAction.skills.name=技能
 colopediaAction.terrain.name=地形種類
 colopediaAction.units.name=單位
 colopediaAction.name=%object% (百科)
@@ -1292,6 +1291,7 @@ model.colony.badGovernment=%colony% 的政府效率低下，生產懲罰出現
 model.colony.goodGovernment=政府效率改善！%colony% 的獨立黨現在已經等於或超過 %number%%！
 model.colony.governmentImproved1=%colony% 的政府效率改善，但還是不夠。生產懲罰仍舊存在。
 model.colony.governmentImproved2=%colony% 的政府效率改善，生產懲罰消失。
+# Fuzzy
 model.colony.insufficientProduction=如果 %colony% 城擁有超過 %inputAmount% 個 %inputType% 的話，我們就可以生產出超過 %outputAmount% 個 %outputType% 。
 model.colony.lostGoodGovernment=政府效率下降！%colony% 的獨立黨現在已經比 %number%% 還小！所有生產獎勵喪失。
 model.colony.lostVeryGoodGovernment=政府效率下降！%colony% 的獨立黨現在已經比 %number%% 還小！一些生產獎勵喪失。
@@ -1305,12 +1305,17 @@ model.colony.unbuildable=%colony% 現在不能建築 %object%。%object% 已經
 model.colony.veryBadGovernment=%colony% 的政府效率非常糟糕，出現嚴重的生產懲罰。
 model.colony.veryGoodGovernment=政府效率改善！%colony% 的獨立黨現在已經等於或超過 %number%%！
 model.diplomaticTrade.receive.contact=從光榮的 %nation% 致上兄弟般的問候。
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=讓我們與 %nation% 談判。
 model.diplomaticTrade.receive.trade=讓我們考慮一下 %nation% 的貿易優惠。
+# Fuzzy
 model.diplomaticTrade.receive.tribute=%nation% 要我們致敬！
 model.diplomaticTrade.send.contact=我們遇到 %nation% 的一員。
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=讓我們考慮一下我們與 %nation% 的外交處境。
+# Fuzzy
 model.diplomaticTrade.send.trade=讓我們提出與 %nation% 貿易於 %settlement% 。
+# Fuzzy
 model.diplomaticTrade.send.tribute=我們要求 %nation% 進貢於 %settlement% 。
 model.direction.N.name=北
 model.direction.NE.name=東北
@@ -1322,6 +1327,7 @@ model.direction.W.name=西
 model.direction.NW.name=西北
 # Fuzzy
 model.historyEventType.conquerColony.description=你敢接受慷慨的條款卻不付錢嗎？這種表裡不一的行為，會讓你嘗到因我們不滿而生的苦果。
+# Fuzzy
 model.historyEventType.nationDestroyed.description=%nation% 已經不存在於新世界了。
 model.indianSettlement.mostHatedNone=無
 model.indianSettlement.mostHatedUnknown=不明
@@ -1360,8 +1366,10 @@ model.messageType.warehouseCapacity.name=倉庫容量
 model.messageType.warning.name=警告
 model.monarch.action.addToRef.text=國王向皇家遠征軍增派了 %number% 個 {{plural:%number%|%unit%}}。殖民地首領們表示憂慮。
 model.monarch.action.addToRef.no=好
+# Fuzzy
 model.monarch.action.declarePeace.text=我們欣然地和 %nation% 簽下和平條約。
 model.monarch.action.declarePeace.no=好
+# Fuzzy
 model.monarch.action.declareWar.text=%nation% 的傲慢逼我們對他們開戰！
 model.monarch.action.declareWar.no=好
 model.monarch.action.displeasure.no=好
@@ -1411,6 +1419,7 @@ model.noClaimReason.water.description=我們並不主張水域。
 model.noClaimReason.worked.description=另一個解決辦法已經在使用這片土地。
 model.player.independentMarket=歐洲
 model.player.startGame=在幾個月的航行之後，你終於來到一個未知的大陸。{{標記： %direction% |west = 往西|east = 往東|default = 隨風}}航行，然後把這個大陸納入王國的版圖吧！
+# Fuzzy
 model.player.waitingFor=等待：%nation%
 model.regionType.coast.unknown=未知海岸地區
 model.regionType.desert.unknown=未知沙漠
@@ -1444,6 +1453,7 @@ model.tradeItem.gold.name=黃金
 model.tradeItem.gold.description=共有 %amount% 黃金
 model.tradeItem.goods.name=貨物
 model.tradeItem.incite.name=宣戰
+# Fuzzy
 model.tradeItem.incite.description=向 %nation% 宣戰
 model.tradeItem.unit.name=單位
 model.tradeRoute.allEmpty=所有的停靠站都是空的。
@@ -1465,6 +1475,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -1535,6 +1546,7 @@ combat.enemyShipEvaded=%enemyNation% 的 %enemyUnit% 已經躲開了 %unit% 所
 combat.enemyShipSunk=%unit% 擊沉了 %enemyNation% 的 %enemyUnit%！
 combat.equipmentCaptured=注意，%nation% 已經拿到了 %equipment%！
 combat.goodsStolen=%enemyNation% 的 %enemyUnit% 已經偷走了 %amount% 個 %colony% 的 %goods%！
+# Fuzzy
 combat.indianPlunder=%enemyNation% 的 %enemyUnit% 已經掠奪了 %colony% 的 %amount% 黃金。
 combat.indianRaid=我們的間諜報告 %nation% 突襲了 %colonyNation% 的 %colony%。
 combat.indianSurprise=%nation% 對 %colony% 發動突襲，驚動了我們的移民，但是 %nation% 的首領否認有參與。
@@ -1588,6 +1600,7 @@ main.javaVersion=推薦使用 JAVA 的 %minVersion% 或更新的版本執行 Fre
 main.memory=您需要分配多於 %memory% 位元組的記憶體給 JVM。重新啟動 FreeCol： java -Xmx %minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol 找不到合適的目錄來保存在使用者資料。正在進行，但可能會遇到麻煩。
 client.baseData=找不到基礎資料的目錄：%dir%\nFreeCol 找不到該資料的檔案，請確定他們都存在。\n如果 FreeCol 找錯了目錄，請在命令列執行以下參數：\n --freecol-data <（資料所在的目錄）>
+# Fuzzy
 client.choicePlayer=選擇玩家：
 client.classic=從「經典模式」的規則集載入資源映射失敗。
 client.debugConnect=你不能在偵錯模式連結已存在的遊戲
@@ -1600,8 +1613,10 @@ metaServer.couldNotConnect=抱歉，無法連接到 meta 伺服器。請稍後
 metaServer.communicationError=與 meta-server 伺服器通信時發生錯誤。請稍後再試。
 abandonEducation.action.studying=學習
 abandonEducation.action.teaching=教授
+# Fuzzy
 abandonEducation.no=否，繼續教學
 abandonEducation.text=離開 %colony% 後，%unit% 就會放棄在 %building% 的 %action%，你確定要讓 %unit% 離開嗎？
+# Fuzzy
 abandonEducation.yes=是，離開殖民地
 abandonTeaching.text=%unit% 離開 %building% 後，%unit% 就會中止教學，你確定要讓 %unit% 離開嗎？
 armedUnitSettlement.attack=攻擊
@@ -1613,7 +1628,9 @@ buy.takeOffer=接受這交易
 buy.text=%nation% 想要賣他們的 %goods% 以換取 %gold% 黃金：
 clearTradeRoute.text=您 %unit% 分配給貿易路線 %route% 。設置其目的地將下降它從貿易路線。你確定你要這樣做？
 client.fullScreen=全螢幕模式不支援這個影像設備。回到視窗模式。
+# Fuzzy
 confirmHostile.alliance=你不能攻擊盟國！你真的想撕毀與 %nation% 的盟約並宣戰嗎？
+# Fuzzy
 confirmTribute.broke=我們的間諜報告說 %nation% 被幹掉了。我們再也不用浪費這些時間去要求進貢啦。
 confirmTribute.european=%nation% %danger% ，而他們 %finance% 。我們應該要求他們進貢多少？
 confirmTribute.happy=%nation% 視我們 %settlement% 為好朋友，很可惜我們的友誼被破壞了。
@@ -1633,6 +1650,7 @@ indianLand.cancel=離開這片土地
 indianLand.pay=用 %amount% 黃金買下這片土地
 indianLand.take=奪取那本是我們的東西
 indianLand.text=這片土地被 %player% 擁有，你要怎麼辦？
+# Fuzzy
 indianLand.unknown=有不明人士住在這塊土地上。你要：
 info.autodetectLanguageSelected=你選擇了預設語言。它將會在下次開始遊戲時生效。
 info.enterSomeText=請輸入一些文本。
@@ -1678,7 +1696,9 @@ defeated.text=你被打敗了！你希望：
 defeated.yes=繼續觀察
 defeatedSinglePlayer.text=你被打敗了！\n\n今晚為行巫之時：當墳地綻裂、陰界蔓延至天下，即為吾輩嗜血之刻！只要做點嚴酷的交易，天下只得顫抖著……
 defeatedSinglePlayer.yes=進入復仇模式
+# Fuzzy
 diplomacy.offerAccepted=%nation% 已接受你慷慨的提案。
+# Fuzzy
 diplomacy.offerRejected=%nation% 拒絕了你慷慨的提案。
 disbandUnit.text=確定要刪除這調查嗎？
 disbandUnit.yes=解散
@@ -1724,7 +1744,9 @@ move.noAccessGoods=%nation% 不會和沒有 %unit% 的國家貿易。
 move.noAccessMissionBan=%nation% 拒絕與你的傳教士建立任何聯繫。
 move.noAccessSettlement=%nation% 不允許我們的 %unit% 進入他們的殖民地。
 move.noAccessSkill=我們的 %unit% 沒法從原住民那邊學到些什麼。
+# Fuzzy
 move.noAccessTrade=我們並沒有同諸如 %nation% 之類歐洲國家貿易的許可。
+# Fuzzy
 move.noAccessWar=我們不能與處於戰爭的 %nation% 貿易。
 move.noAccessWater=%unit% 在進入聚落前，必須先登陸。
 move.noAttackWater=%unit% 在發動攻擊前，必須先登陸。
@@ -1789,6 +1811,7 @@ server.timeOut=連接伺服器逾時。
 server.userNameInUse=指定的使用者名稱已被使用。
 server.userNameNotPresent=指定的使用者名稱不在遊戲內。
 server.wrongFreeColVersion=網路端與客戶端的 FreeCol 版本不相同。
+# Fuzzy
 buildColony.others=%nation% 發現了 %colony% 於 %region% 的殖民地。
 cashInTreasureTrain.colonial=一個價值 %amount% 黃金的寶藏送到了歐洲。%cashInAmount% 黃金送進你的金庫。
 cashInTreasureTrain.independent=一個價值 %amount% 黃金的寶藏送進國庫。
@@ -1830,6 +1853,7 @@ report.highScores.turn=年：
 report.production.update=更新
 report.turn.filter=不要顯示這種訊息：%type%
 report.turn.ignore=忽略此訊息 (殖民地：%colony%、貨品：%goods%)
+# Fuzzy
 report.turn.playerNation=%player%的%nation%
 aboutPanel.version=版本：
 buildingToolTip.breeding=你至少需要 %number% {{plural:%number% | %goods% }} 以繁殖 %goods% 。
@@ -1851,6 +1875,7 @@ chooseFoundingFatherDialog.title=提名開國元勳
 colonyPanel.colonyUnits=殖民地單位
 colonyPanel.inPort=在港口
 colonyPanel.outsideColony=殖民地外
+# Fuzzy
 colonyPanel.producing=生產：
 colonyPanel.reducePopulation=如果你的人口在 %number% 以下， %colony% 將不能建造 %buildable% 。
 colonyPanel.setGoods=貨物設置
@@ -1866,7 +1891,9 @@ confirmDeclarationDialog.areYouSure.no=也許以後吧
 confirmDeclarationDialog.areYouSure.text=讓我們唾棄 %monarch% 不公不義的暴政、宣佈我們的殖民地從王國獨立吧！
 confirmDeclarationDialog.areYouSure.yes=不自由毋寧死！
 confirmDeclarationDialog.createFlag=和我們的敵人應發抖我們違抗橫幅的視線。
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=%nation% 合眾國
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation% 自由國
 confirmDeclarationDialog.enterCountry=今後我們的國家要稱做：
 confirmDeclarationDialog.enterNation=而我光榮民族的公民們將以這個名字為傲：
@@ -1918,8 +1945,10 @@ negotiationDialog.add=新增
 negotiationDialog.cancel=取消
 negotiationDialog.clear=清除
 negotiationDialog.contact.tutorial=你遇見了歐洲人。他們會與你爭奪土地和財富，還有可能對你發動戰爭。但在 Jan de Witt 加入大陸會議後，你可以與他們交易。
+# Fuzzy
 negotiationDialog.demand=%nation% 要求 %otherNation%
 negotiationDialog.exchange=以換取
+# Fuzzy
 negotiationDialog.offer=%nation% 提供 %otherNation%
 negotiationDialog.send=傳送
 negotiationDialog.title.contact=與歐洲人會見
@@ -1941,10 +1970,9 @@ findSettlementPanel.displayAll=尋找所有聚落
 findSettlementPanel.displayOnlyEuropean=只找歐洲人聚落
 findSettlementPanel.displayOnlyNatives=只找原住民聚落
 findSettlementPanel.name=尋找聚落
+# Fuzzy
 firstContactDialog.meeting.natives=遇見原住民……
 firstContactDialog.meeting.natives.tutorial=你發現了原住民。派你的探索者會瞭解原住民們、派你的長工和自由移民會讓他們學到技術、派你的船與貨車則可以與他們交易。
-firstContactDialog.meeting.AZTEC=阿兹特克人…
-firstContactDialog.meeting.INCA=印加帝國…
 firstContactDialog.welcomeOffer.text=%nation% 歡迎您。我們是一個光榮的民族 %camps%   %settlementType% 。為慶祝我們的友誼，我們慷慨地為您提供您現在佔據作為禮物的土地。你將會接受我們的條約和謊言與我們在和平中作為兄弟嗎？
 firstContactDialog.welcomeSimple.text=%nation% 歡迎您。我們是一個光榮的民族 %camps%   %settlementType% 。你將會接受我們的條約和謊言與我們在和平中作為兄弟嗎？
 abandonColony.no=取消
diff --git a/data/strings/FreeColMessages_zh_CN.properties b/data/strings/FreeColMessages_zh_CN.properties
index 1dba92b16..56c815462 100644
--- a/data/strings/FreeColMessages_zh_CN.properties
+++ b/data/strings/FreeColMessages_zh_CN.properties
@@ -285,7 +285,6 @@ colopediaAction.goods.name=货物
 colopediaAction.nations.name=国家
 colopediaAction.nationTypes.name=国家特长
 colopediaAction.resources.name=特产
-colopediaAction.skills.name=专家
 colopediaAction.terrain.name=地形
 colopediaAction.units.name=单位
 colopediaAction.name=%object% (百科)
@@ -490,12 +489,15 @@ model.option.unitsThatUseNoBells.shortDescription=一座殖民城市中不消耗
 model.option.tileProduction.name=该格子产出的货物
 model.option.tileProduction.shortDescription=格子拥有多种产品。
 model.option.tileProduction.veryLow.name=非常少
+model.option.tileProduction.veryLow.shortDescription=极低瓷制品
 model.option.tileProduction.low.name=低
 model.option.tileProduction.low.shortDescription=低瓷制品
 model.option.tileProduction.medium.name=中
+model.option.tileProduction.medium.shortDescription=中瓷制品
 model.option.tileProduction.high.name=高
 model.option.tileProduction.high.shortDescription=高瓷制品
 model.option.tileProduction.veryHigh.name=非常高
+model.option.tileProduction.veryHigh.shortDescription=极高瓷制品
 model.option.badRumour.name=坏的谣言的机会
 model.option.badRumour.decription=百分比的谣言有一个坏结果的机会。
 model.option.goodRumour.name=良好的谣言的机会
@@ -573,7 +575,7 @@ model.option.foundColonyDuringRebellion.name=在叛乱期间发现的殖民地
 model.option.foundColonyDuringRebellion.shortDescription=播放机可以继续在独立战争期间发现的殖民地。
 model.option.payForBuilding.name=支付建设
 model.option.saveProductionOverflow.name=保存产品过载值
-model.option.saveProductionOverflow.shortDescription=保存过载锤子，自由钟及十字架。
+model.option.saveProductionOverflow.shortDescription=保存过载锤子、铃铛和十字架。
 model.option.allowStudentSelection.name=允许选择学徒
 model.option.allowStudentSelection.shortDescription=允许手动而非自动指定学徒
 model.option.enableUpkeep.name=建筑物需要保养（实验）
@@ -997,7 +999,9 @@ model.option.unloadOverflowResponse.shortDescription=当仓库或船舱过载时
 clientOptions.other.unloadOverflowResponse.ask.name=问
 clientOptions.other.unloadOverflowResponse.ask.shortDescription=问您做什么
 clientOptions.other.unloadOverflowResponse.never.name=从不
+clientOptions.other.unloadOverflowResponse.never.shortDescription=从不在能够导致一座仓库溢出的情况下卸下货物
 clientOptions.other.unloadOverflowResponse.always.name=总是
+clientOptions.other.unloadOverflowResponse.always.shortDescription=总是卸下货物，即使在一座仓库溢出
 clientOptions.mods.name=Mods
 clientOptions.mods.shortDescription=允许游戏修改选项
 clientOptions.mods.userMods.name=用户Mods
@@ -1509,6 +1513,7 @@ model.improvement.road.description=道路
 model.improvement.road.name=道路
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=沿海的殖民城市限制
+# Fuzzy
 model.limit.independence.coastalColonies.description=你至少要拥有%limit%座海边城市来宣布独立。
 model.limit.independence.rebels.name=革命党限制
 model.limit.independence.rebels.description=你的移民中至少要有 %limit%%支持独立。
@@ -1863,6 +1868,7 @@ model.colony.badGovernment=%colony%城的政府工作效率低下。生产惩罚
 model.colony.goodGovernment=政府效率改善了!%colony%城中自由党比例现在等于或超过%number%%了。
 model.colony.governmentImproved1=%colony%城的政府工作效率得到改善，不过依旧不足。生产惩罚仍旧起作用。
 model.colony.governmentImproved2=%colony%城的政府工作效率得到改善。生产惩罚不再起作用。
+# Fuzzy
 model.colony.insufficientProduction=在%colony%城中多于%outputAmount%的%outputType%可以被生产出来，只要我们拥有多于%inputAmount%的%inputType%。
 model.colony.lostGoodGovernment=政府效率降低了!%colony%城中自由党比例不再等于或大于%number%%了。所有生产奖励丧失了。
 model.colony.lostVeryGoodGovernment=政府效率降低了!%colony%城中自由党比例不再等于或大于%number%%了。一些生产奖励丧失了。
@@ -1877,12 +1883,17 @@ model.colony.veryBadGovernment=%colony%城政府效率非常低下!高生产惩
 model.colony.veryGoodGovernment=政府效率改善了!%colony%城中自由党比例现在等于或超过%number%%了。
 model.colonyTile.claim=(索要 %direction% )
 model.diplomaticTrade.receive.contact=兄弟般的问候从光荣 %nation% 的国家。
+# Fuzzy
 model.diplomaticTrade.receive.diplomatic=让我们与谈判 %nation% 。
 model.diplomaticTrade.receive.trade=让我们考虑一下 %nation% 贸易优惠。
+# Fuzzy
 model.diplomaticTrade.receive.tribute=%nation% 要求我们致敬 ！
 model.diplomaticTrade.send.contact=我们遇到的成员 %nation% 的国家。
+# Fuzzy
 model.diplomaticTrade.send.diplomatic=让我们考虑一下我们外交处境与 %nation% 。
+# Fuzzy
 model.diplomaticTrade.send.trade=让我们提出与贸易 %nation% 在 %settlement% 。
+# Fuzzy
 model.diplomaticTrade.send.tribute=我们要求进贡的 %nation% 在 %settlement% 。
 model.direction.N.name=北
 model.direction.NE.name=东北
@@ -1893,23 +1904,35 @@ model.direction.SW.name=西南
 model.direction.W.name=西
 model.direction.NW.name=西北
 model.historyEventType.abandonColony.description=你遗弃了殖民城市%colony%。
+# Fuzzy
 model.historyEventType.ceaseFire.description=对%nation%停火。
+# Fuzzy
 model.historyEventType.cityOfGold.description=%nation%发现了七座黄金城之一的%city%，和一笔价值%treasure%黄金的财富。
+# Fuzzy
 model.historyEventType.colonyConquered.description=你的殖民城市%colony%被%nation%人占领了。
+# Fuzzy
 model.historyEventType.colonyDestroyed.description=你的殖民城市%colony%被%nation%人摧毁了。
 model.historyEventType.conquerColony.description=您战胜了%colony%的%nation%殖民地。
 model.historyEventType.declareIndependence.description=你宣布脱离王国独立。
+# Fuzzy
 model.historyEventType.declareWar.description=向%nation%宣战的战争。
+# Fuzzy
 model.historyEventType.destroyNation.description=%nation% 摧毁了 %nativeNation% 。
 model.historyEventType.discoverNewWorld.description=你发现了新大陆。
+# Fuzzy
 model.historyEventType.discoverRegion.description=%nation%发现了%region%地区。
+# Fuzzy
 model.historyEventType.formAlliance.description=联盟谈判与 %nation% 。
 model.historyEventType.foundColony.description=你完成了殖民城市%colony%。
 model.historyEventType.foundingFather.description=%father%加入了大陆议会。
 model.historyEventType.independence.description=你成功脱离王国并获得了独立。
+# Fuzzy
 model.historyEventType.makePeace.description=决定与%nation%和平。
+# Fuzzy
 model.historyEventType.meetNation.description=你遇到了%nation%人。
+# Fuzzy
 model.historyEventType.nationDestroyed.description=在新的世界中， %nation%势力不再存在了。
+# Fuzzy
 model.historyEventType.spanishSuccession.description=%loserNation%割让所有新大陆的殖民地给%nation%。
 model.indianSettlement.mostHatedNone=无
 model.indianSettlement.mostHatedUnknown=未知
@@ -1962,8 +1985,10 @@ model.messageType.warehouseCapacity.name=仓库容量
 model.messageType.warning.name=警告
 model.monarch.action.addToRef.text=王国向皇家远征军增加了%number% {{plural:%number%|%unit%}}。殖民地首领们表现出了担忧。
 model.monarch.action.addToRef.no=完成
+# Fuzzy
 model.monarch.action.declarePeace.text=我们大方地同意与%nation%签署和平条约。
 model.monarch.action.declarePeace.no=完成
+# Fuzzy
 model.monarch.action.declareWar.text=傲慢的%nation%人逼我们向他们开战了!
 model.monarch.action.declareWar.no=完成
 model.monarch.action.displeasure.text=您敢接受我们慷慨的价钱，但逃避付款吗？这种不诚信将收获我们的不满情绪。
@@ -2021,6 +2046,7 @@ model.player.colonialIndependence=只有殖民地球员可以宣布独立。
 model.player.forces=%nation%的武斗力量
 model.player.independentMarket=欧洲
 model.player.startGame=经过几个月的航海之后，你终于来到了一片未知大陆附近了。{{tag:%direction%|west=向西|east=向东|default=随风而}}航行来探索这个新世界并将它加入王国的版图。
+# Fuzzy
 model.player.waitingFor=等待：%nation%
 model.regionType.coast.name=海岸
 model.regionType.coast.unknown=未知海岸区域
@@ -2061,6 +2087,7 @@ model.tradeItem.gold.name=黄金
 model.tradeItem.gold.description=总计有%amount%黄金
 model.tradeItem.goods.name=货物
 model.tradeItem.incite.name=声明反对战争
+# Fuzzy
 model.tradeItem.incite.description=反对战争%nation%
 model.tradeItem.stance.name=和平状态
 model.tradeItem.unit.name=单位
@@ -2084,9 +2111,9 @@ model.unit.underRepair=修理中（%turns%）
 model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
-model.unit.unitState.improving=#
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
+# Fuzzy
 model.unit.unitState.skipped=W
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
@@ -2127,6 +2154,7 @@ model.colony.warehouseSoonFull=%colony%城仓库中的%goods%在下回合将达
 model.colony.warehouseWaste=%colony%城仓库中%goods%的容量已达到最大。%waste%单位被浪费。
 model.colony.workersEvicted=在%colony%，殖民者由于有%enemyUnit%不能再在%location%工作。
 model.colonyTile.resourceExhausted=%colony%城中的%resource%资源耗尽
+# Fuzzy
 model.game.spanishSuccession=阁下，欧洲的战争以西班牙的胜利而告终。在乌德勒支条约中，%loserNation%被要求割让所有新世界的殖民地给%nation%!
 model.indianSettlement.mission.denounced=你在%settlement%的传教士被告发并被处决了。
 model.indianSettlement.mission.destroyed=您在%settlement%的传教士已由于定居点的毁坏死亡。
@@ -2136,6 +2164,7 @@ model.player.autoRecruit=%europe%的宗教动乱使%unit%决定移民。
 model.player.colonyGoodsParty.harbour=在%colony%城中的移民将%amount%%goods%倾倒入港口来表达他们对于国王不公平的税收政策的抗议!
 model.player.colonyGoodsParty.horses=你%colony%城中的移民释放了%amount%的马匹来表达他们对于国王不平等的税收制度的反抗!
 model.player.colonyGoodsParty.landLocked=Y在%colony%城中的移民将市场中%amount%%goods%烧毁来表达他们对于国王不公平的税收政策的抗议!
+# Fuzzy
 model.player.dead.european=阁下，%nation%无条件的宣布将不再参与新大陆的事务了!
 model.player.dead.native=阁下，%nation%已被消灭了。
 model.player.disaster.bankruptcy.start=您未能支付的所有建筑物的维护费用。严重生产的惩罚产生了。
@@ -2149,12 +2178,16 @@ model.player.ignoredTax=如先前宣布的一样，官方已经将税率提高
 model.player.interventionForceArrives=许诺的干涉部队到达！
 model.player.soLDecrease=在你的殖民城市中自由党的比例下降至%newSoL%%!
 model.player.soLIncrease=在你的殖民城市中自由党的比例上升至%newSoL%%!
+# Fuzzy
 model.player.stance.alliance.declared=阁下，%nation%与我们结盟!
 model.player.stance.alliance.others=阁下, %attacker%和%defender%是盟友关系。
+# Fuzzy
 model.player.stance.ceaseFire.declared=阁下，%nation%人同意停火了!
 model.player.stance.ceaseFire.others=阁下，%attacker%人同意和%defender%人停火了。
+# Fuzzy
 model.player.stance.peace.declared=阁下，%nation%同我们处于和平状态!
 model.player.stance.peace.others=阁下，%attacker%同%defender%处于和平状态。
+# Fuzzy
 model.player.stance.war.declared=坏消息，阁下，%nation%人向我们宣战了!
 model.player.stance.war.others=阁下，%attacker%向%defender%宣战了。
 combat.automaticDefence=你在%colony%城中的%unit%已拿起武器保护城市!
@@ -2170,6 +2203,7 @@ combat.enemyShipEvaded=%enemyNation%人的%enemyUnit%已躲开%unit%的一次进
 combat.enemyShipSunk=%unit%击沉了%enemyNation%人的%enemyUnit%!
 combat.equipmentCaptured=注意，%nation%人勇士已获得%equipment%!
 combat.goodsStolen=%enemyNation%人的%enemyUnit%从%colony%城中偷走了%amount%%goods%!
+# Fuzzy
 combat.indianPlunder=%enemyNation%人的%enemyUnit%洗劫%colony%城%amount%黄金。
 combat.indianRaid=我们的间谍报告，%nation%突袭了%colonyNation%的%colony%城。
 combat.indianSurprise=%nation%对%colony%进行突袭，警告我们的移民。%nation%的首领否认参与此事。
@@ -2224,6 +2258,7 @@ main.javaVersion=%minVersion%或更高版本的Java被推荐来运行FreeCol !(
 main.memory=您需要分配多于%memory%字节的内存给JVM。重新启动 FreeCol： java -Xmx %minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol找不到合适的文件夹来存储数据。正在继续，但可能遇到麻烦。
 client.baseData=找不到基础数据目录 %dir% 。\n由 FreeCol 找不到数据文件。 ！N!请确保他们都存在。\n如果 FreeCol 然后在错误的目录中查找 ！N!使用命令行参数运行游戏： ！N!— — freecol 数据<data-directory></data-directory>
+# Fuzzy
 client.choicePlayer=选择玩家：
 client.classic=未能从规则集 '经典'中加载资源映射。
 client.debugConnect=您不可以在调试模式下连接现有游戏。
@@ -2236,8 +2271,10 @@ metaServer.couldNotConnect=在与meta-server服务器进行通信时发生错误
 metaServer.communicationError=在与meta-server服务器进行通信时发生错误。请稍后再试。
 abandonEducation.action.studying=学习
 abandonEducation.action.teaching=教授
+# Fuzzy
 abandonEducation.no=否，继续教育
 abandonEducation.text=如果您 %unit%离开%colony%它将放弃在 %building%中的%action%，确实应该离开吗？
+# Fuzzy
 abandonEducation.yes=是的离开殖民城市
 abandonTeaching.text=您的%unit%离开%building%后将会停止教育，确定么？
 armedUnitSettlement.attack=进攻
@@ -2249,10 +2286,14 @@ buy.takeOffer=同意要价
 buy.text=%nation%希望以%gold%黄金的价格卖出他们的%goods%：
 clearTradeRoute.text=你的%unit%被指定运行于贸易路线 %route%。设定它的目的地将会让它放弃当前的贸易路线。你确定要这样做吗？
 client.fullScreen=全屏幕模式下不支持此 GraphicsDevice。\n降回窗口模式。
+# Fuzzy
 confirmHostile.alliance=你不能攻击盟友!你当真希望撕毁同%nation%盟约并开战吗？
+# Fuzzy
 confirmHostile.ceaseFire=你已同%nation%签定了停火协议。你真的想发动进攻吗？
+# Fuzzy
 confirmHostile.peace=你现在同%nation%处于和平状态。你真的希望对其宣战吗?
 confirmHostile.yes=好，开战吧！
+# Fuzzy
 confirmTribute.broke=报告说，我们的间谍 %nation% 是完全打破了。让我们不浪费我们的时间与进贡的要求。
 confirmTribute.european=The %nation% %danger%, and %finance%.我们应该要求多少进贡的他们？
 confirmTribute.happy=在%settlement%的%nation%对我们都是好朋友，可惜有人正在破坏我们的友谊。
@@ -2274,6 +2315,7 @@ indianLand.pay=出价%amount%黄金购买土地。
 # Fuzzy
 indianLand.take=应该是属于我们的。
 indianLand.text=该土地被%player%拥有。你希望：
+# Fuzzy
 indianLand.unknown=这些岛屿居住有未知人类。您希望：
 info.autodetectLanguageSelected=你选择了默认语言。它将会在下次开始游戏时生效。
 info.enterSomeText=P请输入文字。
@@ -2319,7 +2361,9 @@ defeated.text=你被击败了!你希望：
 defeated.yes=继续观看
 defeatedSinglePlayer.text=你被击败了!\n\n今晚正是使用巫术的好时间，墓地裂开并呼出瘟疫，此时也正是我品尝鲜血的时候!通过这个痛苦仪式,世界将会在你面前颤抖。
 defeatedSinglePlayer.yes=进入复仇模式
+# Fuzzy
 diplomacy.offerAccepted=%nation% 接受了你大方的馈赠。
+# Fuzzy
 diplomacy.offerRejected=%nation% 拒绝了你大方的馈赠。
 disbandUnit.text=你确信要解散这个单位吗？
 disbandUnit.yes=解散
@@ -2365,7 +2409,9 @@ move.noAccessGoods=%nation%不会与一个空的%unit%贸易。
 move.noAccessMissionBan=%nation%拒绝与您的传教士的任何联系。
 move.noAccessSettlement=%nation%人不允许我们的%unit%进入他们的聚落。
 move.noAccessSkill=我们的%unit%无法从土著人处学到什么。
+# Fuzzy
 move.noAccessTrade=我们未被授权同例如%nation%的其它欧洲国家进行贸易。
+# Fuzzy
 move.noAccessWar=我们不能在战时同%nation%人进行贸易。
 move.noAccessWater=在进入聚落前，%unit%必须先登陆。
 move.noAttackWater=我们的%unit%在发起攻击之前必须先登陆。
@@ -2429,6 +2475,7 @@ server.timeOut=连接服务器超时。
 server.userNameInUse=指定的用户名称已被使用。
 server.userNameNotPresent=指定的用户名不在这个游戏中。
 server.wrongFreeColVersion=客户端和服务器的FreeCol版本不匹配。
+# Fuzzy
 buildColony.others=%nation%发现了%colony%在%region%的殖民地。
 cashInTreasureTrain.colonial=一笔价值%amount%黄金的财宝被运到了欧洲。%cashInAmount%黄金流入了你的金库。
 cashInTreasureTrain.independent=一笔价值%amount%黄金的财宝被加入进国库。
@@ -2534,6 +2581,7 @@ colopedia.unit.offensivePower=攻击力：
 colopedia.unit.price=同期欧洲价格：
 colopedia.unit.productionBonus=产品{{plural:%number%|one=modifier|other=modifiers}}:
 colopedia.unit.requirements=需求：
+# Fuzzy
 colopedia.unit.school=训练所需学校：
 colopedia.unit.skill=技术水平：
 report.labour.allColonists=所有移民
@@ -2568,8 +2616,8 @@ report.colony.grow.header=+
 report.colony.growing.description=%colony%可通过增长 {{复数： %amount% 或 = 一 unit|other = %amount% 单位}} 不伤害生产
 report.colony.improve.description=能够改进产品的单位。
 report.colony.improve.header=改善
+# Fuzzy
 report.colony.improving.description=%colony%：为生产更多%amount%的%goods%<br>用%unit%更换%oldUnit%
-report.colony.wanting.description=%colony%：要多制作%amount%个%goods%，增加%unit%
 report.colony.making.blocking.description=%colony%：{{plural:%turns%|one=下一回合|other=%turns%回合后}}%buildable%需要%amount%个%goods%
 report.colony.making.constructing.description=%colony%: %buildable% 完成 {{复数： %turns% 或 = 下一 turn|other = 在 %turns% 转}}
 report.colony.making.description=这个殖民城市在生产什么
@@ -2579,20 +2627,21 @@ report.colony.making.noconstruction.description=%colony%：没有建设进行
 report.colony.making.noteach.description=%colony%：%teacher%缺少一名学生
 report.colony.name.description=殖民城市列表
 report.colony.name.header=殖民地
-report.colony.plow.description=将受益于灌溉的殖民城市格子数
-report.colony.plow.header=P
-report.colony.plowing.description=%colony%会从探索{{plural:%amount%|one=一格|other=%amount%格}}中获利
+# Fuzzy
 report.colony.production.description=%colony%：%goods%净产量=%amount%
+# Fuzzy
 report.colony.production.export.description=%colony%：%goods% 净产量是%amount%(%export%以上出口)
 report.colony.production.header=%goods%净产量
+# Fuzzy
 report.colony.production.high.description=%colony%： 净额 %goods% 生产 =  %amount% 、 充分 {{复数： %turns% 或 = 下一 turn|other = 在 %turns% 转}}
+# Fuzzy
 report.colony.production.low.description=%colony%： 净额 %goods% 生产 =  %amount% 、 走 {{复数： %turns% 或 = 下一 turn|other = 在 %turns% 变成}}
-report.colony.production.waste.description=%colony%：%goods% 净产量=%amount%，仓库将溢出，%waste%将被浪费
-report.colony.road.description=将受益于筑路的殖民城市格子数
-report.colony.road.header=R
-report.colony.roadBuilding.description=%colony%会从探索{{plural:%amount%|one=一格|other=%amount%格}}中获利
+# Fuzzy
+report.colony.production.waste.description=%colony%：%goods% 净产量 = %amount%，仓库将溢出，%waste% 将被浪费
 report.colony.shrinking.description=%colony%必须由收缩 {{复数： %amount% 或 = 一 unit|other = %amount% 单位}} 以改善生产
 report.colony.starving.description=%colony%: 饥荒{{plural:%turns%|one=下回合|other=在%turns%回合内}}
+# Fuzzy
+report.colony.wanting.description=%colony%：要多制作%amount%个%goods%，增加%unit%
 report.continentalCongress.available=可用
 report.continentalCongress.elected=选举：%turn%
 report.continentalCongress.none=(无)
@@ -2635,26 +2684,25 @@ report.production.selectGoods=选择货物
 report.production.update=更新
 report.requirements.badAssignment=%colony% 城内的一个%expert%正在做%expertWork%，同时一个%nonExpert%正在做%nonExpertWork%。如果这两个移民交换他们的工作，那么产出的产品将会更多。
 report.requirements.canTrainExperts={{plural:2|%unit%}}可以被训练于
-report.requirements.clearTile=%type%到%colony%的%direction%将受益于清理。
+# Fuzzy
 report.requirements.exploreTile=%colony%的%direction%的%type%将受益于探索。
 report.requirements.met=所有需求均已达到。
 report.requirements.missingGoods=%colony%虽然现在还能生产%goods%，但还是需要更多的%input%。
 report.requirements.misusedExperts=现在有{{plural:2|%unit%}}并没有做%work%工作位于
 report.requirements.noExpert=%colony%正在生产%goods%，但没有%unit%。
-report.requirements.plowCenter=%colony%将受益于耕种格子。
-report.requirements.plowTile=%colony%的%direction%的%type%将受益于耕种。
-report.requirements.roadTile=%colony%的%direction%的%type%将受益于道路建设。
 report.requirements.severalExperts=若干{{plural:2|%unit%}}可用于
 report.requirements.surplus=下列城市中%goods%生产过剩：
 report.trade.afterTaxes=税后收入
 report.trade.beforeTaxes=税前收入
 report.trade.cargoUnits=货仓中的单位
+# Fuzzy
 report.trade.hasCustomHouse=* 这个城市拥有一个海关；这些货物可以出口了。
 report.trade.totalDelta=总产量
 report.trade.totalUnits=总单位数
 report.trade.unitsSold=单位买卖
 report.turn.filter=不显示该种(%type%)消息
 report.turn.ignore=忽略消息(殖民城市：%colony%，产品： %goods%)
+# Fuzzy
 report.turn.playerNation=%player%的国家是%nation%
 aboutPanel.copyright=版权所有 © 2002~2015 FreeCol团队
 aboutPanel.legalDisclaimer=FreeCol是一款自由软件：你可以在自由软件基金会关于GNU公共许可证第2版或后绪版本条款约束下对其进行重新发布或修改。
@@ -2680,6 +2728,7 @@ colonyPanel.buildQueue=建造队列
 colonyPanel.colonyUnits=殖民地单位
 colonyPanel.inPort=港内
 colonyPanel.outsideColony=殖民城外
+# Fuzzy
 colonyPanel.producing=生产：
 colonyPanel.reducePopulation=如果你将人口降到%number%以下, %colony%将不能修建%buildable%。
 colonyPanel.setGoods=设置货物
@@ -2695,7 +2744,9 @@ confirmDeclarationDialog.areYouSure.no=也许以后吧
 confirmDeclarationDialog.areYouSure.text=让我们从%monarch%不公平的暴政下解放出来并宣布我们的殖民地脱离王国独立了!
 confirmDeclarationDialog.areYouSure.yes=不自由毋宁死!
 confirmDeclarationDialog.createFlag=和我们的敌人应发抖我们违抗横幅的视线。
+# Fuzzy
 confirmDeclarationDialog.defaultCountry=%nation%合众国
+# Fuzzy
 confirmDeclarationDialog.defaultNation=%nation%自由国
 confirmDeclarationDialog.enterCountry=从今以后，我们的国家将被称作
 confirmDeclarationDialog.enterNation=并且我们光荣的民族中的每个公民都将被骄傲的知晓
@@ -2747,9 +2798,11 @@ negotiationDialog.add=添加
 negotiationDialog.cancel=取消
 negotiationDialog.clear=清除
 negotiationDialog.contact.tutorial=你碰到了欧洲的同行. 他们会和你争夺土地和财富，还有可能发动战争来对付你.不过在约翰·德·维特加入大陆议会后,你以可以同他们贸易。
+# Fuzzy
 negotiationDialog.demand=%nation% 的要求%otherNation%
 negotiationDialog.exchange=回应
 negotiationDialog.goldAvailable=（%amount% 黄金可用）
+# Fuzzy
 negotiationDialog.offer=%nation%由%otherNation%提供
 negotiationDialog.send=发送
 negotiationDialog.title.contact=遇到欧洲同行。
@@ -2773,10 +2826,9 @@ findSettlementPanel.displayOnlyEuropean=只找到欧洲定居点
 findSettlementPanel.displayOnlyNatives=找到仅本机住区
 findSettlementPanel.name=寻找聚落
 findSettlementPanel.settlement=%name%%capital%（%nation%）
+# Fuzzy
 firstContactDialog.meeting.natives=遇到了土著人...
 firstContactDialog.meeting.natives.tutorial=你碰到了土著人.你可以派探索者到他们的部落去了解更多他们的事,也可以让契约仆人或自由移民去那里学习他们的技术.如果想和他们贸易就派船或货车去到那儿去吧。
-firstContactDialog.meeting.AZTEC=阿兹特克人...
-firstContactDialog.meeting.INCA=印加帝国...
 firstContactDialog.welcomeOffer.text=%nation%人民欢迎你。我们是一个拥有%camps%座 %settlementType%的强大部落。为了表达我们的友好，我们慷慨地将我们被你占用的土地送给你。你同意接受我们提议并同我们如同兄弟般和平共处吗？
 firstContactDialog.welcomeSimple.text=%nation%人民欢迎你。我们是一个拥有%camps%座%settlementType%的强大部落。你同意接受我们提议并同我们如同兄弟般和平共处吗？
 abandonColony.no=取消
@@ -2877,7 +2929,7 @@ tilePanel.defenseBonus=防卫奖金：
 tilePanel.label=%label%（%x%, %y%）
 tilePanel.movementCost=活动花费：
 tilePanel.owner=所有者：
-tilePanel.region=地区：
+tilePanel.region=区域：
 tilePanel.settlement=结算：
 tradeRouteInputPanel.addStop=增加货站
 tradeRouteInputPanel.allColonies=所有殖民地
@@ -3766,6 +3818,7 @@ model.nation.tupi.settlementName.50=图皮尼求姆
 model.nation.tupi.settlementName.51=乌穆阿拉马
 model.nation.tupi.settlementName.52=乌鲁布
 model.nation.tupi.settlementName.53=乌鲁
+model.other.region.river.16=蓝色
 error.disasterAvoided=灾难%disaster%幸免于%colony%
 info.rgb=RGB值：%red%,%green%,%blue%
 prompt.selectDisaster=选择灾难

From 76330ff2c63d6fed27f0a8e518b6af494b5dd4ba Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 10 Sep 2015 10:17:32 +0930
Subject: [PATCH 196/323] Simplify diplomacy, suppressing doubled messages,
 BR#2879.

---
 .../client/control/InGameController.java      | 37 ++-----------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 4f0a13d68..fafb8be85 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -1328,41 +1328,12 @@ public final class InGameController implements NetworkConstants {
         if (other == player.getREFPlayer()) return false;
 
         StringTemplate nation = other.getNationLabel();
-        ModelMessage m = null;
-        TradeStatus status;
         while (dt != null) {
-            // Inform server of current agreement, exit if it did not
-            // require a response (i.e. was not a proposal).
-            status = dt.getStatus();
+            // Inform server of current agreement.
             dt = askServer().diplomacy(game, unit, colony, dt);
-            if (status != TradeStatus.PROPOSE_TRADE) break;
-            
-            // Process the result of a proposal.
-            status = (dt == null) ? TradeStatus.REJECT_TRADE : dt.getStatus();
-            m = null;
-            switch (status) {
-            case PROPOSE_TRADE:
-                break;
-            case ACCEPT_TRADE:
-                m = new ModelMessage(MessageType.FOREIGN_DIPLOMACY,
-                                     "diplomacy.offerAccepted",
-                                     colony)
-                    .addStringTemplate("%nation%", nation);
-                dt = null;
-                break;
-            case REJECT_TRADE:
-                m = new ModelMessage(MessageType.FOREIGN_DIPLOMACY,
-                                     "diplomacy.offerRejected",
-                                     colony)
-                    .addStringTemplate("%nation%", nation);
-                dt = null;
-                break;
-            default:
-                throw new RuntimeException("Bogus trade status" + status);
-            }
-            if (m != null) player.addModelMessage(m);
-
-            // If it was a counter proposal, consider it.
+            // Returned dt will be null if we sent or the other player
+            // replied with an accept/reject.  Otherwise consider
+            // counter proposal.
             if (dt != null) {
                 dt = gui.showNegotiationDialog(unit, colony, dt,
                     dt.getSendMessage(player, colony));

From 64ad404cb050b7926ef382ba17794ad923533b45 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 10 Sep 2015 09:25:27 +0930
Subject: [PATCH 197/323] Drop river improvements without connections.

---
 .../sf/freecol/common/model/TileItemContainer.java    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/net/sf/freecol/common/model/TileItemContainer.java b/src/net/sf/freecol/common/model/TileItemContainer.java
index c78ba7c58..0f72ba6ed 100644
--- a/src/net/sf/freecol/common/model/TileItemContainer.java
+++ b/src/net/sf/freecol/common/model/TileItemContainer.java
@@ -562,6 +562,17 @@ public class TileItemContainer extends FreeColGameObject {
                     ti.setLocation(tile);
                     integ = Math.min(integ, 0);
                 }
+                // There are also still maps floating around with
+                // rivers that go nowhere.
+                if (ti instanceof TileImprovement) {
+                    TileImprovement tim = (TileImprovement)ti;
+                    if (tim.isRiver()
+                        && (tim.getStyle() == null
+                            || "0000".equals(tim.getStyle().toString()))) {
+                        logger.warning("Style 0000 river: " + tim);
+                        integ = -1;
+                    }
+                }
                 // end @compat
                 if (integ < 0) {
                     logger.warning("Removing broken improvement at: " + tile

From 51d2bb9862260fde2cd10296f5e0be0167732315 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 1 Sep 2015 11:11:00 +0930
Subject: [PATCH 198/323] Use lamdba in animation.

---
 src/net/sf/freecol/client/gui/MapViewer.java  |  2 +-
 .../client/gui/OutForAnimationCallback.java   |  6 +-
 .../gui/animation/UnitImageAnimation.java     | 12 +--
 .../gui/animation/UnitMoveAnimation.java      | 97 +++++++++----------
 4 files changed, 53 insertions(+), 64 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 3f57ec80a..21f4fbc80 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -644,7 +644,7 @@ public final class MapViewer {
      * @param sourceTile The source <code>Tile</code>.
      * @param r The code to be executed.
      */
-    void executeWithUnitOutForAnimation(final Unit unit,
+    public void executeWithUnitOutForAnimation(final Unit unit,
                                                final Tile sourceTile,
                                                final OutForAnimationCallback r) {
         final JLabel unitLabel = enterUnitOutForAnimation(unit, sourceTile);
diff --git a/src/net/sf/freecol/client/gui/OutForAnimationCallback.java b/src/net/sf/freecol/client/gui/OutForAnimationCallback.java
index 2abfde808..3dc72f17f 100644
--- a/src/net/sf/freecol/client/gui/OutForAnimationCallback.java
+++ b/src/net/sf/freecol/client/gui/OutForAnimationCallback.java
@@ -30,9 +30,9 @@ public interface OutForAnimationCallback {
 
     /**
      * The code to be executed when a unit is out for animation.
+     *
      * @param unitLabel A <code>JLabel</code> with an image of
-     *      the unit provided as a parameter to
-     *      {@link MapViewer#executeWithUnitOutForAnimation(net.sf.freecol.common.model.Unit, net.sf.freecol.common.model.Tile, OutForAnimationCallback)}.
+     *      the unit to animate.
      */
-    public void executeWithUnitOutForAnimation(JLabel unitLabel);
+    void executeWithUnitOutForAnimation(JLabel unitLabel);
 }
diff --git a/src/net/sf/freecol/client/gui/animation/UnitImageAnimation.java b/src/net/sf/freecol/client/gui/animation/UnitImageAnimation.java
index 66bab60d3..41e84c5c7 100644
--- a/src/net/sf/freecol/client/gui/animation/UnitImageAnimation.java
+++ b/src/net/sf/freecol/client/gui/animation/UnitImageAnimation.java
@@ -26,7 +26,6 @@ import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 
 import net.sf.freecol.client.gui.ImageLibrary;
-import net.sf.freecol.client.gui.OutForAnimationCallback;
 import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.io.sza.AnimationEvent;
 import net.sf.freecol.common.io.sza.ImageAnimationEvent;
@@ -71,9 +70,7 @@ public final class UnitImageAnimation {
 
         // Painting the whole screen once to get rid of disposed dialog-boxes.
         gui.paintImmediatelyCanvasInItsBounds();
-        gui.executeWithUnitOutForAnimation(unit, tile, new OutForAnimationCallback() {
-            @Override
-            public void executeWithUnitOutForAnimation(final JLabel unitLabel) {
+        gui.executeWithUnitOutForAnimation(unit, tile, (JLabel unitLabel) -> {
                 for (AnimationEvent event : animation) {
                     long time = System.nanoTime();
                     if (event instanceof ImageAnimationEvent) {
@@ -86,7 +83,7 @@ public final class UnitImageAnimation {
                         }
                         icon.setImage(image);
                         gui.paintImmediatelyCanvasIn(getDirtyAnimationArea());
-
+                        
                         time = ievent.getDurationInMs()
                             - (System.nanoTime() - time) / 1000000;
                         if (time > 0) {
@@ -97,9 +94,8 @@ public final class UnitImageAnimation {
                             }
                         }
                     }
-                }             
-            }
-        });
+                }
+            });
     }
 
     protected Rectangle getDirtyAnimationArea() {
diff --git a/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java b/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
index 0d23198d3..39682d9ff 100644
--- a/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
+++ b/src/net/sf/freecol/client/gui/animation/UnitMoveAnimation.java
@@ -26,7 +26,6 @@ import javax.swing.JLabel;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.ImageLibrary;
-import net.sf.freecol.client.gui.OutForAnimationCallback;
 import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Unit;
@@ -84,61 +83,55 @@ final class UnitMoveAnimation {
         final Rectangle bounds = r1.union(r2);
 
         gui.executeWithUnitOutForAnimation(unit, sourceTile,
-            new OutForAnimationCallback() {
-                @Override
-                public void executeWithUnitOutForAnimation(final JLabel unitLabel) {
-                    final int labelWidth = unitLabel.getWidth();
-                    final int labelHeight = unitLabel.getHeight();
-                    final Point srcPoint = gui.calculateUnitLabelPositionInTile(
-                        labelWidth, labelHeight, srcP);
-                    final Point dstPoint = gui.calculateUnitLabelPositionInTile(
-                        labelWidth, labelHeight, dstP);
-                    final double xratio = ImageLibrary.TILE_SIZE.width
-                                        / (double)ImageLibrary.TILE_SIZE.height;
-                    final int stepX = (srcPoint.getX() == dstPoint.getX()) ? 0
-                        : (srcPoint.getX() > dstPoint.getX()) ? -1 : 1;
-                    final int stepY = (srcPoint.getY() == dstPoint.getY()) ? 0
-                        : (srcPoint.getY() > dstPoint.getY()) ? -1 : 1;
-                    
-                    // Painting the whole screen once to get rid of
-                    // disposed dialog-boxes.
-                    gui.paintImmediatelyCanvasInItsBounds();
-                    
-                    int dropFrames = 0;
-                    Point point = srcPoint;
-                    while (!point.equals(dstPoint)) {
-                        long time = System.currentTimeMillis();
-                        
-                        point.x += stepX * xratio * movementRatio;
-                        point.y += stepY * movementRatio;
-                        if ((stepX < 0 && point.x < dstPoint.x)
-                            || (stepX > 0 && point.x > dstPoint.x)) {
-                            point.x = dstPoint.x;
-                        }
-                        if ((stepY < 0 && point.y < dstPoint.y)
-                            || (stepY > 0 && point.y > dstPoint.y)) {
-                            point.y = dstPoint.y;
-                        }
-                        if (dropFrames <= 0) {
-                            unitLabel.setLocation(point);
-                            gui.paintImmediatelyCanvasIn(bounds);
+            (JLabel unitLabel) -> {
+                final int labelWidth = unitLabel.getWidth();
+                final int labelHeight = unitLabel.getHeight();
+                final Point srcPoint = gui.calculateUnitLabelPositionInTile(labelWidth, labelHeight, srcP);
+                final Point dstPoint = gui.calculateUnitLabelPositionInTile(labelWidth, labelHeight, dstP);
+                final double xratio = ImageLibrary.TILE_SIZE.width
+                    / (double)ImageLibrary.TILE_SIZE.height;
+                final int stepX = (srcPoint.getX() == dstPoint.getX()) ? 0
+                    : (srcPoint.getX() > dstPoint.getX()) ? -1 : 1;
+                final int stepY = (srcPoint.getY() == dstPoint.getY()) ? 0
+                    : (srcPoint.getY() > dstPoint.getY()) ? -1 : 1;
+
+                // Painting the whole screen once to get rid of
+                // disposed dialog-boxes.
+                gui.paintImmediatelyCanvasInItsBounds();
+
+                int dropFrames = 0;
+                Point point = srcPoint;
+                while (!point.equals(dstPoint)) {
+                    long time = System.currentTimeMillis();
+
+                    point.x += stepX * xratio * movementRatio;
+                    point.y += stepY * movementRatio;
+                    if ((stepX < 0 && point.x < dstPoint.x)
+                        || (stepX > 0 && point.x > dstPoint.x)) {
+                        point.x = dstPoint.x;
+                    }
+                    if ((stepY < 0 && point.y < dstPoint.y)
+                        || (stepY > 0 && point.y > dstPoint.y)) {
+                        point.y = dstPoint.y;
+                    }
+                    if (dropFrames <= 0) {
+                        unitLabel.setLocation(point);
+                        gui.paintImmediatelyCanvasIn(bounds);
                             
-                            int timeTaken = (int)(System.currentTimeMillis()
-                                - time);
-                            final int waitTime = ANIMATION_DELAY - timeTaken;
-                            if (waitTime > 0) {
-                                try {
-                                    Thread.sleep(waitTime);
-                                } catch (InterruptedException ex) {
-                                    //ignore
-                                }
-                                dropFrames = 0;
-                            } else {
-                                dropFrames = timeTaken / ANIMATION_DELAY - 1;
+                        int timeTaken = (int)(System.currentTimeMillis() - time);
+                        final int waitTime = ANIMATION_DELAY - timeTaken;
+                        if (waitTime > 0) {
+                            try {
+                                Thread.sleep(waitTime);
+                            } catch (InterruptedException ex) {
+                                //ignore
                             }
+                            dropFrames = 0;
                         } else {
-                            dropFrames--;
+                            dropFrames = timeTaken / ANIMATION_DELAY - 1;
                         }
+                    } else {
+                            dropFrames--;
                     }
                 }
             });

From ba359a4cc652e018b1666553017d8c59a8945cf0 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 10 Sep 2015 10:32:24 +0930
Subject: [PATCH 199/323] Start using Java 8 streams, harmlessly in DebugUtils
 for now.

---
 .../sf/freecol/common/debug/DebugUtils.java   | 176 +++++++++---------
 1 file changed, 85 insertions(+), 91 deletions(-)

diff --git a/src/net/sf/freecol/common/debug/DebugUtils.java b/src/net/sf/freecol/common/debug/DebugUtils.java
index f6e8415d3..82e6a2ac6 100644
--- a/src/net/sf/freecol/common/debug/DebugUtils.java
+++ b/src/net/sf/freecol/common/debug/DebugUtils.java
@@ -20,11 +20,13 @@
 package net.sf.freecol.common.debug;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -115,15 +117,14 @@ public class DebugUtils {
         final GUI gui = freeColClient.getGUI();
         final Player player = freeColClient.getMyPlayer();
 
-        List<ChoiceItem<BuildingType>> buildings = new ArrayList<>();
-        for (BuildingType b : game.getSpecification().getBuildingTypeList()) {
-            String msg = Messages.getName(b);
-            buildings.add(new ChoiceItem<>(msg, b));
-        }
-        Collections.sort(buildings);
-
-        BuildingType buildingType
-            = gui.getChoice(true, null, buildingTitle, "cancel", buildings);
+        BuildingType buildingType = gui.getChoice(true, null, buildingTitle,
+            "cancel",
+            game.getSpecification().getBuildingTypeList().stream()
+                .map(bt -> {
+                        String msg = Messages.getName(bt);
+                        return new ChoiceItem<BuildingType>(msg, bt);
+                    })
+                .sorted().collect(Collectors.toList()));
         if (buildingType == null) return;
 
         final Game sGame = server.getGame();
@@ -173,17 +174,15 @@ public class DebugUtils {
         final Player sPlayer = sGame.getFreeColGameObject(player.getId(),
                                                           Player.class);
 
-        List<ChoiceItem<FoundingFather>> fathers = new ArrayList<>();
-        for (FoundingFather father : sSpec.getFoundingFathers()) {
-            if (!sPlayer.hasFather(father)) {
-                String msg = Messages.getName(father);
-                fathers.add(new ChoiceItem<>(msg, father));
-            }
-        }
-        Collections.sort(fathers);
-
         FoundingFather father = gui.getChoice(true, null, fatherTitle,
-                                              "cancel", fathers);
+            "cancel",
+            sSpec.getFoundingFathers().stream()
+                .filter(f -> !sPlayer.hasFather(f))
+                .map(f -> {
+                        String msg = Messages.getName(f);
+                        return new ChoiceItem<FoundingFather>(msg, f);
+                    })
+                .sorted().collect(Collectors.toList()));
         if (father != null) {
             server.getInGameController()
                 .addFoundingFather((ServerPlayer)sPlayer, father);
@@ -319,26 +318,22 @@ public class DebugUtils {
         final Tile sTile = sGame.getFreeColGameObject(tile.getId(), Tile.class);
         final GUI gui = freeColClient.getGUI();
 
-        List<ChoiceItem<UnitType>> uts = new ArrayList<>();
-        for (UnitType t : sSpec.getUnitTypeList()) {
-            String msg = Messages.getName(t);
-            uts.add(new ChoiceItem<>(msg, t));
-        }
-        Collections.sort(uts);
         UnitType unitChoice = gui.getChoice(true, null,
-            StringTemplate.template("prompt.selectUnitType"),
-            "cancel", uts);
+            StringTemplate.template("prompt.selectUnitType"), "cancel",
+            sSpec.getUnitTypeList().stream()
+                .map(ut -> {
+                        String msg = Messages.getName(ut);
+                        return new ChoiceItem<UnitType>(msg, ut);
+                    })
+                .sorted().collect(Collectors.toList()));
         if (unitChoice == null) return;
 
         Unit carrier = null, sCarrier = null;
         if (!sTile.isLand() && !unitChoice.isNaval()) {
-            for (Unit u : sTile.getUnitList()) {
-                if (u.isNaval()
-                    && u.getSpaceLeft() >= unitChoice.getSpaceTaken()) {
-                    sCarrier = u;
-                    break;
-                }
-            }
+            sCarrier = sTile.getUnitList().stream()
+                .filter(u -> u.isNaval()
+                    && u.getSpaceLeft() >= unitChoice.getSpaceTaken())
+                .findFirst().orElse(null);
         }
         Location loc = (sCarrier != null) ? sCarrier : sTile;
         ServerUnit sUnit = new ServerUnit(sGame, loc, sPlayer,
@@ -382,7 +377,14 @@ public class DebugUtils {
         Collections.sort(gtl);
         GoodsType goodsType = gui.getChoice(true, null,
             StringTemplate.template("prompt.selectGoodsType"),
-            "cancel", gtl);
+            "cancel",
+            sSpec.getGoodsTypeList().stream()
+            .filter(gt -> !gt.isFoodType() || gt == sSpec.getPrimaryFoodType())
+            .map(gt -> {
+                    String msg = Messages.getName(gt);
+                    return new ChoiceItem<GoodsType>(msg, gt);
+                })
+            .sorted().collect(Collectors.toList()));
         if (goodsType == null) return;
 
         String amount = gui.getInput(true, null,
@@ -422,16 +424,15 @@ public class DebugUtils {
                 .addName("%colony%", colony.getName()));
             return;
         }
-        List<ChoiceItem<Disaster>> choices = new ArrayList<>();
-        for (RandomChoice<Disaster> rc : disasters) {
-            String label = Messages.getName(rc.getObject())
-                + " " + Integer.toString(rc.getProbability());
-            choices.add(new ChoiceItem<>(label, rc.getObject()));
-        }
-        Collections.sort(choices);
         Disaster disaster = gui.getChoice(true, null,
-            StringTemplate.template("prompt.selectDisaster"),
-            "cancel", choices);
+            StringTemplate.template("prompt.selectDisaster"), "cancel",
+            disasters.stream()
+                .map(rc -> {
+                        String label = Messages.getName(rc.getObject())
+                            + " " + Integer.toString(rc.getProbability());
+                        return new ChoiceItem<Disaster>(label, rc.getObject());
+                    })
+                .sorted().collect(Collectors.toList()));
         if (disaster == null) return;
 
         final FreeColServer server = freeColClient.getFreeColServer();
@@ -467,15 +468,14 @@ public class DebugUtils {
         final GUI gui = freeColClient.getGUI();
         final Game game = freeColClient.getGame();
 
-        List<ChoiceItem<Player>> pcs = new ArrayList<>();
-        for (Player p : game.getLiveEuropeanPlayers(colony.getOwner())) {
-            String msg = Messages.message(p.getCountryLabel());
-            pcs.add(new ChoiceItem<>(msg, p));
-        }
-        Collections.sort(pcs);
         Player player = gui.getChoice(true, null,
-            StringTemplate.template("prompt.selectOwner"),
-            "cancel", pcs);
+            StringTemplate.template("prompt.selectOwner"), "cancel",
+            game.getLiveEuropeanPlayers(colony.getOwner()).stream()
+                .map(p -> {
+                        String msg = Messages.message(p.getCountryLabel());
+                        return new ChoiceItem<Player>(msg, p);
+                    })
+                .sorted().collect(Collectors.toList()));
         if (player == null) return;
 
         ServerPlayer sPlayer = sGame.getFreeColGameObject(player.getId(),
@@ -505,17 +505,15 @@ public class DebugUtils {
         final GUI gui = freeColClient.getGUI();
         final Game game = unit.getGame();
 
-        List<ChoiceItem<Player>> pcs = new ArrayList<>();
-        for (Player p : game.getLivePlayers(null)) {
-            if (unit.getType().isAvailableTo(p)) {
-                String msg = Messages.message(p.getCountryLabel());
-                pcs.add(new ChoiceItem<>(msg, p));
-            }
-        }
-        Collections.sort(pcs);
         Player player = gui.getChoice(true, null,
-            StringTemplate.template("prompt.selectOwner"),
-            "cancel", pcs);
+            StringTemplate.template("prompt.selectOwner"), "cancel",
+            game.getLivePlayers(null).stream()
+            .filter(p -> unit.getType().isAvailableTo(p))
+            .map(p -> {
+                    String msg = Messages.message(p.getCountryLabel());
+                    return new ChoiceItem<Player>(msg, p);
+                })
+            .sorted().collect(Collectors.toList()));
         if (player == null || unit.getOwner() == player) return;
 
         final Game sGame = server.getGame();
@@ -550,14 +548,11 @@ public class DebugUtils {
         final Unit sUnit = sGame.getFreeColGameObject(unit.getId(), Unit.class);
         final GUI gui = freeColClient.getGUI();
 
-        List<ChoiceItem<Role>> rcs = new ArrayList<>();
-        for (Role role : sGame.getSpecification().getRoles()) {
-            rcs.add(new ChoiceItem<>(role.getId(), role));
-        }
-        Collections.sort(rcs);
         Role roleChoice = gui.getChoice(true, null,
-            StringTemplate.template("prompt.selectRole"),
-            "cancel", rcs);
+            StringTemplate.template("prompt.selectRole"), "cancel",
+            sGame.getSpecification().getRoles().stream()
+                .map(r -> new ChoiceItem<Role>(r.getId(), r))
+                .sorted().collect(Collectors.toList()));
         if (roleChoice == null) return;
 
         sUnit.changeRole(roleChoice, roleChoice.getMaximumCount());
@@ -943,16 +938,15 @@ public class DebugUtils {
     public static void setColonyGoods(final FreeColClient freeColClient,
                                       final Colony colony) {
         final Specification spec = colony.getSpecification();
-        List<ChoiceItem<GoodsType>> gtl = new ArrayList<>();
-        for (GoodsType t : spec.getGoodsTypeList()) {
-            if (t.isFoodType() && t != spec.getPrimaryFoodType()) continue;
-            String msg = Messages.getName(t);
-            gtl.add(new ChoiceItem<>(msg, t));
-        }
-        Collections.sort(gtl);
         GoodsType goodsType = freeColClient.getGUI().getChoice(true, null,
-            StringTemplate.template("prompt.selectGoodsType"),
-            "cancel", gtl);
+            StringTemplate.template("prompt.selectGoodsType"), "cancel",
+            spec.getGoodsTypeList().stream()
+                .filter(gt -> !gt.isFoodType() || gt == spec.getPrimaryFoodType())
+                .map(gt -> {
+                        String msg = Messages.getName(gt);
+                        return new ChoiceItem<GoodsType>(msg, gt);
+                    })
+                .sorted().collect(Collectors.toList()));
         if (goodsType == null) return;
 
         String response = freeColClient.getGUI().getInput(true, null,
@@ -995,13 +989,13 @@ public class DebugUtils {
             ServerPlayer.class);
         final GUI gui = freeColClient.getGUI();
 
-        List<ChoiceItem<MonarchAction>> actions = new ArrayList<>();
-        for (MonarchAction action : MonarchAction.values()) {
-            actions.add(new ChoiceItem<>(action));
-        }
-        Collections.sort(actions);
         MonarchAction action = gui.getChoice(true, null, monarchTitle,
-                                             "cancel", actions);
+            "cancel",
+            Arrays.stream(MonarchAction.values())
+                .map(a -> new ChoiceItem<MonarchAction>(a))
+                .sorted().collect(Collectors.toList()));
+        if (action == null) return;
+        
         server.getInGameController().setMonarchAction(sPlayer, action);
     }
 
@@ -1020,15 +1014,15 @@ public class DebugUtils {
         final Tile sTile = sGame.getFreeColGameObject(tile.getId(),
                                                       Tile.class);
 
-        List<ChoiceItem<RumourType>> rumours = new ArrayList<>();
-        for (RumourType rumour : RumourType.values()) {
-            if (rumour == RumourType.NO_SUCH_RUMOUR) continue;
-            rumours.add(new ChoiceItem<>(rumour.toString(), rumour));
-        }
-        Collections.sort(rumours);
         RumourType rumourChoice = freeColClient.getGUI().getChoice(true, null,
             StringTemplate.template("prompt.selectLostCityRumour"),
-            "cancel", rumours);
+            "cancel",
+            Arrays.stream(RumourType.values())
+                .filter(r -> r != RumourType.NO_SUCH_RUMOUR)
+                .map(r -> new ChoiceItem<RumourType>(r.toString(), r))
+                .sorted().collect(Collectors.toList()));
+        if (rumourChoice == null) return;
+
         tile.getTileItemContainer().getLostCityRumour().setType(rumourChoice);
         sTile.getTileItemContainer().getLostCityRumour()
             .setType(rumourChoice);

From ab20bfefbdad50ea0504ecb3128b9dfffed75d79 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 11 Sep 2015 12:59:57 +0930
Subject: [PATCH 200/323] Fix movement crash.

---
 src/net/sf/freecol/client/control/InGameController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index fafb8be85..3ef504547 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -3928,7 +3928,8 @@ public final class InGameController implements NetworkConstants {
         if (ret) {
             if (colonyWas != null) colonyWas.fireChanges();
             updateGUI(null);
-            if (!unit.couldMove()) { // Show colony panel if unit out of moves
+            if (!unit.couldMove() && unit.hasTile()) {
+                // Show colony panel if unit out of moves
                 Colony colony = unit.getTile().getColony();
                 if (colony != null) colonyPanel(colony, unit);
             }

From 7b29dd1cf6ee2e414f049b858d49f5280e06f901 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 11 Sep 2015 13:00:39 +0930
Subject: [PATCH 201/323] Ensure high seas units do not get stuck, BR#2910.

---
 src/net/sf/freecol/server/model/ServerUnit.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/server/model/ServerUnit.java b/src/net/sf/freecol/server/model/ServerUnit.java
index 8cbb38504..d8d8ffc83 100644
--- a/src/net/sf/freecol/server/model/ServerUnit.java
+++ b/src/net/sf/freecol/server/model/ServerUnit.java
@@ -324,7 +324,7 @@ public class ServerUnit extends Unit implements ServerModelObject {
             unitDirty = true;
         }
 
-        if (getWorkLeft() == 0) {
+        if (getWorkLeft() <= 0) {
             setWorkLeft(-1);
             unitDirty = true;
             if (getLocation() instanceof HighSeas) {

From d0ab24a8bfbaf8cd9daa4d02f55f3d659550c6b1 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 12 Sep 2015 09:59:38 +0930
Subject: [PATCH 202/323] Improve debug message.

---
 src/net/sf/freecol/server/model/ServerPlayer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/server/model/ServerPlayer.java b/src/net/sf/freecol/server/model/ServerPlayer.java
index e602f14ea..e6f33e144 100644
--- a/src/net/sf/freecol/server/model/ServerPlayer.java
+++ b/src/net/sf/freecol/server/model/ServerPlayer.java
@@ -783,7 +783,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
         // Select one from each father type
         List<FoundingFather> randomFathers = new ArrayList<>();
         LogBuilder lb = new LogBuilder(64);
-        lb.add("Random fathers");
+        lb.add("Random fathers for ", getDebugName());
         for (FoundingFatherType type : FoundingFatherType.values()) {
             List<RandomChoice<FoundingFather>> rc = choices.get(type);
             if (rc != null) {

From 1c8342908eb6b3aac59b872ea85b46cafc793fc2 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 12 Sep 2015 10:05:38 +0930
Subject: [PATCH 203/323] Further improvement to unit end-of-turn processing,
 BR#2915.

---
 .../sf/freecol/server/model/ServerUnit.java   | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/net/sf/freecol/server/model/ServerUnit.java b/src/net/sf/freecol/server/model/ServerUnit.java
index d8d8ffc83..d10900fdc 100644
--- a/src/net/sf/freecol/server/model/ServerUnit.java
+++ b/src/net/sf/freecol/server/model/ServerUnit.java
@@ -325,11 +325,9 @@ public class ServerUnit extends Unit implements ServerModelObject {
         }
 
         if (getWorkLeft() <= 0) {
-            setWorkLeft(-1);
-            unitDirty = true;
             if (getLocation() instanceof HighSeas) {
-                Europe europe = owner.getEurope();
-                Location dst = getDestination();
+                final Europe europe = owner.getEurope();
+                final Location dst = getDestination();
                 Location result = resolveDestination();
                 if (result == europe) {
                     lb.add(" arrives in Europe");
@@ -345,29 +343,38 @@ public class ServerUnit extends Unit implements ServerModelObject {
                     setLocation(europe);//-vis: safe/Europe
                     cs.add(See.only(owner), owner.getHighSeas());
                     locDirty = true;
-                } else if (result instanceof Tile) {
-                    Tile tile = ((Tile)result).getSafeTile(owner, random);
+                } else {
+                    if (!(result instanceof Tile)) {
+                        logger.warning("Unit has unsupported destination: "
+                            + dst + " -> " + result);
+                        result = getEntryLocation().getTile();
+                    }
+                    Tile tile = result.getTile().getSafeTile(owner, random);
                     lb.add(" arrives in America at ", tile);
-                    if (dst != null) lb.add(" sailing for ", dst);
-                    if (dst instanceof Map) setDestination(null);
+                    if (dst != null) {
+                        lb.add(" sailing for ", dst);
+                        if (dst instanceof Map) setDestination(null);
+                    }
                     csMove(tile, random, cs);
                     locDirty = unitDirty = false; // loc update present
-                } else {
-                    lb.add(" has unsupported destination ", getDestination());
                 }
             } else {
                 switch (getState()) {
-                case FORTIFYING:
-                    setState(UnitState.FORTIFIED);
-                    break;
+                case ACTIVE: case FORTIFIED: case SENTRY: case IN_COLONY:
+                    break; // These states are stable
                 case IMPROVING:
                     csImproveTile(random, cs);
                     setWorkImprovement(null);
                     locDirty = true;
                     break;
-                default:
-                    lb.add(" unknown work completed, state=", getState());
+                case FORTIFYING:
+                    setState(UnitState.FORTIFIED);
+                    unitDirty = true;
+                    break;
+                case SKIPPED: default:
+                    lb.add(" work completed, bad state: ", getState());
                     setState(UnitState.ACTIVE);
+                    unitDirty = true;
                     break;
                 }
             }

From 481d0bb5d451f398549e7b5e4f31d4a9254d4a79 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 12 Sep 2015 11:51:35 +0930
Subject: [PATCH 204/323] Improve message for recovered crash currently being
 seen in testing.

---
 src/net/sf/freecol/common/networking/ReceivingThread.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/common/networking/ReceivingThread.java b/src/net/sf/freecol/common/networking/ReceivingThread.java
index 738917428..d7d60b056 100644
--- a/src/net/sf/freecol/common/networking/ReceivingThread.java
+++ b/src/net/sf/freecol/common/networking/ReceivingThread.java
@@ -320,7 +320,7 @@ final class ReceivingThread extends Thread {
                 bis.reset();
                 connection.handleAndSendReply(bis);
             } catch (IOException ioe) {
-                logger.log(Level.WARNING, "IO error", ioe);
+                logger.log(Level.WARNING, "IO error for " + tag, ioe);
             }
         }
 

From 9d387ba61d8d489a37f2e80a648e23239480b79c Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 12 Sep 2015 14:09:17 +0930
Subject: [PATCH 205/323] float -> double in defence calculations.

---
 src/net/sf/freecol/common/model/Colony.java           | 8 ++++----
 src/net/sf/freecol/common/model/IndianSettlement.java | 4 ++--
 src/net/sf/freecol/common/model/Settlement.java       | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 3423202d1..f1999f7ae 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -1652,9 +1652,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      *
      * @return The total defence power.
      */
-    public float getTotalDefencePower() {
+    public double getTotalDefencePower() {
         CombatModel cm = getGame().getCombatModel();
-        float defence = 0.0f;
+        double defence = 0.0;
         for (Unit unit : getTile().getUnitList()) {
             if (unit.isDefensiveUnit()) {
                 defence += cm.getDefencePower(null, unit);
@@ -2711,7 +2711,7 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * {@inheritDoc}
      */
     @Override
-    public float getDefenceRatio() {
+    public double getDefenceRatio() {
         return getTotalDefencePower() / (1 + getUnitCount());
     }
 
@@ -2720,7 +2720,7 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     @Override
     public boolean isBadlyDefended() {
-        return getTotalDefencePower() < 0.95f * getUnitCount() - 2.5f;
+        return getTotalDefencePower() < 0.95 * getUnitCount() - 2.5;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/IndianSettlement.java b/src/net/sf/freecol/common/model/IndianSettlement.java
index 11fb0d10f..520f92ec3 100644
--- a/src/net/sf/freecol/common/model/IndianSettlement.java
+++ b/src/net/sf/freecol/common/model/IndianSettlement.java
@@ -1206,8 +1206,8 @@ public class IndianSettlement extends Settlement implements TradeLocation {
      * {@inheritDoc}
      */
     @Override
-    public float getDefenceRatio() {
-        return getUnitCount() * 2.0f / (getType().getMinimumSize()
+    public double getDefenceRatio() {
+        return getUnitCount() * 2.0 / (getType().getMinimumSize()
             + getType().getMaximumSize());
     }
 
diff --git a/src/net/sf/freecol/common/model/Settlement.java b/src/net/sf/freecol/common/model/Settlement.java
index a5eb7fdbc..bee579337 100644
--- a/src/net/sf/freecol/common/model/Settlement.java
+++ b/src/net/sf/freecol/common/model/Settlement.java
@@ -634,7 +634,7 @@ public abstract class Settlement extends GoodsLocation
      *
      * @return A ratio of defence power to settlement size.
      */
-    public abstract float getDefenceRatio();
+    public abstract double getDefenceRatio();
 
     /**
      * Is this settlement insufficiently defended?

From 943f1902136d9c6aa77e4c11c28a4cc732a41953 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 12 Sep 2015 19:34:54 +0930
Subject: [PATCH 206/323] Move destroyBuilding to server.

---
 src/net/sf/freecol/common/model/Colony.java     | 17 -----------------
 .../sf/freecol/server/model/ServerColony.java   | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index f1999f7ae..375ef6604 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -580,23 +580,6 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
         return true;
     }
 
-    /**
-     * Destroy an existing building in this colony.
-     *
-     * @param building The <code>Building</code> to destroy.
-     * @return True if the building was destroyed.
-     */
-    public boolean destroyBuilding(Building building) {
-        Tile copied = (building.getType().isDefenceType())
-            ? getTile().getTileToCache() : null;
-        if (!removeBuilding(building)) return false;
-        getTile().cacheUnseen(copied);
-        invalidateCache();
-        checkBuildQueueIntegrity(true);
-        return true;
-    }
-
-
     /**
      * Gets a building for producing a given type of goods.
      * 
diff --git a/src/net/sf/freecol/server/model/ServerColony.java b/src/net/sf/freecol/server/model/ServerColony.java
index 57de3ab19..6bf558912 100644
--- a/src/net/sf/freecol/server/model/ServerColony.java
+++ b/src/net/sf/freecol/server/model/ServerColony.java
@@ -840,6 +840,22 @@ public class ServerColony extends Colony implements ServerModelObject {
         }
     }
 
+    /**
+     * Destroy an existing building in this colony.
+     *
+     * @param building The <code>Building</code> to destroy.
+     * @return True if the building was destroyed.
+     */
+    public boolean destroyBuilding(Building building) {
+        Tile copied = (building.getType().isDefenceType())
+            ? getTile().getTileToCache() : null;
+        if (!removeBuilding(building)) return false;
+        getTile().cacheUnseen(copied);
+        invalidateCache();
+        checkBuildQueueIntegrity(true);
+        return true;
+    }
+
 
     // Serialization
 

From b77033d8ee374eb5c554be19c0ee1d20a6e2b182 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 12 Sep 2015 20:08:31 +0200
Subject: [PATCH 207/323] Improve constructor of InGameMenuBar

---
 src/net/sf/freecol/client/gui/Canvas.java             |  4 +++-
 src/net/sf/freecol/client/gui/menu/InGameMenuBar.java | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 6c7e53701..19cef3c3d 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -66,6 +66,7 @@ import net.sf.freecol.client.gui.action.FreeColAction;
 import net.sf.freecol.client.gui.menu.FreeColMenuBar;
 import net.sf.freecol.client.gui.menu.InGameMenuBar;
 import net.sf.freecol.client.gui.menu.MapEditorMenuBar;
+import net.sf.freecol.client.gui.menu.MenuMouseMotionListener;
 import net.sf.freecol.client.gui.panel.*;
 import net.sf.freecol.client.gui.panel.LabourData.UnitData;
 import net.sf.freecol.common.ServerInfo;
@@ -358,7 +359,8 @@ public final class Canvas extends JDesktopPane {
     void initializeInGame() {
         if (frame == null) return;
 
-        frame.setJMenuBar(new InGameMenuBar(freeColClient, this));
+        frame.setJMenuBar(new InGameMenuBar(freeColClient,
+            new MenuMouseMotionListener(freeColClient, this)));
         frame.paintAll(getGraphics());
     }
 
diff --git a/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java b/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
index 0b6344501..8faaf69fb 100644
--- a/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
@@ -23,6 +23,7 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseMotionListener;
 import java.awt.geom.Rectangle2D;
 import java.util.logging.Logger;
 
@@ -30,7 +31,6 @@ import javax.swing.ButtonGroup;
 import javax.swing.JMenu;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.Canvas;
 import net.sf.freecol.client.gui.action.*;
 import net.sf.freecol.client.gui.action.DisplayTileTextAction.DisplayText;
 import net.sf.freecol.client.gui.panel.Utility;
@@ -60,9 +60,10 @@ public class InGameMenuBar extends FreeColMenuBar {
      * Creates a new <code>FreeColMenuBar</code>. This menu bar will include
      * all of the submenus and items.
      *
-     * @param f The main controller.
+     * @param freeColClient The main controller.
+     * @param listener An optional mouse motion listener.
      */
-    public InGameMenuBar(FreeColClient f, Canvas canvas) {
+    public InGameMenuBar(FreeColClient freeColClient, MouseMotionListener listener) {
         // FIXME: FreeColClient should not have to be passed in to
         // this class.  This is only a menu bar, it doesn't need a
         // reference to the main controller.  The only reason it has
@@ -78,11 +79,11 @@ public class InGameMenuBar extends FreeColMenuBar {
         // Okay, I lied.. the update() and paintComponent() methods in
         // this MenuBar use freeColClient, too. But so what.  Move
         // those to another class too. :)
-        super(f);
+        super(freeColClient);
 
         // Add a mouse listener so that autoscrolling can happen in
         // this menubar
-        this.addMouseMotionListener(new MenuMouseMotionListener(f, canvas));
+        this.addMouseMotionListener(listener);
         
         reset();
     }

From 798e192234767d0b9be65bb8714de4776e160d87 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 12 Sep 2015 20:15:01 +0200
Subject: [PATCH 208/323] Improve constructor of MapEditorMenuBar

---
 src/net/sf/freecol/client/gui/Canvas.java                | 3 ++-
 src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 19cef3c3d..873473287 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -333,7 +333,8 @@ public final class Canvas extends JDesktopPane {
         // We may need to reset the zoom value to the default value
         gui.resetMapZoom();
 
-        frame.setJMenuBar(new MapEditorMenuBar(freeColClient, this));
+        frame.setJMenuBar(new MapEditorMenuBar(freeColClient,
+            new MenuMouseMotionListener(freeColClient, this)));
         showMapEditorTransformPanel();
 
         CanvasMapEditorMouseListener listener
diff --git a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
index 3dc84af9b..e210f1786 100644
--- a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
@@ -22,6 +22,7 @@ package net.sf.freecol.client.gui.menu;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseMotionListener;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.logging.Logger;
@@ -62,12 +63,13 @@ public class MapEditorMenuBar extends FreeColMenuBar {
      * all of the submenus and items.
      *
      * @param freeColClient The <code>FreeColClient</code> for the game.
+     * @param listener An optional mouse motion listener.
      */
-    public MapEditorMenuBar(final FreeColClient freeColClient, Canvas canvas) {
+    public MapEditorMenuBar(final FreeColClient freeColClient, MouseMotionListener listener) {
         super(freeColClient);
 
         // Add a mouse listener so that autoscrolling can happen in this menubar
-        this.addMouseMotionListener(new MenuMouseMotionListener(freeColClient, canvas));
+        this.addMouseMotionListener(listener);
         reset();
     }
 

From 1412d689b2d366c9e7bbb7a3e7a19d17cf6d3d93 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 12 Sep 2015 20:35:55 +0200
Subject: [PATCH 209/323] Hide Canvas from EuropePanel

---
 src/net/sf/freecol/client/gui/Canvas.java            | 2 +-
 src/net/sf/freecol/client/gui/panel/EuropePanel.java | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 873473287..e60b78a7b 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -1939,7 +1939,7 @@ public final class Canvas extends JDesktopPane {
         if (freeColClient.getGame() == null) return;
         EuropePanel panel = getExistingFreeColPanel(EuropePanel.class);
         if (panel == null) {
-            panel = new EuropePanel(freeColClient, this);
+            panel = new EuropePanel(freeColClient, (getHeight() > 780));
             panel.addClosingCallback(() -> { removeEuropeanSubpanels(); });
             showSubPanel(panel, true);
         }
diff --git a/src/net/sf/freecol/client/gui/panel/EuropePanel.java b/src/net/sf/freecol/client/gui/panel/EuropePanel.java
index bd3b1af25..63cb727d1 100644
--- a/src/net/sf/freecol/client/gui/panel/EuropePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/EuropePanel.java
@@ -49,7 +49,6 @@ import net.miginfocom.swing.MigLayout;
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.InGameController.BoycottAction;
-import net.sf.freecol.client.gui.Canvas;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Europe;
@@ -567,9 +566,9 @@ public final class EuropePanel extends PortPanel {
      * The constructor for a EuropePanel.
      *
      * @param freeColClient The <code>FreeColClient</code> for the game.
-     * @param canvas The enclosing <code>Canvas</code>.
+     * @param header True when a header should be added.
      */
-    public EuropePanel(FreeColClient freeColClient, Canvas canvas) {
+    public EuropePanel(FreeColClient freeColClient, boolean header) {
         super(freeColClient, new MigLayout("wrap 3, fill",
                                            "[30%:][30%:][15%:]"));
 
@@ -677,7 +676,7 @@ public final class EuropePanel extends PortPanel {
 
         initialize(europe);
 
-        if (canvas.getHeight() > 780) {
+        if(header) {
             add(Utility.localizedHeader(europe.getNameKey(), false),
                 "span, top, center");
         }

From 12d402b7402ff61e99aa5b3461600f0ff6cd9be7 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 12 Sep 2015 21:17:06 +0200
Subject: [PATCH 210/323] Unify land naming methods

---
 .../client/control/InGameController.java      |  3 +-
 src/net/sf/freecol/client/gui/Canvas.java     | 30 ++++---------------
 src/net/sf/freecol/client/gui/GUI.java        |  3 +-
 src/net/sf/freecol/client/gui/SwingGUI.java   |  6 ++--
 4 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 3ef504547..8cdd55364 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -4020,7 +4020,8 @@ public final class InGameController implements NetworkConstants {
      * @param unit The <code>Unit</code> that has landed.
      */
     public void newLandName(String defaultName, Unit unit) {
-        gui.showNameNewLandDialog("newLand.text", defaultName, unit);
+        gui.showNameNewLandDialog(StringTemplate.key("newLand.text"),
+                                  defaultName, unit);
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index e60b78a7b..9a9b21412 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -2248,36 +2248,16 @@ public final class Canvas extends JDesktopPane {
     }
 
     /**
-     * Display a dialog to set a new land name.
-     *
-     * @param key A key for the message to explain the dialog.
-     * @param defaultName The default name for the new land.
-     * @param unit The <code>Unit</code> discovering the new land.
-     * @param handler A <code>DialogHandler</code> for the dialog response.
-     */
-    void showNameNewLandDialog(String key, String defaultName,
-                                      Unit unit,
-                                      DialogHandler<String> handler) {
-        SwingUtilities.invokeLater(
-            new DialogCallback<>(
-                new FreeColStringInputDialog(freeColClient, frame, false,
-                                             Messages.message(key),
-                                             defaultName, "ok", null),
-                unit.getTile(), handler));
-    }
-
-    /**
-     * Display a dialog to set a new region name.
+     * Display a dialog to set a new name for something.
      *
      * @param template A <code>StringTemplate</code> for the message
      *     to explain the dialog.
-     * @param defaultName The default name for the new region.
-     * @param unit The <code>Unit</code> discovering the new region.
+     * @param defaultName The default name.
+     * @param unit The <code>Unit</code> discovering it.
      * @param handler A <code>DialogHandler</code> for the dialog response.
      */
-    void showNameNewRegionDialog(StringTemplate template,
-                                        String defaultName, Unit unit,
-                                        DialogHandler<String> handler) {
+    void showNamingDialog(StringTemplate template, String defaultName,
+                          Unit unit, DialogHandler<String> handler) {
         SwingUtilities.invokeLater(
             new DialogCallback<>(
                 new FreeColStringInputDialog(freeColClient, frame, false,
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 226dde813..714b0a6c8 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -1291,7 +1291,8 @@ public class GUI {
                                   StringTemplate template, String monarchKey) {
     }
 
-    public void showNameNewLandDialog(String key, final String defaultName,
+    public void showNameNewLandDialog(StringTemplate template,
+                                      final String defaultName,
                                       final Unit unit) {
     }
 
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 4e3dc8c8f..c54b31054 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1316,9 +1316,9 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public void showNameNewLandDialog(String key, final String defaultName,
+    public void showNameNewLandDialog(StringTemplate template, final String defaultName,
                                       final Unit unit) {
-        canvas.showNameNewLandDialog(key, defaultName, unit,
+        canvas.showNamingDialog(template, defaultName, unit,
             new DialogHandler<String>() {
                 @Override
                 public void handle(String name) {
@@ -1333,7 +1333,7 @@ public class SwingGUI extends GUI {
                                         final String defaultName,
                                         final Unit unit, final Tile tile,
                                         final Region region) {
-        canvas.showNameNewRegionDialog(template, defaultName, unit,
+        canvas.showNamingDialog(template, defaultName, unit,
             new DialogHandler<String>() {
                 @Override
                 public void handle(String name) {

From 88416bc5c98556165a25a7baf666c4d8fce6f51c Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 12 Sep 2015 14:18:27 +0930
Subject: [PATCH 211/323] Java8 stream/mapTo*/sum simplifications.

---
 src/net/sf/freecol/client/gui/TilePopup.java  |  7 +--
 .../gui/panel/ReportClassicColonyPanel.java   |  7 +--
 .../panel/ReportContinentalCongressPanel.java |  6 +-
 .../sf/freecol/common/model/AbstractUnit.java |  4 +-
 src/net/sf/freecol/common/model/Building.java | 14 ++---
 src/net/sf/freecol/common/model/Colony.java   | 63 +++++++------------
 .../sf/freecol/common/model/ColonyTile.java   | 21 +++----
 .../freecol/common/model/GoodsContainer.java  | 13 ++--
 src/net/sf/freecol/common/model/Monarch.java  |  6 +-
 src/net/sf/freecol/common/model/Player.java   | 33 ++++------
 .../sf/freecol/common/model/Settlement.java   | 17 ++---
 src/net/sf/freecol/common/model/Unit.java     |  8 +--
 .../sf/freecol/common/model/UnitLocation.java | 13 ++--
 .../sf/freecol/common/model/WorkLocation.java |  5 +-
 .../sf/freecol/common/util/RandomChoice.java  |  6 +-
 src/net/sf/freecol/server/ai/AIColony.java    | 13 ++--
 src/net/sf/freecol/server/ai/Cargo.java       |  2 +-
 src/net/sf/freecol/server/ai/ColonyPlan.java  | 19 ++----
 .../freecol/server/ai/EuropeanAIPlayer.java   | 13 ++--
 src/net/sf/freecol/server/ai/REFAIPlayer.java |  5 +-
 .../server/generator/TerrainGenerator.java    |  7 +--
 .../sf/freecol/server/model/ServerPlayer.java | 29 +++------
 22 files changed, 103 insertions(+), 208 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/TilePopup.java b/src/net/sf/freecol/client/gui/TilePopup.java
index 7f12c43da..0aeef8bb7 100644
--- a/src/net/sf/freecol/client/gui/TilePopup.java
+++ b/src/net/sf/freecol/client/gui/TilePopup.java
@@ -412,17 +412,14 @@ public final class TilePopup extends JPopupMenu {
         menuItem.addActionListener((ActionEvent ae) -> {
                 gui.setActiveUnit(unit);
             });
-        int lineCount = 1;
         if (indent) {
             menuItem.setFont(menuItem.getFont().deriveFont(Font.ITALIC));
         }
         menuItem.setEnabled(enabled);
         menu.add(menuItem);
 
-        for (Unit passenger : unit.getUnitList()) {
-            lineCount += addUnit(menu, passenger, true, true);
-        }
-
+        int lineCount = 1 + unit.getUnitList().stream()
+            .mapToInt(u -> addUnit(menu, u, true, true)).sum();
         boolean hasGoods = false;
         for (Goods goods: unit.getGoodsList()) {
             text = (indent ? "         " : "     ")
diff --git a/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
index 9df44b8b6..243d6a1f1 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
@@ -136,11 +136,8 @@ public final class ReportClassicColonyPanel extends ReportPanel
                 int newValue = colony.getNetProductionOf(gt);
                 int stockValue = colony.getGoodsCount(gt);
                 if (newValue != 0 || stockValue > 0) {
-                    int maxProduction = 0;
-                    for (WorkLocation wl
-                             : colony.getWorkLocationsForProducing(gt)) {
-                        maxProduction += wl.getMaximumProductionOf(gt);
-                    }
+                    int maxProduction = colony.getWorkLocationsForProducing(gt).stream()
+                        .mapToInt(wl -> wl.getMaximumProductionOf(gt)).sum();
                     ProductionLabel productionLabel
                         = new ProductionLabel(getFreeColClient(),
                             new AbstractGoods(gt, newValue),
diff --git a/src/net/sf/freecol/client/gui/panel/ReportContinentalCongressPanel.java b/src/net/sf/freecol/client/gui/panel/ReportContinentalCongressPanel.java
index d9fe12fde..d7231e8dc 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportContinentalCongressPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportContinentalCongressPanel.java
@@ -84,10 +84,8 @@ public final class ReportContinentalCongressPanel extends ReportPanel {
                 Messages.getDescription(currentFather));
             recruitingPanel.add(currentFatherLabel);
             for (GoodsType gt : getSpecification().getLibertyGoodsTypeList()) {
-                int total = 0;
-                for (Colony colony : player.getColonies()) {
-                    total += colony.getNetProductionOf(gt);
-                }
+                int total = player.getColonies().stream()
+                    .mapToInt(c -> c.getNetProductionOf(gt)).sum();
                 FreeColProgressBar progressBar = new FreeColProgressBar(gt, 0,
                     player.getTotalFoundingFatherCost(), player.getLiberty(),
                     total);
diff --git a/src/net/sf/freecol/common/model/AbstractUnit.java b/src/net/sf/freecol/common/model/AbstractUnit.java
index d0a489a71..bceeb4c5c 100644
--- a/src/net/sf/freecol/common/model/AbstractUnit.java
+++ b/src/net/sf/freecol/common/model/AbstractUnit.java
@@ -182,9 +182,7 @@ public class AbstractUnit extends FreeColObject {
      */
     public static double calculateStrength(Specification spec,
                                            List<AbstractUnit> units) { 
-        float result = 0;
-        for (AbstractUnit au : units) result += au.getOffence(spec);
-        return result;
+        return units.stream().mapToDouble(au -> au.getOffence(spec)).sum();
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Building.java b/src/net/sf/freecol/common/model/Building.java
index c2849e963..7ca93b8bd 100644
--- a/src/net/sf/freecol/common/model/Building.java
+++ b/src/net/sf/freecol/common/model/Building.java
@@ -263,10 +263,8 @@ public class Building extends WorkLocation
         } else {
             for (AbstractGoods output : getOutputs()) {
                 final GoodsType goodsType = output.getType();
-                float production = 0f;
-                for (Unit u : getUnitList()) {
-                    production += getUnitProduction(u, goodsType);
-                }
+                float production = getUnitList().stream()
+                    .mapToInt(u -> getUnitProduction(u, goodsType)).sum();
                 // Unattended production always applies for buildings!
                 production += getBaseProduction(null, goodsType, null);
                 production = applyModifiers(production, turn,
@@ -368,11 +366,9 @@ public class Building extends WorkLocation
      */
     @Override
     public int evaluateFor(Player player) {
-        int result = 0;
-        for (AbstractGoods ag : getType().getRequiredGoods()) {
-            result += ag.evaluateFor(player);
-        }
-        return result + super.evaluateFor(player);
+        return super.evaluateFor(player)
+            + getType().getRequiredGoods().stream()
+                .mapToInt(ag -> ag.evaluateFor(player)).sum();
     }
         
 
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 375ef6604..eea270fc2 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -1058,16 +1058,10 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     public int priceGoodsForBuilding(List<AbstractGoods> required) {
         final Market market = getOwner().getMarket();
-        int price = 0;
-        for (AbstractGoods ag : required) {
-            final GoodsType goodsType = ag.getType();
-            final int amount = ag.getAmount();
-            // FIXME: magic number!
-            price += (goodsType.isStorable())
-                ? (market.getBidPrice(goodsType, amount) * 110) / 100
-                : goodsType.getPrice() * amount;
-        }
-        return price;
+        // FIXME: magic number!
+        return required.stream().mapToInt(ag -> (ag.getType().isStorable())
+            ? (market.getBidPrice(ag.getType(), ag.getAmount()) * 110) / 100
+            : ag.getType().getPrice() * ag.getAmount()).sum();
     }
 
     /**
@@ -1745,20 +1739,17 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
             && player.getNumberOfSettlements() < 5) {// FIXME: magic#
             return Integer.MIN_VALUE;
         }
-        int result = 0;
+        int result;
         if (player.owns(this)) {
-            for (WorkLocation wl : getAvailableWorkLocations()) {
-                result += wl.evaluateFor(player);
-            }
-            for (Unit u : getTile().getUnitList()) {
-                result += u.evaluateFor(player);
-            }
-            for (Goods g : getCompactGoods()) {
-                result += g.evaluateFor(player);
-            }
+            result = getAvailableWorkLocations().stream()
+                    .mapToInt(wl -> wl.evaluateFor(player)).sum()
+                + getTile().getUnitList().stream()
+                    .mapToInt(u -> u.evaluateFor(player)).sum()
+                + getCompactGoods().stream()
+                    .mapToInt(g -> g.evaluateFor(player)).sum();
         } else { // Much guesswork
-            result += getDisplayUnitCount() * 1000;
-            result += 500; // Some useful goods?
+            result = getDisplayUnitCount() * 1000
+                + 500; // Some useful goods?
             for (Tile t : getTile().getSurroundingTiles(1)) {
                 if (t.getOwningSettlement() == this) result += 200;
             }
@@ -1947,11 +1938,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return an <code>int</code> value
      */
     public int getFoodProduction() {
-        int result = 0;
-        for (GoodsType foodType : getSpecification().getFoodGoodsTypeList()) {
-            result += getTotalProductionOf(foodType);
-        }
-        return result;
+        return getSpecification().getFoodGoodsTypeList().stream()
+            .mapToInt(ft -> getTotalProductionOf(ft)).sum();
     }
 
     /**
@@ -2551,11 +2539,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     @Override
     public int getUnitCount() {
-        int n = 0;
-        for (WorkLocation wl : getCurrentWorkLocations()) {
-            n += wl.getUnitCount();
-        }
-        return n;
+        return getCurrentWorkLocations().stream()
+            .mapToInt(wl -> wl.getUnitCount()).sum();
     }
 
     /**
@@ -2732,11 +2717,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     @Override
     public int getUpkeep() {
-        int upkeep = 0;
-        for (Building building : buildingMap.values()) {
-            upkeep += building.getType().getUpkeep();
-        }
-        return upkeep;
+        return buildingMap.values().stream()
+            .mapToInt(b -> b.getType().getUpkeep()).sum();
     }
 
     /**
@@ -2744,11 +2726,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     @Override
     public int getTotalProductionOf(GoodsType goodsType) {
-        int amount = 0;
-        for (WorkLocation workLocation : getCurrentWorkLocations()) {
-            amount += workLocation.getTotalProductionOf(goodsType);
-        }
-        return amount;
+        return getCurrentWorkLocations().stream()
+            .mapToInt(wl -> wl.getTotalProductionOf(goodsType)).sum();
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/ColonyTile.java b/src/net/sf/freecol/common/model/ColonyTile.java
index 3bdbf32d1..c21f4afc6 100644
--- a/src/net/sf/freecol/common/model/ColonyTile.java
+++ b/src/net/sf/freecol/common/model/ColonyTile.java
@@ -173,10 +173,8 @@ public class ColonyTile extends WorkLocation {
         } else {
             for (AbstractGoods output : getOutputs()) {
                 final GoodsType goodsType = output.getType();
-                int amount = 0;
-                for (Unit u : getUnitList()) {
-                    amount += getUnitProduction(u, goodsType);
-                }
+                int amount = getUnitList().stream()
+                    .mapToInt(u -> getUnitProduction(u, goodsType)).sum();
                 if (amount > 0) {
                     pi.addProduction(new AbstractGoods(goodsType, amount));
                 }
@@ -245,11 +243,8 @@ public class ColonyTile extends WorkLocation {
             }
 
             // Tile type stays the same, return the sum of any food bonues.
-            int bonus = 0;
-            for (GoodsType gt : getSpecification().getFoodGoodsTypeList()) {
-                bonus += ti.getBonus(gt);
-            }
-            return bonus;
+            return getSpecification().getFoodGoodsTypeList().stream()
+                .mapToInt(gt -> ti.getBonus(gt)).sum();
         }
 
         // Units are at work here.  Find out what work is being done.
@@ -285,11 +280,9 @@ public class ColonyTile extends WorkLocation {
      */
     @Override
     public int evaluateFor(Player player) {
-        int result = 0;
-        for (AbstractGoods ag :getProductionInfo().getProduction()) {
-            result += ag.evaluateFor(player);
-        }
-        return result + super.evaluateFor(player);
+        return super.evaluateFor(player)
+            + getProductionInfo().getProduction().stream()
+                .mapToInt(ag -> ag.evaluateFor(player)).sum();
     }
 
 
diff --git a/src/net/sf/freecol/common/model/GoodsContainer.java b/src/net/sf/freecol/common/model/GoodsContainer.java
index a4af04796..e8431c74d 100644
--- a/src/net/sf/freecol/common/model/GoodsContainer.java
+++ b/src/net/sf/freecol/common/model/GoodsContainer.java
@@ -347,17 +347,12 @@ public class GoodsContainer extends FreeColGameObject implements Ownable {
      * @return The amount of space taken by this containers goods.
      */
     public int getSpaceTaken() {
-        int count = 0;
         synchronized (storedGoods) {
-            for (Integer amount : storedGoods.values()) {
-                if (amount % CARGO_SIZE == 0) {
-                    count += amount/CARGO_SIZE;
-                } else {
-                    count += amount/CARGO_SIZE + 1;
-                }
-            }
+            return storedGoods.values().stream()
+                .mapToInt(amount -> (amount % CARGO_SIZE == 0)
+                    ? amount/CARGO_SIZE
+                    : amount/CARGO_SIZE + 1).sum();
         }
-        return count;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Monarch.java b/src/net/sf/freecol/common/model/Monarch.java
index 62ab5b727..ca67738e4 100644
--- a/src/net/sf/freecol/common/model/Monarch.java
+++ b/src/net/sf/freecol/common/model/Monarch.java
@@ -116,10 +116,8 @@ public final class Monarch extends FreeColGameObject implements Named {
                     capacity += nu.getType(spec).getSpace() * nu.getNumber();
                 }
             }
-            spaceRequired = 0;
-            for (AbstractUnit lu : landUnits) {
-                spaceRequired += lu.getType(spec).getSpaceTaken() * lu.getNumber();
-            }
+            spaceRequired = landUnits.stream()
+                .mapToInt(lu -> lu.getType(spec).getSpaceTaken() * lu.getNumber()).sum();
         }
 
         /**
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 3efb51d39..618443346 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -1374,9 +1374,8 @@ public class Player extends FreeColGameObject implements Nameable {
             .getImmigrationGoodsTypeList();
         int production = 0;
         for (Colony colony : getColonies()) {
-            for (GoodsType goodsType : immigrationGoodsTypes) {
-                production += colony.getTotalProductionOf(goodsType);
-            }
+            production += immigrationGoodsTypes.stream()
+                .mapToInt(gt -> colony.getTotalProductionOf(gt)).sum();
         }
         Europe europe = getEurope();
         if (europe != null) production += europe.getImmigration(production);
@@ -1464,10 +1463,8 @@ public class Player extends FreeColGameObject implements Nameable {
     public int getLibertyProductionNextTurn() {
         int nextTurn = 0;
         for (Colony colony : getColonies()) {
-            for (GoodsType libertyGoods : getSpecification()
-                     .getLibertyGoodsTypeList()) {
-                nextTurn += colony.getTotalProductionOf(libertyGoods);
-            }
+            nextTurn += getSpecification().getLibertyGoodsTypeList().stream()
+                .mapToInt(gt -> colony.getTotalProductionOf(gt)).sum();
         }
         return (int)applyModifiers((float)nextTurn, getGame().getTurn(),
                                    Modifier.LIBERTY);
@@ -1479,13 +1476,10 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return The total percentage of rebels in all this player's colonies.
      */
     public int getSoL() {
-        int sum = 0;
-        int number = 0;
-        for (Colony c : getColonies()) {
-            sum += c.getSoL();
-            number++;
-        }
-        return (number > 0) ? sum / number : 0;
+        final List<Colony> colonies = getColonies();
+        return (colonies.isEmpty()) ? 0
+            : colonies.stream().mapToInt(c -> c.getSoL()).sum()
+                / colonies.size();
     }
 
     /**
@@ -2373,9 +2367,8 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return The sum of the units currently working in the colonies.
      */
     public int getColoniesPopulation() {
-        int i = 0;
-        for (Colony c : getColonies()) i += c.getUnitCount();
-        return i;
+        return getColonies().stream()
+            .mapToInt(c -> c.getUnitCount()).sum();
     }
 
     /**
@@ -3808,10 +3801,8 @@ public class Player extends FreeColGameObject implements Nameable {
             Specification spec = getSpecification();
             for (UnitType unitType : spec.getUnitTypeList()) {
                 if (unitType.isAvailableTo(this)) {
-                    int foodConsumption = 0;
-                    for (GoodsType foodType : spec.getFoodGoodsTypeList()) {
-                        foodConsumption += unitType.getConsumptionOf(foodType);
-                    }
+                    int foodConsumption = spec.getFoodGoodsTypeList().stream()
+                        .mapToInt(ft -> unitType.getConsumptionOf(ft)).sum();
                     if (foodConsumption > maximumFoodConsumption) {
                         maximumFoodConsumption = foodConsumption;
                     }
diff --git a/src/net/sf/freecol/common/model/Settlement.java b/src/net/sf/freecol/common/model/Settlement.java
index bee579337..7582e9161 100644
--- a/src/net/sf/freecol/common/model/Settlement.java
+++ b/src/net/sf/freecol/common/model/Settlement.java
@@ -329,11 +329,8 @@ public abstract class Settlement extends GoodsLocation
      * @return an <code>int</code> value
      */
     public int getConsumptionOf(GoodsType goodsType) {
-        int result = 0;
-        for (Unit unit : getUnitList()) {
-            result += unit.getType().getConsumptionOf(goodsType);
-        }
-        return Math.max(0, result);
+        return Math.max(0, getUnitList().stream()
+                .mapToInt(u -> u.getType().getConsumptionOf(goodsType)).sum());
     }
 
     /**
@@ -344,13 +341,9 @@ public abstract class Settlement extends GoodsLocation
      * @return an <code>int</code> value
      */
     public int getConsumptionOf(List<GoodsType> goodsTypes) {
-        int result = 0;
-        if (goodsTypes != null) {
-            for (GoodsType goodsType : goodsTypes) {
-                result += getConsumptionOf(goodsType);
-            }
-        }
-        return result;
+        return (goodsTypes == null) ? 0
+            : goodsTypes.stream()
+                .mapToInt(gt -> getConsumptionOf(gt)).sum();
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index dcb0f9f36..8fdfcdb6c 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -3229,11 +3229,9 @@ public class Unit extends GoodsLocation
      * @return The number of cargo slots occupied by units.
      */
     public int getUnitSpaceTaken() {
-        int space = 0;
-        if (canCarryUnits()) {
-            for (Unit u : getUnitList()) space += u.getSpaceTaken();
-        }
-        return space;
+        return (canCarryUnits())
+            ? getUnitList().stream().mapToInt(u -> u.getSpaceTaken()).sum()
+            : 0;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/UnitLocation.java b/src/net/sf/freecol/common/model/UnitLocation.java
index 1bd61c1c4..bbf50be7a 100644
--- a/src/net/sf/freecol/common/model/UnitLocation.java
+++ b/src/net/sf/freecol/common/model/UnitLocation.java
@@ -215,12 +215,8 @@ public abstract class UnitLocation extends FreeColGameObject implements Location
      *     <code>Location</code>.
      */
     public int getTotalUnitCount() {
-        int result = 0;
-        for (Unit unit : getUnitList()) {
-            result++;
-            result += unit.getUnitCount();
-        }
-        return result;
+        return getUnitList().stream()
+            .mapToInt(u -> 1 + u.getUnitCount()).sum();
     }
 
     /**
@@ -467,9 +463,8 @@ public abstract class UnitLocation extends FreeColGameObject implements Location
      * @return The sum of the space taken by the units in this location.
      */
     public int getSpaceTaken() {
-        int space = 0;
-        for (Unit u : getUnitList()) space += u.getSpaceTaken();
-        return space;
+        return getUnitList().stream()
+            .mapToInt(u -> u.getSpaceTaken()).sum();
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/WorkLocation.java b/src/net/sf/freecol/common/model/WorkLocation.java
index 3c6a1571b..71d491ab3 100644
--- a/src/net/sf/freecol/common/model/WorkLocation.java
+++ b/src/net/sf/freecol/common/model/WorkLocation.java
@@ -833,9 +833,8 @@ public abstract class WorkLocation extends UnitLocation
      * @return A value for the player.
      */
     public int evaluateFor(Player player) {
-        int result = 0;
-        for (Unit u : getUnitList()) result += u.evaluateFor(player);
-        return result;
+        return getUnitList().stream()
+            .mapToInt(u -> u.evaluateFor(player)).sum();
     }
 
     /**
diff --git a/src/net/sf/freecol/common/util/RandomChoice.java b/src/net/sf/freecol/common/util/RandomChoice.java
index 3f9c3b9cd..9f98ad2e9 100644
--- a/src/net/sf/freecol/common/util/RandomChoice.java
+++ b/src/net/sf/freecol/common/util/RandomChoice.java
@@ -62,11 +62,7 @@ public class RandomChoice<T> {
     }
 
     public static <T> int getTotalProbability(Collection<RandomChoice<T>> input) {
-        int total = 0;
-        for (RandomChoice<T> choice : input) {
-            total += choice.getProbability();
-        }
-        return total;
+        return input.stream().mapToInt(c -> c.getProbability()).sum();
     }
 
     public static <T> T getWeightedRandom(Logger logger, String logMe,
diff --git a/src/net/sf/freecol/server/ai/AIColony.java b/src/net/sf/freecol/server/ai/AIColony.java
index 8ea9912ac..6dcdc5abf 100644
--- a/src/net/sf/freecol/server/ai/AIColony.java
+++ b/src/net/sf/freecol/server/ai/AIColony.java
@@ -639,7 +639,7 @@ public class AIColony extends AIObject implements PropertyChangeListener {
         // owner or if it is the best one available.
         UnitType unitType = spec.getDefaultUnitType(player);
         Tile steal = null;
-        float score = 1.0f;
+        double score = 1.0;
         for (Tile t : tile.getSurroundingTiles(1)) {
             Player owner = t.getOwner();
             if (owner == null || owner == player
@@ -655,13 +655,10 @@ public class AIColony extends AIObject implements PropertyChangeListener {
                 // Pick the best tile to steal, considering mainly the
                 // building goods needed, but including food at a lower
                 // weight.
-                float s = 0.0f;
-                for (GoodsType g : needed) {
-                    s += t.getPotentialProduction(g, unitType);
-                }
-                for (GoodsType g : spec.getFoodGoodsTypeList()) {
-                    s += 0.1 * t.getPotentialProduction(g, unitType);
-                }
+                double s = needed.stream()
+                        .mapToInt(gt -> t.getPotentialProduction(gt, unitType)).sum()
+                    + spec.getFoodGoodsTypeList().stream()
+                        .mapToDouble(ft -> 0.1 * t.getPotentialProduction(ft, unitType)).sum();
                 if (s > score) {
                     score = s;
                     steal = t;
diff --git a/src/net/sf/freecol/server/ai/Cargo.java b/src/net/sf/freecol/server/ai/Cargo.java
index 47993e207..827be3dd2 100644
--- a/src/net/sf/freecol/server/ai/Cargo.java
+++ b/src/net/sf/freecol/server/ai/Cargo.java
@@ -469,7 +469,7 @@ public class Cargo {
         ret += (getMode().isCollection()) ? getTransportable().getSpaceTaken()
             : -getTransportable().getSpaceTaken();
         if (hasWrapped()) {
-            for (Cargo t : wrapped) ret += t.getNewSpace();
+            ret += wrapped.stream().mapToInt(c -> c.getNewSpace()).sum();
         }
         return ret;
     }
diff --git a/src/net/sf/freecol/server/ai/ColonyPlan.java b/src/net/sf/freecol/server/ai/ColonyPlan.java
index a33dc13b7..4272bbd30 100644
--- a/src/net/sf/freecol/server/ai/ColonyPlan.java
+++ b/src/net/sf/freecol/server/ai/ColonyPlan.java
@@ -505,11 +505,8 @@ public class ColonyPlan {
         List<GoodsType> rawMaterials = new ArrayList<>(rawLuxuryGoodsTypes);
         rawMaterials.addAll(otherRawGoodsTypes);
         for (GoodsType g : rawMaterials) {
-            int value = 0;
-            for (Entry<WorkLocation, Integer> e
-                     : production.get(g).entrySet()) {
-                value += e.getValue();
-            }
+            int value = production.get(g).entrySet().stream()
+                .mapToInt(e -> e.getValue()).sum();
             if (value <= LOW_PRODUCTION_THRESHOLD) {
                 production.remove(g);
                 continue;
@@ -921,14 +918,10 @@ public class ColonyPlan {
             = new Comparator<GoodsType>() {
                 @Override
                 public int compare(GoodsType g1, GoodsType g2) {
-                    int p1 = 0;
-                    for (Integer i : production.get(g1).values()) {
-                        p1 += i;
-                    }
-                    int p2 = 0;
-                    for (Integer i : production.get(g2).values()) {
-                        p2 += i;
-                    }
+                    int p1 = production.get(g1).values().stream()
+                        .mapToInt(Integer::intValue).sum();
+                    int p2 = production.get(g2).values().stream()
+                        .mapToInt(Integer::intValue).sum();
                     return p2 - p1;
                 }
             };
diff --git a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
index 4cbb48849..0c2d31b00 100644
--- a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
@@ -2779,17 +2779,14 @@ public class EuropeanAIPlayer extends AIPlayer {
             lb.add(((ret) ? "accepted" : "rejected"),
                    ": special-goods-in-turn-", turn, ".");
         } else {
-            int averageIncome = 0;
-            int numberOfGoods = 0;
             // FIXME: consider the amount of goods produced. If we
             // depend on shipping huge amounts of cheap goods, we
             // don't want these goods to be boycotted.
-            List<GoodsType> goodsTypes = getSpecification().getStorableGoodsTypeList();
-            for (GoodsType type : goodsTypes) {
-                averageIncome += getPlayer().getIncomeAfterTaxes(type);
-                numberOfGoods++;
-            }
-            averageIncome /= numberOfGoods;
+            final List<GoodsType> goodsTypes = getSpecification()
+                .getStorableGoodsTypeList();
+            int averageIncome = goodsTypes.stream()
+                .mapToInt(gt -> getPlayer().getIncomeAfterTaxes(gt)).sum()
+                / goodsTypes.size();
             int income = getPlayer().getIncomeAfterTaxes(toBeDestroyed.getType());
             ret = income <= 0 || income > averageIncome;
             lb.add(((ret) ? "accepted" : "rejected"),
diff --git a/src/net/sf/freecol/server/ai/REFAIPlayer.java b/src/net/sf/freecol/server/ai/REFAIPlayer.java
index b68644f58..d3001e0ce 100644
--- a/src/net/sf/freecol/server/ai/REFAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/REFAIPlayer.java
@@ -796,9 +796,8 @@ public class REFAIPlayer extends EuropeanAIPlayer {
                 // Are there more idle units waiting here?
                 if (!e.getValue().isEmpty()) {
                     idlePorts.add(key);
-                    for (AIUnit aiu : e.getValue()) {
-                        space += aiu.getUnit().getSpaceTaken();
-                    }
+                    space += e.getValue().stream()
+                        .mapToInt(aiu -> aiu.getUnit().getSpaceTaken()).sum();
                 }
             }
 
diff --git a/src/net/sf/freecol/server/generator/TerrainGenerator.java b/src/net/sf/freecol/server/generator/TerrainGenerator.java
index 3fc09c7cb..4a9c3eb1a 100644
--- a/src/net/sf/freecol/server/generator/TerrainGenerator.java
+++ b/src/net/sf/freecol/server/generator/TerrainGenerator.java
@@ -648,11 +648,8 @@ public class TerrainGenerator {
 
         for (River river : rivers) {
             ServerRegion region = river.getRegion();
-            int scoreValue = 0;
-            for (RiverSection section : river.getSections()) {
-                scoreValue += section.getSize();
-            }
-            scoreValue *= 2;
+            int scoreValue = 2 * river.getSections().stream()
+                .mapToInt(rs -> rs.getSize()).sum();
             region.setScoreValue(scoreValue);
             lb.add("Created river region (length ", river.getLength(),
                 ", score value ", scoreValue, ").\n");
diff --git a/src/net/sf/freecol/server/model/ServerPlayer.java b/src/net/sf/freecol/server/model/ServerPlayer.java
index e6f33e144..e078f9356 100644
--- a/src/net/sf/freecol/server/model/ServerPlayer.java
+++ b/src/net/sf/freecol/server/model/ServerPlayer.java
@@ -828,18 +828,11 @@ public class ServerPlayer extends Player implements ServerModelObject {
      */
     public boolean updateScore() {
         int oldScore = score;
-        score = 0;
-
-        for (Unit u : getUnits()) {
-            score += u.getType().getScoreValue();
-        }
-        
-        for (Colony c : getColonies()) {
-            score += c.getLiberty();
-        }
-
-        score += SCORE_FOUNDING_FATHER * getFathers().size();
-
+        score = getUnits().stream()
+                .mapToInt(u -> u.getType().getScoreValue()).sum()
+            + getColonies().stream()
+                .mapToInt(c -> c.getLiberty()).sum()
+            + SCORE_FOUNDING_FATHER * getFathers().size();
         int gold = getGold();
         if (gold != GOLD_NOT_ACCOUNTED) {
             score += (int)Math.floor(SCORE_GOLD * gold);
@@ -1155,10 +1148,8 @@ public class ServerPlayer extends Player implements ServerModelObject {
      * @return The price.
      */
     public int priceMercenaries(List<AbstractUnit> mercenaries) {
-        int mercPrice = 0;
-        for (AbstractUnit au : mercenaries) {
-            mercPrice += getPrice(au);
-        }
+        int mercPrice = mercenaries.stream()
+            .mapToInt(au -> getPrice(au)).sum();
         if (!checkGold(mercPrice)) mercPrice = getGold();
         return mercPrice;
     }
@@ -1525,10 +1516,8 @@ public class ServerPlayer extends Player implements ServerModelObject {
         final Disaster bankruptcy = spec.getDisaster(Disaster.BANKRUPTCY);
 
         boolean changed = false;
-        int upkeep = 0;
-        for (Settlement settlement : getSettlements()) {
-            upkeep += settlement.getUpkeep();
-        }
+        int upkeep = getSettlements().stream()
+            .mapToInt(s -> s.getUpkeep()).sum();
         if (checkGold(upkeep)) {
             modifyGold(-upkeep);
             if (getBankrupt()) {

From adeed741f188e6021237339a53699b4052090c73 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 13 Sep 2015 12:12:32 +0200
Subject: [PATCH 212/323] Remove confusing modal parameter from input, choice,
 confirm dialog methods

It was and must have been always true, because it must wait for the
dialog to close, to be able to return the result.
---
 .../client/control/ConnectController.java     |  2 +-
 .../client/control/InGameController.java      | 50 ++++++------
 src/net/sf/freecol/client/gui/Canvas.java     | 31 +++-----
 src/net/sf/freecol/client/gui/GUI.java        | 79 ++++++++-----------
 src/net/sf/freecol/client/gui/SwingGUI.java   | 73 ++++++++---------
 .../freecol/client/gui/panel/ColonyPanel.java |  4 +-
 .../freecol/client/gui/panel/EuropePanel.java |  2 +-
 .../gui/panel/MapEditorTransformPanel.java    |  2 +-
 .../sf/freecol/common/debug/DebugUtils.java   | 36 ++++-----
 9 files changed, 128 insertions(+), 151 deletions(-)

diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
index 6b4c0fcf4..f8f46921e 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -421,7 +421,7 @@ public final class ConnectController {
                     .add("%nation%", Messages.nameKey(n)));
                 choices.add(new ChoiceItem<>(nam, n));
             }
-            String choice = gui.getChoice(true, null,
+            String choice = gui.getChoice(null,
                 Messages.message("client.choicePlayer"),
                 "cancel", choices);
             if (choice == null) return false; // User cancelled
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 8cdd55364..fa35fb3b5 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -1373,7 +1373,7 @@ public final class InGameController implements NetworkConstants {
         }
 
         if (disembarkable.size() == 1) {
-            if (gui.confirm(true, tile,
+            if (gui.confirm(tile,
                             StringTemplate.key("disembark.text"),
                             disembarkable.get(0), "ok", "cancel")) {
                 moveDirection(disembarkable.get(0), direction, false);
@@ -1390,7 +1390,7 @@ public final class InGameController implements NetworkConstants {
             // destination tile is known to be clear of other player
             // units or settlements, it may have a rumour or need
             // other special handling.
-            Unit u = gui.getChoice(true, unit.getTile(),
+            Unit u = gui.getChoice(unit.getTile(),
                                    Messages.message("disembark.text"),
                                    unit,
                                    "none", choices);
@@ -1443,7 +1443,7 @@ public final class InGameController implements NetworkConstants {
         } else if (choices.size() == 1) {
             // Use the default
         } else {
-            carrier = gui.getChoice(true, unit.getTile(),
+            carrier = gui.getChoice(unit.getTile(),
                                     Messages.message("embark.text"),
                                     unit,
                                     "none", choices);
@@ -1471,13 +1471,13 @@ public final class InGameController implements NetworkConstants {
      */
     private boolean moveExplore(Unit unit, Direction direction) {
         Tile tile = unit.getTile().getNeighbourOrNull(direction);
-        if (!gui.confirm(true, unit.getTile(),
+        if (!gui.confirm(unit.getTile(),
                 StringTemplate.key("exploreLostCityRumour.text"), unit,
                 "exploreLostCityRumour.yes", "exploreLostCityRumour.no")) {
             return true;
         }
         if (tile.getLostCityRumour().getType()== LostCityRumour.RumourType.MOUNDS
-            && !gui.confirm(true, unit.getTile(),
+            && !gui.confirm(unit.getTile(),
                 StringTemplate.key("exploreMoundsRumour.text"), unit,
                 "exploreLostCityRumour.yes", "exploreLostCityRumour.no")) {
             askServer().declineMounds(unit, direction);
@@ -1514,7 +1514,7 @@ public final class InGameController implements NetworkConstants {
                 moveTo(unit, unit.getDestination());
                 return false;
             } else {
-                if (gui.confirm(true, oldTile, StringTemplate
+                if (gui.confirm(oldTile, StringTemplate
                         .template("highseas.text")
                         .addAmount("%number%", unit.getSailTurns()),
                         unit, "highseas.yes", "highseas.no")) {
@@ -1553,7 +1553,7 @@ public final class InGameController implements NetworkConstants {
                 .addStringTemplate("%unit%",
                     unit.getLabel(Unit.UnitLabelType.NATIONAL))
                 .addNamed("%skill%", skill));
-        } else if (gui.confirm(true, unit.getTile(), StringTemplate
+        } else if (gui.confirm(unit.getTile(), StringTemplate
                 .template("learnSkill.text")
                 .addNamed("%skill%", skill),
                 unit, "learnSkill.yes", "learnSkill.no")) {
@@ -1924,7 +1924,7 @@ public final class InGameController implements NetworkConstants {
                 String label = Messages.message(g.getLabel(true));
                 choices.add(new ChoiceItem<>(label, g));
             }
-            goods = gui.getChoice(true, unit.getTile(),
+            goods = gui.getChoice(unit.getTile(),
                                   Messages.message("buyProposition.text"),
                                   settlement,
                                   "nothing", choices);
@@ -1978,7 +1978,7 @@ public final class InGameController implements NetworkConstants {
                 String label = Messages.message(g.getLabel(true));
                 choices.add(new ChoiceItem<>(label, g));
             }
-            goods = gui.getChoice(true, unit.getTile(),
+            goods = gui.getChoice(unit.getTile(),
                                   Messages.message("sellProposition.text"),
                                   settlement,
                                   "nothing", choices);
@@ -2032,7 +2032,7 @@ public final class InGameController implements NetworkConstants {
             String label = Messages.message(g.getLabel(true));
             choices.add(new ChoiceItem<>(label, g));
         }
-        Goods goods = gui.getChoice(true, unit.getTile(),
+        Goods goods = gui.getChoice(unit.getTile(),
                                     Messages.message("gift.text"),
                                     settlement,
                                     "cancel", choices);
@@ -2110,7 +2110,7 @@ public final class InGameController implements NetworkConstants {
                 String label = Messages.message(p.getCountryLabel());
                 choices.add(new ChoiceItem<>(label, p));
             }
-            Player enemy = gui.getChoice(true, unit.getTile(),
+            Player enemy = gui.getChoice(unit.getTile(),
                 Messages.message("missionarySettlement.inciteQuestion"),
                 unit,
                 "missionarySettlement.cancel", choices);
@@ -2123,7 +2123,7 @@ public final class InGameController implements NetworkConstants {
                     .template("missionarySettlement.inciteGoldFail")
                     .add("%player%", enemy.getName())
                     .addAmount("%amount%", gold));
-            } else if (gui.confirm(true, unit.getTile(), StringTemplate
+            } else if (gui.confirm(unit.getTile(), StringTemplate
                     .template("missionarySettlement.inciteConfirm")
                     .add("%player%", enemy.getName())
                     .addAmount("%amount%", gold),
@@ -2447,7 +2447,7 @@ public final class InGameController implements NetworkConstants {
                         .addStringTemplate("%colony%", locName)
                         .addAmount("%amount%", toUnload - atStop)
                         .addNamed("%goods%", goods);
-                    if (!gui.confirm(true, unit.getTile(), template,
+                    if (!gui.confirm(unit.getTile(), template,
                                      unit, "yes", "no")) amount = atStop;
                     break;
                 case ClientOptions.UNLOAD_OVERFLOW_RESPONSE_NEVER:
@@ -2738,7 +2738,7 @@ public final class InGameController implements NetworkConstants {
             .getBoolean(ClientOptions.SHOW_COLONY_WARNINGS)) {
             StringTemplate warnings = tile.getBuildColonyWarnings(unit);
             if (!warnings.getReplacements().isEmpty()
-                && !gui.confirm(true, tile, warnings,
+                && !gui.confirm(tile, warnings,
                                 unit, "buildColony.yes", "buildColony.no")) {
                 return false;
             }
@@ -2942,7 +2942,7 @@ public final class InGameController implements NetworkConstants {
                 template = StringTemplate.template("cashInTreasureTrain.pay")
                     .addAmount("%fee%", percent);
             }
-            if (!gui.confirm(true, unit.getTile(), template, unit,
+            if (!gui.confirm(unit.getTile(), template, unit,
                              "accept", "reject")) return false;
         }
 
@@ -3050,7 +3050,7 @@ public final class InGameController implements NetworkConstants {
         if (!requireOurTurn() || unit == null) return false;
 
         if (unit.getState() == UnitState.IMPROVING
-            && !gui.confirm(true, unit.getTile(), StringTemplate
+            && !gui.confirm(unit.getTile(), StringTemplate
                 .template("clearOrders.text")
                 .addAmount("%turns%", unit.getWorkTurnsLeft()),
                 unit, "ok", "cancel")) {
@@ -3091,7 +3091,7 @@ public final class InGameController implements NetworkConstants {
         }
 
         final Tile tile = (gui.isShowingSubPanel()) ? null : unit.getTile();
-        if (!gui.confirm(true, tile, StringTemplate
+        if (!gui.confirm(tile, StringTemplate
                 .template("clearSpeciality.areYouSure")
                 .addStringTemplate("%oldUnit%",
                     unit.getLabel(Unit.UnitLabelType.NATIONAL))
@@ -3236,7 +3236,7 @@ public final class InGameController implements NetworkConstants {
         if (unit.getColony() != null
             && !gui.confirmLeaveColony(unit)) return false;
         final Tile tile = (gui.isShowingSubPanel()) ? null : unit.getTile();
-        if (!gui.confirm(true, tile, StringTemplate.key("disbandUnit.text"),
+        if (!gui.confirm(tile, StringTemplate.key("disbandUnit.text"),
                          unit, "disbandUnit.yes", "cancel"))
             return false;
 
@@ -3585,7 +3585,7 @@ public final class InGameController implements NetworkConstants {
         if (type == null) {
             switch (opt) {
             case ClientOptions.INDIAN_DEMAND_RESPONSE_ASK:
-                accepted = gui.confirm(true, colony.getTile(), StringTemplate
+                accepted = gui.confirm(colony.getTile(), StringTemplate
                     .template("indianDemand.gold.text")
                     .addName("%nation%", nation)
                     .addName("%colony%", colony.getName())
@@ -3615,14 +3615,14 @@ public final class InGameController implements NetworkConstants {
             switch (opt) {
             case ClientOptions.INDIAN_DEMAND_RESPONSE_ASK:
                 if (type.isFoodType()) {
-                    accepted = gui.confirm(true, colony.getTile(),
+                    accepted = gui.confirm(colony.getTile(),
                         StringTemplate.template("indianDemand.food.text")
                         .addName("%nation%", nation)
                         .addName("%colony%", colony.getName())
                         .addAmount("%amount%", amount),
                         unit, "indianDemand.food.yes", "indianDemand.food.no");
                 } else {
-                    accepted = gui.confirm(true, colony.getTile(),
+                    accepted = gui.confirm(colony.getTile(),
                         StringTemplate.template("indianDemand.other.text")
                         .addName("%nation%", nation)
                         .addName("%colony%", colony.getName())
@@ -4135,7 +4135,7 @@ public final class InGameController implements NetworkConstants {
 
         StringTemplate t = StringTemplate.template("payArrears.text")
             .addAmount("%amount%", arrears);
-        if (!gui.confirm(true, null, t, type, "ok", "cancel")) return false;
+        if (!gui.confirm(null, t, type, "ok", "cancel")) return false;
 
         boolean ret = askServer().payArrears(type) && player.canTrade(type);
         if (ret) {
@@ -4170,7 +4170,7 @@ public final class InGameController implements NetworkConstants {
         final int price = colony.getPriceForBuilding();
         StringTemplate t = StringTemplate.template("payForBuilding.text")
             .addAmount("%amount%", price);
-        if (!gui.confirm(true, null, t, colony, "yes", "no")) return false;
+        if (!gui.confirm(null, t, colony, "yes", "no")) return false;
 
         ColonyWas colonyWas = new ColonyWas(colony);
         boolean ret = askServer().payForBuilding(colony)
@@ -4318,7 +4318,7 @@ public final class InGameController implements NetworkConstants {
         String name = null;
         if (object instanceof Colony) {
             Colony colony = (Colony) object;
-            name = gui.getInput(true, colony.getTile(),
+            name = gui.getInput(colony.getTile(),
                                 StringTemplate.key("renameColony.text"),
                                 colony.getName(), "rename", "cancel");
             if (name == null) { // User cancelled
@@ -4337,7 +4337,7 @@ public final class InGameController implements NetworkConstants {
             }
         } else if (object instanceof Unit) {
             Unit unit = (Unit) object;
-            name = gui.getInput(true, unit.getTile(),
+            name = gui.getInput(unit.getTile(),
                                 StringTemplate.key("renameUnit.text"),
                                 unit.getName(), "rename", "cancel");
             if (name == null) return false; // User cancelled
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 9a9b21412..5deadf98f 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -1520,9 +1520,8 @@ public final class Canvas extends JDesktopPane {
     // Dialog display
 
     /**
-     * Displays a dialog with text and a choice of options.
+     * Displays a modal dialog with text and a choice of options.
      *
-     * @param modal True if this dialog should be modal.
      * @param tile An optional <code>Tile</code> to make visible (not
      *     under the dialog!)
      * @param obj An object that explains the choice for the user.
@@ -1533,19 +1532,17 @@ public final class Canvas extends JDesktopPane {
      * @return The corresponding member of the values array to the selected
      *     option.
      */
-    <T> T showChoiceDialog(boolean modal, Tile tile, Object obj,
-                                  ImageIcon icon, String cancelKey,
-                                  List<ChoiceItem<T>> choices) {
+    <T> T showChoiceDialog(Tile tile, Object obj, ImageIcon icon,
+                           String cancelKey, List<ChoiceItem<T>> choices) {
         FreeColChoiceDialog<T> fcd
-            = new FreeColChoiceDialog<>(freeColClient, frame, modal, obj, icon,
+            = new FreeColChoiceDialog<>(freeColClient, frame, true, obj, icon,
                                          cancelKey, choices);
         return showFreeColDialog(fcd, tile);
     }
 
     /**
-     * Displays a dialog with a text and a ok/cancel option.
+     * Displays a modal dialog with a text and a ok/cancel option.
      *
-     * @param modal True if this dialog should be modal.
      * @param tile An optional <code>Tile</code> to make visible (not
      *     under the dialog!)
      * @param obj An object that explains the choice for the user.
@@ -1554,19 +1551,17 @@ public final class Canvas extends JDesktopPane {
      * @param cancelKey The text displayed on the "cancel"-button.
      * @return True if the user clicked the "ok"-button.
      */
-    boolean showConfirmDialog(boolean modal, Tile tile,
-                                     Object obj, ImageIcon icon,
-                                     String okKey, String cancelKey) {
+    boolean showConfirmDialog(Tile tile, Object obj, ImageIcon icon,
+                              String okKey, String cancelKey) {
         FreeColConfirmDialog fcd
-            = new FreeColConfirmDialog(freeColClient, frame, modal, obj, icon,
+            = new FreeColConfirmDialog(freeColClient, frame, true, obj, icon,
                                        okKey, cancelKey);
         return showFreeColDialog(fcd, tile);
     }
 
     /**
-     * Displays a dialog with a text field and a ok/cancel option.
+     * Displays a modal dialog with a text field and a ok/cancel option.
      *
-     * @param modal True if this dialog should be modal.
      * @param tile An optional tile to make visible (not under the dialog).
      * @param template A <code>StringTemplate</code> that explains the
      *     action to the user.
@@ -1575,11 +1570,11 @@ public final class Canvas extends JDesktopPane {
      * @param cancelKey A key displayed on the optional "cancel"-button.
      * @return The text the user entered, or null if cancelled.
      */
-    String showInputDialog(boolean modal, Tile tile,
-                                  StringTemplate template, String defaultValue,
-                                  String okKey, String cancelKey) {
+    String showInputDialog(Tile tile, StringTemplate template,
+                           String defaultValue,
+                           String okKey, String cancelKey) {
         FreeColStringInputDialog fcd
-            = new FreeColStringInputDialog(freeColClient, frame, modal,
+            = new FreeColStringInputDialog(freeColClient, frame, true,
                                            Messages.message(template),
                                            defaultValue, okKey, cancelKey);
         return showFreeColDialog(fcd, tile);
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 714b0a6c8..b2593b631 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -388,7 +388,7 @@ public class GUI {
     // Dialogs that return values
 
     /**
-     * Simple confirmation dialog.
+     * Simple modal confirmation dialog.
      *
      * @param textKey A string to use as the message key.
      * @param okKey A key for the "ok" button.
@@ -400,25 +400,22 @@ public class GUI {
     }
 
     /**
-     * General confirmation dialog.
+     * General modal confirmation dialog.
      *
-     * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param template The <code>StringTemplate</code> explaining the choice.
      * @param okKey A key for the "ok" button.
      * @param cancelKey A key for the "cancel" button.
      * @return True if the "ok" button was selected.
      */
-    public boolean confirm(boolean modal, Tile tile,
-                           StringTemplate template,
+    public boolean confirm(Tile tile, StringTemplate template,
                            String okKey, String cancelKey) {
         return false;
     }
 
     /**
-     * General confirmation dialog.
+     * General modal confirmation dialog.
      *
-     * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param template The <code>StringTemplate</code> explaining the choice.
      * @param unit An optional unit to make an icon for the dialog from.
@@ -426,21 +423,20 @@ public class GUI {
      * @param cancelKey A key for the "cancel" button.
      * @return True if the "ok" button was selected.
      */
-    public boolean confirm(boolean modal, Tile tile,
-                           StringTemplate template, Unit unit,
+    public boolean confirm(Tile tile, StringTemplate template, Unit unit,
                            String okKey, String cancelKey) {
         return false;
     }
 
-    public boolean confirm(boolean modal, Tile tile,
-                                 StringTemplate template, Settlement settlement,
-                                 String okKey, String cancelKey) {
+    public boolean confirm(Tile tile, StringTemplate template,
+                           Settlement settlement,
+                           String okKey, String cancelKey) {
         return false;
     }
 
-    public boolean confirm(boolean modal, Tile tile,
-                                 StringTemplate template, GoodsType goodsType,
-                                 String okKey, String cancelKey) {
+    public boolean confirm(Tile tile, StringTemplate template,
+                           GoodsType goodsType,
+                           String okKey, String cancelKey) {
         return false;
     }
 
@@ -477,7 +473,7 @@ public class GUI {
                 .addNamed("%building%", school)
             : null;
         return template == null
-            || confirm(true, unit.getTile(), template, unit,
+            || confirm(unit.getTile(), template, unit,
                        "abandonEducation.yes", "abandonEducation.no");
     }
 
@@ -496,7 +492,7 @@ public class GUI {
             .addStringTemplate("%unit%",
                 unit.getLabel(Unit.UnitLabelType.NATIONAL))
             .addName("%route%", tr.getName());
-        return confirm(true, unit.getTile(), template, unit, "yes", "no");
+        return confirm(unit.getTile(), template, unit, "yes", "no");
     }
 
     /**
@@ -595,7 +591,7 @@ public class GUI {
             messageId = "confirmHostile.peace";
             break;
         }
-        return confirm(true, attacker.getTile(), StringTemplate
+        return confirm(attacker.getTile(), StringTemplate
             .template(messageId)
             .addStringTemplate("%nation%", enemy.getNationLabel()),
             attacker, "confirmHostile.yes", "cancel");
@@ -639,7 +635,7 @@ public class GUI {
             : (is.getAlarm(player).getLevel() == Tension.Level.HAPPY)
             ? "confirmTribute.happy"
             : "confirmTribute.normal";
-        return (confirm(true, is.getTile(), StringTemplate.template(messageId)
+        return (confirm(is.getTile(), StringTemplate.template(messageId)
                 .addName("%settlement%", is.getName())
                 .addStringTemplate("%nation%", other.getNationLabel()),
                 attacker, "confirmTribute.yes", "confirmTribute.no"))
@@ -692,7 +688,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("armedUnitSettlement.attack"),
                 ArmedUnitSettlementAction.SETTLEMENT_ATTACK));
 
-        return getChoice(true, settlement.getTile(),
+        return getChoice(settlement.getTile(),
             settlement.getAlarmLevelLabel(player),
             settlement, "cancel", choices);
     }
@@ -720,7 +716,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("boycottedGoods.dumpGoods"),
                 BoycottAction.DUMP_CARGO));
 
-        return getChoice(true, null, template,
+        return getChoice(null, template,
                          goods.getType(), "cancel", choices);
     }
 
@@ -747,7 +743,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("buy.moreGold"),
                                      BuyAction.HAGGLE));
 
-        return getChoice(true, unit.getTile(), template,
+        return getChoice(unit.getTile(), template,
                          goods.getType(), "cancel", choices);
     }
 
@@ -779,7 +775,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("indianLand.take"),
                                      ClaimAction.STEAL));
 
-        return getChoice(true, tile, template,
+        return getChoice(tile, template,
                          owner.getNation(), "indianLand.cancel", choices);
     }
 
@@ -815,7 +811,7 @@ public class GUI {
         }
         if (choices.isEmpty()) return null;
 
-        return getChoice(true, settlement.getTile(), template,
+        return getChoice(settlement.getTile(), template,
                          settlement, "cancel", choices);
     }
 
@@ -854,7 +850,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("missionarySettlement.incite"),
                                      MissionaryAction.INCITE_INDIANS));
 
-        return getChoice(true, unit.getTile(), template,
+        return getChoice(unit.getTile(), template,
                          settlement, "cancel", choices);
     }
 
@@ -867,7 +863,7 @@ public class GUI {
      */
     public String getNewColonyName(Player player, Tile tile) {
         String suggested = player.getSettlementName(null);
-        String name = getInput(true, tile, StringTemplate
+        String name = getInput(tile, StringTemplate
             .template("nameColony.text"), suggested,
             "accept", "cancel");
         if (name == null) {
@@ -910,7 +906,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("scoutColony.attack"),
                                      ScoutColonyAction.FOREIGN_COLONY_ATTACK));
 
-        return getChoice(true, unit.getTile(), template,
+        return getChoice(unit.getTile(), template,
                          colony, "cancel", choices);
     }
 
@@ -969,7 +965,7 @@ public class GUI {
         choices.add(new ChoiceItem<>(Messages.message("scoutSettlement.attack"),
                                      ScoutIndianSettlementAction.INDIAN_SETTLEMENT_ATTACK));
 
-        return getChoice(true, settlement.getTile(), template,
+        return getChoice(settlement.getTile(), template,
                          settlement, "cancel", choices);
     }
 
@@ -1000,15 +996,14 @@ public class GUI {
                     .addStringTemplate("%goods%", goodsTemplate)),
                 SellAction.GIFT));
 
-        return getChoice(true, unit.getTile(), template,
+        return getChoice(unit.getTile(), template,
                          goods.getType(), "cancel", choices);
     }
 
 
     /**
-     * General choice dialog.
+     * General modal choice dialog.
      *
-     * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param explain An object explaining the choice.
      * @param cancelKey A key for the "cancel" button.
@@ -1016,39 +1011,34 @@ public class GUI {
      * @return The selected value of the selected <code>ChoiceItem</code>,
      *     or null if cancelled.
      */
-    public <T> T getChoice(boolean modal, Tile tile, Object explain,
+    public <T> T getChoice(Tile tile, Object explain,
                            String cancelKey, List<ChoiceItem<T>> choices) {
         return null;
     }
 
-    public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                           Unit unit,
+    public <T> T getChoice(Tile tile, Object explain, Unit unit,
                            String cancelKey, List<ChoiceItem<T>> choices) {
         return null;
     }
 
-    public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                           Settlement settlement,
+    public <T> T getChoice(Tile tile, Object explain, Settlement settlement,
                            String cancelKey, List<ChoiceItem<T>> choices) {
         return null;
     }
 
-    public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                           GoodsType goodsType,
+    public <T> T getChoice(Tile tile, Object explain, GoodsType goodsType,
                            String cancelKey, List<ChoiceItem<T>> choices) {
         return null;
     }
 
-    public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                           Nation nation,
+    public <T> T getChoice(Tile tile, Object explain, Nation nation,
                            String cancelKey, List<ChoiceItem<T>> choices) {
         return null;
     }
 
     /**
-     * General input dialog.
+     * General modal string input dialog.
      *
-     * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param template A <code>StringTemplate</code> explaining the choice.
      * @param defaultValue The default value to show initially.
@@ -1056,8 +1046,9 @@ public class GUI {
      * @param cancelKey A key for the "cancel" button.
      * @return The chosen value.
      */
-    public String getInput(boolean modal, Tile tile, StringTemplate template,
-                           String defaultValue, String okKey, String cancelKey) {
+    public String getInput(Tile tile, StringTemplate template,
+                           String defaultValue,
+                           String okKey, String cancelKey) {
         return null;
     }
 
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index c54b31054..149e31e19 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -740,7 +740,7 @@ public class SwingGUI extends GUI {
     // Dialogs that return values
 
     /**
-     * Simple confirmation dialog.
+     * Simple modal confirmation dialog.
      *
      * @param textKey A string to use as the message key.
      * @param okKey A key for the "ok" button.
@@ -749,14 +749,13 @@ public class SwingGUI extends GUI {
      */
     @Override
     public boolean confirm(String textKey, String okKey, String cancelKey) {
-        return canvas.showConfirmDialog(true, null, Messages.message(textKey),
+        return canvas.showConfirmDialog(null, Messages.message(textKey),
             null, okKey, cancelKey);
     }
 
     /**
-     * General confirmation dialog.
+     * General modal confirmation dialog.
      *
-     * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param template The <code>StringTemplate</code> explaining the choice.
      * @param okKey A key for the "ok" button.
@@ -764,17 +763,15 @@ public class SwingGUI extends GUI {
      * @return True if the "ok" button was selected.
      */
     @Override
-    public boolean confirm(boolean modal, Tile tile,
-                           StringTemplate template,
+    public boolean confirm(Tile tile, StringTemplate template,
                            String okKey, String cancelKey) {
-        return canvas.showConfirmDialog(modal, tile,
+        return canvas.showConfirmDialog(tile,
             Utility.localizedTextArea(template), null, okKey, cancelKey);
     }
 
     /**
-     * General confirmation dialog.
+     * General modal confirmation dialog.
      *
-     * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param template The <code>StringTemplate</code> explaining the choice.
      * @param unit An optional unit to make an icon for the dialog from.
@@ -783,30 +780,29 @@ public class SwingGUI extends GUI {
      * @return True if the "ok" button was selected.
      */
     @Override
-    public boolean confirm(boolean modal, Tile tile,
-                           StringTemplate template, Unit unit,
+    public boolean confirm(Tile tile, StringTemplate template, Unit unit,
                            String okKey, String cancelKey) {
-        return canvas.showConfirmDialog(modal, tile,
+        return canvas.showConfirmDialog(tile,
             Utility.localizedTextArea(template),
             new ImageIcon(imageLibrary.getUnitImage(unit)),
             okKey, cancelKey);
     }
 
     @Override
-    public boolean confirm(boolean modal, Tile tile,
-                                 StringTemplate template, Settlement settlement,
-                                 String okKey, String cancelKey) {
-        return canvas.showConfirmDialog(modal, tile,
+    public boolean confirm(Tile tile, StringTemplate template,
+                           Settlement settlement,
+                           String okKey, String cancelKey) {
+        return canvas.showConfirmDialog(tile,
             Utility.localizedTextArea(template),
             new ImageIcon(imageLibrary.getSettlementImage(settlement)),
             okKey, cancelKey);
     }
 
     @Override
-    public boolean confirm(boolean modal, Tile tile,
-                                 StringTemplate template, GoodsType goodsType,
-                                 String okKey, String cancelKey) {
-        return canvas.showConfirmDialog(modal, tile,
+    public boolean confirm(Tile tile, StringTemplate template,
+                           GoodsType goodsType,
+                           String okKey, String cancelKey) {
+        return canvas.showConfirmDialog(tile,
             Utility.localizedTextArea(template),
             new ImageIcon(imageLibrary.getIconImage(goodsType)),
             okKey, cancelKey);
@@ -823,9 +819,8 @@ public class SwingGUI extends GUI {
     }
 
     /**
-     * General choice dialog.
+     * General modal choice dialog.
      *
-     * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param explain An object explaining the choice.
      * @param cancelKey A key for the "cancel" button.
@@ -834,52 +829,47 @@ public class SwingGUI extends GUI {
      *     or null if cancelled.
      */
     @Override
-    public <T> T getChoice(boolean modal, Tile tile, Object explain,
+    public <T> T getChoice(Tile tile, Object explain,
                            String cancelKey, List<ChoiceItem<T>> choices) {
-        return canvas.showChoiceDialog(modal, tile, explain,
+        return canvas.showChoiceDialog(tile, explain,
             null, cancelKey, choices);
     }
 
     @Override
-    public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                           Unit unit,
+    public <T> T getChoice(Tile tile, Object explain, Unit unit,
                            String cancelKey, List<ChoiceItem<T>> choices) {
-        return canvas.showChoiceDialog(modal, tile, explain,
+        return canvas.showChoiceDialog(tile, explain,
             new ImageIcon(imageLibrary.getUnitImage(unit)),
             cancelKey, choices);
     }
 
     @Override
-    public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                           Settlement settlement,
+    public <T> T getChoice(Tile tile, Object explain, Settlement settlement,
                            String cancelKey, List<ChoiceItem<T>> choices) {
-        return canvas.showChoiceDialog(modal, tile, explain,
+        return canvas.showChoiceDialog(tile, explain,
             new ImageIcon(imageLibrary.getSettlementImage(settlement)),
             cancelKey, choices);
     }
 
     @Override
-    public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                           GoodsType goodsType,
+    public <T> T getChoice(Tile tile, Object explain, GoodsType goodsType,
                            String cancelKey, List<ChoiceItem<T>> choices) {
-        return canvas.showChoiceDialog(modal, tile, explain,
+        return canvas.showChoiceDialog(tile, explain,
             new ImageIcon(imageLibrary.getIconImage(goodsType)),
             cancelKey, choices);
     }
 
     @Override
-    public <T> T getChoice(boolean modal, Tile tile, Object explain,
-                           Nation nation,
+    public <T> T getChoice(Tile tile, Object explain, Nation nation,
                            String cancelKey, List<ChoiceItem<T>> choices) {
-        return canvas.showChoiceDialog(modal, tile, explain,
+        return canvas.showChoiceDialog(tile, explain,
             new ImageIcon(imageLibrary.getMiscIconImage(nation)),
             cancelKey, choices);
     }
 
     /**
-     * General input dialog.
+     * General modal string input dialog.
      *
-     * @param modal Is this a modal dialog?
      * @param tile An optional <code>Tile</code> to expose.
      * @param template A <code>StringTemplate</code> explaining the choice.
      * @param defaultValue The default value to show initially.
@@ -888,9 +878,10 @@ public class SwingGUI extends GUI {
      * @return The chosen value.
      */
     @Override
-    public String getInput(boolean modal, Tile tile, StringTemplate template,
-                           String defaultValue, String okKey, String cancelKey) {
-        return canvas.showInputDialog(modal, tile, template, defaultValue,
+    public String getInput(Tile tile, StringTemplate template,
+                           String defaultValue,
+                           String okKey, String cancelKey) {
+        return canvas.showInputDialog(tile, template, defaultValue,
                                       okKey, cancelKey);
     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 5850d8a1b..9736728e5 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -891,7 +891,7 @@ public final class ColonyPanel extends PortPanel
         final Colony colony = getColony();
         boolean abandon = false;
         if (colony.getUnitCount() == 0 && getMyPlayer().owns(colony)) {
-            if (!getGUI().confirm(true, null,
+            if (!getGUI().confirm(null,
                                   StringTemplate.key("abandonColony.text"),
                                   "abandonColony.yes",
                                   "abandonColony.no")) return;
@@ -901,7 +901,7 @@ public final class ColonyPanel extends PortPanel
             BuildableType buildable = colony.getCurrentlyBuilding();
             if (buildable != null
                 && buildable.getRequiredPopulation() > colony.getUnitCount()
-                && !getGUI().confirm(true, null, StringTemplate
+                && !getGUI().confirm(null, StringTemplate
                     .template("colonyPanel.reducePopulation")
                     .addName("%colony%", colony.getName())
                     .addAmount("%number%", buildable.getRequiredPopulation())
diff --git a/src/net/sf/freecol/client/gui/panel/EuropePanel.java b/src/net/sf/freecol/client/gui/panel/EuropePanel.java
index 63cb727d1..b38c97d3f 100644
--- a/src/net/sf/freecol/client/gui/panel/EuropePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/EuropePanel.java
@@ -181,7 +181,7 @@ public final class EuropePanel extends PortPanel {
                     && unit.hasSpaceLeft()) {
                     StringTemplate locName = destination
                         .getLocationLabelFor(unit.getOwner());
-                    if (!getGUI().confirm(true, null, StringTemplate
+                    if (!getGUI().confirm(null, StringTemplate
                             .template("europePanel.leaveColonists")
                             .addStringTemplate("%newWorld%", locName),
                             unit, "ok", "cancel")) return null;
diff --git a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
index 657b35bf4..0d7789de8 100644
--- a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
@@ -312,7 +312,7 @@ public final class MapEditorTransformPanel extends FreeColPanel {
                         String name = Messages.getName(rt);
                         choices.add(new ChoiceItem<>(name, rt));
                     }
-                    ResourceType choice = getGUI().getChoice(true, null, 
+                    ResourceType choice = getGUI().getChoice(null, 
                         Messages.message("mapEditorTransformPanel.chooseResource"),
                         "cancel", choices);
                     if (choice != null) {
diff --git a/src/net/sf/freecol/common/debug/DebugUtils.java b/src/net/sf/freecol/common/debug/DebugUtils.java
index 82e6a2ac6..7243ca6bf 100644
--- a/src/net/sf/freecol/common/debug/DebugUtils.java
+++ b/src/net/sf/freecol/common/debug/DebugUtils.java
@@ -117,7 +117,7 @@ public class DebugUtils {
         final GUI gui = freeColClient.getGUI();
         final Player player = freeColClient.getMyPlayer();
 
-        BuildingType buildingType = gui.getChoice(true, null, buildingTitle,
+        BuildingType buildingType = gui.getChoice(null, buildingTitle,
             "cancel",
             game.getSpecification().getBuildingTypeList().stream()
                 .map(bt -> {
@@ -174,7 +174,7 @@ public class DebugUtils {
         final Player sPlayer = sGame.getFreeColGameObject(player.getId(),
                                                           Player.class);
 
-        FoundingFather father = gui.getChoice(true, null, fatherTitle,
+        FoundingFather father = gui.getChoice(null, fatherTitle,
             "cancel",
             sSpec.getFoundingFathers().stream()
                 .filter(f -> !sPlayer.hasFather(f))
@@ -204,7 +204,7 @@ public class DebugUtils {
         final Player sPlayer = sGame.getFreeColGameObject(player.getId(),
                                                           Player.class);
 
-        String response = gui.getInput(true, null,
+        String response = gui.getInput(null,
             StringTemplate.template("prompt.selectGold"),
             Integer.toString(1000), "ok", "cancel");
         if (response == null || response.isEmpty()) return;
@@ -233,7 +233,7 @@ public class DebugUtils {
         final Player sPlayer = sGame.getFreeColGameObject(player.getId(),
                                                           Player.class);
 
-        String response = gui.getInput(true, null,
+        String response = gui.getInput(null,
             StringTemplate.template("prompt.selectImmigration"),
             Integer.toString(100), "ok", "cancel");
         if (response == null || response.isEmpty()) return;
@@ -260,7 +260,7 @@ public class DebugUtils {
         final Player player = freeColClient.getMyPlayer();
         final Game sGame = server.getGame();
 
-        String response = gui.getInput(true, null,
+        String response = gui.getInput(null,
             StringTemplate.template("prompt.selectLiberty"),
             Integer.toString(100), "ok", "cancel");
         if (response == null || response.isEmpty()) return;
@@ -318,7 +318,7 @@ public class DebugUtils {
         final Tile sTile = sGame.getFreeColGameObject(tile.getId(), Tile.class);
         final GUI gui = freeColClient.getGUI();
 
-        UnitType unitChoice = gui.getChoice(true, null,
+        UnitType unitChoice = gui.getChoice(null,
             StringTemplate.template("prompt.selectUnitType"), "cancel",
             sSpec.getUnitTypeList().stream()
                 .map(ut -> {
@@ -375,7 +375,7 @@ public class DebugUtils {
             gtl.add(new ChoiceItem<>(msg, t));
         }
         Collections.sort(gtl);
-        GoodsType goodsType = gui.getChoice(true, null,
+        GoodsType goodsType = gui.getChoice(null,
             StringTemplate.template("prompt.selectGoodsType"),
             "cancel",
             sSpec.getGoodsTypeList().stream()
@@ -387,7 +387,7 @@ public class DebugUtils {
             .sorted().collect(Collectors.toList()));
         if (goodsType == null) return;
 
-        String amount = gui.getInput(true, null,
+        String amount = gui.getInput(null,
             StringTemplate.template("prompt.selectGoodsAmount"),
             "20", "ok", "cancel");
         if (amount == null) return;
@@ -424,7 +424,7 @@ public class DebugUtils {
                 .addName("%colony%", colony.getName()));
             return;
         }
-        Disaster disaster = gui.getChoice(true, null,
+        Disaster disaster = gui.getChoice(null,
             StringTemplate.template("prompt.selectDisaster"), "cancel",
             disasters.stream()
                 .map(rc -> {
@@ -468,7 +468,7 @@ public class DebugUtils {
         final GUI gui = freeColClient.getGUI();
         final Game game = freeColClient.getGame();
 
-        Player player = gui.getChoice(true, null,
+        Player player = gui.getChoice(null,
             StringTemplate.template("prompt.selectOwner"), "cancel",
             game.getLiveEuropeanPlayers(colony.getOwner()).stream()
                 .map(p -> {
@@ -505,7 +505,7 @@ public class DebugUtils {
         final GUI gui = freeColClient.getGUI();
         final Game game = unit.getGame();
 
-        Player player = gui.getChoice(true, null,
+        Player player = gui.getChoice(null,
             StringTemplate.template("prompt.selectOwner"), "cancel",
             game.getLivePlayers(null).stream()
             .filter(p -> unit.getType().isAvailableTo(p))
@@ -548,7 +548,7 @@ public class DebugUtils {
         final Unit sUnit = sGame.getFreeColGameObject(unit.getId(), Unit.class);
         final GUI gui = freeColClient.getGUI();
 
-        Role roleChoice = gui.getChoice(true, null,
+        Role roleChoice = gui.getChoice(null,
             StringTemplate.template("prompt.selectRole"), "cancel",
             sGame.getSpecification().getRoles().stream()
                 .map(r -> new ChoiceItem<Role>(r.getId(), r))
@@ -938,7 +938,7 @@ public class DebugUtils {
     public static void setColonyGoods(final FreeColClient freeColClient,
                                       final Colony colony) {
         final Specification spec = colony.getSpecification();
-        GoodsType goodsType = freeColClient.getGUI().getChoice(true, null,
+        GoodsType goodsType = freeColClient.getGUI().getChoice(null,
             StringTemplate.template("prompt.selectGoodsType"), "cancel",
             spec.getGoodsTypeList().stream()
                 .filter(gt -> !gt.isFoodType() || gt == spec.getPrimaryFoodType())
@@ -949,7 +949,7 @@ public class DebugUtils {
                 .sorted().collect(Collectors.toList()));
         if (goodsType == null) return;
 
-        String response = freeColClient.getGUI().getInput(true, null,
+        String response = freeColClient.getGUI().getInput(null,
                 StringTemplate.template("prompt.selectGoodsAmount"),
                 Integer.toString(colony.getGoodsCount(goodsType)),
                 "ok", "cancel");
@@ -989,7 +989,7 @@ public class DebugUtils {
             ServerPlayer.class);
         final GUI gui = freeColClient.getGUI();
 
-        MonarchAction action = gui.getChoice(true, null, monarchTitle,
+        MonarchAction action = gui.getChoice(null, monarchTitle,
             "cancel",
             Arrays.stream(MonarchAction.values())
                 .map(a -> new ChoiceItem<MonarchAction>(a))
@@ -1014,7 +1014,7 @@ public class DebugUtils {
         final Tile sTile = sGame.getFreeColGameObject(tile.getId(),
                                                       Tile.class);
 
-        RumourType rumourChoice = freeColClient.getGUI().getChoice(true, null,
+        RumourType rumourChoice = freeColClient.getGUI().getChoice(null,
             StringTemplate.template("prompt.selectLostCityRumour"),
             "cancel",
             Arrays.stream(RumourType.values())
@@ -1038,7 +1038,7 @@ public class DebugUtils {
     public static void skipTurns(FreeColClient freeColClient) {
         freeColClient.skipTurns(0); // Clear existing skipping
 
-        String response = freeColClient.getGUI().getInput(true, null,
+        String response = freeColClient.getGUI().getInput(null,
             StringTemplate.key("prompt.selectTurnsToSkip"),
             Integer.toString(10), "ok", "cancel");
         if (response == null || response.isEmpty()) return;
@@ -1065,7 +1065,7 @@ public class DebugUtils {
         boolean more = true;
         while (more) {
             int val = server.getInGameController().stepRandom();
-            more = gui.confirm(true, null, StringTemplate
+            more = gui.confirm(null, StringTemplate
                 .template("prompt.stepRNG")
                 .addAmount("%value%", val),
                 "more", "cancel");

From 1604af70f37906eb9724fc0782ad20bf767576af Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 13 Sep 2015 17:19:49 +0200
Subject: [PATCH 213/323] Fix malformed JavaDoc comments

---
 src/net/sf/freecol/client/control/InGameController.java   | 5 ++---
 src/net/sf/freecol/client/control/InGameInputHandler.java | 4 ++--
 src/net/sf/freecol/client/gui/panel/AboutPanel.java       | 1 -
 src/net/sf/freecol/common/io/FreeColXMLReader.java        | 1 -
 src/net/sf/freecol/common/model/Unit.java                 | 6 ++----
 src/net/sf/freecol/common/resources/AudioResource.java    | 2 +-
 src/net/sf/freecol/common/sound/SoundPlayer.java          | 2 +-
 src/net/sf/freecol/server/generator/MapGenerator.java     | 1 -
 8 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index fa35fb3b5..fba29ca42 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -4262,7 +4262,6 @@ public final class InGameController implements NetworkConstants {
      * Called from IGIH.remove().
      *
      * @param objects A list of <code>FreeColGameObject</code>s to remove.
-     * @param 
      */
     public void remove(List<FreeColGameObject> objects,
                        FreeColGameObject divert) {
@@ -4710,7 +4709,7 @@ public final class InGameController implements NetworkConstants {
      *
      * Called from UnloadAction, UnitLabel
      *
-     * @param unit The <code>Unit<code> that is dumping.
+     * @param unit The <code>Unit</code> that is dumping.
      * @return True if the unit unloaded.
      */
     public boolean unload(Unit unit) {
@@ -4754,7 +4753,7 @@ public final class InGameController implements NetworkConstants {
      * Called from CargoPanel, ColonyPanel, EuropePanel.MarketPanel,
      * GUI.showDumpCargoDialog, QuickActionMenu, unload()
      *
-     * @param goods The <code>Goods<code> to unload.
+     * @param goods The <code>Goods</code> to unload.
      * @param dump If true, dump the goods.
      * @return True if the unload succeeds.
      */
diff --git a/src/net/sf/freecol/client/control/InGameInputHandler.java b/src/net/sf/freecol/client/control/InGameInputHandler.java
index 6cd77ba6f..3f95b68a4 100644
--- a/src/net/sf/freecol/client/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/client/control/InGameInputHandler.java
@@ -119,7 +119,7 @@ public final class InGameInputHandler extends InputHandler {
     /**
      * Shorthand to run in the EDT and wait.
      *
-     * @return runnable The <code>Runnable</code> to run.
+     * @param runnable The <code>Runnable</code> to run.
      */
     private void invokeAndWait(Runnable runnable) {
         getFreeColClient().getGUI().invokeNowOrWait(runnable);
@@ -128,7 +128,7 @@ public final class InGameInputHandler extends InputHandler {
     /**
      * Shorthand to run in the EDT eventually.
      *
-     * @return runnable The <code>Runnable</code> to run.
+     * @param runnable The <code>Runnable</code> to run.
      */
     private void invokeLater(Runnable runnable) {
         getFreeColClient().getGUI().invokeNowOrLater(runnable);
diff --git a/src/net/sf/freecol/client/gui/panel/AboutPanel.java b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
index 2cdc12651..f6d98d6ad 100644
--- a/src/net/sf/freecol/client/gui/panel/AboutPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
@@ -159,7 +159,6 @@ public final class AboutPanel extends FreeColPanel {
 
     /**
      * {@inheritDoc}
-     * @param event
      */
     @Override
     public void actionPerformed(ActionEvent ae) {
diff --git a/src/net/sf/freecol/common/io/FreeColXMLReader.java b/src/net/sf/freecol/common/io/FreeColXMLReader.java
index a9df9ee94..dd78a40e2 100644
--- a/src/net/sf/freecol/common/io/FreeColXMLReader.java
+++ b/src/net/sf/freecol/common/io/FreeColXMLReader.java
@@ -593,7 +593,6 @@ public class FreeColXMLReader extends StreamReaderDelegate
      * @param required If true a null result should throw an exception.
      * @return The <code>FreeColGameObject</code> found or made, or null
      *     if the attribute was not present.
-     * @exception XMLStreamError if there was a problem reading the stream.
      */
     public <T extends FreeColGameObject> T makeFreeColGameObject(Game game,
         String attributeName, Class<T> returnClass,
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index 8fdfcdb6c..a9fa2b337 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -1307,14 +1307,12 @@ public class Unit extends GoodsLocation
      * Gets the number of turns this unit has to train to educate a student.
      * This value is only meaningful for units that can be put in a school.
      *
+     * @param typeTeacher The teacher <code>UnitType</code>.
+     * @param typeStudent the student <code>UnitType</code>.
      * @return The turns of training needed to teach its current type
      *     to a free colonist or to promote an indentured servant or a
      *     petty criminal.
      * @see #getTurnsOfTraining
-     *
-     * @param typeTeacher The teacher <code>UnitType</code>.
-     * @param typeStudent the student <code>UnitType</code>.
-     * @return The number of turns.
      */
     public int getNeededTurnsOfTraining(UnitType typeTeacher,
                                         UnitType typeStudent) {
diff --git a/src/net/sf/freecol/common/resources/AudioResource.java b/src/net/sf/freecol/common/resources/AudioResource.java
index 47929aa92..67d143827 100644
--- a/src/net/sf/freecol/common/resources/AudioResource.java
+++ b/src/net/sf/freecol/common/resources/AudioResource.java
@@ -43,7 +43,7 @@ public class AudioResource extends Resource {
      * Do not use directly.
      * @param resourceLocator The <code>URI</code> used when loading this
      *      resource.
-     * @throws Assorted exceptions from the underlying audio components
+     * @throws Exception of assorted types from the underlying audio components
      */
     public AudioResource(URI resourceLocator) throws Exception {
         super(resourceLocator);
diff --git a/src/net/sf/freecol/common/sound/SoundPlayer.java b/src/net/sf/freecol/common/sound/SoundPlayer.java
index 610a1467a..2ce85dffe 100644
--- a/src/net/sf/freecol/common/sound/SoundPlayer.java
+++ b/src/net/sf/freecol/common/sound/SoundPlayer.java
@@ -81,7 +81,7 @@ public class SoundPlayer {
      *
      * @param file The <code>File</code> to test.
      * @return An <code>AudioInputStream</code>, or null on failure.
-     * @throws Assorted exceptions if the file does not contain valid audio.
+     * @throws Exception if the file does not contain valid audio.
      */
     public static AudioInputStream getAudioInputStream(File file)
         throws Exception {
diff --git a/src/net/sf/freecol/server/generator/MapGenerator.java b/src/net/sf/freecol/server/generator/MapGenerator.java
index 5689d6729..a04854f2a 100644
--- a/src/net/sf/freecol/server/generator/MapGenerator.java
+++ b/src/net/sf/freecol/server/generator/MapGenerator.java
@@ -42,7 +42,6 @@ public interface MapGenerator {
      * Creates the map with the current set options
      *
      * @return The new <code>Map</code>.
-     * @exception FreeColException if an error occurs
      */
     public abstract Map createMap(LogBuilder lb);
 }

From 228beb130c56b47b69041a825f598a9bcd6a557e Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 13 Sep 2015 17:22:25 +0200
Subject: [PATCH 214/323] Remove unused imports

---
 src/net/sf/freecol/client/control/InGameController.java        | 3 ---
 src/net/sf/freecol/client/gui/TilePopup.java                   | 1 -
 src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java       | 2 --
 src/net/sf/freecol/client/gui/option/FileOptionUI.java         | 1 -
 src/net/sf/freecol/client/gui/option/ListOptionUI.java         | 1 -
 src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java    | 1 -
 src/net/sf/freecol/client/gui/panel/DifficultyDialog.java      | 1 -
 src/net/sf/freecol/client/gui/panel/FreeColDialog.java         | 1 -
 src/net/sf/freecol/client/gui/panel/InformationPanel.java      | 1 -
 src/net/sf/freecol/client/gui/panel/LoadDialog.java            | 1 -
 .../sf/freecol/client/gui/panel/MapEditorTransformPanel.java   | 1 -
 .../sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java | 1 -
 src/net/sf/freecol/client/gui/panel/MonarchDialog.java         | 1 -
 src/net/sf/freecol/client/gui/panel/QuickActionMenu.java       | 1 -
 .../sf/freecol/client/gui/panel/ReportClassicColonyPanel.java  | 1 -
 .../client/gui/panel/ReportContinentalCongressPanel.java       | 1 -
 src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java | 1 -
 src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java       | 1 -
 src/net/sf/freecol/client/gui/panel/SaveDialog.java            | 1 -
 .../sf/freecol/client/gui/panel/SelectDestinationDialog.java   | 2 --
 src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java  | 2 +-
 src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java       | 2 +-
 src/net/sf/freecol/common/debug/DebugUtils.java                | 1 -
 src/net/sf/freecol/server/ai/AIObject.java                     | 2 --
 src/net/sf/freecol/server/control/InGameInputHandler.java      | 1 -
 src/net/sf/freecol/server/control/PreGameInputHandler.java     | 1 -
 src/net/sf/freecol/server/generator/MapGenerator.java          | 1 -
 27 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index fba29ca42..2b2a32e2a 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -21,7 +21,6 @@ package net.sf.freecol.client.control;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -30,8 +29,6 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.swing.SwingUtilities;
-
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
diff --git a/src/net/sf/freecol/client/gui/TilePopup.java b/src/net/sf/freecol/client/gui/TilePopup.java
index 0aeef8bb7..2b0cf4c7b 100644
--- a/src/net/sf/freecol/client/gui/TilePopup.java
+++ b/src/net/sf/freecol/client/gui/TilePopup.java
@@ -23,7 +23,6 @@ import java.awt.Component;
 import java.awt.Container;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
diff --git a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
index e210f1786..153c7543f 100644
--- a/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
+++ b/src/net/sf/freecol/client/gui/menu/MapEditorMenuBar.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.client.gui.menu;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseMotionListener;
 import java.io.File;
@@ -32,7 +31,6 @@ import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.Canvas;
 import net.sf.freecol.client.gui.action.*;
 import net.sf.freecol.client.gui.action.DisplayTileTextAction.DisplayText;
 import net.sf.freecol.client.gui.panel.Utility;
diff --git a/src/net/sf/freecol/client/gui/option/FileOptionUI.java b/src/net/sf/freecol/client/gui/option/FileOptionUI.java
index 59e7eff67..3c018d196 100644
--- a/src/net/sf/freecol/client/gui/option/FileOptionUI.java
+++ b/src/net/sf/freecol/client/gui/option/FileOptionUI.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.client.gui.option;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.Color;
 import java.io.File;
 
diff --git a/src/net/sf/freecol/client/gui/option/ListOptionUI.java b/src/net/sf/freecol/client/gui/option/ListOptionUI.java
index 407c35ec6..247327d72 100644
--- a/src/net/sf/freecol/client/gui/option/ListOptionUI.java
+++ b/src/net/sf/freecol/client/gui/option/ListOptionUI.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.client.gui.option;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
diff --git a/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java b/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
index 0dba4b463..b0c6609ef 100644
--- a/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
@@ -21,7 +21,6 @@ package net.sf.freecol.client.gui.panel;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
diff --git a/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java b/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java
index b5909d146..fc9bdf913 100644
--- a/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.client.gui.panel;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.logging.Logger;
 
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
index 8c10cde62..368a741bd 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
@@ -48,7 +48,6 @@ import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.client.gui.plaf.FreeColOptionPaneUI;
-import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Specification;
diff --git a/src/net/sf/freecol/client/gui/panel/InformationPanel.java b/src/net/sf/freecol/client/gui/panel/InformationPanel.java
index 089b90e56..2e1d7a9b5 100644
--- a/src/net/sf/freecol/client/gui/panel/InformationPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InformationPanel.java
@@ -22,7 +22,6 @@ package net.sf.freecol.client.gui.panel;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
diff --git a/src/net/sf/freecol/client/gui/panel/LoadDialog.java b/src/net/sf/freecol/client/gui/panel/LoadDialog.java
index 4a146dbc5..ab76981b8 100644
--- a/src/net/sf/freecol/client/gui/panel/LoadDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/LoadDialog.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.client.gui.panel;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.List;
 
diff --git a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
index 0d7789de8..edea7fc65 100644
--- a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
@@ -24,7 +24,6 @@ import java.awt.Color;
 import java.awt.GridLayout;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
diff --git a/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java b/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
index 43a7177a3..6c1e68008 100644
--- a/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
@@ -22,7 +22,6 @@ package net.sf.freecol.client.gui.panel;
 import java.awt.Dimension;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Comparator;
diff --git a/src/net/sf/freecol/client/gui/panel/MonarchDialog.java b/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
index c56bdeef0..9e4b1bad2 100644
--- a/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/MonarchDialog.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.client.gui.panel;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.List;
 
 import javax.swing.ImageIcon;
diff --git a/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java b/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
index 4722a49d9..10279357f 100644
--- a/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
+++ b/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
@@ -21,7 +21,6 @@ package net.sf.freecol.client.gui.panel;
 
 import java.awt.Font;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
index 243d6a1f1..a6cbc7e05 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
@@ -44,7 +44,6 @@ import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.GoodsType;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.Unit;
-import net.sf.freecol.common.model.WorkLocation;
 
 
 /**
diff --git a/src/net/sf/freecol/client/gui/panel/ReportContinentalCongressPanel.java b/src/net/sf/freecol/client/gui/panel/ReportContinentalCongressPanel.java
index d7231e8dc..06b7aad17 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportContinentalCongressPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportContinentalCongressPanel.java
@@ -36,7 +36,6 @@ import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
-import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.FoundingFather;
 import net.sf.freecol.common.model.FoundingFather.FoundingFatherType;
 import net.sf.freecol.common.model.GoodsType;
diff --git a/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java b/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java
index c3b78b4cc..ee94c0dfc 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.client.gui.panel;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
index 2af423b79..d0bd53511 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
@@ -22,7 +22,6 @@ package net.sf.freecol.client.gui.panel;
 import java.awt.Font;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Hashtable;
diff --git a/src/net/sf/freecol/client/gui/panel/SaveDialog.java b/src/net/sf/freecol/client/gui/panel/SaveDialog.java
index 3be589a91..96182a6e9 100644
--- a/src/net/sf/freecol/client/gui/panel/SaveDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/SaveDialog.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.client.gui.panel;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.List;
 
diff --git a/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java b/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
index 21dd44136..63c103b5b 100644
--- a/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
@@ -21,7 +21,6 @@ package net.sf.freecol.client.gui.panel;
 
 import java.awt.Dimension;
 import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -41,7 +40,6 @@ import javax.swing.JList;
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
diff --git a/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java b/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
index 91d129303..6e541293a 100644
--- a/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
@@ -26,7 +26,6 @@ import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseListener;
@@ -52,6 +51,7 @@ import javax.swing.TransferHandler;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.plaf.PanelUI;
+
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
diff --git a/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java b/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
index 1a91cc0ea..cab627914 100644
--- a/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
@@ -21,7 +21,6 @@ package net.sf.freecol.client.gui.panel;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -38,6 +37,7 @@ import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JScrollPane;
 import javax.swing.event.ListSelectionEvent;
+
 import net.miginfocom.swing.MigLayout;
 
 import net.sf.freecol.client.FreeColClient;
diff --git a/src/net/sf/freecol/common/debug/DebugUtils.java b/src/net/sf/freecol/common/debug/DebugUtils.java
index 7243ca6bf..2ae9d919e 100644
--- a/src/net/sf/freecol/common/debug/DebugUtils.java
+++ b/src/net/sf/freecol/common/debug/DebugUtils.java
@@ -31,7 +31,6 @@ import java.util.stream.Collectors;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.GUI;
diff --git a/src/net/sf/freecol/server/ai/AIObject.java b/src/net/sf/freecol/server/ai/AIObject.java
index a8027b33b..87b659765 100644
--- a/src/net/sf/freecol/server/ai/AIObject.java
+++ b/src/net/sf/freecol/server/ai/AIObject.java
@@ -26,9 +26,7 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.model.FreeColObject;
 import net.sf.freecol.common.model.Game;
-import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.Specification;
-import net.sf.freecol.common.model.Unit;
 
 import org.w3c.dom.Element;
 
diff --git a/src/net/sf/freecol/server/control/InGameInputHandler.java b/src/net/sf/freecol/server/control/InGameInputHandler.java
index 63414b95a..805e4da24 100644
--- a/src/net/sf/freecol/server/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/server/control/InGameInputHandler.java
@@ -69,7 +69,6 @@ import net.sf.freecol.common.networking.MonarchActionMessage;
 import net.sf.freecol.common.networking.MoveMessage;
 import net.sf.freecol.common.networking.MoveToMessage;
 import net.sf.freecol.common.networking.NetworkConstants;
-import net.sf.freecol.common.networking.NetworkRequestHandler;
 import net.sf.freecol.common.networking.NewLandNameMessage;
 import net.sf.freecol.common.networking.NewRegionNameMessage;
 import net.sf.freecol.common.networking.NoRouteToServerException;
diff --git a/src/net/sf/freecol/server/control/PreGameInputHandler.java b/src/net/sf/freecol/server/control/PreGameInputHandler.java
index 21726b176..50612369b 100644
--- a/src/net/sf/freecol/server/control/PreGameInputHandler.java
+++ b/src/net/sf/freecol/server/control/PreGameInputHandler.java
@@ -32,7 +32,6 @@ import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.networking.Connection;
 import net.sf.freecol.common.networking.DOMMessage;
-import net.sf.freecol.common.networking.NetworkRequestHandler;
 import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.server.FreeColServer;
diff --git a/src/net/sf/freecol/server/generator/MapGenerator.java b/src/net/sf/freecol/server/generator/MapGenerator.java
index a04854f2a..f0f9ae771 100644
--- a/src/net/sf/freecol/server/generator/MapGenerator.java
+++ b/src/net/sf/freecol/server/generator/MapGenerator.java
@@ -19,7 +19,6 @@
 
 package net.sf.freecol.server.generator;
 
-import net.sf.freecol.common.FreeColException;
 import net.sf.freecol.common.model.Map;
 import net.sf.freecol.common.util.LogBuilder;
 

From c90948f8950181d1369de528fab9e98561a5cc87 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 13 Sep 2015 18:52:24 +0200
Subject: [PATCH 215/323] Move DialogHandler to gui package

---
 src/net/sf/freecol/client/gui/{panel => }/DialogHandler.java | 2 +-
 src/net/sf/freecol/client/gui/SwingGUI.java                  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename src/net/sf/freecol/client/gui/{panel => }/DialogHandler.java (95%)

diff --git a/src/net/sf/freecol/client/gui/panel/DialogHandler.java b/src/net/sf/freecol/client/gui/DialogHandler.java
similarity index 95%
rename from src/net/sf/freecol/client/gui/panel/DialogHandler.java
rename to src/net/sf/freecol/client/gui/DialogHandler.java
index d9a4a9837..1fcef1562 100644
--- a/src/net/sf/freecol/client/gui/panel/DialogHandler.java
+++ b/src/net/sf/freecol/client/gui/DialogHandler.java
@@ -17,7 +17,7 @@
  *  along with FreeCol.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sf.freecol.client.gui.panel;
+package net.sf.freecol.client.gui;
 
 
 /**
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 149e31e19..d92951d80 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -58,7 +58,6 @@ import net.sf.freecol.client.gui.animation.Animations;
 import net.sf.freecol.client.gui.panel.ColonyPanel;
 import net.sf.freecol.client.gui.panel.ColorChooserPanel;
 import net.sf.freecol.client.gui.panel.CornerMapControls;
-import net.sf.freecol.client.gui.panel.DialogHandler;
 import net.sf.freecol.client.gui.panel.FreeColDialog;
 import net.sf.freecol.client.gui.panel.LabourData.UnitData;
 import net.sf.freecol.client.gui.panel.MapControls;

From 4842542098998db3bdd0a28c28bee46515821a99 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 13 Sep 2015 18:49:40 +0200
Subject: [PATCH 216/323] Unify naming dialog methods in GUI using lambdas

---
 .../client/control/InGameController.java      | 20 +++++++++----
 .../sf/freecol/client/gui/DialogHandler.java  |  6 ++--
 src/net/sf/freecol/client/gui/GUI.java        | 13 +++-----
 src/net/sf/freecol/client/gui/SwingGUI.java   | 30 ++++---------------
 4 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 2b2a32e2a..2c12306c6 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -4017,8 +4017,12 @@ public final class InGameController implements NetworkConstants {
      * @param unit The <code>Unit</code> that has landed.
      */
     public void newLandName(String defaultName, Unit unit) {
-        gui.showNameNewLandDialog(StringTemplate.key("newLand.text"),
-                                  defaultName, unit);
+        gui.showNamingDialog(
+            StringTemplate.key("newLand.text"), defaultName, unit,
+            (String name) -> {
+                if (name == null || name.isEmpty()) name = defaultName;
+                nameNewLand(unit, name);
+            });
     }
 
     /**
@@ -4040,10 +4044,14 @@ public final class InGameController implements NetworkConstants {
             }
             nameNewRegion(tile, unit, region, defaultName);
         } else {
-            gui.showNameNewRegionDialog(StringTemplate
-                .template("nameRegion.text")
-                .addStringTemplate("%type%", region.getLabel()),
-                defaultName, unit, tile, region);
+            gui.showNamingDialog(
+                StringTemplate.template("nameRegion.text")
+                              .addStringTemplate("%type%", region.getLabel()),
+                defaultName, unit,
+                (String name) -> {
+                    if (name == null || name.isEmpty()) name = defaultName;
+                    nameNewRegion(tile, unit, region, name);
+                });
         }
     }
 
diff --git a/src/net/sf/freecol/client/gui/DialogHandler.java b/src/net/sf/freecol/client/gui/DialogHandler.java
index 1fcef1562..370a17bde 100644
--- a/src/net/sf/freecol/client/gui/DialogHandler.java
+++ b/src/net/sf/freecol/client/gui/DialogHandler.java
@@ -21,10 +21,10 @@ package net.sf.freecol.client.gui;
 
 
 /**
- * The base class for non-modal dialog handlers.
+ * The interface for non-modal dialog handlers.
  */
-public abstract class DialogHandler<T> {
+public interface DialogHandler<T> {
 
-    public abstract void handle(T response);
+    void handle(T response);
 
 };
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index b2593b631..09ef94ba0 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -1282,15 +1282,10 @@ public class GUI {
                                   StringTemplate template, String monarchKey) {
     }
 
-    public void showNameNewLandDialog(StringTemplate template,
-                                      final String defaultName,
-                                      final Unit unit) {
-    }
-
-    public void showNameNewRegionDialog(StringTemplate template,
-                                        final String defaultName,
-                                        final Unit unit, final Tile tile,
-                                        final Region region) {
+    public void showNamingDialog(StringTemplate template,
+                                 final String defaultName,
+                                 final Unit unit,
+                                 DialogHandler<String> handler) {
     }
 
     public void showFirstContactDialog(final Player player, final Player other,
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index d92951d80..deec4487d 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1306,31 +1306,11 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public void showNameNewLandDialog(StringTemplate template, final String defaultName,
-                                      final Unit unit) {
-        canvas.showNamingDialog(template, defaultName, unit,
-            new DialogHandler<String>() {
-                @Override
-                public void handle(String name) {
-                    if (name == null || name.isEmpty()) name = defaultName;
-                    igc().nameNewLand(unit, name);
-                }
-            });
-    }
-
-    @Override
-    public void showNameNewRegionDialog(StringTemplate template,
-                                        final String defaultName,
-                                        final Unit unit, final Tile tile,
-                                        final Region region) {
-        canvas.showNamingDialog(template, defaultName, unit,
-            new DialogHandler<String>() {
-                @Override
-                public void handle(String name) {
-                    if (name == null || name.isEmpty()) name = defaultName;
-                    igc().nameNewRegion(tile, unit, region, name);
-                }
-            });
+    public void showNamingDialog(StringTemplate template,
+                                      final String defaultName,
+                                      final Unit unit,
+                                      DialogHandler<String> handler) {
+        canvas.showNamingDialog(template, defaultName, unit, handler);
     }
 
     @Override

From 62bf5d6432aff9bca009e70b9014a367b35fdd70 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 13 Sep 2015 20:37:29 +0200
Subject: [PATCH 217/323] Move all DialogHandler in SwingGUI into lambdas in
 InGameController

---
 .../client/control/InGameController.java      | 49 +++++++---
 src/net/sf/freecol/client/gui/Canvas.java     | 17 ++--
 src/net/sf/freecol/client/gui/GUI.java        | 24 +++--
 src/net/sf/freecol/client/gui/SwingGUI.java   | 90 +++++--------------
 .../sf/freecol/client/gui/menu/DebugMenu.java |  6 +-
 5 files changed, 87 insertions(+), 99 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 2c12306c6..160af22fc 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -473,7 +473,13 @@ public final class InGameController implements NetworkConstants {
 
         for (; n > 0 || player.checkEmigrate() ; n--) {
             if (!allSame(europe.getRecruitables())) {
-                gui.showEmigrationDialog(player, n, fountainOfYouth);
+                final int nf = n;
+                gui.showEmigrationDialog(player, fountainOfYouth,
+                    (Integer value) -> { // Value is a valid slot
+                        emigrate(player,
+                            Europe.MigrationType.convertToMigrantSlot(value),
+                            nf-1, fountainOfYouth);
+                    });
                 return;
             }
             Unit u = askEmigrate(europe, Europe.MigrationType.getDefaultSlot());
@@ -832,7 +838,13 @@ public final class InGameController implements NetworkConstants {
                 if (unit.couldMove()) units.add(unit);
             }
             if (!units.isEmpty()) {
-                gui.showEndTurnDialog(units); // Modal dialog takes over
+                // Modal dialog takes over
+                gui.showEndTurnDialog(units,
+                    (Boolean value) -> {
+                        if (value != null && value) {
+                            endTurn(false);
+                        }
+                    });
                 return false;
             }
         }
@@ -2981,9 +2993,10 @@ public final class InGameController implements NetworkConstants {
      */
     public void chooseFoundingFather(List<FoundingFather> ffs) {
         if (ffs == null) return;
-        gui.showChooseFoundingFatherDialog(ffs);
+        gui.showChooseFoundingFatherDialog(ffs,
+            (FoundingFather ff) -> chooseFoundingFather(ffs, ff));
     }
-    
+
     /**
      * Claim a tile.
      *
@@ -3437,7 +3450,8 @@ public final class InGameController implements NetworkConstants {
      * @param n The number of settlements claimed by the native player.
      */
     public void firstContact(Player player, Player other, Tile tile, int n) {
-        gui.showFirstContactDialog(player, other, tile, n);
+        gui.showFirstContactDialog(player, other, tile, n,
+            (Boolean b) -> firstContact(player, other, tile, b));
     }
 
     /**
@@ -3448,7 +3462,14 @@ public final class InGameController implements NetworkConstants {
      * @param n The number of migrants available for selection.
      */
     public void fountainOfYouth(int n) {
-        gui.showEmigrationDialog(freeColClient.getMyPlayer(), n, true);
+        Player player = freeColClient.getMyPlayer();
+        final boolean fountainOfYouth = true;
+        gui.showEmigrationDialog(player, fountainOfYouth,
+            (Integer value) -> { // Value is a valid slot
+                emigrate(player,
+                         Europe.MigrationType.convertToMigrantSlot(value),
+                         n-1, fountainOfYouth);
+            });
     }
 
     /**
@@ -3793,9 +3814,10 @@ public final class InGameController implements NetworkConstants {
      * @param defenderId The identifier of the defender unit (may have sunk).
      */
     public void loot(Unit unit, List<Goods> goods, String defenderId) {
-        gui.showCaptureGoodsDialog(unit, goods, defenderId);
+        gui.showCaptureGoodsDialog(unit, goods,
+            (List<Goods> gl) -> lootCargo(unit, gl, defenderId));
     }
-    
+
     /**
      * Accept or reject a monarch action.
      *
@@ -3834,7 +3856,8 @@ public final class InGameController implements NetworkConstants {
      */
     public void monarch(MonarchAction action, StringTemplate template,
                         String monarchKey) {
-        gui.showMonarchDialog(action, template, monarchKey);
+        gui.showMonarchDialog(action, template, monarchKey,
+            (Boolean b) -> monarchAction(action, b));
     }
 
     /**
@@ -4722,7 +4745,6 @@ public final class InGameController implements NetworkConstants {
             || !unit.isCarrier()) return false;
 
         boolean ret = true;
-        boolean inEurope = unit.isInEurope();
         Colony colony = unit.getColony();
         if (colony != null) { // In colony, unload units and goods.
             for (Unit u : unit.getUnitList()) {
@@ -4739,7 +4761,10 @@ public final class InGameController implements NetworkConstants {
                 }
             }
             if (unit.hasGoodsCargo()) { // Goods left here must be dumped.
-                gui.showDumpCargoDialog(unit);
+                gui.showDumpCargoDialog(unit,
+                    (List<Goods> goodsList) -> {
+                        for (Goods g : goodsList) unloadCargo(g, true);
+                    });
                 return false;
             }
         } else { // Dump goods, units dislike jumping overboard
@@ -4812,7 +4837,7 @@ public final class InGameController implements NetworkConstants {
      */
     public void victory(String score) {
         displayHighScores("true".equalsIgnoreCase(score));
-        gui.showVictoryDialog();
+        gui.showVictoryDialog((Boolean result) -> victory(result));
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 5deadf98f..f7ae66998 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -1664,7 +1664,7 @@ public final class Canvas extends JDesktopPane {
      * @param handler A <code>DialogHandler</code> for the dialog response.
      */
     void showCaptureGoodsDialog(Unit unit, List<Goods> gl,
-                                       DialogHandler<List<Goods>> handler) {
+                                DialogHandler<List<Goods>> handler) {
         SwingUtilities.invokeLater(
             new DialogCallback<>(
                 new CaptureGoodsDialog(freeColClient, frame, unit, gl),
@@ -1689,7 +1689,7 @@ public final class Canvas extends JDesktopPane {
      * @param handler A <code>DialogHandler</code> for the dialog response.
      */
     void showChooseFoundingFatherDialog(List<FoundingFather> ffs,
-                                               DialogHandler<FoundingFather> handler) {
+                                        DialogHandler<FoundingFather> handler) {
         SwingUtilities.invokeLater(
             new DialogCallback<>(
                 new ChooseFoundingFatherDialog(freeColClient, frame, ffs),
@@ -1837,8 +1837,7 @@ public final class Canvas extends JDesktopPane {
      * @param unit The <code>Unit</code> that is dumping.
      * @param handler A <code>DialogHandler</code> for the dialog response.
      */
-    void showDumpCargoDialog(Unit unit,
-                                    DialogHandler<List<Goods>> handler) {
+    void showDumpCargoDialog(Unit unit, DialogHandler<List<Goods>> handler) {
         SwingUtilities.invokeLater(
             new DialogCallback<>(
                 new DumpCargoDialog(freeColClient, frame, unit),
@@ -1876,7 +1875,7 @@ public final class Canvas extends JDesktopPane {
      * @param handler A <code>DialogHandler</code> for the dialog response.
      */
     void showEmigrationDialog(Player player, boolean fountainOfYouth,
-                                     DialogHandler<Integer> handler) {
+                              DialogHandler<Integer> handler) {
         SwingUtilities.invokeLater(
             new DialogCallback<>(
                 new EmigrationDialog(freeColClient, frame, player.getEurope(),
@@ -1973,8 +1972,8 @@ public final class Canvas extends JDesktopPane {
      * @param handler A <code>DialogHandler</code> for the dialog response.
      */
     void showFirstContactDialog(Player player, Player other,
-                                       Tile tile, int settlementCount,
-                                       DialogHandler<Boolean> handler) {
+                                Tile tile, int settlementCount,
+                                DialogHandler<Boolean> handler) {
         SwingUtilities.invokeLater(
             new DialogCallback<>(
                 new FirstContactDialog(freeColClient, frame, player, other, tile,
@@ -2234,8 +2233,8 @@ public final class Canvas extends JDesktopPane {
      * @param handler A <code>DialogHandler</code> for the dialog response.
      */
     void showMonarchDialog(MonarchAction action,
-                                  StringTemplate template, String monarchKey,
-                                  DialogHandler<Boolean> handler) {
+                           StringTemplate template, String monarchKey,
+                           DialogHandler<Boolean> handler) {
         SwingUtilities.invokeLater(
             new DialogCallback<>(
                 new MonarchDialog(freeColClient, frame, action, template, monarchKey),
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index 09ef94ba0..b98dc885f 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -1107,13 +1107,14 @@ public class GUI {
     }
 
     public void showCaptureGoodsDialog(final Unit unit, List<Goods> gl,
-                                       final String defenderId) {
+                                       DialogHandler<List<Goods>> handler) {
     }
 
     public void showChatPanel() {
     }
 
-    public void showChooseFoundingFatherDialog(final List<FoundingFather> ffs) {
+    public void showChooseFoundingFatherDialog(final List<FoundingFather> ffs,
+            DialogHandler<FoundingFather> handler) {
     }
 
     public OptionGroup showClientOptionsDialog() {
@@ -1158,18 +1159,21 @@ public class GUI {
         return null;
     }
 
-    public void showDumpCargoDialog(Unit unit) {
+    public void showDumpCargoDialog(Unit unit,
+                                    DialogHandler<List<Goods>> handler) {
     }
 
     public boolean showEditOptionDialog(Option option) {
         return false;
     }
 
-    public void showEmigrationDialog(final Player player, final int n,
-                                     final boolean fountainOfYouth) {
+    public void showEmigrationDialog(final Player player,
+                                     final boolean fountainOfYouth,
+                                     DialogHandler<Integer> handler) {
     }
 
-    public void showEndTurnDialog(final List<Unit> units) {
+    public void showEndTurnDialog(final List<Unit> units,
+                                  DialogHandler<Boolean> handler) {
     }
 
     public void showErrorMessage(StringTemplate template) {
@@ -1279,7 +1283,8 @@ public class GUI {
     }
 
     public void showMonarchDialog(final MonarchAction action,
-                                  StringTemplate template, String monarchKey) {
+                                  StringTemplate template, String monarchKey,
+                                  DialogHandler<Boolean> handler) {
     }
 
     public void showNamingDialog(StringTemplate template,
@@ -1289,7 +1294,8 @@ public class GUI {
     }
 
     public void showFirstContactDialog(final Player player, final Player other,
-                                       final Tile tile, int settlementCount) {
+                                       final Tile tile, int settlementCount,
+                                       DialogHandler<Boolean> handler) {
     }
 
     public DiplomaticTrade showNegotiationDialog(FreeColGameObject our,
@@ -1403,7 +1409,7 @@ public class GUI {
     public void showTradeRoutePanel(Unit unit) {
     }
 
-    public void showVictoryDialog() {
+    public void showVictoryDialog(DialogHandler<Boolean> handler) {
     }
 
     public void updateGameOptions() {
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index deec4487d..bb673c389 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1026,14 +1026,8 @@ public class SwingGUI extends GUI {
 
     @Override
     public void showCaptureGoodsDialog(final Unit unit, List<Goods> gl,
-                                       final String defenderId) {
-        canvas.showCaptureGoodsDialog(unit, gl,
-            new DialogHandler<List<Goods>>() {
-                @Override
-                public void handle(List<Goods> gl) {
-                    igc().lootCargo(unit, gl, defenderId);
-                }
-            });
+                                       DialogHandler<List<Goods>> handler) {
+        canvas.showCaptureGoodsDialog(unit, gl, handler);
     }
 
     @Override
@@ -1042,14 +1036,9 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public void showChooseFoundingFatherDialog(final List<FoundingFather> ffs) {
-        canvas.showChooseFoundingFatherDialog(ffs,
-            new DialogHandler<FoundingFather>() {
-                @Override
-                public void handle(FoundingFather ff) {
-                    igc().chooseFoundingFather(ffs, ff);
-                }
-            });
+    public void showChooseFoundingFatherDialog(final List<FoundingFather> ffs,
+                DialogHandler<FoundingFather> handler) {
+        canvas.showChooseFoundingFatherDialog(ffs, handler);
     }
 
     @Override
@@ -1107,14 +1096,9 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public void showDumpCargoDialog(Unit unit) {
-        canvas.showDumpCargoDialog(unit,
-            new DialogHandler<List<Goods>>() {
-                @Override
-                public void handle(List<Goods> goodsList) {
-                    for (Goods g : goodsList) igc().unloadCargo(g, true);
-                }
-            });
+    public void showDumpCargoDialog(Unit unit,
+                                    DialogHandler<List<Goods>> handler) {
+        canvas.showDumpCargoDialog(unit, handler);
     }
 
     @Override
@@ -1123,30 +1107,16 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public void showEmigrationDialog(final Player player, final int n,
-                                     final boolean fountainOfYouth) {
-        canvas.showEmigrationDialog(player, fountainOfYouth,
-            new DialogHandler<Integer>() {
-                @Override
-                public void handle(Integer value) { // Value is a valid slot
-                    igc().emigrate(player,
-                        Europe.MigrationType.convertToMigrantSlot(value),
-                        n-1, fountainOfYouth);
-                }
-            });
+    public void showEmigrationDialog(final Player player,
+                                     final boolean fountainOfYouth,
+                                     DialogHandler<Integer> handler) {
+        canvas.showEmigrationDialog(player, fountainOfYouth, handler);
     }
 
     @Override
-    public void showEndTurnDialog(final List<Unit> units) {
-        canvas.showEndTurnDialog(units,
-            new DialogHandler<Boolean>() {
-                @Override
-                public void handle(Boolean value) {
-                    if (value != null && value) {
-                        igc().endTurn(false);
-                    }
-                }
-            });
+    public void showEndTurnDialog(final List<Unit> units,
+                                  DialogHandler<Boolean> handler) {
+        canvas.showEndTurnDialog(units, handler);
     }
 
     @Override
@@ -1295,14 +1265,9 @@ public class SwingGUI extends GUI {
 
     @Override
     public void showMonarchDialog(final MonarchAction action,
-                                  StringTemplate template, String monarchKey) {
-        canvas.showMonarchDialog(action, template, monarchKey,
-            new DialogHandler<Boolean>() {
-                @Override
-                public void handle(Boolean b) {
-                    igc().monarchAction(action, b);
-                }
-            });
+                                  StringTemplate template, String monarchKey,
+                                  DialogHandler<Boolean> handler) {
+        canvas.showMonarchDialog(action, template, monarchKey, handler);
     }
 
     @Override
@@ -1315,14 +1280,10 @@ public class SwingGUI extends GUI {
 
     @Override
     public void showFirstContactDialog(final Player player, final Player other,
-                                       final Tile tile, int settlementCount) {
+                                       final Tile tile, int settlementCount,
+                                       DialogHandler<Boolean> handler) {
         canvas.showFirstContactDialog(player, other, tile, settlementCount,
-            new DialogHandler<Boolean>() {
-                @Override
-                public void handle(Boolean b) {
-                    igc().firstContact(player, other, tile, b);
-                }
-            });
+                                      handler);
     }
 
     @Override
@@ -1535,13 +1496,8 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public void showVictoryDialog() {
-        canvas.showVictoryDialog(new DialogHandler<Boolean>() {
-                @Override
-                public void handle(Boolean result) {
-                    igc().victory(result);
-                }
-            });
+    public void showVictoryDialog(DialogHandler<Boolean> handler) {
+        canvas.showVictoryDialog(handler);
     }
 
     public boolean showWarehouseDialog(Colony colony) {
diff --git a/src/net/sf/freecol/client/gui/menu/DebugMenu.java b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
index 8cd2edaed..a891c19dd 100644
--- a/src/net/sf/freecol/client/gui/menu/DebugMenu.java
+++ b/src/net/sf/freecol/client/gui/menu/DebugMenu.java
@@ -263,8 +263,10 @@ public class DebugMenu extends JMenu {
 
         final JMenuItem monarchDialog = Utility.localizedMenuItem("menuBar.debug.displayMonarchPanel");
         monarchDialog.addActionListener((ActionEvent ae) -> {
-                gui.showMonarchDialog(Monarch.MonarchAction.RAISE_TAX_WAR,
-                                      null, player.getMonarchKey());
+                gui.showMonarchDialog(
+                    Monarch.MonarchAction.RAISE_TAX_WAR, null, player.getMonarchKey(),
+                    (Boolean b) ->
+                        freeColClient.getInGameController().monarchAction(Monarch.MonarchAction.RAISE_TAX_WAR, b));
             });
         panelMenu.add(monarchDialog);
 

From 3a4f5674cc661ab8042de9875505c13d2e06c1a6 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 13 Sep 2015 19:02:52 +0930
Subject: [PATCH 218/323] More float->double conversion in combat.

---
 src/net/sf/freecol/common/model/Colony.java   |  4 +-
 .../sf/freecol/common/model/CombatModel.java  | 14 +++---
 .../common/model/IndianSettlement.java        |  4 +-
 .../common/model/SimpleCombatModel.java       | 50 +++++++++----------
 src/net/sf/freecol/common/model/Tile.java     |  3 +-
 src/net/sf/freecol/common/model/Unit.java     |  8 +--
 .../sf/freecol/server/ai/NativeAIPlayer.java  | 14 +++---
 .../ai/mission/DefendSettlementMission.java   | 12 ++---
 .../server/ai/mission/TransportMission.java   |  4 +-
 .../ai/mission/UnitSeekAndDestroyMission.java |  8 +--
 .../sf/freecol/server/model/ServerUnit.java   | 12 +++--
 .../sf/freecol/common/model/CombatTest.java   | 48 ++++++++----------
 .../sf/freecol/util/test/FreeColTestCase.java | 12 ++---
 .../freecol/util/test/MockPseudoRandom.java   | 10 +++-
 14 files changed, 102 insertions(+), 101 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index eea270fc2..826a2b57f 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -2658,9 +2658,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
         List<Unit> unitList = getUnitList();
 
         Unit defender = null;
-        float defencePower = -1.0f;
+        double defencePower = -1.0;
         for (Unit nextUnit : unitList) {
-            float unitPower = getGame().getCombatModel()
+            double unitPower = getGame().getCombatModel()
                 .getDefencePower(attacker, nextUnit);
             if (Unit.betterDefender(defender, defencePower,
                     nextUnit, unitPower)) {
diff --git a/src/net/sf/freecol/common/model/CombatModel.java b/src/net/sf/freecol/common/model/CombatModel.java
index 7cb6d1665..b0f2adf65 100644
--- a/src/net/sf/freecol/common/model/CombatModel.java
+++ b/src/net/sf/freecol/common/model/CombatModel.java
@@ -66,11 +66,11 @@ public abstract class CombatModel {
      * Odds a particular outcome will occur in combat.
      */
     public static class CombatOdds {
-        public static final float UNKNOWN_ODDS = -1.0f;
+        public static final double UNKNOWN_ODDS = -1.0;
 
-        public final float win;
+        public final double win;
 
-        public CombatOdds(float win) {
+        public CombatOdds(double win) {
             this.win = win;
         }
     }
@@ -201,8 +201,8 @@ public abstract class CombatModel {
      * @param defender The defender.
      * @return The offensive power.
      */
-    public abstract float getOffencePower(FreeColGameObject attacker,
-                                          FreeColGameObject defender);
+    public abstract double getOffencePower(FreeColGameObject attacker,
+                                           FreeColGameObject defender);
 
     /**
      * Get the defensive power of a defender wrt an attacker.
@@ -211,8 +211,8 @@ public abstract class CombatModel {
      * @param defender The defender.
      * @return The defensive power.
      */
-    public abstract float getDefencePower(FreeColGameObject attacker,
-                                          FreeColGameObject defender);
+    public abstract double getDefencePower(FreeColGameObject attacker,
+                                           FreeColGameObject defender);
 
     /**
      * Collect all the offensive modifiers that apply to an attack.
diff --git a/src/net/sf/freecol/common/model/IndianSettlement.java b/src/net/sf/freecol/common/model/IndianSettlement.java
index 520f92ec3..7a31981f7 100644
--- a/src/net/sf/freecol/common/model/IndianSettlement.java
+++ b/src/net/sf/freecol/common/model/IndianSettlement.java
@@ -1189,9 +1189,9 @@ public class IndianSettlement extends Settlement implements TradeLocation {
     @Override
     public Unit getDefendingUnit(Unit attacker) {
         Unit defender = null;
-        float defencePower = -1.0f;
+        double defencePower = -1.0;
         for (Unit nextUnit : getUnitList()) {
-            float unitPower = attacker.getGame().getCombatModel()
+            double unitPower = attacker.getGame().getCombatModel()
                 .getDefencePower(attacker, nextUnit);
             if (Unit.betterDefender(defender, defencePower,
                     nextUnit, unitPower)) {
diff --git a/src/net/sf/freecol/common/model/SimpleCombatModel.java b/src/net/sf/freecol/common/model/SimpleCombatModel.java
index 2ff13f9e4..260b255f3 100644
--- a/src/net/sf/freecol/common/model/SimpleCombatModel.java
+++ b/src/net/sf/freecol/common/model/SimpleCombatModel.java
@@ -94,14 +94,14 @@ public class SimpleCombatModel extends CombatModel {
         }
 
         if (lb != null) lb.add(" attacker=", attacker, " ");
-        float attackPower = getOffencePower(attacker, defender, lb);
+        double attackPower = getOffencePower(attacker, defender, lb);
         if (lb != null) lb.add(" defender=", defender, " ");
-        float defencePower = getDefencePower(attacker, defender, lb);
-        if (attackPower == 0.0f && defencePower == 0.0f) {
+        double defencePower = getDefencePower(attacker, defender, lb);
+        if (attackPower == 0.0 && defencePower == 0.0) {
             if (lb != null) lb.add(" odds=unknown");
             return new CombatOdds(CombatOdds.UNKNOWN_ODDS);
         }
-        float victory = attackPower / (attackPower + defencePower);
+        double victory = attackPower / (attackPower + defencePower);
         if (lb != null) lb.add(" odds=", victory);
         return new CombatOdds(victory);
     }
@@ -114,8 +114,8 @@ public class SimpleCombatModel extends CombatModel {
      * @return The offensive power.
      */
     @Override
-    public float getOffencePower(FreeColGameObject attacker,
-                                 FreeColGameObject defender) {
+    public double getOffencePower(FreeColGameObject attacker,
+                                  FreeColGameObject defender) {
         return getOffencePower(attacker, defender, null);
     }
 
@@ -140,10 +140,10 @@ public class SimpleCombatModel extends CombatModel {
      * @param lb An optional <code>LogBuilder</code> to log to.
      * @return The offensive power.
      */
-    private float getOffencePower(FreeColGameObject attacker,
-                                  FreeColGameObject defender,
-                                  LogBuilder lb) {
-        float result = 0.0f;
+    private double getOffencePower(FreeColGameObject attacker,
+                                   FreeColGameObject defender,
+                                   LogBuilder lb) {
+        double result = 0.0;
         if (attacker == null) {
             throw new IllegalStateException("Null attacker");
 
@@ -184,7 +184,7 @@ public class SimpleCombatModel extends CombatModel {
      * @return The defensive power.
      */
     @Override
-    public float getDefencePower(FreeColGameObject attacker,
+    public double getDefencePower(FreeColGameObject attacker,
                                  FreeColGameObject defender) {
         return getDefencePower(attacker, defender, null);
     }
@@ -197,10 +197,10 @@ public class SimpleCombatModel extends CombatModel {
      * @param lb An optional <code>LogBuilder</code> to log to.
      * @return The defensive power.
      */
-    public float getDefencePower(FreeColGameObject attacker,
+    public double getDefencePower(FreeColGameObject attacker,
                                  FreeColGameObject defender,
                                  LogBuilder lb) {
-        float result;
+        double result;
         if (combatIsDefenceMeasurement(attacker, defender)
             || combatIsAttack(attacker, defender)
             || combatIsSettlementAttack(attacker, defender)
@@ -602,7 +602,7 @@ public class SimpleCombatModel extends CombatModel {
         lb.add("Combat");
         ArrayList<CombatResult> crs = new ArrayList<>();
         CombatOdds odds = calculateCombatOdds(attacker, defender, lb);
-        float r = randomFloat(logger, "AttackResult", random);
+        double r = randomDouble(logger, "AttackResult", random);
         lb.add(" random(1.0)=", r);
         boolean great = false; // Great win or loss?
         String action;
@@ -612,7 +612,7 @@ public class SimpleCombatModel extends CombatModel {
             Unit defenderUnit = (Unit) defender;
             action = "Attack";
 
-            // For random float 0 <= r < 1.0:
+            // For random double 0 <= r < 1.0:
             // Partition this range into wins < odds.win and losses above.
             // Within the 0 <= r < odds.win range, partition the first 10%
             // to be great wins and the rest to be ordinary wins.
@@ -628,22 +628,22 @@ public class SimpleCombatModel extends CombatModel {
             //   else => great loss
             // ...and beached ships always lose.
             if (r < odds.win || defenderUnit.isBeached()) {
-                great = r < 0.1f * odds.win; // Great Win
+                great = r < 0.1 * odds.win; // Great Win
                 crs.add(CombatResult.WIN);
                 resolveAttack(attackerUnit, defenderUnit, great,
                     // Rescale to 0 <= r < 1
-                    r / (0.1f * odds.win), crs);
-            } else if (r < 0.8f * odds.win + 0.2f
+                    r / (0.1 * odds.win), crs);
+            } else if (r < 0.8 * odds.win + 0.2
                     && defenderUnit.hasAbility(Ability.EVADE_ATTACK)) {
                 crs.add(CombatResult.NO_RESULT);
                 crs.add(CombatResult.EVADE_ATTACK);
             } else {
-                great = r >= 0.1f * odds.win + 0.9f; // Great Loss
+                great = r >= 0.1 * odds.win + 0.9; // Great Loss
                 crs.add(CombatResult.LOSE);
                 resolveAttack(defenderUnit, attackerUnit, great,
                     // Rescaling to 0 <= r < 1
                     // (rearrange: 0.8 * odds.win + 0.2 <= r < 1.0)
-                    (1.25f * r - 0.25f - odds.win)/(1.0f - odds.win), crs);
+                    (1.25 * r - 0.25 - odds.win)/(1.0 - odds.win), crs);
             }
 
         } else if (combatIsBombard(attacker, defender)) {
@@ -661,9 +661,9 @@ public class SimpleCombatModel extends CombatModel {
 
                 // Great wins occur at most in 1 in 3 of successful bombards,
                 // Good defences reduce this proportion.
-                float offencePower = getOffencePower(attacker, defender);
-                float defencePower = getDefencePower(attacker, defender);
-                float diff = Math.max(3f, defencePower * 2f - offencePower);
+                double offencePower = getOffencePower(attacker, defender);
+                double defencePower = getDefencePower(attacker, defender);
+                double diff = Math.max(3.0, defencePower * 2.0 - offencePower);
                 great = r < odds.win / diff;
 
                 // Sink the defender on great wins or lack of repair
@@ -706,7 +706,7 @@ public class SimpleCombatModel extends CombatModel {
      * @param crs A list of <code>CombatResult</code>s to add to.
      */
     private void resolveAttack(Unit winner, Unit loser, boolean great,
-                               float r, List<CombatResult> crs) {
+                               double r, List<CombatResult> crs) {
         Player loserPlayer = loser.getOwner();
         Tile tile = loser.getTile();
         Player winnerPlayer = winner.getOwner();
@@ -805,7 +805,7 @@ public class SimpleCombatModel extends CombatModel {
                             crs.add(CombatResult.CAPTURE_CONVERT);
                             lose++;
                         }
-                    } else if (r >= 1.0f - winner.getBurnProbability()) {
+                    } else if (r >= 1.0 - winner.getBurnProbability()) {
                         for (IndianSettlement s
                                  : loserPlayer.getIndianSettlements()) {
                             if (s.hasMissionary(winnerPlayer)) {
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 3364e20a2..1dcbdae95 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -2049,8 +2049,7 @@ public final class Tile extends UnitLocation implements Named, Ownable {
     public Unit getDefendingUnit(Unit attacker) {
         CombatModel cm = getGame().getCombatModel();
         Unit defender = null;
-        float defenderPower = -1.0f;
-        float power;
+        double defenderPower = -1.0, power;
 
         // Check the units on the tile...
         for (Unit u : getUnitList()) {
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index a9fa2b337..1be5ce0fa 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -1841,8 +1841,8 @@ public class Unit extends GoodsLocation
      * @param otherPower Its defence power.
      * @return True if the other unit should be preferred.
      */
-    public static boolean betterDefender(Unit defender, float defenderPower,
-                                         Unit other, float otherPower) {
+    public static boolean betterDefender(Unit defender, double defenderPower,
+                                         Unit other, double otherPower) {
         if (defender == null) {
             return true;
         } else if (defender.isPerson() && other.isPerson()
@@ -1899,9 +1899,9 @@ public class Unit extends GoodsLocation
         return new Comparator<Unit>() {
                 @Override
                 public int compare(Unit u1, Unit u2) {
-                    float cmp = cm.calculateCombatOdds(u1, u2).win
+                    double cmp = cm.calculateCombatOdds(u1, u2).win
                         - cm.calculateCombatOdds(u2, u1).win;
-                    return (cmp < 0.5f) ? -1 : (cmp > 0.5f) ? 1 : 0;
+                    return (cmp < 0.5) ? -1 : (cmp > 0.5) ? 1 : 0;
                 }
             };
     }
diff --git a/src/net/sf/freecol/server/ai/NativeAIPlayer.java b/src/net/sf/freecol/server/ai/NativeAIPlayer.java
index 37c20e145..10a116d29 100644
--- a/src/net/sf/freecol/server/ai/NativeAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/NativeAIPlayer.java
@@ -279,7 +279,7 @@ public class NativeAIPlayer extends AIPlayer {
         }
 
         // Collect threats and other potential defenders
-        final HashMap<Tile, Float> threats = new HashMap<>();
+        final HashMap<Tile, Double> threats = new HashMap<>();
         Player enemy;
         Tension tension;
         for (Tile t : is.getTile().getSurroundingTiles(is.getRadius() + 1)) {
@@ -304,20 +304,20 @@ public class NativeAIPlayer extends AIPlayer {
                 ; // Not regarded as a threat
             } else {
                 // Evaluate the threat
-                float threshold, bonus, value = 0.0f;
+                double threshold, bonus, value = 0.0;
                 if (tension.getLevel().compareTo(Tension.Level.DISPLEASED) <= 0) {
-                    threshold = 1.0f;
+                    threshold = 1.0;
                     bonus = 0.0f;
                 } else {
-                    threshold = 0.0f;
+                    threshold = 0.0;
                     bonus = (float)tension.getLevel().ordinal()
                         - Tension.Level.CONTENT.ordinal();
                 }
                 for (Unit u : t.getUnitList()) {
-                    float offence = cm.getOffencePower(u, is);
+                    double offence = cm.getOffencePower(u, is);
                     if (offence > threshold) value += offence + bonus;
                 }
-                if (value > 0.0f) threats.put(t, value);
+                if (value > 0.0) threats.put(t, value);
             }
         }
 
@@ -367,7 +367,7 @@ public class NativeAIPlayer extends AIPlayer {
         Collections.sort(threatTiles, new Comparator<Tile>() {
                 @Override
                 public int compare(Tile t1, Tile t2) {
-                    return Float.compare(threats.get(t2),
+                    return Double.compare(threats.get(t2),
                             threats.get(t1));
                 }
             });
diff --git a/src/net/sf/freecol/server/ai/mission/DefendSettlementMission.java b/src/net/sf/freecol/server/ai/mission/DefendSettlementMission.java
index b566c183d..cde0500a9 100644
--- a/src/net/sf/freecol/server/ai/mission/DefendSettlementMission.java
+++ b/src/net/sf/freecol/server/ai/mission/DefendSettlementMission.java
@@ -381,7 +381,7 @@ public class DefendSettlementMission extends Mission {
 
         final CombatModel cm = unit.getGame().getCombatModel();
         Unit bestTarget = null;
-        float bestDifference = Float.MIN_VALUE;
+        double bestDifference = Double.MIN_VALUE;
         Direction bestDirection = null;
         for (Direction d : Direction.getRandomDirections("defendSettlements",
                 logger, getAIRandom())) {
@@ -392,11 +392,11 @@ public class DefendSettlementMission extends Mission {
                 && defender.getOwner().atWarWith(unit.getOwner())
                 && unit.getMoveType(d).isAttack()) {
                 Unit enemyUnit = t.getDefendingUnit(unit);
-                float enemyAttack = cm.getOffencePower(enemyUnit, unit);
-                float weAttack = cm.getOffencePower(unit, enemyUnit);
-                float enemyDefend = cm.getDefencePower(unit, enemyUnit);
-                float weDefend = cm.getDefencePower(enemyUnit, unit);
-                float difference = weAttack / (weAttack + enemyDefend)
+                double enemyAttack = cm.getOffencePower(enemyUnit, unit);
+                double weAttack = cm.getOffencePower(unit, enemyUnit);
+                double enemyDefend = cm.getDefencePower(unit, enemyUnit);
+                double weDefend = cm.getDefencePower(enemyUnit, unit);
+                double difference = weAttack / (weAttack + enemyDefend)
                     - enemyAttack / (enemyAttack + weDefend);
                 if (difference > bestDifference) {
                     if (difference > 0 || weAttack > enemyDefend) {
diff --git a/src/net/sf/freecol/server/ai/mission/TransportMission.java b/src/net/sf/freecol/server/ai/mission/TransportMission.java
index ce336abf7..b2334b430 100644
--- a/src/net/sf/freecol/server/ai/mission/TransportMission.java
+++ b/src/net/sf/freecol/server/ai/mission/TransportMission.java
@@ -166,8 +166,8 @@ public class TransportMission extends Mission {
                                 other.getOwner()) != null) return false;
         final Unit carrier = getUnit();
         final CombatModel cm = getGame().getCombatModel();
-        float offence = cm.getOffencePower(carrier, other)
-            * ((carrier.hasCargo()) ? 0.3f : 0.80f);
+        double offence = cm.getOffencePower(carrier, other)
+            * ((carrier.hasCargo()) ? 0.3 : 0.80);
         return offence > cm.getOffencePower(other, carrier);
     }
 
diff --git a/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMission.java b/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMission.java
index 5816b22a4..35c25f0f8 100644
--- a/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMission.java
+++ b/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMission.java
@@ -141,8 +141,8 @@ public class UnitSeekAndDestroyMission extends Mission {
         int value = 1020;
         value -= path.getTotalTurns() * 100;
 
-        final float off = combatModel.getOffencePower(unit, settlement);
-        value += off * 50;
+        final double off = combatModel.getOffencePower(unit, settlement);
+        value += (int)Math.round(off * 50);
 
         if (settlement instanceof Colony) {
             // Favour high population (more loot:-).
@@ -178,8 +178,8 @@ public class UnitSeekAndDestroyMission extends Mission {
         final Tile tile = path.getLastNode().getTile();
         final int turns = path.getTotalTurns();
         final CombatModel combatModel = unit.getGame().getCombatModel();
-        final float off = combatModel.getOffencePower(unit, defender);
-        final float def = combatModel.getDefencePower(unit, defender);
+        final double off = combatModel.getOffencePower(unit, defender);
+        final double def = combatModel.getDefencePower(unit, defender);
         if (tile == null || off <= 0) return Integer.MIN_VALUE;
 
         int value = 1020 - turns * 100;
diff --git a/src/net/sf/freecol/server/model/ServerUnit.java b/src/net/sf/freecol/server/model/ServerUnit.java
index d10900fdc..aab1c798b 100644
--- a/src/net/sf/freecol/server/model/ServerUnit.java
+++ b/src/net/sf/freecol/server/model/ServerUnit.java
@@ -543,7 +543,7 @@ public class ServerUnit extends Unit implements ServerModelObject {
         CombatModel combatModel = game.getCombatModel();
         boolean pirate = hasAbility(Ability.PIRACY);
         Unit attacker = null;
-        float attackPower = 0, totalAttackPower = 0;
+        double attackPower = 0, totalAttackPower = 0;
 
         if (!isNaval() || getMovesLeft() <= 0) return null;
         for (Tile tile : newTile.getSurroundingTiles(1)) {
@@ -566,11 +566,13 @@ public class ServerUnit extends Unit implements ServerModelObject {
             }
         }
         if (attacker != null) {
-            float defencePower = combatModel.getDefencePower(attacker, this);
-            float totalProbability = totalAttackPower + defencePower;
+            double defencePower = combatModel.getDefencePower(attacker, this);
+            double totalProbability = totalAttackPower + defencePower;
             if (randomInt(logger, "Slowed", random,
-                    Math.round(totalProbability) + 1) < totalAttackPower) {
-                int diff = Math.max(0, Math.round(totalAttackPower - defencePower));
+                    (int)Math.round(totalProbability) + 1)
+                < totalAttackPower) {
+                int diff = (int)Math.max(0,
+                    Math.round(totalAttackPower - defencePower));
                 int moves = Math.min(9, 3 + diff / 3);
                 setMovesLeft(getMovesLeft() - moves);
                 logger.info(getId() + " slowed by " + attacker.getId()
diff --git a/test/src/net/sf/freecol/common/model/CombatTest.java b/test/src/net/sf/freecol/common/model/CombatTest.java
index f60a20195..9fbd1d760 100644
--- a/test/src/net/sf/freecol/common/model/CombatTest.java
+++ b/test/src/net/sf/freecol/common/model/CombatTest.java
@@ -467,21 +467,6 @@ public class CombatTest extends FreeColTestCase {
     }
 
     public void testRegulars() {
-        Random random = new Random(1);
-        // these are the first ten values the RNG will produce
-        float[] values = new float[] {
-            0.7308782f,
-            0.100473166f,
-            0.4100808f,
-            0.40743977f,
-            0.2077148f,
-            0.036235332f,
-            0.332717f,
-            0.6588672f,
-            0.96775585f,
-            0.7107396f
-        };
-
         Game game = ServerTestHelper.startServerGame(getTestMap(plains, true));
         InGameController igc = ServerTestHelper.getInGameController();
 
@@ -500,50 +485,59 @@ public class CombatTest extends FreeColTestCase {
         Unit colonial = new ServerUnit(game, tile1, french, colonialRegularType,
                                        dragoonRole);
 
+        MockPseudoRandom loseRandom = new MockPseudoRandom();
+        List<Integer> i1 = new ArrayList<>();
+        i1.add((int)(Integer.MAX_VALUE * 0.85));
+        loseRandom.setNextNumbers(i1, true);
+        MockPseudoRandom winRandom = new MockPseudoRandom();
+        List<Integer> i2 = new ArrayList<>();
+        i2.add((int)(Integer.MAX_VALUE * 0.20));
+        winRandom.setNextNumbers(i2, true);
+
         // colonist + regular + cavalry * attack bonus
-        float offence = (0 + 4 + 3) * 1.5f;
+        double offence = (0 + 4 + 3) * 1.5;
         assertEquals(offence, combatModel.getOffencePower(regular, colonial));
         // colonist + colonial + dragoon
-        float defence = 0 + 3 + 3;
+        double defence = 0 + 3 + 3;
         assertEquals(defence, combatModel.getDefencePower(regular, colonial));
 
         List<CombatResult> crs
-            = combatModel.generateAttackResult(random, regular, colonial);
+            = combatModel.generateAttackResult(loseRandom, regular, colonial);
         checkCombat("Regular v Colonial", crs,
             CombatResult.LOSE, CombatResult.LOSE_EQUIP);
-        refPlayer.csCombat(regular, colonial, crs, random, new ChangeSet());
+        refPlayer.csCombat(regular, colonial, crs, loseRandom, new ChangeSet());
         assertEquals(infantryRole, regular.getRole());
 
         // (colonist + regular + infantry) * attack bonus
-        offence = (0 + 4 + 2) * 1.5f;
+        offence = (0 + 4 + 2) * 1.5;
         assertEquals(offence, combatModel.getOffencePower(regular, colonial));
 
         // slaughter King's Regular
-        crs = combatModel.generateAttackResult(random, colonial, regular);
+        crs = combatModel.generateAttackResult(winRandom, colonial, regular);
         checkCombat("Regular should be slaughtered upon losing all equipment",
             crs, CombatResult.WIN, CombatResult.SLAUGHTER_UNIT);
 
         regular = new ServerUnit(game, tile2, french, kingsRegularType,
                                  cavalryRole);
 
-        crs = combatModel.generateAttackResult(random, regular, colonial);
+        crs = combatModel.generateAttackResult(winRandom, regular, colonial);
         checkCombat("Regular v Colonial (2)", crs,
             CombatResult.WIN, CombatResult.LOSE_EQUIP);
-        refPlayer.csCombat(regular, colonial, crs, random, new ChangeSet());
+        refPlayer.csCombat(regular, colonial, crs, winRandom, new ChangeSet());
         assertEquals(soldierRole, colonial.getRole());
 
-        crs = combatModel.generateAttackResult(random, regular, colonial);
+        crs = combatModel.generateAttackResult(winRandom, regular, colonial);
         checkCombat("Regular v Colonial (3)", crs,
             CombatResult.WIN, CombatResult.LOSE_EQUIP, CombatResult.DEMOTE_UNIT);
-        refPlayer.csCombat(regular, colonial, crs, random, new ChangeSet());
+        refPlayer.csCombat(regular, colonial, crs, winRandom, new ChangeSet());
         assertFalse(colonial.isArmed());
         assertEquals(veteranType, colonial.getType());
         assertEquals(spec().getDefaultRole(), colonial.getRole());
 
-        crs = combatModel.generateAttackResult(random, regular, colonial);
+        crs = combatModel.generateAttackResult(winRandom, regular, colonial);
         checkCombat("Regular v Colonial (4)", crs,
             CombatResult.WIN, CombatResult.CAPTURE_UNIT);
-        refPlayer.csCombat(regular, colonial, crs, random, new ChangeSet());
+        refPlayer.csCombat(regular, colonial, crs, winRandom, new ChangeSet());
     }
 
     public void testCaptureConvert() {
diff --git a/test/src/net/sf/freecol/util/test/FreeColTestCase.java b/test/src/net/sf/freecol/util/test/FreeColTestCase.java
index 7287be0e5..0c22d8571 100644
--- a/test/src/net/sf/freecol/util/test/FreeColTestCase.java
+++ b/test/src/net/sf/freecol/util/test/FreeColTestCase.java
@@ -630,20 +630,20 @@ public class FreeColTestCase extends TestCase {
                                                FreeColGameObject defender)
     {
         List<CombatResult> crs;
-        final float delta = 0.02f;
+        final double delta = 0.02;
         CombatModel combatModel = getGame().getCombatModel();
         CombatOdds combatOdds = combatModel.calculateCombatOdds(attacker, defender);
-        float f = combatOdds.win;
+        double p = combatOdds.win;
         MockPseudoRandom mr = new MockPseudoRandom();
         List<Integer> number = new ArrayList<>();
         number.add(-1);
         do {
-            f += (result == CombatResult.WIN) ? -delta : delta;
-            if (f < 0.0f || f >= 1.0f) {
+            p += (result == CombatResult.WIN) ? -delta : delta;
+            if (p < 0.0 || p >= 1.0) {
                 throw new IllegalStateException("f out of range: "
-                                                + Float.toString(f));
+                                                + Double.toString(p));
             }
-            number.set(0, (int)(Integer.MAX_VALUE * f));
+            number.set(0, (int)(Integer.MAX_VALUE * p));
             mr.setNextNumbers(number, true);
             crs = combatModel.generateAttackResult(mr, attacker, defender);
         } while (crs.get(0) != result);
diff --git a/test/src/net/sf/freecol/util/test/MockPseudoRandom.java b/test/src/net/sf/freecol/util/test/MockPseudoRandom.java
index 05a146a5a..a5489427f 100644
--- a/test/src/net/sf/freecol/util/test/MockPseudoRandom.java
+++ b/test/src/net/sf/freecol/util/test/MockPseudoRandom.java
@@ -35,14 +35,14 @@ public class MockPseudoRandom extends Random {
         this(new ArrayList<Integer>(), false);
     }
     
-    public MockPseudoRandom(List<Integer> setNumbers,boolean toCycle){
+    public MockPseudoRandom(List<Integer> setNumbers, boolean toCycle) {
         pos = 0;
         setNumberList = setNumbers;
         cycleNumbers = toCycle;
         random = null;
     }
     
-    public void setNextNumbers(List<Integer> setNumbers,boolean toCycle){
+    public void setNextNumbers(List<Integer> setNumbers, boolean toCycle) {
         pos = 0;
         setNumberList = setNumbers;
         cycleNumbers = toCycle;
@@ -80,4 +80,10 @@ public class MockPseudoRandom extends Random {
         int number = getNext();
         return (number < 0) ? random.nextFloat() : number * scale;
     }
+
+    @Override
+    public double nextDouble() {
+        int number = getNext();
+        return (number < 0) ? random.nextDouble() : number * scale;
+    }
 }

From 342867dcb7399940d64c06b9f68d73ce4fae8cba Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 14 Sep 2015 14:19:31 +0930
Subject: [PATCH 219/323] File filter suffix lists should be unmodifiable.

---
 src/net/sf/freecol/common/io/FreeColFileFilter.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/common/io/FreeColFileFilter.java b/src/net/sf/freecol/common/io/FreeColFileFilter.java
index bb84fbd87..d5b13b99b 100644
--- a/src/net/sf/freecol/common/io/FreeColFileFilter.java
+++ b/src/net/sf/freecol/common/io/FreeColFileFilter.java
@@ -20,11 +20,13 @@
 package net.sf.freecol.common.io;
 
 import java.io.File;
+import java.util.List;
 
 import javax.swing.filechooser.FileFilter;
 
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.common.i18n.Messages;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -32,7 +34,7 @@ import net.sf.freecol.common.i18n.Messages;
  */
 public class FreeColFileFilter extends FileFilter {
 
-    private final String[] extensions;
+    private final List<String> extensions;
     private final boolean allowSubdirs;
     private final String description;
 
@@ -57,7 +59,7 @@ public class FreeColFileFilter extends FileFilter {
      */
     public FreeColFileFilter(String extension, boolean allowSubdirs,
                              String description) {
-        this.extensions = new String[] { extension };
+        this.extensions = makeUnmodifiableList(extension);
         this.allowSubdirs = allowSubdirs;
         this.description = Messages.message(description);
     }

From e1763709cd53f2815507540ad9bd3e1d59214217 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 13 Sep 2015 11:09:31 +0930
Subject: [PATCH 220/323] Second pass adding Java8 stream/../sum, now also with
 filter() or count().

---
 src/net/sf/freecol/common/model/Building.java | 15 ++---
 src/net/sf/freecol/common/model/Colony.java   | 19 +++---
 .../sf/freecol/common/model/ColonyTile.java   |  7 +--
 .../common/model/IndianSettlement.java        | 36 ++++-------
 src/net/sf/freecol/common/model/Monarch.java  | 13 ++--
 src/net/sf/freecol/common/model/Player.java   | 62 +++++++------------
 .../freecol/common/model/ProductionType.java  |  9 +--
 src/net/sf/freecol/common/model/Role.java     | 12 ++++
 .../common/model/SimpleCombatModel.java       | 14 ++---
 src/net/sf/freecol/common/model/Tile.java     | 10 +--
 src/net/sf/freecol/server/ai/ColonyPlan.java  | 29 ++++-----
 .../sf/freecol/server/ai/NativeAIPlayer.java  |  7 +--
 .../ai/mission/UnitSeekAndDestroyMission.java |  9 +--
 .../sf/freecol/server/model/ServerPlayer.java | 14 ++---
 .../sf/freecol/server/model/ServerUnit.java   |  7 +--
 15 files changed, 110 insertions(+), 153 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Building.java b/src/net/sf/freecol/common/model/Building.java
index 7ca93b8bd..8272356c3 100644
--- a/src/net/sf/freecol/common/model/Building.java
+++ b/src/net/sf/freecol/common/model/Building.java
@@ -280,8 +280,8 @@ public class Building extends WorkLocation
 
         // Then reduce the minimum ratio if some input is in short supply.
         for (AbstractGoods input : getInputs()) {
-            int required = (int)Math.floor(input.getAmount() * minimumRatio);
-            int available = getAvailable(input.getType(), inputs);
+            long required = (long)Math.floor(input.getAmount() * minimumRatio);
+            long available = getAvailable(input.getType(), inputs);
             // Do not allow auto-production to go negative.
             if (canAutoProduce()) available = Math.max(0, available);
             // Experts in factory level buildings may produce a
@@ -290,13 +290,10 @@ public class Building extends WorkLocation
             if (available < required
                 && hasAbility(Ability.EXPERTS_USE_CONNECTIONS)
                 && spec.getBoolean(GameOptions.EXPERTS_HAVE_CONNECTIONS)) {
-                int minimumGoodsInput = 0;
-                for (Unit unit: getUnitList()) {
-                    if (unit.getType() == getExpertUnitType()) {
-                        // FIXME: put magic number in specification
-                        minimumGoodsInput += 4;
-                    }
-                }
+                long minimumGoodsInput = 4 // FIXME: magic number
+                    * (int)getUnitList().stream()
+                        .filter(u -> u.getType() == getExpertUnitType())
+                        .count();
                 if (minimumGoodsInput > available) {
                     available = minimumGoodsInput;
                 }
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 826a2b57f..ec39cc486 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -1630,14 +1630,10 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return The total defence power.
      */
     public double getTotalDefencePower() {
-        CombatModel cm = getGame().getCombatModel();
-        double defence = 0.0;
-        for (Unit unit : getTile().getUnitList()) {
-            if (unit.isDefensiveUnit()) {
-                defence += cm.getDefencePower(null, unit);
-            }
-        }
-        return defence;
+        final CombatModel cm = getGame().getCombatModel();
+        return getTile().getUnitList().stream()
+            .filter(Unit::isDefensiveUnit)
+            .mapToDouble(u -> cm.getDefencePower(null, u)).sum();
     }
 
     /**
@@ -1749,10 +1745,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
                     .mapToInt(g -> g.evaluateFor(player)).sum();
         } else { // Much guesswork
             result = getDisplayUnitCount() * 1000
-                + 500; // Some useful goods?
-            for (Tile t : getTile().getSurroundingTiles(1)) {
-                if (t.getOwningSettlement() == this) result += 200;
-            }
+                + 500 // Some useful goods?
+                + 200 * (int)getTile().getSurroundingTiles(0, 1).stream()
+                    .filter(t -> t.getOwningSettlement() == this).count();
             Building stockade = getStockade();
             if (stockade != null) result *= stockade.getLevel();
         }
diff --git a/src/net/sf/freecol/common/model/ColonyTile.java b/src/net/sf/freecol/common/model/ColonyTile.java
index c21f4afc6..fb863bc88 100644
--- a/src/net/sf/freecol/common/model/ColonyTile.java
+++ b/src/net/sf/freecol/common/model/ColonyTile.java
@@ -236,10 +236,9 @@ public class ColonyTile extends WorkLocation {
                 }
                 // No production showstoppers found
                 // Would the passive food production be improved?
-                for (AbstractGoods ag : newProd) {
-                    if (ag.getType().isFoodType()) food += ag.getAmount();
-                }
-                return food;
+                return newProd.stream()
+                    .filter(ag -> ag.getType().isFoodType())
+                    .mapToInt(AbstractGoods::getAmount).sum();
             }
 
             // Tile type stays the same, return the sum of any food bonues.
diff --git a/src/net/sf/freecol/common/model/IndianSettlement.java b/src/net/sf/freecol/common/model/IndianSettlement.java
index 7a31981f7..5fa549c98 100644
--- a/src/net/sf/freecol/common/model/IndianSettlement.java
+++ b/src/net/sf/freecol/common/model/IndianSettlement.java
@@ -769,19 +769,14 @@ public class IndianSettlement extends Settlement implements TradeLocation {
 
         final Specification spec = getSpecification();
         final UnitType unitType = getFirstUnit().getType();
-        final Role militaryRole = Role.getAvailableRoles(getOwner(),
-            unitType, spec.getMilitaryRoles()).get(0);
+        final List<Role> militaryRoles = Role.getAvailableRoles(getOwner(),
+            unitType, spec.getMilitaryRoles());
 
-        if (type.isMilitaryGoods()) {
-            // Retain enough goods to fully arm.
-            int need = 0;
-            for (Unit u : ownedUnits) {
-                if (u.getRole() == militaryRole) continue;
-                List<AbstractGoods> required
-                    = u.getGoodsDifference(militaryRole, 1);
-                need += AbstractGoods.getCount(type, required);
-            }
-            return need;
+        if (type.isMilitaryGoods()) { // Retain enough goods to fully arm
+            return ownedUnits.stream()
+                .filter(u -> !militaryRoles.contains(u.getRole()))
+                .mapToInt(u -> AbstractGoods.getCount(type, 
+                        u.getGoodsDifference(militaryRoles.get(0), 1))).sum();
         }
 
         int consumption = getConsumptionOf(type);
@@ -949,15 +944,11 @@ public class IndianSettlement extends Settlement implements TradeLocation {
      *         be produced in one turn.
      */
     public int getMaximumProduction(GoodsType goodsType) {
-        int amount = 0;
-        for (Tile workTile: getTile().getSurroundingTiles(getRadius())) {
-            if (workTile.getOwningSettlement() == null || workTile.getOwningSettlement() == this) {
-                // FIXME: make unitType brave
-                amount += workTile.getPotentialProduction(goodsType, null);
-            }
-        }
-
-        return amount;
+        return getTile().getSurroundingTiles(0, getRadius()).stream()
+            .filter(t -> t.getOwningSettlement() == null
+                    || t.getOwningSettlement() == this)
+            // FIXME: make unitType brave
+            .mapToInt(t -> t.getPotentialProduction(goodsType, null)).sum();
     }
 
 
@@ -1257,9 +1248,8 @@ public class IndianSettlement extends Settlement implements TradeLocation {
             return getUnitCount();
         }
 
-        int potential = 0;
         int tiles = 0;
-
+        int potential = 0;
         for (Tile workTile : getOwnedTiles()) {
             if (workTile != getTile() && !workTile.isOccupied()) {
                 // FIXME: make unitType brave
diff --git a/src/net/sf/freecol/common/model/Monarch.java b/src/net/sf/freecol/common/model/Monarch.java
index ca67738e4..fe46f676c 100644
--- a/src/net/sf/freecol/common/model/Monarch.java
+++ b/src/net/sf/freecol/common/model/Monarch.java
@@ -110,14 +110,13 @@ public final class Monarch extends FreeColGameObject implements Named {
          */
         public final void updateSpaceAndCapacity() {
             final Specification spec = getSpecification();
-            capacity = 0;
-            for (AbstractUnit nu : navalUnits) {
-                if (nu.getType(spec).canCarryUnits()) {
-                    capacity += nu.getType(spec).getSpace() * nu.getNumber();
-                }
-            }
+            capacity = navalUnits.stream()
+                .filter(nu -> nu.getType(spec).canCarryUnits())
+                .mapToInt(nu -> nu.getType(spec).getSpace()
+                    * nu.getNumber()).sum();
             spaceRequired = landUnits.stream()
-                .mapToInt(lu -> lu.getType(spec).getSpaceTaken() * lu.getNumber()).sum();
+                .mapToInt(lu -> lu.getType(spec).getSpaceTaken()
+                    * lu.getNumber()).sum();
         }
 
         /**
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 618443346..767358556 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -1372,12 +1372,11 @@ public class Player extends FreeColGameObject implements Nameable {
         
         final List<GoodsType> immigrationGoodsTypes = getSpecification()
             .getImmigrationGoodsTypeList();
-        int production = 0;
-        for (Colony colony : getColonies()) {
-            production += immigrationGoodsTypes.stream()
-                .mapToInt(gt -> colony.getTotalProductionOf(gt)).sum();
-        }
-        Europe europe = getEurope();
+        int production = getColonies().stream()
+            .mapToInt(c -> immigrationGoodsTypes.stream()
+                .mapToInt(gt -> c.getTotalProductionOf(gt)).sum())
+            .sum();
+        final Europe europe = getEurope();
         if (europe != null) production += europe.getImmigration(production);
         return production;
     }
@@ -1461,11 +1460,11 @@ public class Player extends FreeColGameObject implements Nameable {
      *     <code>Colony</code>s will make next turn.
      */
     public int getLibertyProductionNextTurn() {
-        int nextTurn = 0;
-        for (Colony colony : getColonies()) {
-            nextTurn += getSpecification().getLibertyGoodsTypeList().stream()
-                .mapToInt(gt -> colony.getTotalProductionOf(gt)).sum();
-        }
+        final Specification spec = getSpecification();
+        int nextTurn = getColonies().stream()
+            .mapToInt(c -> spec.getLibertyGoodsTypeList().stream()
+                .mapToInt(gt -> c.getTotalProductionOf(gt)).sum())
+            .sum();
         return (int)applyModifiers((float)nextTurn, getGame().getTurn(),
                                    Modifier.LIBERTY);
     }
@@ -1645,13 +1644,9 @@ public class Player extends FreeColGameObject implements Nameable {
      */
     public int calculateStrength(boolean naval) {
         final CombatModel cm = getGame().getCombatModel();
-        int s = 0;
-        for (Unit unit : getUnits()) {
-            if (unit.isNaval() == naval) {
-                s += cm.getOffencePower(unit, null);
-            }
-        }
-        return s;
+        return (int)getUnits().stream()
+            .filter(u -> u.isNaval() == naval)
+            .mapToDouble(u -> cm.getOffencePower(u, null)).sum();
     }
 
     /**
@@ -1941,18 +1936,11 @@ public class Player extends FreeColGameObject implements Nameable {
      */
     public int getPrice(AbstractUnit au) {
         final Specification spec = getSpecification();
-        UnitType unitType = au.getType(spec);
-        Role role = au.getRole(spec);
-        if (unitType.hasPrice()) {
-            int price = getEurope().getUnitPrice(unitType);
-            for (AbstractGoods goods : role.getRequiredGoods()) {
-                int amount = goods.getAmount() * role.getMaximumCount();
-                price += getMarket().getBidPrice(goods.getType(), amount);
-            }
-            return price * au.getNumber();
-        } else {
-            return INFINITY;
-        }
+        final UnitType unitType = au.getType(spec);
+        if (!unitType.hasPrice()) return INFINITY;
+
+        return au.getNumber() * (getEurope().getUnitPrice(unitType)
+            + au.getRole(spec).getRequiredGoodsPrice(getMarket()));
     }
 
     /**
@@ -3057,7 +3045,6 @@ public class Player extends FreeColGameObject implements Nameable {
     public int getLandPrice(Tile tile) {
         final Specification spec = getSpecification();
         Player nationOwner = tile.getOwner();
-        int price = 0;
 
         if (nationOwner == null || nationOwner == this) {
             return 0; // Freely available
@@ -3071,15 +3058,12 @@ public class Player extends FreeColGameObject implements Nameable {
                 return 0; // Claim abandoned or only by tile improvement
             }
         } // Else, native ownership
-        for (GoodsType type : spec.getGoodsTypeList()) {
-            if (type == spec.getPrimaryFoodType()) {
+        int price = spec.getInteger(GameOptions.LAND_PRICE_FACTOR)
+            * spec.getGoodsTypeList().stream()
                 // Only consider specific food types, not the aggregation.
-                continue;
-            }
-            price += tile.getPotentialProduction(type, null);
-        }
-        price *= spec.getInteger(GameOptions.LAND_PRICE_FACTOR);
-        price += 100;
+                .filter(gt -> gt != spec.getPrimaryFoodType())
+                .mapToInt(gt -> tile.getPotentialProduction(gt, null)).sum()
+            + 100;
         return (int)applyModifiers(price, getGame().getTurn(),
                                    Modifier.LAND_PAYMENT_MODIFIER);
     }
diff --git a/src/net/sf/freecol/common/model/ProductionType.java b/src/net/sf/freecol/common/model/ProductionType.java
index 9f04f4780..2cc9d38f7 100644
--- a/src/net/sf/freecol/common/model/ProductionType.java
+++ b/src/net/sf/freecol/common/model/ProductionType.java
@@ -311,12 +311,9 @@ public class ProductionType extends FreeColObject {
         ProductionType best = null;
         int bestSum = 0;
         for (ProductionType pt : types) {
-            int sum = 0;
-            for (AbstractGoods output : pt.getOutputs()) {
-                if (goodsType == null || goodsType == output.getType()) {
-                    sum += output.getAmount();
-                }
-            }
+            int sum = pt.getOutputs().stream()
+                .filter(o -> goodsType == null || goodsType == o.getType())
+                .mapToInt(AbstractGoods::getAmount).sum();
             if (bestSum < sum) {
                 bestSum = sum;
                 best = pt;
diff --git a/src/net/sf/freecol/common/model/Role.java b/src/net/sf/freecol/common/model/Role.java
index 3b2fa9dbb..f5a85e103 100644
--- a/src/net/sf/freecol/common/model/Role.java
+++ b/src/net/sf/freecol/common/model/Role.java
@@ -258,6 +258,18 @@ public class Role extends BuildableType {
         return result;
     }
 
+    /**
+     * Get the price of the required goods in a given market.
+     *
+     * @param market The <code>Market</code> to evaluate in.
+     * @return The price of the goods for this role.
+     */
+    public int getRequiredGoodsPrice(Market market) {
+        return getRequiredGoods().stream()
+            .mapToInt(ag -> market.getBidPrice(ag.getType(),
+                    ag.getAmount() * getMaximumCount())).sum();
+    }
+        
     /**
      * Get the role changes that can allow a unit to assume this role.
      *
diff --git a/src/net/sf/freecol/common/model/SimpleCombatModel.java b/src/net/sf/freecol/common/model/SimpleCombatModel.java
index 260b255f3..43a8e5b83 100644
--- a/src/net/sf/freecol/common/model/SimpleCombatModel.java
+++ b/src/net/sf/freecol/common/model/SimpleCombatModel.java
@@ -161,11 +161,9 @@ public class SimpleCombatModel extends CombatModel {
         } else if (combatIsBombard(attacker, defender)) {
             Settlement attackerSettlement = (Settlement) attacker;
             if (attackerSettlement.hasAbility(Ability.BOMBARD_SHIPS)) {
-                for (Unit unit : attackerSettlement.getTile().getUnitList()) {
-                    if (unit.hasAbility(Ability.BOMBARD)) {
-                        result += unit.getType().getOffence();
-                    }
-                }
+                result += attackerSettlement.getTile().getUnitList().stream()
+                    .filter(u -> u.hasAbility(Ability.BOMBARD))
+                    .mapToDouble(u -> u.getType().getOffence()).sum();
             }
             if (result > MAXIMUM_BOMBARD_POWER) result = MAXIMUM_BOMBARD_POWER;
             if (lb != null) lb.add(" bombard=", result);
@@ -185,7 +183,7 @@ public class SimpleCombatModel extends CombatModel {
      */
     @Override
     public double getDefencePower(FreeColGameObject attacker,
-                                 FreeColGameObject defender) {
+                                  FreeColGameObject defender) {
         return getDefencePower(attacker, defender, null);
     }
 
@@ -198,8 +196,8 @@ public class SimpleCombatModel extends CombatModel {
      * @return The defensive power.
      */
     public double getDefencePower(FreeColGameObject attacker,
-                                 FreeColGameObject defender,
-                                 LogBuilder lb) {
+                                  FreeColGameObject defender,
+                                  LogBuilder lb) {
         double result;
         if (combatIsDefenceMeasurement(attacker, defender)
             || combatIsAttack(attacker, defender)
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 1dcbdae95..601d598fa 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -1580,17 +1580,13 @@ public final class Tile extends UnitLocation implements Named, Ownable {
             }
         }
 
-        int food = 0;
-        for (Entry<GoodsType, Integer> entry : goodsMap.entrySet()) {
-            if (entry.getKey().isFoodType()) {
-                food += entry.getValue();
-            }
-        }
-
         StringTemplate ret = StringTemplate.label("\n");
         if (landLocked) {
             ret.add("warning.landLocked");
         }
+        int food = goodsMap.entrySet().stream()
+            .filter(e -> e.getKey().isFoodType())
+            .mapToInt(e -> e.getValue()).sum();
         if (food < 8) {
             ret.add("warning.noFood");
         }
diff --git a/src/net/sf/freecol/server/ai/ColonyPlan.java b/src/net/sf/freecol/server/ai/ColonyPlan.java
index 4272bbd30..472f58211 100644
--- a/src/net/sf/freecol/server/ai/ColonyPlan.java
+++ b/src/net/sf/freecol/server/ai/ColonyPlan.java
@@ -825,18 +825,16 @@ public class ColonyPlan {
 
         // Weight by lower required goods.
         for (BuildPlan bp : buildPlans) {
-            double difficulty = 0.0f;
-            for (AbstractGoods ag : bp.type.getRequiredGoods()) {
-                GoodsType g = ag.getType();
-                int need = ag.getAmount() - colony.getGoodsCount(g);
-                if (need > 0) {
-                    // Penalize building with type that can not be
-                    // made locally.
-                    double f = (produce.contains(g.getInputType())) ? 1.0
-                        : 5.0;
-                    difficulty += need * f;
-                }
-            }
+            double difficulty = bp.type.getRequiredGoods().stream()
+                .filter(ag -> ag.getAmount() > colony.getGoodsCount(ag.getType()))
+                .mapToDouble(ag -> {
+                        final GoodsType type = ag.getType();
+                        return (ag.getAmount() - colony.getGoodsCount(type))
+                            // Penalize building with type that can not be
+                            // made locally.
+                            * ((produce.contains(type.getInputType())) ? 1.0
+                                : 5.0);
+                    }).sum();
             bp.difficulty = Math.max(1.0f, Math.sqrt(difficulty));
         }
 
@@ -1391,10 +1389,9 @@ public class ColonyPlan {
                 // what is needed for a building--- e.g. prevent
                 // musket production from hogging the tools.
                 GoodsType raw = goodsType.getInputType();
-                int rawNeeded = 0;
-                for (AbstractGoods ag : buildGoods) {
-                    if (raw == ag.getType()) rawNeeded += ag.getAmount();
-                }
+                int rawNeeded = buildGoods.stream()
+                    .filter(ag -> ag.getType() == raw)
+                    .mapToInt(AbstractGoods::getAmount).sum();
                 if (raw == null
                     || col.getAdjustedNetProductionOf(raw) >= 0
                     || (((col.getGoodsCount(raw) - rawNeeded)
diff --git a/src/net/sf/freecol/server/ai/NativeAIPlayer.java b/src/net/sf/freecol/server/ai/NativeAIPlayer.java
index 10a116d29..3248d3c59 100644
--- a/src/net/sf/freecol/server/ai/NativeAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/NativeAIPlayer.java
@@ -313,10 +313,9 @@ public class NativeAIPlayer extends AIPlayer {
                     bonus = (float)tension.getLevel().ordinal()
                         - Tension.Level.CONTENT.ordinal();
                 }
-                for (Unit u : t.getUnitList()) {
-                    double offence = cm.getOffencePower(u, is);
-                    if (offence > threshold) value += offence + bonus;
-                }
+                value += t.getUnitList().stream()
+                    .filter(u -> cm.getOffencePower(u, is) > threshold)
+                    .mapToDouble(u -> cm.getOffencePower(u, is) + bonus).sum();
                 if (value > 0.0) threats.put(t, value);
             }
         }
diff --git a/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMission.java b/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMission.java
index 35c25f0f8..d1f356dca 100644
--- a/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMission.java
+++ b/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMission.java
@@ -187,12 +187,9 @@ public class UnitSeekAndDestroyMission extends Mission {
 
         // Add a big bonus for treasure trains on the tile.
         // Do not cheat and look at the value.
-        for (Unit u : tile.getUnitList()) {
-            if (u.canCarryTreasure() && u.getTreasureAmount() > 0) {
-                value += 1000;
-                break;
-            }
-        }
+        value += 1000 * tile.getUnitList().stream()
+            .filter(u -> u.canCarryTreasure() && u.getTreasureAmount() > 0)
+            .count();
 
         if (defender.isNaval()) {
             if (tile.isLand()) value += 500; // Easy win
diff --git a/src/net/sf/freecol/server/model/ServerPlayer.java b/src/net/sf/freecol/server/model/ServerPlayer.java
index e078f9356..66a85adfd 100644
--- a/src/net/sf/freecol/server/model/ServerPlayer.java
+++ b/src/net/sf/freecol/server/model/ServerPlayer.java
@@ -595,9 +595,9 @@ public class ServerPlayer extends Player implements ServerModelObject {
         // than the rebels.
         int rebelPower = 0;
         for (Player rebel : getRebels()) {
-            for (Unit r : rebel.getUnits()) {
-                if (!r.isNaval()) rebelPower += cm.getOffencePower(r, null);
-            }
+            rebelPower += rebel.getUnits().stream()
+                .filter(u -> !u.isNaval())
+                .mapToDouble(u -> cm.getOffencePower(u, null)).sum();
         }
         if (power > rebelPower) return false;
 
@@ -1908,11 +1908,9 @@ public class ServerPlayer extends Player implements ServerModelObject {
                         if (enemy.isEuropean()) {
                             Integer alarm = extra.get(enemy);
                             if (alarm == null) continue;
-                            for (Unit unit : tile.getUnitList()) {
-                                if (unit.isOffensiveUnit() && !unit.isNaval()) {
-                                    alarm += (int)unit.getType().getOffence();
-                                }
-                            }
+                            alarm += (int)tile.getUnitList().stream()
+                                .filter(u -> u.isOffensiveUnit() && !u.isNaval())
+                                .mapToDouble(u -> u.getType().getOffence()).sum();
                             extra.put(enemy, alarm);
                         }
                     } else if (colony != null) { // Colonies
diff --git a/src/net/sf/freecol/server/model/ServerUnit.java b/src/net/sf/freecol/server/model/ServerUnit.java
index aab1c798b..a1297996d 100644
--- a/src/net/sf/freecol/server/model/ServerUnit.java
+++ b/src/net/sf/freecol/server/model/ServerUnit.java
@@ -569,10 +569,9 @@ public class ServerUnit extends Unit implements ServerModelObject {
             double defencePower = combatModel.getDefencePower(attacker, this);
             double totalProbability = totalAttackPower + defencePower;
             if (randomInt(logger, "Slowed", random,
-                    (int)Math.round(totalProbability) + 1)
-                < totalAttackPower) {
-                int diff = (int)Math.max(0,
-                    Math.round(totalAttackPower - defencePower));
+                    (int)Math.round(totalProbability + 1)) < totalAttackPower) {
+                int diff = Math.max(0,
+                    (int)Math.round(totalAttackPower - defencePower));
                 int moves = Math.min(9, 3 + diff / 3);
                 setMovesLeft(getMovesLeft() - moves);
                 logger.info(getId() + " slowed by " + attacker.getId()

From 751cef07c2b8f8ddb8321a4bfcbc682de4632588 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 15 Sep 2015 09:27:19 +0930
Subject: [PATCH 221/323] Simplify file filters.

---
 src/net/sf/freecol/FreeCol.java               | 13 +--
 src/net/sf/freecol/client/FreeColClient.java  |  2 +-
 .../client/control/InGameController.java      |  6 +-
 src/net/sf/freecol/client/gui/Canvas.java     | 54 +++++------
 src/net/sf/freecol/client/gui/SwingGUI.java   |  7 +-
 .../client/gui/panel/DifficultyDialog.java    | 24 ++++-
 .../gui/panel/MapGeneratorOptionsDialog.java  |  2 +-
 .../freecol/client/gui/panel/SaveDialog.java  | 22 ++---
 .../sf/freecol/common/io/FreeColDataFile.java | 68 +++++---------
 .../freecol/common/io/FreeColDirectories.java |  2 +-
 .../freecol/common/io/FreeColFileFilter.java  | 91 -------------------
 .../sf/freecol/common/io/FreeColModFile.java  | 71 +++++++++------
 .../common/io/FreeColSavegameFile.java        | 29 +++---
 .../sf/freecol/common/io/FreeColTcFile.java   | 30 ++----
 src/net/sf/freecol/common/io/Mods.java        | 40 ++------
 src/net/sf/freecol/tools/FSGConverter.java    |  2 +-
 .../sf/freecol/tools/SaveGameValidator.java   |  2 +-
 .../server/generator/MapGeneratorTest.java    |  3 +-
 18 files changed, 163 insertions(+), 305 deletions(-)
 delete mode 100644 src/net/sf/freecol/common/io/FreeColFileFilter.java

diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index 806509a24..827e116e6 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -84,7 +84,7 @@ public final class FreeCol {
     };
 
     /** The extension for FreeCol saved games. */
-    public static final String  FREECOL_SAVE_EXTENSION = ".fsg";
+    public static final String  FREECOL_SAVE_EXTENSION = "fsg";
 
     /** The Java version. */
     private static final String JAVA_VERSION
@@ -93,17 +93,6 @@ public final class FreeCol {
     /** The maximum available memory. */
     private static final long MEMORY_MAX = Runtime.getRuntime().maxMemory();
 
-    /** A file filter to select the saved game files. */
-    public static final FileFilter freeColSaveFileFilter
-        = new FileFilter() {
-                @Override
-                public boolean accept(File f) {
-                    return f.isFile()
-                        && f.getName().endsWith(FREECOL_SAVE_EXTENSION)
-                        && f.getName().length() > FREECOL_SAVE_EXTENSION.length();
-                }
-            };
-
     public static final String  CLIENT_THREAD = "FreeColClient:";
     public static final String  SERVER_THREAD = "FreeColServer:";
     public static final String  METASERVER_THREAD = "FreeColMetaServer:";
diff --git a/src/net/sf/freecol/client/FreeColClient.java b/src/net/sf/freecol/client/FreeColClient.java
index b2a2db83e..252eae66f 100644
--- a/src/net/sf/freecol/client/FreeColClient.java
+++ b/src/net/sf/freecol/client/FreeColClient.java
@@ -810,7 +810,7 @@ public final class FreeColClient {
             if (validPeriod != 0L && autoSave != null
                 && (flist = autoSave.list()) != null) {
                 for (String f : flist) {
-                    if (!f.endsWith(FreeCol.FREECOL_SAVE_EXTENSION)) continue;
+                    if (!f.endsWith("." + FreeCol.FREECOL_SAVE_EXTENSION)) continue;
                     // delete files which are older than user option allows
                     File saveGameFile = new File(autoSave, f);
                     if (saveGameFile.lastModified() + validPeriod < timeNow) {
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 160af22fc..3c170c11a 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -600,10 +600,10 @@ public final class InGameController implements NetworkConstants {
         final String prefix = options.getText(ClientOptions.AUTO_SAVE_PREFIX);
         final String lastTurnName = prefix + "-"
             + options.getText(ClientOptions.LAST_TURN_NAME)
-            + FreeCol.FREECOL_SAVE_EXTENSION;
+            + "." + FreeCol.FREECOL_SAVE_EXTENSION;
         final String beforeLastTurnName = prefix + "-"
             + options.getText(ClientOptions.BEFORE_LAST_TURN_NAME)
-            + FreeCol.FREECOL_SAVE_EXTENSION;
+            + "." + FreeCol.FREECOL_SAVE_EXTENSION;
         File autoSaveDir = FreeColDirectories.getAutosaveDirectory();
         File lastTurnFile = new File(autoSaveDir, lastTurnName);
         File beforeLastTurnFile = new File(autoSaveDir, beforeLastTurnName);
@@ -619,7 +619,7 @@ public final class InGameController implements NetworkConstants {
         int turnNumber = game.getTurn().getNumber();
         if (saveGamePeriod >= 1 && turnNumber % saveGamePeriod == 0) {
             String fileName = prefix + "-" + getSaveGameString(game)
-                + FreeCol.FREECOL_SAVE_EXTENSION;
+                + "." + FreeCol.FREECOL_SAVE_EXTENSION;
             saveGame(new File(autoSaveDir, fileName));
         }
     }
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index f7ae66998..b80fd834c 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -57,6 +57,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 import javax.swing.filechooser.FileFilter;
+import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.plaf.basic.BasicInternalFrameUI;
 
 import net.sf.freecol.FreeCol;
@@ -71,7 +72,6 @@ import net.sf.freecol.client.gui.panel.*;
 import net.sf.freecol.client.gui.panel.LabourData.UnitData;
 import net.sf.freecol.common.ServerInfo;
 import net.sf.freecol.common.i18n.Messages;
-import net.sf.freecol.common.io.FreeColFileFilter;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.DiplomaticTrade;
 import net.sf.freecol.common.model.Direction;
@@ -878,6 +878,21 @@ public final class Canvas extends JDesktopPane {
         }
     }
 
+    /**
+     * Initialize the file filters to filter for saved games.
+     *
+     * @return File filters for the FreeCol save game extension.
+     */
+    private FileFilter[] getFileFilters() {
+        if (fileFilters == null) {
+            String s = Messages.message("filter.savedGames");
+            fileFilters = new FileFilter[] {
+                new FileNameExtensionFilter(s, FreeCol.FREECOL_SAVE_EXTENSION)
+            };
+        }
+        return fileFilters;
+    }
+
     /**
      * A component is closing.  Some components need position and size
      * to be saved.
@@ -2095,13 +2110,8 @@ public final class Canvas extends JDesktopPane {
      * @return The selected <code>File</code>.
      */
     File showLoadDialog(File directory) {
-        if (fileFilters == null) {
-            fileFilters = new FileFilter[] {
-                FreeColFileFilter.freeColSaveDirectoryFilter,
-            };
-        }
         return showFreeColDialog(new LoadDialog(freeColClient, frame, directory,
-                                                fileFilters),
+                                                getFileFilters()),
                                  null);
     }
 
@@ -2109,15 +2119,15 @@ public final class Canvas extends JDesktopPane {
      * Displays a dialog where the user may choose a file.
      *
      * @param directory The directory containing the files.
-     * @param fileFilters The file filters which the user can select in the
-     *     dialog.
+     * @param filters The file filters which the user can select in the dialog.
      * @return The selected <code>File</code>.
      */
-    File showLoadDialog(File directory, FileFilter[] fileFilters) {
+    File showLoadDialog(File directory, FileFilter[] filters) {
+        if (filters == null) filters = getFileFilters();
         File response = null;
         for (;;) {
             response = showFreeColDialog(new LoadDialog(freeColClient, frame,
-                                                        directory, fileFilters),
+                                                        directory, filters),
                                          null);
             if (response == null || response.isFile()) break;
             showErrorMessage("error.noSuchFile");
@@ -2397,14 +2407,8 @@ public final class Canvas extends JDesktopPane {
      * @param defaultName Default filename for the savegame.
      * @return The selected <code>File</code>.
      */
-    File showSaveDialog(File directory, String defaultName) {
-        if (fileFilters == null) {
-            fileFilters = new FileFilter[] {
-                FreeColFileFilter.freeColSaveDirectoryFilter,
-            };
-        }
-        return showSaveDialog(directory, fileFilters, defaultName,
-                              FreeCol.FREECOL_SAVE_EXTENSION);
+    public File showSaveDialog(File directory, String defaultName) {
+        return showSaveDialog(directory, getFileFilters(), defaultName);
     }
 
     /**
@@ -2412,17 +2416,15 @@ public final class Canvas extends JDesktopPane {
      *
      * @param directory The directory containing the files in which
      *     the user may overwrite.
-     * @param fileFilters The available file filters in the dialog.
+     * @param filters The available file filters in the dialog.
      * @param defaultName Default filename for the savegame.
-     * @param extension This extension will be added to the specified
-     *     filename (if not added by the user).
      * @return The selected <code>File</code>.
      */
-    File showSaveDialog(File directory, FileFilter[] fileFilters,
-                               String defaultName, String extension) {
+    public File showSaveDialog(File directory, FileFilter[] filters,
+                               String defaultName) {
+        if (filters == null) filters = getFileFilters();
         return showFreeColDialog(new SaveDialog(freeColClient, frame, directory,
-                                                fileFilters, defaultName,
-                                                extension),
+                                                filters, defaultName),
                                  null);
     }
 
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index bb673c389..5d13a3cd5 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1418,13 +1418,12 @@ public class SwingGUI extends GUI {
 
     @Override
     public File showSaveDialog(File directory, String defaultName) {
-        return canvas.showSaveDialog(directory, defaultName);
+        return showSaveDialog(directory, null, defaultName);
     }
 
     public File showSaveDialog(File directory, FileFilter[] fileFilters,
-                               String defaultName, String extension) {
-        return canvas.showSaveDialog(directory, fileFilters, defaultName,
-                                     extension);
+                               String defaultName) {
+        return canvas.showSaveDialog(directory, fileFilters, defaultName);
     }
 
     @Override
diff --git a/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java b/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java
index fc9bdf913..6fe88f897 100644
--- a/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/DifficultyDialog.java
@@ -28,13 +28,14 @@ import javax.swing.JFrame;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.filechooser.FileFilter;
+import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
 
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.common.io.FreeColDirectories;
-import net.sf.freecol.common.io.FreeColFileFilter;
+import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.option.OptionGroup;
 
@@ -49,9 +50,8 @@ public final class DifficultyDialog extends OptionsDialog
 
     private static final Logger logger = Logger.getLogger(DifficultyDialog.class.getName());
 
-    private static final FileFilter[] filters = {
-        FreeColFileFilter.freeColXMLFilter
-    };
+    /** File filters array to filter for XML files. */
+    private static final FileFilter[] filters = { null };
 
     /** The currently selected subgroup. */
     private OptionGroup selected;
@@ -136,6 +136,7 @@ public final class DifficultyDialog extends OptionsDialog
      * @param button The <code>JButton</code> to add the action to.
      */
     private void addLoadAction(JButton button) {
+        initializeFilters();
         button.addActionListener((ActionEvent ae) -> {
                 File dir = FreeColDirectories.getOptionsDirectory();
                 File file = getGUI().showLoadDialog(dir, filters);
@@ -153,10 +154,11 @@ public final class DifficultyDialog extends OptionsDialog
      * @param button The <code>JButton</code> to add the action to.
      */
     private void addSaveAction(JButton button) {
+        initializeFilters();
         button.addActionListener((ActionEvent ae) -> {
                 File dir = FreeColDirectories.getOptionsDirectory();
                 File file = getGUI().showSaveDialog(dir, filters,
-                    getDefaultFileName(), ".xml");
+                                                    getDefaultFileName());
                 if (file != null) {
                     getOptionUI().updateOption();
                     save(file);
@@ -164,6 +166,18 @@ public final class DifficultyDialog extends OptionsDialog
             });
     }
 
+    /**
+     * Initialize the XML file filter.
+     */
+    private void initializeFilters() {
+        synchronized (filters) {
+            if (filters[0] == null) {
+                String desc = Messages.message("filter.xml");
+                filters[0] = new FileNameExtensionFilter(desc, "xml");
+            }
+        }
+    }
+
 
     // Implement TreeSelectionListener
 
diff --git a/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java b/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
index 6c1e68008..82c224445 100644
--- a/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
@@ -80,7 +80,7 @@ public final class MapGeneratorOptionsDialog extends OptionsDialog {
             // FIXME: The update should be solved by PropertyEvent.
             File mapDirectory = FreeColDirectories.getMapsDirectory();
             if (mapDirectory.isDirectory()) {
-                File[] files = mapDirectory.listFiles(FreeCol.freeColSaveFileFilter);
+                File[] files = mapDirectory.listFiles(FreeColSavegameFile.getFileFilter());
                 Arrays.sort(files, new Comparator<File>() {
                         @Override
                         public int compare(File f1, File f2) {
diff --git a/src/net/sf/freecol/client/gui/panel/SaveDialog.java b/src/net/sf/freecol/client/gui/panel/SaveDialog.java
index 96182a6e9..50402569e 100644
--- a/src/net/sf/freecol/client/gui/panel/SaveDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/SaveDialog.java
@@ -51,11 +51,9 @@ public final class SaveDialog extends FreeColDialog<File> {
      * @param directory The directory to display when choosing the file.
      * @param fileFilters The available file filters in the dialog.
      * @param defaultName Name of the default save game file.
-     * @param ext The default extension to add to user specified file names.
      */
     public SaveDialog(FreeColClient freeColClient, JFrame frame,
-            File directory, FileFilter[] fileFilters,
-            String defaultName, final String ext) {
+            File directory, FileFilter[] fileFilters, String defaultName) {
         super(freeColClient, frame);
 
         final JFileChooser fileChooser = new JFileChooser(directory);
@@ -70,19 +68,11 @@ public final class SaveDialog extends FreeColDialog<File> {
         fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         fileChooser.setFileHidingEnabled(false);
         fileChooser.setSelectedFile(new File(defaultName));
-        fileChooser.addActionListener((ActionEvent ae) -> {
-                final String cmd = ae.getActionCommand();
-                if (JFileChooser.APPROVE_SELECTION.equals(cmd)) {
-                    File file = fileChooser.getSelectedFile();
-                    if (!file.getName().endsWith(ext)) {
-                        file = new File(file.getAbsolutePath() + ext);
-                    }
-                    setValue(file);
-                } else {
-                    setValue(cancelFile);
-                }
-            });
-
+        fileChooser.addActionListener((ActionEvent ae) ->
+                setValue((JFileChooser.APPROVE_SELECTION
+                        .equals(ae.getActionCommand()))
+                    ? fileChooser.getSelectedFile() : cancelFile));
+        
         List<ChoiceItem<File>> c = choices();
         initializeDialog(frame, DialogType.QUESTION, true, fileChooser, null, c);
     }
diff --git a/src/net/sf/freecol/common/io/FreeColDataFile.java b/src/net/sf/freecol/common/io/FreeColDataFile.java
index 180197167..6d77b90a1 100644
--- a/src/net/sf/freecol/common/io/FreeColDataFile.java
+++ b/src/net/sf/freecol/common/io/FreeColDataFile.java
@@ -29,6 +29,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLConnection;
 
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
@@ -59,8 +60,7 @@ public class FreeColDataFile {
 
     private static final Logger logger = Logger.getLogger(FreeColDataFile.class.getName());
 
-    private static final Set<String> FILE_ENDINGS
-        = makeUnmodifiableSet(".zip");
+    protected static final String ZIP_FILE_EXTENSION = "zip";
     private static final String RESOURCE_FILE_PREFIX = "resources";
     private static final String RESOURCE_FILE_SUFFIX = ".properties";
 
@@ -84,38 +84,23 @@ public class FreeColDataFile {
      * @exception IOException if the file does not exist.
      */
     public FreeColDataFile(File file) throws IOException {
-        if (!file.exists()) {
-            for (String ending : getFileEndings()) {
-                final File tempFile = new File(file.getAbsolutePath() + ending);
-                if (tempFile.exists()) {
-                    file = tempFile;
-                    break;
-                }
-            }
-        }
         if (!file.exists()) {
             throw new IOException("File " + file.getName() + " does not exist");
         }
         this.file = file;
-
-        if (file.isDirectory()) {
-            this.jarDirectory = null;
-        } else {
-            String jarName = file.getName().substring(0,
-                file.getName().lastIndexOf('.'));
-            this.jarDirectory = findJarDirectory(jarName, file);
-        }
+        this.jarDirectory = (file.isDirectory()) ? null
+            : findJarDirectory(file);
     }
 
     /**
      * Finds the directory within the zip-file in case the data file
      * has been renamed.
      *
-     * @param expectedName The name the directory should have.
      * @param file The zip-file.
      * @return The name of the base directory in the zip-file.
      */
-    private static String findJarDirectory(final String expectedName, File file) {
+    private static String findJarDirectory(File file) {
+        String expected = file.getName().substring(0, file.getName().lastIndexOf('.'));
         try (
             JarFile jf = new JarFile(file);
         ) {
@@ -129,7 +114,7 @@ public class FreeColDataFile {
             return name;
         } catch (Exception e) {
             logger.log(Level.WARNING, "Exception while reading data file.", e);
-            return expectedName;
+            return expected;
         }
     }
 
@@ -290,32 +275,23 @@ public class FreeColDataFile {
     }
 
     /**
-     * Gets a <code>FileFilter</code> for the accepted file endings.
+     * Make a <code>FileFilter</code> for a set of file endings.
      *
-     * @return The <code>FileFilter</code>.
+     * @param requiredFile If non-null, the filter will accept a directory
+     *     containing this file.
+     * @param endings Acceptable file suffixes.
+     * @return A suitable <code>FileFilter</code>.
      */
-    public FileFilter getFileFilter() {
-        return new FileFilter() {
-            @Override
-            public boolean accept(File f) {
-                final String name = f.getName();
-                for (String ending : getFileEndings()) {
-                    if (name.endsWith(ending)) {
-                        return true;
-                    }
-                }
-                return false;
-            }
+    public static FileFilter makeFileFilter(final String requiredFile,
+                                            final String... endings) {
+        return f -> {
+            final String name = f.getName();
+            return (name.startsWith("."))
+                ? false
+                : (requiredFile != null && f.isDirectory())
+                ? new File(f, requiredFile).exists()
+                : Arrays.stream(endings).anyMatch(e -> name.endsWith("." + e)
+                    && name.length() > e.length());
         };
     }
-
-    /**
-     * File endings that are supported for this type of data file.
-     * Override in classes that accept other endings.
-     *
-     * @return An array with a single element: ".zip".
-     */
-    protected static Set<String> getFileEndings() {
-        return FILE_ENDINGS;
-    }
 }
diff --git a/src/net/sf/freecol/common/io/FreeColDirectories.java b/src/net/sf/freecol/common/io/FreeColDirectories.java
index 9d4d5a3ce..34df9d996 100644
--- a/src/net/sf/freecol/common/io/FreeColDirectories.java
+++ b/src/net/sf/freecol/common/io/FreeColDirectories.java
@@ -851,7 +851,7 @@ public class FreeColDirectories {
         for (File directory : new File[] {
                 FreeColDirectories.getSaveDirectory(),
                 FreeColDirectories.getAutosaveDirectory() }) {
-            for (File savegame : directory.listFiles(FreeCol.freeColSaveFileFilter)) {
+            for (File savegame : directory.listFiles(FreeColSavegameFile.getFileFilter())) {
                 if (lastSave == null
                     || savegame.lastModified() > lastSave.lastModified()) {
                     lastSave = savegame;
diff --git a/src/net/sf/freecol/common/io/FreeColFileFilter.java b/src/net/sf/freecol/common/io/FreeColFileFilter.java
deleted file mode 100644
index d5b13b99b..000000000
--- a/src/net/sf/freecol/common/io/FreeColFileFilter.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- *  Copyright (C) 2002-2015   The FreeCol Team
- *
- *  This file is part of FreeCol.
- *
- *  FreeCol 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, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  FreeCol 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 FreeCol.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sf.freecol.common.io;
-
-import java.io.File;
-import java.util.List;
-
-import javax.swing.filechooser.FileFilter;
-
-import net.sf.freecol.FreeCol;
-import net.sf.freecol.common.i18n.Messages;
-import static net.sf.freecol.common.util.CollectionUtils.*;
-
-
-/**
- * A simple file filter with a description.
- */
-public class FreeColFileFilter extends FileFilter {
-
-    private final List<String> extensions;
-    private final boolean allowSubdirs;
-    private final String description;
-
-    /**
-     * Visible predefined constant filter for selected saved games or
-     * subdirectories.
-     */
-    public static final FileFilter freeColSaveDirectoryFilter
-        = new FreeColFileFilter(FreeCol.FREECOL_SAVE_EXTENSION, true,
-                                "filter.savedGames");
-
-    public static final FileFilter freeColXMLFilter
-        = new FreeColFileFilter(".xml", true, "filter.xml");
-
-    
-    /**
-     * Create a new FreeColFileFilter.
-     *
-     * @param extension An acceptable extension.
-     * @param allowSubdirs If true accept subdirectories.
-     * @param description A description for the filter.
-     */
-    public FreeColFileFilter(String extension, boolean allowSubdirs,
-                             String description) {
-        this.extensions = makeUnmodifiableList(extension);
-        this.allowSubdirs = allowSubdirs;
-        this.description = Messages.message(description);
-    }
-
-
-    // Implement FileFilter
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean accept(File f) {
-        if (allowSubdirs && f.isDirectory()) return true;
-        if (!f.isFile()) return false;
-        for (String x : extensions) {
-            if (f.getName().endsWith(x) && f.getName().length() > x.length())
-                return true;
-        }
-        return false;
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/src/net/sf/freecol/common/io/FreeColModFile.java b/src/net/sf/freecol/common/io/FreeColModFile.java
index fd4eb5c0e..8cfd8107e 100644
--- a/src/net/sf/freecol/common/io/FreeColModFile.java
+++ b/src/net/sf/freecol/common/io/FreeColModFile.java
@@ -20,6 +20,7 @@
 package net.sf.freecol.common.io;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,8 +30,7 @@ import javax.xml.stream.XMLStreamException;
 import java.util.Set;
 
 import net.sf.freecol.common.ObjectWithId;
-
-import static net.sf.freecol.common.util.CollectionUtils.*;
+import net.sf.freecol.common.model.Specification;
 
 
 /**
@@ -38,12 +38,17 @@ import static net.sf.freecol.common.util.CollectionUtils.*;
  */
 public class FreeColModFile extends FreeColDataFile implements ObjectWithId {
 
-    private static final Set<String> FILE_ENDINGS
-        = makeUnmodifiableSet(".fmd", ".zip");
-    public static final String SPECIFICATION_FILE = "specification.xml";
-    public static final String MOD_DESCRIPTOR_FILE = "mod.xml";
+    protected static final String SPECIFICATION_FILE = "specification.xml";
+    protected static final String MOD_DESCRIPTOR_FILE = "mod.xml";
 
+    /** A file filter to select mods. */
+    private static final FileFilter fileFilter
+        = makeFileFilter(MOD_DESCRIPTOR_FILE, "fmd", ZIP_FILE_EXTENSION);
+
+    /** The identifier for this mod. */
     private String id;
+
+    /** The identifier for the parent of this mod, if any. */
     private String parent;
 
 
@@ -55,9 +60,11 @@ public class FreeColModFile extends FreeColDataFile implements ObjectWithId {
      */
     public FreeColModFile(final File file) throws IOException {
         super(file);
+
         readModDescriptor();
     }
 
+
     /**
      * Gets the input stream to the specification.
      *
@@ -74,6 +81,29 @@ public class FreeColModFile extends FreeColDataFile implements ObjectWithId {
         return null;
     }
 
+    /**
+     * Gets the Specification.
+     *
+     * @return The <code>Specification</code>, or null if none present.
+     * @exception IOException if an error occurs reading the specification.
+     */
+    public Specification getSpecification() throws IOException {
+        try (InputStream si = getSpecificationInputStream()) {
+            return (si == null) ? null : new Specification(si);
+        }
+    }
+
+    /**
+     * Gets the input stream to the mod meta file.
+     *
+     * @return An <code>InputStream</code> to the file "mod.xml"
+     *     within this data file.
+     * @exception IOException if thrown while opening the input stream.
+     */
+    private InputStream getModDescriptorInputStream() throws IOException {
+        return getInputStream(MOD_DESCRIPTOR_FILE);
+    }
+
     /**
      * Reads a file object representing this mod.
      *
@@ -92,26 +122,6 @@ public class FreeColModFile extends FreeColDataFile implements ObjectWithId {
         }
     }
 
-    /**
-     * Gets the input stream to the mod meta file.
-     *
-     * @return An <code>InputStream</code> to the file "mod.xml"
-     *     within this data file.
-     * @exception IOException if thrown while opening the input stream.
-     */
-    private InputStream getModDescriptorInputStream() throws IOException {
-        return getInputStream(MOD_DESCRIPTOR_FILE);
-    }
-
-    /**
-     * File endings that are supported for this type of data file.
-     *
-     * @return A set of: ".fmd" and ".zip".
-     */
-    protected static Set<String> getFileEndings() {
-        return FILE_ENDINGS;
-    }
-
     /**
      * Gets the object identifier of this mod.
      *
@@ -130,4 +140,13 @@ public class FreeColModFile extends FreeColDataFile implements ObjectWithId {
     public String getParent() {
         return parent;
     }
+
+    /**
+     * Get the file filter to select mod files.
+     *
+     * @return The mod file filter.
+     */
+    public static FileFilter getFileFilter() {
+        return fileFilter;
+    }
 }
diff --git a/src/net/sf/freecol/common/io/FreeColSavegameFile.java b/src/net/sf/freecol/common/io/FreeColSavegameFile.java
index 6331be645..69a2e54c4 100644
--- a/src/net/sf/freecol/common/io/FreeColSavegameFile.java
+++ b/src/net/sf/freecol/common/io/FreeColSavegameFile.java
@@ -20,28 +20,18 @@
 package net.sf.freecol.common.io;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.IOException;
 import java.io.BufferedInputStream;
 
-import java.util.Set;
-import java.util.logging.Logger;
-
 import net.sf.freecol.FreeCol;
 
-import static net.sf.freecol.common.util.CollectionUtils.*;
-
 
 /**
  * Represents a FreeCol savegame.
  */
 public class FreeColSavegameFile extends FreeColDataFile {
 
-    @SuppressWarnings("unused")
-    private static final Logger logger = Logger.getLogger(FreeColSavegameFile.class.getName());
-
-    private static final Set<String> FILE_ENDINGS
-        = makeUnmodifiableSet(FreeCol.FREECOL_SAVE_EXTENSION, ".zip");
-
     /** The tag for the version string in the saved game. */
     public static final String VERSION_TAG = "version";
 
@@ -72,8 +62,16 @@ public class FreeColSavegameFile extends FreeColDataFile {
      */
     public static final String THUMBNAIL_FILE = "thumbnail.png";
 
+    /** A file filter to select the saved game files. */
+    private static final FileFilter fileFilter = makeFileFilter(SAVEGAME_FILE,
+        FreeCol.FREECOL_SAVE_EXTENSION, ZIP_FILE_EXTENSION);
 
 
+    /**
+     * Create a new save game file from a given file.
+     *
+     * @param file The base <code>File</code>.
+     */
     public FreeColSavegameFile(File file) throws IOException {
         super(file);
     }
@@ -119,10 +117,11 @@ public class FreeColSavegameFile extends FreeColDataFile {
     }
 
     /**
-     * File endings that are supported for this type of data file.
-     * @return An array of: ".fsg" and ".zip".
+     * Get the file filter to select saved game files.
+     *
+     * @return The saved game file filter.
      */
-    protected static Set<String> getFileEndings() {
-        return FILE_ENDINGS;
+    public static FileFilter getFileFilter() {
+        return fileFilter;
     }
 }
diff --git a/src/net/sf/freecol/common/io/FreeColTcFile.java b/src/net/sf/freecol/common/io/FreeColTcFile.java
index 22f5957d7..7b42e9fbf 100644
--- a/src/net/sf/freecol/common/io/FreeColTcFile.java
+++ b/src/net/sf/freecol/common/io/FreeColTcFile.java
@@ -20,14 +20,12 @@
 package net.sf.freecol.common.io;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.InputStream;
 import java.io.IOException;
 
-import java.util.Set;
-
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.resources.ResourceMapping;
-import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -35,8 +33,9 @@ import static net.sf.freecol.common.util.CollectionUtils.*;
  */
 public class FreeColTcFile extends FreeColModFile {
 
-    private static final Set<String> FILE_ENDINGS
-        = makeUnmodifiableSet(".ftc", ".zip");
+    /** A file filter to select TCs. */
+    private static final FileFilter fileFilter
+        = makeFileFilter(MOD_DESCRIPTOR_FILE, "ftc", ZIP_FILE_EXTENSION);
 
 
     /**
@@ -60,19 +59,6 @@ public class FreeColTcFile extends FreeColModFile {
     }
 
 
-    /**
-     * Gets the Specification of this TC.
-     *
-     * @return The <code>Specification</code> in this TC, or null if
-     *     none present.
-     * @exception IOException if an error occurs reading the specification.
-     */
-    public Specification getSpecification() throws IOException {
-        try (InputStream si = getSpecificationInputStream()) {
-            return (si == null) ? null : new Specification(si);
-        }
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -97,11 +83,11 @@ public class FreeColTcFile extends FreeColModFile {
     }
 
     /**
-     * File endings that are supported for this type of data file.
+     * Get the file filter to select TC files.
      *
-     * @return A set: ".ftc" and ".zip".
+     * @return The TC file filter.
      */
-    protected static Set<String> getFileEndings() {
-        return FILE_ENDINGS;
+    public static FileFilter getFileFilter() {
+        return fileFilter;
     }
 }
diff --git a/src/net/sf/freecol/common/io/Mods.java b/src/net/sf/freecol/common/io/Mods.java
index 82e3b0337..99ef6297c 100644
--- a/src/net/sf/freecol/common/io/Mods.java
+++ b/src/net/sf/freecol/common/io/Mods.java
@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.sf.freecol.common.io.FreeColModFile;
 import net.sf.freecol.common.util.LogBuilder;
 
 
@@ -40,26 +41,6 @@ public class Mods {
 
     private static final Logger logger = Logger.getLogger(Mods.class.getName());
 
-    private static final FileFilter MOD_FILTER = new FileFilter() {
-            @Override
-            public boolean accept(File f) {
-                final String name = f.getName();
-                if (name.startsWith(".")) {
-                    // Ignore `hidden' files.
-                    return false;
-                } else if (f.isDirectory()) {
-                    return true;
-                } else {
-                    for (String ending : FreeColModFile.getFileEndings()) {
-                        if (name.endsWith(ending)) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }
-            }
-        };
-
     /** A cache of all the mods. */
     private static final Map<String, FreeColModFile> allMods = new HashMap<>();
 
@@ -74,7 +55,7 @@ public class Mods {
             LogBuilder lb = new LogBuilder(64);
             lb.add("In ", directory.getPath(), " found mod:");
             lb.mark();
-            for (File f : directory.listFiles(MOD_FILTER)) {
+            for (File f : directory.listFiles(FreeColModFile.getFileFilter())) {
                 try {
                     FreeColModFile fcmf = new FreeColModFile(f);
                     allMods.put(fcmf.getId(), fcmf);
@@ -137,18 +118,11 @@ public class Mods {
     public static List<FreeColTcFile> getRuleSets() {
         List<FreeColTcFile> result = new ArrayList<>();
         File directory = FreeColDirectories.getRulesDirectory();
-        for (File dir : directory.listFiles()) {
-            if (dir.isDirectory()) {
-                File modDescription
-                    = new File(dir, FreeColModFile.MOD_DESCRIPTOR_FILE);
-                if (modDescription.exists()) {
-                    try {
-                        result.add(new FreeColTcFile(dir));
-                    } catch (IOException e) {
-                        logger.log(Level.WARNING, "Failed to create rule set "
-                            + dir, e);
-                    }
-                }
+        for (File f : directory.listFiles(FreeColTcFile.getFileFilter())) {
+            try {
+                result.add(new FreeColTcFile(f));
+            } catch (IOException ioe) {
+                logger.log(Level.WARNING, "Failed to load rule set " + f, ioe);
             }
         }
         return result;
diff --git a/src/net/sf/freecol/tools/FSGConverter.java b/src/net/sf/freecol/tools/FSGConverter.java
index 19a725edd..785915768 100644
--- a/src/net/sf/freecol/tools/FSGConverter.java
+++ b/src/net/sf/freecol/tools/FSGConverter.java
@@ -198,7 +198,7 @@ public class FSGConverter {
                 out = new File(args[2]);
             } else {
                 String filename = in.getName()
-                    .replaceAll(FreeCol.FREECOL_SAVE_EXTENSION, ".xml");
+                    .replaceAll("." + FreeCol.FREECOL_SAVE_EXTENSION, ".xml");
                 if (filename.equals(in.getName())) {
                     filename += ".xml";
                 }
diff --git a/src/net/sf/freecol/tools/SaveGameValidator.java b/src/net/sf/freecol/tools/SaveGameValidator.java
index ff3cd6162..fb53e03a5 100644
--- a/src/net/sf/freecol/tools/SaveGameValidator.java
+++ b/src/net/sf/freecol/tools/SaveGameValidator.java
@@ -49,7 +49,7 @@ public class SaveGameValidator {
         Validator saveGameValidator = schema.newValidator();
 
         List<File> allFiles = new ArrayList<>();
-        FileFilter ff = FreeCol.freeColSaveFileFilter;
+        FileFilter ff = FreeColSavegameFile.getFileFilter();
         for (String name : args) {
             File file = new File(name);
             if (file.exists()) {
diff --git a/test/src/net/sf/freecol/server/generator/MapGeneratorTest.java b/test/src/net/sf/freecol/server/generator/MapGeneratorTest.java
index 1ff4179a8..51faf2aa6 100644
--- a/test/src/net/sf/freecol/server/generator/MapGeneratorTest.java
+++ b/test/src/net/sf/freecol/server/generator/MapGeneratorTest.java
@@ -24,6 +24,7 @@ import java.util.Random;
 import java.util.Vector;
 
 import net.sf.freecol.FreeCol;
+import net.sf.freecol.common.io.FreeColSavegameFile;
 import net.sf.freecol.common.model.FreeColObject;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.IndianSettlement;
@@ -200,7 +201,7 @@ public class MapGeneratorTest extends FreeColTestCase {
         Game game = new ServerGame(spec());
         MapGenerator gen = new SimpleMapGenerator(game, new Random(1));
         File mapDir = new File("data/maps/");
-        for (File importFile : mapDir.listFiles(FreeCol.freeColSaveFileFilter)) {
+        for (File importFile : mapDir.listFiles(FreeColSavegameFile.getFileFilter())) {
             ((FileOption)spec().getOption(MapGeneratorOptions.IMPORT_FILE))
                 .setValue(importFile);
             assertNotNull(gen.createMap(new LogBuilder(-1)));

From 20609aa13312bdc3b55502481ef2584a449a21c9 Mon Sep 17 00:00:00 2001
From: Bernat <bernatttp@gmail.com>
Date: Sun, 13 Sep 2015 21:22:46 +0200
Subject: [PATCH 222/323] Add two functions to remove overlaped backgrounds on
 panels, BR#2911

---
 .../client/gui/panel/FreeColDialog.java       | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
index 368a741bd..54f96f2dc 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
@@ -39,7 +39,10 @@ import java.util.logging.Logger;
 import javax.swing.ImageIcon;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 
 import net.sf.freecol.client.FreeColClient;
@@ -48,6 +51,7 @@ import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.client.gui.plaf.FreeColOptionPaneUI;
+import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Specification;
@@ -193,6 +197,8 @@ public class FreeColDialog<T> extends JDialog implements PropertyChangeListener
         setResizable(false);
         setUndecorated(true);
         setModal(modal);
+        
+        iterateOverOpaqueLayersComponents(this.pane);
         try { // Layout failures might not get logged.
             pack();
         } catch (Exception e) {
@@ -259,7 +265,50 @@ public class FreeColDialog<T> extends JDialog implements PropertyChangeListener
                 }
             });
     }
+    
+  public void iterateOverOpaqueLayersComponents(Object j){   
+        if (j instanceof JPanel) {            
+            
+           JPanel d =  ((JPanel) j);
+           Component[] componentes =d.getComponents();            
+           for (Component componente : componentes) {
+               setOpaqueLayerRecursive(componente);
+           }
 
+        }    
+        
+        if (j instanceof JOptionPane) {            
+            
+           JOptionPane d =  ((JOptionPane) j);
+           Component[] componentes =d.getComponents();            
+           for (Component componente : componentes) {
+               setOpaqueLayerRecursive(componente);
+           }
+
+        }        
+    }
+    
+    public void setOpaqueLayerRecursive(Component opaqueComponent){
+        
+                if (opaqueComponent instanceof JTextArea) {
+                    if (opaqueComponent.isOpaque()) {      
+                        ((JTextArea) opaqueComponent).setOpaque(false);
+                    }    
+                }
+                if (opaqueComponent instanceof JLabel) {
+                    if (opaqueComponent.isOpaque()) {                          
+                        ((JLabel) opaqueComponent).setOpaque(false);
+                    }
+                }            
+                if (opaqueComponent instanceof JPanel) {            
+                    if (opaqueComponent.isOpaque()) {      
+                        ((JPanel) opaqueComponent).setOpaque(false);
+                    }    
+                        JPanel mipanel = ((JPanel) opaqueComponent);
+                        iterateOverOpaqueLayersComponents(mipanel);         
+                }  
+    }
+    
     /**
      * Get the FreeColClient.
      *

From 94e4566bc2f4338079295f4458da4dde4b8a2f0c Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 15 Sep 2015 19:33:00 +0200
Subject: [PATCH 223/323] Synchronize with AWT Tree Lock and simplify MR#36 for
 BR#2911

---
 .../client/gui/panel/FreeColDialog.java       | 68 ++++++++-----------
 1 file changed, 28 insertions(+), 40 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
index 54f96f2dc..b893f4a8a 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
@@ -37,6 +37,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.swing.ImageIcon;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -197,8 +198,8 @@ public class FreeColDialog<T> extends JDialog implements PropertyChangeListener
         setResizable(false);
         setUndecorated(true);
         setModal(modal);
-        
-        iterateOverOpaqueLayersComponents(this.pane);
+
+        setSubcomponentsNotOpaque(this.pane);
         try { // Layout failures might not get logged.
             pack();
         } catch (Exception e) {
@@ -265,50 +266,37 @@ public class FreeColDialog<T> extends JDialog implements PropertyChangeListener
                 }
             });
     }
-    
-  public void iterateOverOpaqueLayersComponents(Object j){   
-        if (j instanceof JPanel) {            
-            
-           JPanel d =  ((JPanel) j);
-           Component[] componentes =d.getComponents();            
+
+    public static void setSubcomponentsNotOpaque(JComponent j) {
+        synchronized(j.getTreeLock()) {
+            iterateOverOpaqueLayersComponents(j);
+        }
+    }
+
+    private static void iterateOverOpaqueLayersComponents(JComponent j){   
+        if (j instanceof JPanel || j instanceof JOptionPane) {            
+           Component[] componentes = j.getComponents();            
            for (Component componente : componentes) {
                setOpaqueLayerRecursive(componente);
            }
-
         }    
-        
-        if (j instanceof JOptionPane) {            
-            
-           JOptionPane d =  ((JOptionPane) j);
-           Component[] componentes =d.getComponents();            
-           for (Component componente : componentes) {
-               setOpaqueLayerRecursive(componente);
-           }
+    }
 
-        }        
+    private static void setOpaqueLayerRecursive(Component opaqueComponent) {
+        if (opaqueComponent instanceof JTextArea ||
+            opaqueComponent instanceof JLabel) {
+            if (opaqueComponent.isOpaque()) {
+                ((JComponent) opaqueComponent).setOpaque(false);
+            }
+        } else if (opaqueComponent instanceof JPanel) {
+            JComponent panel = (JComponent)opaqueComponent;
+            if (panel.isOpaque()) {
+                panel.setOpaque(false);
+            }
+            iterateOverOpaqueLayersComponents(panel);
+        }
     }
-    
-    public void setOpaqueLayerRecursive(Component opaqueComponent){
-        
-                if (opaqueComponent instanceof JTextArea) {
-                    if (opaqueComponent.isOpaque()) {      
-                        ((JTextArea) opaqueComponent).setOpaque(false);
-                    }    
-                }
-                if (opaqueComponent instanceof JLabel) {
-                    if (opaqueComponent.isOpaque()) {                          
-                        ((JLabel) opaqueComponent).setOpaque(false);
-                    }
-                }            
-                if (opaqueComponent instanceof JPanel) {            
-                    if (opaqueComponent.isOpaque()) {      
-                        ((JPanel) opaqueComponent).setOpaque(false);
-                    }    
-                        JPanel mipanel = ((JPanel) opaqueComponent);
-                        iterateOverOpaqueLayersComponents(mipanel);         
-                }  
-    }
-    
+
     /**
      * Get the FreeColClient.
      *

From d59e4c06e6e462b50998cafe087dc5af80fde28f Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 16 Sep 2015 01:10:14 +0200
Subject: [PATCH 224/323] Reduce calls from Canvas back to GUI and remove
 unused return value

---
 src/net/sf/freecol/client/gui/Canvas.java   |  7 +------
 src/net/sf/freecol/client/gui/GUI.java      |  3 +--
 src/net/sf/freecol/client/gui/SwingGUI.java | 14 +++++++++++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index b80fd834c..a156aa27c 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -1001,7 +1001,7 @@ public final class Canvas extends JDesktopPane {
      * Stop blinking on the map.
      */
     private void stopBlinking() {
-        if (gui.getViewMode() != GUI.MOVE_UNITS_MODE) return;
+        if (mapViewer.getViewMode() != GUI.MOVE_UNITS_MODE) return;
         mapViewer.stopBlinking();
     }
 
@@ -1724,11 +1724,6 @@ public final class Canvas extends JDesktopPane {
             group = showFreeColDialog(dialog, null);
         } finally {
             clientOptionsDialogShowing = false;
-            if (group != null) {
-                gui.resetMenuBar();
-                // Immediately redraw the minimap if that was updated.
-                gui.updateMapControls();
-            }
         }
         return group;
     }
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index b98dc885f..eaf32abd6 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -1117,8 +1117,7 @@ public class GUI {
             DialogHandler<FoundingFather> handler) {
     }
 
-    public OptionGroup showClientOptionsDialog() {
-        return null;
+    public void showClientOptionsDialog() {
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 5d13a3cd5..060e98211 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1042,10 +1042,18 @@ public class SwingGUI extends GUI {
     }
 
     @Override
-    public OptionGroup showClientOptionsDialog() {
-        OptionGroup group = canvas.showClientOptionsDialog();
+    public void showClientOptionsDialog() {
+        OptionGroup group = null;
+        try {
+            group = canvas.showClientOptionsDialog();
+        } finally {
+            if (group != null) {
+                resetMenuBar();
+                // Immediately redraw the minimap if that was updated.
+                updateMapControls();
+            }
+        }
         if (!freeColClient.isInGame()) showMainPanel(null);
-        return group;
     }
 
     @Override

From 39a79dc1cb6824168212e6f756f76b9f123125c9 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 16 Sep 2015 09:17:12 +0930
Subject: [PATCH 225/323] Fix broken food calculation.

---
 .../sf/freecol/common/model/ColonyTile.java   | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/net/sf/freecol/common/model/ColonyTile.java b/src/net/sf/freecol/common/model/ColonyTile.java
index fb863bc88..0c3ac8bb2 100644
--- a/src/net/sf/freecol/common/model/ColonyTile.java
+++ b/src/net/sf/freecol/common/model/ColonyTile.java
@@ -208,21 +208,26 @@ public class ColonyTile extends WorkLocation {
 
         // Unattended production is the hard case.
         if (productionType.getUnattended()) {
-            if (newType != null) { // Tile type change
-                final List<AbstractGoods> newProd
-                    = newType.getPossibleProduction(true);
-                int food = 0;
-                // Get the current food production.  Otherwise for
-                // goods that are being passively produced and
-                // consumed, check if production remains in surplus
-                // following a negative change.
-                for (AbstractGoods ag : getProduction()) {
-                    final GoodsType goodsType = ag.getType();
-                    if (goodsType.isFoodType()) {
-                        food -= ag.getAmount();
-                        continue;
-                    }                        
-                    if (!colony.isConsuming(goodsType)) continue;
+            if (newType == null) {
+                // Tile type stays the same, return the sum of any food bonues.
+                return getSpecification().getFoodGoodsTypeList().stream()
+                    .mapToInt(gt -> ti.getBonus(gt)).sum();
+            }
+
+            // Tile type change.
+            final List<AbstractGoods> newProd
+                = newType.getPossibleProduction(true);
+            int food = newProd.stream()
+                .filter(ag -> ag.getType().isFoodType())
+                .mapToInt(AbstractGoods::getAmount).sum();
+            // Get the current food production.  Otherwise for goods
+            // that are being passively produced and consumed, check
+            // if production remains in surplus following a negative change.
+            for (AbstractGoods ag : getProduction()) {
+                final GoodsType goodsType = ag.getType();
+                if (goodsType.isFoodType()) {
+                    food -= ag.getAmount();
+                } else if (colony.isConsuming(goodsType)) {
                     int change = -ag.getAmount();
                     AbstractGoods ng
                         = AbstractGoods.findByType(goodsType, newProd);
@@ -234,16 +239,8 @@ public class ColonyTile extends WorkLocation {
                         return change;
                     }
                 }
-                // No production showstoppers found
-                // Would the passive food production be improved?
-                return newProd.stream()
-                    .filter(ag -> ag.getType().isFoodType())
-                    .mapToInt(AbstractGoods::getAmount).sum();
             }
-
-            // Tile type stays the same, return the sum of any food bonues.
-            return getSpecification().getFoodGoodsTypeList().stream()
-                .mapToInt(gt -> ti.getBonus(gt)).sum();
+            return food;
         }
 
         // Units are at work here.  Find out what work is being done.

From 53d695109b44d8ec0f1b10a820336237a2b3b2a4 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 16 Sep 2015 12:05:08 +0930
Subject: [PATCH 226/323] Make tests more robust against unit placement.

---
 .../sf/freecol/common/model/BuildingTest.java |  7 +++---
 .../common/model/IndividualFatherTest.java    |  3 ++-
 .../server/model/ServerBuildingTest.java      | 12 +++++++---
 .../sf/freecol/util/test/FreeColTestCase.java | 22 +++++++++++++++++++
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/test/src/net/sf/freecol/common/model/BuildingTest.java b/test/src/net/sf/freecol/common/model/BuildingTest.java
index f019b4528..15da45e85 100644
--- a/test/src/net/sf/freecol/common/model/BuildingTest.java
+++ b/test/src/net/sf/freecol/common/model/BuildingTest.java
@@ -857,8 +857,9 @@ public class BuildingTest extends FreeColTestCase {
 
         Colony colony = getStandardColony(4);
         Unit unit = colony.getUnitList().get(0);
-
         for (Building building : colony.getBuildings()) {
+            clearWorkLocation(building);
+            unit.setLocation(building);
             for (AbstractGoods output : building.getOutputs()) {
                 GoodsType outputType = output.getType();
                 for (UnitType type : spec().getUnitTypeList()) {
@@ -881,8 +882,8 @@ public class BuildingTest extends FreeColTestCase {
                             assertFalse("ModifierSet should not be empty!",
                                         type.getModifiers(outputType.getId()).isEmpty());
                         }
-                        assertEquals("Wrong productivity for " + type, expected,
-                                     productivity);
+                        assertEquals("Wrong productivity for " + type
+                            + " in " + building, expected, productivity);
                     }
                 }
             }
diff --git a/test/src/net/sf/freecol/common/model/IndividualFatherTest.java b/test/src/net/sf/freecol/common/model/IndividualFatherTest.java
index 39f131336..a3c4f6d75 100644
--- a/test/src/net/sf/freecol/common/model/IndividualFatherTest.java
+++ b/test/src/net/sf/freecol/common/model/IndividualFatherTest.java
@@ -260,6 +260,7 @@ public class IndividualFatherTest extends FreeColTestCase {
         Colony colony = getStandardColony(4);
         Player player = colony.getOwner();
         Building townHall = colony.getBuilding(townHallType);
+        clearWorkLocation(townHall);
         Unit unit = colony.getFirstUnit();
         townHall.add(unit);
 
@@ -317,11 +318,11 @@ public class IndividualFatherTest extends FreeColTestCase {
     public void testPaine() {
         Game game = getGame();
         game.setMap(getTestMap(true));
-
         Colony colony = getStandardColony(4);
         Player player = colony.getOwner();
         List<AbstractGoods> empty = new ArrayList<>();
         Building townHall = colony.getBuilding(townHallType);
+        clearWorkLocation(townHall);
 
         Unit statesman1 = colony.getUnitList().get(0);
         Unit statesman2 = colony.getUnitList().get(1);
diff --git a/test/src/net/sf/freecol/server/model/ServerBuildingTest.java b/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
index ca877d1f5..2f20bf45b 100644
--- a/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
+++ b/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
@@ -413,7 +413,9 @@ public class ServerBuildingTest extends FreeColTestCase {
 
         Unit colonist = units.next();
         colonist.setType(freeColonistType);
-        colonist.setLocation(colony.getBuilding(townHallType));
+        Building townHall = colony.getBuilding(townHallType);
+        clearWorkLocation(townHall);
+        colonist.setLocation(townHall);
 
         Unit lumberJack = units.next();
         lumberJack.setType(expertLumberJackType);
@@ -456,7 +458,9 @@ public class ServerBuildingTest extends FreeColTestCase {
 
         Unit colonist = units.next();
         colonist.setType(freeColonistType);
-        colonist.setLocation(colony.getBuilding(townHallType));
+        Building townHall = colony.getBuilding(townHallType);
+        clearWorkLocation(townHall);
+        colonist.setLocation(townHall);
 
         Unit lumberjack1 = units.next();
         lumberjack1.setType(expertLumberJackType);
@@ -494,7 +498,9 @@ public class ServerBuildingTest extends FreeColTestCase {
 
         Unit colonist = units.next();
         colonist.setType(freeColonistType);
-        colonist.setLocation(colony.getBuilding(townHallType));
+        Building townHall = colony.getBuilding(townHallType);
+        clearWorkLocation(townHall);
+        colonist.setLocation(townHall);
 
         Unit lumber = units.next();
         lumber.setType(expertLumberJackType);
diff --git a/test/src/net/sf/freecol/util/test/FreeColTestCase.java b/test/src/net/sf/freecol/util/test/FreeColTestCase.java
index 0c22d8571..d20f69c6a 100644
--- a/test/src/net/sf/freecol/util/test/FreeColTestCase.java
+++ b/test/src/net/sf/freecol/util/test/FreeColTestCase.java
@@ -48,6 +48,7 @@ import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.TileType;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.UnitType;
+import net.sf.freecol.common.model.WorkLocation;
 import net.sf.freecol.server.model.ServerGame;
 import net.sf.freecol.server.model.ServerIndianSettlement;
 import net.sf.freecol.server.model.ServerPlayer;
@@ -326,6 +327,27 @@ public class FreeColTestCase extends TestCase {
         return ret;
     }
 
+    /**
+     * Useful utility to make sure a work location is empty before doing
+     * some test that implicates it.
+     *
+     * @param wl The <code>WorkLocation</code> to clear.
+     * @return True if the work location is clear, false if there was a problem
+     *     removing a unit.
+     */
+    public boolean clearWorkLocation(WorkLocation wl) {
+        for (Unit u : wl.getUnitList()) {
+            for (WorkLocation w : wl.getColony().getCurrentWorkLocations()) {
+                if (w == wl) continue;
+                if (w.canAdd(u)) {
+                    u.setLocation(w);
+                    if (u.getLocation() == w) break;
+                }
+            }
+        }
+        return wl.isEmpty();
+    }
+
     public static class MapBuilder{
 
         // Required parameter

From 9c7c0f214a19250799efa29a90fbe94586958be7 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 16 Sep 2015 10:59:22 +0930
Subject: [PATCH 227/323] Improve OO in work location lists, and use stream
 collector.

---
 src/net/sf/freecol/common/model/Building.java | 16 ++++++++
 src/net/sf/freecol/common/model/Colony.java   | 40 +++++++++----------
 .../sf/freecol/common/model/ColonyTile.java   | 16 ++++++++
 .../sf/freecol/common/model/Occupation.java   |  6 +--
 .../sf/freecol/common/model/WorkLocation.java | 14 +++++++
 5 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Building.java b/src/net/sf/freecol/common/model/Building.java
index 8272356c3..89d1ad80a 100644
--- a/src/net/sf/freecol/common/model/Building.java
+++ b/src/net/sf/freecol/common/model/Building.java
@@ -452,6 +452,22 @@ public class Building extends WorkLocation
             : StringTemplate.key(buildingType);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isCurrent() {
+        return true;
+    }
+    
     /**
      * {@inheritDoc}
      */
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index ec39cc486..0d481f2c4 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -30,6 +30,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -504,15 +506,24 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
 
     // WorkLocations, Buildings, ColonyTiles
 
+    /**
+     * Get a stream of all the possible work locations for this colony.
+     *
+     * @return A suitable <code>Stream</code>.
+     */
+    private Stream<WorkLocation> getAllWorkLocationsStream() {
+        return Stream.concat(colonyTiles.stream(),
+                             buildingMap.values().stream());
+    }
+    
     /**
      * Gets a list of every work location in this colony.
      *
      * @return The list of work locations.
      */
     public List<WorkLocation> getAllWorkLocations() {
-        List<WorkLocation> result = new ArrayList<WorkLocation>(colonyTiles);
-        result.addAll(buildingMap.values());
-        return result;
+        return getAllWorkLocationsStream()
+            .collect(Collectors.toList());
     }
 
     /**
@@ -522,16 +533,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return The list of available <code>WorkLocation</code>s.
      */
     public List<WorkLocation> getAvailableWorkLocations() {
-        List<WorkLocation> result
-            = new ArrayList<WorkLocation>(buildingMap.values());
-        for (ColonyTile ct : colonyTiles) {
-            Tile tile = ct.getWorkTile();
-            if (tile.getOwningSettlement() == this
-                || getOwner().canClaimForSettlement(tile)) {
-                result.add(ct);
-            }
-        }
-        return result;
+        return getAllWorkLocationsStream()
+            .filter(WorkLocation::isAvailable)
+            .collect(Collectors.toList());
     }
 
     /**
@@ -540,13 +544,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return The list of current <code>WorkLocation</code>s.
      */
     public List<WorkLocation> getCurrentWorkLocations() {
-        List<WorkLocation> result
-            = new ArrayList<WorkLocation>(buildingMap.values());
-        for (ColonyTile ct : colonyTiles) {
-            Tile tile = ct.getWorkTile();
-            if (tile.getOwningSettlement() == this) result.add(ct);
-        }
-        return result;
+        return getAllWorkLocationsStream()
+            .filter(WorkLocation::isCurrent)
+            .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/ColonyTile.java b/src/net/sf/freecol/common/model/ColonyTile.java
index 0c3ac8bb2..cee3d7320 100644
--- a/src/net/sf/freecol/common/model/ColonyTile.java
+++ b/src/net/sf/freecol/common/model/ColonyTile.java
@@ -360,6 +360,22 @@ public class ColonyTile extends WorkLocation {
         return (workTile == null) ? null : workTile.getLabel();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isAvailable() {
+        return isCurrent() || getOwner().canClaimForSettlement(getWorkTile());
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isCurrent() {
+        return getWorkTile().getOwningSettlement() == getColony();
+    }
+    
     /**
      * {@inheritDoc}
      */
diff --git a/src/net/sf/freecol/common/model/Occupation.java b/src/net/sf/freecol/common/model/Occupation.java
index cb2d8a742..1adb30333 100644
--- a/src/net/sf/freecol/common/model/Occupation.java
+++ b/src/net/sf/freecol/common/model/Occupation.java
@@ -179,10 +179,10 @@ public class Occupation {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder(32);
-        sb.append("[Occupation ").append(workLocation)
+        sb.append("[Occupation ").append(workLocation);
             //.append(" ").append(productionType)
-            .append(" ").append(workType.getSuffix())
-            .append("]");
+        if (workType != null) sb.append(" ").append(workType.getSuffix());
+        sb.append("]");
         return sb.toString();
     }
 }
diff --git a/src/net/sf/freecol/common/model/WorkLocation.java b/src/net/sf/freecol/common/model/WorkLocation.java
index 71d491ab3..74ca3ab13 100644
--- a/src/net/sf/freecol/common/model/WorkLocation.java
+++ b/src/net/sf/freecol/common/model/WorkLocation.java
@@ -760,6 +760,20 @@ public abstract class WorkLocation extends UnitLocation
      */
     public abstract StringTemplate getLabel();
 
+    /**
+     * Is this work location available?
+     *
+     * @return True if the work location is either current or can be claimed.
+     */
+    public abstract boolean isAvailable();
+
+    /**
+     * Is this a current work location of this colony?
+     *
+     * @return True if the work location is current.
+     */
+    public abstract boolean isCurrent();
+
     /**
      * Checks if this work location is available to the colony to be
      * worked.

From f1c4ec54338c26b67693036ac4ffbcde8525ea85 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 17 Sep 2015 15:04:23 +0200
Subject: [PATCH 228/323] Fix glitched MenuBar when (re)starting game and going
 from mapeditor to main menu

---
 src/net/sf/freecol/client/gui/Canvas.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index a156aa27c..9b10891d3 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -362,7 +362,7 @@ public final class Canvas extends JDesktopPane {
 
         frame.setJMenuBar(new InGameMenuBar(freeColClient,
             new MenuMouseMotionListener(freeColClient, this)));
-        frame.paintAll(getGraphics());
+        frame.validate();
     }
 
     /**
@@ -2163,6 +2163,7 @@ public final class Canvas extends JDesktopPane {
     void showMainPanel(String userMsg) {
         closeMenus();
         frame.setJMenuBar(null);
+        frame.validate();
         mainPanel = new MainPanel(freeColClient);
         addCentered(mainPanel, JLayeredPane.DEFAULT_LAYER);
         if (userMsg != null) gui.showInformationMessage(userMsg);

From 33b5eb6270e1ca86178315f09fb535460c237c3c Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 17 Sep 2015 15:09:36 +0200
Subject: [PATCH 229/323] Move code for exiting fullscreen to the frame, where
 it was entered

---
 src/net/sf/freecol/client/gui/Canvas.java       | 6 ++----
 src/net/sf/freecol/client/gui/FreeColFrame.java | 6 ++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 9b10891d3..01fdc1fec 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -347,10 +347,8 @@ public final class Canvas extends JDesktopPane {
      * Quit the GUI.  All that is required is to exit the full screen.
      */
     void quit() throws Exception {
-        if (frame != null) {
-            GraphicsConfiguration GraphicsConf = frame.getGraphicsConfiguration();
-            GraphicsDevice gd = GraphicsConf.getDevice();
-            if (!windowed) gd.setFullScreenWindow(null);
+        if (frame != null && !windowed) {
+            frame.exitFullScreen();
         }
     }
 
diff --git a/src/net/sf/freecol/client/gui/FreeColFrame.java b/src/net/sf/freecol/client/gui/FreeColFrame.java
index 702fceb24..40a2d3886 100644
--- a/src/net/sf/freecol/client/gui/FreeColFrame.java
+++ b/src/net/sf/freecol/client/gui/FreeColFrame.java
@@ -20,6 +20,7 @@
 package net.sf.freecol.client.gui;
 
 import java.awt.Dimension;
+import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.Insets;
 import java.awt.Rectangle;
@@ -99,6 +100,11 @@ public class FreeColFrame extends JFrame {
         logger.info("Frame created in size " + bounds.width + "x" + bounds.height);
     }
 
+    public void exitFullScreen() {
+        GraphicsConfiguration GraphicsConf = getGraphicsConfiguration();
+        GraphicsDevice gd = GraphicsConf.getDevice();
+        gd.setFullScreenWindow(null);
+    }
 
     /**
      * Get the standard name for the main frame.

From a3e99d0d12d6f3f38aca9aec1466185c8e1053a7 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 17 Sep 2015 15:55:55 +0200
Subject: [PATCH 230/323] Simplify changeWindowedMode methods

---
 src/net/sf/freecol/client/gui/Canvas.java             | 11 -----------
 src/net/sf/freecol/client/gui/FreeColFrame.java       | 10 ++++++++++
 src/net/sf/freecol/client/gui/GUI.java                |  5 +----
 src/net/sf/freecol/client/gui/SwingGUI.java           |  7 ++-----
 .../client/gui/action/ChangeWindowedModeAction.java   |  2 +-
 5 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 01fdc1fec..b63c29d96 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -25,15 +25,12 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.Image;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.event.ActionListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
@@ -311,14 +308,6 @@ public final class Canvas extends JDesktopPane {
         // multi-screen setup, so make this.gd point to the current screen.
         frame = new FreeColFrame(freeColClient, graphicsDevice,
             menuBar, this, windowed, windowBounds);
-        if (windowed) {
-            frame.addComponentListener(new ComponentAdapter() {
-                @Override
-                public void componentResized(ComponentEvent e) {
-                    logger.info("Window size changes to " + getSize());
-                }
-            });
-        }
 
         updateSizes();
         frame.setVisible(true);
diff --git a/src/net/sf/freecol/client/gui/FreeColFrame.java b/src/net/sf/freecol/client/gui/FreeColFrame.java
index 40a2d3886..a954de623 100644
--- a/src/net/sf/freecol/client/gui/FreeColFrame.java
+++ b/src/net/sf/freecol/client/gui/FreeColFrame.java
@@ -25,6 +25,8 @@ import java.awt.GraphicsDevice;
 import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -98,6 +100,14 @@ public class FreeColFrame extends JFrame {
         }
         setBounds(bounds);
         logger.info("Frame created in size " + bounds.width + "x" + bounds.height);
+        if (windowed) {
+            addComponentListener(new ComponentAdapter() {
+                @Override
+                public void componentResized(ComponentEvent e) {
+                    logger.info("Window size changes to " + getSize());
+                }
+            });
+        }
     }
 
     public void exitFullScreen() {
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index eaf32abd6..f7587697c 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -191,11 +191,8 @@ public class GUI {
 
     /**
      * Change the windowed mode.
-     *
-     * @param windowed Use <code>true</code> for windowed mode
-     *     and <code>false</code> for fullscreen mode.
      */
-    public void changeWindowedMode(boolean windowed) {
+    public void changeWindowedMode() {
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 060e98211..57e76be1e 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -434,13 +434,10 @@ public class SwingGUI extends GUI {
 
     /**
      * Change the windowed mode.
-     *
-     * @param windowed Use <code>true</code> for windowed mode
-     *     and <code>false</code> for fullscreen mode.
      */
     @Override
-    public void changeWindowedMode(boolean windowed) {
-        canvas.changeWindowedMode(windowed);
+    public void changeWindowedMode() {
+        canvas.changeWindowedMode(!canvas.isWindowed());
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/action/ChangeWindowedModeAction.java b/src/net/sf/freecol/client/gui/action/ChangeWindowedModeAction.java
index 90b22312e..8a4bd7cc4 100644
--- a/src/net/sf/freecol/client/gui/action/ChangeWindowedModeAction.java
+++ b/src/net/sf/freecol/client/gui/action/ChangeWindowedModeAction.java
@@ -78,6 +78,6 @@ public class ChangeWindowedModeAction extends SelectableAction {
     public void actionPerformed(ActionEvent ae) {
         GUI gui = getGUI();
         if (gui == null) return;
-        gui.changeWindowedMode(!gui.isWindowed());
+        gui.changeWindowedMode();
     }
 }

From d824f2bdd241785188ba5aef56991bed02817ce0 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 17 Sep 2015 16:16:01 +0200
Subject: [PATCH 231/323] Split off createFrame from changeWindowedMode in
 Canvas

---
 src/net/sf/freecol/client/gui/Canvas.java   | 17 +++++++++--------
 src/net/sf/freecol/client/gui/SwingGUI.java |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index b63c29d96..f45c866e2 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -277,7 +277,7 @@ public final class Canvas extends JDesktopPane {
         setFocusTraversalKeysEnabled(false);
 
         createKeyBindings();
-        changeWindowedMode(windowed);
+        createFrame(null);
         logger.info("Canvas created.");
     }
 
@@ -287,28 +287,29 @@ public final class Canvas extends JDesktopPane {
 
     /**
      * Change the windowed mode.
-     *
-     * @param windowed Use <code>true</code> for windowed mode
-     *     and <code>false</code> for fullscreen mode.
      */
-    void changeWindowedMode(boolean windowed) {
+    void changeWindowedMode() {
         // Clean up the old frame
         JMenuBar menuBar = null;
         if (frame != null) {
             menuBar = frame.getJMenuBar();
-            if (this.windowed) {
+            if (windowed) {
                 windowBounds = frame.getBounds();
             }
             frame.setVisible(false);
             frame.dispose();
         }
-        this.windowed = windowed;
+        windowed = !windowed;
 
+        createFrame(menuBar);
+    }
+
+    private void createFrame(JMenuBar menuBar) {
+        // FIXME: Check this:
         // User might have moved window to new screen in a
         // multi-screen setup, so make this.gd point to the current screen.
         frame = new FreeColFrame(freeColClient, graphicsDevice,
             menuBar, this, windowed, windowBounds);
-
         updateSizes();
         frame.setVisible(true);
     }
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 57e76be1e..6402f42bb 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -437,7 +437,7 @@ public class SwingGUI extends GUI {
      */
     @Override
     public void changeWindowedMode() {
-        canvas.changeWindowedMode(!canvas.isWindowed());
+        canvas.changeWindowedMode();
     }
 
     /**

From 9359a47cb9635eb7917c6234e63477c25f462825 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 17 Sep 2015 17:08:30 +0200
Subject: [PATCH 232/323] Handle all MenuBar operations inside FreeColFrame

---
 src/net/sf/freecol/client/gui/Canvas.java     | 26 +++--------
 .../sf/freecol/client/gui/FreeColFrame.java   | 46 +++++++++++++++++--
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index f45c866e2..f8a094c07 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -61,10 +61,6 @@ import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.action.FreeColAction;
-import net.sf.freecol.client.gui.menu.FreeColMenuBar;
-import net.sf.freecol.client.gui.menu.InGameMenuBar;
-import net.sf.freecol.client.gui.menu.MapEditorMenuBar;
-import net.sf.freecol.client.gui.menu.MenuMouseMotionListener;
 import net.sf.freecol.client.gui.panel.*;
 import net.sf.freecol.client.gui.panel.LabourData.UnitData;
 import net.sf.freecol.common.ServerInfo;
@@ -323,8 +319,7 @@ public final class Canvas extends JDesktopPane {
         // We may need to reset the zoom value to the default value
         gui.resetMapZoom();
 
-        frame.setJMenuBar(new MapEditorMenuBar(freeColClient,
-            new MenuMouseMotionListener(freeColClient, this)));
+        frame.setMapEditorMenuBar();
         showMapEditorTransformPanel();
 
         CanvasMapEditorMouseListener listener
@@ -347,10 +342,7 @@ public final class Canvas extends JDesktopPane {
      */
     void initializeInGame() {
         if (frame == null) return;
-
-        frame.setJMenuBar(new InGameMenuBar(freeColClient,
-            new MenuMouseMotionListener(freeColClient, this)));
-        frame.validate();
+        frame.setInGameMenuBar();
     }
 
     /**
@@ -358,19 +350,15 @@ public final class Canvas extends JDesktopPane {
      */
     void resetMenuBar() {
         if (frame == null) return;
-        JMenuBar menuBar = frame.getJMenuBar();
-        if (menuBar != null) {
-            ((FreeColMenuBar)menuBar).reset();
-        }
+        frame.resetMenuBar();
     }
 
     /**
      * Update the menu bar.
      */
     void updateMenuBar() {
-        if (frame != null && frame.getJMenuBar() != null) {
-            ((FreeColMenuBar)frame.getJMenuBar()).update();
-        }
+        if (frame == null) return;
+        frame.updateMenuBar();
     }
 
     /**
@@ -1370,7 +1358,6 @@ public final class Canvas extends JDesktopPane {
         // inGame. (Retrieve value of GUI::inGame.)  If GUI thinks
         // we're still in the game then log an error because at this
         // point the GUI should have been informed.
-        closeMenus();
         removeInGameComponents();
         showMainPanel(null);
         repaint();
@@ -2150,8 +2137,7 @@ public final class Canvas extends JDesktopPane {
      */
     void showMainPanel(String userMsg) {
         closeMenus();
-        frame.setJMenuBar(null);
-        frame.validate();
+        frame.removeMenuBar();
         mainPanel = new MainPanel(freeColClient);
         addCentered(mainPanel, JLayeredPane.DEFAULT_LAYER);
         if (userMsg != null) gui.showInformationMessage(userMsg);
diff --git a/src/net/sf/freecol/client/gui/FreeColFrame.java b/src/net/sf/freecol/client/gui/FreeColFrame.java
index a954de623..95f2d622c 100644
--- a/src/net/sf/freecol/client/gui/FreeColFrame.java
+++ b/src/net/sf/freecol/client/gui/FreeColFrame.java
@@ -35,11 +35,15 @@ import javax.swing.JMenuBar;
 
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.client.gui.menu.FreeColMenuBar;
+import net.sf.freecol.client.gui.menu.InGameMenuBar;
+import net.sf.freecol.client.gui.menu.MapEditorMenuBar;
+import net.sf.freecol.client.gui.menu.MenuMouseMotionListener;
 import net.sf.freecol.common.resources.ResourceManager;
 
 
 /**
- * The base frame for FreeCol panels.
+ * The base frame for FreeCol.
  */
 public class FreeColFrame extends JFrame {
 
@@ -48,6 +52,9 @@ public class FreeColFrame extends JFrame {
     /** The FreeCol client controlling the frame. */
     protected final FreeColClient freeColClient;
 
+    /** The Canvas contained inside the frame. */
+    protected final Canvas canvas;
+
 
     /**
      * Create a new main frame.
@@ -65,6 +72,7 @@ public class FreeColFrame extends JFrame {
         super(getFrameName(), gd.getDefaultConfiguration());
 
         this.freeColClient = freeColClient;
+        this.canvas = canvas;
         setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
         if(windowed) {
             setResizable(true);
@@ -76,7 +84,7 @@ public class FreeColFrame extends JFrame {
         addWindowListener(windowed
             ? new WindowedFrameListener(freeColClient)
             : new FullScreenFrameListener(freeColClient, this));
-        setCanvas(canvas);
+        setCanvas();
         setIconImage(ResourceManager.getImage("image.miscicon.FrameIcon"));
 
         pack(); // necessary for getInsets
@@ -116,6 +124,36 @@ public class FreeColFrame extends JFrame {
         gd.setFullScreenWindow(null);
     }
 
+    public void setInGameMenuBar() {
+        setJMenuBar(new InGameMenuBar(freeColClient,
+            new MenuMouseMotionListener(freeColClient, canvas)));
+        validate();
+    }
+
+    public void setMapEditorMenuBar() {
+        setJMenuBar(new MapEditorMenuBar(freeColClient,
+            new MenuMouseMotionListener(freeColClient, canvas)));
+    }
+
+    public void removeMenuBar() {
+        setJMenuBar(null);
+        validate();
+    }
+
+    public void resetMenuBar() {
+        JMenuBar menuBar = getJMenuBar();
+        if (menuBar != null) {
+            ((FreeColMenuBar)menuBar).reset();
+        }
+    }
+
+    public void updateMenuBar() {
+        JMenuBar menuBar = getJMenuBar();
+        if (menuBar != null) {
+            ((FreeColMenuBar)menuBar).update();
+        }
+    }
+
     /**
      * Get the standard name for the main frame.
      *
@@ -128,10 +166,8 @@ public class FreeColFrame extends JFrame {
 
     /**
      * Set the canvas for this frame.
-     *
-     * @param canvas The <code>Canvas</code> to use.
      */
-    private void setCanvas(Canvas canvas) {
+    private void setCanvas() {
         // This crashes deep in the Java libraries when changing full screen
         // mode during the opening video
         //   Java version: 1.7.0_45

From 96699d71a5e1e68fe4b88eab837b02630ef33712 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 17 Sep 2015 17:18:23 +0200
Subject: [PATCH 233/323] Remove Canvas.windowBounds and use method parameter
 instead

---
 src/net/sf/freecol/client/gui/Canvas.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index f8a094c07..6f512cad9 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -183,8 +183,6 @@ public final class Canvas extends JDesktopPane {
 
     private boolean windowed;
 
-    private Rectangle windowBounds;
-
     private MainPanel mainPanel;
 
     private final StartGamePanel startGamePanel;
@@ -239,7 +237,7 @@ public final class Canvas extends JDesktopPane {
         this.mapViewer = mapViewer;
 
         // Determine if windowed mode should be used and set the window size.
-        windowBounds = null;
+        Rectangle windowBounds = null;
         if (desiredSize == null) {
             if(graphicsDevice.isFullScreenSupported()) {
                 windowed = false;
@@ -273,7 +271,7 @@ public final class Canvas extends JDesktopPane {
         setFocusTraversalKeysEnabled(false);
 
         createKeyBindings();
-        createFrame(null);
+        createFrame(null, windowBounds);
         logger.info("Canvas created.");
     }
 
@@ -287,6 +285,7 @@ public final class Canvas extends JDesktopPane {
     void changeWindowedMode() {
         // Clean up the old frame
         JMenuBar menuBar = null;
+        Rectangle windowBounds = null;
         if (frame != null) {
             menuBar = frame.getJMenuBar();
             if (windowed) {
@@ -297,10 +296,10 @@ public final class Canvas extends JDesktopPane {
         }
         windowed = !windowed;
 
-        createFrame(menuBar);
+        createFrame(menuBar, windowBounds);
     }
 
-    private void createFrame(JMenuBar menuBar) {
+    private void createFrame(JMenuBar menuBar, Rectangle windowBounds) {
         // FIXME: Check this:
         // User might have moved window to new screen in a
         // multi-screen setup, so make this.gd point to the current screen.

From 2e0d45a5e1cb263a8d6e72816eb00201366cea81 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 17 Sep 2015 18:03:01 +0200
Subject: [PATCH 234/323] Remove redundant show method overloads in Canvas

---
 src/net/sf/freecol/client/gui/Canvas.java   | 53 ++-------------------
 src/net/sf/freecol/client/gui/SwingGUI.java | 18 +++++--
 2 files changed, 18 insertions(+), 53 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index 6f512cad9..a6208a892 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -1788,30 +1788,18 @@ public final class Canvas extends JDesktopPane {
                      PopupPosition.CENTERED, false);
     }
 
-    /**
-     * Display the difficulty dialog.
-     *
-     * @return The resulting <code>OptionGroup</code>.
-     */
-    OptionGroup showDifficultyDialog() {
-        Game game = freeColClient.getGame();
-        Specification spec = game.getSpecification();
-        return showFreeColDialog(new DifficultyDialog(freeColClient, frame, spec,
-                spec.getDifficultyOptionGroup(), false),
-            null);
-    }
-
     /**
      * Display the difficulty dialog for a given group.
      *
      * @param spec The enclosing <code>Specification</code>.
      * @param group The <code>OptionGroup</code> containing the difficulty.
+     * @param editable If the options should be editable.
      * @return The resulting <code>OptionGroup</code>.
      */
     OptionGroup showDifficultyDialog(Specification spec,
-                                            OptionGroup group) {
-        return showFreeColDialog(new DifficultyDialog(freeColClient, frame, spec, 
-                group, group.isEditable()),
+                                     OptionGroup group, boolean editable) {
+        return showFreeColDialog(new DifficultyDialog(freeColClient, frame,
+                spec, group, editable),
             null);
     }
 
@@ -2072,18 +2060,6 @@ public final class Canvas extends JDesktopPane {
                          tile, true);
     }
 
-    /**
-     * Displays a dialog where the user may choose a file.
-     *
-     * @param directory The directory containing the files.
-     * @return The selected <code>File</code>.
-     */
-    File showLoadDialog(File directory) {
-        return showFreeColDialog(new LoadDialog(freeColClient, frame, directory,
-                                                getFileFilters()),
-                                 null);
-    }
-
     /**
      * Displays a dialog where the user may choose a file.
      *
@@ -2264,14 +2240,7 @@ public final class Canvas extends JDesktopPane {
     }
 
     /**
-     * Display the NewPanel.
-     */
-    void showNewPanel() {
-        showSubPanel(new NewPanel(freeColClient), false);
-    }
-
-    /**
-     * Display the NewPanel for a given specification.
+     * Display the NewPanel for a given optional specification.
      *
      * @param specification The <code>Specification</code> to use.
      */
@@ -2368,18 +2337,6 @@ public final class Canvas extends JDesktopPane {
         return showFreeColDialog(new RiverStyleDialog(freeColClient, frame), tile);
     }
 
-    /**
-     * Displays a dialog where the user may choose a filename.
-     *
-     * @param directory The directory containing the files in which
-     *     the user may overwrite.
-     * @param defaultName Default filename for the savegame.
-     * @return The selected <code>File</code>.
-     */
-    public File showSaveDialog(File directory, String defaultName) {
-        return showSaveDialog(directory, getFileFilters(), defaultName);
-    }
-
     /**
      * Displays a dialog where the user may choose a filename.
      *
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 6402f42bb..1fd24bd81 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1090,14 +1090,22 @@ public class SwingGUI extends GUI {
         canvas.showDeclarationPanel();
     }
 
+    /**
+     * Display a difficulty dialog allowing only viewing of game options.
+     *
+     * @return The resulting <code>OptionGroup</code>.
+     */
     @Override
     public OptionGroup showDifficultyDialog() {
-        return canvas.showDifficultyDialog();
+        Game game = freeColClient.getGame();
+        Specification spec = game.getSpecification();
+        return canvas.showDifficultyDialog(spec,
+            spec.getDifficultyOptionGroup(), false);
     }
 
     public OptionGroup showDifficultyDialog(Specification spec,
                                             OptionGroup group) {
-        return canvas.showDifficultyDialog(spec, group);
+        return canvas.showDifficultyDialog(spec, group, group.isEditable());
     }
 
     @Override
@@ -1230,7 +1238,7 @@ public class SwingGUI extends GUI {
 
     @Override
     public File showLoadDialog(File directory) {
-        return canvas.showLoadDialog(directory);
+        return canvas.showLoadDialog(directory, null);
     }
 
     public File showLoadDialog(File directory, FileFilter[] fileFilters) {
@@ -1301,7 +1309,7 @@ public class SwingGUI extends GUI {
 
     @Override
     public void showNewPanel() {
-        canvas.showNewPanel();
+        canvas.showNewPanel(null);
     }
 
     @Override
@@ -1423,7 +1431,7 @@ public class SwingGUI extends GUI {
 
     @Override
     public File showSaveDialog(File directory, String defaultName) {
-        return showSaveDialog(directory, null, defaultName);
+        return canvas.showSaveDialog(directory, null, defaultName);
     }
 
     public File showSaveDialog(File directory, FileFilter[] fileFilters,

From 1f8a30f057ca938b5902dda96325bb259fa1da71 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 17 Sep 2015 19:14:05 +0200
Subject: [PATCH 235/323] Remove unnecessary call to restartBlinking when it
 was never stopped in ColonyPanel

---
 src/net/sf/freecol/client/gui/SwingGUI.java          | 4 ----
 src/net/sf/freecol/client/gui/panel/ColonyPanel.java | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 1fd24bd81..d7749bf3b 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1590,10 +1590,6 @@ public class SwingGUI extends GUI {
         return mapViewer.getViewMode();
     }
 
-    public void restartBlinking() {
-        mapViewer.restartBlinking();
-    }
-
     @Override
     public void setFocus(Tile tileToFocus) {
         mapViewer.setFocus(tileToFocus);
diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 9736728e5..3433496ff 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -914,7 +914,6 @@ public final class ColonyPanel extends PortPanel
         cleanup();
 
         getGUI().removeFromCanvas(this);
-        getGUI().restartBlinking();
         getGUI().updateMapControls();
 
         // Talk to the controller last, allow all the cleanup to happen first.

From 85933ac1b5e776d6e1c781f0ff120f1b5c74d6c3 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 17 Sep 2015 19:47:42 +0200
Subject: [PATCH 236/323] Start blinking inside Canvas

---
 src/net/sf/freecol/client/gui/Canvas.java    | 1 +
 src/net/sf/freecol/client/gui/MapViewer.java | 2 +-
 src/net/sf/freecol/client/gui/SwingGUI.java  | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index a6208a892..cb859a3f0 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -272,6 +272,7 @@ public final class Canvas extends JDesktopPane {
 
         createKeyBindings();
         createFrame(null, windowBounds);
+        mapViewer.startCursorBlinking();
         logger.info("Canvas created.");
     }
 
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 21f4fbc80..6d97e31b2 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1027,7 +1027,7 @@ public final class MapViewer {
     void startCursorBlinking() {
         blinkingMarqueeEnabled = true;
 
-        cursor = new net.sf.freecol.client.gui.TerrainCursor();
+        cursor = new TerrainCursor();
         cursor.addActionListener((ActionEvent ae) -> {
                 if (!blinkingMarqueeEnabled) return;
                 Unit unit = activeUnit;
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index d7749bf3b..8c150fb9c 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -427,7 +427,6 @@ public class SwingGUI extends GUI {
                 }
             });
 
-        mapViewer.startCursorBlinking();
         logger.info("GUI created.");
         logger.info("Starting in Move Units View Mode");
     }

From 7f91a1f655cc2796a77253c54086fd148b4915e8 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 17 Sep 2015 20:59:18 +0200
Subject: [PATCH 237/323] Initialize ActionManager as late as possible, giving
 the prematurely requested button-images more time to load

---
 src/net/sf/freecol/client/FreeColClient.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/client/FreeColClient.java b/src/net/sf/freecol/client/FreeColClient.java
index 252eae66f..c1d62a4ee 100644
--- a/src/net/sf/freecol/client/FreeColClient.java
+++ b/src/net/sf/freecol/client/FreeColClient.java
@@ -216,8 +216,6 @@ public final class FreeColClient {
         } catch (IOException e) {
             fatal(Messages.message("client.classic") + "\n" + e.getMessage());
         }
-        actionManager = new ActionManager(this);
-        actionManager.initializeActions(inGameController, connectController);
 
         if (!this.headless) {
             // Swing system and look-and-feel initialization.
@@ -227,8 +225,10 @@ public final class FreeColClient {
                 fatal(Messages.message("client.laf") + "\n" + e.getMessage());
             }
         }
+        actionManager = new ActionManager(this);
+        actionManager.initializeActions(inGameController, connectController);
     }
-    
+
     /**
      * Starts the new <code>FreeColClient</code>, including the GUI.
      *

From c63e5a4feee75c19c537c9ab5d55c6ef22413ef0 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 19 Sep 2015 09:23:22 +0930
Subject: [PATCH 238/323] Fix AboutPanel manual url load.

---
 src/net/sf/freecol/client/gui/panel/AboutPanel.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/panel/AboutPanel.java b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
index f6d98d6ad..8506a6b29 100644
--- a/src/net/sf/freecol/client/gui/panel/AboutPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/AboutPanel.java
@@ -163,7 +163,8 @@ public final class AboutPanel extends FreeColPanel {
     @Override
     public void actionPerformed(ActionEvent ae) {
         final String url = ae.getActionCommand();
-        if (SITE_URL.equals(url) || PROJECT_URL.equals(url)) {
+        if (SITE_URL.equals(url) || PROJECT_URL.equals(url)
+            || MANUAL_URL.equals(url)) {
             String os = System.getProperty("os.name");
             // FIXME: move this to OS utilities
             String[] cmd = null;

From c27b602a92eb20ada633cb087ea475824033f7ed Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 19 Sep 2015 13:13:56 +0930
Subject: [PATCH 239/323] Improve turn report buttons again, BR#2917.

---
 .../client/gui/panel/ReportTurnPanel.java     | 84 +++----------------
 .../sf/freecol/client/gui/panel/Utility.java  | 42 ++++++++++
 src/net/sf/freecol/common/model/Europe.java   | 13 ++-
 .../common/model/FreeColGameObject.java       | 15 ++++
 src/net/sf/freecol/common/model/HighSeas.java | 10 +++
 src/net/sf/freecol/common/model/Market.java   | 10 +++
 .../sf/freecol/common/model/ModelMessage.java | 52 +++++++++++-
 .../sf/freecol/common/model/Settlement.java   | 10 +++
 src/net/sf/freecol/common/model/Tile.java     |  8 ++
 src/net/sf/freecol/common/model/Unit.java     |  9 ++
 10 files changed, 175 insertions(+), 78 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
index d0bd53511..4def259d8 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
@@ -305,81 +305,17 @@ public final class ReportTurnPanel extends ReportPanel {
 
     private void insertMessage(StyledDocument document, ModelMessage message,
                                Player player) throws BadLocationException {
-        final String input = Messages.message(message);
-        final Game game = getFreeColClient().getGame();
-        final FreeColGameObject messageSource = game.getMessageSource(message);
-        int start = 0;
-        for (String key : message.getKeys()) {
-            StringTemplate rep = message.getReplacement(key);
-            String val = Messages.message(rep);
-            int index = input.indexOf(val, start);
-            if (index < 0) continue;
-            insertText(document, input.substring(start, index));
-            if ("%colony%".equals(key) || key.endsWith("Colony%")) {
-                Settlement settlement = game.getSettlement(val);
-                if (settlement != null) {
-                    if (player.owns(settlement)) {
-                        insertLinkButton(document, settlement, val);
-                    } else {
-                        insertLinkButton(document, settlement.getTile(), val);
-                    }
-                } else if (messageSource instanceof Tile) {
-                    insertLinkButton(document, messageSource, val);
-                } else {
-                    insertText(document, val);
-                }
-            } else if ("%europe%".equals(key)
-                || ("%market%".equals(key) && player.isColonial())) {
-                insertLinkButton(document, player.getEurope(), val);
-            } else if ("%location%".equals(key)
-                || key.endsWith("Location%")) {
-                if (messageSource instanceof Europe) {
-                    insertLinkButton(document, player.getEurope(), val);
-                } else if (messageSource instanceof Location) {
-                    Location loc = ((Location)messageSource).up();
-                    insertLinkButton(document, (FreeColGameObject)loc, val);
-                } else {
-                    insertText(document, val);
-                }
-            } else if ("%unit%".equals(key) || key.endsWith("Unit%")
-                || "%newName%".equals(key)) {
-                Tile tile = null;
-                if (messageSource instanceof Unit) {
-                    tile = ((Unit)messageSource).getTile();
-                } else if (messageSource instanceof Tile) {
-                    tile = (Tile)messageSource;
-                }
-                if (tile != null) {
-                    Settlement settlement = tile.getSettlement();
-                    if (settlement != null && player.owns(settlement)) {
-                        insertLinkButton(document, settlement, val);
-                    } else {
-                        insertLinkButton(document, tile, val);
-                    }
-                } else {
-                    insertText(document, val);
-                }
-            } else {
-                insertText(document, val);
+        for (Object o : message.splitLinks(player)) {
+            if (o instanceof String) {
+                document.insertString(document.getLength(), (String)o,
+                                      document.getStyle("regular"));
+            } else if (o instanceof JButton) {
+                JButton b = (JButton)o;
+                b.addActionListener(this);
+                StyleConstants.setComponent(document.getStyle("button"), b);
+                document.insertString(document.getLength(), " ",
+                                      document.getStyle("button"));
             }
-            start = index + val.length();
         }
-        insertText(document, input.substring(start));
-    }
-
-    private void insertText(StyledDocument document, String text)
-        throws BadLocationException {
-        document.insertString(document.getLength(), text,
-                              document.getStyle("regular"));
-    }
-
-    private void insertLinkButton(StyledDocument document,
-                                  FreeColGameObject object, String name)
-        throws BadLocationException {
-        JButton button = Utility.getLinkButton(name, null, object.getId());
-        button.addActionListener(this);
-        StyleConstants.setComponent(document.getStyle("button"), button);
-        document.insertString(document.getLength(), " ",
-                              document.getStyle("button"));
     }
 }
diff --git a/src/net/sf/freecol/client/gui/panel/Utility.java b/src/net/sf/freecol/client/gui/panel/Utility.java
index c1bf61c3b..3d4b643fa 100644
--- a/src/net/sf/freecol/client/gui/panel/Utility.java
+++ b/src/net/sf/freecol/client/gui/panel/Utility.java
@@ -48,8 +48,13 @@ import javax.swing.text.StyleContext;
 
 import net.sf.freecol.client.gui.FontLibrary;
 import net.sf.freecol.common.i18n.Messages;
+import net.sf.freecol.common.model.FreeColGameObject;
+import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.Named;
+import net.sf.freecol.common.model.Player;
+import net.sf.freecol.common.model.Settlement;
 import net.sf.freecol.common.model.StringTemplate;
+import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.resources.ResourceManager;
 
 
@@ -171,6 +176,43 @@ public final class Utility {
         return button;
     }
 
+    /**
+     * Make a suitable link button for a given key.
+     *
+     * Colonies and Europe-like objects are obvious, locations and units
+     * are dependent on the message source.
+     * TODO: Are there more useful possibilities?
+     *
+     * @param key The message key to make a link for.
+     * @param val The text for the link.
+     * @param player The <code>Player</code> to make a link for.
+     * @param source The message source <code>FreeColGameObject</code>.
+     * @return A <code>JButton</code> for the link, or null if no good
+     *     choice found.
+     */
+    public static JButton getMessageButton(String key, String val,
+        Player player, FreeColGameObject source) {
+        FreeColGameObject link = null;
+        if ("%colony%".equals(key) || key.endsWith("Colony%")) {
+            Settlement settlement = player.getGame().getSettlement(val);
+            link = (settlement == null) ? null
+                : (player.owns(settlement)) ? settlement
+                : settlement.getTile();
+        } else if ("%europe%".equals(key) || "%market%".equals(key)) {
+            link = player.getEurope();
+        } else if ("%location%".equals(key) || key.endsWith("Location%")) {
+            if (source instanceof Location) {
+                link = source.getLinkTarget(player);
+            }
+        } else if ("%unit%".equals(key) || key.endsWith("Unit%")) {
+            if (source instanceof Unit) {
+                link = source.getLinkTarget(player);
+            }
+        }
+        return (link == null) ? null
+            : getLinkButton(val, null, link.getId());
+    }
+
     /**
      * Creates a text area with standard settings suitable for use in FreeCol
      * panels, without setting its size.
diff --git a/src/net/sf/freecol/common/model/Europe.java b/src/net/sf/freecol/common/model/Europe.java
index 2ef0d1c27..d73087616 100644
--- a/src/net/sf/freecol/common/model/Europe.java
+++ b/src/net/sf/freecol/common/model/Europe.java
@@ -257,15 +257,22 @@ public class Europe extends UnitLocation
     // Override FreeColObject
 
     /**
-     * Gets the feature container for this Europe object.
-     *
-     * @return The <code>FeatureContainer</code>.
+     * {@inheritDoc}
      */
     @Override
     public FeatureContainer getFeatureContainer() {
         return featureContainer;
     }
 
+    // Override FreeColGameObject
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public FreeColGameObject getLinkTarget(Player player) {
+        return (getOwner() == player) ? this : null;
+    }
 
     // Interface Location (from UnitLocation)
     // Inheriting:
diff --git a/src/net/sf/freecol/common/model/FreeColGameObject.java b/src/net/sf/freecol/common/model/FreeColGameObject.java
index 4f1329939..a55f79c58 100644
--- a/src/net/sf/freecol/common/model/FreeColGameObject.java
+++ b/src/net/sf/freecol/common/model/FreeColGameObject.java
@@ -215,6 +215,21 @@ public abstract class FreeColGameObject extends FreeColObject {
         return null;
     }
 
+    /**
+     * Get a suitable game object to use as a clickable link in messages
+     * to a player.
+     *
+     * Objects do not have links by default, hence the null return
+     * here.  However, for example, a player's colony should return
+     * itself as a link target.
+     *
+     * @param player The <code>Player</code> to make a link for.
+     * @return A suitable link target if available, although usually null.
+     */
+    public FreeColGameObject getLinkTarget(Player player) {
+        return null;
+    }
+
     /**
      * Checks the integrity of this game object.
      *
diff --git a/src/net/sf/freecol/common/model/HighSeas.java b/src/net/sf/freecol/common/model/HighSeas.java
index 2f5a2d6c8..2a6ffbb8c 100644
--- a/src/net/sf/freecol/common/model/HighSeas.java
+++ b/src/net/sf/freecol/common/model/HighSeas.java
@@ -97,6 +97,16 @@ public class HighSeas extends UnitLocation {
     }
 
 
+    // Override FreeColGameObject
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public FreeColGameObject getLinkTarget(Player player) {
+        return player.getEurope();
+    }
+
     // Interface Location (from UnitLocation)
     // Inherits
     //   FreeColObject.getId
diff --git a/src/net/sf/freecol/common/model/Market.java b/src/net/sf/freecol/common/model/Market.java
index 9b94982c4..710f88350 100644
--- a/src/net/sf/freecol/common/model/Market.java
+++ b/src/net/sf/freecol/common/model/Market.java
@@ -466,6 +466,16 @@ public final class Market extends FreeColGameObject implements Ownable {
         this.owner = owner;
     }
 
+    // Override FreeColGameObject
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public FreeColGameObject getLinkTarget(Player player) {
+        return (player == getOwner()) ? getOwner().getEurope() : null;
+    }
+
 
     // Serialization
 
diff --git a/src/net/sf/freecol/common/model/ModelMessage.java b/src/net/sf/freecol/common/model/ModelMessage.java
index 180d3854e..3fa118434 100644
--- a/src/net/sf/freecol/common/model/ModelMessage.java
+++ b/src/net/sf/freecol/common/model/ModelMessage.java
@@ -19,8 +19,12 @@
 
 package net.sf.freecol.common.model;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.xml.stream.XMLStreamException;
 
+import net.sf.freecol.client.gui.panel.Utility;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
@@ -350,8 +354,54 @@ public class ModelMessage extends StringTemplate {
         }
         return null;
     }
+
+    /**
+     * Split a message into a list of text and link objects.
+     *
+     * @param player The <code>Player</code> who will see the result.
+     * @return A list of strings and buttons.
+     */
+    public List<Object> splitLinks(Player player) {
+        final FreeColGameObject source = player.getGame()
+            .getMessageSource(this);
+
+        // Build a list of objects, initially containing just the plain
+        // text of the message.
+        List<Object> result = new ArrayList<>();
+        result.add(Messages.message(this));
+
+        for (String key : getKeys()) {
+            // Then for each key, check if it can be made into a link.
+            // If not, ignore it.
+            String val = Messages.message(getReplacement(key));
+            Object b = Utility.getMessageButton(key, val, player, source);
+            if (b == null) continue;
+
+            // ...if so, find all instances of the replacement of the key
+            // in the object list texts, and replace them with buttons.
+            List<Object> next = new ArrayList<>();
+            for (Object o : result) {
+                if (o instanceof String) {
+                    String str = (String)o;
+                    int index, start = 0;
+                    while ((index = str.indexOf(val, start)) >= 0) {
+                        if (index > start) {
+                            next.add(str.substring(start, index));
+                        }
+                        next.add(b);
+                        start = index + val.length();
+                    }
+                    next.add(str.substring(start, str.length()));
+                } else {
+                    next.add(o);
+                }
+            }
+            result = next;
+        }
+        return result;
+    }
+
         
-    
     // Quasi-override StringTemplate routines to return ModelMessages
 
     /**
diff --git a/src/net/sf/freecol/common/model/Settlement.java b/src/net/sf/freecol/common/model/Settlement.java
index 7582e9161..75a7479a3 100644
--- a/src/net/sf/freecol/common/model/Settlement.java
+++ b/src/net/sf/freecol/common/model/Settlement.java
@@ -423,6 +423,16 @@ public abstract class Settlement extends GoodsLocation
     }
 
 
+    // Override FreeColGameObject
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public FreeColGameObject getLinkTarget(Player player) {
+        return (player == getOwner()) ? this : getTile();
+    }
+
     // Override FreeColObject
 
     /**
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 601d598fa..c48f5e9d4 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -2326,6 +2326,14 @@ public final class Tile extends UnitLocation implements Named, Ownable {
         super.disposeResources();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public FreeColGameObject getLinkTarget(Player player) {
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index 1be5ce0fa..11c7af642 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -4043,6 +4043,15 @@ public class Unit extends GoodsLocation
         super.disposeResources();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public FreeColGameObject getLinkTarget(Player player) {
+        return (hasTile()) ? (FreeColGameObject)getTile().up()
+            : player.getEurope();
+    }
+
     /**
      * {@inheritDoc}
      */

From bad6ab6cf2f6dcef149b04d13a4fd4d264cf738a Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 17 Sep 2015 12:48:44 +0930
Subject: [PATCH 240/323] Java8 stream list collections, including sorting.

---
 .../client/control/InGameController.java      | 22 ++---
 src/net/sf/freecol/client/gui/Canvas.java     | 14 +--
 .../sf/freecol/client/gui/ImageLibrary.java   | 12 +--
 .../client/gui/panel/FreeColDialog.java       |  6 +-
 .../freecol/client/gui/panel/LabourData.java  | 12 +--
 .../sf/freecol/common/model/BuildingType.java | 13 +--
 src/net/sf/freecol/common/model/Colony.java   | 26 ++----
 .../freecol/common/model/DiplomaticTrade.java |  9 +-
 .../freecol/common/model/FreeColObject.java   |  5 +-
 src/net/sf/freecol/common/model/Game.java     | 33 +++----
 src/net/sf/freecol/common/model/Monarch.java  | 37 ++------
 src/net/sf/freecol/common/model/Player.java   | 93 ++++++++++++-------
 src/net/sf/freecol/common/model/Role.java     |  9 +-
 .../common/model/SimpleCombatModel.java       |  7 +-
 .../freecol/common/model/Specification.java   | 70 +++++++-------
 src/net/sf/freecol/common/model/Tile.java     | 52 +++++------
 .../sf/freecol/common/model/TradeRoute.java   |  9 +-
 src/net/sf/freecol/common/model/Unit.java     |  8 +-
 .../sf/freecol/common/model/UnitLocation.java |  8 +-
 src/net/sf/freecol/common/model/UnitType.java | 11 +--
 .../common/resources/ResourceMapping.java     | 54 ++++-------
 .../freecol/common/util/CollectionUtils.java  | 45 +++------
 src/net/sf/freecol/server/ai/AIColony.java    | 30 +++---
 src/net/sf/freecol/server/ai/ColonyPlan.java  | 21 ++---
 .../freecol/server/ai/EuropeanAIPlayer.java   |  7 +-
 .../server/control/InGameController.java      | 14 +--
 .../server/generator/TerrainGenerator.java    | 28 +++---
 .../sf/freecol/server/model/ServerUnit.java   | 10 +-
 .../sf/freecol/tools/MergeTranslations.java   | 13 +--
 .../sf/freecol/common/model/SchoolTest.java   | 10 +-
 .../server/model/ServerBuildingTest.java      | 10 +-
 31 files changed, 288 insertions(+), 410 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 3c170c11a..27b68d6af 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -28,6 +28,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.ClientOptions;
@@ -833,10 +834,8 @@ public final class InGameController implements NetworkConstants {
      */
     private boolean doEndTurn(boolean showDialog) {
         if (showDialog) {
-            List<Unit> units = new ArrayList<>();
-            for (Unit unit : freeColClient.getMyPlayer().getUnits()) {
-                if (unit.couldMove()) units.add(unit);
-            }
+            List<Unit> units = freeColClient.getMyPlayer().getUnits().stream()
+                .filter(Unit::couldMove).collect(Collectors.toList());
             if (!units.isEmpty()) {
                 // Modal dialog takes over
                 gui.showEndTurnDialog(units,
@@ -1369,18 +1368,11 @@ public final class InGameController implements NetworkConstants {
         }
 
         // Disembark selected units able to move.
-        final List<Unit> disembarkable = new ArrayList<>();
         unit.setStateToAllChildren(UnitState.ACTIVE);
-        for (Unit u : unit.getUnitList()) {
-            if (u.getMoveType(tile).isProgress()) {
-                disembarkable.add(u);
-            }
-        }
-        if (disembarkable.isEmpty()) {
-            // Did not find any unit that could disembark, fail.
-            return false;
-        }
-
+        final List<Unit> disembarkable = unit.getUnitList().stream()
+            .filter(u -> u.getMoveType(tile).isProgress())
+            .collect(Collectors.toList());
+        if (disembarkable.isEmpty()) return false; // Fail, did not find one
         if (disembarkable.size() == 1) {
             if (gui.confirm(tile,
                             StringTemplate.key("disembark.text"),
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index cb859a3f0..d491c915b 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -38,10 +38,12 @@ import java.awt.font.TextLayout;
 import java.awt.geom.Rectangle2D;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
@@ -680,15 +682,9 @@ public final class Canvas extends JDesktopPane {
         Point p = new Point(x, y);
         todo.add(p);
 
-        List<Component> allComponents = new ArrayList<>();
-        for (Component c : this.getComponents()) {
-            if (c instanceof GrayLayer || !c.isValid()) {
-                // GrayLayer always intersects and blocks early
-                // dialogs like FF-selection
-                continue;
-            }
-            allComponents.add(c);
-        }
+        List<Component> allComponents = Arrays.stream(this.getComponents())
+            .filter(c -> !(c instanceof GrayLayer) && c.isValid())
+            .collect(Collectors.toList());
         for (FreeColDialog<?> fcd : dialogs) allComponents.add(fcd);
 
         // Find the position with the least overlap
diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index aef68a214..5cdd95777 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -39,6 +39,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.swing.JComponent;
 
@@ -546,13 +547,10 @@ public final class ImageLibrary {
 
     public static BufferedImage getOverlayImage(TileType type, String id, float scale,
                                         Set<String> overlayCache) {
-        String prefix = "image.tileoverlay." + type.getId() + ".r";
-        List<String> keys = new ArrayList<>();
-        for (String key : overlayCache) {
-            if (key.startsWith(prefix)) {
-                keys.add(key);
-            }
-        }
+        final String prefix = "image.tileoverlay." + type.getId() + ".r";
+        final List<String> keys = overlayCache.stream()
+            .filter(k -> k.startsWith(prefix))
+            .collect(Collectors.toList());
         return getRandomizedImage(keys, id, scale);
     }
 
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
index b893f4a8a..a932de616 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
@@ -146,11 +146,7 @@ public class FreeColDialog<T> extends JDialog implements PropertyChangeListener
      * @return An array of enabled options.
      */
     private Object[] selectOptions() {
-        List<ChoiceItem<T>> actual = new ArrayList<>();
-        for (ChoiceItem<T> c : this.options) {
-            if (c.isEnabled()) actual.add(c);
-        }
-        return actual.toArray();
+        return this.options.stream().filter(ChoiceItem::isEnabled).toArray();
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/panel/LabourData.java b/src/net/sf/freecol/client/gui/panel/LabourData.java
index 21eca2446..bc1950e70 100644
--- a/src/net/sf/freecol/client/gui/panel/LabourData.java
+++ b/src/net/sf/freecol/client/gui/panel/LabourData.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.common.i18n.Messages;
@@ -451,14 +452,9 @@ public class LabourData {
     }
 
     public static List<UnitType> getLabourTypes(Player player) {
-        List<UnitType> unitTypes = player.getSpecification().getUnitTypeList();
-        ArrayList<UnitType> labourTypes = new ArrayList<>();
-        for (UnitType unitType : unitTypes) {
-            if (unitType.hasSkill() && unitType.isAvailableTo(player)) {
-                labourTypes.add(unitType);
-            }
-        }
-        return labourTypes;
+        return player.getSpecification().getUnitTypeList().stream()
+            .filter(ut -> ut.hasSkill() && ut.isAvailableTo(player))
+            .collect(Collectors.toList());
     }
 
     private void summarize() {
diff --git a/src/net/sf/freecol/common/model/BuildingType.java b/src/net/sf/freecol/common/model/BuildingType.java
index a3eaa5789..6cc40d79f 100644
--- a/src/net/sf/freecol/common/model/BuildingType.java
+++ b/src/net/sf/freecol/common/model/BuildingType.java
@@ -21,6 +21,7 @@ package net.sf.freecol.common.model;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -223,14 +224,10 @@ public final class BuildingType extends BuildableType {
      */
     public List<ProductionType> getAvailableProductionTypes(boolean unattended,
                                                             String level) {
-        List<ProductionType> result = new ArrayList<>();
-        for (ProductionType productionType : productionTypes) {
-            if (productionType.getUnattended() == unattended
-                && productionType.appliesTo(level)) {
-                result.add(productionType);
-            }
-        }
-        return result;
+        return productionTypes.stream()
+            .filter(pt -> pt.getUnattended() == unattended
+                && pt.appliesTo(level))
+            .collect(Collectors.toList());
     }
 
     // @compat 0.10.6
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 0d481f2c4..5f0de5901 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -826,14 +826,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return A list of buildable <code>UnitType</code>s.
      */
     public List<UnitType> getBuildableUnits() {
-        ArrayList<UnitType> buildableUnits = new ArrayList<>();
-        List<UnitType> unitTypes = getSpecification().getUnitTypeList();
-        for (UnitType unitType : unitTypes) {
-            if (unitType.needsGoodsToBuild() && canBuild(unitType)) {
-                buildableUnits.add(unitType);
-            }
-        }
-        return buildableUnits;
+        return getSpecification().getUnitTypeList().stream()
+            .filter(ut -> ut.needsGoodsToBuild() && canBuild(ut))
+            .collect(Collectors.toList());
     }
 
     /**
@@ -1672,11 +1667,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return A list of burnable buildings.
      */
     public List<Building> getBurnableBuildings() {
-        List<Building> buildingList = new ArrayList<>();
-        for (Building building : getBuildings()) {
-            if (building.canBeDamaged()) buildingList.add(building);
-        }
-        return buildingList;
+        return getBuildings().stream()
+            .filter(Building::canBeDamaged).collect(Collectors.toList());
     }
 
     /**
@@ -1686,11 +1678,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return A list of lootable goods in this colony.
      */
     public List<Goods> getLootableGoodsList() {
-        List<Goods> goodsList = new ArrayList<>();
-        for (Goods goods : getGoodsContainer().getGoods()) {
-            if (goods.getType().isStorable()) goodsList.add(goods);
-        }
-        return goodsList;
+        return getGoodsContainer().getGoods().stream()
+            .filter(g -> g.getType().isStorable())
+            .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/DiplomaticTrade.java b/src/net/sf/freecol/common/model/DiplomaticTrade.java
index 0e056b385..458bc5b1c 100644
--- a/src/net/sf/freecol/common/model/DiplomaticTrade.java
+++ b/src/net/sf/freecol/common/model/DiplomaticTrade.java
@@ -22,6 +22,7 @@ package net.sf.freecol.common.model;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -311,11 +312,9 @@ public class DiplomaticTrade extends FreeColObject {
      * @return A list of <code>TradeItem</code>s offered by the player.
      */
     public List<TradeItem> getItemsGivenBy(Player player) {
-        List<TradeItem> goodsList = new ArrayList<>();
-        for (TradeItem ti : items) {
-            if (player == ti.getSource()) goodsList.add(ti);
-        }
-        return goodsList;
+        return items.stream()
+            .filter(ti -> ti.getSource() == player)
+            .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/FreeColObject.java b/src/net/sf/freecol/common/model/FreeColObject.java
index a7290dd74..01c988718 100644
--- a/src/net/sf/freecol/common/model/FreeColObject.java
+++ b/src/net/sf/freecol/common/model/FreeColObject.java
@@ -37,6 +37,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -248,9 +249,7 @@ public abstract class FreeColObject
      * @return A sorted copy of the collection.
      */
     public static <T extends FreeColObject> List<T> getSortedCopy(Collection<T> c) {
-        List<T> newC = new ArrayList<>(c);
-        Collections.sort(newC); // Use natural order if implemented.
-        return newC;
+        return c.stream().sorted().collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Game.java b/src/net/sf/freecol/common/model/Game.java
index 979654bfa..72e1cf46c 100644
--- a/src/net/sf/freecol/common/model/Game.java
+++ b/src/net/sf/freecol/common/model/Game.java
@@ -32,6 +32,7 @@ import java.util.NoSuchElementException;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -496,13 +497,9 @@ public class Game extends FreeColGameObject {
      * @return The list of live <code>Player</code>s.
      */
     public List<Player> getLivePlayers(Player other) {
-        List<Player> result = new ArrayList<>();
-        for (Player player : players) {
-            if (player.isUnknownEnemy() || player.isDead()
-                || player == other) continue;
-            result.add(player);
-        }
-        return result;
+        return players.stream()
+            .filter(p -> !p.isUnknownEnemy() && !p.isDead() && p != other)
+            .collect(Collectors.toList());
     }
 
     /**
@@ -524,13 +521,10 @@ public class Game extends FreeColGameObject {
      * @return A list of live European <code>Player</code>s in this game.
      */
     public List<Player> getLiveEuropeanPlayers(Player other) {
-        List<Player> result = new ArrayList<>();
-        for (Player player : players) {
-            if (player.isUnknownEnemy() || player.isDead()
-                || !player.isEuropean() || player == other) continue;
-            result.add(player);
-        }
-        return result;
+        return players.stream()
+            .filter(p -> !p.isUnknownEnemy() && !p.isDead() && p != other
+                && p.isEuropean())
+            .collect(Collectors.toList());
     }
 
     /**
@@ -540,13 +534,10 @@ public class Game extends FreeColGameObject {
      * @return A list of live native <code>Player</code>s in this game.
      */
     public List<Player> getLiveNativePlayers(Player other) {
-        List<Player> result = new ArrayList<>();
-        for (Player player : players) {
-            if (player.isUnknownEnemy() || player.isDead()
-                || !player.isIndian() || player == other) continue;
-            result.add(player);
-        }
-        return result;
+        return players.stream()
+            .filter(p -> !p.isUnknownEnemy() && !p.isDead() && p != other
+                && p.isIndian())
+            .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Monarch.java b/src/net/sf/freecol/common/model/Monarch.java
index fe46f676c..c13206bb0 100644
--- a/src/net/sf/freecol/common/model/Monarch.java
+++ b/src/net/sf/freecol/common/model/Monarch.java
@@ -20,9 +20,11 @@
 package net.sf.freecol.common.model;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+import java.util.stream.Collectors;
 import java.util.logging.Logger;
 
 import javax.xml.stream.XMLStreamConstants;
@@ -571,22 +573,12 @@ public final class Monarch extends FreeColGameObject implements Named {
      * @return A list of potential enemy <code>Player</code>s.
      */
     public List<Player> collectPotentialEnemies() {
-        List<Player> enemies = new ArrayList<>();
         // Benjamin Franklin puts an end to the monarch's interference
-        if (!player.hasAbility(Ability.IGNORE_EUROPEAN_WARS)) {
-            for (Player enemy : getGame().getLiveEuropeanPlayers(player)) {
-                if (enemy.hasAbility(Ability.IGNORE_EUROPEAN_WARS)
-                    || enemy.isREF()) continue;
-                switch (player.getStance(enemy)) {
-                case PEACE: case CEASE_FIRE:
-                    enemies.add(enemy);
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-        return enemies;
+        return (player.hasAbility(Ability.IGNORE_EUROPEAN_WARS))
+            ? Collections.<Player>emptyList()
+            : getGame().getLiveEuropeanPlayers(player).stream()
+                .filter(p -> p.isPotentialEnemy(player))
+                .collect(Collectors.toList());
     }
 
     /**
@@ -597,18 +589,9 @@ public final class Monarch extends FreeColGameObject implements Named {
      * @return A list of potential friendly <code>Player</code>s.
      */
     public List<Player> collectPotentialFriends() {
-        List<Player> friends = new ArrayList<>();
-        for (Player enemy : getGame().getLiveEuropeanPlayers(player)) {
-            if (enemy.isREF()) continue;
-            switch (player.getStance(enemy)) {
-            case WAR: case CEASE_FIRE:
-                friends.add(enemy);
-                break;
-            default:
-                break;
-            }
-        }
-        return friends;
+        return getGame().getLiveEuropeanPlayers(player).stream()
+            .filter(p -> p.isPotentialFriend(player))
+            .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 767358556..cb18831fd 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -33,6 +33,7 @@ import java.util.Locale;
 import java.util.Random;
 import java.util.Set;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -925,6 +926,41 @@ public class Player extends FreeColGameObject implements Nameable {
         return playerType == PlayerType.ROYAL;
     }
 
+    /**
+     * Is this player currently on good terms with a given player, and thus
+     * a suitable candidate for a random monarch war declaration?
+     *
+     * @param player The <code>Player</code> to possibly declare war on.
+     * @return True if this player is a potential enemy.
+     */
+    public boolean isPotentialEnemy(Player player) {
+        if (!hasAbility(Ability.IGNORE_EUROPEAN_WARS)
+            && player.getREFPlayer() != this) {
+            switch (getStance(player)) {
+            case PEACE: case CEASE_FIRE: return true;
+            default: break;
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * Is this player currently on bad terms with a given player, and thus
+     * a suitable candidate for a random monarch peace declaration?
+     *
+     * @param player The <code>Player</code> to possibly declare peace with.
+     * @return True if this player is a potential friend.
+     */
+    public boolean isPotentialFriend(Player player) {
+        if (player.getREFPlayer() != this) {
+            switch (getStance(player)) {
+            case WAR: case CEASE_FIRE: return true;
+            default: break;
+            }
+        }
+        return false;
+    }
+
     /**
      * Get the nation type of this player.
      *
@@ -1117,12 +1153,10 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return A list of nations in rebellion against us.
      */
     public List<Player> getRebels() {
-        List<Player> rebels = new ArrayList<>();
-        for (Player p : getGame().getLiveEuropeanPlayers(this)) {
-            if (p.getREFPlayer() == this
-                && (p.isRebel() || p.isUndead())) rebels.add(p);
-        }
-        return rebels;
+        return getGame().getLiveEuropeanPlayers(this).stream()
+            .filter(p -> p.getREFPlayer() == this
+                && (p.isRebel() || p.isUndead()))
+            .collect(Collectors.toList());
     }
 
     /**
@@ -2062,11 +2096,9 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return A list of suitable carriers.
      */
     public List<Unit> getCarriersForUnit(Unit unit) {
-        List<Unit> ul = new ArrayList<>();
-        for (Unit u : getUnits()) {
-            if (u.couldCarry(unit)) ul.add(u);
-        }
-        return ul;
+        return getUnits().stream()
+            .filter(u -> u.couldCarry(unit))
+            .collect(Collectors.toList());
     }
 
     /**
@@ -2076,11 +2108,9 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return The number of units.
      */
     public int getUnitCount(boolean naval) {
-        int ret = 0;
-        for (Unit u : getUnits()) {
-            if (u.isNaval() == naval) ret++;
-        }
-        return ret;
+        return (int)getUnits().stream()
+            .filter(u -> u.isNaval() == naval)
+            .count();
     }
         
     /**
@@ -2089,17 +2119,11 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return The number of units
      */
     public int getNumberOfKingLandUnits() {
-        int n = 0;
-        for (Unit unit : getUnits()) {
-            if (unit.hasAbility(Ability.REF_UNIT) && !unit.isNaval()) {
-                n++;
-            }
-        }
-        return n;
+        return (int)getUnits().stream()
+            .filter(u -> u.hasAbility(Ability.REF_UNIT) && !u.isNaval())
+            .count();
     }
 
- 
-
     /**
      * Checks if this player has at least one of a given unit type.
      *
@@ -2303,12 +2327,11 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return A list of port <code>Colony</code>s.
      */
     public List<Colony> getPorts() {
-        if (!isEuropean()) return Collections.<Colony>emptyList();
-        List<Colony> result = new ArrayList<>();
-        for (Colony colony : getColonies()) {
-            if (colony.isConnectedPort()) result.add(colony);
-        }
-        return result;
+        return (!isEuropean())
+            ? Collections.<Colony>emptyList()
+            : getColonies().stream()
+                .filter(Colony::isConnectedPort)
+                .collect(Collectors.toList());
     }
 
     /**
@@ -2488,11 +2511,11 @@ public class Player extends FreeColGameObject implements Nameable {
      *     <code>Player</code>.
      */
     public List<ModelMessage> getNewModelMessages() {
-        List<ModelMessage> out = new ArrayList<>();
-        for (ModelMessage m : getModelMessages()) {
-            if (!m.hasBeenDisplayed()) out.add(m); // preserve message order
+        synchronized (modelMessages) {
+            return modelMessages.stream()
+                .filter(m -> !m.hasBeenDisplayed())
+                .collect(Collectors.toList());
         }
-        return out;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Role.java b/src/net/sf/freecol/common/model/Role.java
index f5a85e103..3bd8915c0 100644
--- a/src/net/sf/freecol/common/model/Role.java
+++ b/src/net/sf/freecol/common/model/Role.java
@@ -25,6 +25,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -414,11 +415,9 @@ public class Role extends BuildableType {
      */
     public static List<Role> getAvailableRoles(Player player, UnitType type,
                                                List<Role> roles) {
-        List<Role> result = new ArrayList<>();
-        for (Role r : roles) {
-            if (r.isAvailableTo(player, type)) result.add(r);
-        }
-        return result;
+        return roles.stream()
+            .filter(r -> r.isAvailableTo(player, type))
+            .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/SimpleCombatModel.java b/src/net/sf/freecol/common/model/SimpleCombatModel.java
index 43a8e5b83..273bea7b2 100644
--- a/src/net/sf/freecol/common/model/SimpleCombatModel.java
+++ b/src/net/sf/freecol/common/model/SimpleCombatModel.java
@@ -27,6 +27,7 @@ import java.util.Random;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.common.model.Modifier.ModifierType;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
@@ -126,10 +127,8 @@ public class SimpleCombatModel extends CombatModel {
      * @param modSet A set of <code>Modifiers</code> to log.
      */   
     private void logModifiers(LogBuilder lb, Set<Modifier> modSet) {
-        List<Modifier> modList = new ArrayList<>();
-        modList.addAll(modSet);
-        Collections.sort(modList);
-        lb.addCollection(" ", modList);
+        lb.addCollection(" ", modSet.stream()
+            .sorted().collect(Collectors.toList()));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index f6884c742..ed079f73a 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -24,6 +24,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -32,6 +33,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -142,6 +145,22 @@ public final class Specification {
         = new Source("model.source.shipTradePenalty");
     public static final Source SOL_MODIFIER_SOURCE
         = new Source("model.source.solModifier");
+    /** All the special static sources. */
+    private static final Source[] sources = new Source[] {
+        MOVEMENT_PENALTY_SOURCE,
+        ARTILLERY_PENALTY_SOURCE,
+        ATTACK_BONUS_SOURCE,
+        FORTIFICATION_BONUS_SOURCE,
+        INDIAN_RAID_BONUS_SOURCE,
+        AMPHIBIOUS_ATTACK_PENALTY_SOURCE,
+        BASE_OFFENCE_SOURCE,
+        BASE_DEFENCE_SOURCE,
+        CARGO_PENALTY_SOURCE,
+        AMBUSH_BONUS_SOURCE,
+        COLONY_GOODS_PARTY_SOURCE,
+        SHIP_TRADE_PENALTY_SOURCE,
+        SOL_MODIFIER_SOURCE
+    };
 
 
     /** A map from specification element to a reader for that element. */
@@ -250,23 +269,7 @@ public final class Specification {
      */
     public Specification() {
         logger.fine("Initializing Specification");
-        for (Source source : new Source[] {
-                MOVEMENT_PENALTY_SOURCE,
-                ARTILLERY_PENALTY_SOURCE,
-                ATTACK_BONUS_SOURCE,
-                FORTIFICATION_BONUS_SOURCE,
-                INDIAN_RAID_BONUS_SOURCE,
-                AMPHIBIOUS_ATTACK_PENALTY_SOURCE,
-                BASE_OFFENCE_SOURCE,
-                BASE_DEFENCE_SOURCE,
-                CARGO_PENALTY_SOURCE,
-                AMBUSH_BONUS_SOURCE,
-                COLONY_GOODS_PARTY_SOURCE,
-                SHIP_TRADE_PENALTY_SOURCE,
-                SOL_MODIFIER_SOURCE
-            }) {
-            allTypes.put(source.getId(), source);
-        }
+        for (Source source : sources) allTypes.put(source.getId(), source);
 
         readerMap.put(BUILDING_TYPES_TAG,
                       new TypeReader<>(BuildingType.class, buildingTypeList));
@@ -1409,11 +1412,9 @@ public final class Specification {
      * @param naval If true, choose naval units, if not, land units.
      */
     public List<UnitType> getREFUnitTypes(boolean naval) {
-        List<UnitType> types = new ArrayList<>();
-        for (UnitType ut : getUnitTypesWithAbility(Ability.REF_UNIT)) {
-            if (naval == ut.isNaval()) types.add(ut);
-        }
-        return types;
+        return getUnitTypesWithAbility(Ability.REF_UNIT).stream()
+            .filter(ut -> ut.isNaval() == naval)
+            .collect(Collectors.toList());
     }
 
     /**
@@ -1545,12 +1546,11 @@ public final class Specification {
      */
     public List<Role> getMilitaryRoles() {
         if (militaryRoles == null) {
-            List<Role> mr = new ArrayList<>();
-            for (Role role : roles) {
-                if (role.isOffensive()) mr.add(role);
-            }
-            Collections.sort(mr, Role.militaryComparator);
-            this.militaryRoles = Collections.<Role>unmodifiableList(mr);
+            this.militaryRoles
+                = Collections.<Role>unmodifiableList(roles.stream()
+                    .filter(Role::isOffensive)
+                    .sorted(Role.militaryComparator)
+                    .collect(Collectors.toList()));
         }
         return militaryRoles;
     }
@@ -1605,15 +1605,11 @@ public final class Specification {
      * @param naval If true, choose roles for naval units, if not, land units.
      */
     public List<Role> getREFRoles(boolean naval) {
-        List<Role> roles = new ArrayList<>();
-        if (naval) {
-            roles.add(getDefaultRole());
-        } else {
-            for (Role r : getMilitaryRoles()) {
-                if (r.requiresAbility(Ability.REF_UNIT)) roles.add(r);
-            }
-        }
-        return roles;
+        return ((naval)
+            ? Stream.of(getDefaultRole())
+            : getMilitaryRoles().stream()
+                .filter(r -> r.requiresAbility(Ability.REF_UNIT)))
+            .collect(Collectors.toList());
     }
 
 
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index c48f5e9d4..61911e3ff 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -30,6 +30,7 @@ import java.util.Random;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
@@ -197,6 +198,15 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      */
     private final java.util.Map<Player, IndianSettlementInternals> playerIndianSettlements;
 
+    /** A comparator to sort for best defence value. */
+    private final Comparator<Tile> defenceValueComparator
+        = new Comparator<Tile>() {
+                public int compare(Tile t1, Tile t2) {
+                    float f = t2.getDefenceValue() - t1.getDefenceValue();
+                    return (f < 0.0f) ? -1 : (f > 0.0f) ? 1 : 0;
+                }
+            };
+
 
     /**
      * The main tile constructor.
@@ -500,10 +510,8 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      * @return True if this is a river corner.
      */
     public boolean isRiverCorner() {
-        List<Tile> tiles = new ArrayList<>();
-        for (Tile t : getSurroundingTiles(1)) {
-            if (t.isOnRiver()) tiles.add(t);
-        }
+        List<Tile> tiles = getSurroundingTiles(0, 1).stream()
+            .filter(Tile::isOnRiver).collect(Collectors.toList());
         switch (tiles.size()) {
         case 0: case 1:
             return false;
@@ -1001,11 +1009,8 @@ public final class Tile extends UnitLocation implements Named, Ownable {
     public StringTemplate getLabel() {
         StringTemplate label = StringTemplate.key(type);
         if (tileItemContainer != null) {
-            List<Named> keys = new ArrayList<>();
-            for (TileItem item : tileItemContainer.getTileItems()) {
-                if (!item.isComplete()) continue;
-                keys.add(item);
-            }
+            List<Named> keys = tileItemContainer.getTileItems().stream()
+                .filter(TileItem::isComplete).collect(Collectors.toList());
             if (!keys.isEmpty()) {
                 label = StringTemplate.label("/").addNamed(type);
                 for (Named key : keys) label.addNamed(key);
@@ -1377,21 +1382,10 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      * @return A list of land <code>Tile</code>s.
      */
     public List<Tile> getSafestSurroundingLandTiles(Player player) {
-        List<Tile> tiles = new ArrayList<>();
-        for (Tile t : getSurroundingTiles(1)) {
-            if (t.isLand()
-                && (!t.hasSettlement() || player.owns(t.getSettlement()))) {
-                tiles.add(t);
-            }
-        }
-        Collections.sort(tiles, new Comparator<Tile>() {
-                @Override
-                public int compare(Tile t1, Tile t2) {
-                    float f = t2.getDefenceValue() - t1.getDefenceValue();
-                    return (f < 0.0f) ? -1 : (f > 0.0f) ? 1 : 0;
-                }
-            });
-        return tiles;
+        return getSurroundingTiles(0, 1).stream()
+            .filter(t -> t.isLand()
+                && (!t.hasSettlement() || player.owns(t.getSettlement())))
+            .sorted(defenceValueComparator).collect(Collectors.toList());
     }
                     
     /**
@@ -1438,12 +1432,10 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      * @return A list of suitable <code>Tile</code>s.
      */
     public List<Tile> getSafeAnchoringTiles(Unit unit) {
-        List<Tile> result = new ArrayList<>();
-        for (Tile t : getSurroundingTiles(1)) {
-            if (!t.isLand() && t.isHighSeasConnected()
-                && !t.isDangerousToShip(unit)) result.add(t);
-        }
-        return result;
+        return getSurroundingTiles(0, 1).stream()
+            .filter(t -> !t.isLand() && t.isHighSeasConnected()
+                && !t.isDangerousToShip(unit))
+            .collect(Collectors.toList());
     }
                 
 
diff --git a/src/net/sf/freecol/common/model/TradeRoute.java b/src/net/sf/freecol/common/model/TradeRoute.java
index e27ae1089..20d00fa4b 100644
--- a/src/net/sf/freecol/common/model/TradeRoute.java
+++ b/src/net/sf/freecol/common/model/TradeRoute.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -224,11 +225,9 @@ public class TradeRoute extends FreeColGameObject
      * @return A list of assigned <code>Unit</code>s.
      */
     public List<Unit> getAssignedUnits() {
-        List<Unit> list = new ArrayList<>();
-        for (Unit unit : owner.getUnits()) {
-            if (unit.getTradeRoute() == this) list.add(unit);
-        }
-        return list;
+        return owner.getUnits().stream()
+            .filter(u -> u.getTradeRoute() == this)
+            .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index 11c7af642..338f69650 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -25,6 +25,7 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.logging.Logger;
 
 import javax.xml.stream.XMLStreamConstants;
@@ -855,11 +856,8 @@ public class Unit extends GoodsLocation
      */
     public List<Role> getAvailableRoles(List<Role> roles) {
         if (roles == null) roles = getSpecification().getRoles();
-        List<Role> result = new ArrayList<>();
-        for (Role role : roles) {
-            if (roleIsAvailable(role)) result.add(role);
-        }
-        return result;
+        return roles.stream()
+            .filter(r -> roleIsAvailable(r)).collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/UnitLocation.java b/src/net/sf/freecol/common/model/UnitLocation.java
index bbf50be7a..f323e6bc5 100644
--- a/src/net/sf/freecol/common/model/UnitLocation.java
+++ b/src/net/sf/freecol/common/model/UnitLocation.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -242,11 +243,8 @@ public abstract class UnitLocation extends FreeColGameObject implements Location
      * @return A list of naval <code>Unit</code>s present.
      */
     public List<Unit> getNavalUnits() {
-        List<Unit> shipList = new ArrayList<>();
-        for (Unit u : getUnitList()) {
-            if (u.isNaval()) shipList.add(u);
-        }
-        return shipList;
+        return getUnitList().stream()
+            .filter(Unit::isNaval).collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/UnitType.java b/src/net/sf/freecol/common/model/UnitType.java
index 4e72aa74a..2a9917f5a 100644
--- a/src/net/sf/freecol/common/model/UnitType.java
+++ b/src/net/sf/freecol/common/model/UnitType.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -395,13 +396,9 @@ public final class UnitType extends BuildableType implements Consumer {
      * @return a list of expert roles
      */
     public List<Role> getExpertRoles() {
-        List<Role> result = new ArrayList<>();
-        for (Role role : getSpecification().getRoles()) {
-            if (role.getExpertUnit() == this) {
-                result.add(role);
-            }
-        }
-        return result;
+        return getSpecification().getRoles().stream()
+            .filter(r -> r.getExpertUnit() == this)
+            .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/resources/ResourceMapping.java b/src/net/sf/freecol/common/resources/ResourceMapping.java
index 04f18df64..8edf463db 100644
--- a/src/net/sf/freecol/common/resources/ResourceMapping.java
+++ b/src/net/sf/freecol/common/resources/ResourceMapping.java
@@ -19,13 +19,12 @@
 
 package net.sf.freecol.common.resources;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 
 /**
@@ -286,51 +285,38 @@ public final class ResourceMapping {
     }
 
     /**
-     * Get the image keys in this mapping with a given prefix.
+     * Get the image keys in this mapping with a given prefix as a list.
      *
      * @param prefix The prefix to check for.
      * @return A list of keys.
      */
     public List<String> getImageKeys(String prefix) {
-        List<String> result = new ArrayList<>();
-        for (String key : imageResources.keySet()) {
-            if (key.startsWith(prefix)) {
-                result.add(key);
-            }
-        }
-        return result;
+        return imageResources.keySet().stream()
+            .filter(k -> k.startsWith(prefix)).collect(Collectors.toList());
     }
 
     /**
-     * Get the image keys in this mapping with a given prefix and suffix.
+     * Get the image keys in this mapping with a given prefix as a set.
+     *
+     * @param prefix The prefix to check for.
+     * @return The set of keys.
+     */
+    public Set<String> getImageKeySet(String prefix) {
+        return imageResources.keySet().stream()
+            .filter(k -> k.startsWith(prefix)).collect(Collectors.toSet());
+    }
+
+    /**
+     * Get the image keys in this mapping with a given prefix and
+     * suffix as a list.
      *
      * @param prefix The prefix to check for.
      * @param suffix The suffix to check for.
      * @return A list of keys.
      */
     public List<String> getImageKeys(String prefix, String suffix) {
-        List<String> result = new ArrayList<>();
-        for (String key : imageResources.keySet()) {
-            if (key.startsWith(prefix) && key.endsWith(suffix)) {
-                result.add(key);
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Get the image keys in this mapping with a given prefix.
-     *
-     * @param prefix The prefix to check for.
-     * @return The set of keys.
-     */
-    public Set<String> getImageKeySet(String prefix) {
-        HashSet<String> result = new HashSet<>();
-        for (String key : imageResources.keySet()) {
-            if (key.startsWith(prefix)) {
-                result.add(key);
-            }
-        }
-        return result;
+        return imageResources.keySet().stream()
+            .filter(k -> k.startsWith(prefix) && k.endsWith(suffix))
+            .collect(Collectors.toList());
     }
 }
diff --git a/src/net/sf/freecol/common/util/CollectionUtils.java b/src/net/sf/freecol/common/util/CollectionUtils.java
index 3edc3e083..103deb741 100644
--- a/src/net/sf/freecol/common/util/CollectionUtils.java
+++ b/src/net/sf/freecol/common/util/CollectionUtils.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 
 /**
@@ -311,14 +312,9 @@ public class CollectionUtils {
      */
     public static <K extends Comparable<? super K>,V> List<Entry<K,V>>
         mapEntriesByKey(Map<K, V> map) {
-        List<Entry<K,V>> result = new ArrayList<>();
-        result.addAll(map.entrySet());
-        Collections.sort(result, new Comparator<Entry<K,V>>() {
-                public int compare(Entry<K,V> e1, Entry<K,V> e2) {
-                    return e1.getKey().compareTo(e2.getKey());
-                }
-            });
-        return result;
+        return map.entrySet().stream()
+            .sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey()))
+            .collect(Collectors.toList());
     }
 
     /**
@@ -330,14 +326,9 @@ public class CollectionUtils {
      */
     public static <K,V> List<Entry<K,V>>
         mapEntriesByKey(Map<K, V> map, final Comparator<K> comparator) {
-        List<Entry<K,V>> result = new ArrayList<>();
-        result.addAll(map.entrySet());
-        Collections.sort(result, new Comparator<Entry<K,V>>() {
-                public int compare(Entry<K,V> e1, Entry<K,V> e2) {
-                    return comparator.compare(e1.getKey(), e2.getKey());
-                }
-            });
-        return result;
+        return map.entrySet().stream()
+            .sorted((e1, e2) -> comparator.compare(e1.getKey(), e2.getKey()))
+            .collect(Collectors.toList());
     }
 
     /**
@@ -348,14 +339,9 @@ public class CollectionUtils {
      */
     public static <K,V extends Comparable<? super V>> List<Entry<K,V>>
         mapEntriesByValue(Map<K, V> map) {
-        List<Entry<K,V>> result = new ArrayList<>();
-        result.addAll(map.entrySet());
-        Collections.sort(result, new Comparator<Entry<K,V>>() {
-                public int compare(Entry<K,V> e1, Entry<K,V> e2) {
-                    return e1.getValue().compareTo(e2.getValue());
-                }
-            });
-        return result;
+        return map.entrySet().stream()
+            .sorted((e1, e2) -> e1.getValue().compareTo(e2.getValue()))
+            .collect(Collectors.toList());
     }
 
     /**
@@ -367,13 +353,8 @@ public class CollectionUtils {
      */
     public static <K,V> List<Entry<K,V>>
         mapEntriesByValue(Map<K, V> map, final Comparator<V> comparator) {
-        List<Entry<K,V>> result = new ArrayList<>();
-        result.addAll(map.entrySet());
-        Collections.sort(result, new Comparator<Entry<K,V>>() {
-                public int compare(Entry<K,V> e1, Entry<K,V> e2) {
-                    return comparator.compare(e1.getValue(), e2.getValue());
-                }
-            });
-        return result;
+        return map.entrySet().stream()
+            .sorted((e1, e2) -> comparator.compare(e1.getValue(), e2.getValue()))
+            .collect(Collectors.toList());
     }
 }
diff --git a/src/net/sf/freecol/server/ai/AIColony.java b/src/net/sf/freecol/server/ai/AIColony.java
index 6dcdc5abf..25809d827 100644
--- a/src/net/sf/freecol/server/ai/AIColony.java
+++ b/src/net/sf/freecol/server/ai/AIColony.java
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -580,15 +581,10 @@ public class AIColony extends AIObject implements PropertyChangeListener {
      */
     private void exploreLCRs() {
         final Tile tile = colony.getTile();
-        List<Unit> explorers = new ArrayList<>();
-        for (Unit u : tile.getUnitList()) {
-            if (u.isPerson()
-                && (u.getType().getSkill() <= 0
-                    || u.hasAbility(Ability.EXPERT_SCOUT))) {
-                explorers.add(u);
-            }
-        }
-        Collections.sort(explorers, scoutComparator);
+        List<Unit> explorers = tile.getUnitList().stream()
+            .filter(u -> u.isPerson() && (u.getType().getSkill() <= 0
+                        || u.hasAbility(Ability.EXPERT_SCOUT)))
+            .sorted(scoutComparator).collect(Collectors.toList());
         for (Tile t : tile.getSurroundingTiles(1)) {
             if (t.hasLostCityRumour()) {
                 Direction direction = tile.getDirection(t);
@@ -630,10 +626,9 @@ public class AIColony extends AIObject implements PropertyChangeListener {
         if (!hasDefender) return;
 
         // What goods are really needed?
-        List<GoodsType> needed = new ArrayList<>();
-        for (GoodsType g : spec.getRawBuildingGoodsTypeList()) {
-            if (colony.getTotalProductionOf(g) <= 0) needed.add(g);
-        }
+        List<GoodsType> needed = spec.getRawBuildingGoodsTypeList().stream()
+            .filter(gt -> colony.getTotalProductionOf(gt) <= 0)
+            .collect(Collectors.toList());
 
         // If a tile can be stolen, do so if already at war with the
         // owner or if it is the best one available.
@@ -1524,11 +1519,10 @@ public class AIColony extends AIObject implements PropertyChangeListener {
      */
     @Override
     public void dispose() {
-        List<AIObject> objects = new ArrayList<>();
-        for (AIGoods ag : getExportGoods()) {
-            if (ag.isDisposed() || ag.getGoods() == null) continue;
-            if (ag.getGoods().getLocation() == colony) objects.add(ag);
-        }
+        List<AIObject> objects = getExportGoods().stream()
+            .filter(ag -> !ag.isDisposed() && ag.getGoods() != null
+                && ag.getGoods().getLocation() == colony)
+            .collect(Collectors.toList());
         objects.addAll(wishes);
         wishes.clear();
         objects.addAll(tileImprovementPlans);
diff --git a/src/net/sf/freecol/server/ai/ColonyPlan.java b/src/net/sf/freecol/server/ai/ColonyPlan.java
index 472f58211..ca301c61f 100644
--- a/src/net/sf/freecol/server/ai/ColonyPlan.java
+++ b/src/net/sf/freecol/server/ai/ColonyPlan.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.AbstractGoods;
@@ -270,12 +271,10 @@ public class ColonyPlan {
      * @return A list of food producing plans.
      */
     public List<WorkLocationPlan> getFoodPlans() {
-        List<WorkLocationPlan> plans = new ArrayList<>();
-        for (WorkLocationPlan wlp : workPlans) {
-            if (wlp.isFoodPlan()
-                && !wlp.getWorkLocation().canAutoProduce()) plans.add(wlp);
-        }
-        return plans;
+        return workPlans.stream()
+            .filter(wp -> wp.isFoodPlan()
+                && !wp.getWorkLocation().canAutoProduce())
+            .collect(Collectors.toList());
     }
 
     /**
@@ -285,12 +284,10 @@ public class ColonyPlan {
      * @return A list of non-food producing plans.
      */
     public List<WorkLocationPlan> getWorkPlans() {
-        List<WorkLocationPlan> plans = new ArrayList<>();
-        for (WorkLocationPlan wlp : workPlans) {
-            if (!wlp.isFoodPlan()
-                && !wlp.getWorkLocation().canAutoProduce()) plans.add(wlp);
-        }
-        return plans;
+        return workPlans.stream()
+            .filter(wp -> !wp.isFoodPlan()
+                && !wp.getWorkLocation().canAutoProduce())
+            .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
index 0c2d31b00..f1ce47646 100644
--- a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
@@ -31,6 +31,7 @@ import java.util.Random;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -454,9 +455,9 @@ public class EuropeanAIPlayer extends AIPlayer {
         final Random air = getAIRandom();
         final List<GoodsType> arrears = new ArrayList<>();
         if (market != null) {
-            for (GoodsType gt : spec.getGoodsTypeList()) {
-                if (market.getArrears(gt) > 0) arrears.add(gt);
-            }
+            arrears.addAll(spec.getGoodsTypeList().stream()
+                .filter(gt -> market.getArrears(gt) > 0)
+                .collect(Collectors.toList()));
         }
         final int nCheats = arrears.size() + 6; // 6 cheats + arrears
         int[] randoms = randomInts(logger, "cheats", air, 100, nCheats);
diff --git a/src/net/sf/freecol/server/control/InGameController.java b/src/net/sf/freecol/server/control/InGameController.java
index a4690fd29..274f2d857 100644
--- a/src/net/sf/freecol/server/control/InGameController.java
+++ b/src/net/sf/freecol/server/control/InGameController.java
@@ -39,6 +39,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.common.debug.FreeColDebugger;
@@ -1285,17 +1286,16 @@ public final class InGameController extends Controller {
         // declare peace on you and war on the REF.  If they are the
         // same nation, go to the next most hostile nation that may
         // already be at war.
-        List<Player> natives = new ArrayList<>();
-        for (Player p : game.getLiveNativePlayers(null)) {
-            if (p.hasContacted(serverPlayer)) natives.add(p);
-        }
-        if (!natives.isEmpty()) {
-            Collections.sort(natives, new Comparator<Player>() {
+        List<Player> natives = game.getLiveNativePlayers(null).stream()
+            .filter(p -> p.hasContacted(serverPlayer))
+            .sorted(new Comparator<Player>() {
                     public int compare(Player p1, Player p2) {
                         return p1.getTension(serverPlayer).getValue()
                             - p2.getTension(serverPlayer).getValue();
                     }
-                });
+                })
+            .collect(Collectors.toList());
+        if (!natives.isEmpty()) {
             ServerPlayer good = (ServerPlayer)natives.get(0);
             logger.info("Native ally following independence: " + good);
             cs.addMessage(See.only(serverPlayer),
diff --git a/src/net/sf/freecol/server/generator/TerrainGenerator.java b/src/net/sf/freecol/server/generator/TerrainGenerator.java
index 4a9c3eb1a..17be6f0d0 100644
--- a/src/net/sf/freecol/server/generator/TerrainGenerator.java
+++ b/src/net/sf/freecol/server/generator/TerrainGenerator.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Random;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.LandMap;
@@ -152,15 +153,11 @@ public class TerrainGenerator {
      */
     private TileType getRandomLandTileType(int latitude) {
         if (landTileTypes == null) {
-            landTileTypes = new ArrayList<>();
-            for (TileType type : spec.getTileTypeList()) {
-                if (type.isElevation() || type.isWater()) {
-                    // do not generate elevated and water tiles at this time
-                    // they are created separately
-                    continue;
-                }
-                landTileTypes.add(type);
-            }
+            // Do not generate elevated and water tiles at this time
+            // they are created elsewhere.
+            landTileTypes = spec.getTileTypeList().stream()
+                .filter(t -> !t.isElevation() && !t.isWater())
+                .collect(Collectors.toList());
         }
         return getRandomTileType(landTileTypes, latitude);
     }
@@ -173,14 +170,11 @@ public class TerrainGenerator {
      */
     private TileType getRandomOceanTileType(int latitude) {
         if (oceanTileTypes == null) {
-            oceanTileTypes = new ArrayList<>();
-            for (TileType type : spec.getTileTypeList()) {
-                if (type.isWater()
-                    && type.isHighSeasConnected()
-                    && !type.isDirectlyHighSeasConnected()) {
-                    oceanTileTypes.add(type);
-                }
-            }
+            oceanTileTypes = spec.getTileTypeList().stream()
+                .filter(t -> t.isWater()
+                    && t.isHighSeasConnected()
+                    && !t.isDirectlyHighSeasConnected())
+                .collect(Collectors.toList());
         }
         return getRandomTileType(oceanTileTypes, latitude);
     }
diff --git a/src/net/sf/freecol/server/model/ServerUnit.java b/src/net/sf/freecol/server/model/ServerUnit.java
index a1297996d..c4dccfac7 100644
--- a/src/net/sf/freecol/server/model/ServerUnit.java
+++ b/src/net/sf/freecol/server/model/ServerUnit.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.i18n.NameCache;
@@ -843,12 +844,9 @@ public class ServerUnit extends Unit implements ServerModelObject {
      * @return A list of new tiles to see.
      */
     public List<Tile> collectNewTiles(Tile tile) {
-        List<Tile> newTiles = new ArrayList<>();
-        int los = getLineOfSight();
-        for (Tile t : tile.getSurroundingTiles(0, los)) {
-            if (!getOwner().canSee(t)) newTiles.add(t);
-        }
-        return newTiles;
+        final int los = getLineOfSight();
+        return tile.getSurroundingTiles(0, los).stream()
+            .filter(t -> !getOwner().canSee(t)).collect(Collectors.toList());
     }
 
     /**
diff --git a/src/net/sf/freecol/tools/MergeTranslations.java b/src/net/sf/freecol/tools/MergeTranslations.java
index 416d81ab1..4832e5fa0 100644
--- a/src/net/sf/freecol/tools/MergeTranslations.java
+++ b/src/net/sf/freecol/tools/MergeTranslations.java
@@ -31,6 +31,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 
 /**
@@ -68,16 +69,12 @@ public class MergeTranslations {
             File targetFile = new File(targetDirectory, name);
 
             if (targetFile.exists()) {
-
                 Map<String, String> targetProperties = readFile(targetFile);
 
-                List<Entry<?,?>> missingProperties = new ArrayList<>();
-                for (Entry<?,?> entry : sourceProperties.entrySet()) {
-                    if (!targetProperties.containsKey(entry.getKey())) {
-                        missingProperties.add(entry);
-                    }
-                }
-
+                List<Entry<?,?>> missingProperties
+                    = sourceProperties.entrySet().stream()
+                    .filter(e -> !targetProperties.containsKey(e.getKey()))
+                    .collect(Collectors.toList());
                 if (!missingProperties.isEmpty()) {
                     try (FileWriter out = new FileWriter(targetFile, true)) {
                         out.write("### Merged from trunk on "
diff --git a/test/src/net/sf/freecol/common/model/SchoolTest.java b/test/src/net/sf/freecol/common/model/SchoolTest.java
index 9814f8806..16e97b011 100644
--- a/test/src/net/sf/freecol/common/model/SchoolTest.java
+++ b/test/src/net/sf/freecol/common/model/SchoolTest.java
@@ -22,6 +22,7 @@ package net.sf.freecol.common.model;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.server.model.ServerBuilding;
 import net.sf.freecol.util.test.FreeColTestCase;
@@ -95,13 +96,8 @@ public class SchoolTest extends FreeColTestCase {
      * @return A list of all the units of the given type in this colony.
      */
     private List<Unit> getUnitList(Colony colony, UnitType type) {
-        List<Unit> units = new ArrayList<>() ;
-        for (Unit unit : colony.getUnitList()) {
-            if (type.equals(unit.getType())) {
-                units.add(unit);
-            }
-        }
-        return units;
+        return colony.getUnitList().stream()
+            .filter(u -> u.getType() == type).collect(Collectors.toList());
     }
 
     public void testUpgrades() {
diff --git a/test/src/net/sf/freecol/server/model/ServerBuildingTest.java b/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
index 2f20bf45b..b70805750 100644
--- a/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
+++ b/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
@@ -22,6 +22,7 @@ package net.sf.freecol.server.model;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.Building;
@@ -121,13 +122,8 @@ public class ServerBuildingTest extends FreeColTestCase {
      * @return A list of all the units of the given type in this colony.
      */
     private List<Unit> getUnitList(Colony colony, UnitType type) {
-        List<Unit> units = new ArrayList<>() ;
-        for (Unit unit : colony.getUnitList()) {
-            if (type.equals(unit.getType())) {
-                units.add(unit);
-            }
-        }
-        return units;
+        return colony.getUnitList().stream()
+            .filter(u -> u.getType() == type).collect(Collectors.toList());
     }
 
     /**

From 48087474cbcf30a0070e683e6f7fdae0f0e2c459 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 19 Sep 2015 17:04:05 +0930
Subject: [PATCH 241/323] Simplify getWorkLocationWith*.

---
 src/net/sf/freecol/common/model/Colony.java | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 5f0de5901..e8d9c67a5 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -621,13 +621,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     public <T extends WorkLocation> T getWorkLocationWithAbility(String ability,
         Class<T> returnClass) {
-        for (WorkLocation wl : getCurrentWorkLocations()) {
-            if (wl.hasAbility(ability)) {
-                try {
-                    return returnClass.cast(wl);
-                } catch (ClassCastException cce) {}
-            }
-        }
+        WorkLocation wl = getWorkLocationWithAbility(ability);
+        if (wl != null) try { return returnClass.cast(wl); } catch (ClassCastException cce) {};
         return null;
     }
 
@@ -655,13 +650,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     public <T extends WorkLocation> T getWorkLocationWithModifier(String modifier,
         Class<T> returnClass) {
-        for (WorkLocation wl : getCurrentWorkLocations()) {
-            if (wl.hasModifier(modifier)) {
-                try {
-                    return returnClass.cast(wl);
-                } catch (ClassCastException cce) {}
-            }
-        }
+        WorkLocation wl = getWorkLocationWithModifier(modifier);
+        if (wl != null) try { return returnClass.cast(wl); } catch (ClassCastException cce) {}
         return null;
     }
     

From dae01ca9bca02ce01cb13a9a207bbd30691feb15 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 19 Sep 2015 18:02:57 +0200
Subject: [PATCH 242/323] Delay loading of button images until they are used,
 to improve game startup

---
 .../client/gui/action/FreeColAction.java      | 14 +++-----
 .../freecol/client/gui/panel/UnitButton.java  | 33 ++++++++++---------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/action/FreeColAction.java b/src/net/sf/freecol/client/gui/action/FreeColAction.java
index 2ddf6717a..721d1b3e3 100644
--- a/src/net/sf/freecol/client/gui/action/FreeColAction.java
+++ b/src/net/sf/freecol/client/gui/action/FreeColAction.java
@@ -19,13 +19,11 @@
 
 package net.sf.freecol.client.gui.action;
 
-import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
-import javax.swing.ImageIcon;
 import javax.swing.KeyStroke;
 import javax.swing.event.MenuKeyEvent;
 import javax.swing.event.MenuKeyListener;
@@ -241,14 +239,10 @@ public abstract class FreeColAction extends AbstractAction
             + (ResourceManager.hasImageResource(pressedKey) ? 1 : 0)
             + (ResourceManager.hasImageResource(disabledKey) ? 1 : 0);
         if (hasOrderButtons()) {
-            Image normal = ResourceManager.getImage(normalKey);
-            Image highlighted = ResourceManager.getImage(highlightedKey);
-            Image pressed = ResourceManager.getImage(pressedKey);
-            Image disabled = ResourceManager.getImage(disabledKey);
-            putValue(BUTTON_IMAGE, new ImageIcon(normal));
-            putValue(BUTTON_ROLLOVER_IMAGE, new ImageIcon(highlighted));
-            putValue(BUTTON_PRESSED_IMAGE, new ImageIcon(pressed));
-            putValue(BUTTON_DISABLED_IMAGE, new ImageIcon(disabled));
+            putValue(BUTTON_IMAGE, normalKey);
+            putValue(BUTTON_ROLLOVER_IMAGE, highlightedKey);
+            putValue(BUTTON_PRESSED_IMAGE, pressedKey);
+            putValue(BUTTON_DISABLED_IMAGE, disabledKey);
         } else {
             logger.warning("Missing " + (4-orderButtonImageCount)
                 + " order button images for " + getId());
diff --git a/src/net/sf/freecol/client/gui/panel/UnitButton.java b/src/net/sf/freecol/client/gui/panel/UnitButton.java
index 53eadb27e..ebc3381dd 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitButton.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitButton.java
@@ -25,10 +25,12 @@ import java.beans.PropertyChangeListener;
 import javax.swing.AbstractButton;
 import javax.swing.Action;
 import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 
 import net.sf.freecol.client.gui.action.ActionManager;
 import net.sf.freecol.client.gui.action.FreeColAction;
+import net.sf.freecol.common.resources.ResourceManager;
 
 
 /**
@@ -72,20 +74,21 @@ public final class UnitButton extends JButton {
 
         if (a != null) {
             setRolloverEnabled(true);
-            Icon bi = (Icon) a.getValue(FreeColAction.BUTTON_IMAGE);
+            String key = (String) a.getValue(FreeColAction.BUTTON_IMAGE);
+            ImageIcon bi = new ImageIcon(ResourceManager.getImage(key));
             setIcon(bi);
-            setRolloverIcon((Icon) a.getValue(FreeColAction.BUTTON_ROLLOVER_IMAGE));
-            setPressedIcon((Icon) a.getValue(FreeColAction.BUTTON_PRESSED_IMAGE));
-            setDisabledIcon((Icon) a.getValue(FreeColAction.BUTTON_DISABLED_IMAGE));
+            key = (String) a.getValue(FreeColAction.BUTTON_ROLLOVER_IMAGE);
+            setRolloverIcon(new ImageIcon(ResourceManager.getImage(key)));
+            key = (String) a.getValue(FreeColAction.BUTTON_PRESSED_IMAGE);
+            setPressedIcon(new ImageIcon(ResourceManager.getImage(key)));
+            key = (String) a.getValue(FreeColAction.BUTTON_DISABLED_IMAGE);
+            setDisabledIcon(new ImageIcon(ResourceManager.getImage(key)));
             setToolTipText((String) a.getValue(FreeColAction.NAME));
             setText(null);
             setFocusPainted(false);
             setContentAreaFilled(false);
             setBorderPainted(false);
 
-            if (bi == null) {
-                throw new IllegalArgumentException("The given action is missing \"BUTTON_IMAGE\".");
-            }
             setSize(bi.getIconWidth(), bi.getIconHeight());
         }
     }
@@ -118,20 +121,20 @@ public final class UnitButton extends JButton {
                 button.setIcon(icon);
                 button.repaint();
             } else if (FreeColAction.BUTTON_IMAGE.equals(e.getPropertyName())) {
-                Icon icon = (Icon) e.getNewValue();
-                button.setIcon(icon);
+                String key = (String) e.getNewValue();
+                button.setIcon(new ImageIcon(ResourceManager.getImage(key)));
                 button.repaint();
             } else if (FreeColAction.BUTTON_ROLLOVER_IMAGE.equals(e.getPropertyName())) {
-                Icon icon = (Icon) e.getNewValue();
-                button.setRolloverIcon(icon);
+                String key = (String) e.getNewValue();
+                button.setRolloverIcon(new ImageIcon(ResourceManager.getImage(key)));
                 button.repaint();
             } else if (FreeColAction.BUTTON_PRESSED_IMAGE.equals(e.getPropertyName())) {
-                Icon icon = (Icon) e.getNewValue();
-                button.setPressedIcon(icon);
+                String key = (String) e.getNewValue();
+                button.setPressedIcon(new ImageIcon(ResourceManager.getImage(key)));
                 button.repaint();
             } else if (FreeColAction.BUTTON_DISABLED_IMAGE.equals(e.getPropertyName())) {
-                Icon icon = (Icon) e.getNewValue();
-                button.setDisabledIcon(icon);
+                String key = (String) e.getNewValue();
+                button.setDisabledIcon(new ImageIcon(ResourceManager.getImage(key)));
                 button.repaint();
             } else if (Action.MNEMONIC_KEY.equals(e.getPropertyName())) {
                 Integer mn = (Integer) e.getNewValue();

From ca73849f2613f91bb1e17bded57b410c42328bc0 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 18 Sep 2015 13:44:44 +0930
Subject: [PATCH 243/323] Use Java 8 stream *Match routines.

---
 .../freecol/common/model/BuildableType.java   | 10 +--
 src/net/sf/freecol/common/model/Colony.java   | 65 +++++++------------
 src/net/sf/freecol/common/model/Effect.java   |  7 +-
 src/net/sf/freecol/common/model/Feature.java  | 24 ++-----
 .../common/model/FeatureContainer.java        |  8 +--
 .../freecol/common/model/FoundingFather.java  |  9 +--
 src/net/sf/freecol/common/model/Game.java     |  5 +-
 .../freecol/common/model/GoodsContainer.java  | 18 ++---
 .../freecol/common/model/GoodsLocation.java   |  6 +-
 .../common/model/IndianSettlement.java        |  5 +-
 src/net/sf/freecol/common/model/LandMap.java  | 16 ++---
 src/net/sf/freecol/common/model/Player.java   | 54 +++++----------
 .../freecol/common/model/ProductionCache.java | 16 ++---
 .../freecol/common/model/ProductionType.java  |  9 +--
 .../sf/freecol/common/model/Settlement.java   | 18 +++--
 .../common/model/SimpleCombatModel.java       | 10 +--
 src/net/sf/freecol/common/model/Tile.java     | 37 +++++------
 .../common/model/TileImprovementType.java     | 13 ++--
 .../common/model/TileItemContainer.java       |  6 +-
 .../freecol/common/model/TradeRouteStop.java  | 25 ++++---
 src/net/sf/freecol/common/model/Unit.java     | 27 ++++----
 .../sf/freecol/common/model/UnitLocation.java |  9 +--
 .../freecol/common/model/UnitTypeChange.java  |  5 +-
 .../common/model/mission/CompoundMission.java | 10 +--
 .../model/mission/ImprovementMission.java     |  9 +--
 .../sf/freecol/common/option/ListOption.java  |  8 +--
 .../sf/freecol/common/option/OptionGroup.java |  6 +-
 .../server/control/InGameController.java      | 11 +---
 .../sf/freecol/server/generator/River.java    | 23 +++----
 29 files changed, 165 insertions(+), 304 deletions(-)

diff --git a/src/net/sf/freecol/common/model/BuildableType.java b/src/net/sf/freecol/common/model/BuildableType.java
index 48ca6f746..36d726a76 100644
--- a/src/net/sf/freecol/common/model/BuildableType.java
+++ b/src/net/sf/freecol/common/model/BuildableType.java
@@ -20,6 +20,7 @@
 package net.sf.freecol.common.model;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -133,14 +134,9 @@ public abstract class BuildableType extends FreeColGameObjectType {
      */
     public boolean isAvailableTo(FreeColObject... fco) {
         if (requiredAbilities != null) {
-            FreeColObject[] objects = fco;
             for (Entry<String, Boolean> entry : requiredAbilities.entrySet()) {
-                boolean found = false;
-                for (FreeColObject object : objects) {
-                    found = object.hasAbility(entry.getKey());
-                    if (found) break;
-                }
-                if (found != entry.getValue()) return false;
+                if (entry.getValue() != Arrays.stream(fco)
+                    .anyMatch(o -> o.hasAbility(entry.getKey()))) return false;
             }
         }
         return true;
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index e8d9c67a5..05a2d8f68 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -589,10 +589,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     public Building getBuildingForProducing(final GoodsType goodsType) {
         for (Building b : buildingMap.values()) {
-            for (AbstractGoods ag : b.getOutputs()) {
-                if (ag.getType() == goodsType)
-                    return b;
-            }
+            if (AbstractGoods.findByType(goodsType, b.getOutputs()) != null)
+                return b;
         }
         return null;
     }
@@ -960,18 +958,13 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
             && !getTile().isCoastland()) {
             return NoBuildReason.COASTAL;
         } else {
-            for (Entry<String, Boolean> entry
-                     : buildableType.getRequiredAbilities().entrySet()) {
-                if (hasAbility(entry.getKey()) != entry.getValue()) {
-                    return NoBuildReason.MISSING_ABILITY;
-                }
+            if (!buildableType.getRequiredAbilities().entrySet().stream()
+                .allMatch(e -> e.getValue() == hasAbility(e.getKey()))) {
+                return NoBuildReason.MISSING_ABILITY;
             }
-            if (buildableType.getLimits() != null) {
-                for (Limit limit : buildableType.getLimits()) {
-                    if (!limit.evaluate(this)) {
-                        return NoBuildReason.LIMIT_EXCEEDED;
-                    }
-                }
+            if (!buildableType.getLimits().stream()
+                .allMatch(l -> l.evaluate(this))) {
+                return NoBuildReason.LIMIT_EXCEEDED;
             }
         }
         if (assumeBuilt == null) {
@@ -998,15 +991,13 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
                 }
             }
         } else if (buildableType instanceof UnitType) {
-            if (!buildableType.hasAbility(Ability.PERSON)) {
-                boolean ok = hasAbility(Ability.BUILD, buildableType);
-                if (!ok) {
-                    for (BuildableType bt : assumeBuilt) {
-                        ok = bt.hasAbility(Ability.BUILD, buildableType);
-                        if (ok) break;
-                    }
-                }
-                if (!ok) return NoBuildReason.MISSING_BUILD_ABILITY;
+            // Non-person units need a BUILD ability, present or assumed.
+            if (!buildableType.hasAbility(Ability.PERSON)
+                && !hasAbility(Ability.BUILD, buildableType)
+                && assumeBuilt.stream()
+                    .noneMatch(bt -> bt.hasAbility(Ability.BUILD,
+                                                   buildableType))) {
+                return NoBuildReason.MISSING_BUILD_ABILITY;
             }
         }
         return NoBuildReason.NONE;
@@ -1760,16 +1751,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return <code>true</code> if this unit type could be added.
      */
     public boolean canTrain(UnitType unitType) {
-        if (!hasAbility(Ability.TEACH)) {
-            return false;
-        }
-
-        for (Building building : buildingMap.values()) {
-            if (building.canTeach() && building.canAddType(unitType)) {
-                return true;
-            }
-        }
-        return false;
+        return hasAbility(Ability.TEACH)
+            && buildingMap.values().stream()
+                .anyMatch(b -> b.canTeach() && b.canAddType(unitType));
     }
 
     /**
@@ -2053,10 +2037,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
 
         // Is there a work location that can produce the goods, with
         // satisfied inputs and positive generic production potential?
-        outer: for (WorkLocation wl : getWorkLocationsForProducing(goodsType)) {
-            for (AbstractGoods ag : wl.getInputs()) {
-                if (!canProduce(ag.getType())) continue outer;
-            }
+        for (WorkLocation wl : getWorkLocationsForProducing(goodsType)) {
+            if (!wl.getInputs().stream()
+                .allMatch(ag -> canProduce(ag.getType()))) continue;
             if (wl.getGenericPotential(goodsType) > 0) return true;
         }
         return false;
@@ -2501,10 +2484,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
     @Override
     public boolean contains(Locatable locatable) {
         if (locatable instanceof Unit) {
-            for (WorkLocation wl : getAvailableWorkLocations()) {
-                if (wl.contains(locatable)) return true;
-            }
-            return false;
+            return getAvailableWorkLocations().stream()
+                .anyMatch(wl -> wl.contains(locatable));
         }
         return super.contains(locatable);
     }
diff --git a/src/net/sf/freecol/common/model/Effect.java b/src/net/sf/freecol/common/model/Effect.java
index c5ac931e1..5e2a8fba6 100644
--- a/src/net/sf/freecol/common/model/Effect.java
+++ b/src/net/sf/freecol/common/model/Effect.java
@@ -131,11 +131,8 @@ public class Effect extends FreeColGameObjectType {
      * @return True if this effect applies.
      */
     public boolean appliesTo(final FreeColGameObjectType objectType) {
-        if (scopes == null || scopes.isEmpty()) return true;
-        for (Scope scope : scopes) {
-            if (scope.appliesTo(objectType)) return true;
-        }
-        return false;
+        return (scopes == null || scopes.isEmpty()) ? true
+            : scopes.stream().anyMatch(s -> s.appliesTo(objectType));
     }
 
 
diff --git a/src/net/sf/freecol/common/model/Feature.java b/src/net/sf/freecol/common/model/Feature.java
index bf18eebad..997771e62 100644
--- a/src/net/sf/freecol/common/model/Feature.java
+++ b/src/net/sf/freecol/common/model/Feature.java
@@ -224,11 +224,8 @@ public abstract class Feature extends FreeColObject implements Named {
      *     applicable to the object.
      */
     public boolean appliesTo(final FreeColGameObjectType objectType) {
-        if (!hasScope()) return true;
-        for (Scope scope : scopes) {
-            if (scope.appliesTo(objectType)) return true;
-        }
-        return false;
+        return (!hasScope()) ? true
+            : scopes.stream().anyMatch(s -> s.appliesTo(objectType));
     }
 
     /**
@@ -332,18 +329,11 @@ public abstract class Feature extends FreeColObject implements Named {
             } else if (feature.scopes == null) {
                 return false;
             } else {
-                // not very efficient, but we do not expect many
-                // scopes
-                for (Scope scope : scopes) {
-                    if (!feature.scopes.contains(scope)) {
-                        return false;
-                    }
-                }
-                for (Scope scope : feature.scopes) {
-                    if (!scopes.contains(scope)) {
-                        return false;
-                    }
-                }
+                // Not very efficient, but we do not expect many scopes
+                if (!scopes.stream()
+                    .allMatch(s -> feature.scopes.contains(s))
+                    || !feature.scopes.stream()
+                    .allMatch(s -> scopes.contains(s))) return false;
             }
             return true;
         }
diff --git a/src/net/sf/freecol/common/model/FeatureContainer.java b/src/net/sf/freecol/common/model/FeatureContainer.java
index 0039b01c9..9e8d5b64c 100644
--- a/src/net/sf/freecol/common/model/FeatureContainer.java
+++ b/src/net/sf/freecol/common/model/FeatureContainer.java
@@ -106,11 +106,9 @@ public final class FeatureContainer {
      * @return True if the ability set is `satisfied'.
      */
     public static boolean hasAbility(Set<Ability> abilitySet) {
-        if (abilitySet == null || abilitySet.isEmpty()) return false;
-        for (Ability ability : abilitySet) {
-            if (!ability.getValue()) return false;
-        }
-        return true;
+        return (abilitySet == null || abilitySet.isEmpty())
+            ? false
+            : abilitySet.stream().allMatch(Ability::getValue);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/FoundingFather.java b/src/net/sf/freecol/common/model/FoundingFather.java
index dd89faf2f..ec63ce285 100644
--- a/src/net/sf/freecol/common/model/FoundingFather.java
+++ b/src/net/sf/freecol/common/model/FoundingFather.java
@@ -276,12 +276,9 @@ public class FoundingFather extends FreeColGameObjectType {
      * @return True if the father is available.
      */
     public boolean isAvailableTo(Player player) {
-        if (!player.isEuropean()) return false;
-        if (scopes == null) return true;
-        for (Scope scope : scopes) {
-            if (scope.appliesTo(player)) return true;
-        }
-        return false;
+        return (!player.isEuropean()) ? false
+            : (scopes == null) ? true
+            : scopes.stream().anyMatch(s -> s.appliesTo(player));
     }
 
 
diff --git a/src/net/sf/freecol/common/model/Game.java b/src/net/sf/freecol/common/model/Game.java
index 72e1cf46c..cea648a3a 100644
--- a/src/net/sf/freecol/common/model/Game.java
+++ b/src/net/sf/freecol/common/model/Game.java
@@ -948,10 +948,7 @@ public class Game extends FreeColGameObject {
      * @return True if all players are ready to launch.
      */
     public boolean allPlayersReadyToLaunch() {
-        for (Player player : getLivePlayers(null)) {
-            if (!player.isReady()) return false;
-        }
-        return true;
+        return getLivePlayers(null).stream().allMatch(Player::isReady);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/GoodsContainer.java b/src/net/sf/freecol/common/model/GoodsContainer.java
index e8431c74d..e75aac82d 100644
--- a/src/net/sf/freecol/common/model/GoodsContainer.java
+++ b/src/net/sf/freecol/common/model/GoodsContainer.java
@@ -330,14 +330,10 @@ public class GoodsContainer extends FreeColGameObject implements Ownable {
      */
     public boolean hasReachedCapacity(int amount) {
         synchronized (storedGoods) {
-            for (GoodsType goodsType : storedGoods.keySet()) {
-                if (goodsType.isStorable() && !goodsType.limitIgnored()
-                    && storedGoods.get(goodsType) > amount) {
-                    return true;
-                }
-            }
+            return storedGoods.keySet().stream()
+                .anyMatch(gt -> gt.isStorable() && !gt.limitIgnored()
+                    && storedGoods.get(gt) > amount);
         }
-        return false;
     }
 
     /**
@@ -441,12 +437,8 @@ public class GoodsContainer extends FreeColGameObject implements Ownable {
      * @return True if the contents have changed.
      */
     public boolean hasChanged() {
-        for (GoodsType type : getSpecification().getGoodsTypeList()) {
-            int oldCount = getOldGoodsCount(type);
-            int newCount = getGoodsCount(type);
-            if (oldCount != newCount) return true;
-        }
-        return false;
+        return getSpecification().getGoodsTypeList().stream()
+            .anyMatch(gt -> getOldGoodsCount(gt) != getGoodsCount(gt));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/GoodsLocation.java b/src/net/sf/freecol/common/model/GoodsLocation.java
index d8102b0d4..843350e4d 100644
--- a/src/net/sf/freecol/common/model/GoodsLocation.java
+++ b/src/net/sf/freecol/common/model/GoodsLocation.java
@@ -146,10 +146,8 @@ public abstract class GoodsLocation extends UnitLocation {
      * @return True if the goods are all present.
      */
     public final boolean containsGoods(List<AbstractGoods> goods) {
-        for (AbstractGoods ag : goods) {
-            if (getGoodsCount(ag.getType()) < ag.getAmount()) return false;
-        }
-        return true;
+        return goods.stream()
+            .allMatch(ag -> ag.getAmount() <= getGoodsCount(ag.getType()));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/IndianSettlement.java b/src/net/sf/freecol/common/model/IndianSettlement.java
index 5fa549c98..2f867e6e8 100644
--- a/src/net/sf/freecol/common/model/IndianSettlement.java
+++ b/src/net/sf/freecol/common/model/IndianSettlement.java
@@ -556,10 +556,7 @@ public class IndianSettlement extends Settlement implements TradeLocation {
      * @return True if any European player has spoken with the chief.
      */
     public boolean hasAnyScouted() {
-        for (Player p : contactLevels.keySet()) {
-            if (hasScouted(p)) return true;
-        }
-        return false;
+        return contactLevels.keySet().stream().anyMatch(p -> hasScouted(p));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/LandMap.java b/src/net/sf/freecol/common/model/LandMap.java
index 58deeddb3..c5d9947fc 100644
--- a/src/net/sf/freecol/common/model/LandMap.java
+++ b/src/net/sf/freecol/common/model/LandMap.java
@@ -20,6 +20,7 @@
 package net.sf.freecol.common.model;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 import java.util.logging.Logger;
@@ -284,15 +285,12 @@ public class LandMap {
      * @param y The y coordinate to check.
      */
     private boolean isSingleTile(int x, int y) {
-        Position p = new Position(x, y);
-
-        for (Direction direction : Direction.values()) {
-            Position n = new Position(p, direction);
-            if (n.isValid(width, height) && map[n.getX()][n.getY()]) {
-                return false;
-            }
-        }
-        return true;
+        final Position p = new Position(x, y);
+        return Arrays.stream(Direction.values())
+            .noneMatch(d -> {
+                    Position n = new Position(p, d);
+                    return n.isValid(width, height) && map[n.getX()][n.getY()];
+                });
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index cb18831fd..83dc71b0c 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -1141,10 +1141,9 @@ public class Player extends FreeColGameObject implements Nameable {
      *     world or a nation is in rebellion against us.
      */
     public boolean isWorkForREF() {
-        for (Unit u : getUnits()) { // Work to do if unit in the new world
-            if (u.hasTile()) return true;
-        }
-        return !getRebels().isEmpty();
+        return (getUnits().stream().anyMatch(Unit::hasTile))
+            ? true // Work to do still if there exists a unit in the new world
+            : !getRebels().isEmpty();
     }
 
     /**
@@ -1801,22 +1800,13 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return True if type of goods can be traded.
      */
     public boolean canTrade(GoodsType type, Market.Access access) {
-        if (getMarket().getArrears(type) == 0) return true;
-
-        if (access == Market.Access.CUSTOM_HOUSE) {
-            if (getSpecification().getBoolean(GameOptions.CUSTOM_IGNORE_BOYCOTT)) {
-                return true;
-            }
-            if (hasAbility(Ability.CUSTOM_HOUSE_TRADES_WITH_FOREIGN_COUNTRIES)) {
-                for (Player other : getGame().getLiveEuropeanPlayers(this)) {
-                    if (getStance(other) == Stance.PEACE
-                        || getStance(other) == Stance.ALLIANCE) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
+        return getMarket().getArrears(type) == 0
+            || (access == Market.Access.CUSTOM_HOUSE
+                && (getSpecification().getBoolean(GameOptions.CUSTOM_IGNORE_BOYCOTT)
+                    || (hasAbility(Ability.CUSTOM_HOUSE_TRADES_WITH_FOREIGN_COUNTRIES)
+                        && getGame().getLiveEuropeanPlayers(this).stream()
+                            .anyMatch(p -> getStance(p) == Stance.PEACE
+                                || getStance(p) == Stance.ALLIANCE))));
     }
 
     /**
@@ -2131,10 +2121,8 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return True if this player owns at least one of the specified unit type.
      */
     public boolean hasUnitType(String typeId) {
-        for (Unit u : getUnits()) {
-            if (typeId.equals(u.getType().getId())) return true;
-        }
-        return false;
+        return getUnits().stream()
+            .anyMatch(u -> typeId.equals(u.getType().getId()));
     }
 
     /**
@@ -3003,10 +2991,8 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return True if this player is at war with any other.
      */
     public boolean isAtWar() {
-        for (Player player : getGame().getLivePlayers(null)) {
-            if (atWarWith(player)) return true;
-        }
-        return false;
+        return getGame().getLivePlayers(null).stream()
+            .anyMatch(p -> atWarWith(p));
     }
 
     /**
@@ -3025,10 +3011,8 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return True if this <code>Player</code> has contacted any Europeans.
      */
     public boolean hasContactedEuropeans() {
-        for (Player other : getGame().getLiveEuropeanPlayers(this)) {
-            if (hasContacted(other)) return true;
-        }
-        return false;
+        return getGame().getLiveEuropeanPlayers(this).stream()
+            .anyMatch(p -> hasContacted(p));
     }
 
     /**
@@ -3037,10 +3021,8 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return True if this <code>Player</code> has contacted any natives.
      */
     public boolean hasContactedIndians() {
-        for (Player other : getGame().getLiveNativePlayers(this)) {
-            if (hasContacted(other)) return true;
-        }
-        return false;
+        return getGame().getLiveNativePlayers(this).stream()
+            .anyMatch(p -> hasContacted(p));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/ProductionCache.java b/src/net/sf/freecol/common/model/ProductionCache.java
index cda6bbfcf..76b5947e9 100644
--- a/src/net/sf/freecol/common/model/ProductionCache.java
+++ b/src/net/sf/freecol/common/model/ProductionCache.java
@@ -217,11 +217,9 @@ public class ProductionCache {
      */
     public boolean isProducing(GoodsType goodsType) {
         update();
-        for (ProductionInfo pi : productionAndConsumption.values()) {
-            if (AbstractGoods.findByType(goodsType, pi.getProduction()) != null)
-                return true;
-        }
-        return false;
+        return productionAndConsumption.values().stream()
+            .anyMatch(pi -> AbstractGoods.findByType(goodsType,
+                    pi.getProduction()) != null);
     }
 
     /**
@@ -232,11 +230,9 @@ public class ProductionCache {
      */
     public boolean isConsuming(GoodsType goodsType) {
         update();
-        for (ProductionInfo pi : productionAndConsumption.values()) {
-            if (AbstractGoods.findByType(goodsType, pi.getConsumption()) != null)
-                return true;
-        }
-        return false;
+        return productionAndConsumption.values().stream()
+            .anyMatch(pi -> AbstractGoods.findByType(goodsType,
+                    pi.getConsumption()) != null);
     }
     
     /**
diff --git a/src/net/sf/freecol/common/model/ProductionType.java b/src/net/sf/freecol/common/model/ProductionType.java
index 2cc9d38f7..ef2880422 100644
--- a/src/net/sf/freecol/common/model/ProductionType.java
+++ b/src/net/sf/freecol/common/model/ProductionType.java
@@ -289,12 +289,9 @@ public class ProductionType extends FreeColObject {
      */
     public static boolean canProduce(GoodsType goodsType,
                                      Collection<ProductionType> types) {
-        for (ProductionType productionType : types) {
-            AbstractGoods output = AbstractGoods.findByType(goodsType,
-                productionType.getOutputs());
-            if (output != null) return true;
-        }
-        return false;
+        return types.stream()
+            .anyMatch(pt -> AbstractGoods.findByType(goodsType,
+                                                     pt.getOutputs()) != null);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Settlement.java b/src/net/sf/freecol/common/model/Settlement.java
index 75a7479a3..b2809697f 100644
--- a/src/net/sf/freecol/common/model/Settlement.java
+++ b/src/net/sf/freecol/common/model/Settlement.java
@@ -364,16 +364,14 @@ public abstract class Settlement extends GoodsLocation
      * @return True if the settlement can provide the equipment.
      */
     public boolean canProvideGoods(List<AbstractGoods> goods) {
-        for (AbstractGoods ag : goods) {
-            int available = getGoodsCount(ag.getType());
-
-            int breedingNumber = ag.getType().getBreedingNumber();
-            if (breedingNumber != GoodsType.INFINITY) {
-                available -= breedingNumber;
-            }
-            if (available < ag.getAmount()) return false;
-        }
-        return true;
+        return goods.stream().allMatch(ag -> {
+                int available = getGoodsCount(ag.getType());
+                int breedingNumber = ag.getType().getBreedingNumber();
+                if (breedingNumber != GoodsType.INFINITY) {
+                    available -= breedingNumber;
+                }
+                return available >= ag.getAmount();
+            });
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/SimpleCombatModel.java b/src/net/sf/freecol/common/model/SimpleCombatModel.java
index 273bea7b2..5a9876056 100644
--- a/src/net/sf/freecol/common/model/SimpleCombatModel.java
+++ b/src/net/sf/freecol/common/model/SimpleCombatModel.java
@@ -509,13 +509,9 @@ public class SimpleCombatModel extends CombatModel {
      * @return True if a strong defence bonus is present.
      */
     private boolean hasStrongDefenceModifier(FreeColObject fco) {
-        for (Modifier m : fco.getDefenceModifiers()) {
-            if (m.getType() == ModifierType.PERCENTAGE
-                && m.getValue() >= STRONG_DEFENCE_THRESHOLD) {
-                return true;
-            }
-        }
-        return false;
+        return fco.getDefenceModifiers().stream()
+            .anyMatch(m -> m.getType() == ModifierType.PERCENTAGE
+                && m.getValue() >= STRONG_DEFENCE_THRESHOLD);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 61911e3ff..00071d6e1 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -1188,11 +1188,8 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      * @return True if land locked.
      */
     public boolean isLandLocked() {
-        if (!isLand()) return false;
-        for (Tile t : getSurroundingTiles(1)) {
-            if (!t.isLand()) return false;
-        }
-        return true;
+        return (!isLand()) ? false
+            : getSurroundingTiles(0, 1).stream().allMatch(Tile::isLand);
     }
 
     /**
@@ -1205,10 +1202,8 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      * @return True if this <code>Tile</code> is on the shore.
      */
     public boolean isShore() {
-        for (Tile t : getSurroundingTiles(1)) {
-            if (t.isLand() != this.isLand()) return true;
-        }
-        return false;
+        return getSurroundingTiles(0, 1).stream()
+            .anyMatch(t -> t.isLand() != this.isLand());
     }
 
 
@@ -1264,10 +1259,8 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      *     unexplored.
      */
     public boolean hasUnexploredAdjacent() {
-        for (Tile t : getSurroundingTiles(1)) {
-            if (!t.isExplored()) return true;
-        }
-        return false;
+        return getSurroundingTiles(0, 1).stream()
+            .anyMatch(t -> !t.isExplored());
     }
 
     /**
@@ -1412,15 +1405,15 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      */
     public boolean isDangerousToShip(Unit ship) {
         final Player player = ship.getOwner();
-        for (Tile t : getSurroundingTiles(1)) {
-            if (!t.hasSettlement()) continue;
-            Settlement settlement = t.getSettlement();
-            if (!player.owns(settlement)
-                && settlement.canBombardEnemyShip()
-                && (player.atWarWith(settlement.getOwner())
-                    || ship.hasAbility(Ability.PIRACY))) return true;
-        }
-        return false;
+        return getSurroundingTiles(0, 1).stream()
+            .filter(Tile::hasSettlement)
+            .anyMatch(t -> {
+                    Settlement settlement = t.getSettlement();
+                    return !player.owns(settlement)
+                        && settlement.canBombardEnemyShip()
+                        && (player.atWarWith(settlement.getOwner())
+                            || ship.hasAbility(Ability.PIRACY));
+                });
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/TileImprovementType.java b/src/net/sf/freecol/common/model/TileImprovementType.java
index 7eaa53085..5cda5c1a1 100644
--- a/src/net/sf/freecol/common/model/TileImprovementType.java
+++ b/src/net/sf/freecol/common/model/TileImprovementType.java
@@ -285,10 +285,7 @@ public final class TileImprovementType extends FreeColGameObjectType {
      * @return True if improvement is possible.
      */
     public boolean isTileTypeAllowed(TileType tileType) {
-        for (Scope scope : getScopes()) {
-            if (!scope.appliesTo(tileType)) return false;
-        }
-        return true;
+        return getScopes().stream().allMatch(s -> s.appliesTo(tileType));
     }
 
     public int getBonus(GoodsType goodsType) {
@@ -355,11 +352,9 @@ public final class TileImprovementType extends FreeColGameObjectType {
      * @return True if the required <code>TileType</code> can be changed to.
      */
     public boolean changeContainsTarget(TileType tileType) {
-        if (tileTypeChanges == null) return false;
-        for (TileTypeChange change : tileTypeChanges.values()) {
-            if (change.getTo() == tileType) return true;
-        }
-        return false;
+        return (tileTypeChanges == null) ? false
+            : tileTypeChanges.values().stream()
+                .anyMatch(change -> change.getTo() == tileType);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/TileItemContainer.java b/src/net/sf/freecol/common/model/TileItemContainer.java
index 0f72ba6ed..35ea67466 100644
--- a/src/net/sf/freecol/common/model/TileItemContainer.java
+++ b/src/net/sf/freecol/common/model/TileItemContainer.java
@@ -435,10 +435,8 @@ public class TileItemContainer extends FreeColGameObject {
      * @return True if this container allows the goods type to be produced.
      */
     public boolean canProduce(GoodsType goodsType, UnitType unitType) {
-        for (TileItem ti : tileItems) {
-            if (ti.canProduce(goodsType, unitType)) return true;
-        }
-        return false;
+        return tileItems.stream()
+            .anyMatch(ti -> ti.canProduce(goodsType, unitType));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/TradeRouteStop.java b/src/net/sf/freecol/common/model/TradeRouteStop.java
index e351a7c66..56b7cd809 100644
--- a/src/net/sf/freecol/common/model/TradeRouteStop.java
+++ b/src/net/sf/freecol/common/model/TradeRouteStop.java
@@ -196,22 +196,19 @@ public class TradeRouteStop extends FreeColObject implements TradeLocation {
     public boolean hasWork(Unit unit, int turns) {
         // Look for goods to load.
         List<AbstractGoods> stopGoods = getCompactCargo();
-        for (AbstractGoods ag : stopGoods) {
-            if (unit.getGoodsCount(ag.getType()) >= ag.getAmount()) continue;
-            // There is space on the unit to load some more
-            // of this goods type, so return true if there is
-            // some available at the stop.
-            if (getExportAmount(ag.getType(), turns) > 0) return true;
-        }
+        // There is space on the unit to load some more of this goods
+        // type, so return true if there is some available at the stop.
+        if (stopGoods.stream()
+            .filter(ag -> unit.getGoodsCount(ag.getType()) < ag.getAmount())
+            .anyMatch(ag -> getExportAmount(ag.getType(), turns) > 0))
+            return true;
 
         // Look for goods to unload.
-        for (Goods goods : unit.getCompactGoodsList()) {
-            GoodsType type = goods.getType();
-            if (AbstractGoods.findByType(type, stopGoods) != null) continue;
-            // There are goods on board this unit that need to be unloaded.
-            if (getImportAmount(type, turns) > 0) return true;
-        }
-            
+        if (unit.getCompactGoodsList().stream()
+            .filter(ag -> AbstractGoods.findByType(ag.getType(), stopGoods) == null)
+            .anyMatch(ag -> getImportAmount(ag.getType(), turns) > 0))
+            return true;
+
         return false;
     }
 
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index 338f69650..28bfa0d3e 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -2247,13 +2247,12 @@ public class Unit extends GoodsLocation
                 return MoveType.MOVE_NO_ACCESS_SETTLEMENT;
             }
         } else { // moving to sea, check for embarkation
-            if (defender == null || !getOwner().owns(defender)) {
-                return MoveType.MOVE_NO_ACCESS_EMBARK;
-            }
-            for (Unit u : target.getUnitList()) {
-                if (u.canAdd(this)) return MoveType.EMBARK;
-            }
-            return MoveType.MOVE_NO_ACCESS_FULL;
+            return (defender == null || !getOwner().owns(defender))
+                ? MoveType.MOVE_NO_ACCESS_EMBARK
+                : (target.getUnitList().stream()
+                    .anyMatch(u -> u.canAdd(this)))
+                ? MoveType.EMBARK
+                : MoveType.MOVE_NO_ACCESS_FULL;
         }
     }
 
@@ -2431,14 +2430,12 @@ public class Unit extends GoodsLocation
      *      seas or can make a move to a neighbouring high seas tile.
      */
     public boolean hasHighSeasMove() {
-        if (canMoveToHighSeas()) return true;
-        if (hasTile() && getMovesLeft() > 0) {
-            for (Tile t : getTile().getSurroundingTiles(1)) {
-                if (t.isDirectlyHighSeasConnected()
-                    && getMoveType(t).isLegal()) return true;
-            }
-        }
-        return false;
+        return (canMoveToHighSeas())
+            ? true
+            : (hasTile() && getMovesLeft() > 0)
+            ? getTile().getSurroundingTiles(1, 1).stream()
+                .anyMatch(Tile::isDirectlyHighSeasConnected)
+            : false;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/UnitLocation.java b/src/net/sf/freecol/common/model/UnitLocation.java
index f323e6bc5..80c3c8966 100644
--- a/src/net/sf/freecol/common/model/UnitLocation.java
+++ b/src/net/sf/freecol/common/model/UnitLocation.java
@@ -229,12 +229,9 @@ public abstract class UnitLocation extends FreeColGameObject implements Location
      * @see Unit#isCarrier
      */
     public boolean hasCarrierWithSpace(int space) {
-        for (Unit u : getUnitList()) {
-            if (u.isCarrier()
-                && !u.isDamaged()
-                && u.getSpaceLeft() >= space) return true;
-        }
-        return false;
+        return getUnitList().stream()
+            .anyMatch(u -> u.isCarrier() && !u.isDamaged()
+                && u.getSpaceLeft() >= space);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/UnitTypeChange.java b/src/net/sf/freecol/common/model/UnitTypeChange.java
index 3f0252666..b019e6f9e 100644
--- a/src/net/sf/freecol/common/model/UnitTypeChange.java
+++ b/src/net/sf/freecol/common/model/UnitTypeChange.java
@@ -230,9 +230,8 @@ public class UnitTypeChange extends FreeColObject {
      */
     public boolean appliesTo(Player player) {
         List<Scope> scopeList = getScopes();
-        if (scopeList.isEmpty()) return true;
-        for (Scope scope : scopeList) if (scope.appliesTo(player)) return true;
-        return false;
+        return (scopeList.isEmpty()) ? true
+            : scopeList.stream().anyMatch(s -> s.appliesTo(player));
     }
 
 
diff --git a/src/net/sf/freecol/common/model/mission/CompoundMission.java b/src/net/sf/freecol/common/model/mission/CompoundMission.java
index e42eeb95f..3bed29d7f 100644
--- a/src/net/sf/freecol/common/model/mission/CompoundMission.java
+++ b/src/net/sf/freecol/common/model/mission/CompoundMission.java
@@ -133,13 +133,9 @@ public class CompoundMission extends AbstractMission {
      */
     @Override
     public boolean isValid() {
-        if (super.isValid() && !missions.isEmpty()) {
-            for (Mission mission : missions) {
-                if (!mission.isValid()) return false;
-            }
-            return true;
-        }
-        return false;
+        return (super.isValid() && !missions.isEmpty())
+            ? missions.stream().allMatch(Mission::isValid)
+            : false;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/mission/ImprovementMission.java b/src/net/sf/freecol/common/model/mission/ImprovementMission.java
index 4fd40e11a..350c5762d 100644
--- a/src/net/sf/freecol/common/model/mission/ImprovementMission.java
+++ b/src/net/sf/freecol/common/model/mission/ImprovementMission.java
@@ -140,13 +140,8 @@ public class ImprovementMission extends AbstractMission {
      * @return false
      */
     public static boolean isValidFor(Unit unit) {
-        for (TileImprovementType type : unit.getGame().getSpecification()
-                 .getTileImprovementTypeList()) {
-            if (type.isWorkerAllowed(unit)) {
-                return true;
-            }
-        }
-        return false;
+        return unit.getGame().getSpecification().getTileImprovementTypeList().stream()
+            .anyMatch(ti -> ti.isWorkerAllowed(unit));
     }
 
 
diff --git a/src/net/sf/freecol/common/option/ListOption.java b/src/net/sf/freecol/common/option/ListOption.java
index 7bf01b65d..6dd594469 100644
--- a/src/net/sf/freecol/common/option/ListOption.java
+++ b/src/net/sf/freecol/common/option/ListOption.java
@@ -141,12 +141,8 @@ public abstract class ListOption<T> extends AbstractOption<List<AbstractOption<T
      * @return True if the option can be added.
      */
     public boolean canAdd(AbstractOption<T> ao) {
-        if (!allowDuplicates) {
-            for (AbstractOption<T> o : value) {
-                if (o.equals(ao)) return false;
-            }
-        }
-        return true;
+        return (allowDuplicates) ? true
+            : value.stream().noneMatch(o -> o.equals(ao));
     }
 
 
diff --git a/src/net/sf/freecol/common/option/OptionGroup.java b/src/net/sf/freecol/common/option/OptionGroup.java
index c7d73f1e2..3ef37389e 100644
--- a/src/net/sf/freecol/common/option/OptionGroup.java
+++ b/src/net/sf/freecol/common/option/OptionGroup.java
@@ -160,10 +160,8 @@ public class OptionGroup extends AbstractOption<OptionGroup> {
      * @return True if there are any child <code>OptionGroup</code>s present.
      */
     public boolean hasOptionGroup() {
-        for (Option o : options) {
-            if (o instanceof OptionGroup) return true;
-        }
-        return false;
+        return options.stream()
+            .anyMatch(o -> o instanceof OptionGroup);
     }
 
     /**
diff --git a/src/net/sf/freecol/server/control/InGameController.java b/src/net/sf/freecol/server/control/InGameController.java
index 274f2d857..3f45bdbe1 100644
--- a/src/net/sf/freecol/server/control/InGameController.java
+++ b/src/net/sf/freecol/server/control/InGameController.java
@@ -614,14 +614,9 @@ public final class InGameController extends Controller {
             // Are there humans left?
             // FIXME: see if this can be relaxed so we can run large
             // AI-only simulations.
-            boolean human = false;
-            for (ServerPlayer sp : game.getConnectedPlayers()) {
-                if (!sp.isAI()) {
-                    human = true;
-                    break;
-                }
-            }
-            if (!human) {
+            boolean onlyAI = game.getConnectedPlayers().stream()
+                .allMatch(Player::isAI);
+            if (onlyAI) {
                 logger.info("No human player left.");
                 if (debugOnlyAITurns > 0) { // Complete debug runs
                     FreeColDebugger.signalEndDebugRun();
diff --git a/src/net/sf/freecol/server/generator/River.java b/src/net/sf/freecol/server/generator/River.java
index 5d1d01155..0f3f4cae5 100644
--- a/src/net/sf/freecol/server/generator/River.java
+++ b/src/net/sf/freecol/server/generator/River.java
@@ -229,11 +229,8 @@ public class River {
      * @return true if the given tile is next to this river.
      */
     public boolean isNextToSelf(Tile tile) {
-        for (Direction direction : Direction.longSides) {
-            Tile t = tile.getNeighbourOrNull(direction);
-            if (this.contains(t)) return true;
-        }
-        return false;
+        return Direction.longSides.stream()
+            .anyMatch(d -> this.contains(tile.getNeighbourOrNull(d)));
     }
 
     /**
@@ -243,11 +240,11 @@ public class River {
      * @return true if the given tile is next to a river, lake or sea.
      */
     public boolean isNextToWater(Tile tile) {
-        for (Direction direction : Direction.longSides) {
-            Tile t = tile.getNeighbourOrNull(direction);
-            if (t != null && (!t.isLand() || t.hasRiver())) return true;
-        }
-        return false;
+        return Direction.longSides.stream()
+            .anyMatch(d -> {
+                    Tile t = tile.getNeighbourOrNull(d);
+                    return t != null && (!t.isLand() || t.hasRiver());
+                });
     }
 
     /**
@@ -257,10 +254,8 @@ public class River {
      * @return true if this river already contains the given tile.
      */
     public boolean contains(Tile tile) {
-        for (RiverSection rs : getSections()) {
-            if (tile == rs.getTile()) return true;
-        }
-        return false;
+        return getSections().stream()
+            .anyMatch(rs -> rs.getTile() == tile);
     }
 
     /**

From d42604670fe2599836032f0f9190d2cf68b290f8 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 20 Sep 2015 09:55:01 +0930
Subject: [PATCH 244/323] Simplifications, dead-code and format tweaks.

---
 .../client/gui/panel/BuildQueuePanel.java     |  12 --
 .../freecol/common/model/BuildableType.java   |   4 +-
 src/net/sf/freecol/common/model/Colony.java   |   3 +-
 src/net/sf/freecol/common/model/Disaster.java |   3 +-
 .../sf/freecol/common/model/NationType.java   |   8 +-
 .../freecol/common/model/Specification.java   |   3 +-
 src/net/sf/freecol/common/model/UnitType.java |  12 +-
 src/net/sf/freecol/server/ai/ColonyPlan.java  |   3 +-
 .../server/ai/mission/TransportMission.java   |   4 +-
 .../sf/freecol/server/model/ServerPlayer.java | 147 +++++++++---------
 10 files changed, 86 insertions(+), 113 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
index 80b9ae642..33f233ac5 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
@@ -946,18 +946,6 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
         return result;
     }
 
-    private List<BuildableType> getBuildableTypes(Object[] objects) {
-        List<BuildableType> result = new ArrayList<>();
-        if (objects != null) {
-            for (Object object : objects) {
-                if (object instanceof BuildableType) {
-                    result.add((BuildableType) object);
-                }
-            }
-        }
-        return result;
-    }
-
     private int getMinimumIndex(BuildableType buildableType) {
         ListModel<BuildableType> buildQueue = this.buildQueueList.getModel();
         if (buildableType instanceof UnitType) {
diff --git a/src/net/sf/freecol/common/model/BuildableType.java b/src/net/sf/freecol/common/model/BuildableType.java
index 36d726a76..81df3874e 100644
--- a/src/net/sf/freecol/common/model/BuildableType.java
+++ b/src/net/sf/freecol/common/model/BuildableType.java
@@ -176,9 +176,7 @@ public abstract class BuildableType extends FreeColGameObjectType {
      * @param ag The required <code>AbstractGoods</code> to add.
      */
     private void addRequiredGoods(AbstractGoods ag) {
-        if (requiredGoods == null) {
-            requiredGoods = new ArrayList<>();
-        }
+        if (requiredGoods == null) requiredGoods = new ArrayList<>();
         requiredGoods.add(ag);
     }
 
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 05a2d8f68..0d8bef6b1 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -1073,8 +1073,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return A list of required abstract goods.
      */
     public List<AbstractGoods> getFullRequiredGoods(BuildableType buildable) {
+        if (buildable == null) return Collections.<AbstractGoods>emptyList();
+
         List<AbstractGoods> required = new ArrayList<>();
-        if (buildable == null) return required;
         for (AbstractGoods ag : buildable.getRequiredGoods()) {
             int amount = ag.getAmount();
             GoodsType type = ag.getType();
diff --git a/src/net/sf/freecol/common/model/Disaster.java b/src/net/sf/freecol/common/model/Disaster.java
index 79ed3f98b..f23307dc9 100644
--- a/src/net/sf/freecol/common/model/Disaster.java
+++ b/src/net/sf/freecol/common/model/Disaster.java
@@ -102,8 +102,7 @@ public class Disaster extends FreeColGameObjectType {
      */
     private void addEffect(Effect effect) {
         if (effects == null) effects = new ArrayList<>();
-        effects.add(new RandomChoice<>(effect,
-                                             effect.getProbability()));
+        effects.add(new RandomChoice<>(effect, effect.getProbability()));
     }
 
 
diff --git a/src/net/sf/freecol/common/model/NationType.java b/src/net/sf/freecol/common/model/NationType.java
index 77f0724d7..901af7503 100644
--- a/src/net/sf/freecol/common/model/NationType.java
+++ b/src/net/sf/freecol/common/model/NationType.java
@@ -100,9 +100,7 @@ public abstract class NationType extends FreeColGameObjectType {
      * @param settlementType The <code>SettlementType</code> to add.
      */
     private void addSettlementType(SettlementType settlementType) {
-        if (settlementTypes == null) {
-            settlementTypes = new ArrayList<>();
-        }
+        if (settlementTypes == null) settlementTypes = new ArrayList<>();
         settlementTypes.add(settlementType);
     }
 
@@ -112,9 +110,7 @@ public abstract class NationType extends FreeColGameObjectType {
      * @param types A list of <code>SettlementType</code>s to add.
      */
     private void addSettlementTypes(List<SettlementType> types) {
-        if (settlementTypes == null) {
-            settlementTypes = new ArrayList<>();
-        }
+        if (settlementTypes == null) settlementTypes = new ArrayList<>();
         settlementTypes.addAll(types);
     }
 
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index ed079f73a..b6bb0b275 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -2013,8 +2013,7 @@ public final class Specification {
         }
 
         // Fix all other UnitListOptions
-        List<Option> todo = new ArrayList<>();
-        for (OptionGroup og : getDifficultyLevels()) todo.add(og);
+        List<Option> todo = new ArrayList<>(getDifficultyLevels());
         while (!todo.isEmpty()) {
             Option o = todo.remove(0);
             if (o instanceof OptionGroup) {
diff --git a/src/net/sf/freecol/common/model/UnitType.java b/src/net/sf/freecol/common/model/UnitType.java
index 2a9917f5a..1aa23769b 100644
--- a/src/net/sf/freecol/common/model/UnitType.java
+++ b/src/net/sf/freecol/common/model/UnitType.java
@@ -437,9 +437,7 @@ public final class UnitType extends BuildableType implements Consumer {
      * @param change The <code>UnitTypeChange</code> to add.
      */
     private void addTypeChange(UnitTypeChange change) {
-        if (typeChanges == null) {
-            typeChanges = new ArrayList<>();
-        }
+        if (typeChanges == null) typeChanges = new ArrayList<>();
         typeChanges.add(change);
     }
 
@@ -938,16 +936,12 @@ public final class UnitType extends BuildableType implements Consumer {
             defaultRole = parent.defaultRole;
 
             if (parent.typeChanges != null) {
-                if (typeChanges == null) {
-                    typeChanges = new ArrayList<>();
-                }
+                if (typeChanges == null) typeChanges = new ArrayList<>();
                 typeChanges.addAll(parent.typeChanges);
             }
 
             if (parent.consumption != null) {
-                if (consumption == null) {
-                    consumption = new TypeCountMap<>();
-                }
+                if (consumption == null) consumption = new TypeCountMap<>();
                 consumption.putAll(parent.consumption);
             }
 
diff --git a/src/net/sf/freecol/server/ai/ColonyPlan.java b/src/net/sf/freecol/server/ai/ColonyPlan.java
index ca301c61f..0b45b9815 100644
--- a/src/net/sf/freecol/server/ai/ColonyPlan.java
+++ b/src/net/sf/freecol/server/ai/ColonyPlan.java
@@ -369,8 +369,7 @@ public class ColonyPlan {
      */
     public void update() {
         // Update the profile type.
-        profileType = ProfileType
-            .getProfileTypeFromSize(colony.getUnitCount());
+        profileType = ProfileType.getProfileTypeFromSize(colony.getUnitCount());
 
         // Build the total map of all possible production with standard units.
         Map<GoodsType, Map<WorkLocation, Integer>> production
diff --git a/src/net/sf/freecol/server/ai/mission/TransportMission.java b/src/net/sf/freecol/server/ai/mission/TransportMission.java
index b2334b430..176758d1a 100644
--- a/src/net/sf/freecol/server/ai/mission/TransportMission.java
+++ b/src/net/sf/freecol/server/ai/mission/TransportMission.java
@@ -183,11 +183,9 @@ public class TransportMission extends Mission {
      * @return A copy of the list of cargoes.
      */
     private List<Cargo> tCopy() {
-        List<Cargo> nxt;
         synchronized (cargoes) {
-            nxt = new ArrayList<>(cargoes);
+            return new ArrayList<>(cargoes);
         }
-        return nxt;
     }
 
     /**
diff --git a/src/net/sf/freecol/server/model/ServerPlayer.java b/src/net/sf/freecol/server/model/ServerPlayer.java
index 66a85adfd..a4472042c 100644
--- a/src/net/sf/freecol/server/model/ServerPlayer.java
+++ b/src/net/sf/freecol/server/model/ServerPlayer.java
@@ -1047,8 +1047,8 @@ public class ServerPlayer extends Player implements ServerModelObject {
      */
     public List<Unit> createUnits(List<AbstractUnit> abstractUnits,
                                   Location location) {
+        if (location == null) return Collections.<Unit>emptyList();
         List<Unit> units = new ArrayList<>();
-        if (location == null) return units;
 
         final Game game = getGame();
         final Specification spec = game.getSpecification();
@@ -1439,10 +1439,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
                 interventionBells = Integer.MIN_VALUE;
                 
                 // Enter near a port.
-                List<Colony> ports = new ArrayList<>();
-                for (Colony c : getColonies()) {
-                    if (c.isConnectedPort()) ports.add(c);
-                }
+                List<Colony> ports = getPorts();
                 Colony port = getRandomMember(logger, "Intervention port",
                                               ports, random);
                 Tile portTile = port.getTile();
@@ -1638,7 +1635,7 @@ public class ServerPlayer extends Player implements ServerModelObject {
                 for (Modifier modifier : effect.getModifiers()) {
                     if (modifier.getDuration() > 0) {
                         Modifier timedModifier = Modifier
-                                .makeTimedModifier(modifier.getId(), modifier, getGame().getTurn());
+                            .makeTimedModifier(modifier.getId(), modifier, getGame().getTurn());
                         modifier.setModifierIndex(Modifier.DISASTER_PRODUCTION_INDEX);
                         cs.addFeatureChange(this, this, timedModifier, true);
                     } else {
@@ -1648,59 +1645,61 @@ public class ServerPlayer extends Player implements ServerModelObject {
             } else {
                 if (null != effect.getId()) {
                     switch (effect.getId()) {
-                        case Effect.LOSS_OF_MONEY:
-                            int plunder = Math.max(1, colony.getPlunder(null, random) / 5);
-                            modifyGold(-plunder);
-                            cs.addPartial(See.only(this), this, "gold");
+                    case Effect.LOSS_OF_MONEY:
+                        int plunder = Math.max(1, colony.getPlunder(null, random) / 5);
+                        modifyGold(-plunder);
+                        cs.addPartial(See.only(this), this, "gold");
+                        messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
+                                effect.getId(), this)
+                            .addAmount("%amount%", plunder));
+                        break;
+                    case Effect.LOSS_OF_BUILDING:
+                        Building building = getBuildingForEffect(colony, effect, random);
+                        if (building != null) {
+                            // Add message before damaging building
                             messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
-                                    effect.getId(), this)
-                                    .addAmount("%amount%", plunder));
-                            break;
-                        case Effect.LOSS_OF_BUILDING:
-                            Building building = getBuildingForEffect(colony, effect, random);
-                            if (building != null) {
-                                // Add message before damaging building
-                                messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
-                                        effect.getId(), colony)
-                                        .addNamed("%building%", building.getType()));
-                                csDamageBuilding(building, cs);
-                                colonyDirty = true;
-                    }       break;
-                        case Effect.LOSS_OF_GOODS:
-                            Goods goods = getRandomMember(logger, "select goods",
-                                    colony.getLootableGoodsList(),
-                                    random);
-                            if (goods != null) {
-                                goods.setAmount(Math.min(goods.getAmount() / 2, 50));
-                                colony.removeGoods(goods);
-                                messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
-                                        effect.getId(), colony)
-                                        .addStringTemplate("%goods%", goods.getLabel(true)));
-                                colonyDirty = true;
-                    }       break;
-                        case Effect.LOSS_OF_UNIT:
-                        {
-                                Unit unit = getUnitForEffect(colony, effect, random);
-                                if (unit != null) {
-                                    if (colony.getUnitCount() == 1) {
-                                        messages.clear();
-                                        messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
-                                                "model.player.disaster.effect.colonyDestroyed", this)
-                                                .addName("%colony%", colony.getName()));
-                                        csDisposeSettlement(colony, cs);
-                                        colonyDirty = false;
-                                        break OUTER; // No point proceeding
-                                    }
-                                    messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
-                                            effect.getId(), colony)
-                                            .addStringTemplate("%unit%", unit.getLabel()));
-                                    cs.addRemove(See.only(this), null, unit);
-                                    unit.dispose();//-vis: Safe, entirely within colony
-                                    colonyDirty = true;
-                                }
-                                break;
+                                    effect.getId(), colony)
+                                .addNamed("%building%", building.getType()));
+                            csDamageBuilding(building, cs);
+                            colonyDirty = true;
                         }
-                        case Effect.DAMAGED_UNIT:
+                        break;
+                    case Effect.LOSS_OF_GOODS:
+                        Goods goods = getRandomMember(logger, "select goods",
+                            colony.getLootableGoodsList(),
+                            random);
+                        if (goods != null) {
+                            goods.setAmount(Math.min(goods.getAmount() / 2, 50));
+                            colony.removeGoods(goods);
+                            messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
+                                    effect.getId(), colony)
+                                .addStringTemplate("%goods%", goods.getLabel(true)));
+                            colonyDirty = true;
+                        }
+                        break;
+                    case Effect.LOSS_OF_UNIT:
+                        {
+                            Unit unit = getUnitForEffect(colony, effect, random);
+                            if (unit != null) {
+                                if (colony.getUnitCount() == 1) {
+                                    messages.clear();
+                                    messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
+                                            "model.player.disaster.effect.colonyDestroyed", this)
+                                        .addName("%colony%", colony.getName()));
+                                    csDisposeSettlement(colony, cs);
+                                    colonyDirty = false;
+                                    break OUTER; // No point proceeding
+                                }
+                                messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
+                                        effect.getId(), colony)
+                                    .addStringTemplate("%unit%", unit.getLabel()));
+                                cs.addRemove(See.only(this), null, unit);
+                                unit.dispose();//-vis: Safe, entirely within colony
+                                colonyDirty = true;
+                            }
+                            break;
+                        }
+                    case Effect.DAMAGED_UNIT:
                         {
                             Unit unit = getUnitForEffect(colony, effect, random);
                             if (unit != null && unit.isNaval()) {
@@ -1708,31 +1707,33 @@ public class ServerPlayer extends Player implements ServerModelObject {
                                 if (repairLocation == null) {
                                     messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
                                             effect.getId(), colony)
-                                            .addStringTemplate("%unit%", unit.getLabel()));
+                                        .addStringTemplate("%unit%", unit.getLabel()));
                                     csSinkShip(unit, null, cs);
                                 } else {
                                     messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
                                             effect.getId(), colony)
-                                            .addStringTemplate("%unit%", unit.getLabel()));
+                                        .addStringTemplate("%unit%", unit.getLabel()));
                                     csDamageShip(unit, repairLocation, cs);
                                 }
                                 colonyDirty = true;
-                            }           break;
+                            }
+                            break;
                         }
-                        default:
-                            messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
-                                    effect.getId(), colony));
-                            for (Modifier modifier : effect.getModifiers()) {
-                                if (modifier.getDuration() > 0) {
-                                    Modifier timedModifier = Modifier
-                                            .makeTimedModifier(modifier.getId(), modifier, getGame().getTurn());
-                                    timedModifier.setModifierIndex(Modifier.DISASTER_PRODUCTION_INDEX);
-                                    cs.addFeatureChange(this, colony, timedModifier, true);
-                        } else {
-                            cs.addFeatureChange(this, colony, modifier, true);
+                    default:
+                        messages.add(new ModelMessage(ModelMessage.MessageType.DEFAULT,
+                                effect.getId(), colony));
+                        for (Modifier modifier : effect.getModifiers()) {
+                            if (modifier.getDuration() > 0) {
+                                Modifier timedModifier = Modifier
+                                    .makeTimedModifier(modifier.getId(), modifier, getGame().getTurn());
+                                timedModifier.setModifierIndex(Modifier.DISASTER_PRODUCTION_INDEX);
+                                cs.addFeatureChange(this, colony, timedModifier, true);
+                            } else {
+                                cs.addFeatureChange(this, colony, modifier, true);
+                            }
+                            colonyDirty = true;
                         }
-                        colonyDirty = true;
-                    }       break;
+                        break;
                     }
                 }
             }

From 0dbe4b906ce07989edd666a3fc203990035c5de2 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 21 Sep 2015 20:40:44 +0200
Subject: [PATCH 245/323] Do not get terrain images when only calculating tile
 size

---
 src/net/sf/freecol/client/gui/MapViewer.java       |  8 ++++----
 src/net/sf/freecol/client/gui/RoadPainter.java     | 10 ++++------
 src/net/sf/freecol/client/gui/panel/MiniMap.java   |  8 ++++----
 src/net/sf/freecol/client/gui/panel/UnitLabel.java | 10 ++++------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 6d97e31b2..d37696542 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -2602,12 +2602,12 @@ public final class MapViewer {
      */
     private void setImageLibraryAndUpdateData(ImageLibrary lib) {
         this.lib = lib;
-        rp = new RoadPainter(lib);
         // ATTENTION: we assume that all base tiles have the same size
-        Image unexplored = lib.getTerrainImage(null, 0, 0);
-        tileHeight = unexplored.getHeight(null);
+        Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        rp = new RoadPainter(tileSize);
+        tileHeight = tileSize.height;
+        tileWidth = tileSize.width;
         halfHeight = tileHeight/2;
-        tileWidth = unexplored.getWidth(null);
         halfWidth = tileWidth/2;
 
         int dx = tileWidth/16;
diff --git a/src/net/sf/freecol/client/gui/RoadPainter.java b/src/net/sf/freecol/client/gui/RoadPainter.java
index 1d4fc61ef..753f6ac30 100644
--- a/src/net/sf/freecol/client/gui/RoadPainter.java
+++ b/src/net/sf/freecol/client/gui/RoadPainter.java
@@ -21,8 +21,8 @@ package net.sf.freecol.client.gui;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Graphics2D;
-import java.awt.Image;
 import java.awt.RenderingHints;
 import java.awt.Stroke;
 import java.awt.geom.GeneralPath;
@@ -52,12 +52,10 @@ public final class RoadPainter {
         new EnumMap<>(Direction.class);
     private Stroke roadStroke = new BasicStroke(2);
 
-    public RoadPainter(ImageLibrary lib) {
-        // ATTENTION: we assume that all base tiles have the same size
-        Image unexplored = lib.getTerrainImage(null, 0, 0);
-        tileHeight = unexplored.getHeight(null);
+    public RoadPainter(Dimension tileSize) {
+        tileHeight = tileSize.height;
+        tileWidth = tileSize.width;
         halfHeight = tileHeight/2;
-        tileWidth = unexplored.getWidth(null);
         halfWidth = tileWidth/2;
 
         int dy = tileHeight/16;
diff --git a/src/net/sf/freecol/client/gui/panel/MiniMap.java b/src/net/sf/freecol/client/gui/panel/MiniMap.java
index d1b15e9af..92af0d9b3 100644
--- a/src/net/sf/freecol/client/gui/panel/MiniMap.java
+++ b/src/net/sf/freecol/client/gui/panel/MiniMap.java
@@ -21,6 +21,7 @@ package net.sf.freecol.client.gui.panel;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
@@ -349,12 +350,11 @@ public final class MiniMap extends JPanel implements MouseInputListener {
          * Use miniRectWidth/Height / 2 to get the upper left corner.
          * x/yTiles are the number of tiles that fit on the large map */
         if (getParent() != null) {
-            TileType tileType = freeColClient.getGame().getSpecification().getTileTypeList().get(0);
             int miniRectX = (gui.getFocus().getX() - firstColumn) * tileSize;
             int miniRectY = (gui.getFocus().getY() - firstRow) * tileSize / 4;
-            Image image = library.getTerrainImage(tileType, 0, 0);
-            int miniRectWidth = (getParent().getWidth() / image.getWidth(null) + 1) * tileSize;
-            int miniRectHeight = (getParent().getHeight() / image.getHeight(null) + 1) * tileSize / 2;
+            Dimension mapTileSize = library.scaleDimension(ImageLibrary.TILE_SIZE);
+            int miniRectWidth = (getParent().getWidth() / mapTileSize.width + 1) * tileSize;
+            int miniRectHeight = (getParent().getHeight() / mapTileSize.height + 1) * tileSize / 2;
             if (miniRectX + miniRectWidth / 2 > width) {
                 miniRectX = width - miniRectWidth / 2 - 1;
             } else if (miniRectX - miniRectWidth / 2 < 0) {
diff --git a/src/net/sf/freecol/client/gui/panel/UnitLabel.java b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
index cf19e4101..293ac3b92 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitLabel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
@@ -210,12 +210,10 @@ public final class UnitLabel extends JLabel
             ImageIcon imageIcon = new ImageIcon(lib.getUnitImage(unit));
             ImageIcon disabledImageIcon = new ImageIcon(lib.getUnitImage(unit, true));
             if (unit.getLocation() instanceof ColonyTile) {
-                final Tile tile = unit.getLocation().getTile();
-                final TileType tileType = tile.getType();
-                final Image image = lib.getTerrainImage(tileType, tile.getX(),
-                                                        tile.getY());
-                setSize(new Dimension(image.getWidth(null) / 2,
-                                      imageIcon.getIconHeight()));
+                Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+                tileSize.width /= 2;
+                tileSize.height = imageIcon.getIconHeight();
+                setSize(tileSize);
             } else {
                 setPreferredSize(null);
             }

From 9563bb1cb9c3f40edd78dc3b43add9196c8c0b3b Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 22 Sep 2015 19:06:03 +0200
Subject: [PATCH 246/323] Group related methods in MapViewer for better
 maintainability

---
 src/net/sf/freecol/client/gui/MapViewer.java | 1900 +++++++++---------
 1 file changed, 950 insertions(+), 950 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index d37696542..291026e52 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -265,6 +265,15 @@ public final class MapViewer {
     }
 
 
+    /**
+     * Gets the contained <code>ImageLibrary</code>.
+     * 
+     * @return The image library;
+     */
+    ImageLibrary getImageLibrary() {
+        return lib;
+    }
+
     /**
      * Get the view mode.
      *
@@ -295,38 +304,6 @@ public final class MapViewer {
         }
     }
 
-    /**
-     * Set the current active unit path.
-     *
-     * @param path The current <code>PathNode</code>.
-     */
-    void setCurrentPath(PathNode path) {
-        this.currentPath = path;
-    }
-
-    /**
-     * Sets the path of the active unit to display it.
-     */
-    void updateCurrentPathForActiveUnit() {
-        PathNode path;
-        if (activeUnit == null
-            || activeUnit.getDestination() == null
-            || ((FreeColGameObject)activeUnit.getDestination()).isDisposed()
-            || Map.isSameLocation(activeUnit.getLocation(),
-                                  activeUnit.getDestination())) {
-            path = null;
-        } else {
-            try {
-                path = activeUnit.findPath(activeUnit.getDestination());
-            } catch (Exception e) {
-                logger.log(Level.WARNING, "Path fail", e);
-                path = null;
-                activeUnit.setDestination(null);
-            }
-        }
-        setCurrentPath(path);
-    }
-
     /**
      * Centers the map on the selected unit.
      */
@@ -655,61 +632,76 @@ public final class MapViewer {
         }
     }
 
-    /**
-     * Force the next screen repaint to reposition the tiles on the window.
-     */
-    void forceReposition() {
-        bottomRow = -1;
+    private JLabel enterUnitOutForAnimation(final Unit unit,
+                                            final Tile sourceTile) {
+        Integer i = unitsOutForAnimation.get(unit);
+        if (i == null) {
+            final JLabel unitLabel = createUnitLabel(unit);
+
+            i = 1;
+            unitLabel.setLocation(calculateUnitLabelPositionInTile(
+                    unitLabel.getWidth(), unitLabel.getHeight(),
+                    calculateTilePosition(sourceTile)));
+            unitsOutForAnimationLabels.put(unit, unitLabel);
+            gui.getCanvas().add(unitLabel, JLayeredPane.DEFAULT_LAYER);
+        } else {
+            i++;
+        }
+        unitsOutForAnimation.put(unit, i);
+        return unitsOutForAnimationLabels.get(unit);
+    }
+
+    private void releaseUnitOutForAnimation(final Unit unit) {
+        Integer i = unitsOutForAnimation.get(unit);
+        if (i == null) {
+            throw new IllegalStateException("Tried to release unit that was not out for animation");
+        }
+        if (i == 1) {
+            unitsOutForAnimation.remove(unit);
+            gui.getCanvas().removeFromCanvas(unitsOutForAnimationLabels.remove(unit));
+        } else {
+            i--;
+            unitsOutForAnimation.put(unit, i);
+        }
     }
 
     /**
-     * Gets the active unit.
+     * Returns true if the given Unit is being animated.
      *
-     * @return The <code>Unit</code>.
-     * @see #setActiveUnit
+     * @param unit an <code>Unit</code>
+     * @return a <code>boolean</code>
      */
-    Unit getActiveUnit() {
-        return activeUnit;
+    private boolean isOutForAnimation(final Unit unit) {
+        return unitsOutForAnimation.containsKey(unit);
     }
 
     /**
-     * Gets the focus of the map. That is the center tile of the displayed
-     * map.
+     * Draw the unit's image and occupation indicator in one JLabel object.
      *
-     * @return The center tile of the displayed map
-     * @see #setFocus(Tile)
+     * @param unit The unit to be drawn
+     * @return A JLabel object with the unit's image.
      */
-    Tile getFocus() {
-        return focus;
-    }
+    private JLabel createUnitLabel(Unit unit) {
+        final Image unitImg = lib.getUnitImage(unit);
+        final int width = halfWidth + unitImg.getWidth(null)/2;
+        final int height = unitImg.getHeight(null);
 
-    /**
-     * Gets the path to be drawn on the map.
-     *
-     * @return The path that should be drawn on the map or
-     *     <code>null</code> if no path should be drawn.
-     */
-    PathNode getGotoPath() {
-        return gotoPath;
-    }
+        BufferedImage img = new BufferedImage(width, height,
+                                              BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = img.createGraphics();
 
-    /**
-     * Gets the contained <code>ImageLibrary</code>.
-     * 
-     * @return The image library;
-     */
-    ImageLibrary getImageLibrary() {
-        return lib;
-    }
+        final int unitX = (width - unitImg.getWidth(null)) / 2;
+        g.drawImage(unitImg, unitX, 0, null);
 
-    /**
-     * Gets the selected tile.
-     *
-     * @return The <code>Tile</code> selected.
-     * @see #setSelectedTile(Tile, boolean)
-     */
-    Tile getSelectedTile() {
-        return selectedTile;
+        Player player = freeColClient.getMyPlayer();
+        String text = Messages.message(unit.getOccupationLabel(player, false));
+        g.drawImage(lib.getOccupationIndicatorChip(g, unit, text), 0, 0, null);
+
+        final JLabel label = new JLabel(new ImageIcon(img));
+        label.setSize(width, height);
+
+        g.dispose();
+        return label;
     }
 
     /**
@@ -781,15 +773,6 @@ public final class MapViewer {
         }
     }
 
-    /**
-     * Checks if there is currently a goto operation on the mapboard.
-     *
-     * @return True if a goto operation is in progress.
-     */
-    boolean isGotoStarted() {
-        return gotoStarted;
-    }
-
     /**
      * Checks if the Tile/Units at the given coordinates are displayed
      * on the screen (or, if the map is already displayed and the focus
@@ -809,81 +792,41 @@ public final class MapViewer {
             && (tileToCheck.getX() + 2 < rightColumn || alignedRight);
     }
 
+    /**
+     * Starts the unit-selection-cursor blinking animation.
+     */
+    void startCursorBlinking() {
+        blinkingMarqueeEnabled = true;
+
+        cursor = new TerrainCursor();
+        cursor.addActionListener((ActionEvent ae) -> {
+                if (!blinkingMarqueeEnabled) return;
+                Unit unit = activeUnit;
+                if (unit != null) {
+                    Tile tile = unit.getTile();
+                    if (isTileVisible(tile)) gui.refreshTile(tile);
+                }
+            });
+        cursor.startBlinking();
+    }
+
+    void stopBlinking() {
+        blinkingMarqueeEnabled = false;
+    }
+
     void restartBlinking() {
         blinkingMarqueeEnabled = true;
     }
 
     /**
-     * Scroll the map in the given direction.
+     * Gets the focus of the map. That is the center tile of the displayed
+     * map.
      *
-     * @param direction The <code>Direction</code> to scroll in.
-     * @return True if scrolling occurred.
+     * @return The center tile of the displayed map
+     * @see #setFocus(Tile)
      */
-    boolean scrollMap(Direction direction) {
-        Tile t = focus;
-        if (t == null) return false;
-        int fx = t.getX(), fy = t.getY();
-        if ((t = t.getNeighbourOrNull(direction)) == null) return false;
-        int tx = t.getX(), ty = t.getY();
-        int x, y;
-
-        // When already close to an edge, resist moving the focus closer,
-        // but if moving away immediately jump out of the `nearTo' area.
-        if (isMapNearTop(ty) && isMapNearTop(fy)) {
-            y = (ty <= fy) ? fy : topRows;
-        } else if (isMapNearBottom(ty) && isMapNearBottom(fy)) {
-            y = (ty >= fy) ? fy : freeColClient.getGame().getMap().getWidth()
-                - bottomRows;
-        } else {
-            y = ty;
-        }
-        if (isMapNearLeft(tx, ty) && isMapNearLeft(fx, fy)) {
-            x = (tx <= fx) ? fx : getLeftColumns(ty);
-        } else if (isMapNearRight(tx, ty) && isMapNearRight(fx, fy)) {
-            x = (tx >= fx) ? fx : freeColClient.getGame().getMap().getWidth()
-                - getRightColumns(ty);
-        } else {
-            x = tx;
-        }
-
-        if (x == fx && y == fy) return false;
-        gui.setFocus(freeColClient.getGame().getMap().getTile(x,y));
-        return true;
-    }
-
-    /**
-     * Sets the active unit.
-     *
-     * Invokes {@link #setSelectedTile(Tile, boolean)} if the selected
-     * tile is another tile than where the <code>activeUnit</code> is located.
-     *
-     * @param activeUnit The new active <code>Unit</code>.
-     * @return True if the focus was set.
-     * @see #setSelectedTile(Tile, boolean)
-     */
-    boolean setActiveUnit(Unit activeUnit) {
-        // Don't select a unit with zero moves left. -sjm
-        // The user might what to check the status of a unit - SG
-        Tile tile = (activeUnit == null) ? null : activeUnit.getTile();
-        this.activeUnit = activeUnit;
-
-        // The user activated a unit
-        if (viewMode == GUI.VIEW_TERRAIN_MODE && activeUnit != null) {
-            changeViewMode(GUI.MOVE_UNITS_MODE);
-        }
-
-        if (activeUnit == null || tile == null) {
-            gui.getCanvas().stopGoto();
-        } else {
-            updateCurrentPathForActiveUnit();
-            if (!gui.setSelectedTile(tile)
-                || freeColClient.getClientOptions()
-                .getBoolean(ClientOptions.JUMP_TO_ACTIVE_UNIT)) {
-                gui.setFocus(tile);
-                return true;
-            }
-        }
-        return false;
+    Tile getFocus() {
+        return focus;
     }
 
     /**
@@ -898,19 +841,6 @@ public final class MapViewer {
         forceReposition();
     }
 
-    /**
-     * Sets the path to be drawn on the map.
-     * 
-     * Dont use this directly, call the method in canvas!
-     *
-     * @param gotoPath The path that should be drawn on the map
-     *     or <code>null</code> if no path should be drawn.
-     */
-    void setGotoPath(PathNode gotoPath) {
-        this.gotoPath = gotoPath;
-        forceReposition();
-    }
-
     /**
      * Sets the focus of the map but offset to the left or right so
      * that the focus position can still be visible when a popup is
@@ -961,6 +891,282 @@ public final class MapViewer {
         return where;
     }
 
+    /**
+     * Force the next screen repaint to reposition the tiles on the window.
+     */
+    void forceReposition() {
+        bottomRow = -1;
+    }
+
+    private void repositionMapIfNeeded() {
+        if (bottomRow < 0 && focus != null) positionMap(focus);
+    }
+
+    /**
+     * Position the map so that the supplied tile is displayed at the center.
+     *
+     * @param pos The <code>Tile</code> to center at.
+     */
+    private void positionMap(Tile pos) {
+        final Game game = freeColClient.getGame();
+        int x = pos.getX(), y = pos.getY();
+        int leftColumns = getLeftColumns(), rightColumns = getRightColumns();
+
+        /*
+          PART 1
+          ======
+          Calculate: bottomRow, topRow, bottomRowY, topRowY
+          This will tell us which rows need to be drawn on the screen (from
+          bottomRow until and including topRow).
+          bottomRowY will tell us at which height the bottom row needs to be
+          drawn.
+        */
+        alignedTop = false;
+        alignedBottom = false;
+        if (y < topRows) {
+            alignedTop = true;
+            // We are at the top of the map
+            bottomRow = (size.height / (halfHeight)) - 1;
+            if ((size.height % (halfHeight)) != 0) {
+                bottomRow++;
+            }
+            topRow = 0;
+            bottomRowY = bottomRow * (halfHeight);
+            topRowY = 0;
+        } else if (y >= (game.getMap().getHeight() - bottomRows)) {
+            alignedBottom = true;
+            // We are at the bottom of the map
+            bottomRow = game.getMap().getHeight() - 1;
+
+            topRow = size.height / (halfHeight);
+            if ((size.height % (halfHeight)) > 0) {
+                topRow++;
+            }
+            topRow = game.getMap().getHeight() - topRow;
+
+            bottomRowY = size.height - tileHeight;
+            topRowY = bottomRowY - (bottomRow - topRow) * (halfHeight);
+        } else {
+            // We are not at the top of the map and not at the bottom
+            bottomRow = y + bottomRows - 1;
+            topRow = y - topRows;
+            bottomRowY = topSpace + (halfHeight) * bottomRows;
+            topRowY = topSpace - topRows * (halfHeight);
+        }
+
+        /*
+          PART 2
+          ======
+          Calculate: leftColumn, rightColumn, leftColumnX
+          This will tell us which columns need to be drawn on the screen (from
+          leftColumn until and including rightColumn).
+          leftColumnX will tell us at which x-coordinate the left
+          column needs to be drawn (this is for the Tiles where y&1 == 0;
+          the others should be halfWidth more to the right).
+        */
+
+        alignedLeft = false;
+        alignedRight = false;
+        if (x < leftColumns) {
+            // We are at the left side of the map
+            leftColumn = 0;
+
+            rightColumn = size.width / tileWidth - 1;
+            if ((size.width % tileWidth) > 0) {
+                rightColumn++;
+            }
+
+            leftColumnX = 0;
+            alignedLeft = true;
+        } else if (x >= (game.getMap().getWidth() - rightColumns)) {
+            // We are at the right side of the map
+            rightColumn = game.getMap().getWidth() - 1;
+
+            leftColumn = size.width / tileWidth;
+            if ((size.width % tileWidth) > 0) {
+                leftColumn++;
+            }
+
+            leftColumnX = size.width - tileWidth - halfWidth -
+                leftColumn * tileWidth;
+            leftColumn = rightColumn - leftColumn;
+            alignedRight = true;
+        } else {
+            // We are not at the left side of the map and not at the right side
+            leftColumn = x - leftColumns;
+            rightColumn = x + rightColumns;
+            leftColumnX = (size.width - tileWidth) / 2
+                - leftColumns * tileWidth;
+        }
+    }
+
+    /**
+     * Scroll the map in the given direction.
+     *
+     * @param direction The <code>Direction</code> to scroll in.
+     * @return True if scrolling occurred.
+     */
+    boolean scrollMap(Direction direction) {
+        Tile t = focus;
+        if (t == null) return false;
+        int fx = t.getX(), fy = t.getY();
+        if ((t = t.getNeighbourOrNull(direction)) == null) return false;
+        int tx = t.getX(), ty = t.getY();
+        int x, y;
+
+        // When already close to an edge, resist moving the focus closer,
+        // but if moving away immediately jump out of the `nearTo' area.
+        if (isMapNearTop(ty) && isMapNearTop(fy)) {
+            y = (ty <= fy) ? fy : topRows;
+        } else if (isMapNearBottom(ty) && isMapNearBottom(fy)) {
+            y = (ty >= fy) ? fy : freeColClient.getGame().getMap().getWidth()
+                - bottomRows;
+        } else {
+            y = ty;
+        }
+        if (isMapNearLeft(tx, ty) && isMapNearLeft(fx, fy)) {
+            x = (tx <= fx) ? fx : getLeftColumns(ty);
+        } else if (isMapNearRight(tx, ty) && isMapNearRight(fx, fy)) {
+            x = (tx >= fx) ? fx : freeColClient.getGame().getMap().getWidth()
+                - getRightColumns(ty);
+        } else {
+            x = tx;
+        }
+
+        if (x == fx && y == fy) return false;
+        gui.setFocus(freeColClient.getGame().getMap().getTile(x,y));
+        return true;
+    }
+
+    /**
+     * Is a y-coordinate near the bottom?
+     *
+     * @param y The y-coordinate.
+     * @return True if near the bottom.
+     */
+    private boolean isMapNearBottom(int y) {
+        return y >= freeColClient.getGame().getMap().getHeight() - bottomRows;
+    }
+
+    /**
+     * Is an x,y coordinate near the left?
+     *
+     * @param x The x-coordinate.
+     * @param y The y-coordinate.
+     * @return True if near the left.
+     */
+    private boolean isMapNearLeft(int x, int y) {
+        return x < getLeftColumns(y);
+    }
+
+    /**
+     * Is an x,y coordinate near the right?
+     *
+     * @param x The x-coordinate.
+     * @param y The y-coordinate.
+     * @return True if near the right.
+     */
+    private boolean isMapNearRight(int x, int y) {
+        return x >= freeColClient.getGame().getMap().getWidth()
+            - getRightColumns(y);
+    }
+
+    /**
+     * Returns the amount of columns that are to the left of the Tile
+     * that is displayed in the center of the Map.
+     *
+     * @return The amount of columns that are to the left of the Tile
+     *     that is displayed in the center of the Map.
+     */
+    private int getLeftColumns() {
+        return getLeftColumns(focus.getY());
+    }
+
+    /**
+     * Returns the amount of columns that are to the left of the Tile
+     * with the given y-coordinate.
+     *
+     * @param y The y-coordinate of the Tile in question.
+     * @return The amount of columns that are to the left of the Tile
+     *     with the given y-coordinate.
+     */
+    private int getLeftColumns(int y) {
+        int leftColumns = leftSpace / tileWidth + 1;
+
+        if ((y & 1) == 0) {
+            if ((leftSpace % tileWidth) > 32) {
+                leftColumns++;
+            }
+        } else {
+            if ((leftSpace % tileWidth) == 0) {
+                leftColumns--;
+            }
+        }
+
+        return leftColumns;
+    }
+
+    /**
+     * Returns the amount of columns that are to the right of the Tile
+     * that is displayed in the center of the Map.
+     *
+     * @return The amount of columns that are to the right of the Tile
+     *     that is displayed in the center of the Map.
+     */
+    private int getRightColumns() {
+        return getRightColumns(focus.getY());
+    }
+
+    /**
+     * Returns the amount of columns that are to the right of the Tile
+     * with the given y-coordinate.
+     *
+     * @param y The y-coordinate of the Tile in question.
+     * @return The amount of columns that are to the right of the Tile
+     *     with the given y-coordinate.
+     */
+    private int getRightColumns(int y) {
+        int rightColumns = rightSpace / tileWidth + 1;
+
+        if ((y & 1) == 0) {
+            if ((rightSpace % tileWidth) == 0) {
+                rightColumns--;
+            }
+        } else {
+            if ((rightSpace % tileWidth) > 32) {
+                rightColumns++;
+            }
+        }
+
+        return rightColumns;
+    }
+
+    /**
+     * Is a y-coordinate near the top?
+     *
+     * @param y The y-coordinate.
+     * @return True if near the top.
+     */
+    private boolean isMapNearTop(int y) {
+        return y < topRows;
+    }
+
+    private boolean isTileVisible(Tile tile) {
+        if (tile == null) return false;
+        return tile.getY() >= topRow && tile.getY() <= bottomRow
+            && tile.getX() >= leftColumn && tile.getX() <= rightColumn;
+    }
+
+    /**
+     * Gets the selected tile.
+     *
+     * @return The <code>Tile</code> selected.
+     * @see #setSelectedTile(Tile, boolean)
+     */
+    Tile getSelectedTile() {
+        return selectedTile;
+    }
+
     /**
      * Selects the tile at the specified position.  There are two
      * possible cases:
@@ -1016,27 +1222,130 @@ public final class MapViewer {
         return ret;
     }
 
-    void setSize(Dimension size) {
-        this.size = size;
-        updateMapDisplayVariables();
+    /**
+     * Gets the unit that should be displayed on the given tile.
+     *
+     * @param unitTile The <code>Tile</code> to check.
+     * @return The <code>Unit</code> to display or null if none found.
+     */
+    private Unit findUnitInFront(Tile unitTile) {
+        Unit result;
+
+        if (unitTile == null || unitTile.isEmpty()) {
+            result = null;
+
+        } else if (activeUnit != null && activeUnit.getTile() == unitTile) {
+            result = activeUnit;
+
+        } else if (unitTile.hasSettlement()) {
+            result = null;
+
+        } else if (activeUnit != null && activeUnit.isOffensiveUnit()) {
+            result = unitTile.getDefendingUnit(activeUnit);
+
+        } else {
+            // Find the unit with the most moves left, preferring
+            // active units.
+            List<Unit> units = unitTile.getUnitList();
+            result = units.remove(0);
+            int best = result.getMovesLeft();
+            boolean carrier,
+                active = result.getState() == Unit.UnitState.ACTIVE;
+            for (Unit u : units) {
+                carrier = false;
+                if (active) {
+                    if (u.getState() == Unit.UnitState.ACTIVE) {
+                        if (best < u.getMovesLeft()) {
+                            best = u.getMovesLeft();
+                            result = u;
+                        }
+                    } else {
+                        carrier = !u.isEmpty();
+                    }
+                } else if (u.getState() == Unit.UnitState.ACTIVE) {
+                    active = true;
+                    best = u.getMovesLeft();
+                    result = u;
+                } else {
+                    if (best < u.getMovesLeft()) {
+                        best = u.getMovesLeft();
+                        result = u;
+                    }
+                    carrier = !u.isEmpty();
+                }
+                if (carrier) {
+                    // Check for active units on carriers.  Usually the
+                    // carrier takes precedence.
+                    for (Unit c : u.getUnitList()) {
+                        if (active) {
+                            if (best < c.getMovesLeft()) {
+                                best = c.getMovesLeft();
+                                result = c;
+                            }
+                        } else if (c.getState() == Unit.UnitState.ACTIVE) {
+                            active = true;
+                            best = c.getMovesLeft();
+                            result = c;
+                        }
+                    }
+                }
+            }
+        }
+        return result;
     }
 
     /**
-     * Starts the unit-selection-cursor blinking animation.
+     * Gets the active unit.
+     *
+     * @return The <code>Unit</code>.
+     * @see #setActiveUnit
      */
-    void startCursorBlinking() {
-        blinkingMarqueeEnabled = true;
+    Unit getActiveUnit() {
+        return activeUnit;
+    }
 
-        cursor = new TerrainCursor();
-        cursor.addActionListener((ActionEvent ae) -> {
-                if (!blinkingMarqueeEnabled) return;
-                Unit unit = activeUnit;
-                if (unit != null) {
-                    Tile tile = unit.getTile();
-                    if (isTileVisible(tile)) gui.refreshTile(tile);
-                }
-            });
-        cursor.startBlinking();
+    /**
+     * Sets the active unit.
+     *
+     * Invokes {@link #setSelectedTile(Tile, boolean)} if the selected
+     * tile is another tile than where the <code>activeUnit</code> is located.
+     *
+     * @param activeUnit The new active <code>Unit</code>.
+     * @return True if the focus was set.
+     * @see #setSelectedTile(Tile, boolean)
+     */
+    boolean setActiveUnit(Unit activeUnit) {
+        // Don't select a unit with zero moves left. -sjm
+        // The user might what to check the status of a unit - SG
+        Tile tile = (activeUnit == null) ? null : activeUnit.getTile();
+        this.activeUnit = activeUnit;
+
+        // The user activated a unit
+        if (viewMode == GUI.VIEW_TERRAIN_MODE && activeUnit != null) {
+            changeViewMode(GUI.MOVE_UNITS_MODE);
+        }
+
+        if (activeUnit == null || tile == null) {
+            gui.getCanvas().stopGoto();
+        } else {
+            updateCurrentPathForActiveUnit();
+            if (!gui.setSelectedTile(tile)
+                || freeColClient.getClientOptions()
+                .getBoolean(ClientOptions.JUMP_TO_ACTIVE_UNIT)) {
+                gui.setFocus(tile);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks if there is currently a goto operation on the mapboard.
+     *
+     * @return True if a goto operation is in progress.
+     */
+    boolean isGotoStarted() {
+        return gotoStarted;
     }
 
     /**
@@ -1049,10 +1358,6 @@ public final class MapViewer {
         setGotoPath(null);
     }
 
-    void stopBlinking() {
-        blinkingMarqueeEnabled = false;
-    }
-
     /**
      * Stops any ongoing goto operation on the mapboard.
      * 
@@ -1064,6 +1369,66 @@ public final class MapViewer {
         gotoStarted = false;
     }
 
+    /**
+     * Gets the path to be drawn on the map.
+     *
+     * @return The path that should be drawn on the map or
+     *     <code>null</code> if no path should be drawn.
+     */
+    PathNode getGotoPath() {
+        return gotoPath;
+    }
+
+    /**
+     * Sets the path to be drawn on the map.
+     * 
+     * Dont use this directly, call the method in canvas!
+     *
+     * @param gotoPath The path that should be drawn on the map
+     *     or <code>null</code> if no path should be drawn.
+     */
+    void setGotoPath(PathNode gotoPath) {
+        this.gotoPath = gotoPath;
+        forceReposition();
+    }
+
+    /**
+     * Sets the path of the active unit to display it.
+     */
+    void updateCurrentPathForActiveUnit() {
+        PathNode path;
+        if (activeUnit == null
+            || activeUnit.getDestination() == null
+            || ((FreeColGameObject)activeUnit.getDestination()).isDisposed()
+            || Map.isSameLocation(activeUnit.getLocation(),
+                                  activeUnit.getDestination())) {
+            path = null;
+        } else {
+            try {
+                path = activeUnit.findPath(activeUnit.getDestination());
+            } catch (Exception e) {
+                logger.log(Level.WARNING, "Path fail", e);
+                path = null;
+                activeUnit.setDestination(null);
+            }
+        }
+        setCurrentPath(path);
+    }
+
+    /**
+     * Set the current active unit path.
+     *
+     * @param path The current <code>PathNode</code>.
+     */
+    void setCurrentPath(PathNode path) {
+        this.currentPath = path;
+    }
+
+    void setSize(Dimension size) {
+        this.size = size;
+        updateMapDisplayVariables();
+    }
+
     /**
      * Reset the scale of the map to the default.
      */
@@ -1096,338 +1461,70 @@ public final class MapViewer {
         updateMapDisplayVariables();
     }
 
-    /**
-     * Centers the given Image on the tile.
-     *
-     * @param g a <code>Graphics2D</code>
-     * @param image an <code>Image</code>
-     */
-    private static void displayCenteredImage(Graphics2D g, Image image,
-                                    int tileWidth, int tileHeight) {
-        g.drawImage(image,
-                    (tileWidth - image.getWidth(null))/2,
-                    (tileHeight - image.getHeight(null))/2,
-                    null);
-    }
-
-    /**
-     * Draws the pentagram indicating a native capital.
-     */
-    private static BufferedImage createCapitalLabel(int extent, int padding,
-                                     Color backgroundColor) {
-        // create path
-        double deg2rad = Math.PI/180.0;
-        double angle = -90.0 * deg2rad;
-        double offset = extent * 0.5;
-        double size1 = (extent - padding - padding) * 0.5;
-
-        GeneralPath path = new GeneralPath();
-        path.moveTo(Math.cos(angle) * size1 + offset, Math.sin(angle) * size1 + offset);
-        for (int i = 0; i < 4; i++) {
-            angle += 144 * deg2rad;
-            path.lineTo(Math.cos(angle) * size1 + offset, Math.sin(angle) * size1 + offset);
-        }
-        path.closePath();
-
-        // draw everything
-        BufferedImage bi = new BufferedImage(extent, extent, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = bi.createGraphics();
-        g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g.setColor(backgroundColor);
-        g.fill(new RoundRectangle2D.Float(0, 0, extent, extent, padding, padding));
-        g.setColor(Color.BLACK);
-        g.setStroke(new BasicStroke(2.4f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
-        g.draw(path);
-        g.setColor(Color.WHITE);
-        g.fill(path);
-        g.dispose();
-        return bi;
-    }
-
-
-    /**
-     * Creates an BufferedImage that shows the given text centred on a
-     * translucent rounded rectangle with the given color.
-     *
-     * @param g a <code>Graphics2D</code>
-     * @param text a <code>String</code>
-     * @param font a <code>Font</code>
-     * @param backgroundColor a <code>Color</code>
-     * @return an <code>BufferedImage</code>
-     */
-    private static BufferedImage createLabel(Graphics2D g, String text,
-                                             Font font, Color backgroundColor) {
-        TextSpecification[] specs = new TextSpecification[1];
-        specs[0] = new TextSpecification(text, font);
-        return createLabel(g, specs, backgroundColor);
-    }
-
-    /**
-     * Creates an BufferedImage that shows the given text centred on a
-     * translucent rounded rectangle with the given color.
-     *
-     * @param g a <code>Graphics2D</code>
-     * @param textSpecs a <code>TextSpecification</code> array
-     * @param backgroundColor a <code>Color</code>
-     * @return a <code>BufferedImage</code>
-     */
-    private static BufferedImage createLabel(Graphics2D g,
-                                             TextSpecification[] textSpecs,
-                                             Color backgroundColor) {
-        int hPadding = 15;
-        int vPadding = 10;
-        int linePadding = 5;
-        int width = 0;
-        int height = vPadding;
-        int i;
-
-        TextSpecification spec;
-        TextLayout[] labels = new TextLayout[textSpecs.length];
-        TextLayout label;
-
-        for (i = 0; i < textSpecs.length; i++) {
-            spec = textSpecs[i];
-            label = new TextLayout(spec.text, spec.font, g.getFontRenderContext());
-            labels[i] = label;
-            Rectangle textRectangle = label.getPixelBounds(null, 0, 0);
-            width = Math.max(width, textRectangle.width + hPadding);
-            if (i > 0) height += linePadding;
-            height += (int) (label.getAscent() + label.getDescent());
-        }
-
-        int radius = Math.min(hPadding, vPadding);
-
-        BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g2 = bi.createGraphics();
-        g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-
-        g2.setColor(backgroundColor);
-        g2.fill(new RoundRectangle2D.Float(0, 0, width, height, radius, radius));
-        g2.setColor(ImageLibrary.getForegroundColor(backgroundColor));
-        float y = vPadding / 2;
-        for (i = 0; i < labels.length; i++) {
-            Rectangle textRectangle = labels[i].getPixelBounds(null, 0, 0);
-            float x = (width - textRectangle.width) / 2;
-            y += labels[i].getAscent();
-            labels[i].draw(g2, x, y);
-            y += labels[i].getDescent() + linePadding;
-        }
-        g2.dispose();
-        return bi;
-    }
-
-    /**
-     * Draws a cross indicating a religious mission is present in the
-     * native village.
-     */
-    private static BufferedImage createReligiousMissionLabel(int extent,
-            int padding, Color backgroundColor, boolean expertMissionary) {
-        // create path
-        double offset = extent * 0.5;
-        double size1 = extent - padding - padding;
-        double bar = size1 / 3.0;
-        double inset = 0.0;
-        double kludge = 0.0;
-
-        GeneralPath circle = new GeneralPath();
-        GeneralPath cross = new GeneralPath();
-        if (expertMissionary) {
-            // this is meant to represent the eucharist (the -1, +1 thing is a nasty kludge)
-            circle.append(new Ellipse2D.Double(padding-1, padding-1, size1+1, size1+1), false);
-            inset = 4.0;
-            bar = (size1 - inset - inset) / 3.0;
-            // more nasty -1, +1 kludges
-            kludge = 1.0;
-        }
-        offset -= 1.0;
-        cross.moveTo(offset, padding + inset - kludge);
-        cross.lineTo(offset, extent - padding - inset);
-        cross.moveTo(offset - bar, padding + bar + inset);
-        cross.lineTo(offset + bar + 1, padding + bar + inset);
-
-        // draw everything
-        BufferedImage bi = new BufferedImage(extent, extent, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = bi.createGraphics();
-        g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g.setColor(backgroundColor);
-        g.fill(new RoundRectangle2D.Float(0, 0, extent, extent, padding, padding));
-        g.setColor(ImageLibrary.getForegroundColor(backgroundColor));
-        if (expertMissionary) {
-            g.setStroke(new BasicStroke(2.0f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
-            g.draw(circle);
-            g.setStroke(new BasicStroke(1.6f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+    private void updateMapDisplayVariables() {
+        // Calculate the amount of rows that will be drawn above the
+        // central Tile
+        topSpace = (size.height - tileHeight) / 2;
+        if ((topSpace % (halfHeight)) != 0) {
+            topRows = topSpace / (halfHeight) + 2;
         } else {
-            g.setStroke(new BasicStroke(2.4f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+            topRows = topSpace / (halfHeight) + 1;
         }
-        g.draw(cross);
-        g.dispose();
-        return bi;
+        bottomRows = topRows;
+        leftSpace = (size.width - tileWidth) / 2;
+        rightSpace = leftSpace;
     }
 
     /**
-     * Displays the given Tile onto the given Graphics2D object at the
-     * location specified by the coordinates. Only base terrain will be drawn.
+     * Sets the ImageLibrary and calculates various items that depend
+     * on tile size.
      *
-     * @param g The Graphics2D object on which to draw the Tile.
-     * @param library The <code>ImageLibrary</code> to use.
-     * @param tile The Tile to draw.
-     * @param drawUnexploredBorders If true; draws border between explored and
-     *        unexplored terrain.
+     * @param lib an <code>ImageLibrary</code> value
      */
-    private static void displayTileWithBeachAndBorder(Graphics2D g,
-                                                      ImageLibrary library,
-                                                      Tile tile,
-                                                      boolean drawUnexploredBorders) {
-        if (tile != null) {
-            int x = tile.getX();
-            int y = tile.getY();
-            // ATTENTION: we assume that all base tiles have the same size
-            g.drawImage(library.getTerrainImage(tile.getType(), x, y),
-                        0, 0, null);
-            if (tile.isExplored()) {
-                if (!tile.isLand() && tile.getStyle() > 0) {
-                    int edgeStyle = tile.getStyle() >> 4;
-                    if (edgeStyle > 0) {
-                        g.drawImage(library.getBeachEdgeImage(edgeStyle, x, y),
-                                    0, 0, null);
-                    }
-                    int cornerStyle = tile.getStyle() & 15;
-                    if (cornerStyle > 0) {
-                        g.drawImage(library.getBeachCornerImage(cornerStyle, x, y),
-                                    0, 0, null);
-                    }
-                }
+    private void setImageLibraryAndUpdateData(ImageLibrary lib) {
+        this.lib = lib;
+        // ATTENTION: we assume that all base tiles have the same size
+        Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        rp = new RoadPainter(tileSize);
+        tileHeight = tileSize.height;
+        tileWidth = tileSize.width;
+        halfHeight = tileHeight/2;
+        halfWidth = tileWidth/2;
 
-                List<SortableImage> imageBorders = new ArrayList<>(8);
-                SortableImage si;
-                for (Direction direction : Direction.values()) {
-                    Tile borderingTile = tile.getNeighbourOrNull(direction);
-                    if (borderingTile != null) {
+        int dx = tileWidth/16;
+        int dy = tileHeight/16;
+        int ddx = dx + dx/2;
+        int ddy = dy + dy/2;
 
-                        if (!drawUnexploredBorders && !borderingTile.isExplored() &&
-                            (direction == Direction.SE || direction == Direction.S ||
-                             direction == Direction.SW)) {
-                            continue;
-                        }
+        // small corners
+        controlPoints.put(Direction.N, new Point2D.Float(halfWidth, dy));
+        controlPoints.put(Direction.E, new Point2D.Float(tileWidth - dx, halfHeight));
+        controlPoints.put(Direction.S, new Point2D.Float(halfWidth, tileHeight - dy));
+        controlPoints.put(Direction.W, new Point2D.Float(dx, halfHeight));
+        // big corners
+        controlPoints.put(Direction.SE, new Point2D.Float(halfWidth, tileHeight));
+        controlPoints.put(Direction.NE, new Point2D.Float(tileWidth, halfHeight));
+        controlPoints.put(Direction.SW, new Point2D.Float(0, halfHeight));
+        controlPoints.put(Direction.NW, new Point2D.Float(halfWidth, 0));
+        // small corners
+        borderPoints.put(Direction.NW, new Point2D.Float(dx + ddx, halfHeight - ddy));
+        borderPoints.put(Direction.N,  new Point2D.Float(halfWidth - ddx, dy + ddy));
+        borderPoints.put(Direction.NE, new Point2D.Float(halfWidth + ddx, dy + ddy));
+        borderPoints.put(Direction.E,  new Point2D.Float(tileWidth - dx - ddx, halfHeight - ddy));
+        borderPoints.put(Direction.SE, new Point2D.Float(tileWidth - dx - ddx, halfHeight + ddy));
+        borderPoints.put(Direction.S,  new Point2D.Float(halfWidth + ddx, tileHeight - dy - ddy));
+        borderPoints.put(Direction.SW, new Point2D.Float(halfWidth - ddx, tileHeight - dy - ddy));
+        borderPoints.put(Direction.W,  new Point2D.Float(dx + ddx, halfHeight + ddy));
 
-                        if (tile.getType() == borderingTile.getType()) {
-                            // Equal tiles, no need to draw border
-                        } else if (tile.isLand() && !borderingTile.isLand()) {
-                            // The beach borders are drawn on the side of water tiles only
-                        } else if (!tile.isLand() && borderingTile.isLand() && borderingTile.isExplored()) {
-                            // If there is a Coast image (eg. beach) defined, use it, otherwise skip
-                            // Draw the grass from the neighboring tile, spilling over on the side of this tile
-                            si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction, x, y),
-                                                   borderingTile.getType().getIndex());
-                            imageBorders.add(si);
-                            TileImprovement river = borderingTile.getRiver();
-                            if (river != null && river.isConnectedTo(direction.getReverseDirection())) {
-                                si = new SortableImage(library.getRiverMouthImage(direction, borderingTile
-                                                                                  .getRiver().getMagnitude(), x, y),
-                                                       -1);
-                                imageBorders.add(si);
-                            }
-                        } else if (borderingTile.isExplored()) {
-                            if (library.getTerrainImage(tile.getType(), 0, 0)
-                                .equals(library.getTerrainImage(borderingTile.getType(), 0, 0))) {
-                                // Do not draw limit between tile that share same graphics (ocean & great river)
-                            } else if (borderingTile.getType().getIndex() < tile.getType().getIndex()) {
-                                // Draw land terrain with bordering land type, or ocean/high seas limit
-                                si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction,
-                                                                              x, y), borderingTile.getType().getIndex());
-                                imageBorders.add(si);
-                            }
-                        }
-                    }
-                }
-                Collections.sort(imageBorders);
-                for (SortableImage sorted : imageBorders) {
-                    g.drawImage(sorted.image, 0, 0, null);
-                }
-            }
-        }
-    }
+        borderStroke = new BasicStroke(dy);
+        gridStroke = new BasicStroke(lib.getScaleFactor());
 
-    /**
-     * Displays the given Tile onto the given Graphics2D object at the
-     * location specified by the coordinates.  Fog of war will be
-     * drawn.
-     *
-     * @param g The <code>Graphics2D</code> object on which to draw
-     *     the <code>Tile</code>.
-     * @param tile The <code>Tile</code> to draw.
-     */
-    private static void displayFogOfWar(FreeColClient freeColClient,
-            GeneralPath fog, Graphics2D g, Tile tile) {
-        if (freeColClient.getGame() != null
-            && freeColClient.getGame().getSpecification()
-                .getBoolean(GameOptions.FOG_OF_WAR)
-            && freeColClient.getMyPlayer() != null
-            && !freeColClient.getMyPlayer().canSee(tile)) {
-            g.setColor(Color.BLACK);
-            Composite oldComposite = g.getComposite();
-            g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
-                                                      0.2f));
-            g.fill(fog);
-            g.setComposite(oldComposite);
-        }
-    }
-
-
-    /**
-     * Display a path.
-     *
-     * @param g The <code>Graphics2D</code> to display on.
-     * @param path The <code>PathNode</code> to display.
-     */
-    private void displayPath(Graphics2D g, PathNode path) {
-        final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.TINY, lib.getScaleFactor());
-        final boolean debug = FreeColDebugger
-            .isInDebugMode(FreeColDebugger.DebugMode.PATHS);
-
-        for (PathNode p = path; p != null; p = p.next) {
-            Tile tile = p.getTile();
-            if (tile == null) continue;
-            Point point = calculateTilePosition(tile);
-            if (point == null) continue;
-
-            Image image = (p.isOnCarrier())
-                ? ImageLibrary.getPathImage(ImageLibrary.PathType.NAVAL)
-                : (activeUnit != null)
-                ? ImageLibrary.getPathImage(activeUnit)
-                : null;
-
-            Image turns = (p.getTurns() <= 0) ? null
-                : lib.getStringImage(g, Integer.toString(p.getTurns()),
-                                      Color.WHITE, font);
-            g.setColor((turns == null) ? Color.GREEN : Color.RED);
-
-            if (debug) { // More detailed display
-                if (activeUnit != null) {
-                    image = ImageLibrary.getPathNextTurnImage(activeUnit);
-                }
-                turns = lib.getStringImage(g, Integer.toString(p.getTurns())
-                    + "/" + Integer.toString(p.getMovesLeft()),
-                    Color.WHITE, font);
-            }
-
-            g.translate(point.x, point.y);
-            if (image == null) {
-                g.fillOval(halfWidth, halfHeight, 10, 10);
-                g.setColor(Color.BLACK);
-                g.drawOval(halfWidth, halfHeight, 10, 10);
-            } else {
-                displayCenteredImage(g, image, tileWidth, tileHeight);
-                if (turns != null)
-                    displayCenteredImage(g, turns, tileWidth, tileHeight);
-            }
-            g.translate(-point.x, -point.y);
-        }
+        fog.reset();
+        fog.moveTo(halfWidth, 0);
+        fog.lineTo(tileWidth, halfHeight);
+        fog.lineTo(halfWidth, tileHeight);
+        fog.lineTo(0, halfHeight);
+        fog.closePath();
     }
 
     /**
@@ -1772,6 +1869,340 @@ public final class MapViewer {
 
     }
 
+    /**
+     * Centers the given Image on the tile.
+     *
+     * @param g a <code>Graphics2D</code>
+     * @param image an <code>Image</code>
+     */
+    private static void displayCenteredImage(Graphics2D g, Image image,
+                                    int tileWidth, int tileHeight) {
+        g.drawImage(image,
+                    (tileWidth - image.getWidth(null))/2,
+                    (tileHeight - image.getHeight(null))/2,
+                    null);
+    }
+
+    /**
+     * Draws the pentagram indicating a native capital.
+     */
+    private static BufferedImage createCapitalLabel(int extent, int padding,
+                                     Color backgroundColor) {
+        // create path
+        double deg2rad = Math.PI/180.0;
+        double angle = -90.0 * deg2rad;
+        double offset = extent * 0.5;
+        double size1 = (extent - padding - padding) * 0.5;
+
+        GeneralPath path = new GeneralPath();
+        path.moveTo(Math.cos(angle) * size1 + offset, Math.sin(angle) * size1 + offset);
+        for (int i = 0; i < 4; i++) {
+            angle += 144 * deg2rad;
+            path.lineTo(Math.cos(angle) * size1 + offset, Math.sin(angle) * size1 + offset);
+        }
+        path.closePath();
+
+        // draw everything
+        BufferedImage bi = new BufferedImage(extent, extent, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = bi.createGraphics();
+        g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g.setColor(backgroundColor);
+        g.fill(new RoundRectangle2D.Float(0, 0, extent, extent, padding, padding));
+        g.setColor(Color.BLACK);
+        g.setStroke(new BasicStroke(2.4f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+        g.draw(path);
+        g.setColor(Color.WHITE);
+        g.fill(path);
+        g.dispose();
+        return bi;
+    }
+
+
+    /**
+     * Creates an BufferedImage that shows the given text centred on a
+     * translucent rounded rectangle with the given color.
+     *
+     * @param g a <code>Graphics2D</code>
+     * @param text a <code>String</code>
+     * @param font a <code>Font</code>
+     * @param backgroundColor a <code>Color</code>
+     * @return an <code>BufferedImage</code>
+     */
+    private static BufferedImage createLabel(Graphics2D g, String text,
+                                             Font font, Color backgroundColor) {
+        TextSpecification[] specs = new TextSpecification[1];
+        specs[0] = new TextSpecification(text, font);
+        return createLabel(g, specs, backgroundColor);
+    }
+
+    /**
+     * Creates an BufferedImage that shows the given text centred on a
+     * translucent rounded rectangle with the given color.
+     *
+     * @param g a <code>Graphics2D</code>
+     * @param textSpecs a <code>TextSpecification</code> array
+     * @param backgroundColor a <code>Color</code>
+     * @return a <code>BufferedImage</code>
+     */
+    private static BufferedImage createLabel(Graphics2D g,
+                                             TextSpecification[] textSpecs,
+                                             Color backgroundColor) {
+        int hPadding = 15;
+        int vPadding = 10;
+        int linePadding = 5;
+        int width = 0;
+        int height = vPadding;
+        int i;
+
+        TextSpecification spec;
+        TextLayout[] labels = new TextLayout[textSpecs.length];
+        TextLayout label;
+
+        for (i = 0; i < textSpecs.length; i++) {
+            spec = textSpecs[i];
+            label = new TextLayout(spec.text, spec.font, g.getFontRenderContext());
+            labels[i] = label;
+            Rectangle textRectangle = label.getPixelBounds(null, 0, 0);
+            width = Math.max(width, textRectangle.width + hPadding);
+            if (i > 0) height += linePadding;
+            height += (int) (label.getAscent() + label.getDescent());
+        }
+
+        int radius = Math.min(hPadding, vPadding);
+
+        BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g2 = bi.createGraphics();
+        g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
+
+        g2.setColor(backgroundColor);
+        g2.fill(new RoundRectangle2D.Float(0, 0, width, height, radius, radius));
+        g2.setColor(ImageLibrary.getForegroundColor(backgroundColor));
+        float y = vPadding / 2;
+        for (i = 0; i < labels.length; i++) {
+            Rectangle textRectangle = labels[i].getPixelBounds(null, 0, 0);
+            float x = (width - textRectangle.width) / 2;
+            y += labels[i].getAscent();
+            labels[i].draw(g2, x, y);
+            y += labels[i].getDescent() + linePadding;
+        }
+        g2.dispose();
+        return bi;
+    }
+
+    /**
+     * Draws a cross indicating a religious mission is present in the
+     * native village.
+     */
+    private static BufferedImage createReligiousMissionLabel(int extent,
+            int padding, Color backgroundColor, boolean expertMissionary) {
+        // create path
+        double offset = extent * 0.5;
+        double size1 = extent - padding - padding;
+        double bar = size1 / 3.0;
+        double inset = 0.0;
+        double kludge = 0.0;
+
+        GeneralPath circle = new GeneralPath();
+        GeneralPath cross = new GeneralPath();
+        if (expertMissionary) {
+            // this is meant to represent the eucharist (the -1, +1 thing is a nasty kludge)
+            circle.append(new Ellipse2D.Double(padding-1, padding-1, size1+1, size1+1), false);
+            inset = 4.0;
+            bar = (size1 - inset - inset) / 3.0;
+            // more nasty -1, +1 kludges
+            kludge = 1.0;
+        }
+        offset -= 1.0;
+        cross.moveTo(offset, padding + inset - kludge);
+        cross.lineTo(offset, extent - padding - inset);
+        cross.moveTo(offset - bar, padding + bar + inset);
+        cross.lineTo(offset + bar + 1, padding + bar + inset);
+
+        // draw everything
+        BufferedImage bi = new BufferedImage(extent, extent, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = bi.createGraphics();
+        g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g.setColor(backgroundColor);
+        g.fill(new RoundRectangle2D.Float(0, 0, extent, extent, padding, padding));
+        g.setColor(ImageLibrary.getForegroundColor(backgroundColor));
+        if (expertMissionary) {
+            g.setStroke(new BasicStroke(2.0f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+            g.draw(circle);
+            g.setStroke(new BasicStroke(1.6f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+        } else {
+            g.setStroke(new BasicStroke(2.4f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+        }
+        g.draw(cross);
+        g.dispose();
+        return bi;
+    }
+
+    /**
+     * Displays the given Tile onto the given Graphics2D object at the
+     * location specified by the coordinates. Only base terrain will be drawn.
+     *
+     * @param g The Graphics2D object on which to draw the Tile.
+     * @param library The <code>ImageLibrary</code> to use.
+     * @param tile The Tile to draw.
+     * @param drawUnexploredBorders If true; draws border between explored and
+     *        unexplored terrain.
+     */
+    private static void displayTileWithBeachAndBorder(Graphics2D g,
+                                                      ImageLibrary library,
+                                                      Tile tile,
+                                                      boolean drawUnexploredBorders) {
+        if (tile != null) {
+            int x = tile.getX();
+            int y = tile.getY();
+            // ATTENTION: we assume that all base tiles have the same size
+            g.drawImage(library.getTerrainImage(tile.getType(), x, y),
+                        0, 0, null);
+            if (tile.isExplored()) {
+                if (!tile.isLand() && tile.getStyle() > 0) {
+                    int edgeStyle = tile.getStyle() >> 4;
+                    if (edgeStyle > 0) {
+                        g.drawImage(library.getBeachEdgeImage(edgeStyle, x, y),
+                                    0, 0, null);
+                    }
+                    int cornerStyle = tile.getStyle() & 15;
+                    if (cornerStyle > 0) {
+                        g.drawImage(library.getBeachCornerImage(cornerStyle, x, y),
+                                    0, 0, null);
+                    }
+                }
+
+                List<SortableImage> imageBorders = new ArrayList<>(8);
+                SortableImage si;
+                for (Direction direction : Direction.values()) {
+                    Tile borderingTile = tile.getNeighbourOrNull(direction);
+                    if (borderingTile != null) {
+
+                        if (!drawUnexploredBorders && !borderingTile.isExplored() &&
+                            (direction == Direction.SE || direction == Direction.S ||
+                             direction == Direction.SW)) {
+                            continue;
+                        }
+
+                        if (tile.getType() == borderingTile.getType()) {
+                            // Equal tiles, no need to draw border
+                        } else if (tile.isLand() && !borderingTile.isLand()) {
+                            // The beach borders are drawn on the side of water tiles only
+                        } else if (!tile.isLand() && borderingTile.isLand() && borderingTile.isExplored()) {
+                            // If there is a Coast image (eg. beach) defined, use it, otherwise skip
+                            // Draw the grass from the neighboring tile, spilling over on the side of this tile
+                            si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction, x, y),
+                                                   borderingTile.getType().getIndex());
+                            imageBorders.add(si);
+                            TileImprovement river = borderingTile.getRiver();
+                            if (river != null && river.isConnectedTo(direction.getReverseDirection())) {
+                                si = new SortableImage(library.getRiverMouthImage(direction, borderingTile
+                                                                                  .getRiver().getMagnitude(), x, y),
+                                                       -1);
+                                imageBorders.add(si);
+                            }
+                        } else if (borderingTile.isExplored()) {
+                            if (library.getTerrainImage(tile.getType(), 0, 0)
+                                .equals(library.getTerrainImage(borderingTile.getType(), 0, 0))) {
+                                // Do not draw limit between tile that share same graphics (ocean & great river)
+                            } else if (borderingTile.getType().getIndex() < tile.getType().getIndex()) {
+                                // Draw land terrain with bordering land type, or ocean/high seas limit
+                                si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction,
+                                                                              x, y), borderingTile.getType().getIndex());
+                                imageBorders.add(si);
+                            }
+                        }
+                    }
+                }
+                Collections.sort(imageBorders);
+                for (SortableImage sorted : imageBorders) {
+                    g.drawImage(sorted.image, 0, 0, null);
+                }
+            }
+        }
+    }
+
+    /**
+     * Displays the given Tile onto the given Graphics2D object at the
+     * location specified by the coordinates.  Fog of war will be
+     * drawn.
+     *
+     * @param g The <code>Graphics2D</code> object on which to draw
+     *     the <code>Tile</code>.
+     * @param tile The <code>Tile</code> to draw.
+     */
+    private static void displayFogOfWar(FreeColClient freeColClient,
+            GeneralPath fog, Graphics2D g, Tile tile) {
+        if (freeColClient.getGame() != null
+            && freeColClient.getGame().getSpecification()
+                .getBoolean(GameOptions.FOG_OF_WAR)
+            && freeColClient.getMyPlayer() != null
+            && !freeColClient.getMyPlayer().canSee(tile)) {
+            g.setColor(Color.BLACK);
+            Composite oldComposite = g.getComposite();
+            g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
+                                                      0.2f));
+            g.fill(fog);
+            g.setComposite(oldComposite);
+        }
+    }
+
+
+    /**
+     * Display a path.
+     *
+     * @param g The <code>Graphics2D</code> to display on.
+     * @param path The <code>PathNode</code> to display.
+     */
+    private void displayPath(Graphics2D g, PathNode path) {
+        final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
+            FontLibrary.FontSize.TINY, lib.getScaleFactor());
+        final boolean debug = FreeColDebugger
+            .isInDebugMode(FreeColDebugger.DebugMode.PATHS);
+
+        for (PathNode p = path; p != null; p = p.next) {
+            Tile tile = p.getTile();
+            if (tile == null) continue;
+            Point point = calculateTilePosition(tile);
+            if (point == null) continue;
+
+            Image image = (p.isOnCarrier())
+                ? ImageLibrary.getPathImage(ImageLibrary.PathType.NAVAL)
+                : (activeUnit != null)
+                ? ImageLibrary.getPathImage(activeUnit)
+                : null;
+
+            Image turns = (p.getTurns() <= 0) ? null
+                : lib.getStringImage(g, Integer.toString(p.getTurns()),
+                                      Color.WHITE, font);
+            g.setColor((turns == null) ? Color.GREEN : Color.RED);
+
+            if (debug) { // More detailed display
+                if (activeUnit != null) {
+                    image = ImageLibrary.getPathNextTurnImage(activeUnit);
+                }
+                turns = lib.getStringImage(g, Integer.toString(p.getTurns())
+                    + "/" + Integer.toString(p.getMovesLeft()),
+                    Color.WHITE, font);
+            }
+
+            g.translate(point.x, point.y);
+            if (image == null) {
+                g.fillOval(halfWidth, halfHeight, 10, 10);
+                g.setColor(Color.BLACK);
+                g.drawOval(halfWidth, halfHeight, 10, 10);
+            } else {
+                displayCenteredImage(g, image, tileWidth, tileHeight);
+                if (turns != null)
+                    displayCenteredImage(g, turns, tileWidth, tileHeight);
+            }
+            g.translate(-point.x, -point.y);
+        }
+    }
+
     /**
      * Displays the given Tile onto the given Graphics2D object at the
      * location specified by the coordinates. Show tile names,
@@ -2059,6 +2490,20 @@ public final class MapViewer {
         }
     }
 
+    /**
+     * Gets the coordinates to draw a unit in a given tile.
+     *
+     * @param unitImage The unit's image
+     * @return The coordinates where the unit should be drawn onscreen
+     */
+    private Point calculateUnitImagePositionInTile(Image unitImage) {
+        int unitX = (tileWidth - unitImage.getWidth(null)) / 2;
+        int unitY = (tileHeight - unitImage.getHeight(null)) / 2 -
+                    (int) (UNIT_OFFSET * lib.getScaleFactor());
+
+        return new Point(unitX, unitY);
+    }
+
     private void displayCursor(Graphics2D g) {
         Image cursorImage = lib.getMiscImage(ImageLibrary.UNIT_SELECT);
         g.drawImage(cursorImage, 0, 0, null);
@@ -2115,269 +2560,6 @@ public final class MapViewer {
         }
     }
 
-    private JLabel enterUnitOutForAnimation(final Unit unit,
-                                            final Tile sourceTile) {
-        Integer i = unitsOutForAnimation.get(unit);
-        if (i == null) {
-            final JLabel unitLabel = createUnitLabel(unit);
-
-            i = 1;
-            unitLabel.setLocation(calculateUnitLabelPositionInTile(
-                    unitLabel.getWidth(), unitLabel.getHeight(),
-                    calculateTilePosition(sourceTile)));
-            unitsOutForAnimationLabels.put(unit, unitLabel);
-            gui.getCanvas().add(unitLabel, JLayeredPane.DEFAULT_LAYER);
-        } else {
-            i++;
-        }
-        unitsOutForAnimation.put(unit, i);
-        return unitsOutForAnimationLabels.get(unit);
-    }
-
-    /**
-     * Returns the amount of columns that are to the left of the Tile
-     * that is displayed in the center of the Map.
-     *
-     * @return The amount of columns that are to the left of the Tile
-     *     that is displayed in the center of the Map.
-     */
-    private int getLeftColumns() {
-        return getLeftColumns(focus.getY());
-    }
-
-    /**
-     * Returns the amount of columns that are to the left of the Tile
-     * with the given y-coordinate.
-     *
-     * @param y The y-coordinate of the Tile in question.
-     * @return The amount of columns that are to the left of the Tile
-     *     with the given y-coordinate.
-     */
-    private int getLeftColumns(int y) {
-        int leftColumns = leftSpace / tileWidth + 1;
-
-        if ((y & 1) == 0) {
-            if ((leftSpace % tileWidth) > 32) {
-                leftColumns++;
-            }
-        } else {
-            if ((leftSpace % tileWidth) == 0) {
-                leftColumns--;
-            }
-        }
-
-        return leftColumns;
-    }
-
-    /**
-     * Returns the amount of columns that are to the right of the Tile
-     * that is displayed in the center of the Map.
-     *
-     * @return The amount of columns that are to the right of the Tile
-     *     that is displayed in the center of the Map.
-     */
-    private int getRightColumns() {
-        return getRightColumns(focus.getY());
-    }
-
-    /**
-     * Returns the amount of columns that are to the right of the Tile
-     * with the given y-coordinate.
-     *
-     * @param y The y-coordinate of the Tile in question.
-     * @return The amount of columns that are to the right of the Tile
-     *     with the given y-coordinate.
-     */
-    private int getRightColumns(int y) {
-        int rightColumns = rightSpace / tileWidth + 1;
-
-        if ((y & 1) == 0) {
-            if ((rightSpace % tileWidth) == 0) {
-                rightColumns--;
-            }
-        } else {
-            if ((rightSpace % tileWidth) > 32) {
-                rightColumns++;
-            }
-        }
-
-        return rightColumns;
-    }
-
-    /**
-     * Gets the coordinates to draw a unit in a given tile.
-     *
-     * @param unitImage The unit's image
-     * @return The coordinates where the unit should be drawn onscreen
-     */
-    private Point calculateUnitImagePositionInTile(Image unitImage) {
-        int unitX = (tileWidth - unitImage.getWidth(null)) / 2;
-        int unitY = (tileHeight - unitImage.getHeight(null)) / 2 -
-                    (int) (UNIT_OFFSET * lib.getScaleFactor());
-
-        return new Point(unitX, unitY);
-    }
-
-    /**
-     * Gets the unit that should be displayed on the given tile.
-     *
-     * @param unitTile The <code>Tile</code> to check.
-     * @return The <code>Unit</code> to display or null if none found.
-     */
-    private Unit findUnitInFront(Tile unitTile) {
-        Unit result;
-
-        if (unitTile == null || unitTile.isEmpty()) {
-            result = null;
-
-        } else if (activeUnit != null && activeUnit.getTile() == unitTile) {
-            result = activeUnit;
-
-        } else if (unitTile.hasSettlement()) {
-            result = null;
-
-        } else if (activeUnit != null && activeUnit.isOffensiveUnit()) {
-            result = unitTile.getDefendingUnit(activeUnit);
-
-        } else {
-            // Find the unit with the most moves left, preferring
-            // active units.
-            List<Unit> units = unitTile.getUnitList();
-            result = units.remove(0);
-            int best = result.getMovesLeft();
-            boolean carrier,
-                active = result.getState() == Unit.UnitState.ACTIVE;
-            for (Unit u : units) {
-                carrier = false;
-                if (active) {
-                    if (u.getState() == Unit.UnitState.ACTIVE) {
-                        if (best < u.getMovesLeft()) {
-                            best = u.getMovesLeft();
-                            result = u;
-                        }
-                    } else {
-                        carrier = !u.isEmpty();
-                    }
-                } else if (u.getState() == Unit.UnitState.ACTIVE) {
-                    active = true;
-                    best = u.getMovesLeft();
-                    result = u;
-                } else {
-                    if (best < u.getMovesLeft()) {
-                        best = u.getMovesLeft();
-                        result = u;
-                    }
-                    carrier = !u.isEmpty();
-                }
-                if (carrier) {
-                    // Check for active units on carriers.  Usually the
-                    // carrier takes precedence.
-                    for (Unit c : u.getUnitList()) {
-                        if (active) {
-                            if (best < c.getMovesLeft()) {
-                                best = c.getMovesLeft();
-                                result = c;
-                            }
-                        } else if (c.getState() == Unit.UnitState.ACTIVE) {
-                            active = true;
-                            best = c.getMovesLeft();
-                            result = c;
-                        }
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Draw the unit's image and occupation indicator in one JLabel object.
-     *
-     * @param unit The unit to be drawn
-     * @return A JLabel object with the unit's image.
-     */
-    private JLabel createUnitLabel(Unit unit) {
-        final Image unitImg = lib.getUnitImage(unit);
-        final int width = halfWidth + unitImg.getWidth(null)/2;
-        final int height = unitImg.getHeight(null);
-
-        BufferedImage img = new BufferedImage(width, height,
-                                              BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = img.createGraphics();
-
-        final int unitX = (width - unitImg.getWidth(null)) / 2;
-        g.drawImage(unitImg, unitX, 0, null);
-
-        Player player = freeColClient.getMyPlayer();
-        String text = Messages.message(unit.getOccupationLabel(player, false));
-        g.drawImage(lib.getOccupationIndicatorChip(g, unit, text), 0, 0, null);
-
-        final JLabel label = new JLabel(new ImageIcon(img));
-        label.setSize(width, height);
-
-        g.dispose();
-        return label;
-    }
-
-    /**
-     * Is a y-coordinate near the bottom?
-     *
-     * @param y The y-coordinate.
-     * @return True if near the bottom.
-     */
-    private boolean isMapNearBottom(int y) {
-        return y >= freeColClient.getGame().getMap().getHeight() - bottomRows;
-    }
-
-    /**
-     * Is an x,y coordinate near the left?
-     *
-     * @param x The x-coordinate.
-     * @param y The y-coordinate.
-     * @return True if near the left.
-     */
-    private boolean isMapNearLeft(int x, int y) {
-        return x < getLeftColumns(y);
-    }
-
-    /**
-     * Is an x,y coordinate near the right?
-     *
-     * @param x The x-coordinate.
-     * @param y The y-coordinate.
-     * @return True if near the right.
-     */
-    private boolean isMapNearRight(int x, int y) {
-        return x >= freeColClient.getGame().getMap().getWidth()
-            - getRightColumns(y);
-    }
-
-    /**
-     * Is a y-coordinate near the top?
-     *
-     * @param y The y-coordinate.
-     * @return True if near the top.
-     */
-    private boolean isMapNearTop(int y) {
-        return y < topRows;
-    }
-
-    /**
-     * Returns true if the given Unit is being animated.
-     *
-     * @param unit an <code>Unit</code>
-     * @return a <code>boolean</code>
-     */
-    private boolean isOutForAnimation(final Unit unit) {
-        return unitsOutForAnimation.containsKey(unit);
-    }
-
-    private boolean isTileVisible(Tile tile) {
-        if (tile == null) return false;
-        return tile.getY() >= topRow && tile.getY() <= bottomRow
-            && tile.getX() >= leftColumn && tile.getX() <= rightColumn;
-    }
-
     /**
      * Draws the borders of a territory on the given Tile. The
      * territory is either a country or a region.
@@ -2478,186 +2660,4 @@ public final class MapViewer {
         }
     }
 
-    /**
-     * Position the map so that the supplied tile is displayed at the center.
-     *
-     * @param pos The <code>Tile</code> to center at.
-     */
-    private void positionMap(Tile pos) {
-        final Game game = freeColClient.getGame();
-        int x = pos.getX(), y = pos.getY();
-        int leftColumns = getLeftColumns(), rightColumns = getRightColumns();
-
-        /*
-          PART 1
-          ======
-          Calculate: bottomRow, topRow, bottomRowY, topRowY
-          This will tell us which rows need to be drawn on the screen (from
-          bottomRow until and including topRow).
-          bottomRowY will tell us at which height the bottom row needs to be
-          drawn.
-        */
-        alignedTop = false;
-        alignedBottom = false;
-        if (y < topRows) {
-            alignedTop = true;
-            // We are at the top of the map
-            bottomRow = (size.height / (halfHeight)) - 1;
-            if ((size.height % (halfHeight)) != 0) {
-                bottomRow++;
-            }
-            topRow = 0;
-            bottomRowY = bottomRow * (halfHeight);
-            topRowY = 0;
-        } else if (y >= (game.getMap().getHeight() - bottomRows)) {
-            alignedBottom = true;
-            // We are at the bottom of the map
-            bottomRow = game.getMap().getHeight() - 1;
-
-            topRow = size.height / (halfHeight);
-            if ((size.height % (halfHeight)) > 0) {
-                topRow++;
-            }
-            topRow = game.getMap().getHeight() - topRow;
-
-            bottomRowY = size.height - tileHeight;
-            topRowY = bottomRowY - (bottomRow - topRow) * (halfHeight);
-        } else {
-            // We are not at the top of the map and not at the bottom
-            bottomRow = y + bottomRows - 1;
-            topRow = y - topRows;
-            bottomRowY = topSpace + (halfHeight) * bottomRows;
-            topRowY = topSpace - topRows * (halfHeight);
-        }
-
-        /*
-          PART 2
-          ======
-          Calculate: leftColumn, rightColumn, leftColumnX
-          This will tell us which columns need to be drawn on the screen (from
-          leftColumn until and including rightColumn).
-          leftColumnX will tell us at which x-coordinate the left
-          column needs to be drawn (this is for the Tiles where y&1 == 0;
-          the others should be halfWidth more to the right).
-        */
-
-        alignedLeft = false;
-        alignedRight = false;
-        if (x < leftColumns) {
-            // We are at the left side of the map
-            leftColumn = 0;
-
-            rightColumn = size.width / tileWidth - 1;
-            if ((size.width % tileWidth) > 0) {
-                rightColumn++;
-            }
-
-            leftColumnX = 0;
-            alignedLeft = true;
-        } else if (x >= (game.getMap().getWidth() - rightColumns)) {
-            // We are at the right side of the map
-            rightColumn = game.getMap().getWidth() - 1;
-
-            leftColumn = size.width / tileWidth;
-            if ((size.width % tileWidth) > 0) {
-                leftColumn++;
-            }
-
-            leftColumnX = size.width - tileWidth - halfWidth -
-                leftColumn * tileWidth;
-            leftColumn = rightColumn - leftColumn;
-            alignedRight = true;
-        } else {
-            // We are not at the left side of the map and not at the right side
-            leftColumn = x - leftColumns;
-            rightColumn = x + rightColumns;
-            leftColumnX = (size.width - tileWidth) / 2
-                - leftColumns * tileWidth;
-        }
-    }
-
-    private void releaseUnitOutForAnimation(final Unit unit) {
-        Integer i = unitsOutForAnimation.get(unit);
-        if (i == null) {
-            throw new IllegalStateException("Tried to release unit that was not out for animation");
-        }
-        if (i == 1) {
-            unitsOutForAnimation.remove(unit);
-            gui.getCanvas().removeFromCanvas(unitsOutForAnimationLabels.remove(unit));
-        } else {
-            i--;
-            unitsOutForAnimation.put(unit, i);
-        }
-    }
-
-    private void repositionMapIfNeeded() {
-        if (bottomRow < 0 && focus != null) positionMap(focus);
-    }
-
-    /**
-     * Sets the ImageLibrary and calculates various items that depend
-     * on tile size.
-     *
-     * @param lib an <code>ImageLibrary</code> value
-     */
-    private void setImageLibraryAndUpdateData(ImageLibrary lib) {
-        this.lib = lib;
-        // ATTENTION: we assume that all base tiles have the same size
-        Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
-        rp = new RoadPainter(tileSize);
-        tileHeight = tileSize.height;
-        tileWidth = tileSize.width;
-        halfHeight = tileHeight/2;
-        halfWidth = tileWidth/2;
-
-        int dx = tileWidth/16;
-        int dy = tileHeight/16;
-        int ddx = dx + dx/2;
-        int ddy = dy + dy/2;
-
-        // small corners
-        controlPoints.put(Direction.N, new Point2D.Float(halfWidth, dy));
-        controlPoints.put(Direction.E, new Point2D.Float(tileWidth - dx, halfHeight));
-        controlPoints.put(Direction.S, new Point2D.Float(halfWidth, tileHeight - dy));
-        controlPoints.put(Direction.W, new Point2D.Float(dx, halfHeight));
-        // big corners
-        controlPoints.put(Direction.SE, new Point2D.Float(halfWidth, tileHeight));
-        controlPoints.put(Direction.NE, new Point2D.Float(tileWidth, halfHeight));
-        controlPoints.put(Direction.SW, new Point2D.Float(0, halfHeight));
-        controlPoints.put(Direction.NW, new Point2D.Float(halfWidth, 0));
-        // small corners
-        borderPoints.put(Direction.NW, new Point2D.Float(dx + ddx, halfHeight - ddy));
-        borderPoints.put(Direction.N,  new Point2D.Float(halfWidth - ddx, dy + ddy));
-        borderPoints.put(Direction.NE, new Point2D.Float(halfWidth + ddx, dy + ddy));
-        borderPoints.put(Direction.E,  new Point2D.Float(tileWidth - dx - ddx, halfHeight - ddy));
-        borderPoints.put(Direction.SE, new Point2D.Float(tileWidth - dx - ddx, halfHeight + ddy));
-        borderPoints.put(Direction.S,  new Point2D.Float(halfWidth + ddx, tileHeight - dy - ddy));
-        borderPoints.put(Direction.SW, new Point2D.Float(halfWidth - ddx, tileHeight - dy - ddy));
-        borderPoints.put(Direction.W,  new Point2D.Float(dx + ddx, halfHeight + ddy));
-
-        borderStroke = new BasicStroke(dy);
-        gridStroke = new BasicStroke(lib.getScaleFactor());
-
-        fog.reset();
-        fog.moveTo(halfWidth, 0);
-        fog.lineTo(tileWidth, halfHeight);
-        fog.lineTo(halfWidth, tileHeight);
-        fog.lineTo(0, halfHeight);
-        fog.closePath();
-    }
-
-    private void updateMapDisplayVariables() {
-        // Calculate the amount of rows that will be drawn above the
-        // central Tile
-        topSpace = (size.height - tileHeight) / 2;
-        if ((topSpace % (halfHeight)) != 0) {
-            topRows = topSpace / (halfHeight) + 2;
-        } else {
-            topRows = topSpace / (halfHeight) + 1;
-        }
-        bottomRows = topRows;
-        leftSpace = (size.width - tileWidth) / 2;
-        rightSpace = leftSpace;
-    }
-
 }

From 9749bc5d3604fc9f16668533f672c74b112be8c2 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 22 Sep 2015 20:06:14 +0200
Subject: [PATCH 247/323] Change MapViewer.gridPath into local variable

---
 src/net/sf/freecol/client/gui/MapViewer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 291026e52..5f8ac4838 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -227,7 +227,6 @@ public final class MapViewer {
         OTHER_UNITS_WIDTH = 3,
         MAX_OTHER_UNITS = 10;
 
-    private GeneralPath gridPath = null;
     private final GeneralPath fog = new GeneralPath();
 
     private final java.util.Map<Unit, Integer> unitsOutForAnimation;
@@ -1578,6 +1577,7 @@ public final class MapViewer {
         =======
         Create a GeneralPath to draw the grid with, if needed.
         */
+        GeneralPath gridPath = null;
         if (options.getBoolean(ClientOptions.DISPLAY_GRID)) {
             gridPath = new GeneralPath();
             gridPath.moveTo(0, 0);

From 6165fbd483ec7f6f0bbe33daf3036fab321ae8a7 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 25 Sep 2015 14:22:37 +0930
Subject: [PATCH 248/323] Rivers were allowed too close to the ocean due to bad
 continue.

---
 src/net/sf/freecol/server/generator/TerrainGenerator.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/server/generator/TerrainGenerator.java b/src/net/sf/freecol/server/generator/TerrainGenerator.java
index 17be6f0d0..f320c8b60 100644
--- a/src/net/sf/freecol/server/generator/TerrainGenerator.java
+++ b/src/net/sf/freecol/server/generator/TerrainGenerator.java
@@ -618,9 +618,9 @@ public class TerrainGenerator {
                 if (!riverType.isTileTypeAllowed(tile.getType())) continue;
 
                 // check the river source/spring is not too close to the ocean
-                for (Tile neighborTile : tile.getSurroundingTiles(2)) {
-                    if (!neighborTile.isLand()) continue;
-                }
+                if (!tile.getSurroundingTiles(1, 2).stream()
+                    .allMatch(Tile::isLand)) continue;
+
                 if (riverMap.get(tile) == null) {
                     // no river here yet
                     ServerRegion riverRegion = new ServerRegion(game, RegionType.RIVER);

From 1effea1f36b3d339d143b709e688ab787802837e Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 25 Sep 2015 14:35:10 +0930
Subject: [PATCH 249/323] Fix another test conditions failure.

---
 .../sf/freecol/server/model/ServerBuildingTest.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/src/net/sf/freecol/server/model/ServerBuildingTest.java b/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
index b70805750..96a6344b4 100644
--- a/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
+++ b/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
@@ -352,29 +352,32 @@ public class ServerBuildingTest extends FreeColTestCase {
         colony.addGoods(foodType, 100);
 
         Building university = colony.getBuilding(universityType);
+        Building townHall = colony.getBuilding(townHallType);
+        clearWorkLocation(townHall);
         Iterator<Unit> units = colony.getUnitIterator();
 
         Unit colonist1 = units.next();
         colonist1.setType(freeColonistType);
-        colonist1.setLocation(colony.getBuilding(townHallType));
+        colonist1.setLocation(townHall);
 
         Unit colonist2 = units.next();
         colonist2.setType(freeColonistType);
-        colonist2.setLocation(colony.getBuilding(townHallType));
+        colonist2.setLocation(townHall);
 
         Unit colonist3 = units.next();
         colonist3.setType(freeColonistType);
-        colonist3.setLocation(colony.getBuilding(townHallType));
+        colonist3.setLocation(townHall);
 
         Unit black = units.next();
         black.setType(masterBlacksmithType);
+        black.setLocation(university);
 
         Unit ore = units.next();
         ore.setType(expertOreMinerType);
-
-        black.setLocation(university);
         ore.setLocation(university);
 
+        assertTrue("Should be longer to train blacksmith then ore miner",
+            black.getNeededTurnsOfTraining() > ore.getNeededTurnsOfTraining());
         assertEquals(3, getUnitList(colony, freeColonistType).size());
         assertEquals(1, getUnitList(colony, masterBlacksmithType).size());
         assertEquals(1, getUnitList(colony, expertOreMinerType).size());

From 23ef2f67f47e7d1cdfdd745a28481786841ff3b3 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 25 Sep 2015 14:49:24 +0930
Subject: [PATCH 250/323] More float->double.

---
 .../sf/freecol/common/model/AbstractUnit.java |  2 +-
 src/net/sf/freecol/common/model/Colony.java   | 29 +++++++++----------
 src/net/sf/freecol/common/model/Role.java     | 20 ++++++-------
 src/net/sf/freecol/common/model/Tile.java     |  8 ++---
 src/net/sf/freecol/common/model/UnitType.java |  4 +--
 .../model/pathfinding/GoalDeciders.java       |  6 ++--
 6 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/net/sf/freecol/common/model/AbstractUnit.java b/src/net/sf/freecol/common/model/AbstractUnit.java
index bceeb4c5c..41c86f9b9 100644
--- a/src/net/sf/freecol/common/model/AbstractUnit.java
+++ b/src/net/sf/freecol/common/model/AbstractUnit.java
@@ -166,7 +166,7 @@ public class AbstractUnit extends FreeColObject {
      * @param spec A <code>Specification</code> to look up.
      * @return The approximate offence power.
      */
-    public float getOffence(Specification spec) {
+    public double getOffence(Specification spec) {
         int n = getNumber();
         Role role = getRole(spec);
         UnitType type = spec.getUnitType(getId());
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 0d8bef6b1..10d88ee51 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -1325,22 +1325,21 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
     public StringTemplate getReducePopulationMessage() {
         if (canReducePopulation()) return null;
         Set<Modifier> modifierSet = getModifiers(Modifier.MINIMUM_COLONY_SIZE);
-        for (Modifier modifier : modifierSet) {
-            FreeColObject source = modifier.getSource();
-            if (source instanceof BuildingType) {
-                // If the modifier source is a building type, use the
-                // building in the colony, which may be of a different
-                // level to the modifier source.
-                // This prevents the stockade modifier from matching a
-                // colony-fort, and thus the message attributing the
-                // failure to reduce population to a non-existing
-                // stockade, BR#3522055.
-                source = getBuilding((BuildingType)source).getType();
-            }
-            return StringTemplate.template("model.colony.minimumColonySize")
-                .addName("%object%", source);
+        if (modifierSet.isEmpty()) return null;
+        Modifier modifier = modifierSet.iterator().next();
+        FreeColObject source = modifier.getSource();
+        if (source instanceof BuildingType) {
+            // If the modifier source is a building type, use the
+            // building in the colony, which may be of a different
+            // level to the modifier source.
+            // This prevents the stockade modifier from matching a
+            // colony-fort, and thus the message attributing the
+            // failure to reduce population to a non-existing
+            // stockade, BR#3522055.
+            source = getBuilding((BuildingType)source).getType();
         }
-        return null;
+        return StringTemplate.template("model.colony.minimumColonySize")
+            .addName("%object%", source);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Role.java b/src/net/sf/freecol/common/model/Role.java
index 3bd8915c0..8d9e1d228 100644
--- a/src/net/sf/freecol/common/model/Role.java
+++ b/src/net/sf/freecol/common/model/Role.java
@@ -68,8 +68,8 @@ public class Role extends BuildableType {
         = new Comparator<Role>() {
             @Override
             public int compare(Role role1, Role role2) {
-                float amount1 = role1.getOffence() + role1.getDefence();
-                float amount2 = role2.getOffence() + role2.getDefence();
+                double amount1 = role1.getOffence() + role1.getDefence();
+                double amount2 = role2.getOffence() + role2.getDefence();
                 return (amount1 < amount2) ? 1
                     : (amount1 > amount2) ? -1
                     : 0;
@@ -81,8 +81,8 @@ public class Role extends BuildableType {
         = new Comparator<Role>() {
             @Override
             public int compare(Role role1, Role role2) {
-                float defence1 = role1.getDefence();
-                float defence2 = role2.getDefence();
+                double defence1 = role1.getDefence();
+                double defence2 = role2.getDefence();
                 return (defence1 > defence2) ? 1
                     : (defence1 < defence2) ? -1
                     : 0;
@@ -94,8 +94,8 @@ public class Role extends BuildableType {
         = new Comparator<Role>() {
             @Override
             public int compare(Role role1, Role role2) {
-                float offence1 = role1.getOffence();
-                float offence2 = role2.getOffence();
+                double offence1 = role1.getOffence();
+                double offence2 = role2.getOffence();
                 return (offence1 > offence2) ? 1
                     : (offence1 < offence2) ? -1
                     : 0;
@@ -297,8 +297,8 @@ public class Role extends BuildableType {
      *
      * @return The offense value.
      */
-    public float getOffence() {
-        return applyModifiers(0f, null, Modifier.OFFENCE);
+    public double getOffence() {
+        return applyModifiers(0.0f, null, Modifier.OFFENCE);
     }
 
     /**
@@ -315,8 +315,8 @@ public class Role extends BuildableType {
      *
      * @return The defence value.
      */
-    private float getDefence() {
-        return applyModifiers(0f, null, Modifier.DEFENCE);
+    private double getDefence() {
+        return applyModifiers(0.0f, null, Modifier.DEFENCE);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 00071d6e1..3792a5061 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -202,8 +202,8 @@ public final class Tile extends UnitLocation implements Named, Ownable {
     private final Comparator<Tile> defenceValueComparator
         = new Comparator<Tile>() {
                 public int compare(Tile t1, Tile t2) {
-                    float f = t2.getDefenceValue() - t1.getDefenceValue();
-                    return (f < 0.0f) ? -1 : (f > 0.0f) ? 1 : 0;
+                    double f = t2.getDefenceValue() - t1.getDefenceValue();
+                    return (f < 0.0) ? -1 : (f > 0.0) ? 1 : 0;
                 }
             };
 
@@ -1349,9 +1349,9 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      *
      * @return The defence value.
      */
-    public float getDefenceValue() {
+    public double getDefenceValue() {
         final TileType type = getType();
-        return (type == null) ? 0.0f
+        return (type == null) ? 0.0
             : applyModifiers(1.0f, null, type.getDefenceModifiers());
     }
 
diff --git a/src/net/sf/freecol/common/model/UnitType.java b/src/net/sf/freecol/common/model/UnitType.java
index 1aa23769b..29871e3d9 100644
--- a/src/net/sf/freecol/common/model/UnitType.java
+++ b/src/net/sf/freecol/common/model/UnitType.java
@@ -177,7 +177,7 @@ public final class UnitType extends BuildableType implements Consumer {
      *
      * @return The offence value.
      */
-    public float getOffence() {
+    public double getOffence() {
         return applyModifiers(offence, null, Modifier.OFFENCE);
     }
 
@@ -204,7 +204,7 @@ public final class UnitType extends BuildableType implements Consumer {
      *
      * @return The defence value.
      */
-    public float getDefence() {
+    public double getDefence() {
         return applyModifiers(defence, null, Modifier.DEFENCE);
     }
 
diff --git a/src/net/sf/freecol/common/model/pathfinding/GoalDeciders.java b/src/net/sf/freecol/common/model/pathfinding/GoalDeciders.java
index a8573c541..c2c144aef 100644
--- a/src/net/sf/freecol/common/model/pathfinding/GoalDeciders.java
+++ b/src/net/sf/freecol/common/model/pathfinding/GoalDeciders.java
@@ -299,7 +299,7 @@ public final class GoalDeciders {
      */
     public static GoalDecider getDisembarkGoalDecider(final Tile target) {
         return new GoalDecider() {
-            private float bestScore = -1.0f;
+            private double bestScore = -1.0;
             private boolean goalDangerous = true;
             private PathNode goal = null;
 
@@ -339,9 +339,9 @@ public final class GoalDeciders {
                     }
                 }
                 if (found) {
-                    float distance = 1.0f + u.getGame().getMap()
+                    double distance = 1.0 + u.getGame().getMap()
                         .getDistance(target, tile);
-                    float score = tile.getDefenceValue() / distance;
+                    double score = tile.getDefenceValue() / distance;
                     if (bestScore < score) {
                         bestScore = score;
                         goal = pathNode;

From ed50addec48de6abb652ea2220c8e2dc3dc39a9c Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 25 Sep 2015 14:42:18 +0200
Subject: [PATCH 251/323] Fix bug preventing TileInfoPanel from showing any
 info for unexplored tiles

---
 src/net/sf/freecol/client/gui/MapViewer.java  | 81 +++++++++----------
 .../freecol/client/gui/panel/InfoPanel.java   |  2 +-
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 5f8ac4838..b855b7d7f 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -471,6 +471,8 @@ public final class MapViewer {
      * @return The image.
      */
     BufferedImage createTileImageWithBeachBorderAndItems(Tile tile) {
+        if (!tile.isExplored())
+            return lib.getTerrainImage(null, tile.getX(), tile.getY());
         final TileType tileType = tile.getType();
         Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
         BufferedImage overlayImage = lib.getOverlayImage(tile);
@@ -2362,9 +2364,9 @@ public final class MapViewer {
     }
 
     /**
-     * Displays the given Tile onto the given Graphics2D object at the
-     * location specified by the coordinates.  Addtions and
-     * improvements to Tile will be drawn.
+     * Displays the given tile's items onto the given Graphics2D object.
+     * Additions and improvements to Tile will be drawn.
+     * Only works for explored tiles.
      *
      * @param g The Graphics2D object on which to draw the Tile.
      * @param tile The Tile to draw.
@@ -2373,47 +2375,44 @@ public final class MapViewer {
     private void displayTileItems(Graphics2D g, Tile tile, Image overlayImage) {
         // ATTENTION: we assume that only overlays and forests
         // might be taller than a tile.
-        if (!tile.isExplored()) {
-            g.drawImage(lib.getTerrainImage(null, tile.getX(), tile.getY()), 0, 0, null);
-        } else {
-            // layer additions and improvements according to zIndex
-            List<TileItem> tileItems = (tile.getTileItemContainer() != null)
-                ? tile.getTileItemContainer().getTileItems()
-                : new ArrayList<TileItem>();
-            int startIndex = 0;
-            for (int index = startIndex; index < tileItems.size(); index++) {
-                if (tileItems.get(index).getZIndex() < Tile.OVERLAY_ZINDEX) {
-                    displayTileItem(g, tile, tileItems.get(index));
-                    startIndex = index + 1;
-                } else {
-                    startIndex = index;
-                    break;
-                }
-            }
-            // Tile Overlays (eg. hills and mountains)
-            if (overlayImage != null) {
-                g.drawImage(overlayImage, 0, (tileHeight - overlayImage.getHeight(null)), null);
-            }
-            for (int index = startIndex; index < tileItems.size(); index++) {
-                if (tileItems.get(index).getZIndex() < Tile.FOREST_ZINDEX) {
-                    displayTileItem(g, tile, tileItems.get(index));
-                    startIndex = index + 1;
-                } else {
-                    startIndex = index;
-                    break;
-                }
-            }
-            // Forest
-            if (tile.isForested()) {
-                Image forestImage = lib.getForestImage(tile.getType(), tile.getRiverStyle());
-                g.drawImage(forestImage, 0, (tileHeight - forestImage.getHeight(null)), null);
-            }
 
-            // draw all remaining items
-            for (TileItem ti : tileItems.subList(startIndex, tileItems.size())) {
-                displayTileItem(g, tile, ti);
+        // layer additions and improvements according to zIndex
+        List<TileItem> tileItems = (tile.getTileItemContainer() != null)
+            ? tile.getTileItemContainer().getTileItems()
+            : new ArrayList<TileItem>();
+        int startIndex = 0;
+        for (int index = startIndex; index < tileItems.size(); index++) {
+            if (tileItems.get(index).getZIndex() < Tile.OVERLAY_ZINDEX) {
+                displayTileItem(g, tile, tileItems.get(index));
+                startIndex = index + 1;
+            } else {
+                startIndex = index;
+                break;
             }
         }
+        // Tile Overlays (eg. hills and mountains)
+        if (overlayImage != null) {
+            g.drawImage(overlayImage, 0, (tileHeight - overlayImage.getHeight(null)), null);
+        }
+        for (int index = startIndex; index < tileItems.size(); index++) {
+            if (tileItems.get(index).getZIndex() < Tile.FOREST_ZINDEX) {
+                displayTileItem(g, tile, tileItems.get(index));
+                startIndex = index + 1;
+            } else {
+                startIndex = index;
+                break;
+            }
+        }
+        // Forest
+        if (tile.isForested()) {
+            Image forestImage = lib.getForestImage(tile.getType(), tile.getRiverStyle());
+            g.drawImage(forestImage, 0, (tileHeight - forestImage.getHeight(null)), null);
+        }
+
+        // draw all remaining items
+        for (TileItem ti : tileItems.subList(startIndex, tileItems.size())) {
+            displayTileItem(g, tile, ti);
+        }
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index db8f43efc..ead22b6c2 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -145,7 +145,7 @@ public final class InfoPanel extends FreeColPanel {
             final ImageLibrary lib = getGUI().getTileImageLibrary();
             final Font font = FontLibrary.createFont(FontLibrary.FontType.NORMAL,
                 FontLibrary.FontSize.TINY, lib.getScaleFactor());
-            if (tile != null && tile.getType() != null) {
+            if (tile != null) {
                 final int width = getWidth() - SLACK;
                 BufferedImage image = getGUI().createTileImageWithBeachBorderAndItems(tile);
                 if (tile.isExplored()) {

From 8a6b2ecaf996751980f508321c38d87ef9ae38c2 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 25 Sep 2015 15:11:51 +0200
Subject: [PATCH 252/323] Simplify MapViewer.displayTileWithBeachAndBorder

Removes drawUnexploredBorders parameter which had no effect since 2007,
see git.51802c03 and git.dbda4218.
---
 src/net/sf/freecol/client/gui/MapViewer.java | 24 ++++++--------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index b855b7d7f..43a50ca31 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -485,7 +485,7 @@ public final class MapViewer {
             terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
         Graphics2D g = image.createGraphics();
         g.translate(0, compoundHeight - terrainTileSize.height);
-        displayTileWithBeachAndBorder(g, lib, tile, true);
+        displayTileWithBeachAndBorder(g, lib, tile);
         displayTileItems(g, tile, overlayImage);
         g.dispose();
         return image;
@@ -579,7 +579,7 @@ public final class MapViewer {
             }
         }
 
-        displayTileWithBeachAndBorder(g, lib, tile, false);
+        displayTileWithBeachAndBorder(g, lib, tile);
         if (tile != null && tile.isExplored()) {
             displayTileItems(g, tile, overlayImage);
             displaySettlementWithChipsOrPopulationNumber(freeColClient, lib,
@@ -1622,7 +1622,7 @@ public final class MapViewer {
             // Column per column; start at the left side to display the tiles.
             for (int column = firstColumn; column <= lastColumn; column++) {
                 Tile tile = map.getTile(column, row);
-                displayTileWithBeachAndBorder(g, lib, tile, true);
+                displayTileWithBeachAndBorder(g, lib, tile);
                 g.translate(tileWidth, 0);
             }
             g.setTransform(rowTransform);
@@ -2050,13 +2050,10 @@ public final class MapViewer {
      * @param g The Graphics2D object on which to draw the Tile.
      * @param library The <code>ImageLibrary</code> to use.
      * @param tile The Tile to draw.
-     * @param drawUnexploredBorders If true; draws border between explored and
-     *        unexplored terrain.
      */
     private static void displayTileWithBeachAndBorder(Graphics2D g,
                                                       ImageLibrary library,
-                                                      Tile tile,
-                                                      boolean drawUnexploredBorders) {
+                                                      Tile tile) {
         if (tile != null) {
             int x = tile.getX();
             int y = tile.getY();
@@ -2081,19 +2078,12 @@ public final class MapViewer {
                 SortableImage si;
                 for (Direction direction : Direction.values()) {
                     Tile borderingTile = tile.getNeighbourOrNull(direction);
-                    if (borderingTile != null) {
-
-                        if (!drawUnexploredBorders && !borderingTile.isExplored() &&
-                            (direction == Direction.SE || direction == Direction.S ||
-                             direction == Direction.SW)) {
-                            continue;
-                        }
-
+                    if (borderingTile != null && borderingTile.isExplored()) {
                         if (tile.getType() == borderingTile.getType()) {
                             // Equal tiles, no need to draw border
                         } else if (tile.isLand() && !borderingTile.isLand()) {
                             // The beach borders are drawn on the side of water tiles only
-                        } else if (!tile.isLand() && borderingTile.isLand() && borderingTile.isExplored()) {
+                        } else if (!tile.isLand() && borderingTile.isLand()) {
                             // If there is a Coast image (eg. beach) defined, use it, otherwise skip
                             // Draw the grass from the neighboring tile, spilling over on the side of this tile
                             si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction, x, y),
@@ -2106,7 +2096,7 @@ public final class MapViewer {
                                                        -1);
                                 imageBorders.add(si);
                             }
-                        } else if (borderingTile.isExplored()) {
+                        } else {
                             if (library.getTerrainImage(tile.getType(), 0, 0)
                                 .equals(library.getTerrainImage(borderingTile.getType(), 0, 0))) {
                                 // Do not draw limit between tile that share same graphics (ocean & great river)

From 1b2f9b40c2d9378ab8ad8248f1839b6745a7b16b Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 25 Sep 2015 16:04:32 +0200
Subject: [PATCH 253/323] Update comment about used image sizes

---
 src/net/sf/freecol/client/gui/ImageLibrary.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index 5cdd95777..cd156a137 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -81,12 +81,12 @@ public final class ImageLibrary {
 
     /**
      * Canonical sizes of images GUI elements and map are expecting
-     * in some cases already and current image files have.
-     * ATM this is just for documentation.
-     * Currently, most images result in a size of image size times scaling
-     * factor times requested size. If these canonical sizes would get used
-     * in the equation, the game could tolerate changing sizes in the files,
-     * without GUI elements sized wrongly, parts cut off or moved unexpectedly.
+     * and current image files have.
+     * ICON_SIZE, TILE_SIZE, TILE_OVERLAY_SIZE and TILE_FOREST_SIZE constants
+     * are used in this way already, allowing them to tolerate changing sizes
+     * in the files.
+     * Most other images are currently still shown in a size of image size
+     * times scaling factor times requested size.
      */
     public static final Dimension ICON_SIZE = new Dimension(32, 32),
                                   BUILDING_SIZE = new Dimension(128, 96),

From 490110c82337e82f979660a5905e48b6016b8c6d Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Fri, 25 Sep 2015 16:08:12 +0200
Subject: [PATCH 254/323] Localisation updates from https://translatewiki.net.

---
 data/strings/FreeColMessages_br.properties    | 157 +++------
 data/strings/FreeColMessages_de.properties    | 215 ++++++------
 data/strings/FreeColMessages_el.properties    |  12 +-
 data/strings/FreeColMessages_es_ES.properties |  50 ++-
 data/strings/FreeColMessages_it_IT.properties |  10 +-
 data/strings/FreeColMessages_ja.properties    | 164 ++++++---
 data/strings/FreeColMessages_lt.properties    |  27 +-
 data/strings/FreeColMessages_mk.properties    |  51 ++-
 data/strings/FreeColMessages_nl.properties    | 173 +++-------
 data/strings/FreeColMessages_pl_PL.properties |   5 +-
 data/strings/FreeColMessages_pt_BR.properties |  64 ++--
 data/strings/FreeColMessages_pt_PT.properties |  35 +-
 data/strings/FreeColMessages_ru.properties    |  26 +-
 data/strings/FreeColMessages_sk.properties    | 324 +++++++++++-------
 data/strings/FreeColMessages_sv_SE.properties |   1 +
 data/strings/FreeColMessages_tr.properties    |   2 +
 .../FreeColMessages_zh-hant.properties        |   7 +-
 data/strings/FreeColMessages_zh_CN.properties | 135 +++-----
 18 files changed, 714 insertions(+), 744 deletions(-)

diff --git a/data/strings/FreeColMessages_br.properties b/data/strings/FreeColMessages_br.properties
index 3967d8833..e930ec991 100644
--- a/data/strings/FreeColMessages_br.properties
+++ b/data/strings/FreeColMessages_br.properties
@@ -100,6 +100,7 @@ cashInTreasureTrain=Arc'hant e Karrigenn an teñzor
 clearOrders=Nullañ an urzhioù
 colonists=Trevadennerien
 colopedia=Trevpedia
+countryName={{tag:country|%nation%}}
 difficulty=Diaester
 docks=Kaeoù
 dumpCargo=Teurel al lestrad
@@ -1552,8 +1553,7 @@ model.improvement.road.description=Hent
 model.improvement.road.name=Hent
 model.improvement.road.occupationString=H
 model.limit.independence.coastalColonies.name=Bevenn trevaennoù war an aod
-# Fuzzy
-model.limit.independence.coastalColonies.description=Rankout a reot kaout %limit% trevadenn war an aod da nebeutañ evit disklêriañ ho tizalc'hiezh.
+model.limit.independence.coastalColonies.description=Rankout a reot kaout %limit% {{plural:%limit%|one=trevadenn|other=trevadennoù}} war an aod da nebeutañ evit disklêriañ ho tizalc'hiezh.
 model.limit.independence.rebels.name=Bevenn a emsavidi
 model.limit.independence.rebels.description=D'an nebeutañ %limit%% eus ho entrevidi a rank souten an dizalc'hiezh.
 model.limit.independence.year.name=Bloavezh Harz
@@ -1901,8 +1901,7 @@ model.colony.badGovernment=Diefedus eo gouarnamant %colony%. Kastizoù zo lakaet
 model.colony.goodGovernment=Gwellaet eo efedusted ar gouarnamant! Mibien ar frankiz n'eo ket mui par pe a ya bremañ d'ober muioc'h eget %number% dre gant ar gumuniezh e %colony%.
 model.colony.governmentImproved1=Gwellaet eo gouarnamant %colony%, daoust dezhañ chom diefedus. Kastizoù a zo lakaet war ar produerezh c'hoazh.
 model.colony.governmentImproved2=Gwellaet eo gouarnamant %colony%. Lamet eo bet ar c'hastizoù war ar produerezh.
-# Fuzzy
-model.colony.insufficientProduction=%outputAmount% %outputType% muioc'h a c'hellfe bezañ produet e %colony% gant ma vefe un dreistad a %inputAmount% %inputType% ganeomp.
+model.colony.insufficientProduction=%outputAmount% %outputType% muioc'h a c'hellfe bezañ produet e %colony% gant ma vefe un dreistad a %consumptionDeficit%  ganeomp.
 model.colony.lostGoodGovernment=Koazhet eo efedusted ar gouarnamant! Mibien ar frankiz n'eo ket mui par pe a ya bremañ d'ober muioc'h eget %number% dre gant ar gumuniezh e %colony%. N'eus bonuz produiñ ebet ken gant an drevadenn.
 model.colony.lostVeryGoodGovernment=Koazhet eo efedusted ar gouarnamant! Mibien ar frankiz n'eo ket mui par pe a ya bremañ d'ober nebeutoc'h eget %number% dre gant ar gumuniezh e %colony%. Kollet ez eus bet holl he bonuzoù produiñ gant an drevadenn.
 model.colony.minimumColonySize=%object% a vir ouzh ar boblañs da zigreskiñ betek re.
@@ -1916,18 +1915,13 @@ model.colony.veryBadGovernment=Diefedus a-grenn eo gouarnamant %colony%. Kastizo
 model.colony.veryGoodGovernment=Gwellaet eo bet efedusted ar gournamant! Par eo ar santadur disuj er %colony% pe mont a ra dreist bremañ da %number% dre gant...
 model.colonyTile.claim=(%direction% ar goulenn)
 model.diplomaticTrade.receive.contact=Gant hor gwellañ gourc'hemennoù a-berzh ar vroad illur %nation%.
-# Fuzzy
-model.diplomaticTrade.receive.diplomatic=Kevraouomp gant %nation%.
+model.diplomaticTrade.receive.diplomatic=Kevraouomp gant {{tag:country|%nation%}}.
 model.diplomaticTrade.receive.trade=Roomp studi da ginnig kenwerzhel %nation%.
-# Fuzzy
-model.diplomaticTrade.receive.tribute=%nation% zo o c'houlenn un truaj diganeoc'h !
+model.diplomaticTrade.receive.tribute={{tag:country|%nation%]] zo o c'houlenn un truaj diganeoc'h !
 model.diplomaticTrade.send.contact=Kejet hon eus ouzh izili eus ar vroad %nation%.
-# Fuzzy
-model.diplomaticTrade.send.diplomatic=Roomp studi d'hor stad diplomatel gant %nation%
-# Fuzzy
-model.diplomaticTrade.send.trade=Roomp studi d'ur c'henwerzh gant %nation% e %settlement%.
-# Fuzzy
-model.diplomaticTrade.send.tribute=Goulenn a reomp un truaj digant %nation% e % %settlement%.
+model.diplomaticTrade.send.diplomatic=Roomp studi d'hor stad diplomatel gant {{tag:country|%nation%}}.
+model.diplomaticTrade.send.trade=Roomp studi d'ur c'henwerzh gant {{tag:%nation%}} e %settlement%.
+model.diplomaticTrade.send.tribute=Goulenn a reomp un truaj digant {{tag:country|%nation%}} e % %settlement%.
 model.direction.N.name=norzh
 model.direction.NE.name=biz
 model.direction.E.name=reter
@@ -1937,40 +1931,25 @@ model.direction.SW.name=mervent
 model.direction.W.name=kornôg
 model.direction.NW.name=gwalarn
 model.historyEventType.abandonColony.description=Dilezel a rit trevadenn %colony%.
-# Fuzzy
-model.historyEventType.ceaseFire.description=Un harz-tennañ zo bet sinet gant %nation%
-# Fuzzy
-model.historyEventType.cityOfGold.description=An %nation%  a zizolo %city%, unan eus ar Seizh Keoded aour Kollet, hag un teñzor a %treasure% unanenn aour.
-# Fuzzy
-model.historyEventType.colonyConquered.description=Aloubet eo bet ho trevadenn %colony% gant %nation%.
-# Fuzzy
-model.historyEventType.colonyDestroyed.description=Distrujet eo bet ho trevadenn %colony% gant %nation%.
-# Fuzzy
-model.historyEventType.conquerColony.description=Krediñ a reot degemer hon aozioù brokus ha tremen a rit, koulskoude, hep paeañ ? Aze ez eus trubarderezh ! Setu perak n'omp ket plijet gant hoc'h emzaclc'h.
-# Fuzzy
-model.historyEventType.declareIndependence.description=Distrujañ a rit kêriadenn %settlement% %nation%.
-# Fuzzy
-model.historyEventType.declareWar.description=Disklêriet eo ar brezel gant %nation%
-# Fuzzy
-model.historyEventType.destroyNation.description=Gant an %nation% eo bet distrujet an %nativeNation%.
-# Fuzzy
-model.historyEventType.destroySettlement.description=Distrujañ a rit ar gêriadenn %settlement e %nation%
+model.historyEventType.ceaseFire.description=Un harz-tennañ zo bet sinet gant {{tag:country|%nation%}}.
+model.historyEventType.cityOfGold.description={{tag:country|%nation%}} a zizolo %city%, unan eus ar Seizh Keoded aour Kollet, hag un teñzor a %treasure% unanenn aour.
+model.historyEventType.colonyConquered.description=Aloubet eo bet ho trevadenn %colony% gant {{tag:country|%nation%}}.
+model.historyEventType.colonyDestroyed.description=Distrujet eo bet ho trevadenn %colony% gant {{tag:country|%nation%}}.
+model.historyEventType.conquerColony.description=Aloubet ho peus an drevadenn %nation% colony eus %colony%.
+model.historyEventType.declareIndependence.description=Disklêriañ a rit an dizalc'hiezh ouzh ar Gururenn.
+model.historyEventType.declareWar.description=Disklêriet eo ar brezel gant  {{tag:country|%nation%}}.
+model.historyEventType.destroyNation.description=An {{tag:country|%nation%}} a zistuj an %nativeNation%.
+model.historyEventType.destroySettlement.description=Distrujañ a rit ar gêriadenn %settlement% e %nation%
 model.historyEventType.discoverNewWorld.description=Dizoleiñ a rit an Douar Nevez.
-# Fuzzy
-model.historyEventType.discoverRegion.description=An %nation% a zizolo %region%.
-# Fuzzy
-model.historyEventType.formAlliance.description=Un emglev zo bet siner gant %nation%
+model.historyEventType.discoverRegion.description={{tag:country|%nation%}} a zizolo %region%.
+model.historyEventType.formAlliance.description=Un emglev zo bet siner gant  {{tag:country|%nation%}}.
 model.historyEventType.foundColony.description=Sevel a rit trevadenn %colony%.
 model.historyEventType.foundingFather.description=Emezelañ a ra %father% ouzh ar C'hendalc'h Kevandirel.
 model.historyEventType.independence.description=An Dizalc'hiezh ho peus gounezet diouzh ar Gurunenn.
-# Fuzzy
-model.historyEventType.makePeace.description=Un emglev peoc'h zo bet sinet gant %nation%.
-# Fuzzy
+model.historyEventType.makePeace.description=Un emglev peoc'h zo bet sinet gant  {{tag:country|%nation%}}.
 model.historyEventType.meetNation.description=En em gavout a rit gant %nation%.
-# Fuzzy
 model.historyEventType.nationDestroyed.description=N'eus ket mui eus !!%nation% er Bed Nevez.
-# Fuzzy
-model.historyEventType.spanishSuccession.description=%loserNation% a lez holl o zrevadennoù en Douar Nevez da %nation%.
+model.historyEventType.spanishSuccession.description={{tag:country|%loserNation%}}a lez holl o zrevadennoù en Douar Nevez da {{tag:country|%nation%}}.
 model.indianSettlement.mostHatedNone=Hini ebet
 model.indianSettlement.mostHatedUnknown=Dianav
 model.indianSettlement.nameUnknown=Dianav
@@ -2023,11 +2002,9 @@ model.messageType.warehouseCapacity.name=Barregezh ar sanailh
 model.messageType.warning.name=Kemennoù diwall
 model.monarch.action.addToRef.text=Ouzhpennet eo bet gant ar Gurunenn {{plural:%number%|%unit%}} d'ar Bagad Brezel Roueel. Ankeniet eo renerien an trevadennoù.
 model.monarch.action.addToRef.no=Graet
-# Fuzzy
-model.monarch.action.declarePeace.text=Asantet hon eus skoulmañ un emglev peoc'h gant an %nation%.
+model.monarch.action.declarePeace.text=Asantet hon eus skoulmañ un emglev peoc'h gant {{tag:country|%nation%}}.
 model.monarch.action.declarePeace.no=Graet
-# Fuzzy
-model.monarch.action.declareWar.text=Rediet omp, abalamour d'ho rogoni, da zisklêriañ brezel d'an %nation% !
+model.monarch.action.declareWar.text=Rediet omp, abalamour d'ho rogoni, da zisklêriañ brezel da {{tag:country|%nation%}}  !
 model.monarch.action.declareWar.no=Graet
 # Fuzzy
 model.monarch.action.displeasure.text=Disklêriañ a rit Dizalchiezh diouzh ar Gurunenn.
@@ -2071,8 +2048,7 @@ model.advantages.selectable.name=A c'haller dibab
 model.advantages.selectable.shortDescription=Ar spledoù broadel a c'haller dibab ha n'o deus ket da vezañ dibar.
 model.nationState.aiOnly.name=NA nemetken
 model.nationState.available.name=hegerz
-# Fuzzy
-model.nationState.available.shortDescription=Aloubiñ a rit %colony%, un drevadenn eus ar vroad %nation%.
+model.nationState.available.shortDescription=Gallout a rit c'hoari ar vroad-mañ
 model.nationState.notAvailable.name=n'eo ket hegerz
 model.nationState.notAvailable.shortDescription=N'haller ket kaout ar vroad-se
 model.noClaimReason.europeans.description=Ur vroad europat all a embann piaouañ an douar-mañ dija.
@@ -2087,8 +2063,7 @@ model.player.colonialIndependence=N'eus nemet ar c'hoarierien drevadennel a c'ha
 model.player.forces=Nerzhioù %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Goude mizioù war vor emaoc'h degouezhet a-vaez da aodoù ur c'hevandir dianav. Lakait penn {{tag:%direction%|west=d'ar C'hornôg|east=ar Reter|default=dindan an avel}} evit dizoleiñ an Douar Nevez ha piaouañ anezhañ en anv ar Gurunenn.
-# Fuzzy
-model.player.waitingFor=O c'hortoz ma vo echuet o zro gant : %nation%
+model.player.waitingFor=O c'hortoz : {{tag:country|%nation%}}
 model.regionType.coast.name=Aod
 model.regionType.coast.unknown=Rannvro arvorek dianav
 model.regionType.desert.name=Dezerzh
@@ -2127,8 +2102,7 @@ model.tradeItem.gold.name=Aour
 model.tradeItem.gold.description=ar sammad a %amount% aour
 model.tradeItem.goods.name=Marc'hadourezh
 model.tradeItem.incite.name=Disklêriañ ar brezel da
-# Fuzzy
-model.tradeItem.incite.description=brezel a-enep an %nation%
+model.tradeItem.incite.description=brezel a-enep {{tag:country|%nation%}}
 model.tradeItem.stance.name=Darempredoù
 model.tradeItem.unit.name=Unvez
 model.tradeRoute.allEmpty=Goullo eo an holl zrsavioù.
@@ -2152,7 +2126,6 @@ model.unit.unitState.fortified=K
 model.unit.unitState.fortifying=K
 model.unit.unitState.inColony=L
 model.unit.unitState.sentry=G
-# Fuzzy
 model.unit.unitState.skipped=T
 model.unit.unitState.toAmerica=B
 model.unit.unitState.toEurope=B
@@ -2180,6 +2153,7 @@ model.colony.colonyStarved=Trevadenner diwezhañ %colony% zo marvet gant an naon
 model.colony.customs.sale=Gwerzhet ez eus bet %data% e Maltouterezh %colony%.
 model.colony.customs.saleData=%amount% %goods% evit %gold%
 model.colony.famineFeared=Emañ an naonegezh o c'hourdrouz %colony%. A-benn %number% tro ne chomo tamm boued ebet ken.
+model.colony.starving=%colony% marnaoniet
 model.colony.newColonist=Trevadenner nevez e %colony%.
 model.colony.newConvert=Un ezel eus ar vroad %nation% gounezet gant ar feiz nevez zo degouezhet e %colony%.
 model.colony.notBuildingAnything=N'emeur o sevel netra e %colony%.
@@ -2193,8 +2167,7 @@ model.colony.warehouseSoonFull=Ho sanailh e %colony% a yay en tu all d'he barreg
 model.colony.warehouseWaste=Ho sanailh e %colony% a zo aet en tu all d'he barregezh sanailhañ %goods%. Foranet eo bet %waste% unanenn.
 model.colony.workersEvicted=E %colony% ne c'hall ket ho trevadennerien labourat war %location% abalamour ma'z eus %enemyUnit% war al lec'h.
 model.colonyTile.resourceExhausted=Danvez %resource% kaset da get e %colony%
-# Fuzzy
-model.game.spanishSuccession=Ho Meurdez, ar Brezel Hêrezh Spagnol a zo echuet en Europa. Hervez Skrid-emglev Utrecht eo bet rediet ar vroad %loserNation% da lezel holl he zrevadennoù en Douar Nevez da %nation%!
+model.game.spanishSuccession=Ho Meurdez, ar Brezel Hêrezh Spagnol a zo echuet en Europa. Hervez Skrid-emglev Utrecht eo bet rediet ar vroad {{tag:country|%loserNation%}} da lezel holl he zrevadennoù en Douar Nevez da  {{tag:country|%nation%}}!
 model.indianSettlement.mission.denounced=Ho misioner a oa e %settlement% a zo bet diskulhiet ha kaset d'ar marv!
 model.indianSettlement.mission.destroyed=Marvet eo ho misioner e %settlement% pa'z eo bet distrujet ar c'hampadur-se.
 model.player.alarmIncrease.tension.angry=Penn %nation% à %settlement% a ro da c'houzout emañ ar re galonek o c'hoant d'ober ar brezel ouzh an  %enemy% evit skarzhañ ho trevadennerien aloubus hag ho prezelourien lorc'hus warhon douaroù.
@@ -2203,8 +2176,7 @@ model.player.autoRecruit=An trubuilhoù relijiel en %europe% a laka %unit% da zi
 model.player.colonyGoodsParty.harbour=Ho trevadennerien a %colony% o deus bannet %amount% unanenn %goods% er porzh da reiñ mouezh a-enep an taosoù direizh savet gant ar Gurunenn !
 model.player.colonyGoodsParty.horses=Ho trevadennerien a %colony% o deus dieubet %amount% marc'h da reiñ mouezh a-enep an taosoù direizh savet gant ar Gurunenn !
 model.player.colonyGoodsParty.landLocked=Ho trevadennerien a %colony% o deus devet %amount% unvez %goods% war blasenn ar marc'had da reiñ mouezh a-enep an taosoù direizh savet gant ar Gurunenn!
-# Fuzzy
-model.player.dead.european=Ho Meurdez, %nation% o deus disklêriet bezañ aet maez aferioù an Douar Nevez krenn ha krak!
+model.player.dead.european=Ho Meurdez, {{tag:country|%nation%}} he deus disklêriet bezañ aet maez aferioù an Douar Nevez krenn ha krak!
 model.player.dead.native=Ho Meurdez, distrujet eo bet an %nation%.
 model.player.disaster.bankruptcy.start=N'ho peus paeet mann ebet evit derc'hel kempenn an holl savadurioù. Lakaet e viot da baeañ maluzoù produiñ bras.
 model.player.disaster.bankruptcy.stop=E-tail emaoc'h, ur wech ouzhpenn, da baeañ kempenn an holl savadurioù. Dilamet eo bet ar maluzoù produiñ.
@@ -2216,16 +2188,12 @@ model.player.ignoredTax=Lakaet eo bet ar feur tellañ da greskiñ a %amount%%, e
 model.player.interventionForceArrives=Ar Bagad emellout prometet zo oc'h erruout !
 model.player.soLDecrease=Koazhet eo ar feur emezelañ ouzh Mibien ar Frankiz betek %newSoL% % !
 model.player.soLIncrease=Kresket eo ar feur emezelañ ouzh Mibien ar Frankiz betek %newSoL% %!
-# Fuzzy
 model.player.stance.alliance.declared=Ho Meurdez, an %nation% a zo kevredet ganeomp!
 model.player.stance.alliance.others=Ho Meurdez, %attacker% a zo kevredet gant %defender%.
-# Fuzzy
-model.player.stance.ceaseFire.declared=Ho Meurdez, %nation% o deus skoulmet un arsav-tennañ ganeomp!
+model.player.stance.ceaseFire.declared=Ho Meurdez, %nation% he deus skoulmet un arsav-tennañ ganeomp!
 model.player.stance.ceaseFire.others=Ho Meurdez, %attacker% en deus skoulmet un arsav-tennañ gant %defender%.
-# Fuzzy
 model.player.stance.peace.declared=Ho Meurdez, an %nation% a zo e peoc'h ganeomp!
 model.player.stance.peace.others=Ho Meurdez, %attacker% a zo e peoc'h gant %defender%.
-# Fuzzy
 model.player.stance.war.declared=Keloù fall, Ho Meurdez, disklêriet eo bet ar brezel a-enep deomp gant %nation% !
 model.player.stance.war.others=Ho Meurdez, %attacker% o deus disklêriet ar brezel da %defender%.
 combat.automaticDefence=Tapet eo bet e armoù gant ho %unit% e %colony% evit he zifenn!
@@ -2297,8 +2265,7 @@ main.javaVersion=An doare %minVersion% eus Java pe un doare gwelloc'h egetañ zo
 main.memory=Rankout a reot deverkañ muioc'h %memory% okted memor d'ar JVM.\nAdloc'hit FreeCol gant java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=Ne c'hall ket Freecol kavout kavlec'hioù a zere evit saveteiñ roadennoù enno. Kenderc'hel, met bezit war soñj kaout trubuilhoù.
 client.baseData=Dibosupl eo kavout ar c'havlec'h roadennoù tarzh%dir%. Ar restroù roadennoù ne c'hallont ket bezañ kavet gant FreeCol. Bezit sur ez eus anezho. Ma klask FreeCol er c'havlec'h fall, lañsit ar jeu gant un arventenn el linenn urzhiañ : -freecol-data <kavlec'h-roadennoù>
-# Fuzzy
-client.choicePlayer=Dibabit ur c'hoarier mar plij :
+client.choicePlayer=Dibabit ur vroad mar plij :
 client.classic=C'hwitet eo bet pa'z eo bet karget kartennouriezh ar roadennoù adal ar rummad reolennoù "klasel".
 client.debugConnect=Ne c'hallit ket kevreañ ouzh ur bartiad zo anezhi er mod dizreinañ.
 client.ending=Echuet eo ar bartiad.
@@ -2310,8 +2277,7 @@ metaServer.couldNotConnect=Hon digarez, n'eus ket bet tu da gevreañ ouzh ar met
 metaServer.communicationError=Ur fazi zo bet e-ser mont e darempred gant ar meta-servijer. Klaskit en-dro diwezhatoc'h mar plij.
 abandonEducation.action.studying=o studiañ
 abandonEducation.action.teaching=O kelenn
-# Fuzzy
-abandonEducation.no=Nann, kenderc'hel ar stummadur
+abandonEducation.no=Stummadur dibaouez
 abandonEducation.text=Ma ya ho %unit% kuit eus %colony% e tilezo %action% er %building% ; ha c'hoant ho peus e lezfe anezhañ ennañ ?
 # Fuzzy
 abandonEducation.yes=Ya, kuitait an drevadenn
@@ -2327,18 +2293,14 @@ clearTradeRoute.text=Deverket eo ho %unit% d'an hent kenwerzh %route%. Arventenn
 client.fullScreen=Ne vez ket embreget ar mod skramm leun evit an drobarzell c'hrafik-mañ.\nDistriñ d'ar mod prenestret.
 # Fuzzy
 confirmHostile.alliance=N'oc'h ket evit tagañ ur vroad kevredet ! Ha fellout a ra deoc'h terriñ ho emglev gant %nation% ha disklêriañ ar brezel ?
-# Fuzzy
-confirmHostile.ceaseFire=Sinet hoc'h eus un harz-brezel gant ar %nation%. Ha sur oc'h e fell deoc'h tagañ anezho?
-# Fuzzy
-confirmHostile.peace=E peoc'h emaoc'h gant %nation%. Ha sur oc'h e fell deoc'h disklêriañ ar brezel?
+confirmHostile.ceaseFire=Sinet hoc'h eus un harz-brezel gant {{tag:country|%nation%}}. Ha sur oc'h e fell deoc'h tagañ anezho?
+confirmHostile.peace=E peoc'h emaoc'h gant {{tag:country|%nation%}}. Ha sur oc'h e fell deoc'h disklêriañ ar brezel?
 confirmHostile.yes=Ya,distagomp ar chas-brezel !
-# Fuzzy
-confirmTribute.broke=Hor spierien a ro dimp da c'houzout emañ kras an traoù gant ar %nation%. Arabat dimp koll hon amzer gant goulennoù truajoù.
+confirmTribute.broke=Hor spierien a ro dimp da c'houzout emañ kras an traoù gant {{tag:country|%nation%}}. Arabat dimp koll hon amzer gant goulennoù truajoù.
 confirmTribute.european=Ar %nation% %danger%, ha %finance%.\nPegement e rankomp goulenn groñs diganto ?
 confirmTribute.happy=Mignoned vat ganeomp eo an %nation% e %settlement%. Pec'hed e vefe ober gaou ouzh hon emglev.
 confirmTribute.no=Gwelloc'h e vefe marteze
-# Fuzzy
-confirmTribute.normal=Goulenn un truaj habaskaet
+confirmTribute.normal=Diaes eo bezañ sur eus an dra-se met %nation% e %settlement% a c'hall kaout un dra bennak a dalvoudegezh. Ha rankout a reomp goulenn un truaj diganto ?
 confirmTribute.unwise=Kreñv ha niverus eo an %nation% ; ne vefe ket fur, a-dra-sur, atahinañ anezho.
 confirmTribute.warLikely=Diwallit, ur goulenn truaj a c'hallfe digeriñ brezel en-dro gant an %nation%.
 confirmTribute.yes=Goulenn an truaj
@@ -2353,7 +2315,6 @@ indianLand.cancel=Kuitaat an douar
 indianLand.pay=Kinnig %amount% aour evit an douar
 indianLand.take=Kemer ar pezh zo deoc'h ent gwir
 indianLand.text=Perc'hennet eo an douar-mañ gant ar %player%. Ha fellout a ra deoc'h :
-# Fuzzy
 indianLand.unknown=Tud dianav zo o vevañ war an douaroù-mañ. C'hoant ho peus da :
 info.autodetectLanguageSelected=Dibabet hoc'h eus emdetektiñ ar yezh. Ret e vo deoc'h adlañsañ ar c'hoari evit lakaat ar cheñchamant da dalvezout.
 info.enterSomeText=Skrivit un tamm skrid.
@@ -2399,10 +2360,8 @@ defeated.text=Faezhet oc'h bet ! Ha fellout a ra deoc'h :
 defeated.yes=Chom da sellet
 defeatedSinglePlayer.text=Trec'het oc'h bet !\n\nSetu deuet amzer strobinellus an noz, pa zigor ar bezioù ha pa zic'hwezh an ifern e anal flaerius war ar bed. Adalek bremañ e c'hellimp evañ gwad ha derc'hel d'hol labour ken euzhus ma kreno ar bed ken nemet gant gwelet ac'hanomp !
 defeatedSinglePlayer.yes=Ober gant ar mod Dial
-# Fuzzy
-diplomacy.offerAccepted=Degemeret eo bet ho kinnig brokus gant an %nation%
-# Fuzzy
-diplomacy.offerRejected=Distaolet eo bet ho kinnig brokus gant an %nation%
+diplomacy.offerAccepted=Degemeret eo bet ho kinnig brokus gant an {{tag:country|%nation%}}.
+diplomacy.offerRejected=Distaolet eo bet ho kinnig brokus gant an {{tag:country|%nation%}}.
 disbandUnit.text=Ha sur oc'h e fell deoc'h divodañ an unanenn-mañ ?
 disbandUnit.yes=Divodañ
 disembark.text=Gourc'hemennoù martolod, ha dilestrañ a fell deoc'h da vat ?
@@ -2447,9 +2406,7 @@ move.noAccessGoods=Ne genwerzho ket %nation% gant un %unit% goullo.
 move.noAccessMissionBan=Nac'hañ a ran ar %nation% mont e darempred gant holl ho misionerien.
 move.noAccessSettlement=Ne aotre ket an %nation% e yafe hor %unit% en o zrevadenn.
 move.noAccessSkill=Ne c'hell ket hor %unit% deskiñ gant an henvroad.
-# Fuzzy
-move.noAccessTrade=N'emañ ket an aotrouniezh ganeomp evit kenwerzh gant Europiz all evel %nation%.
-# Fuzzy
+move.noAccessTrade=N'emañ ket an aotrouniezh ganeomp evit kenwerzh gant Europiz all evel {{tag:country|%nation%}}.
 move.noAccessWar=Ne c'hellomp ket kenwerzhañ gant %nation% p' emaomp o brezeliñ
 move.noAccessWater=Hor %unit% a rank mont war an douar a-raok mont e-barzh an trevadenn.
 move.noAttackWater=Ret eo da %unit% douarañ a-raok gallout tagañ.
@@ -2480,8 +2437,7 @@ tradeRoute.loadStopBlocked=%goods% dic'hortoz kavet e bourzh
 tradeRoute.loadStopExport=%amount% %goods% karget c'hoazh gant  %more% a chom er sanailh.
 tradeRoute.loadStopImport=%amount% %goods% karget, mankout a ra plas evit %more% ouzhpenn.
 tradeRoute.loadStopNoExport=N'eus ket a %goods% karget c'hoazh  %more% a chom er sanailh.
-# Fuzzy
-tradeRoute.loadStopNone=Tamm marc'hadourezh ebet karget en un sanailh goullo.
+tradeRoute.loadStopNone=Tamm %goods% ebet karget en un sanailh goullo.
 tradeRoute.pathStop=Ne c'haller ket kavout un hent war-zu %location%.
 tradeRoute.prefix=%route%, %unit%:%data%
 tradeRoute.skipped=Lammet
@@ -2516,8 +2472,7 @@ server.timeOut=Re bell eo padet ar c'hlask kevreañ ouzh ar servijer.
 server.userNameInUse=Implijet eo an anv implijer spisaet dija.
 server.userNameNotPresent=N'eo ket spisaet an anv implijer er c'hoari-mañ.
 server.wrongFreeColVersion=Stummoù pratik ha servijer Freecol ne glotont ket an eil gant egile.
-# Fuzzy
-buildColony.others=Ar "%nation% o deus diazezet trevadenn nevez %colony% e %region%.
+buildColony.others={{tag:country|%nation%}} he deus diazezet an drevadenn nevez eus %colony% e %region%.
 cashInTreasureTrain.colonial=Un teñzor a %amount% pezh aour a zo bet dilestret en Europa. %cashInAmount% pezh aour a zo bet enkefiet ganeoc'h.
 cashInTreasureTrain.independent=Un teñzor a %amount% a zo bet ouzhpennet d'o teñzor broadel.
 cashInTreasureTrain.otherColonial=Un  teñzor a %amount% zo bet lakaet en Europa.  Plijet eo, evit doare unpenn an %nation%.
@@ -2654,11 +2609,9 @@ report.colony.exploring.description=Interest he defe %colony% da ergerzhet {{plu
 report.colony.grow.description=Niver a unvezioù a c'hall an drevadenn diorren hep ober gaou ouzh he froduadur.
 report.colony.grow.header=+
 report.colony.growing.description=Ne c'hall ket %colony% kreskiñ a {{plural:%amount%|one=un unvez|other=%amount% unvez}} hep noazout ouzh he froadudur.
-# Fuzzy
-report.colony.improve.description=Unvezioù a c'hallfe gwellaat ar produadur e-keñver an unvez zo oc'h ober al labour
+report.colony.improve.description=Unvezioù a c'hallfe gwellaat ar produadur.
 report.colony.improve.header=Gwellaat
-# Fuzzy
-report.colony.improving.description=%colony% : Evit produiñ %amount% %goods% ouzhpenn, lakait %unit% e-lec'h %oldUnit%
+report.colony.improving.description=%colony% %location%: Evit produiñ %amount% %goods% ouzhpenn, lakait %unit% e-lec'h %oldUnit%
 report.colony.making.blocking.description=%colony%: nevez:%amount% %goods%  ret evit %buildable% {{plural:%turns%|one=er c'hentañ tro|other=e %turns% tro}}
 report.colony.making.constructing.description=%colony%: nevez: %buildable% echuet  {{plural:%turns%|one=er c'hentañ tro|other=e %turns% tro}}
 report.colony.making.description=Petra emañ an drevadenenn-mañ o fardañ
@@ -2668,8 +2621,7 @@ report.colony.making.noconstruction.description=%colony% :N'emeur o sevel mann e
 report.colony.making.noteach.description=%colony%: %teacher% n'en deus studier ebet
 report.colony.name.description=Roll an trevadennoù
 report.colony.name.header=Trevadenn
-# Fuzzy
-report.colony.production.description=%colony% : produadur rik a %goods% = %amount%
+report.colony.production.description=%colony% : %amount% %goods% zo bet produet
 # Fuzzy
 report.colony.production.export.description=%colony% : ar produadur rik a %goods% zo %amount% (ezporzhiet en tu all da %export%)
 report.colony.production.header=Produadur rik a %goods%
@@ -2744,10 +2696,10 @@ report.trade.totalUnits=Hollad an unvezioù
 report.trade.unitsSold=Unvezioù prenet pe gwerzhet
 report.turn.filter=Ober a-seurt ne vo ket diskouezet ken an doare kemennoù-se (%type%)
 report.turn.ignore=Ober van eus ar gemenadenn-se (Trevadenn : %colony%, Marc'hadourezh : %goods%)
-# Fuzzy
-report.turn.playerNation=%nation% ar %player%
+report.turn.playerNation={{tag:country|%nation%}}ar %player%
 aboutPanel.copyright=Copyright © 2002-2014 Skipailh FreeCol
 aboutPanel.legalDisclaimer=FreeCol a zo ur c'hoari digor an tarzh anezhañ : gallout a rit addasparzhañ ha/pe kemmañ anezhañ diwar termenoù diferadennoù ar GNU Aotre-implijout Foran Hollek, evel m'eo embannet gant ar Free Software Foundation en e stumm 2 pe en ur stumm nevesoc'h.
+aboutPanel.manual=Pellgargañ FreeCol dre zorn
 aboutPanel.officialSite=Lec'hienn ofisiel :
 aboutPanel.sfProject=Raktres SourceForge :
 aboutPanel.version=Stumm :
@@ -2770,7 +2722,6 @@ colonyPanel.buildQueue=Lostad sevel
 colonyPanel.colonyUnits=Unvevzioù an Drevadenn
 colonyPanel.inPort=Er porzh
 colonyPanel.outsideColony=E-maez an drevadenn
-# Fuzzy
 colonyPanel.producing=O produiñ :
 colonyPanel.reducePopulation=Ma tigreskit ar boblañs dindan %number%, ne vo ket gouest %colony% da sevel %buildable% ken.
 colonyPanel.setGoods=Hollad madoù
@@ -2786,9 +2737,7 @@ confirmDeclarationDialog.areYouSure.no=Diwezhatoc'hik marteze
 confirmDeclarationDialog.areYouSure.text=Hol leuskit da dreiñ kein da diranterezh direizh %monarch% ha da zisklêriañ hon dizalc'hiezh diouzh ar gurunenn!
 confirmDeclarationDialog.areYouSure.yes=Bezañ dieub pe mervel !
 confirmDeclarationDialog.createFlag=hag hon enebourien da grenañ gant ar spont pa welint hor banniel disuj.
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=Stadoù Unanet %nation%
-# Fuzzy
+confirmDeclarationDialog.defaultCountry=Stadoù-Unanet {{tag:country|%nation%}}
 confirmDeclarationDialog.defaultNation=%nation% dieub
 confirmDeclarationDialog.enterCountry=Adal bremañ e vo anavezet ho pro evel
 confirmDeclarationDialog.enterNation=ha kement keodedour hor broad klodus a dlefe bezañ lorc'h ennañ da vezañ anavezet evel
@@ -2839,12 +2788,10 @@ negotiationDialog.add=Ouzhpennañ
 negotiationDialog.cancel=Nullañ
 negotiationDialog.clear=Diverkañ
 negotiationDialog.contact.tutorial=Kejañ a rit ouzh Europiz all. Keveziñ a raint ganeoc'h da gaout douaroù ha pinvidigezhioù, ha brezeliñ ouzhoc'h marteze. Kerkent hag anvet Jan a Witt er C'hendalc'h Kevandirel e c'helloc'h ober kenwerzh ganto.
-# Fuzzy
-negotiationDialog.demand=%nation% a c'houlenn groñs digant %otherNation%
+negotiationDialog.demand={{tag:country|%nation%}} a c'houlenn groñs digant {{tag:country|%otherNation%}}
 negotiationDialog.exchange=en eskemm ouzh
 negotiationDialog.goldAvailable=(%amount% aour a c'haller kaout)
-# Fuzzy
-negotiationDialog.offer=%nation% a ginnig da %otherNation%
+negotiationDialog.offer={{tag:country|%nation%}} a ginnig da {{tag:country|%otherNation%}}
 negotiationDialog.send=Kas
 negotiationDialog.title.contact=Kejañ ouzh Europiz all
 negotiationDialog.title.diplomatic=Kevraouiñ diplomatel
@@ -2866,9 +2813,10 @@ findSettlementPanel.displayAll=Kavout ar c'hampadurioù
 findSettlementPanel.displayOnlyEuropean=Kavout ar c'hampadurioù europat hepken
 findSettlementPanel.displayOnlyNatives=Ganet er c'hampadurioù henvroat
 findSettlementPanel.name=Klask ur gêriadenn
-# Fuzzy
-firstContactDialog.meeting.natives=Kejañ ouzh ar pobloù henvroat. . .
+firstContactDialog.meeting.natives=Kejañ ouzh an henvroidi
 firstContactDialog.meeting.natives.tutorial=Kejañ a rit ouzh henvroidi. Kasit ho sklêrijennerien d'o c'hêriadennoù evit gouzout hiroc'h diwar o fenn,hag ho mevelien kevratet hag ho trevadennerien evit deskiñ traoù diganto. Kasit ho pigi hag ho Trenioù davet o c'hêriadennoù ma fell deoc'h ober kenwerzh ganto.
+firstContactDialog.meeting.aztec=Ar vroad Aztek
+firstContactDialog.meeting.inca=An Impalaeriezh inka. . .
 firstContactDialog.welcomeOffer.text=%nation% ho salud. Broad klodus kamp %camps% %settlementType% emomp-ni. Da lidañ hor mignoniezh e profomp deoc'h an douaroù emaoc'h warno. Hag asantiñ a rit d'hor feur-emglev ? Hag asantiñ a rit chom ganeomp da vevañ e peoc'h evel breudeur?
 firstContactDialog.welcomeSimple.text=%nation% ho salud. Broad klodus kamp %camps% %settlementType% omp-ni. Hag a santiñ a rit d'hor feur-emglev hag asantiñ a rit chom ganeomp da vevañ e peoc'h evel breudeur?
 abandonColony.no=Nullañ
@@ -2911,6 +2859,7 @@ freecol.map.Australia=Aostralia
 freecol.map.Caribbean_basin=Diazad ar C'harib
 mapSizeDialog.mapSize=Diuzañ ment ar gartenn
 modifierFormat.unknown=???
+modifierFormat.scopeMethod.isIndian.name=henvroidi
 monarchDialog.default=Ur gemennadenn a-berzh ar Gurunenn
 newPanel.editDifficulty=Kemmañ an diaester
 newPanel.getServerList=Tapout roll ar servijer
diff --git a/data/strings/FreeColMessages_de.properties b/data/strings/FreeColMessages_de.properties
index 4e1510a3a..bf6d8c7f8 100644
--- a/data/strings/FreeColMessages_de.properties
+++ b/data/strings/FreeColMessages_de.properties
@@ -126,7 +126,9 @@ cargoOnCarrier=Ladung in Schiff
 cashInTreasureTrain=Schatz nach Europa transportieren
 clearOrders=Befehle löschen
 colonists=Kolonisten
+colonyCenter=Koloniezentrum
 colopedia=Colopädie
+countryName={{tag:country|%nation%}}
 difficulty=Schwierigkeitsgrad
 docks=Docks
 dumpCargo=Ladung über Bord
@@ -201,6 +203,7 @@ cli.error.home.notDir=%string% ist kein Verzeichnis.
 cli.error.home.notExists=Das Verzeichnis %string% existiert nicht.
 cli.error.save=Das gespeicherte Spiel %string% konnte nicht gelesen werden.
 cli.error.serverPort=%string% ist keine gültige Portnummer.
+cli.error.splash=Datei %name% nicht gefunden.
 cli.error.timeout=%string% ist zu kurz (weniger als %minimum%)
 cli.advantages=Den Typ der VORTEILE festlegen (%advantages%)
 cli.check-savegame.failure=Die Konsistenzprüfung des gespeicherten Spielstandes ist fehlgeschlagen. Die Einzelheiten können im Logbuch eingesehen werden.
@@ -229,6 +232,7 @@ cli.no-intro=Intro-Video überspringen
 cli.no-java-check=überspringe die Java-Version-Überprüfung
 cli.no-memory-check=überspringe die Arbeitsspeicher-Überprüfung
 cli.no-sound=startet FreeCol ohne Tonwiedergabe
+cli.no-splash=Den Splash-Bildschirm überspringen
 cli.private=starte einen privaten Server (nicht öffentlich über den Metaserver)
 cli.seed=bitte eine INITIALZAHL für den Pseudozufallszahlengenerator angeben
 cli.server-name=einen benutzerdefinierten NAMEn für den Server angeben
@@ -482,6 +486,10 @@ model.option.interventionForce.name=Eingreiftruppe
 model.option.interventionForce.shortDescription=Die zur Unterstützung deines Unabhängigkeitskriegs entsandte Eingreiftruppe.
 model.option.mercenaryForce.name=Söldnertruppe
 model.option.mercenaryForce.shortDescription=Die Söldnertruppe hat angeboten, Ihren Unabhängigkeitskrieg zu unterstützen.
+model.option.warSupportForce.name=Kriegsunterstützungstruppe
+model.option.warSupportForce.shortDescription=Die maximale Truppe wurde vom Monarchen angeboten, um Eure Kriege zu unterstützen.
+model.option.warSupportGold.name=Gold zur Kriegsunterstützung
+model.option.warSupportGold.shortDescription=Die maximale Goldmenge, die vom Monarchen angeboten wurde, um Eure Kriege zu unterstützen.
 model.difficulty.government.name=Regierung
 model.option.badGovernmentLimit.name=Limit für ineffiziente Regierung
 model.option.badGovernmentLimit.shortDescription=Die maximale Anzahl der Royalisten welche keine Produktionsstrafe verursachen.
@@ -1545,8 +1553,7 @@ model.improvement.road.description=Straße
 model.improvement.road.name=Straße
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limit Küstenkolonien
-# Fuzzy
-model.limit.independence.coastalColonies.description=Für eine Unabhängigkeitserklärung brauchst du mindestens %limit% Küstenkolonien.
+model.limit.independence.coastalColonies.description=Für eine Unabhängigkeitserklärung brauchst du mindestens {{plural:%limit%|one=eine Küstenkolonie|other=%limit% Küstenkolonien}}.
 model.limit.independence.rebels.name=Rebellenlimit
 model.limit.independence.rebels.description=Zumindest %limit%% der Kolonisten müssen die Unabhängigkeit unterstützen.
 model.limit.independence.year.name=Jahresbegrenzung
@@ -1894,8 +1901,7 @@ model.colony.badGovernment=Die Regierung in %colony% ist ineffizient. Bei der Pr
 model.colony.goodGovernment=Die Effizienz der Regierung hat sich verbessert! Die Stimmung der Rebellen in %colony% entspricht jetzt %number% Prozent oder liegt darüber.
 model.colony.governmentImproved1=Die Regierung in %colony% hat sich verbessert, ist aber weiterhin ineffizient. Bei der Produktivität ergeben sich weiterhin Abzüge.
 model.colony.governmentImproved2=Die Regierung in %colony% hat sich verbessert. Bei der Produktivität ergeben sich keine Abzüge mehr.
-# Fuzzy
-model.colony.insufficientProduction=%outputAmount% %outputType% mehr könnten in %colony% produziert werden, wenn wir %inputAmount% mehr %inputType% hätten.
+model.colony.insufficientProduction=%outputAmount% %outputType% mehr könnten in %colony% produziert werden, falls zusätzlich %consumptionDeficit% verfügbar wären.
 model.colony.lostGoodGovernment=Die Effizienz der Regierung ist zurückgegangen! Die Stimmung der Rebellen in %colony% entspricht nicht länger %number% Prozent oder liegt darunter. Die Kolonie erzielt keine Produktionsboni mehr.
 model.colony.lostVeryGoodGovernment=Die Effizienz der Regierung ist zurückgegangen! Die Stimmung der Rebellen in %colony% entspricht nicht länger %number% Prozent oder liegt darunter. Einige Produktionsboni sind verloren gegangen.
 model.colony.minimumColonySize=%object% verhindert, dass die Bevölkerungszahl weiter verringert werden kann.
@@ -1909,18 +1915,13 @@ model.colony.veryBadGovernment=Die Regierung in %colony% ist sehr ineffizient. B
 model.colony.veryGoodGovernment=Die Effizienz der Regierung hat sich verbessert! Die Stimmung der Rebellen in %colony% entspricht jetzt %number% Prozent oder liegt darüber.
 model.colonyTile.claim=(beanspruche %direction%)
 model.diplomaticTrade.receive.contact=Brüderliche Grüße von den glorreichen %nation%.
-# Fuzzy
-model.diplomaticTrade.receive.diplomatic=Lasst uns mit den %nation% verhandeln.
+model.diplomaticTrade.receive.diplomatic=Lasst uns mit den {{tag:country|%nation%}} verhandeln.
 model.diplomaticTrade.receive.trade=Lasst uns das Handelsangebot der %nation% prüfen.
-# Fuzzy
-model.diplomaticTrade.receive.tribute=Die %nation% fordern Tribut von uns!
+model.diplomaticTrade.receive.tribute=Die {{tag:country|%nation%}} fordern Tribut von uns!
 model.diplomaticTrade.send.contact=Wir sind Mitgliedern der %nation% begegnet.
-# Fuzzy
-model.diplomaticTrade.send.diplomatic=Lasst uns unsere diplomatische Situation mit den %nation% prüfen.
-# Fuzzy
-model.diplomaticTrade.send.trade=Lasst uns einen Handel mit den %nation% bei %settlement% vorschlagen.
-# Fuzzy
-model.diplomaticTrade.send.tribute=Wir fordern Tribut von den %nation% bei %settlement%.
+model.diplomaticTrade.send.diplomatic=Lasst uns unsere diplomatische Situation mit den {{tag:country|%nation%}} prüfen.
+model.diplomaticTrade.send.trade=Lasst uns einen Handel mit den {{tag:country|%nation%}} bei %settlement% vorschlagen.
+model.diplomaticTrade.send.tribute=Wir fordern Tribut von den {{tag:country|%nation%}} bei %settlement%.
 model.direction.N.name=nördlich
 model.direction.NE.name=nordöstlich
 model.direction.E.name=östlich
@@ -1930,38 +1931,25 @@ model.direction.SW.name=südwestlich
 model.direction.W.name=westlich
 model.direction.NW.name=nordwestlich
 model.historyEventType.abandonColony.description=Ihr gebt die Kolonie %colony% auf.
-# Fuzzy
-model.historyEventType.ceaseFire.description=Feuer mit %nation% einstellen.
-# Fuzzy
-model.historyEventType.cityOfGold.description=Die %nation% haben %city% entdeckt - eine der sieben goldenen Städte - und Schätze im Wert von %treasure% erbeutet.
-# Fuzzy
-model.historyEventType.colonyConquered.description=Eure Kolonie %colony% wird durch die %nation% eingenommen.
-# Fuzzy
-model.historyEventType.colonyDestroyed.description=Eure Kolonie %colony% wird durch die %nation% niedergebrannt.
+model.historyEventType.ceaseFire.description=Feuer mit {{tag:country|%nation%}} einstellen.
+model.historyEventType.cityOfGold.description=Die {{tag:country|%nation%}} haben %city% entdeckt – eine der sieben goldenen Städte – und Schätze im Wert von %treasure% erbeutet.
+model.historyEventType.colonyConquered.description=Eure Kolonie %colony% wird durch die {{tag:country|%nation%}} eingenommen.
+model.historyEventType.colonyDestroyed.description=Eure Kolonie %colony% wird durch die {{tag:country|%nation%}} niedergebrannt.
 model.historyEventType.conquerColony.description=Du eroberst die %nation% Kolonie von %colony%.
 model.historyEventType.declareIndependence.description=Du erklärst die Unabhängigkeit von der Krone.
-# Fuzzy
-model.historyEventType.declareWar.description=Krieg erklärt mit %nation%.
-# Fuzzy
-model.historyEventType.destroyNation.description=Die %nation% löschen die %nativeNation% aus.
-# Fuzzy
+model.historyEventType.declareWar.description=Krieg erklärt mit {{tag:country|%nation%}}.
+model.historyEventType.destroyNation.description=Die {{tag:country|%nation%}} löschen die %nativeNation% aus.
 model.historyEventType.destroySettlement.description=Du zerstörst die %nation% Siedlung %settlement%.
 model.historyEventType.discoverNewWorld.description=Ihr entdeckt die Neue Welt.
-# Fuzzy
-model.historyEventType.discoverRegion.description=Die %nation% entdecken %region%.
-# Fuzzy
-model.historyEventType.formAlliance.description=Bündnis mit %nation% ausgehandelt.
+model.historyEventType.discoverRegion.description=Die {{tag:country|%nation%}} entdecken %region%.
+model.historyEventType.formAlliance.description=Bündnis mit {{tag:country|%nation%}} ausgehandelt.
 model.historyEventType.foundColony.description=Ihr gründet die Kolonie %colony%.
 model.historyEventType.foundingFather.description=%father% tritt dem Kontinentalkongress bei.
 model.historyEventType.independence.description=Ihr erlangt Eure Unabhängigkeit von der Krone.
-# Fuzzy
-model.historyEventType.makePeace.description=Frieden mit %nation% vereinbart.
-# Fuzzy
+model.historyEventType.makePeace.description=Frieden mit {{tag:country|%nation%}} vereinbart.
 model.historyEventType.meetNation.description=Ihr trefft die %nation%.
-# Fuzzy
 model.historyEventType.nationDestroyed.description=Die %nation% ist nicht länger in der Neuen Welt anwesend.
-# Fuzzy
-model.historyEventType.spanishSuccession.description=Die %loserNation% übergeben alle ihre Kolonien in der neuen Welt an die %nation%.
+model.historyEventType.spanishSuccession.description=Die {{tag:country|%loserNation%}} übergeben alle ihre Kolonien in der neuen Welt an die {{tag:country|%nation%}}.
 model.indianSettlement.mostHatedNone=nichts
 model.indianSettlement.mostHatedUnknown=Unbekannt
 model.indianSettlement.nameUnknown=Unbekannt
@@ -2014,13 +2002,10 @@ model.messageType.warehouseCapacity.name=Lagerkapazität
 model.messageType.warning.name=Warnungen
 model.monarch.action.addToRef.text=Die Krone hat dem königlichen Expeditionskorps %number% {{plural:%number%|%unit%}} hinzugefügt. Die Anführer der Kolonien äußern sich besorgt.
 model.monarch.action.addToRef.no=Fertig
-# Fuzzy
-model.monarch.action.declarePeace.text=Wir haben gnädigerweise einem Friedensvertrag mit %nation% zugestimmt.
+model.monarch.action.declarePeace.text=Wir haben gnädigerweise einem Friedensvertrag mit {{tag:country|%nation%}} zugestimmt.
 model.monarch.action.declarePeace.no=Vereinbart
-# Fuzzy
-model.monarch.action.declareWar.text=Die Anmaßungen der %nation% zwingen Uns dazu, ihnen den Krieg zu erklären!
-# Fuzzy
-model.monarch.action.declareWarSupported.text=Die Anmaßungen der %nation% zwingen Uns, den Krieg gegen sie zu erklären! Zur Beschleunigung dieser Sache warten unsere loyalen Truppen (%force%) auf deine Befehle und weitere Summen an %gold% wurden deinem Schatz hinzugefügt.
+model.monarch.action.declareWar.text=Die Anmaßungen der {{tag:country|%nation%}} zwingen Uns dazu, ihnen den Krieg zu erklären!
+model.monarch.action.declareWarSupported.text=Die Anmaßungen der {{tag:country|%nation%}} zwingen Uns, den Krieg gegen sie zu erklären! Zur Beschleunigung dieser Sache warten unsere loyalen Truppen (%force%) auf deine Befehle und weitere Summen an %gold% wurden deinem Schatz hinzugefügt.
 model.monarch.action.declareWar.no=Fertig
 model.monarch.action.displeasure.text=Du wagst es, Unsere großzügigen Bedingungen zu akzeptieren und weichst sogar einer Bezahlung aus? Solche Doppelzüngigkeit soll den bitteren Lohn Unseres Unmutes ernten.
 model.monarch.action.displeasure.no=Fertig
@@ -2079,8 +2064,7 @@ model.player.colonialIndependence=Nur Spieler mit einer Kolonie können eine Una
 model.player.forces=%nation% Streitkräfte
 model.player.independentMarket=Europa
 model.player.startGame=Nach Monaten auf See habt Ihr schließlich die Küste eines unbekannten Kontinents erreicht. Segelt weiter {{tag:%direction%|west=westwärts|east=ostwärts|default=mit dem Wind}}, um die Neue Welt zu entdecken und sie für die Krone in Anspruch zu nehmen.
-# Fuzzy
-model.player.waitingFor=Warten auf: %nation%
+model.player.waitingFor=Warten auf: {{tag:country|%nation%}}
 model.regionType.coast.name=Küste
 model.regionType.coast.unknown=Unbekannte Küstenregion
 model.regionType.desert.name=Wüste
@@ -2120,8 +2104,7 @@ model.tradeItem.gold.name=Gold
 model.tradeItem.gold.description=die Summe von %amount% Gold
 model.tradeItem.goods.name=Waren
 model.tradeItem.incite.name=Krieg erklären gegen
-# Fuzzy
-model.tradeItem.incite.description=Krieg gegen die %nation%
+model.tradeItem.incite.description=Krieg gegen die {{tag:country|%nation%}}
 model.tradeItem.stance.name=Haltung
 model.tradeItem.unit.name=Einheit
 model.tradeRoute.allEmpty=Alle Haltestationen sind leer.
@@ -2145,8 +2128,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.alreadyPresent.description=Wir sind an diesem Standort bereits vertreten.
@@ -2173,6 +2155,7 @@ model.colony.colonyStarved=Der letzte Kolonist in %colony% ist verhungert, so da
 model.colony.customs.sale=Das Zollamt in %colony% verkaufte: %data%.
 model.colony.customs.saleData=%amount% %goods% für %gold%
 model.colony.famineFeared=In %colony% wird eine Hungersnot befürchtet. Die Nahrung wird nur noch für %number% Runden reichen.
+model.colony.starving=Die %colony% verhungert.
 model.colony.newColonist=Bevölkerungszuwachs in %colony%.
 model.colony.newConvert=Eine neuer Konvertit aus einer Siedlung der %nation% ist in %colony% eingetroffen.
 model.colony.notBuildingAnything=In %colony% wird nichts gebaut.
@@ -2186,8 +2169,7 @@ model.colony.warehouseSoonFull=Unser Lagerhaus in %colony% wird seine Kapazität
 model.colony.warehouseWaste=Unser Lagerhaus in %colony% hat seine Kapazität für %goods% überschritten. %waste% Einheiten wurden verschwendet.
 model.colony.workersEvicted=Deine Kolonisten können wegen der Anwesenheit von %enemyUnit% nicht länger %location% bei %colony% arbeiten.
 model.colonyTile.resourceExhausted=Die Ressource %resource% in %colony% ist erschöpft!
-# Fuzzy
-model.game.spanishSuccession=Eure Exzellenz, der spanische Erbfolgekrieg in Europa ist beendet. Im Vertrag von Utrecht wurden die %loserNation% dazu gezwungen alle Kolonien in der Neuen Welt den %nation% zu überlassen!
+model.game.spanishSuccession=Eure Exzellenz, der spanische Erbfolgekrieg in Europa ist beendet. Im Vertrag von Utrecht wurden die {{tag:country|%loserNation%}} dazu gezwungen alle Kolonien in der Neuen Welt den {{tag:country|%nation%}} zu überlassen!
 model.indianSettlement.mission.denounced=Euer Missionar in %settlement% wurde denunziert und hingerichtet!
 model.indianSettlement.mission.destroyed=Dein Missionar in %settlement% ist in der Zerstörung der Siedlung gestorben.
 model.player.alarmIncrease.tension.angry=Das %nation%-Oberhaupt in %settlement% warnt, dass die Tapferen offen nach einem Krieg mit den %enemy% rufen, um uns Eurer übergriffigen Siedler und Eurer hochmütigen Krieger auf unserem Lande zu entledigen.
@@ -2196,8 +2178,7 @@ model.player.autoRecruit=Religiöse Unruhen in %europe% veranlassen %unit% zur A
 model.player.colonyGoodsParty.harbour=Unsere Kolonisten in %colony% haben %amount% %goods% in den Hafen geworfen, um gegen diese unfaire Besteuerung durch die Krone zu protestieren!
 model.player.colonyGoodsParty.horses=Die Bevölkerung in %colony% hat %amount% Pferde freigelassen um gegen die unfaire Besteuerung durch die Krone zu protestieren!
 model.player.colonyGoodsParty.landLocked=Unsere Kolonisten in %colony% haben %amount% %goods% auf dem Marktplatz verbrannt, um gegen diese unfaire Besteuerung durch die Krone zu protestieren!
-# Fuzzy
-model.player.dead.european=Eure Exzellenz, die %nation% haben einen vollständigen Rückzug aus der Neuen Welt verkündet!
+model.player.dead.european=Eure Exzellenz, die {{tag:country|%nation%}} haben einen vollständigen Rückzug aus der Neuen Welt verkündet!
 model.player.dead.native=Eure Exzellenz, die %nation% wurden vernichtet.
 model.player.disaster.bankruptcy.start=Du hast nicht für die Instandhaltung aller Gebäude gezahlt. Schwere Produktionsstrafen wurden verhängt.
 model.player.disaster.bankruptcy.stop=Du bist wieder in der Lage für die Instandhaltung aller Gebäude zu zahlen. Die Produktionsstrafen wurden aufgehoben.
@@ -2210,16 +2191,12 @@ model.player.ignoredTax=Die Krone hat den Steuersatz wie zuvor angekündigt auf
 model.player.interventionForceArrives=Die versprochenen Eingreiftruppe trifft ein!
 model.player.soLDecrease=Die Mitgliederzahl der Söhne der Freiheit in unseren Kolonien ist auf %newSoL% Prozent gesunken!
 model.player.soLIncrease=Die Mitgliederzahl der Söhne der Freiheit in unseren Kolonien ist auf %newSoL% Prozent gestiegen!
-# Fuzzy
 model.player.stance.alliance.declared=Eure Exzellenz, die %nation% haben ein Bündnis mit uns!
 model.player.stance.alliance.others=Eure Exzellenz, die %attacker% sind in Allianz mit den %defender%.
-# Fuzzy
 model.player.stance.ceaseFire.declared=Eure Exzellenz, die %nation% haben einem Waffenstillstand mit uns zugestimmt.
 model.player.stance.ceaseFire.others=Eure Exzellenz, die %attacker% haben einem Waffenstillstand mit %defender% zugestimmt.
-# Fuzzy
 model.player.stance.peace.declared=Eure Exzellenz, die %nation% haben Frieden mit uns!
 model.player.stance.peace.others=Eure Exzellenz, die %attacker% haben Frieden mit den %defender%.
-# Fuzzy
 model.player.stance.war.declared=Schlechte Neuigkeiten, Eure Exzellenz, das Volk der %nation% hat uns den Krieg erklärt!
 model.player.stance.war.others=Eure Exzellenz, die %attacker% haben den %defender% den Krieg erklärt.
 combat.automaticDefence=Ein %unit% in %colony% hat sich bewaffnet um die Kolonie zu verteidigen!
@@ -2235,8 +2212,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% ist einem Angriff durch %unit%
 combat.enemyShipSunk=%unit% versenkt %enemyNation% %enemyUnit%!
 combat.equipmentCaptured=Vorsicht, die Krieger der %nation% sind in den Besitz von %equipment% gelangt!
 combat.goodsStolen=%enemyNation% %enemyUnit% stehlen %amount% %goods% aus %colony%.
-# Fuzzy
-combat.indianPlunder=%enemyNation% %enemyUnit% plünderten %amount% in %colony%.
+combat.indianPlunder=%enemyNation% %enemyUnit% plünderten %amount% Gold in %colony%.
 combat.indianRaid=Unsere Spione melden, dass die %nation% die %colony% der %colonyNation% überfallen haben.
 combat.indianSurprise=Die %nation% hat %colony% überraschend überfallen und so unsere Kolonisten alarmiert. Der Häuptling der %nation% leugnet jegliche Beteiligung.
 combat.indianTreasure=Sie haben %amount% von %settlement% geplündert.
@@ -2291,8 +2267,7 @@ main.javaVersion=Zur korrekten Ausführung von FreeCol wird die Java-Version %mi
 main.memory=Es muss für JVM ein Speicher von mehr als %memory% Byte zugewiesen werden.\nFreeCol neu starten mit „java -Xmx%minMemory%M -jar FreeCol.jar“
 main.userDir.fail=FreeCol konnte keine passenden Verzeichnisse zum Speichern der Benutzerdaten finden. Fahre fort, aber es werden Probleme erwartet.
 client.baseData=Das Basisdatenverzeichnis %dir% konnte nicht gefunden werden.\nDie Datendateien konnten von FreeCol nicht gefunden werden.\nStelle sicher, dass sie vorhanden sind.\nFalls FreeCol im falschen Verzeichnis sucht,\nführe das Spiel mit einem Kommandozeilenparameter aus:\n--freecol-data <Datenverzeichnis>
-# Fuzzy
-client.choicePlayer=Bitte Spieler wählen:
+client.choicePlayer=Bitte eine Nation auswählen:
 client.classic=Fehler beim Laden der Quellkarte von Regelsatz „classic“.
 client.debugConnect=Du kannst dich nicht mit einem vorhandenen Spiel im Fehlerbehebungsmodus verbinden.
 client.ending=Das Spiel endet.
@@ -2304,11 +2279,9 @@ metaServer.couldNotConnect=Verbindung mit Meta-Server nicht möglich. Bitte vers
 metaServer.communicationError=Fehler bei der Kommunikation mit dem Meta-Server. Bitte versuchen Sie es später noch einmal.
 abandonEducation.action.studying=das Studium
 abandonEducation.action.teaching=die Ausbildung
-# Fuzzy
-abandonEducation.no=Nein, die Ausbildung fortsetzen
+abandonEducation.no=Ausbildung fortsetzen
 abandonEducation.text=Sofern deine %unit% die Kolonie %colony% verlässt, wird sie %action% in der %building% aufgeben. Bist du sicher, dass sie aufbrechen soll?
-# Fuzzy
-abandonEducation.yes=Ja, die Kolonie verlassen
+abandonEducation.yes=Ausbildung abbrechen
 abandonTeaching.text=Falls deine %unit% das %building% verlässt, wird die Ausbildung abgebrochen. Bist du sicher, dass das Gebäude verlassen werden soll?
 armedUnitSettlement.attack=Angriff
 armedUnitSettlement.tribute=Einen Tribut fordern
@@ -2319,15 +2292,11 @@ buy.takeOffer=Angebot annehmen
 buy.text=Die %nation% würden ihre %goods% gerne für %gold% verkaufen:
 clearTradeRoute.text=%unit% ist der Handelsroute %route% zugewiesen. Wenn der Zielort verändert wird, wird die Zuweisung entfernt. Bist du sicher, dass du das tun willst?
 client.fullScreen=Der Vollbildmodus wird für dieses Grafikgerät nicht unterstützt.\nZurück zum Fenstermodus.
-# Fuzzy
-confirmHostile.alliance=Ihr könnt keine verbündete Nation angreifen! Möchtet Ihr wirklich die Allianz mit %nation% brechen und Ihnen den Krieg erklären?
-# Fuzzy
-confirmHostile.ceaseFire=Ihr habt einen Waffenstillstand mit den %nation% unterzeichnet. Möchtet Ihr wirklich angreifen?
-# Fuzzy
-confirmHostile.peace=Sie sind im Frieden mit %nation%. Möchtet Ihr wirklich den Krieg erklären?
+confirmHostile.alliance=Ihr könnt keine verbündete Nation angreifen! Möchtet Ihr wirklich die Allianz mit {{tag:country|%nation%}} brechen und Ihnen den Krieg erklären?
+confirmHostile.ceaseFire=Ihr habt einen Waffenstillstand mit den {{tag:country|%nation%}} unterzeichnet. Möchtet Ihr wirklich angreifen?
+confirmHostile.peace=Sie sind im Frieden mit {{tag:country|%nation%}}. Möchtet Ihr wirklich den Krieg erklären?
 confirmHostile.yes=Ja, lasst die Kriegshunde los!
-# Fuzzy
-confirmTribute.broke=Unsere Spione melden, dass die %nation% völlig pleite sind. Lasst uns nicht unsere Zeit mit Tributforderungen verschwenden.
+confirmTribute.broke=Unsere Spione melden, dass die {{tag:country|%nation%}} völlig pleite sind. Lasst uns nicht unsere Zeit mit Tributforderungen verschwenden.
 confirmTribute.european=Die %nation% %danger% und %finance%. Wie viel Tribut sollten wir von ihnen fordern?
 confirmTribute.happy=Die %nation% bei %settlement% sind für uns gute Freunde. Es ist schade, unsere Kameradschaft zu beschädigen.
 confirmTribute.no=Vielleicht sollten wir besser keinen fordern
@@ -2346,8 +2315,7 @@ indianLand.cancel=Das Land verlassen
 indianLand.pay=%amount% Gold für das Land anbieten
 indianLand.take=Nehmen, was uns rechtmäßig zusteht
 indianLand.text=Dieses Land gehört den %player%. Möchtet Ihr:
-# Fuzzy
-indianLand.unknown=Einige unbekannte Menschen leben in diesen Ländern. Möchtest du:
+indianLand.unknown=Einige unkontaktierte Menschen leben in diesen Ländern. Möchtest du:
 info.autodetectLanguageSelected=Sie haben die automatische Spracherkennung gewählt. Bitte starten Sie das Spiel neu, damit diese durchgeführt werden kann.
 info.enterSomeText=Bitte einen Text eingeben.
 info.newLanguageSelected=Ändert die Sprache auf %language%. Sie müssen das Spiel neu starten, damit die Änderungen wirksam werden.
@@ -2392,10 +2360,8 @@ defeated.text=Ihr wurdet besiegt! Möchtet Ihr:
 defeated.yes=Bleiben und zusehen
 defeatedSinglePlayer.text=Ihr wurdet besiegt!\n\nNun ist die wahre Geisterstunde, in der Friedhöfe gähnen und die Hölle Verderben in diese Welt bringt. Nun tränk’ ich wohl heiß’ Blut, und täte manch’ Ding, dass beim bloßen Anblick der Tag schon schaudern würd’.
 defeatedSinglePlayer.yes=Revanche-Modus starten
-# Fuzzy
-diplomacy.offerAccepted=Die %nation% haben Euer großzügiges Angebot angenommen.
-# Fuzzy
-diplomacy.offerRejected=Die %nation% haben Euer großzügiges Angebot abgelehnt.
+diplomacy.offerAccepted=Die {{tag:country|%nation%}} haben Euer großzügiges Angebot angenommen.
+diplomacy.offerRejected=Die {{tag:country|%nation%}} haben Euer großzügiges Angebot abgelehnt.
 disbandUnit.text=Seid Ihr sicher, dass Ihr diese Einheit auflösen wollt?
 disbandUnit.yes=Auflösen
 disembark.text=Welche Truppen sollen hier an Land gehen, Eure Exzellenz?
@@ -2440,9 +2406,7 @@ move.noAccessGoods=%nation% wird nicht mit einer unbeladenen %unit% handeln.
 move.noAccessMissionBan=Die %nation% lehnen jeglichen Kontakt mit unseren Missionaren ab.
 move.noAccessSettlement=Die %nation% verweigern unserem %unit% den Zutritt zu ihrer Siedlung.
 move.noAccessSkill=Unsere %unit% Einheit kann nichts von den Ureinwohnern lernen.
-# Fuzzy
-move.noAccessTrade=Wir sind nicht berechtigt mit anderen europäischen Nationen - wie die %nation% - Handel zu treiben.
-# Fuzzy
+move.noAccessTrade=Wir sind nicht berechtigt mit anderen europäischen Nationen – wie die {{tag:country|%nation%}} – Handel zu treiben.
 move.noAccessWar=Wir können mit den %nation% nicht handeln solange wir im Krieg sind.
 move.noAccessWater=Unser %unit% muss zuerst an Land gehen bevor er die Siedlung betreten kann.
 move.noAttackWater=Unsere %unit% muss vor dem Angriff an Land gehen.
@@ -2508,8 +2472,7 @@ server.timeOut=Zeitüberschreitung beim Versuch mit dem Server zu verbinden.
 server.userNameInUse=Der angegebene Spielername wird bereits verwendet.
 server.userNameNotPresent=Der angegebene Benutzername ist nicht in diesem Spiel.
 server.wrongFreeColVersion=Die Versionen des Spiels auf dem Client sowie dem Server stimmen nicht überein.
-# Fuzzy
-buildColony.others=Die %nation% haben die neue Kolonie %colony% in %region% gegründet.
+buildColony.others=Die {{tag:country|%nation%}} haben die neue Kolonie %colony% in %region% gegründet.
 cashInTreasureTrain.colonial=Ein Schatz mit %amount% Gold ist in Europa angekommen. Unsere Schatzkammer ist um %cashInAmount% Gold reicher!
 cashInTreasureTrain.independent=Ein Schatz im Wert von %amount% wurde unserem Nationalschatz hinzugefügt.
 cashInTreasureTrain.otherColonial=Ein Schatz von %amount% wurde in Europa entladen. Der Monarch von %nation% ist in der Tat erfreut.
@@ -2518,7 +2481,6 @@ declareIndependence.announce=Die %oldNation% Kolonien haben ihre Unabhängigkeit
 declareIndependence.continentalArmyMuster=Um euch bei eurem Kampf für die Unabhängigkeit zu unterstützen {{plural:%number%|one=wurde|other=wurden}} %number% {{plural:%number%|%oldUnit%}} in %colony% zu {{plural:%number%|%unit%}} befördert!
 declareIndependence.interventionForce={{tag:country|%nation%}} verspricht feierlich ein Eingreiftruppe zur Unterstützung eures legitimen Kampfes für die Unabhängigkeit zu entsenden, sofern ihr %number% {{plural:%number%|one=Freiheitsglocke|other=Freiheitsglocken}} produziert, um eure Entschlossenheit zu beweisen.
 declareIndependence.nativeSupport=Die %nation% erklären ihre Verachtung für %ruler% und das königliche Expeditionskorps und versprechen, sie bei jeder Gelegenheit anzugreifen.
-# Fuzzy
 declareIndependence.nativeHostile=Unsere Spione berichten, dass das königliche Expeditionskorps Freundschaftsbeziehungen mit den %nation% gegründet haben. Achtung, sie könnten einen Angriff planen!
 declareIndependence.resolution=An diesem Tag hat der Kongress die wichtigste Resolution verabschiedet, die jemals in Amerika vorgenommen wurde.\n\nIch bin mir der Mühe und dem Blut und den Reichtümern sehr wohl bewusst, die es uns kosten wird, diese Erklärung zu behaupten, unsere Staaten zu unterstützen und zu verteidigen. Dennoch kann ich jenseits der Finsternis Strahlen von Licht und Ruhm sehen. Ich kann sehen, dass das Ende die Mittel mehr als aufwiegt. Und dass die Nachwelt in jenen Tagen siegen wird, selbst wenn wir es bedauern sollten, was wir bei Gott nicht werden.\n\nDas Königliche Expeditionskorps wird bald eintreffen. Bereitet unsere Verteidigung sorgfältig vor, während wir Freiwillige für eine neue Kontinentalarmee ausheben.
 declareIndependence.unitsSeized=Als Reaktion auf die Unabhängigkeitserklärung hat der König die folgenden Truppen in Europa und auf See beschlagnahmt: %units%
@@ -2617,8 +2579,7 @@ colopedia.unit.offensivePower=Angriffsstärke:
 colopedia.unit.price=Preis in Europa:
 colopedia.unit.productionBonus=Produktions{{plural:%number%|one=änderungsfaktor|other=änderungsfaktoren}}
 colopedia.unit.requirements=Vorraussetzungen:
-# Fuzzy
-colopedia.unit.school=Zur Ausbildung benötigtes Gebäude:
+colopedia.unit.school=Darf ausbilden in:
 colopedia.unit.skill=Fertigkeit:
 report.labour.allColonists=Alle Kolonisten
 report.labour.amateursWorking=Amateure
@@ -2643,41 +2604,60 @@ report.labour.unitTotal.tooltip=%unit% oder erlernte %unit%
 report.labour.workingAs=Arbeiten als
 report.labour.workingAsOther=andere
 report.colony.arriving.description=%colony%: neue %unit% {{plural:%turns%|one=in der nächsten Runde|other=in %turns% Runden}}
+report.colony.arriving.summary.description=Die durchschnittliche Anzahl der Runden, bevor ein neuer Kolonist in den Kolonien dieses Kontinents ankommt
 report.colony.birth.description=Anzahl der Runden bis ein neuer Kolonist kommt oder verhungert
 report.colony.explore.description=Anzahl der an diese Kolonie angrenzenden Felder, die erforscht werden sollen
 report.colony.explore.header=E
 report.colony.exploring.description=%colony% würde von der Erforschung von {{plural:%amount%|one=einem Feld|other=%amount% Feldern}} profitieren
+report.colony.exploring.summary.description=Gesamtanzahl der Koloniefelder, die vom Entdecken für diesen Kontinent profitieren würden.
 report.colony.grow.description=Anzahl der Einheiten, die die Kolonie wachsen kann, ohne dass die Produktion beeinträchtigt wird
 report.colony.grow.header=+
 report.colony.growing.description=%colony% kann um {{plural:%amount%|one=eine Einheit|other=%amount% Einheiten}} wachsen, ohne dass die Produktion beeinträchtigt wird
+report.colony.growing.summary.description=Die Gesamtanzahl der Kolonisten, die Kolonien dieses Kontinents ohne schadender Produktion beitreten können
 report.colony.improve.description=Einheiten welche die Produktion verbessern könnten.
 report.colony.improve.header=Verbessert
-# Fuzzy
-report.colony.improving.description=%colony%: Um %amount% %goods% zusätzlich herstellen zu können: %oldUnit% durch %unit% austauschen
+report.colony.improving.description=%colony% %location%: Um %amount% %goods% zusätzlich herstellen zu können: %oldUnit% durch %unit% austauschen
+report.colony.improving.summary.description=Einheiten (Typ und Anzahl), die von Kolonien dieses Kontinents profitieren würden
 report.colony.making.blocking.description=%colony%: %amount% %goods% werden {{plural:%turns%|one=in der nächsten Runde|other=in %turns% Runden}} für %buildable% benötigt.
 report.colony.making.constructing.description=%colony%: %buildable% wird {{plural:%turns%|one=in der nächsten Runde|other=in %turns% Runden}} fertiggestellt
 report.colony.making.description=Was diese Kolonie macht
 report.colony.making.educating.description=%colony%: %teacher% schließt Ausbildung {{plural:%turns%|one=in der nächsten Runde|other=in %turns% Runden}} ab
+report.colony.making.educationVacancy.description=%colony%: {{plural:%number%|one=Ein Schülerort ist|other=%number% Schülerorte sind}} vakant
+report.colony.making.educating.summary.description=Einheiten (Typ und Anzahl), die voraussichtlich von Schulen dieses Kontinents aufsteigen
 report.colony.making.header=Erzeugt
 report.colony.making.noconstruction.description=%colony% : Es finden keine Bauarbeiten statt
 report.colony.making.noteach.description=%colony%: %teacher% ohne Student
+report.colony.making.summary.description=Der Verlust von %goods% pro Runde während der unbefriedigenden Bauanforderungen dieses Kontinents
 report.colony.name.description=Die Liste der Kolonien
 report.colony.name.header=Kolonie
-# Fuzzy
-report.colony.production.description=%colony%: %goods% Produktion (netto) = %amount%
-# Fuzzy
-report.colony.production.export.description=%colony%: %goods% Produktion (netto) beträgt %amount% (exportiere ab über %export%)
+report.colony.name.summary.description=Die Region enthält weitere der obigen Kolonien dieses Kontinents
+report.colony.production.description=%colony%: %amount% %goods% werden produziert
+report.colony.production.export.description=%colony%: %amount% %goods% werden produziert (exportiert über %export%)
 report.colony.production.header=%goods% Produktion (netto)
-# Fuzzy
-report.colony.production.high.description=%colony%: %goods% Produktion (netto) = %amount%, voll bis {{plural:%turns%|one = nächste Runde|other = in %turns% Runden}}
-# Fuzzy
-report.colony.production.low.description=%colony%: %goods% Produktion (netto) = %amount%, leer bis {{plural:%turns%|one = nächste Runde|other = in %turns% Runden}}
-# Fuzzy
-report.colony.production.waste.description=%colony%: %goods% Produktion (netto) = %amount%. Das Warenlager wird überquellen, %waste% wird verschwendet
+report.colony.production.high.description=%colony%: %amount% %goods% werden produziert, voll bis {{plural:%turns%|one=nächster Runde|other=in %turns% Runden}}
+report.colony.production.low.description=%colony%: %amount% %goods% werden konsumiert, leer bis {{plural:%turns%|one=nächster Runde|other=in %turns% Runden}}
+report.colony.production.maxConsumption.description=%colony%: %amount% %goods% werden konsumiert (könnte weitere %more% konsumieren)
+report.colony.production.maxProduction.description=%colony%: %amount% %goods% werden produziert (könnte weitere %more% produzieren)
+report.colony.production.summary.description=Die Menge an Gütern, die produziert oder konsumiert wird.
+report.colony.production.waste.description=%colony%: %amount% %goods% werden produziert, Lagerhaus quillt über, %waste% wird verschwendet
+report.colony.tile.clearForest.description=%colony% würde vom Roden von {{plural:%amount%|one=einem Feld|other=%amount% Feldern}} profitieren
+report.colony.tile.clearForest.specific.description=%colony% würde vom Roden von %location% profitieren
+report.colony.tile.clearForest.header=C
+report.colony.tile.clearForest.header.description=Anzahl der Koloniefelder, die vom Roden profitieren würden.
+report.colony.tile.clearForest.summary.description=Gesamtanzahl der Koloniefelder, die vom Roden für diesen Kontinent profitieren würden.
+report.colony.tile.plow.description=%colony% würde vom Pflügen von {{plural:%amount%|one=einem Feld|other=%amount% Feldern}} profitieren
+report.colony.tile.plow.specific.description=%colony% würde vom Pflügen von %location% profitieren
+report.colony.tile.plow.header=P
+report.colony.tile.plow.header.description=Anzahl der Koloniefelder, die vom Pflügen profitieren würden.
+report.colony.tile.plow.summary.description=Gesamtanzahl der Koloniefelder, die vom Pflügen für diesen Kontinent profitieren würden.
+report.colony.tile.road.description=%colony% würde vom Bau von {{plural:%amount%|one=einer Straße|other=%amount% Straßen}} profitieren
+report.colony.tile.road.specific.description=%colony% würde vom Bau einer Straße bei %location% profitieren
+report.colony.tile.road.header=R
+report.colony.tile.road.header.description=Anzahl der Koloniefelder, die vom Straßenbau profitieren würden.
+report.colony.tile.road.summary.description=Gesamtanzahl der Koloniefelder, die vom Straßenbau für diesen Kontinent profitieren würden.
 report.colony.shrinking.description=%colony% muss um {{plural:%amount%|one=eine Einheit|other=%amount% Einheiten}} schrumpfen, um die Produktion zu verbessern
 report.colony.starving.description=%colony%: Hungersnot {{plural:%turns%|one=in der nächsten Runde|other=in %turns% Runden}}
-# Fuzzy
-report.colony.wanting.description=%colony%: Um %amount% %goods% zusätzlich herstellen zu können: %unit% hinzufügen
+report.colony.wanting.description=%colony% %location%: Um %amount% %goods% zusätzlich herstellen zu können: %unit% hinzufügen
 report.continentalCongress.available=Verfügbar
 report.continentalCongress.elected=Gewählt wurde: %turn%
 report.continentalCongress.none=(keine)
@@ -2722,28 +2702,30 @@ report.production.selectGoods=Güter auswählen
 report.production.update=Aktualisieren
 report.requirements.badAssignment=%colony% hat einen %expert%, der derzeit als %expertWork% arbeitet, während ein %nonExpert% als %nonExpertWork% tätig ist. Die Produktion würde größer sein, sofern beide Kolonisten ihre Arbeitsplätze tauschten.
 report.requirements.canTrainExperts={{plural:2|%unit%}} können ausgebildet werden, und zwar als
-# Fuzzy
-report.requirements.exploreTile=%type% in %direction% %colony% würden von einer Erforschung profitieren.
+report.requirements.exploreTile=%location% würden von einer Erforschung profitieren.
 report.requirements.met=Alle Bedingungen sind erfüllt.
 report.requirements.missingGoods=%colony% produziert %goods% benötigt dafür aber mehr %input%.
 report.requirements.misusedExperts=Es sind {{plural:2|%unit%}} vorhanden, die nicht als %work% arbeiten:
 report.requirements.noExpert=%colony% produziert %goods%, hat aber keinen %unit%.
+report.requirements.tile.clearForest=%location% würde vom Roden profitieren.
+report.requirements.tile.plow=%location% würde vom Pflügen profitieren.
+report.requirements.tile.road=%location% würde vom Straßenbau profitieren.
 report.requirements.severalExperts=Mehrere {{plural:2|%unit%}} befinden sich in
 report.requirements.surplus=Ein Überangebot an %goods% wird produziert, und zwar in
 report.trade.afterTaxes=Einkommen nach Steuern
 report.trade.beforeTaxes=Einkommen vor Steuern
 report.trade.cargoUnits=Transportierte Einheiten
-# Fuzzy
-report.trade.hasCustomHouse=* Diese Kolonie hat ein Zollhaus; diese Waren werden exportiert.
+report.trade.export=Exportiere %goods% über %amount%
+report.trade.hasCustomHouse=* Diese Kolonie hat ein Zollhaus und darf Waren exportieren.
 report.trade.totalDelta=Gesamt Produktion
 report.trade.totalUnits=Gesamt Einheiten
 report.trade.unitsSold=Gekaufte oder verkaufte Einheiten
 report.turn.filter=Diese Art von Meldung nicht anzeigen (%type%)
 report.turn.ignore=Ignoriere diese Meldung (Kolonie: %colony%, Waren: %goods%)
-# Fuzzy
-report.turn.playerNation=%player%s %nation%
+report.turn.playerNation=%player%s {{tag:country|%nation%}}
 aboutPanel.copyright=Copyright © 2002–2015  Das FreeCol-Team
 aboutPanel.legalDisclaimer=FreeCol ist Freie Software: Sie dürfen es weiter verteilen und/oder verändern unter Berücksichtigung der Regeln zur GNU General Public License wie veröffentlicht durch die Free Software Foundation, entweder Version 2 der Lizenz, oder jede höhere Version.
+aboutPanel.manual=Manueller FreeCol-Download
 aboutPanel.officialSite=Offizielle Seite:
 aboutPanel.sfProject=SourceForge-Projekt:
 aboutPanel.version=Version:
@@ -2766,7 +2748,6 @@ colonyPanel.buildQueue=Bauwarteschlange
 colonyPanel.colonyUnits=Kolonieeinheiten
 colonyPanel.inPort=Im Hafen
 colonyPanel.outsideColony=Außerhalb der Kolonie
-# Fuzzy
 colonyPanel.producing=Herstellung:
 colonyPanel.reducePopulation=Wenn Ihr die Einwohnerzahl unter %number% vermindert wird %colony% nicht mehr in der Lage sein %buildable% zu bauen.
 colonyPanel.setGoods=Waren festlegen
@@ -2782,10 +2763,8 @@ confirmDeclarationDialog.areYouSure.no=Vielleicht später
 confirmDeclarationDialog.areYouSure.text=Lasst uns der ungerechten Tyrannei des Monarchen von %monarch% entsagen und die Unabhängigkeit unserer Kolonien von der Krone erklären!
 confirmDeclarationDialog.areYouSure.yes=Freiheit oder Tod!
 confirmDeclarationDialog.createFlag=und unsere Feinde werden beim Anblick unserer aufsässigen Fahne zittern.
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=Vereinigte Staaten von %nation%
-# Fuzzy
-confirmDeclarationDialog.defaultNation=Freie %nation%
+confirmDeclarationDialog.defaultCountry=Vereinigte Staaten von {{tag:country|%nation%}}
+confirmDeclarationDialog.defaultNation=Freie {{tag:country|%nation%}}
 confirmDeclarationDialog.enterCountry=Von diesem Tag an soll unser Land bekannt sein als
 confirmDeclarationDialog.enterNation=und jeder Bürger unserer glorreichen Nation möge stolz sein, bekannt zu sein als
 flag.background.FESSES=Balken
@@ -2836,12 +2815,10 @@ negotiationDialog.add=Hinzufügen
 negotiationDialog.cancel=Abbrechen
 negotiationDialog.clear=Löschen
 negotiationDialog.contact.tutorial=Du triffst Europäische Kameraden. Sie werden mit dir um Land und Reichtümer wetteifern und es wohl wagen, Krieg gegen dich zu führen. Aber nachdem Jan de Witt dem Kontinentalkongress beigetreten ist, kannst du mit ihnen handeln.
-# Fuzzy
-negotiationDialog.demand=Die %nation% fordern von den %otherNation%
+negotiationDialog.demand=Die {{tag:country|%nation%}} fordern von den {{tag:country|%otherNation%}}
 negotiationDialog.exchange=im Gegenzug für
 negotiationDialog.goldAvailable=(%amount% Gold verfügbar)
-# Fuzzy
-negotiationDialog.offer=Die %nation% bieten den %otherNation%
+negotiationDialog.offer=Die {{tag:country|%nation%}} bieten den {{tag:country|%otherNation%}}
 negotiationDialog.send=Abschicken
 negotiationDialog.title.contact=Europäische Kameraden treffen
 negotiationDialog.title.diplomatic=Diplomatische Verhandlung
@@ -2864,9 +2841,10 @@ findSettlementPanel.displayOnlyEuropean=Nur Europäische Siedlungen finden
 findSettlementPanel.displayOnlyNatives=Nur Eingeborenensiedlungen finden
 findSettlementPanel.name=Siedlung finden
 findSettlementPanel.settlement=%name%%capital% (%nation%)
-# Fuzzy
-firstContactDialog.meeting.natives=Treffen mit den Ureinwohnern...
+firstContactDialog.meeting.natives=Treffen mit den Ureinwohnern
 firstContactDialog.meeting.natives.tutorial=Du triffst Ureinwohner. Sende deine Späher zu ihren Siedlungen, um mehr über sie zu erfahren und deine Schuldknechte und freien Kolonisten, um mehr von ihnen zu lernen. Sende deine Schiffe und Wagenzüge zu ihren Siedlungen, wenn du vorhast, mit ihnen zu handeln.
+firstContactDialog.meeting.aztec=Die Azteken
+firstContactDialog.meeting.inca=Das Inkareich
 firstContactDialog.welcomeOffer.text=Die %nation% grüßen Euch. Wir sind eine glorreiche Nation die %camps% %settlementType% umfasst. Um unsere Freundschaft zu feiern bieten wir Euch das Land welches Ihr derzeit besetzt als Geschenk an. Werdet Ihr diesen Vertrag akzeptieren und mit uns in Frieden als Brüder leben?
 firstContactDialog.welcomeSimple.text=Die %nation% grüßen Euch. Wir sind eine glorreiche Nation die %camps% %settlementType% umfasst. Werdet Ihr unseren Vertrag akzeptieren und mit uns in Frieden als Brüder leben?
 abandonColony.no=Abbrechen
@@ -2909,6 +2887,7 @@ freecol.map.Australia=Australien
 freecol.map.Caribbean_basin=Karibischer Becken
 mapSizeDialog.mapSize=Kartengröße wählen
 modifierFormat.unknown=???
+modifierFormat.scopeMethod.isIndian.name=Eingeborene
 monarchDialog.default=Eine Nachricht von der Krone
 newPanel.editDifficulty=Schwierigkeit bearbeiten
 newPanel.getServerList=Serverliste abrufen
diff --git a/data/strings/FreeColMessages_el.properties b/data/strings/FreeColMessages_el.properties
index 4b703e4a8..0bcb733be 100644
--- a/data/strings/FreeColMessages_el.properties
+++ b/data/strings/FreeColMessages_el.properties
@@ -900,8 +900,7 @@ model.historyEventType.discoverRegion.description=Ανακαλύπτεις το
 model.historyEventType.foundColony.description=Κατοχυρώνεις την αποικία του %colony%.
 model.historyEventType.foundingFather.description=Ο %father% λαμβάνει μέρος στο Ηπειρωτικό Κογκρέσο.
 model.historyEventType.independence.description=Επιτυγχάνεις ανεξαρτησία από το Στέμμα.
-# Fuzzy
-model.historyEventType.meetNation.description=Συναντάς το %nation%.
+model.historyEventType.meetNation.description=Συναντάς το έθνος %nation%.
 # Fuzzy
 model.historyEventType.nationDestroyed.description=Το %nation% καταστρέφεται.
 model.indianSettlement.mostHatedNone=Κανένα
@@ -1063,8 +1062,7 @@ cashInTreasureTrain.free=Ο βασιλιάς σου θα μεταφέρει το
 cashInTreasureTrain.pay=Ο βασιλιάς θα μεταφέρει το θησαυρό σου αν πάρει το 50% της αξίας του.
 defeated.text=Ηττηθήκατε! Τί θέλετε τώρα;
 defeated.yes=Ας μείνω να παρακολουθήσω
-# Fuzzy
-diplomacy.offerAccepted=Οι %nation% αποδέχθηκαν τη γενναιόδωρη προσφορά σας.
+diplomacy.offerAccepted=Οι {{tag:country|%nation%}} αποδέχθηκαν τη γενναιόδωρη προσφορά σας.
 # Fuzzy
 diplomacy.offerRejected=Οι %nation% αρνήθηκαν τη γενναιόδωρη προσφορά σας.
 disbandUnit.text=Σίγουρα θέλετε να διαλύσετε αυτή τη μονάδα;
@@ -1217,10 +1215,8 @@ colonyPanel.notBestTile=%unit% θα μπορούσε να παράγει περ
 confirmDeclarationDialog.areYouSure.no=Ίσως Αργότερα
 confirmDeclarationDialog.areYouSure.text=Ας αποκηρύξουμε την άδικη τυραννία του %monarch% και ας διακηρύξουμε την \nανεξαρτησία των αποικιών μας από το στέμμα!
 confirmDeclarationDialog.areYouSure.yes=Ελευθερία ή Θάνατος!
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=Ηνωμένες Πολιτείες %nation%
-# Fuzzy
-confirmDeclarationDialog.defaultNation=Ελεύθερο %nation%
+confirmDeclarationDialog.defaultCountry=Ηνωμένες Πολιτείες {{tag:country|%nation%}}
+confirmDeclarationDialog.defaultNation=Ελεύθεροι {{tag:country|%nation%}}
 confirmDeclarationDialog.enterCountry=Εφεξής, η χώρα μας θα είναι γνωστή ως
 confirmDeclarationDialog.enterNation=και κάθε πολίτης του ένδοξου έθνους μας θα είναι υπερήφανοι που θα αποκαλούνται
 constructionPanel.clickToBuild=Πατήστε στη μεριά κτιρίων για να επιλέξτε ένα κτίριο ή μια μονάδα για να χτίσετε.
diff --git a/data/strings/FreeColMessages_es_ES.properties b/data/strings/FreeColMessages_es_ES.properties
index d5d831080..733c6c365 100644
--- a/data/strings/FreeColMessages_es_ES.properties
+++ b/data/strings/FreeColMessages_es_ES.properties
@@ -125,6 +125,7 @@ cashInTreasureTrain=Dinero en carruaje de tesoro
 clearOrders=Eliminar órdenes
 colonists=Colonos
 colopedia=Colopedia
+countryName={{tag:country|%nation%}}
 difficulty=Dificultad
 docks=Muelles
 dumpCargo=Verter cargamento
@@ -1869,8 +1870,7 @@ model.diplomaticTrade.receive.tribute=¡Los %nation% están exigiendo tributo de
 model.diplomaticTrade.send.contact=Nos hemos encontrado con los miembros de la nación %nation%
 # Fuzzy
 model.diplomaticTrade.send.diplomatic=Consideremos nuestra situación diplomática con el  %nation%.
-# Fuzzy
-model.diplomaticTrade.send.trade=Vamos a proponer un negocio con el %nation% en %settlement%.
+model.diplomaticTrade.send.trade=Vamos a proponer un negocio con {{tag:country|%nation%}} en %settlement%.
 # Fuzzy
 model.diplomaticTrade.send.tribute=Exigimos tributo de %nation% en %settlement%.
 model.direction.N.name=norte
@@ -1897,8 +1897,7 @@ model.historyEventType.declareWar.description=Guerra declarada con %nation%.
 # Fuzzy
 model.historyEventType.destroyNation.description=Los  %nation%  destruyen a  los %nativeNation% .
 model.historyEventType.discoverNewWorld.description=Descubres el Nuevo Mundo.
-# Fuzzy
-model.historyEventType.discoverRegion.description=La %nation% descubre %region%.
+model.historyEventType.discoverRegion.description={{tag:country|%nation%}} descubre %region%.
 # Fuzzy
 model.historyEventType.formAlliance.description=Alianza negociada con %nation%.
 model.historyEventType.foundColony.description=Establece la colonia de %colony%.
@@ -1906,12 +1905,10 @@ model.historyEventType.foundingFather.description=%father% se une al Congreso Co
 model.historyEventType.independence.description=Consigue la independencia de la Corona.
 # Fuzzy
 model.historyEventType.makePeace.description=Acuerdo de paz con %nation%.
-# Fuzzy
-model.historyEventType.meetNation.description=Encuentra la %nation%.
+model.historyEventType.meetNation.description=Encuentras a la nación %nation%.
 # Fuzzy
 model.historyEventType.nationDestroyed.description=La %nation% no está más presente en el nuevo mundo.
-# Fuzzy
-model.historyEventType.spanishSuccession.description=La %loserNation% cede todas sus colonias en el Nuevo Mundo a la %nation%.
+model.historyEventType.spanishSuccession.description={{tag:country|%loserNation%}} cede todas sus colonias en el Nuevo Mundo a {{tag:country|%nation%}}.
 model.indianSettlement.mostHatedNone=Ninguno
 model.indianSettlement.mostHatedUnknown=Desconocido
 model.indianSettlement.nameUnknown=Desconocido
@@ -2028,8 +2025,7 @@ model.player.colonialIndependence=Solamente los jugadores coloniales pueden decl
 model.player.forces=Ejército %nation%
 model.player.independentMarket=Europa
 model.player.startGame=Después de meses en el mar, ha llegado finalmente a la costa de un continente desconocido. Navegue {{tag:%direction%|west=hacia el oeste|east=hacia el este|default=de cara al viento}} para descubrir el Nuevo Mundo y reclámelo para la Corona.
-# Fuzzy
-model.player.waitingFor=Esperando a: %nation%
+model.player.waitingFor=Esperando a: {{tag:country|%nation%}}
 model.regionType.coast.name=Costa
 model.regionType.coast.unknown=Región Costera Desconocida
 model.regionType.desert.name=Desierto
@@ -2093,8 +2089,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.alreadyPresent.description=Ya presente en este lugar.
@@ -2144,8 +2139,7 @@ model.player.autoRecruit=Disturbios religiosos en  %europe%  provocan que  %unit
 model.player.colonyGoodsParty.harbour=¡Sus colonos de %colony% han arrojado %amount% unidades de %goods% al mar en protesta por este impuesto injusto de la Corona!
 model.player.colonyGoodsParty.horses=¡Sus colonos de %colony% han liberado %amount% caballos en protesta por este impuesto injusto de la Corona!
 model.player.colonyGoodsParty.landLocked=¡Sus colonos de %colony% han quemado la cantidad de %amount% de %goods% en el mercado en protesta de este impuesto injusto de la Corona!
-# Fuzzy
-model.player.dead.european=Su excelencia, la %nation% ha declarado una retirada incondicional de los asuntos del Nuevo Mundo!
+model.player.dead.european=Su excelencia, ¡{{tag:country|%nation%}} ha declarado una retirada incondicional de los asuntos del Nuevo Mundo!
 model.player.dead.native=Su Excelencia, la %nation% ha sido destruída.
 model.player.disaster.bankruptcy.start=No has podido pagar el mantenimiento de todos los edificios. Se aplicarán sanciones de producción severas.
 model.player.disaster.bankruptcy.stop=Nuevamente, eres capaz de pagar por el mantenimiento de todos los edificios. Se han levantado las sanciones de la producción.
@@ -2238,8 +2232,7 @@ main.javaVersion=La versión de Java %minVersion% o mejor es recomendada para po
 main.memory=Necesitas asignar más de %memory% bytes de memoria para JVM.\n  Reinicia FreeCol con:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol no puede encontrar directorios adecuados para guardar los datos de usuario. Procediendo, pero se esperan problemas.
 client.baseData=No se encontró el directorio de la base de datos %dir%.\n  No se encontraron los archivos de datos de FreeCol.\n  Por favor, asegúrate de que existen.\n  Si FreeCol está buscando en el directorio equivocado,\n  ejecuta el juego con el parámentro de línea de comando:\n  --freecol-data <data-directory>
-# Fuzzy
-client.choicePlayer=Elija un jugador:
+client.choicePlayer=Elige una nación:
 client.classic=Error al cargar la asignación de recursos del conjunto de reglas 'clásico'.
 client.ending=La partida está terminándose.
 client.headlessDebug=El modo sin cabeza requiere una ejecución en depuración.
@@ -2253,8 +2246,7 @@ abandonEducation.action.teaching=enseñando
 # Fuzzy
 abandonEducation.no=No, continuar la educación
 abandonEducation.text=Si tu %unit% abandona %colony% abandonará %action% en el %building%, ¿estás seguro que desea abandonar?
-# Fuzzy
-abandonEducation.yes=Sí, salir de la colonia
+abandonEducation.yes=Abandonar la educación
 abandonTeaching.text=Si tu %unit% deja el %building%, dejará de enseñanzar, ¿estás seguro que debe irse?
 armedUnitSettlement.attack=Atacar
 armedUnitSettlement.tribute=Exigir tributo
@@ -2615,6 +2607,9 @@ report.colony.production.high.description=%colony%: produción neta de %goods% =
 report.colony.production.low.description=%colony%: produción neta de %goods% = %amount%; desaparecerá {{plural:%turns%|one=en el siguiente turno|other=en %turns% turnos}}
 # Fuzzy
 report.colony.production.waste.description=%colony%: produción neta de %goods% = %amount%; el almacén se desbordará, se perderán %waste%
+report.colony.tile.clearForest.header=C
+report.colony.tile.plow.header=P
+report.colony.tile.road.header=R
 report.colony.shrinking.description=%colony% debe disminuir {{plural:%amount%|one=en una unidad|other=en %amount% unidades}} para mejorar la producción
 report.colony.starving.description=%colony%: hambre {{plural:%turns%|one=en el siguiente turno|other=en %turns% turnos}}
 # Fuzzy
@@ -2684,6 +2679,7 @@ report.turn.ignore=Ignorar este mensaje (Colonia: %colony%, Bienes: %goods%)
 report.turn.playerNation=%nation% de %player%
 aboutPanel.copyright=Derechos de autor © 2002-2015 del equipo de FreeCol
 aboutPanel.legalDisclaimer=Freecol es software libre: Puede redistribuirlo y/o modificarlo bajo los términos de LPG Licencia Pública General tal y como se ha publicado por la Fundación del Software Libre, bien por la versión 2 de la Licencia, o cualquier versión posterior.
+aboutPanel.manual=Descarga del manual de FreeCol
 aboutPanel.officialSite=Sitio oficial:
 aboutPanel.sfProject=Proyecto SourceForge:
 aboutPanel.version=Versión:
@@ -2706,8 +2702,7 @@ colonyPanel.buildQueue=Edificios en espera
 colonyPanel.colonyUnits=Unidades de la colonia
 colonyPanel.inPort=En el puerto
 colonyPanel.outsideColony=Fuera de la colonia
-# Fuzzy
-colonyPanel.producing=Produciendo:
+colonyPanel.producing=produciendo:
 colonyPanel.reducePopulation=Si reduces la población debajo de %number%, %colony% no será más capaz de contruir %buildable%.
 colonyPanel.unitChange=En %colony%, un %oldType% se ha convertido en un %newType%.
 colonyPanel.warehouse=Almacén
@@ -2720,10 +2715,8 @@ confirmDeclarationDialog.areYouSure.no=Quizá más tarde
 confirmDeclarationDialog.areYouSure.text=Renunciemos a la injusta tiranía de %monarch% y declaremos la independencia de nuestras colonias de la corona!
 confirmDeclarationDialog.areYouSure.yes=¡Libertad o Muerte!
 confirmDeclarationDialog.createFlag=y nuestros enemigos temblarán a la vista de nuestro estandarte desafiante.
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=Estados Unidos de %nation%
-# Fuzzy
-confirmDeclarationDialog.defaultNation=%nation% libre
+confirmDeclarationDialog.defaultCountry=Estados Unidos de {{tag:country|%nation%}}
+confirmDeclarationDialog.defaultNation=Liberar a {{tag:country|%nation%}}
 confirmDeclarationDialog.enterCountry=De ahora en adelante, nuestro país deberá ser conocido como
 confirmDeclarationDialog.enterNation=y todo ciudadano de nuestra gloriosa nación deberá estar orgulloso de ser conocido como
 flag.background.PALES=Límites
@@ -2773,8 +2766,7 @@ negotiationDialog.add=Añadir
 negotiationDialog.cancel=Cancelar
 negotiationDialog.clear=Vaciar
 negotiationDialog.contact.tutorial=Encuentra colegas Europeos.Competirá con usted por tierras y riquezas, y pueden posiblemente declararle la guerra. Pero después de que Jan de Witt se haya unido al Congreso Continental, puede comerciar con ellos.
-# Fuzzy
-negotiationDialog.demand=Los %nation% exigen de los %otherNation%
+negotiationDialog.demand={{tag:country|%nation%}} exigen de {{tag:country|%otherNation%}}
 negotiationDialog.exchange=a cambio de
 # Fuzzy
 negotiationDialog.offer=Los %nation% ofrecen los %otherNation%
@@ -2800,9 +2792,10 @@ findSettlementPanel.displayOnlyEuropean=Encontrar solo asentamientos europeos
 findSettlementPanel.displayOnlyNatives=Encontrar solo asentamientos nativos
 findSettlementPanel.name=Encontrar asentamiento
 findSettlementPanel.settlement=%name%%capital% (%nation%)
-# Fuzzy
-firstContactDialog.meeting.natives=Conociendo a los nativos...
+firstContactDialog.meeting.natives=Conociendo a los nativos
 firstContactDialog.meeting.natives.tutorial=Conocerás a los nativos. Envía a tus exploradores a sus asentamientos para aprender más sobre ellos y a tus sirvientes contratados y colonos libres con el fin de aprender de ellos. Envía tus barcos y trenes de carro a sus asentamientos si deseas comerciar con ellos.
+firstContactDialog.meeting.aztec=La nación Azteca
+firstContactDialog.meeting.inca=El imperio Inca
 firstContactDialog.welcomeOffer.text=La %nation% te da la bienvenida.Somos una gloriosa nación de %camps% %settlementType%. Para celebrar nuestra amistad, Nosotros generosamente te ofrecemos la tierra que ahora ocupas como un regalo. Aceptarás nuestro tratado y estarás en paz con nosotros como hermanos?
 firstContactDialog.welcomeSimple.text=La %nation% te da la bienvenida. Somos una gloriosa nación de %camps% %settlementType%. Aceptarás nuestro tratado y vivirás con nosotros en paz como hermanos?
 abandonColony.no=Cancelar
@@ -2845,6 +2838,7 @@ freecol.map.Australia=Australia
 freecol.map.Caribbean_basin=Cuenca del Caribe
 mapSizeDialog.mapSize=Seleccionar tamaño de mapa
 modifierFormat.unknown=???
+modifierFormat.scopeMethod.isIndian.name=nativos
 monarchDialog.default=Un mensaje de la Corona
 newPanel.editDifficulty=Editar la dificultad
 newPanel.getServerList=Obtener lista de servidores
diff --git a/data/strings/FreeColMessages_it_IT.properties b/data/strings/FreeColMessages_it_IT.properties
index 41bf11022..d20ac080b 100644
--- a/data/strings/FreeColMessages_it_IT.properties
+++ b/data/strings/FreeColMessages_it_IT.properties
@@ -5,6 +5,7 @@
 # Author: Beta16
 # Author: BrokenArrow
 # Author: David Güdel
+# Author: F. Cosoleto
 # Author: Federico Mugnaini
 # Author: Fringio
 # Author: Gianfranco
@@ -1669,7 +1670,6 @@ model.historyEventType.discoverRegion.description=%nation% ha scoperto %region%.
 model.historyEventType.foundColony.description=Hai fondato la colonia di %colony%.
 model.historyEventType.foundingFather.description=%father% si è unito al Congresso Continentale.
 model.historyEventType.independence.description=Hai ottenuto l'indipendenza dalla Corona.
-# Fuzzy
 model.historyEventType.meetNation.description=Hai incontrato il popolo %nation%.
 # Fuzzy
 model.historyEventType.nationDestroyed.description=Il contingente %nation% non è più presente nel Nuovo Mondo.
@@ -1847,8 +1847,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.alreadyPresent.description=Già presente in questa posizione.
@@ -2324,6 +2323,7 @@ report.colony.production.high.description=%colony%: produzione netta di %goods%
 report.colony.production.low.description=%colony%: produzione netta di %goods% = %amount%, terminati {{plural:%turns%|one=il prossimo turno|other=fra %turns% turni}}
 # Fuzzy
 report.colony.production.waste.description=%colony%: produzione netta di %goods% = %amount%, il deposito sarà pieno, %waste% verranno sprecati.
+report.colony.tile.plow.header=P
 report.colony.shrinking.description=%colony% deve diminuire di {{plural:%amount%|one=una unità|other=%amount% unità}} per migliorare la produzione
 report.colony.starving.description=%colony%: morte di fame {{plural:%turns%|one=il prossimo turno|other=fra %turns% turni}}
 # Fuzzy
@@ -2428,9 +2428,7 @@ colonyPanel.notBestTile=%unit% potrebbe produrre più %goods% in %tile%.
 confirmDeclarationDialog.areYouSure.no=Forse più tardi
 confirmDeclarationDialog.areYouSure.text=Rinunciamo all'ingiusta tirannide di %monarch% e dichiariamo l'indipendenza delle nostre colonie dalla corona!
 confirmDeclarationDialog.areYouSure.yes=Libertà o Morte!
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=Stati Uniti di %nation%
-# Fuzzy
+confirmDeclarationDialog.defaultCountry=Stati Uniti di {{tag:country|%nation%}}
 confirmDeclarationDialog.defaultNation=Libero Stato %nation%
 confirmDeclarationDialog.enterCountry=D'ora in poi, la nostra nazione si chiamerà
 confirmDeclarationDialog.enterNation=e ogni cittadino della nostra gloriosa nazione sarà orgoglioso di definirsi
diff --git a/data/strings/FreeColMessages_ja.properties b/data/strings/FreeColMessages_ja.properties
index 7587ebb1c..db34d83b3 100644
--- a/data/strings/FreeColMessages_ja.properties
+++ b/data/strings/FreeColMessages_ja.properties
@@ -37,7 +37,9 @@ dry=乾燥
 hot=暑い
 temperate=温暖
 veryDry=非常に乾燥
+veryHigh=とても高い
 veryLarge=非常に大きい
+veryLow=とても低い
 verySmall=非常に小さい
 veryWet=超高湿
 warm=暖かい
@@ -57,9 +59,11 @@ false=無効
 fill=フィル
 height=高さ
 help=ヘルプ
+high=高い
 host=ホスト
 large=大
 load=読み込み
+low=低い
 many=多くの
 medium=中
 more=もっと...
@@ -78,6 +82,7 @@ remove=削除
 rename=改名
 reset=リセット
 save=保存
+select=選択
 server=サーバー
 skip=スキップ
 small=小
@@ -100,6 +105,7 @@ cargoOnCarrier=運搬中の積荷
 cashInTreasureTrain=財宝車が壊れました
 clearOrders=命令の初期化
 colonists=入植者
+colonyCenter=植民地 中心
 colopedia=コロペディア
 difficulty=難易度
 docks=埠頭
@@ -111,6 +117,7 @@ goldAmount=%amount% {{plural:%amount%|ゴールド}}
 goods=商品
 goToEurope=ヨーロッパに行く
 goToThisTile=このタイルに移動
+immigrants=移民
 inPort=入港中
 mission=布教
 modifiers=有利条件
@@ -147,6 +154,7 @@ cli.arg.debug=デバッグ・モード
 cli.arg.difficulty=難易度
 cli.arg.dimensions=横幅x縦幅
 cli.arg.directory=ディレクトリ
+cli.arg.europeans=ヨーロピアン
 cli.arg.file=ファイル
 cli.arg.locale=ロケール
 cli.arg.loglevel=ログレベル
@@ -392,6 +400,7 @@ model.option.priceIncrease.artillery.name=砲兵の価格引き上げ
 model.option.priceIncrease.artillery.shortDescription=新しい砲兵ごとに価格を上げる。
 model.option.expertStartingUnits.name=ベテラン開始ユニット
 model.option.expertStartingUnits.shortDescription=開始ユニットをすべてベテランにする
+model.option.immigrants.name=移民
 model.option.landPriceFactor.name=土地価格係数
 model.option.landPriceFactor.shortDescription=原住民の土地を購入するコストを増加する。
 model.option.nativeConvertProbability.name=原住民改宗者の確率
@@ -418,6 +427,7 @@ model.option.settlementNumber.verySmall.name=非常に小さい
 model.option.settlementNumber.small.name=小
 model.option.settlementNumber.medium.name=中
 model.option.settlementNumber.large.name=大
+model.option.settlementNumber.veryLarge.name=とても大きい
 model.difficulty.monarch.name=君主
 model.option.monarchMeddling.name=君主の干渉
 model.option.monarchMeddling.shortDescription=君主が干渉する頻度と干渉量が増える。
@@ -521,18 +531,54 @@ model.option.maximumLatitude.shortDescription=最南端の緯度です。正の
 model.option.riverNumber.name=河川の数
 model.option.riverNumber.shortDescription=マップ中の河川の数を設定します。
 model.option.riverNumber.verySmall.name=非常に小さい
+model.option.riverNumber.small.name=小さい
+model.option.riverNumber.medium.name=中
+model.option.riverNumber.large.name=大
+model.option.riverNumber.veryLarge.name=とても大きい
 model.option.mountainNumber.name=山の数
 model.option.mountainNumber.shortDescription=マップ中の山の数を設定します。
+model.option.mountainNumber.verySmall.name=とても小さい
+model.option.mountainNumber.small.name=小さい
+model.option.mountainNumber.large.name=大きい
+model.option.mountainNumber.veryLarge.name=とても大きい
 model.option.rumourNumber.name=古代都市の噂の数
 model.option.rumourNumber.shortDescription=マップ中の古代都市の噂の数を設定します。
+model.option.rumourNumber.verySmall.name=とても小さい
+model.option.rumourNumber.small.name=小さい
+model.option.rumourNumber.medium.name=中
+model.option.rumourNumber.large.name=大きい
 model.option.forestNumber.name=森林の割合
 model.option.forestNumber.shortDescription=マップ中の森林の割合を設定します。
+model.option.forestNumber.verySmall.name=とても小さい
+model.option.forestNumber.small.name=小さい
+model.option.forestNumber.medium.name=中
+model.option.forestNumber.large.name=大きい
 model.option.bonusNumber.name=ボーナスタイルの割合
 model.option.bonusNumber.shortDescription=マップ中のボーナスタイルの割合を設定します。
+model.option.bonusNumber.verySmall.name=とても小さい
+model.option.bonusNumber.small.name=小さい
+model.option.bonusNumber.medium.name=中
+model.option.bonusNumber.large.name=大きい
 model.option.humidity.name=湿度
 model.option.humidity.shortDescription=マップ中の平均的な湿度を設定します。
+model.option.humidity.veryDry.name=とても乾燥
+model.option.humidity.veryDry.shortDescription=湿度がとても低い
+model.option.humidity.dry.name=乾燥
+model.option.humidity.dry.shortDescription=低い湿度
+model.option.humidity.normal.name=普通
+model.option.humidity.normal.shortDescription=普通の湿度
+model.option.humidity.wet.name=湿ってる
+model.option.humidity.wet.shortDescription=高い湿度
+model.option.humidity.veryWet.name=とても湿ってる
+model.option.humidity.veryWet.shortDescription=とても高い湿度
 model.option.temperature.name=気温
 model.option.temperature.shortDescription=マップ中の平均的な気温を設定します。
+model.option.temperature.cold.name=冷たい
+model.option.temperature.cold.shortDescription=温度がとても低い
+model.option.temperature.chilly.name=冷涼
+model.option.temperature.chilly.shortDescription=低い温度
+model.option.temperature.hot.name=あつい
+model.option.temperature.hot.shortDescription=温度がとても高い
 mapGeneratorOptions.import.name=インポート
 mapGeneratorOptions.import.shortDescription=マップやセーブデータのインポートの設定です。
 model.option.importFile.name=ファイルのインポート
@@ -547,6 +593,7 @@ model.option.importSettlements.name=入植地のインポート
 model.option.importSettlements.shortDescription=原住民の入植地のインポートを有効にします。
 clientOptions.name=設定
 clientOptions.shortDescription=優先するクライアント設定
+clientOptions.personal.name=個人
 model.option.playerName.name=プレイヤー名:
 clientOptions.gui.name=ディスプレイ
 clientOptions.gui.shortDescription=ゲームの外観を調整するための設定です。
@@ -560,8 +607,7 @@ model.option.guiMaxNumberOfGoodsImages.shortDescription=表示する品物画像
 model.option.guiMinNumberToDisplayGoods.name=非表示にする倉庫の在庫数
 model.option.guiMinNumberToDisplayGoods.shortDescription=植民地にある品物がこの数よりも多ければ表示する
 model.option.alwaysCenter.name=選択されたタイルを常に中央に表示
-# Fuzzy
-model.option.alwaysCenter.shortDescription=この設定を友好にすると、選択したタイルが常に中央になります。
+model.option.alwaysCenter.shortDescription=この設定を有効にすると、選択したタイルが常に中央になります。
 model.option.jumpToActiveUnit.name=アクティブなユニットに移動
 # Fuzzy
 model.option.jumpToActiveUnit.shortDescription=アクティブなユニットが画面外の場合、表示を中央に移動します。
@@ -607,6 +653,7 @@ clientOptions.gui.displayColonyLabels.modern.name=モダン
 model.option.colonyComparator.name=植民地の並び順
 model.option.colonyComparator.shortDescription=植民地の並び順をどのようにするか
 clientOptions.gui.colonyComparator.byName.name=名前
+clientOptions.gui.colonyComparator.byAge.name=年齢
 clientOptions.gui.colonyComparator.byPosition.name=位置
 clientOptions.gui.colonyComparator.bySize.name=サイズ
 clientOptions.gui.colonyComparator.bySoL.name=独立推進派
@@ -713,6 +760,7 @@ model.option.indianDemandResponse.name=インディアンの要求に対する
 model.option.indianDemandResponse.shortDescription=原住民が質問するたびに確認するか、要求を受け入れるか、要求を受け入れないか、の対応をします。
 model.option.unloadOverflowResponse.name=過搭載分の積み下ろし
 model.option.unloadOverflowResponse.shortDescription=届いた積荷を下ろして倉庫から溢れたときにはどうするのか。
+clientOptions.other.unloadOverflowResponse.always.name=常に
 clientOptions.mods.name=MOD
 clientOptions.mods.shortDescription=ゲームを拡張するオプション。
 model.ability.ambushPenalty.name=待ち伏せペナルティ
@@ -758,6 +806,8 @@ model.ability.native.shortDescription=アメリカの原住民
 model.ability.navalUnit.name=海軍ユニット
 model.ability.navalUnit.shortDescription=このユニットは海軍ユニットです。
 model.ability.negotiate.name=交渉
+model.ability.person.name=人
+model.ability.person.shortDescription=このユニットは人です
 model.ability.plunderNatives.name=略奪の原住民
 model.ability.plunderNatives.shortDescription=原住民の入植地を破壊して得られる略奪品の量が向上します
 model.ability.produceInWater.name=水域で生産
@@ -887,6 +937,12 @@ model.building.weaverHouse.name=織工の家
 model.building.weaverHouse.description=織工の店にアップグレードすることができる織工の家は、綿花から布を生産するために使います。植民地の人口が8に達してから、Adam Smithが大陸会議に参加することで織物工場にアップグレードすることができます。
 model.building.weaverShop.name=織工の店
 model.building.weaverShop.description=織物工場にアップグレードすることができる織工の店は、綿花から布を生産するために使います。植民地の人口が8に達してから、Adam Smithが大陸会議に参加することで織物工場にアップグレードすることができます。織工の店は布の生産を増やします。
+model.disaster.disease.name=病気
+model.disaster.flood.name=洪水
+model.disaster.hurricane.name=ハリケーン
+model.disaster.sandstorm.name=砂嵐
+model.disaster.stormsurge.name=高潮
+model.disaster.tornado.name=竜巻
 model.event.declareIndependence.name=独立宣言
 model.foundingFather.adamSmith.name=アダム・スミス
 model.foundingFather.adamSmith.description=工場の建築を有効にする。
@@ -1237,6 +1293,7 @@ model.settlement.aztec.plural=都市
 model.settlement.camp.capital.name=野営地
 model.settlement.camp.name=野営地
 model.settlement.camp.plural=野営地
+model.settlement.colony.capital.name=植民地
 model.settlement.colony.name=植民地
 model.settlement.colony.plural=植民地
 model.settlement.inca.capital.name=インカ都市
@@ -1413,12 +1470,14 @@ filter.savedGames=FreeColのセーブデータ (*.fsg)
 filter.xml=XML (拡張マークアップ言語)
 model.abstractGoods.boycotted=%amount% {{plural:%amount%|%goods%}} (ボイコット中)
 model.abstractGoods.label=%amount% {{plural:%amount%|%goods%}}
+model.building.locationLabel=%location%内で
 model.colony.badGovernment=%colony%の政府は非効率的です。生産ペナルティが課せられます。
 model.colony.governmentImproved1=%colony%の政府は改善されていますが、まだ不十分です。生産ペナルティが依然として課せられています。
 model.colony.governmentImproved2=%colony%の政府は改善しました。もはや生産ペナルティは課せられていません。
 model.colony.minimumColonySize=%object%以上の人口を減らすことを防ぎます。
 model.colony.unbuildable=現時点での%colony%ではまだ%object%を建てることができません。%object%を建設待ちリストから削除しました。
 model.colony.veryBadGovernment=%colony%の政府はとても非効率的です。高い生産ペナルティが課せられています。
+model.diplomaticTrade.receive.tribute={{tag:country|%nation%}}は私たちの敬意を要求しています！
 model.direction.N.name=北
 model.direction.NE.name=北東
 model.direction.E.name=東
@@ -1428,27 +1487,19 @@ model.direction.SW.name=南西
 model.direction.W.name=西
 model.direction.NW.name=北西
 model.historyEventType.abandonColony.description=あなたは植民地 %colony% を放棄しました。
-# Fuzzy
-model.historyEventType.cityOfGold.description=%nation%は黄金の七都市のうちの一つである%city%を発見し、%treasure%ゴールドの財宝を入手しました。
-# Fuzzy
-model.historyEventType.colonyConquered.description=あなたの植民地%colony%は%nation%によって征服されました。
-# Fuzzy
-model.historyEventType.colonyDestroyed.description=あなたの植民地%colony%は%nation%によって破壊されました。
+model.historyEventType.cityOfGold.description={{tag:country|%nation%}}は黄金の七都市のうちの一つである%city%を発見し、%treasure%ゴールドの財宝を入手しました。
+model.historyEventType.colonyConquered.description=あなたの植民地%colony%は{{tag:country|%nation%}}によって征服されました。
+model.historyEventType.colonyDestroyed.description=あなたの植民地%colony%は{{tag:country|%nation%}}によって破壊されました。
 model.historyEventType.declareIndependence.description=あなたはクラウンからの独立を宣言する。
-# Fuzzy
-model.historyEventType.destroyNation.description=あなたは%nation%を破壊しました。
+model.historyEventType.destroyNation.description={{tag:country|%nation%}}は%nativeNation%を破壊します。
 model.historyEventType.discoverNewWorld.description=あなたは新世界を発見しました。
-# Fuzzy
-model.historyEventType.discoverRegion.description=%nation%は%region%を発見しました。
+model.historyEventType.discoverRegion.description={{tag:country|%nation%}}は%region%を発見しました。
 model.historyEventType.foundColony.description=あなたは植民地%colony%を設立しました。
 model.historyEventType.foundingFather.description=%father%が大陸会議に参加しました。
 model.historyEventType.independence.description=あなたは国王から独立を成し遂げました。
-# Fuzzy
-model.historyEventType.meetNation.description=あなたは%nation%に出会いました。
-# Fuzzy
-model.historyEventType.nationDestroyed.description=%nation%は破壊されました。
-# Fuzzy
-model.historyEventType.spanishSuccession.description=%loserNation%は新世界の植民地すべてを%nation%に譲り渡しました。
+model.historyEventType.meetNation.description=あなたは%nation%ネーションに出会いました。
+model.historyEventType.nationDestroyed.description=%nation%はもはや新世界に存在しません。
+model.historyEventType.spanishSuccession.description={{tag:country|%loserNation%}}は新世界の植民地すべてを{{tag:country|%nation%}}に譲り渡しました。
 model.indianSettlement.mostHatedNone=なし
 model.indianSettlement.mostHatedUnknown=不明
 model.indianSettlement.nameUnknown=不明
@@ -1456,6 +1507,7 @@ model.indianSettlement.skillNone=なし
 model.indianSettlement.skillUnknown=不明
 model.indianSettlement.tension.unknown=不明
 model.indianSettlement.tension.wary=警戒
+model.indianSettlement.wantedGoodsNone=なし
 model.indianSettlement.wantedGoodsUnknown=不明
 model.lostCityRumour.burialGround.description=よくも%nation%の神聖な埋葬地を汚したな！ 死んで償え！
 model.lostCityRumour.cibola.description=あなたは黄金の七都市のうちの一つの%city%を発見し、価値%money%の財宝を略奪しました！ 財宝車を植民地の一つに移動させ、換金するかガレオン船でヨーロッパに運んでください。
@@ -1499,6 +1551,9 @@ model.monarch.action.displeasure.text=あなたは国王からの独立を宣言
 model.monarch.action.displeasure.no=完了
 model.monarch.action.forceTax.no=完了
 model.monarch.action.lowerTax.no=完了
+model.monarch.action.monarchMercenaries.yes=私達は、受け入れる
+model.monarch.action.raiseTaxAct.yes=私達は、受け入れる
+model.monarch.action.raiseTaxWar.yes=私達は、受け入れる
 model.monarch.action.supportLand.no=完了
 model.monarch.action.supportSea.no=完了
 model.monarch.action.waiveTax.no=完了
@@ -1514,8 +1569,7 @@ model.noClaimReason.terrain.description=この地は植民地に適していま
 model.player.forces=%nation%軍
 model.player.independentMarket=ヨーロッパ
 model.player.startGame=数か月の航海の末、あなたはついに未知の大陸の沖に到達しました。新世界を発見するため{{tag:%direction%|west=西|east=東|default=風が吹く方}}に航路を向け、国王に発見報告をしましょう。
-# Fuzzy
-model.player.waitingFor=%nation%の行動を待っています
+model.player.waitingFor={{tag:country|%nation%}}の行動を待っています
 model.regionType.coast.name=沿岸
 model.regionType.coast.unknown=未知の沿岸地方
 model.regionType.desert.name=砂漠
@@ -1568,8 +1622,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.claimRequired.description=この地は他の民族に支配されていますが、苦情は入ってきません。
@@ -1585,6 +1638,7 @@ model.colony.colonistStarved=%colony%の入植者が餓死しました！
 model.colony.colonyStarved=%colony%での最後の入植者が餓死したので、残された植民地は放棄されます。
 model.colony.customs.sale=%colony%の税関は売却しました: %data%
 model.colony.famineFeared=%colony%では飢餓の恐れがあります。食料の残りがあと%number%だけです。
+model.colony.starving=%colony%は飢えています。
 model.colony.newColonist=%colony%で新しい入植者が誕生しました。
 model.colony.newConvert=新しい%nation%の改宗者が%colony%に到着しました。
 model.colony.notBuildingAnything=%colony%には建造するものが何もありません。
@@ -1597,14 +1651,12 @@ model.colony.warehouseOverfull=%colony%にある%goods%の量が倉庫一杯に
 model.colony.warehouseSoonFull=次のターンで%colony%の%goods%の倉庫容量を超えてしまいます。%amount%単位の%goods%が廃棄されます。
 model.colony.warehouseWaste=%colony%にある%goods%が倉庫容量を超えています。%waste%単位が廃棄されました。
 model.colonyTile.resourceExhausted=%colony%で資源%resource%が枯渇しました
-# Fuzzy
-model.game.spanishSuccession=閣下、ヨーロッパでスペイン継承戦争が終結しました。ユトレヒト条約により、%loserNation%が新世界に持っていたすべての植民地を%nation%へ強制割譲することになりました！
+model.game.spanishSuccession=閣下、ヨーロッパでスペイン継承戦争が終結しました。ユトレヒト条約により、{{tag:country|%loserNation%}}が新世界に持っていたすべての植民地を{{tag:country|%nation%}}へ強制割譲することになりました！
 model.indianSettlement.mission.denounced=あなたの宣教師は%settlement%で非難され、処刑されました！
 model.player.colonyGoodsParty.harbour=国王の不当な課税に抗議するため、%colony%の入植者は%amount%単位の%goods%を港に投げ捨てました。
 model.player.colonyGoodsParty.horses=国王の不当な課税に抗議して、%colony%の入植者は%amount%頭の馬を解放しました！
 model.player.colonyGoodsParty.landLocked=国王の不当な課税に抗議するため、%colony%の入植者は%amount%単位の%goods%を市場で焼き払いました。
-# Fuzzy
-model.player.dead.european=閣下、%nation%は新世界の場から無条件撤退を宣言しました！
+model.player.dead.european=閣下、{{tag:country|%nation%}}は新世界の場から無条件撤退を宣言しました！
 model.player.dead.native=閣下、%nation%は破壊されました。
 model.player.disaster.effect.colonyDestroyed=%colony%は完全に破壊されました。
 model.player.disaster.strikes=あなたの植民地 %colony% は打たれています、%disaster%によって
@@ -1621,7 +1673,6 @@ model.player.stance.ceaseFire.others=閣下、%attacker%は%defender%との停
 # Fuzzy
 model.player.stance.peace.declared=閣下、%nation%は我々と和平を結びました！
 model.player.stance.peace.others=閣下、%attacker%は%defender%と和平を結びました。
-# Fuzzy
 model.player.stance.war.declared=閣下、悪いニュースです。%nation%が我々に宣戦を布告しました！
 model.player.stance.war.others=閣下、%attacker%が%defender%に宣戦を布告しました。
 combat.automaticDefence=%colony%のあなたの%unit%が植民地を守るため、武器を手に取って立ち上がった！
@@ -1635,8 +1686,7 @@ combat.enemyShipEvaded=%enemyNation%の%enemyUnit%は%unit%からの攻撃を回
 combat.enemyShipSunk=%unit%は%enemyNation%の%enemyUnit%を撃沈しました！
 combat.equipmentCaptured=気をつけてください。%nation%の騎兵は%equipment%を手に入れました！
 combat.goodsStolen=%enemyNation%の%enemyUnit%が%colony%で%goods%%amount%を盗みました！
-# Fuzzy
-combat.indianPlunder=%enemyNation%の%enemyUnit%が%colony%から%amount%を略奪しました。
+combat.indianPlunder=%enemyNation%の%enemyUnit%が%colony%から金%amount%を略奪しました。
 combat.indianTreasure=%settlement%から%amount%ゴールドを略奪しました。
 combat.nativeCapitalBurned=あなたは%nation%の首都、%name%を焼き払いました。%nation%はあなたの実力に対して降伏しました！
 combat.newConvertFromAttack=恐る恐る%nation%の%unit%があなたに加わりました！
@@ -1684,13 +1734,14 @@ error.couldNotSave=ファイル%name%のゲーム保存中にエラーが発生
 main.defaultPlayerName=プレイヤー名
 main.javaVersion=FreeCol を動作させるには Java バージョン %minVersion% 以降をお勧めします\n(%version% を検出しました。このチェックをスキップするには --no-java-check を使用してください。)
 main.memory=JVM に %memory% バイト以上のメモリを割り当てる必要があります。\n  FreeCol を以下のように指定して再起動してください:  java -Xmx%minMemory%M -jar FreeCol.jar
-# Fuzzy
-client.choicePlayer=プレイヤーを選択してください:
+client.choicePlayer=ネーションを選択してください:
 client.ending=そのゲームは終了。
 metaServer.couldNotConnect=申し訳ありません。メタ・サーバーに接続できませんでした。後でもう一度試してください。
 metaServer.communicationError=メタ・サーバーとの通信中にエラーが発生しました。後でもう一度試してください。
 abandonEducation.action.studying=勉強中
 abandonEducation.action.teaching=教育中
+abandonEducation.no=教育を続ける
+abandonEducation.yes=教育を放棄
 armedUnitSettlement.attack=攻撃
 boycottedGoods.dumpGoods=品物を投棄する
 boycottedGoods.text=国王が%goods%のボイコットを行っているため、これを%europe%に売ることはできません。滞納税(%amount%ゴールド)を支払うか、港に品物を投げ捨てるのか、さぁどうする？
@@ -1698,12 +1749,9 @@ buy.moreGold=安くならないか交渉する
 buy.takeOffer=申し出を受け入れる
 buy.text=%nation%が彼らの所有している%goods%を%gold%で売りたいそうです:
 clearTradeRoute.text=%unit%には交易路%route%を割り当てます。交易路から目的地の設定がなくなりますが、行ってもよろしいですか？
-# Fuzzy
-confirmHostile.alliance=同盟国を攻撃することはできません！ 本当に%nation%との同盟を破棄して宣戦布告しますか？
-# Fuzzy
-confirmHostile.ceaseFire=あなたは%nation%との停戦に署名しています。本当に攻撃するのですか？
-# Fuzzy
-confirmHostile.peace=現在、%nation%とは平和を保っています。宣戦布告しますか？
+confirmHostile.alliance=同盟国を攻撃することはできません！ 本当に{{tag:country|%nation%}}との同盟を破棄して宣戦布告しますか？
+confirmHostile.ceaseFire=あなたは{{tag:country|%nation%}}との停戦に署名しています。本当に攻撃するのですか？
+confirmHostile.peace=現在、{{tag:country|%nation%}}とは平和を保っています。宣戦布告しますか？
 error.noSuchFile=指定したファイルが存在しないか、通常のファイルではありません。
 finance.high=財政的に安全であります。
 indianLand.cancel=土地を離れる
@@ -1753,10 +1801,8 @@ clearSpeciality.impossible=%unit%は降格できません！
 defeated.text=あなたは敗北しました！ どうしますか:
 defeated.yes=引き続き観察する
 defeatedSinglePlayer.yes=リベンジモードに入る
-# Fuzzy
-diplomacy.offerAccepted=%nation%はあなたの寛大な提案を受け入れました。
-# Fuzzy
-diplomacy.offerRejected=%nation%はあなたの寛大な提案を拒否しました。
+diplomacy.offerAccepted={{tag:country|%nation%}}はあなたの寛大な提案を受け入れました。
+diplomacy.offerRejected={{tag:country|%nation%}}はあなたの寛大な提案を拒否しました。
 disbandUnit.text=本当にこのユニットを解散しますか？
 disbandUnit.yes=解散
 disembark.text=やぁ、船乗りの方々。本当に上陸するかい？
@@ -1796,10 +1842,8 @@ move.noAccessBeached=接近した%nation%の船がが我々の進路を妨害し
 move.noAccessContact=閣下、まずは%nation%に接触関係を持つ必要があります。
 move.noAccessSettlement=%nation%は%unit%がその入植地に入る許可を与えていません。
 move.noAccessSkill=%unit%が原住民から学ぶことはできません。
-# Fuzzy
-move.noAccessTrade=%nation%といった他のヨーロッパ諸国と交易をする権限を持っていません。
-# Fuzzy
-move.noAccessWar=戦争中は%nation%と交易ができません。
+move.noAccessTrade={{tag:country|%nation%}}といった他のヨーロッパ諸国と交易をする権限を持っていません。
+move.noAccessWar=戦争中は%nation%ネーションと交易ができません。
 move.noAccessWater=%unit%は入植地に入る前に上陸が必要です。
 move.noAttackWater=%unit%は攻撃する前に着陸する必要があります。
 nameRegion.text=あなたは%type%を発見し、そのことを国王に報告しました！ 慣例として名前をつけてください:
@@ -1821,11 +1865,14 @@ trade.noTradeGoods=すまない、もうこれ以上の%goods%は結構だ！
 trade.noTradeHostile=お前とその商品を軽蔑する。立ち去れ！
 trade.nothingToSell=すまないが、まだ売るものが何もないんだ！
 tradeProposition.welcome=%nation%の%settlement%と交易
+tradeRoute.atStop=%location%で:
 tradeRoute.prefix=%route%, %unit%:%data%
 tradeRoute.skipped=スキップされた
+tradeRoute.toStop=%location%に旅行中。
 traderoute.warehouseCapacity=%unit%を%colony%に降ろすと植民地の倉庫の容量を超えてしまいます。%goods%%amount%が無駄になるでしょう。それでも品物を降ろしますか？
 twoTurnsPerYear=%year%年以降は、1年あたり1ターンではなく%amount%ターンになります。
 server.badColor=無効な色
+server.badNation=無効なネーション
 server.couldNotConnect=サーバーへの接続を行うことができませんでした。
 server.errorStartingGame=ゲーム開始中にエラーが発生しました。
 server.fileNotFound=指定した名前のファイルは見つかりませんでした。
@@ -1839,6 +1886,7 @@ server.onlyAdminCanLaunch=申し訳ありませんが、サーバー管理者だ
 server.reject=サーバーはそれを実行できません。
 server.timeOut=サーバーへの接続がタイムアウトしました。
 server.wrongFreeColVersion=FreeColのクライアントとサーバーのバージョンが一致しません。
+buildColony.others={{tag:country|%nation%}}が発見した、%region%内の%colony%の新しい植民地を。
 cashInTreasureTrain.colonial=%amount%ゴールドの財宝がヨーロッパに到着し、%cashInAmount%ゴールドに換金されました。
 cashInTreasureTrain.independent=%amount%の財宝が国庫に追加されました。
 declareIndependence.announce=%oldNation%植民地は%ruler%からの独立を決意し、%newNation%になりました。
@@ -1856,6 +1904,8 @@ indianSettlement.mission.tension.displeased=布教によって、%nation%は気
 indianSettlement.mission.tension.happy=布教によって、%nation%は喜んで新しい宗教に変わりました。
 scoutSettlement.tributeAgree=平和を保つため%amount%ゴールドを支払うことに合意したが、もうこの次はないぞ！
 scoutSettlement.tributeDisagree=君たちの要求に応えることはできない。我々の土地からすぐに出て行け！
+colopedia.description=説明
+colopedia.effects=効果
 colopedia.buildings.autoBuilt=新しい植民地を建設すると自動的に建設される。
 colopedia.buildings.cost=費用
 colopedia.buildings.modifiers={{plural:%number%|one=修正値|other=修正値}}
@@ -1944,6 +1994,9 @@ report.colony.improve.header=改善
 report.colony.making.header=メイキング
 report.colony.name.description=植民地の一覧
 report.colony.name.header=植民地
+report.colony.production.export.description=%colony%: %amount% %goods% が生産されています (exporting above %export%)
+report.colony.tile.clearForest.header=C
+report.colony.tile.plow.header=P
 report.continentalCongress.available=利用可能
 report.continentalCongress.none=(なし)
 report.continentalCongress.recruiting=新規勧誘
@@ -1995,8 +2048,7 @@ report.trade.totalUnits=総ユニット
 report.trade.unitsSold=売買されたユニット
 report.turn.filter=この種類のメッセージを表示しない (%type%)
 report.turn.ignore=このメッセージの無視 (植民地: %colony%, 品物: %goods%)
-# Fuzzy
-report.turn.playerNation=%player%の%nation%
+report.turn.playerNation=%player%の{{tag:country|%nation%}}
 aboutPanel.copyright=Copyright © 2002-2015 The FreeCol Team
 aboutPanel.legalDisclaimer=FreeColはフリーソフトウェアです: あなたはこれを、フリーソフトウェア財団によって発行された GNU 一般公衆利用許諾契約書 (バージョン2もしくはそれ以降のバージョン) の定める条件の下で再頒布または改変することができます。
 aboutPanel.officialSite=公式サイト:
@@ -2019,6 +2071,7 @@ colonyPanel.inPort=入港中
 colonyPanel.outsideColony=植民地の外
 colonyPanel.reducePopulation=人口が%number%を下回ると、%colony%ではもう%buildable%を建てることができなくなります。
 colonyPanel.unitChange=植民地に入った%oldType%は%newType%になりました。
+colonyPanel.warehouse=倉庫
 colonyPanel.bonusLabel=ボーナス: %number%%extra%
 colonyPanel.populationLabel=人口: %number%人
 colonyPanel.rebelLabel=独立派: %number%
@@ -2027,16 +2080,15 @@ colonyPanel.notBestTile=%unit%は%tile%よりも多くの%goods%を生産でき
 confirmDeclarationDialog.areYouSure.no=あとで
 confirmDeclarationDialog.areYouSure.text=我々は%monarch%の不当な専制政治を放棄し、国王から植民地の独立を宣言した！
 confirmDeclarationDialog.areYouSure.yes=自由を！さもなくば死を！
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=%nation%合衆国
-# Fuzzy
-confirmDeclarationDialog.defaultNation=%nation%自由主義国
+confirmDeclarationDialog.defaultCountry={{tag:country|%nation%}}合衆国
+confirmDeclarationDialog.defaultNation={{tag:country|%nation%}}自由主義国
 confirmDeclarationDialog.enterCountry=今後、我々の国は次のようになる:
 flag.unionPosition.LEFT=左
 flag.unionPosition.MIDDLE=中
 flag.unionPosition.NONE=なし
 flag.unionPosition.RIGHT=右
 flag.unionPosition.TOP=トップ
+flag.unionShape.RECTANGLE=長方形
 flag.unionShape.TRIANGLE=三角形
 constructionPanel.clickToBuild=建設する建物や作成するユニットをクリックしてください。
 constructionPanel.turnsToComplete=(完成までのターン数: %number%)
@@ -2045,10 +2097,8 @@ negotiationDialog.accept=受け入れ
 negotiationDialog.add=追加
 negotiationDialog.cancel=中止
 negotiationDialog.clear=消去
-# Fuzzy
-negotiationDialog.demand=%nation% の要求
-# Fuzzy
-negotiationDialog.offer=%nation% の提供
+negotiationDialog.demand={{tag:country|%nation%}} 提供 {{tag:country|%otherNation%}}
+negotiationDialog.offer={{tag:country|%nation%}} 提供 {{tag:country|%otherNation%}}
 negotiationDialog.send=送信
 editSettlementDialog.removeSettlement=植民地を削除
 editSettlementDialog.removeSettlement.text=この植民地を削除しますか？
@@ -2061,6 +2111,8 @@ europePanel.transaction.price=価格:\t%gold%
 europePanel.transaction.purchase=%goods% %amount%を一つ%gold%で購入
 europePanel.transaction.sale=%goods% %amount%を一つあたり%gold%で売却
 findSettlementPanel.name=入植地の検索
+firstContactDialog.meeting.aztec=アステカ族
+firstContactDialog.meeting.inca=インカ帝国
 firstContactDialog.welcomeOffer.text=%nation%にようこそ。我々は%camps%%settlementType%の栄光なる民族だ。我々の友情を祝福して、土地の支配権を寛大にお渡ししよう。条約を受け入れ、兄弟のように平和にならないか？
 firstContactDialog.welcomeSimple.text=%nation%にようこそ。我々は%camps%%settlementType%の栄光なる民族だ。条約を受け入れ、兄弟のように平和にならないか？
 abandonColony.no=中止
@@ -2086,6 +2138,7 @@ infoPanel.moves=移動力:
 loadingSavegameDialog.port=ポート:
 loadingSavegameDialog.privateMultiplayer=非公開マルチプレイヤー
 loadingSavegameDialog.publicMultiplayer=公開マルチプレイヤー
+loadingSavegameDialog.serverName=サーバー名:
 loadingSavegameDialog.singlePlayer=シングルプレイヤー
 loadingSavegameDialog.name=保存されたゲームの読み込み
 mapEditorTransformPanel.majorRiver=大きな河川
@@ -2096,6 +2149,7 @@ freecol.map.America_large=アメリカ (大)
 freecol.map.Australia=オーストラリア
 freecol.map.Caribbean_basin=カリブ海地域
 mapSizeDialog.mapSize=マップの大きさを選ぶ
+modifierFormat.scopeMethod.isIndian.name=原住民
 monarchDialog.default=国王からのメッセージ
 newPanel.editDifficulty=難易度を編集
 newPanel.getServerList=サーバーリストの取得
diff --git a/data/strings/FreeColMessages_lt.properties b/data/strings/FreeColMessages_lt.properties
index 394d2e24c..e2cea3c4d 100644
--- a/data/strings/FreeColMessages_lt.properties
+++ b/data/strings/FreeColMessages_lt.properties
@@ -6,6 +6,7 @@
 # Author: Mantak111
 # Author: Sergej.Privalov
 # Author: Tomasdd
+# Author: Zygimantus
 
 model.option.recruitable.slot0.name=Pirmasis imigrantas
 model.option.recruitable.slot0.shortDescription=Pirmojo imigranto padalinio tipas.
@@ -26,7 +27,7 @@ verySmall=Labai mažas
 veryWet=Labai drėgnas
 warm=Šiltas
 wet=Drėgnas
-freecol.desktopEntry.GenericName=Strateginis Žaidimas
+freecol.desktopEntry.GenericName=Strateginis žaidimas
 freecol.desktopEntry.Comment=Ėjimais pagrįstas strateginis žaidimas grindžiamas "Sid Meier's Colonization".
 accept=Sutikti
 all=Visi
@@ -48,7 +49,7 @@ large=Didelis
 load=Krauti
 many=daug
 medium=Vidutinis
-more=daugiau ...
+more=daugiau...
 # Fuzzy
 music=Muzika
 name=Vardas
@@ -57,9 +58,9 @@ none=Nėra
 normal=Normalus
 nothing=Nieko
 ok=Gerai
-options=Pasirinktys
+options=Nustatymai
 port=Prievadas
-quit=Išėiti
+quit=Išeiti
 reject=Atmesti
 remove=Pašalinti
 rename=Pervadinti
@@ -161,7 +162,7 @@ cli.load-savegame=įkelti išsaugotą žaidimą iš FAILO
 cli.log-console=rašyti žurnalą į konsolę, ne tik į failą
 cli.log-file=nustatyti FreeCol žurnalo failą (pagal nutylėjimą FreeCol.log)
 cli.log-level=nustatyti "Java" žurnalo lygį į LOGLEVEL
-cli.no-intro=nerodyti įžanginio video
+cli.no-intro=nerodyti įžanginio filmuko
 cli.no-java-check=netikrinti Javos versijos
 cli.no-memory-check=netikrinti atminties
 cli.no-sound=paleisti FreeCol be garso
@@ -174,9 +175,9 @@ cli.tc=apkrova viso konversijos su tokiu pavadinimu
 cli.version=parodyti versijos numerį ir baigti darbą
 # Fuzzy
 cli.windowed=paleisti FreeCol lango režimu užuot visą ekraną
-menuBar.colopedia=Kolopėdija
+menuBar.colopedia=Kolopedija
 menuBar.game=Žaidimas
-menuBar.orders=Įsakymai
+menuBar.orders=Užsakymai
 menuBar.report=Ataskaita
 menuBar.tools=Įrankiai
 menuBar.view=Žiūrėti
@@ -249,7 +250,7 @@ gotoAction.name=Eiti į
 gotoTileAction.name=Eiti į langelį
 loadAction.name=Įkrauti
 mapControlsAction.name=Žemėlapio valdymas
-mapEditorAction.name=Žemėlapis redaktorius
+mapEditorAction.name=Žemėlapio redaktorius
 mapGeneratorOptionsAction.name=Parodyti žemėlapio generatoriaus funkcijas
 miniMapZoomInAction.name=Priartinti mini žemėlapį
 miniMapZoomInAction.secondary.name=Padidinti minimap (antrinius)
@@ -265,7 +266,7 @@ moveAction.NW.name=Judėti į šiaurės vakarus
 moveAction.NW.secondary.name=Judėti į šiaurės vakarus (pakartotinai)
 moveAction.S.name=Judėti į pietus
 moveAction.S.secondary.name=Judėti į pietus (pakartotinai)
-moveAction.SE.name=Judėti pietryčiais
+moveAction.SE.name=Judėti į pietryčius
 moveAction.SE.secondary.name=Judėti pietryčiais (pakartotinai)
 moveAction.SW.name=Judėti pietvakarais
 moveAction.SW.secondary.name=Judėti pietvakarais (pakartotinai)
@@ -276,7 +277,7 @@ newEmptyMapAction.name=Nauja tuščias žemėlapis
 openAction.name=Įkelti
 plowAction.name=Suarti
 preferencesAction.name=Nustatymai
-quitAction.name=Išėiti
+quitAction.name=Išeiti
 reconnectAction.name=Prisijungti iš naujo
 renameAction.name=Pervadinti
 reportCargoAction.name=Gabenimų pranešimas
@@ -1883,6 +1884,7 @@ report.colony.grow.header=+
 report.colony.improve.header=Pagerinti
 report.colony.name.description=Kolonijų sąrašas
 report.colony.name.header=Kolonija
+report.colony.tile.plow.header=P
 # Fuzzy
 report.continentalCongress.elected=Išrinkti:
 report.continentalCongress.none=(jokių)
@@ -1964,8 +1966,7 @@ chooseFoundingFatherDialog.title=Paskirti steigiamąjį tėvą
 colonyPanel.colonyUnits=Kolonijos Vienetai
 colonyPanel.inPort=Uoste
 colonyPanel.outsideColony=Už kolonijos ribų
-# Fuzzy
-colonyPanel.producing=Gaminama:
+colonyPanel.producing=gaminamas:
 colonyPanel.reducePopulation=Jei sumažinsit gyventojus žemiau %number% ,%colony% nebegalės statyti %buildable%.
 colonyPanel.unitChange=Įeinant į kolonija jūsų %oldType% tapo padaliniu %newType%.
 colonyPanel.bonusLabel=Premija:%number%%extra%
@@ -2004,6 +2005,8 @@ europePanel.transaction.net=Pelnas:\t%gold%
 europePanel.transaction.price=Kaina:\t%gold%
 europePanel.transaction.purchase=Pirkti %amount% %goods% už %gold%
 europePanel.transaction.sale=Parduoti %amount% %goods% už %gold%
+firstContactDialog.meeting.natives=Vietinių susitikimas
+firstContactDialog.meeting.inca=Inkų imperija
 firstContactDialog.welcomeOffer.text=%nation% pasveikinti Jus. Mes šlovingą tautos %camps% %settlementType% . Norėdami švęsti mūsų draugystė, mes dosniai siūlome jums kraštą, kurį dabar užima kaip dovana. Ar jūs priimate mūsų sutartis ir guli su mumis taikos kaip broliai?
 firstContactDialog.welcomeSimple.text=%nation% pasveikinti Jus. Mes šlovingą tautos %camps% %settlementType% . Ar jūs priimate mūsų sutartis ir guli su mumis taikos kaip broliai?
 abandonColony.no=Atšaukti
diff --git a/data/strings/FreeColMessages_mk.properties b/data/strings/FreeColMessages_mk.properties
index f141e4697..beee26f48 100644
--- a/data/strings/FreeColMessages_mk.properties
+++ b/data/strings/FreeColMessages_mk.properties
@@ -92,7 +92,9 @@ cargoOnCarrier=Натоварено
 cashInTreasureTrain=Готовина во караванот со богатство
 clearOrders=Откажи наредби
 colonists=Колонисти
+colonyCenter=колониски центар
 colopedia=Колопедија
+countryName={{tag:country|%nation%}}
 difficulty=Тешкотија
 docks=Пристаништа
 dumpCargo=Исфрли го товарот
@@ -167,6 +169,7 @@ cli.error.home.notDir=%string% не претставува папка.
 cli.error.home.notExists=Матичната папка %string% не постои.
 cli.error.save=Не можам да ја прочитам зачуваната игра %string%.
 cli.error.serverPort=%string% не претставува важечки број на порта.
+cli.error.splash=Не ја пронајдов податотеката %name% за најавата.
 cli.error.timeout=%string% е прекусо (помалку од %minimum%).
 cli.advantages=задај тип на ПРЕДНОСТИ (%advantages%)
 cli.check-savegame.failure=Проверката на доследноста на зачувувањето на играта не успеа. Погледајте во дневничката евиденција за повеќе.
@@ -195,6 +198,7 @@ cli.no-intro=прескокни го воведното видео
 cli.no-java-check=прескокни ја проверката на верзија на Java
 cli.no-memory-check=прескокни ја проверката на памтењето
 cli.no-sound=пушти го FreeCol без звук
+cli.no-splash=изостави ја најавата
 cli.private=започнете доверлив опслужувач (не се објавува на метаопслужувачот)
 cli.seed=овозможи SEED за создавачот на псевдослучајни броеви
 cli.server-name=назначете НАЗИВ на опслужувачот
@@ -497,6 +501,10 @@ model.option.interventionForce.name=Интервенциски сили
 model.option.interventionForce.shortDescription=Интервенциските сили што ви се испорачуваат за да ве поддржат во Војната за независност.
 model.option.mercenaryForce.name=Платеничка војска
 model.option.mercenaryForce.shortDescription=Платеничката војска понудена како помош во вашата Војна за независност
+model.option.warSupportForce.name=Сили за воена поддршка
+model.option.warSupportForce.shortDescription=Максималниот број на сили што во Владетелот ги нуди во поддршка на вашите војни.
+model.option.warSupportGold.name=Злато за воена поддршка
+model.option.warSupportGold.shortDescription=Максималното количество на злато што Владетелот го нуди во поддршка на вашите војни.
 model.difficulty.government.name=Управа
 model.option.badGovernmentLimit.name=Граница на лоша управа
 model.option.badGovernmentLimit.shortDescription=Најголем можен број на ројалисти што не предизвикуваат казна за производство.
@@ -1604,8 +1612,7 @@ model.improvement.road.description=Пат
 model.improvement.road.name=Пат
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Граница за крајбрежни колонии
-# Fuzzy
-model.limit.independence.coastalColonies.description=Ви требаат барем %limit% крајбрежни колонии за да прогласите независност.
+model.limit.independence.coastalColonies.description=Ви требаат барем %limit% {{plural:%limit%|one=крајбрежна колонија|other=крајбрежни колонии}} за да прогласите независност.
 model.limit.independence.rebels.name=Ограничување за бунтовници
 model.limit.independence.rebels.description=Барем %limit%% ваши доселеници мора да поддржуваат независност.
 model.limit.independence.year.name=Огран. на година
@@ -2000,8 +2007,7 @@ model.historyEventType.abandonColony.description=Ја напуштивте ко
 model.historyEventType.ceaseFire.description=Примирје со %nation%.
 # Fuzzy
 model.historyEventType.cityOfGold.description=%nation%те го открија градот  %city% - еден од Седумте Златни Градови и во него богатство од  %treasure% злато.
-# Fuzzy
-model.historyEventType.colonyConquered.description=Вашата колонија %colony% ја освоија %nation%те.
+model.historyEventType.colonyConquered.description=Вашата колонија %colony% ја освоија  {{tag:country|%nation%}}.
 # Fuzzy
 model.historyEventType.colonyDestroyed.description=Вашата колонија %colony% е уништена од %nation%те.
 model.historyEventType.conquerColony.description=Ја освоивте колонијата %colony% на %nation%те.
@@ -2730,21 +2736,17 @@ report.colony.making.noconstruction.description=%colony%: Не се одвива
 report.colony.making.noteach.description=%colony%: %teacher% нема ученик
 report.colony.name.description=Списокот на колонии
 report.colony.name.header=Колонија
-# Fuzzy
-report.colony.production.description=%colony%: нето производство на %goods% = %amount%
-# Fuzzy
-report.colony.production.export.description=%colony%: нето производството на %goods% изнесува %amount% (го извезуваме остатокот над %export%)
+report.colony.production.description=%colony%: Се произведуваат %amount% %goods%
+report.colony.production.export.description=%colony%: Се произведуваат %amount% %goods% (сè над %export% оди за извоз)
 report.colony.production.header=Нето производство на %goods%
-# Fuzzy
-report.colony.production.high.description=%colony%: нето производство на %goods% = %amount%, што ќе се наполни {{plural:%turns%|one=со следниот потег|other=во рок од %turns% потези}}
+report.colony.production.high.description=%colony%: Се произведуваат %amount% %goods%, што ќе се наполни {{plural:%turns%|one=со следниот потег|other=во рок од %turns% потези}}
 # Fuzzy
 report.colony.production.low.description=%colony%: нето производство на %goods% = %amount%, што ќе го снема {{plural:%turns%|one=со следниот потег|other=во рок од %turns% потези}}
 # Fuzzy
 report.colony.production.waste.description=%colony%: нето производство на %goods% = %amount% - складиштето ќе се прелее, со загуба од %waste%
 report.colony.shrinking.description=%colony% мора да се намали за {{plural:%amount%|one=една единица|other=%amount% единици}} за да го подобри производството
 report.colony.starving.description=%colony%: прегладнување {{plural:%turns%|one=со следниот потег|other=за %turns% потези}}
-# Fuzzy
-report.colony.wanting.description=%colony%: За да правите уште %amount% %goods%, додајте %unit%
+report.colony.wanting.description=%colony% %location%: За да правите уште %amount% %goods%, додајте %unit%
 report.continentalCongress.available=Достапно
 report.continentalCongress.elected=Избрани: %turn%
 report.continentalCongress.none=(нема)
@@ -2789,8 +2791,7 @@ report.production.selectGoods=Изберете стока
 report.production.update=Надградби
 report.requirements.badAssignment=%colony% има %expert% што моментално работи како %expertWork% и %nonExpert% што работи како %nonExpertWork%. Производството ќе се зголеми ако тие си ги сменат занаетите.
 report.requirements.canTrainExperts={{plural:2|%unit%}} можат да се обучат во
-# Fuzzy
-report.requirements.exploreTile=Би било корисно да се истражи %type% на %direction% од %colony%.
+report.requirements.exploreTile=Би било корисно да се истражи %location%.
 report.requirements.met=Сите услови се задоволени.
 report.requirements.missingGoods=%colony% произведува %goods%, но им треба повеќе %input%.
 report.requirements.misusedExperts={{plural:2|%unit%}} што не работат како %work% се во
@@ -2811,6 +2812,7 @@ report.turn.ignore=Ингорирај ја оваа порака (Колониј
 report.turn.playerNation=%player% - %nation%
 aboutPanel.copyright=Авторски права © 2002-2015 Екипата на FreeCol
 aboutPanel.legalDisclaimer=FreeCol е слободен програм: можете да го распространувате и /или менувате во согласност со условите на ГНУ-овата општа јавна лиценца, објавена од Фондацијата за слободна програмска опрема, верзија 2 и сите понови верзии.
+aboutPanel.manual=Преземете го Прирачникот за FreeCol
 aboutPanel.officialSite=Официјална страница:
 aboutPanel.sfProject=Проект во SourceForge:
 aboutPanel.version=Верзија:
@@ -2833,8 +2835,7 @@ colonyPanel.buildQueue=Ред на чекање за изградба
 colonyPanel.colonyUnits=Единици на колонијата
 colonyPanel.inPort=На пристаништето
 colonyPanel.outsideColony=Вон колонијата
-# Fuzzy
-colonyPanel.producing=Произведува:
+colonyPanel.producing=произведува:
 colonyPanel.reducePopulation=Ако го намалите насленението под %number%, %colony% повеќе нема да може да гради %buildable%.
 colonyPanel.setGoods=Задај стоки
 colonyPanel.traceWork=Проследи работа
@@ -2849,10 +2850,8 @@ confirmDeclarationDialog.areYouSure.no=Можеби подоцна
 confirmDeclarationDialog.areYouSure.text=Ајде да ја отфрлиме оваа неправедна тиранија на %monarch% и да прогласиме независност на нашите колонии од круната!
 confirmDeclarationDialog.areYouSure.yes=Слобода или смрт!
 confirmDeclarationDialog.createFlag=и душманите ќе треперат кога ќе го здогледаат нашиот смел бајрак.
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=Соединети Држави на %nation%
-# Fuzzy
-confirmDeclarationDialog.defaultNation=Слободни %nation%
+confirmDeclarationDialog.defaultCountry=Соединети држави на {{tag:country|%nation%}}
+confirmDeclarationDialog.defaultNation=Слободна {{tag:country|%nation%}}
 confirmDeclarationDialog.enterCountry=Отсега нашата земја ќе се нарекува
 confirmDeclarationDialog.enterNation=и секој граѓанин на нашата славна нација ќе се гордее со тоа што ќе се нарекува
 flag.background.FESSES=Превез
@@ -2903,12 +2902,10 @@ negotiationDialog.add=Додај
 negotiationDialog.cancel=Откажи
 negotiationDialog.clear=Исчисти
 negotiationDialog.contact.tutorial=Сретнавте Европејци како вас. Тие ќе се натпреваруваат со вас за земја и богатства, а може и против вас да започнат војна. Но откако Јан де Вит ќе стапи во Континенталниот конгрес, вие ќе можете да тргувате со нив.
-# Fuzzy
-negotiationDialog.demand=%nation%те од %otherNation%те бараат
+negotiationDialog.demand={{tag:country|%nation%}} бара од {{tag:country|%otherNation%}}
 negotiationDialog.exchange=во замена за
 negotiationDialog.goldAvailable=(%amount% злато на располагање)
-# Fuzzy
-negotiationDialog.offer=%nation%те им нудат на %otherNation%те
+negotiationDialog.offer={{tag:country|%nation%}} нуди на {{tag:country|%otherNation%}}
 negotiationDialog.send=Испрати
 negotiationDialog.title.contact=Средба со други Европејци.
 negotiationDialog.title.diplomatic=Дипломатски преговори
@@ -2931,9 +2928,10 @@ findSettlementPanel.displayOnlyEuropean=Пронајди само европск
 findSettlementPanel.displayOnlyNatives=Пронајди само домородни населби
 findSettlementPanel.name=Пронајди населба
 findSettlementPanel.settlement=%name%%capital% (%nation%)
-# Fuzzy
-firstContactDialog.meeting.natives=Се среќавате со домородците...
+firstContactDialog.meeting.natives=Средба со домородците
 firstContactDialog.meeting.natives.tutorial=Се сретнавте со домородци. Испратете ги вашите извидници за да дознаат повеќе за нив, а наемните слуги и слободните колонисти за да учат од нив. Испратете ги вашите бродови и каравани во нивните населби ако сакате да тргувате со нив.
+firstContactDialog.meeting.aztec=Ацтеките
+firstContactDialog.meeting.inca=Царство на Инките
 firstContactDialog.welcomeOffer.text=%nation%те ви пожелуваат добредојде. Ние сме славен народ со %camps% %settlementType%. Во чест на нашето пријателство великодушно ви ја нудиме земјата на којашто сега престојувате. Дали ќе ја прифатите нашата спогодба, за да живееме мирно и братски?
 firstContactDialog.welcomeSimple.text=%nation%те ви пожелуваат добредојде. Ние сме славен народ со %camps% %settlementType%. Дали ќе ја прифатите нашата спогодба, за да живееме мирно и братски?
 abandonColony.no=Откажи
@@ -2976,6 +2974,7 @@ freecol.map.Australia=Австралија
 freecol.map.Caribbean_basin=Карипски Бразил
 mapSizeDialog.mapSize=Одберете големина на картата
 modifierFormat.unknown=???
+modifierFormat.scopeMethod.isIndian.name=домородци
 monarchDialog.default=Порака од Круната
 newPanel.editDifficulty=Измени тешкотија
 newPanel.getServerList=Преземи список на опслужувачи
diff --git a/data/strings/FreeColMessages_nl.properties b/data/strings/FreeColMessages_nl.properties
index ee17efaf3..31c027b94 100644
--- a/data/strings/FreeColMessages_nl.properties
+++ b/data/strings/FreeColMessages_nl.properties
@@ -1527,8 +1527,7 @@ model.improvement.road.description=Weg
 model.improvement.road.name=Weg
 model.improvement.road.occupationString=W
 model.limit.independence.coastalColonies.name=Limiet voor kustkolonies
-# Fuzzy
-model.limit.independence.coastalColonies.description=U moet tenminste %limit% kustkolonies hebben voordat u de onafhankelijkheid kunt afkondigen.
+model.limit.independence.coastalColonies.description=U moet tenminste %limit% {{plural:%limit%|one=kustkolonie|other=kustkolonies}} hebben voordat u de onafhankelijkheid kunt afkondigen.
 model.limit.independence.rebels.name=Rebellenlimiet
 model.limit.independence.rebels.description=Tenminste %limit%% van uw kolonisten moet onafhankelijkheid ondersteunen.
 model.limit.independence.year.name=Jarenlimiet
@@ -1864,8 +1863,7 @@ model.colony.badGovernment=Het bestuur van %colony% is inefficiënt. De producti
 model.colony.goodGovernment=De efficiëntie van het bestuur is verbeterd! Het rebellensentiment in %colony% is nu gelijk aan of groter dan %number% procent.
 model.colony.governmentImproved1=Het bestuur van %colony% is verbeterd, maar is nog inefficient. De productiviteit is nog steeds gedaald.
 model.colony.governmentImproved2=Het bestuur van %colony% is verbeterd. De productiviteit is gestegen.
-# Fuzzy
-model.colony.insufficientProduction=In %colony% zou %outputAmount% meer %outputType% geproduceerd kunnen worden als er maar %inputAmount% meer %inputType% beschikbaar was.
+model.colony.insufficientProduction=In %colony% kan %outputAmount% meer %outputType% geproduceerd worden als de volgende middelden beschikbaar waren: %consumptionDeficit%.
 model.colony.lostGoodGovernment=De efficiëntie van het bestuur is afgenomen! Het rebellensentiment in %colony% is niet langer groter of gelijk aan %number% procent. Er is niet langer een productiebonus voor de kolonie.
 model.colony.lostVeryGoodGovernment=De efficiëntie van het bestuur is afgenomen! Het rebellensentiment in %colony% is niet langer groter of gelijk aan %number% procent. Een aantal productiebonussen zijn verloren gegaan.
 model.colony.minimumColonySize=%object% maakt het onmogelijk de bevolkingsomvang verder te laten dalen.
@@ -1879,18 +1877,13 @@ model.colony.veryBadGovernment=Het bestuur van %colony% is erg inefficient. De p
 model.colony.veryGoodGovernment=De efficiëntie van het bestuur is verbeterd! Het rebellensentiment in %colony% is nu gelijk aan of groter dan %number% procent.
 model.colonyTile.claim=(claim %direction%)
 model.diplomaticTrade.receive.contact=Broederlijke groeten uit van de glorieuze natie der %nation%.
-# Fuzzy
-model.diplomaticTrade.receive.diplomatic=Laten we onderhandelen met de %nation%.
+model.diplomaticTrade.receive.diplomatic=Laten we onderhandelen met de {{tag:country|%nation%}}.
 model.diplomaticTrade.receive.trade=Laten we het handelsvoorstel van de %nation% overwegen.
-# Fuzzy
-model.diplomaticTrade.receive.tribute=De %nation% eisen eerbetoon van ons!
+model.diplomaticTrade.receive.tribute=De {{tag:country|%nation%}} eisen eerbetoon van ons!
 model.diplomaticTrade.send.contact=We zijn leden van de natie der %nation% tegengekomen.
-# Fuzzy
-model.diplomaticTrade.send.diplomatic=Laat ons onze diplomatieke situatie met de %nation% heroverwegen.
-# Fuzzy
-model.diplomaticTrade.send.trade=Laat ons handel met de %nation% voorstellen bij %settlement%.
-# Fuzzy
-model.diplomaticTrade.send.tribute=Wij eisen eerbetoon van de %nation% bij %settlement%.
+model.diplomaticTrade.send.diplomatic=Laat ons onze diplomatieke situatie met de {{tag:country|%nation%}} heroverwegen.
+model.diplomaticTrade.send.trade=Laat ons handel met de {{tag:country|%nation%}} voorstellen bij %settlement%.
+model.diplomaticTrade.send.tribute=Wij eisen eerbetoon van de {{tag:country|%nation%}} bij %settlement%.
 model.direction.N.name=noord
 model.direction.NE.name=noordoost
 model.direction.E.name=oost
@@ -1900,37 +1893,25 @@ model.direction.SW.name=zuidwest
 model.direction.W.name=west
 model.direction.NW.name=noordwest
 model.historyEventType.abandonColony.description=U hebt de kolonie %colony% verlaten.
-# Fuzzy
-model.historyEventType.ceaseFire.description=Staakt het vuren met de %nation%.
-# Fuzzy
-model.historyEventType.cityOfGold.description=De %nation% hebben %city% ontdekt, een van de zeven Gouden Steden. De schat bedraagt %treasure% goud.
-# Fuzzy
-model.historyEventType.colonyConquered.description=Uw kolonie %colony% is veroverd door de %nation%.
-# Fuzzy
-model.historyEventType.colonyDestroyed.description=Uw kolonie %colony% is verwoest door de %nation%.
+model.historyEventType.ceaseFire.description=Staakt het vuren met de {{tag:country|%nation%}}.
+model.historyEventType.cityOfGold.description=De {{tag:country|%nation%}} hebben %city% ontdekt, een van de zeven Gouden Steden. De schat bedraagt %treasure% goud.
+model.historyEventType.colonyConquered.description=Uw kolonie %colony% is veroverd door de {{tag:country|%nation%}}.
+model.historyEventType.colonyDestroyed.description=Uw kolonie %colony% is verwoest door de {{tag:country|%nation%}}.
 # Fuzzy
 model.historyEventType.conquerColony.description=U durft Onze genereuze voorwaarden te aanvaarden en dan nog de betaling te ontwijken? Een dergelijke dubbelhartigheid oogsten van Ons een bittere beloning.
 model.historyEventType.declareIndependence.description=U verklaart onafhankelijkheid van de Kroon.
-# Fuzzy
-model.historyEventType.declareWar.description=Oorlog verklaard met de %nation%.
-# Fuzzy
-model.historyEventType.destroyNation.description=De %nation% vernietigen de %nativeNation%.
+model.historyEventType.declareWar.description=Oorlog verklaard met de {{tag:country|%nation%}}.
+model.historyEventType.destroyNation.description=De {{tag:country|%nation%}} vernietigen de %nativeNation%.
 model.historyEventType.discoverNewWorld.description=U hebt de Nieuwe Wereld ontdekt.
-# Fuzzy
-model.historyEventType.discoverRegion.description=De %nation% hebben %region% ontdekt.
-# Fuzzy
-model.historyEventType.formAlliance.description=Bondgenootschap onderhandeld met de %nation%.
+model.historyEventType.discoverRegion.description=De {{tag:country|%nation%}} hebben %region% ontdekt.
+model.historyEventType.formAlliance.description=Bondgenootschap onderhandeld met de {{tag:country|%nation%}}.
 model.historyEventType.foundColony.description=U hebt de kolonie %colony% gevestigd.
 model.historyEventType.foundingFather.description=%father% treedt toe tot het Continentale Congres
 model.historyEventType.independence.description=U bereikt onafhankelijkheid van de Kroon.
-# Fuzzy
-model.historyEventType.makePeace.description=Vrede overeengekomen met de %nation%.
-# Fuzzy
-model.historyEventType.meetNation.description=U ontmoet de %nation%
-# Fuzzy
-model.historyEventType.nationDestroyed.description=De %nation% zijn niet meer aanwezig in de Nieuwe Wereld.
-# Fuzzy
-model.historyEventType.spanishSuccession.description=De %loserNation% staan al hun kolonies in de Nieuwe Wereld af aan de %nation%.
+model.historyEventType.makePeace.description=Vrede overeengekomen met de {{tag:country|%nation%}}.
+model.historyEventType.meetNation.description=U ontmoet de {{tag:country|%nation%}}.
+model.historyEventType.nationDestroyed.description=De {{tag:country|%nation%}} zijn niet meer aanwezig in de Nieuwe Wereld.
+model.historyEventType.spanishSuccession.description=De {{tag:country|%loserNation%}} staan al hun kolonies in de Nieuwe Wereld af aan de {{tag:country|%nation%}}.
 model.indianSettlement.mostHatedNone=Geen
 model.indianSettlement.mostHatedUnknown=Onbekend
 model.indianSettlement.nameUnknown=Onbekend
@@ -1980,11 +1961,9 @@ model.messageType.warehouseCapacity.name=Pakhuiscapaciteit
 model.messageType.warning.name=Waarschuwingen
 model.monarch.action.addToRef.text=De Kroon heeft %number% {{plural:%number%|%unit%}} toegevoegd aan de Koninklijke Verkenningsmacht. Koloniale leiders uiten hun bezorgdheid.
 model.monarch.action.addToRef.no=Afgerond
-# Fuzzy
-model.monarch.action.declarePeace.text=We hebben genadig ingestemd met een vredesverdrag met de %nation%.
+model.monarch.action.declarePeace.text=We hebben genadig ingestemd met een vredesverdrag met de {{tag:country|%nation%}}.
 model.monarch.action.declarePeace.no=Afgerond
-# Fuzzy
-model.monarch.action.declareWar.text=De brutaliteit van %nation% dwingt ons om de oorlog te verklaren!
+model.monarch.action.declareWar.text=De brutaliteit van {{tag:country|%nation%}} dwingt ons om de oorlog te verklaren!
 model.monarch.action.declareWar.no=Afgerond
 # Fuzzy
 model.monarch.action.displeasure.text=U verklaart onafhankelijkheid van de Kroon.
@@ -2028,8 +2007,7 @@ model.advantages.selectable.name=Selecteerbaar
 model.advantages.selectable.shortDescription=Nationale voordelen zijn te selecteren en hoeven niet uniek te zijn.
 model.nationState.aiOnly.name=Alleen KI
 model.nationState.available.name=beschikbaar
-# Fuzzy
-model.nationState.available.shortDescription=U hebt de kolonie %colony% op de %nation% veroverd.
+model.nationState.available.shortDescription=U speelt als deze natie
 model.nationState.notAvailable.name=niet beschikbaar
 model.noClaimReason.europeans.description=Dit land wordt opgeëist door een andere Europese natie.
 model.noClaimReason.natives.description=Dit land wordt opgeëist door een inheemse stam.
@@ -2043,8 +2021,7 @@ model.player.colonialIndependence=Alleen koloniale spelers kunnen onafhankelijkh
 model.player.forces=%nation% strijdkrachten
 model.player.independentMarket=Europa
 model.player.startGame=Na maanden op zee bent u eindelijk aangekomen bij de kust van een onbekend continent. Zeil naar {{tag:%direction%|west=naar het westen|east=naar het oosten|default=tegen de wind in}} om de Nieuwe Wereld te ontdekken en deze te claimen voor de Kroon.
-# Fuzzy
-model.player.waitingFor=Aan het wachten op: %nation%
+model.player.waitingFor=Aan het wachten op: {{tag:country|%nation%}}
 model.regionType.coast.name=Kust
 model.regionType.coast.unknown=Onbekend kustgebied
 model.regionType.desert.name=Woestijn
@@ -2083,8 +2060,7 @@ model.tradeItem.gold.name=Goud
 model.tradeItem.gold.description=het totaal van %amount% goud
 model.tradeItem.goods.name=Goederen
 model.tradeItem.incite.name=Oorlog verklaren aan
-# Fuzzy
-model.tradeItem.incite.description=oorlog tegen de %nation%
+model.tradeItem.incite.description=oorlog tegen de {{tag:country|%nation%}}
 model.tradeItem.stance.name=Houding
 model.tradeItem.unit.name=Eenheid
 model.tradeRoute.duplicateName=Deze handelsroute heeft dezelfde naam als een van uw bestaande handelsroutes: %name%. Kies een andere unieke naam.
@@ -2106,8 +2082,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=W
-# Fuzzy
-model.unit.unitState.skipped=O
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=E
 model.unit.unitState.toEurope=E
 model.noAddReason.alreadyPresent.description=Al aanwezig in deze locatie.
@@ -2147,8 +2122,7 @@ model.colony.warehouseSoonFull=Het pakhuis in %colony% zit bij de volgende beurt
 model.colony.warehouseWaste=Het pakhuis in %colony% zit overvol met %goods%. %waste% eenheden zijn weggegooid.
 model.colony.workersEvicted=Bij %colony% kunnen uw kolonisten niet langer werken bij %location% vanwege de aanwezigheid van %enemyUnit%.
 model.colonyTile.resourceExhausted=De grondstof %resource% is op in %colony%
-# Fuzzy
-model.game.spanishSuccession=Excellentie, de Spaanse Successieoorlog in Europa is beëindigd. In het Verdrag van Utrecht worden de %loserNation% gedwongen om alle kolonies in de Nieuwe Wereld af te staan aan de %nation%!
+model.game.spanishSuccession=Excellentie, de Spaanse Successieoorlog in Europa is beëindigd. In het Verdrag van Utrecht worden de {{tag:country|%loserNation%}} gedwongen om alle kolonies in de Nieuwe Wereld af te staan aan de {{tag:country|%nation%}}!
 model.indianSettlement.mission.denounced=Uw missionaris in %settlement% is uit de gratie gevallen en geëxecuteerd!
 model.indianSettlement.mission.destroyed=Uw missionaris in de nederzetting %settlement% is overleden tijdens de vernietiging van die nederzetting.
 model.player.alarmIncrease.tension.angry=et opperhoofd van de %nation% in %settlement% waarschuwt dat de dapperen openlijk vragen om oorlog met de %enemy%, om ons te ontdoen van de ingrepen op ons land van de kolonisten en de arrogante krijgers.
@@ -2157,8 +2131,7 @@ model.player.autoRecruit=Religieuze onrust in %europe% zet %unit% aan tot emigra
 model.player.colonyGoodsParty.harbour=Uw kolonisten in %colony% hebben %amount% eenheden van %goods% in de haven gegooid in protest tegen de oneerlijke belastingen van de koning!
 model.player.colonyGoodsParty.horses=Uw kolonisten in %colony% hebben %amount% paarden vrijgelaten uit protest tegen deze oneerlijke belasting door de Kroon!
 model.player.colonyGoodsParty.landLocked=Uw kolonisten in %colony% hebben %amount% eenheden van %goods% verbrand op het marktplein in protest tegen de oneerlijke belastingen van de koning!
-# Fuzzy
-model.player.dead.european=Uwe Hoogheid. De %nation% hebben verklaard zich onvoorwaardelijk terug te trekken uit gelegenheden aangaande de Nieuwe Wereld!
+model.player.dead.european=Uwe Hoogheid. De {{tag:country|%nation%}} hebben verklaard zich onvoorwaardelijk terug te trekken uit gelegenheden aangaande de Nieuwe Wereld!
 model.player.dead.native=Uwe Hoogheid. De %nation% zijn vernietigd.
 model.player.disaster.bankruptcy.start=U heeft niet betaald voor het onderhoud van alle gebouwen. Er worden zware productiesancties opgelegd.
 model.player.disaster.bankruptcy.stop=U bent weer in staat om te betalen voor het onderhoud van alle gebouwen. De productiesancties zijn opgeheven.
@@ -2171,17 +2144,13 @@ model.player.ignoredTax=De Kroon heeft het belastingpercentage verhoogd naar %am
 model.player.interventionForceArrives=De beloofde interventiemacht is gearriveerd!
 model.player.soLDecrease=Het patriottisme in uw kolonies is gedaalt naar %newSoL% procent!
 model.player.soLIncrease=Het patriottisme in uw kolonies is gestegen naar %newSoL% procent!
-# Fuzzy
-model.player.stance.alliance.declared=Uwe Hoogheid, de %nation% vormen nu een alliantie met ons!
+model.player.stance.alliance.declared=Uwe Hoogheid, de {{tag:country|%nation%}} vormen nu een alliantie met ons!
 model.player.stance.alliance.others=Uwe Hoogheid, de %attacker% vormen nu een alliantie met de %defender%.
-# Fuzzy
-model.player.stance.ceaseFire.declared=Uwe Hoogheid, de %nation% hebben toegestemd in een staakt het vuren met ons!
+model.player.stance.ceaseFire.declared=Uwe Hoogheid, de {{tag:country|%nation%}} hebben toegestemd in een staakt het vuren met ons!
 model.player.stance.ceaseFire.others=Uwe Hoogheid, de %attacker% hebben toegestemd in een staakt het vuren met de %defender%.
-# Fuzzy
-model.player.stance.peace.declared=Uwe Hoogheid, de %nation% hebben de vrede met ons getekend!
+model.player.stance.peace.declared=Uwe Hoogheid, de {{tag:country|%nation%}} hebben de vrede met ons getekend!
 model.player.stance.peace.others=Uwe Hoogheid, de %attacker% hebben de vrede met de %defender% getekend.
-# Fuzzy
-model.player.stance.war.declared=Slecht nieuws Uwe Hoogheid. De %nation% hebben ons de oorlog verklaard!
+model.player.stance.war.declared=Slecht nieuws Uwe Hoogheid. De {{tag:country|%nation%}} hebben ons de oorlog verklaard!
 model.player.stance.war.others=Uwe Hoogheid, de %attacker% hebben de oorlog verklaard aan %defender%.
 combat.automaticDefence=Uw %unit% in %colony% heeft de wapens opgenomen on de kolonie te verdedigen!
 combat.buildingDamaged=%building% in %colony% is vernietigd door %enemyNation% %enemyUnit%!
@@ -2196,8 +2165,7 @@ combat.enemyShipEvaded=%enemyNation% %enemyUnit% heeft de aanval door %unit% ont
 combat.enemyShipSunk=%unit% heeft %enemyNation% %enemyUnit% tot zinken gebracht!
 combat.equipmentCaptured=Opgepast. De moedige %nation% hebben %equipment% buitgemaakt!
 combat.goodsStolen=%enemyNation% %enemyUnit% steelt %amount% %goods% in %colony%!
-# Fuzzy
-combat.indianPlunder=%enemyNation% %enemyUnit% plundert %amount% van %colony%.
+combat.indianPlunder=%enemyNation% %enemyUnit% plundert %amount% goud van %colony%.
 combat.indianRaid=Onze spionnen melden dat de %nation% een inval hebben in de kolonie %colony% van de %colonyNation%.
 combat.indianSurprise=De %nation% voeren een verrassingsaanval uit op %colony%, waardoor onze kolonisten gealarmeerd worden. Het hoofd van de %nation% ontkent betrokkenheid.
 combat.indianTreasure=U hebt %amount% geplunderd uit %settlement%.
@@ -2244,17 +2212,14 @@ model.unit.noMoreTools=%location%: Uw pionier heeft al zijn gereedschap opgebrui
 model.unit.slowed=%enemyNation% %enemyUnit% vertraagt %unit%'s beweging.
 model.unit.unitRepaired=%unit% is gerepareerd in %repairLocation%.
 model.unit.hardyPioneer.noMoreTools=%location%: Uw geharde pionier heeft al zijn gereedschap opgebruikt.
-# Fuzzy
-error.couldNotLoad=Er is iets misgegaan tijdens het laden van het spel!
-# Fuzzy
-error.couldNotSave=Er is iets misgegaan tijdens het opslaan van het spel!
+error.couldNotLoad=Er is iets misgegaan tijdens het laden van het spel uit bestand %name%!
+error.couldNotSave=Er is iets misgegaan tijdens het opslaan van het spel in bestand %name%!
 main.defaultPlayerName=Spelernaam
 main.javaVersion=Voor FreeCol wordt een Javaversie van %minVersion% of later aanbevolen.\n%version% is gedetecteerd. Gebruik "--no-java-check" om deze controle over te slaan.
 main.memory=U moet meer dan %memory% bytes geheugen aan de JVM toekennen.\n  Herstart FreeCol met: java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol kan geen geschikt mappen vinden om gebruikersgegevens in op te slaan. Het programma blijft uitgevoerd worden, maar verwacht problemen.
 client.baseData=De map %dir% voor de basisgegevens kon niet gevonden worden.\n  De gegevensbestanden kunnen niet worden gevonden door FreeCol.\n  Zorg ervoor dat ze aanwezig zijn.\n  Als FreeCol in de verkeerde map zoekt,\n  start het spel dan met de volgende opdrachtregelparameter:\n  --freecol-data <data-directory>
-# Fuzzy
-client.choicePlayer=Selecteer een speler:
+client.choicePlayer=Kies een natie:
 client.classic=Het laden van de resourcemapping voor regelset "classic" is mislukt.
 client.debugConnect=U kunt geen verbinding maken met een bestaand spel in de debug modus.
 client.ending=Het spel is ten einde.
@@ -2266,11 +2231,9 @@ metaServer.couldNotConnect=Er kon geen verbinding worden gemaakt met de metaserv
 metaServer.communicationError=Er is een fout opgetreden in de verbinding met de metaserver. Probeer het later nog eens.
 abandonEducation.action.studying=aan het studeren
 abandonEducation.action.teaching=aan het opleiden
-# Fuzzy
-abandonEducation.no=Nee, ga door met opleiden
+abandonEducation.no=Doorgaan met opleiden
 abandonEducation.text=Als uw %unit% %colony% verlaat, stopt deze met %action% in het gebouw %building%. Weet u het zeker?
-# Fuzzy
-abandonEducation.yes=Ja, deze eenheid kan de kolonie verlaten
+abandonEducation.yes=Opleiding afbreken
 abandonTeaching.text=Als uw %unit% het gebouw %building% verlaat, stopt deze met opleiden. Weet u zeker dat u dit wilt doen?
 armedUnitSettlement.attack=Aanvallen
 armedUnitSettlement.tribute=Eerbetoon eisen
@@ -2281,14 +2244,10 @@ buy.takeOffer=Het aanbod aanvaarden
 buy.text=De %nation% wil graag hun %goods% voor %gold% verkopen:
 clearTradeRoute.text=Uw %unit% is toegewezen aan de handelsroute %route%. Door een bestemming in te stellen haalt u deze van de handelsroute af. Weet u zeker dat u dit wilt doen?
 client.fullScreen=De modus volledig scherm wordt niet ondersteund voor dit apparaat.\nHet programma wordt uitgevoerd in venstermodus.
-# Fuzzy
-confirmHostile.alliance=U kunt geen geallieerde natie aanvallen! Wilt u echt de alliantie met de %nation% verbreken en dan de oorlog verklaren?
-# Fuzzy
-confirmHostile.ceaseFire=We hebben een staak het vuren getekend met %nation%. Wilt u echt aanvallen?
-# Fuzzy
-confirmHostile.peace=U leeft in vrede met de %nation%. Weet u zeker dat u de oorlog wilt verklaren?
-# Fuzzy
-confirmTribute.broke=Onze spionnen melden dat de %nation% volkomen blut zijn. Laten we onze tijd niet verspillen met het eisen van eerbetoon.
+confirmHostile.alliance=U kunt geen geallieerde natie aanvallen! Wilt u echt de alliantie met de {{tag:country|%nation%}} verbreken en dan de oorlog verklaren?
+confirmHostile.ceaseFire=We hebben een staak het vuren getekend met {{tag:country|%nation%}}. Wilt u echt aanvallen?
+confirmHostile.peace=U leeft in vrede met de {{tag:country|%nation%}}. Weet u zeker dat u de oorlog wilt verklaren?
+confirmTribute.broke=Onze spionnen melden dat de {{tag:country|%nation%}} volkomen blut zijn. Laten we onze tijd niet verspillen met het eisen van eerbetoon.
 confirmTribute.european=De %nation% %danger% en %finance%. Hoeveel eerbetoon gaan we van ze eisen?
 confirmTribute.happy=De %nation% bij %settlement% zijn goede vrienden van ons. Het zou jammer zijn om onze kameraadschap te beschadigen.
 confirmTribute.no=Misschien hadden we beter niet
@@ -2304,14 +2263,11 @@ error.noSuchFile=Het bestand is niet gevonden of de opmaak is niet correct.
 finance.high=hebben goede reserves
 finance.low=zijn arm
 finance.normal=hebben een kleine goudreserve
-# Fuzzy
-indianLand.cancel=Verlaat het land.
-# Fuzzy
-indianLand.pay=Bied %amount% goud voor het land.
+indianLand.cancel=Verlaat het land
+indianLand.pay=Bied %amount% goud voor het land
 indianLand.take=Neem wat ons toekomt.
 indianLand.text=Dit land is in bezit van de %player%. Wat wilt u doen:
-# Fuzzy
-indianLand.unknown=Een aantal onbekende mensen wonen in dit land. Zou u graag:
+indianLand.unknown=Er wonen ongecontacteerde volkeren in dit land. Wilt u:
 info.autodetectLanguageSelected=U hebt gekozen voor het automatisch detecteren van de taal. Dit gebeurt de eerstvolgende keer dat u het spel start.
 info.enterSomeText=Vul tekst in.
 info.newLanguageSelected=De taal is ingesteld op %language%. Het spel moet herstart worden voordat de taal compleet wordt doorgevoerd.
@@ -2356,10 +2312,8 @@ defeated.text=U bent verslagen! Wat wilt u doen:
 defeated.yes=Blijf kijken
 defeatedSinglePlayer.text=U bent verslagen!
 defeatedSinglePlayer.yes=Start de wraak
-# Fuzzy
-diplomacy.offerAccepted=De natie %nation% heeft uw vrijgevige aanbod geaccepteerd.
-# Fuzzy
-diplomacy.offerRejected=The natie %nation% heeft uw vrijgevige aanbod afgewezen.
+diplomacy.offerAccepted=De natie {{tag:country|%nation%}} heeft uw vrijgevige aanbod geaccepteerd.
+diplomacy.offerRejected=The natie {{tag:country|%nation%}} heeft uw vrijgevige aanbod afgewezen.
 disbandUnit.text=Weet u zeker dat u deze eenheid wilt opheffen?
 disbandUnit.yes=Opheffen
 disembark.text=Gegroet zeeman. Wilt u van boord?
@@ -2403,10 +2357,8 @@ move.noAccessContact=We moeten eerst contact maken met de %nation%, Excellentie.
 move.noAccessGoods=De %nation% zal geen handel drijven met een lege %unit%.
 move.noAccessSettlement=De %nation% laten onze %unit% hun nederzetting niet binnen.
 move.noAccessSkill=Onze %unit% kan  niets leren van de inheemse bevolking.
-# Fuzzy
-move.noAccessTrade=We heben geen volmacht handel te drijven met andere Europeanen zoals de %nation%.
-# Fuzzy
-move.noAccessWar=We kunnen geen handel drijven met de %nation% als we in oorlog zijn.
+move.noAccessTrade=We heben geen volmacht handel te drijven met andere Europeanen zoals de {{tag:country|%nation%}}.
+move.noAccessWar=We kunnen geen handel drijven met de {{tag:country|%nation%}} als we in oorlog zijn.
 move.noAccessWater=Onze %unit% moet eerst aan land komen voor die de nederzetting binnen kan treden.
 move.noAttackWater=Onze eenheid %unit% moet landen voordat deze kan aanvallen.
 move.noTile=Onze %unit% is niet te zien op de kaart!
@@ -2550,10 +2502,8 @@ colopedia.nationType.skills=Gedoceerde beroepen:
 colopedia.nationType.typeOfSettlements=Type nederzetting:
 colopedia.nationType.units=Starteenheden:
 colopedia.terrain.colonyCenterTile=Centrale tegel van de kolonie
-# Fuzzy
 colopedia.terrain.defenseBonus=Verdedigingsbonus
 colopedia.terrain.description=Beschrijving
-# Fuzzy
 colopedia.terrain.movementCost=Kosten verplaatsing
 colopedia.terrain.resource=Mogelijke grondstof
 colopedia.terrain.terrainImage=Afbeelding terrein
@@ -2570,8 +2520,7 @@ colopedia.unit.offensivePower=Aanvalskracht:
 colopedia.unit.price=Prijs in Europa:
 colopedia.unit.productionBonus=productie{{plural:%number%|one=modifier|other=modifiers}}:
 colopedia.unit.requirements=Vereisten:
-# Fuzzy
-colopedia.unit.school=School nodig voor training:
+colopedia.unit.school=Mag opleiden in:
 colopedia.unit.skill=Niveau:
 report.labour.allColonists=Alle kolonisten
 report.labour.amateursWorking=amateurs
@@ -2690,8 +2639,7 @@ report.trade.totalUnits=Aantal eenheden
 report.trade.unitsSold=Eenheden gekocht of verkocht
 report.turn.filter=Laat dit type bericht (%type%) niet meer zien
 report.turn.ignore=Negeer dit bericht (Kolonie: %colony%, Goederen: %goods%)
-# Fuzzy
-report.turn.playerNation=%player%'s %nation%
+report.turn.playerNation=%player%'s {{tag:country|%nation%}}
 aboutPanel.copyright=Copyright (C) 2002-2015 Het FreeCol-team
 aboutPanel.legalDisclaimer=FreeCol is vrije software: u kunt het herdistribueren en/of aanpassen volgens de voorwaarden van de GNU General Public License zoals gepubliceerd door de Free Software Foundation, versie 2 van de Licentie, of enige latere versie.
 aboutPanel.officialSite=Website:
@@ -2716,8 +2664,7 @@ colonyPanel.buildQueue=Wachtrij bouwen
 colonyPanel.colonyUnits=Kolonieeenheden
 colonyPanel.inPort=In de haven
 colonyPanel.outsideColony=Buiten kolonie
-# Fuzzy
-colonyPanel.producing=Produceert:
+colonyPanel.producing=produceert:
 colonyPanel.reducePopulation=Als u de bevolking tot onder %number% laat slinken, dan is %colony% niet langer in staat een %buildable% te bouwen.
 colonyPanel.unitChange=Bij het betreden van uw kolonie is uw %oldType% een %newType% geworden.
 colonyPanel.warehouse=Magazijn
@@ -2730,10 +2677,8 @@ confirmDeclarationDialog.areYouSure.no=Misschien een andere keer
 confirmDeclarationDialog.areYouSure.text=Laat ons de onrechtvaardige tirannie van %monarch% afwijzen en laat ons de onafhankelijkheid van onze kolonies van de kroon verklaren!
 confirmDeclarationDialog.areYouSure.yes=Vrijheid of de dood!
 confirmDeclarationDialog.createFlag=en onze vijanden zullen sidderen bij de aanblik van onze uitdagende banier.
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=Verenigde Staten van %nation%
-# Fuzzy
-confirmDeclarationDialog.defaultNation=Vrije %nation%
+confirmDeclarationDialog.defaultCountry=Verenigde Staten van {{tag:country|%nation%}}
+confirmDeclarationDialog.defaultNation={{tag:country|%nation%}} bevrijden
 confirmDeclarationDialog.enterCountry=Voortaan staat ons land bekend als
 confirmDeclarationDialog.enterNation=en elke burger van ons glorierijke land zal trots zijn om bekend te staan als
 flag.background.FESSES=Fasen
@@ -2782,11 +2727,9 @@ negotiationDialog.add=Toevoegen
 negotiationDialog.cancel=Annuleren
 negotiationDialog.clear=Wissen
 negotiationDialog.contact.tutorial=U komt mede-Europeanen tegen. Zij wedijveren met u om land en rijkdommen, en voeren mogelijk zelfs oorlog met u. Maar nadat Jan de Witt is toegetreden tot het Continentale Congres, kunt u handel met ze drijven.
-# Fuzzy
-negotiationDialog.demand=De %nation% eisen van de %otherNation%
+negotiationDialog.demand=De{{tag:country|%nation%}} eisen van de {{tag:country|%otherNation%}}
 negotiationDialog.exchange=in ruil voor
-# Fuzzy
-negotiationDialog.offer=De %nation% bieden de %otherNation% aan
+negotiationDialog.offer=De {{tag:country|%nation%}} bieden de {{tag:country|%otherNation%}} aan
 negotiationDialog.send=Verzenden
 negotiationDialog.title.contact=Kennis maken met mede-Europeanen
 negotiationDialog.title.diplomatic=Diplomatieke onderhandelingen
@@ -2808,8 +2751,7 @@ findSettlementPanel.displayAll=Alle nederzettingen vinden
 findSettlementPanel.displayOnlyEuropean=Alleen Europese nederzettingen vinden
 findSettlementPanel.displayOnlyNatives=Alleen inheemse nederzettingen vinden
 findSettlementPanel.name=Nederzetting zoeken
-# Fuzzy
-firstContactDialog.meeting.natives=Ontmoetingen met de inheemsen...
+firstContactDialog.meeting.natives=Ontmoetingen met de inheemsen
 firstContactDialog.meeting.natives.tutorial=U ontmoet de inheemse bevolking. Stuur uw verkenners naar hun nederzettingen om meer over ze te leren en stuur ook uw bedienden en vrije kolonisten zodat ze meer over hun kunnen leren. Stuur uw schepen en huifkarren als u handel met ze wil drijven.
 firstContactDialog.welcomeOffer.text=De %nation% verwelkomen u. Wij zijn de glorieuze natie van %camps% %settlementType%. Om onze vriendschap te vieren, bieden wij het land dat u nu bezet aan als gift. Accepteert u ons voorstel en leeft u met ons samen als broeders?
 firstContactDialog.welcomeSimple.text=De %nation% verwelkomen u. Wij zijn de glorieuze natie van %camps% %settlementType%. Accepteert u ons voorstel en leeft u met ons samen als broeders?
@@ -2832,8 +2774,7 @@ indianSettlementPanel.learnableSkill=De volgende beroepen kunnen getraind worden
 indianSettlementPanel.highlyWanted=Deze kolonie is zeer geïnteresseerd in de handel van:
 indianSettlementPanel.otherWanted=Andere goederen die hier verhandeld kunnen worden zijn:
 indianSettlementPanel.mostHated=De meest gehate natie in deze nederzetting:
-# Fuzzy
-infoPanel.defenseBonus=Verdedigingsbonus %bonus%%
+infoPanel.defenseBonus=Verdediging %bonus%%
 infoPanel.endTurn=Druk op enter om de beurt te beëindigen.
 infoPanel.moves=Stappen:
 loadingSavegameDialog.port=Poort:
diff --git a/data/strings/FreeColMessages_pl_PL.properties b/data/strings/FreeColMessages_pl_PL.properties
index 997f8b4ca..2fa89cb65 100644
--- a/data/strings/FreeColMessages_pl_PL.properties
+++ b/data/strings/FreeColMessages_pl_PL.properties
@@ -9,6 +9,7 @@
 # Author: Krzysiek
 # Author: Luxus
 # Author: Macofe
+# Author: Mateon1
 # Author: Mateuszlacki
 # Author: Misiulo
 # Author: PiotrAntosz
@@ -87,6 +88,7 @@ remove=Usuń
 rename=Zmień nazwę
 reset=Reset
 save=Zapisz
+select=Wybierz
 server=Serwer
 skip=Pomiń
 small=Mała
@@ -2488,8 +2490,7 @@ chooseFoundingFatherDialog.title=Nominuj Ojca Założyciela
 colonyPanel.colonyUnits=Jednostki kolonii
 colonyPanel.inPort=W porcie
 colonyPanel.outsideColony=Poza osadą
-# Fuzzy
-colonyPanel.producing=Produkcja:
+colonyPanel.producing=produkcja:
 colonyPanel.reducePopulation=Jeśli ludności będzie mniej niż %number%, w %colony% nie uda się zbudować %buildable%.
 colonyPanel.unitChange=Podczas wejścia do kolonii twoja jednostka %oldType% została %newType%.
 colonyPanel.bonusLabel=Bonus: %number%%extra%
diff --git a/data/strings/FreeColMessages_pt_BR.properties b/data/strings/FreeColMessages_pt_BR.properties
index e55a2fd59..7f8beb34a 100644
--- a/data/strings/FreeColMessages_pt_BR.properties
+++ b/data/strings/FreeColMessages_pt_BR.properties
@@ -72,7 +72,7 @@ color=Cor
 connect=Conectar
 current=Atual
 false=Falso
-fill=preencher
+fill=Preencher
 height=Altura
 help=Ajuda
 high=Alto
@@ -190,7 +190,7 @@ cli.error.clientOptions=Ignorando o arquivo ilegível de opções do cliente: %s
 cli.error.debug=Modo da lista de conserto de erros (%modes%) esperados.
 cli.error.difficulties=Níveis de dificuldade (%difficulties%) achados, esperados: %arg%
 cli.error.europeans=Número de nações europeias deve ser no mínimo %min%
-cli.error.gui-scale=Porcentaxe de escala da GUI (%scales%) esperada, atopouse: %arg%
+cli.error.gui-scale=Era esperado a porcentagem da escala da GUI (%scales%), encontrou-se: %arg%
 cli.error.home.noRead=Impossível ler de %string%.
 cli.error.home.noWrite=Impossível gravar em %string%.
 cli.error.home.notDir=%string% não é um diretório.
@@ -213,8 +213,8 @@ cli.fast=pular todos os diálogos de configurações
 cli.font=definir a fonte padrão
 cli.freecol-data=define o DIRETÓRIO de dados do FreeCol (tem um subdiretório chamado 'base')
 cli.full-screen=executar FreeCol em modo de tela cheia
-cli.gui-scale=elementos escala GUI, com a escala opcional (%scales%)
-cli.headless=\nexecutado no modo sem cabeça
+cli.gui-scale=elementos da escala da GUI, com a ESCALA opcional (%scales%)
+cli.headless=executar no modo sem cabeça
 cli.help=exibe esta tela de ajuda
 cli.load-savegame=carrega o ARQUIVO de jogo salvo dado
 cli.log-console=registra também no terminal além de em arquivo
@@ -236,7 +236,7 @@ cli.user-cache-directory=Defina o diretório poara o cache de usuário do Freeco
 cli.user-config-directory=definir o DIRETÓRIO para configurações do usuário do FreeCol
 cli.user-data-directory=definir o DIRETÓRIO para dados do usuário do FreeCol
 cli.version=exibe o número de versão e encerra
-cli.windowed=FreeCol executado no modo de janela, com dimensões opcionais
+cli.windowed=executar FreeCol no modo de janela, com DIMENSÕES opcionais
 menuBar.colopedia=Colonizopedia
 menuBar.game=Jogo
 menuBar.orders=Ordens
@@ -253,8 +253,8 @@ menuBar.debug.addLiberty=Adicionar liberdade para cada colônia
 menuBar.debug.compareMaps.checkComplete=Busca completa. Dessincronização não encontrada.
 menuBar.debug.compareMaps.problem=Provável problema descoberto. Por favor leia as informações para entender o erro.
 menuBar.debug.compareMaps=Procurar dessincronização no mapa.
-menuBar.debug.displayAIMissions=Mostrar missões AI
-menuBar.debug.displayAdditionalAIMissionInfo=Exibir informações adicionais missão AI
+menuBar.debug.displayAIMissions=Mostrar missões IA
+menuBar.debug.displayAdditionalAIMissionInfo=Exibir informações adicionais da missão IA
 menuBar.debug.displayErrorMessage=Mostrar mensagem de erro
 menuBar.debug.displayEuropeStatus=Mostrar a situação da Europa
 menuBar.debug.displayMonarchPanel=Mostrar o painel do Monarca
@@ -355,7 +355,7 @@ renameAction.name=Renomear
 reportCargoAction.name=Relatório de Carga
 reportColonyAction.name=Relatório de Colônias
 reportCongressAction.name=Congresso Continental
-reportEducationAction.name=Relatório educação
+reportEducationAction.name=Relatório Educação
 reportExplorationAction.name=Relatório de Exploração
 reportForeignAction.name=Relatório das Relações Exteriores
 reportHighScoresAction.name=Melhores Pontuações
@@ -437,15 +437,15 @@ model.option.buildOnNativeLand.never.shortDescription=Não é permitida a constr
 model.option.settlementNumber.name=Número de acampamentos dos nativos
 model.option.settlementNumber.shortDescription=Defina o número de acampamentos dos nativos nos mapas gerados.
 model.option.settlementNumber.verySmall.name=Muito pequeno
-model.option.settlementNumber.verySmall.shortDescription=Muito poucos assentamentos indígenas
+model.option.settlementNumber.verySmall.shortDescription=Muito poucos assentamentos nativos
 model.option.settlementNumber.small.name=Pequeno
-model.option.settlementNumber.small.shortDescription=Pequeno número de assentamentos indígenas
+model.option.settlementNumber.small.shortDescription=Pequeno número de assentamentos nativos
 model.option.settlementNumber.medium.name=Médio
-model.option.settlementNumber.medium.shortDescription=Número médio de assentamentos indígenas
-model.option.settlementNumber.large.name=grande
-model.option.settlementNumber.large.shortDescription=Grande número de assentamentos indígenas
+model.option.settlementNumber.medium.shortDescription=Número médio de assentamentos nativos
+model.option.settlementNumber.large.name=Grande
+model.option.settlementNumber.large.shortDescription=Número grande de assentamentos nativos
 model.option.settlementNumber.veryLarge.name=Muito grande
-model.option.settlementNumber.veryLarge.shortDescription=Assentamentos nativos abundantes
+model.option.settlementNumber.veryLarge.shortDescription=Abundantes assentamentos nativos
 model.difficulty.monarch.name=Monarca
 model.option.monarchMeddling.name=Interferência do Monarca
 model.option.monarchMeddling.shortDescription=Aumenta o número e gravidade das interferências do Monarca.
@@ -498,15 +498,15 @@ model.option.unitsThatUseNoBells.shortDescription=O número de colonos em uma co
 model.option.tileProduction.name=Produção dos terrenos
 model.option.tileProduction.shortDescription=A variação da quantidade da produção
 model.option.tileProduction.veryLow.name=Muito baixo
-model.option.tileProduction.veryLow.shortDescription=Muito baixa produção de telhas
+model.option.tileProduction.veryLow.shortDescription=Produção muito baixa de telhas
 model.option.tileProduction.low.name=Baixo
-model.option.tileProduction.low.shortDescription=Baixa produção de telha
+model.option.tileProduction.low.shortDescription=Baixa produção de telhas
 model.option.tileProduction.medium.name=Médio
-model.option.tileProduction.medium.shortDescription=Produção de ladrilhos Médio
+model.option.tileProduction.medium.shortDescription=Produção média de telhas
 model.option.tileProduction.high.name=Alto
-model.option.tileProduction.high.shortDescription=A alta produção de telha
+model.option.tileProduction.high.shortDescription=Alta produção de telhas
 model.option.tileProduction.veryHigh.name=Muito alto
-model.option.tileProduction.veryHigh.shortDescription=Produção muito elevada telha
+model.option.tileProduction.veryHigh.shortDescription=Produção muito elevada de telhas
 model.option.badRumour.name=Chance de rumor ruim
 model.option.badRumour.decription=Porcentagem de chance de um rumor ter resultado ruim.
 model.option.goodRumour.name=Chance de bons  rumores
@@ -546,7 +546,7 @@ model.option.settlementActionsContactChief.shortDescription=Todas as interaçõe
 model.option.enhancedMissionaries.name=Missionários melhorados
 model.option.enhancedMissionaries.shortDescription=Missões missionárias melhoram o comércio, habilidades ensinadas e dar visibilidade ao redor.
 model.option.missionInfluence.name=Missão Influência
-model.option.missionInfluence.shortDescription=A força da influência de uma missão para o nível de alarme dos nativos em um acordo.
+model.option.missionInfluence.shortDescription=A força da influência de uma missão no nível de alarme dos nativos em um assentamento.
 model.option.giftProbability.name=Probabilidade de receber presente
 model.option.giftProbability.shortDescription=Porcentagem por turno de chance que uma assentamento nativo pacífico oferecer os excedentes de produção como um presente para um assentamento europeu amigável nas proximidades.
 model.option.demandProbability.name=Probabilidade de demanda
@@ -575,26 +575,26 @@ model.option.equipEuropeanRecruits.name=Equipar recrutas Europeus
 model.option.equipEuropeanRecruits.shortDescription=Treinados recentemente ou recrutas na Europa estão equipados de acordocom a configuração padrão
 gameOptions.colony.name=Opcões da Colônia
 gameOptions.colony.shortDescription=Contém opções relacionadas ao comportamento das colônias.
-model.option.bellAccumulationCapped.name=Acumulação de Bell tampado
-model.option.bellAccumulationCapped.shortDescription=Colônias não pode acumular mais uma vez sinos 100% rebeldes são atingidos
-model.option.captureUnitsUnderRepair.name=Unidades de captura em reparação
-model.option.captureUnitsUnderRepair.shortDescription=Capturar unidades em reparação quando uma colônia é conquistada.
+model.option.bellAccumulationCapped.name=Acumulação de sinos interrompida
+model.option.bellAccumulationCapped.shortDescription=Colônias não podem acumular mais sinos depois que é atingido 100% rebeldes
+model.option.captureUnitsUnderRepair.name=Capturar unidades em reparos
+model.option.captureUnitsUnderRepair.shortDescription=Capturar unidades em reparos quando uma colônia é conquistada.
 model.option.customIgnoreBoycott.name=Casa de Comércio ignora boicote
 model.option.customIgnoreBoycott.shortDescription=A Casa de Comércio venderá produtos sob boicote.
-model.option.customsOnCoast.name=Alfândegas na costa
-model.option.customsOnCoast.shortDescription=Alfândegas só podem ser construídas nas colônias costeiras.
-model.option.disembarkInColony.name=Desembarque em Colônia
-model.option.disembarkInColony.shortDescription=Todas as unidades desembarcar quando um veículo chega numa colónia.
+model.option.customsOnCoast.name=Casas de comércio na costa
+model.option.customsOnCoast.shortDescription=Casas de comércio só podem ser construídas em colônias costeiras.
+model.option.disembarkInColony.name=Desembarque na Colônia
+model.option.disembarkInColony.shortDescription=Todas as unidades desembarcam quando um veículo chega a uma colônia.
 model.option.expertsHaveConnections.name=Experts possuem contatos
 model.option.expertsHaveConnections.shortDescription=Profissionais podem usar seus contatos para prover quantidades mínimas para manter a produção nas fábricas.
 model.option.foundColonyDuringRebellion.name=Colonias fundadas durante  a rebelião
 model.option.foundColonyDuringRebellion.shortDescription=O jogador pode continuar fundadndo colonias durante a guerra da independencia.
 model.option.payForBuilding.name=Pagar para a construção
-model.option.payForBuilding.shortDescription=Buildables pode ser concluída rapidamente, pagando para as mercadorias em falta.
+model.option.payForBuilding.shortDescription=Construções podem ser concluídas rapidamente pagando pelas mercadorias que faltam.
 model.option.saveProductionOverflow.name=Guardar o excedenta da produção
 model.option.saveProductionOverflow.shortDescription=Guardar o excedente de martelos, sinos e cruzes.
-model.option.clearHammersOnConstructionSwitch.name=Martelos claras sobre interruptor de construção
-model.option.clearHammersOnConstructionSwitch.shortDescription=Zero os martelos acumulados se as mudanças atuais edificáveis.
+model.option.clearHammersOnConstructionSwitch.name=Remove martelos ao alterar a construção
+model.option.clearHammersOnConstructionSwitch.shortDescription=Remove os martelos acumulados se a construção for alterada.
 model.option.allowStudentSelection.name=Permitir seleção de estudantes
 model.option.allowStudentSelection.shortDescription=Permite a atribuição de estudantes manual, em vez de automática
 model.option.enableUpkeep.name=Edifícios precisam de manutenção (EXPERIMENTAL)
@@ -623,7 +623,7 @@ model.option.lastYear.name=Último ano do jogo
 model.option.lastYear.shortDescription=O último ano do jogo.
 model.option.lastColonialYear.name=Último ano colonial do jogo
 model.option.lastColonialYear.shortDescription=O último ano do jogo para um jogador colonial.
-model.option.independenceTurn.name=independência Ligue
+model.option.independenceTurn.name=Turno Independência
 model.option.seasons.name=Sessões
 gameOptions.prices.name=Opções de Preços
 gameOptions.prices.shortDescription=Contem opições geradas no jogo que controlam o preço inicial dos itens.
diff --git a/data/strings/FreeColMessages_pt_PT.properties b/data/strings/FreeColMessages_pt_PT.properties
index 9c485c2f2..5d6837b22 100644
--- a/data/strings/FreeColMessages_pt_PT.properties
+++ b/data/strings/FreeColMessages_pt_PT.properties
@@ -1,5 +1,6 @@
 # Messages for Portuguese (português)
 # Exported from translatewiki.net
+# Author: Cainamarques
 # Author: Clno
 # Author: Crazymadlover
 # Author: Danielsouzat
@@ -10,6 +11,7 @@
 # Author: Imperadeiro90
 # Author: Imperadeiro98
 # Author: JasonZe
+# Author: Jkb8
 # Author: Knitter
 # Author: Luckas
 # Author: Luckas Blade
@@ -60,8 +62,7 @@ connect=Connectar
 # Fuzzy
 current=Atual
 false=Falso
-# Fuzzy
-fill=Resultado final
+fill=Preencher
 height=Altura
 help=Ajuda
 high=Alto
@@ -423,6 +424,7 @@ model.option.interventionForce.name=Força de Intervenção
 model.option.interventionForce.shortDescription=A Força de Intervenção oferece-te apoio na Guerra de Independência.
 model.option.mercenaryForce.name=Força mercenária
 model.option.mercenaryForce.shortDescription=A Força Mercenária oferece-te apoio na tua Guerra de Independência.
+model.option.warSupportForce.shortDescription=A Força máxima oferecida pelo Monarca para apoiar suas guerras.
 model.difficulty.government.name=Governo
 model.option.badGovernmentLimit.name=Limite de má governação
 model.option.badGovernmentLimit.shortDescription=O número máximo de monarquistas que não provocam uma penalização de produção.
@@ -1565,12 +1567,10 @@ model.historyEventType.formAlliance.description=Aliança negociada com %nation%.
 model.historyEventType.foundColony.description=Fundou a colónia de %colony%.
 model.historyEventType.foundingFather.description=%father% entrou no Congresso Continental.
 model.historyEventType.independence.description=Conquistou a sua independência da Coroa!
-# Fuzzy
-model.historyEventType.meetNation.description=Encontra os %nation%.
+model.historyEventType.meetNation.description=Encontra os %nation% nação.
 # Fuzzy
 model.historyEventType.nationDestroyed.description=Os %nation% já não estão presentes no Novo Mundo.
-# Fuzzy
-model.historyEventType.spanishSuccession.description=Os %loserNation% cederam todas as colónias no Novo Mundo aos %nation%.
+model.historyEventType.spanishSuccession.description=Os {{tag:country|%loserNation%}} cederam todas as colónias no Novo Mundo aos {{tag:country|%nation%}}.
 model.indianSettlement.mostHatedNone=Nenhum
 model.indianSettlement.mostHatedUnknown=Desconhecida
 model.indianSettlement.nameUnknown=Por determinar
@@ -1725,8 +1725,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.alreadyPresent.description=Já presente nesta localização
@@ -1770,8 +1769,7 @@ model.player.autoRecruit=A agitação religiosa em %europe% forçam a emigraçã
 model.player.colonyGoodsParty.harbour=Seus colonos em %colony% jogaram %amount% unidades de %goods% ao mar, em protesto à taxação injusta pretendida pela Coroa!
 model.player.colonyGoodsParty.horses=Os seus colonos de %colony% libertaram %amount% cavalos em protesto contra estes impostos injustos da Coroa!
 model.player.colonyGoodsParty.landLocked=Seus colonos em %colony% queimaram %amount% unidades de %goods% no mercado em protesto a esta taxação injusta da Coroa!
-# Fuzzy
-model.player.dead.european=Vossa Excelência, os %nation% declararam a sua retirada incondicional dos assuntos do Novo Mundo!
+model.player.dead.european=Vossa Excelência, os{{tag:country|%nation%}} declararam a sua retirada incondicional dos assuntos do Novo Mundo!
 model.player.dead.native=Vossa Excelência, os %nation% foram destruídos.
 model.player.disaster.effect.colonyDestroyed=%colony% foi completamente destruída.
 model.player.disaster.strikes=A sua colónia %colony%, foi atacada por um %disaster%.
@@ -1866,11 +1864,9 @@ metaServer.couldNotConnect=Desculpe, não foi possível ligar ao meta-servidor.
 metaServer.communicationError=Houve um erro na comunicação com o meta-servidor. Tente novamente mais tarde.
 abandonEducation.action.studying=estudas
 abandonEducation.action.teaching=ensino
-# Fuzzy
-abandonEducation.no=Não, continuar a educação
+abandonEducation.no=Continuar a educação
 abandonEducation.text=Se o seu %unit% abandonar %colony% irá abandonar a %action% no %building%. Tem a certeza que deseja continuar?
-# Fuzzy
-abandonEducation.yes=Sim, deixar a colónia
+abandonEducation.yes=Abandonar educação
 abandonTeaching.text=Se o %unit% abandonar a %building% vai parar de ensinar. Tem a certeza que ele o deve fazer?
 armedUnitSettlement.attack=Atacar
 boycottedGoods.dumpGoods=Largar Mercadorias
@@ -2159,6 +2155,8 @@ report.colony.making.header=A fabricar
 report.colony.making.noconstruction.description=%colony%: Nada está a ser construído.
 report.colony.name.description=A lista de colónias
 report.colony.name.header=Colónia
+report.colony.tile.plow.description=%colony% iria beneficiar se ara-se {{plural:%amount%|one=um terreno|other=%amount% terrenos}}
+report.colony.tile.plow.header=P
 report.colony.starving.description=%colony%: haverá fome {{plural:%turns%|one=no próximo turno|other=em %turns% turnos}}
 # Fuzzy
 report.colony.wanting.description=%colony%: Para produzir mais %amount% de %goods% adicione %unit%
@@ -2216,6 +2214,7 @@ report.requirements.surplus=Está a ser produzido um excedente de %goods% em
 report.trade.afterTaxes=Receita após os impostos
 report.trade.beforeTaxes=Receita antes dos impostos
 report.trade.cargoUnits=Unidades na Carga
+report.trade.export=Exportando %goods% do sequinte valor %amount%
 # Fuzzy
 report.trade.hasCustomHouse=* Esta colónia tem uma alfândega; estas mercadorias são exportadas.
 report.trade.totalDelta=Total de Produção
@@ -2227,6 +2226,7 @@ report.turn.ignore=Ignorar esta mensagem (Colónia: %colony%, Mercadorias: %good
 report.turn.playerNation=%nation% de %player%
 aboutPanel.copyright=Copyright © 2002-2015 A Equipa do FreeCol
 aboutPanel.legalDisclaimer=O FreeCol é software livre: pode redistribuí-lo ou modificá-lo nos termos da GNU General Public License tal como publicada pela Free Software Foundation, versão 2 da Licença ou qualquer versão posterior.
+aboutPanel.manual=Descarga do manual de FreeCol
 aboutPanel.officialSite=Site oficial:
 aboutPanel.sfProject=Projeto SourceForge:
 aboutPanel.version=Versão:
@@ -2261,10 +2261,8 @@ colonyPanel.notBestTile=%unit% poderia produzir mais %goods% em %tile%.
 confirmDeclarationDialog.areYouSure.no=Talvez Mais Tarde
 confirmDeclarationDialog.areYouSure.text=Renunciemos à tirania injusta de %monarch% e declaremos a independência da coroa para as nossas colónias!
 confirmDeclarationDialog.areYouSure.yes=A Liberdade ou a Morte!
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=Estados Unidos de %nation%
-# Fuzzy
-confirmDeclarationDialog.defaultNation=%nation% Livre
+confirmDeclarationDialog.defaultCountry=Estados Unidos de {{tag:country|%nation%}}
+confirmDeclarationDialog.defaultNation=Livre {{tag:country|%nation%}}
 confirmDeclarationDialog.enterCountry=De ora em diante, o nosso país será conhecido por
 confirmDeclarationDialog.enterNation=e todos os cidadãos da nossa gloriosa nação terão orgulho em serem conhecidos por
 flag.backgroundColors.label=Cor de Fundo
@@ -2297,6 +2295,7 @@ europePanel.transaction.price=Preço:\t%gold%
 europePanel.transaction.purchase=Comprar %amount% %goods% por %gold% de ouro
 europePanel.transaction.sale=Vender %amount% %goods% @%gold%
 europePanel.transaction.tax=-%tax%%:\t%gold%
+firstContactDialog.meeting.inca=O império Inca
 firstContactDialog.welcomeOffer.text=Os %nation% dão-lhe as boas vindas. Somos uma nação gloriosa de %camps% %settlementType%. Para celebrar a nossa amizade, oferecemos-lhe a terra que ocupa agora. Aceita o nosso tratado e viver em paz connosco, como irmãos?
 firstContactDialog.welcomeSimple.text=Os %nation% dão-lhe as boas vindas. Somos uma nação gloriosa de %camps% %settlementType%. Aceita o nosso tratado e viver em paz connosco, como irmãos?
 abandonColony.no=Cancelar
diff --git a/data/strings/FreeColMessages_ru.properties b/data/strings/FreeColMessages_ru.properties
index 5e858500b..5d34a808c 100644
--- a/data/strings/FreeColMessages_ru.properties
+++ b/data/strings/FreeColMessages_ru.properties
@@ -12,6 +12,7 @@
 # Author: Eleferen
 # Author: Eroha
 # Author: Ferrer
+# Author: INS Pirat
 # Author: Inpw
 # Author: KennyTHPS
 # Author: Kirill
@@ -232,6 +233,7 @@ cli.no-intro=пропустить вступительное видео
 cli.no-java-check=пропустить проверку версии Java
 cli.no-memory-check=пропустить проверку памяти
 cli.no-sound=запустить FreeCol без звука
+cli.no-splash=пропустить заставку
 cli.private=запустить частный сервер (без публикации на metaserver)
 cli.seed=начальное число для генератора псевдослучайных чисел
 cli.server-name=указать ИМЯ сервера
@@ -2197,8 +2199,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.alreadyPresent.description=Уже присутствует в этом месте.
@@ -2225,6 +2226,7 @@ model.colony.colonyStarved=Голодает последний колонист
 model.colony.customs.sale=Таможня в %colony% продала: %data%.
 model.colony.customs.saleData=%amount% %goods% за %gold%
 model.colony.famineFeared=Ожидание голода в колонии %colony%. Осталось пищи только на %number% {{plural:%number%|one=ход|few=хода|many=ходов|default=ходов}}.
+model.colony.starving=%colony% голодает.
 model.colony.newColonist=Новый поселенец в колонии %colony%.
 model.colony.newConvert=Новый крещёный индеец %nation% прибыл в колонию %colony%.
 model.colony.notBuildingAnything=Ничего не строится в колонии %colony%.
@@ -2344,8 +2346,7 @@ main.javaVersion=Для запуска FreeCol рекомендуется Java 
 main.memory=Необходимо назначить более %memory% байт памяти для JVM.\n  Перезапустите FreeCol с: java-Xmx%minMemory%М-jar FreeCol.jar
 main.userDir.fail=FreeCol не может найти подходящих каталогов для сохранения пользовательских данных. Продолжаем, но ждите неприятностей.
 client.baseData=Не удалось найти каталог базы данных  %dir%. FreeCol не удалось найти файлы данных. Убедитесь, что они существуют. Если FreeCol ищет в неверной директории, тогда запустите игру с параметром командной строки:  --freecol-data<data-directory>
-# Fuzzy
-client.choicePlayer=Выберите игрока:
+client.choicePlayer=Пожалуйста, выбирайте нацию:
 client.classic=Не удалось загрузить ресурс из набора правил `классический'.
 client.debugConnect=Вы не можете подключиться к этой игре в режиме отладки.
 client.ending=Игра завершается.
@@ -2357,11 +2358,9 @@ metaServer.couldNotConnect=Извините, не могу подключить
 metaServer.communicationError=Во время общения с мета-сервером возникла ошибка. Пожалуйста, поброуйте позже.
 abandonEducation.action.studying=изучение
 abandonEducation.action.teaching=обучение
-# Fuzzy
-abandonEducation.no=Нет, продолжить обучение
+abandonEducation.no=Продолжить обучение
 abandonEducation.text=Если ваш %unit% покинет колонию %colony%, он откажется от %action% в %building%, вы уверены?
-# Fuzzy
-abandonEducation.yes=Да, покинуть колонию
+abandonEducation.yes=Прервать обучение
 abandonTeaching.text=Если %unit% покинет %building% он прекратит обучение, вы уверены что ему пора это сделать?
 armedUnitSettlement.attack=Атаковать
 armedUnitSettlement.tribute=Требовать дань
@@ -2493,8 +2492,7 @@ move.noAccessGoods=%nation% не станут торговать с %unit% бе
 move.noAccessMissionBan=%nation% отвергли все контакты с вашими миссионерами.
 move.noAccessSettlement=%nation% не разрешают войти в поселение нашему %unit%.
 move.noAccessSkill=Наш %unit% не может учиться у индейцев.
-# Fuzzy
-move.noAccessTrade=Мы не имеем права торговать с другими европейскими нациями, такими, как %nation%.
+move.noAccessTrade=Мы не имеем права торговать с другими европейскими нациями, такими как {{tag:country|%nation%}}.
 # Fuzzy
 move.noAccessWar=Мы не можем торговать с {{tag:with|%nation%}} во время войны.
 move.noAccessWater=Наш %unit% должен высадиться на берег, прежде чем входить в поселение.
@@ -2690,6 +2688,7 @@ report.labour.unitTotal.tooltip=%unit% или становится %unit%
 report.labour.workingAs=Работает как
 report.labour.workingAsOther=другой
 report.colony.arriving.description=%colony%: новый %unit% появится через %turns% {{plural:%turns%|one=ход|few=хода|many=ходов}}
+report.colony.arriving.summary.description=Среднее число ходов между прибытием каждого нового колониста в колонии на этом континенте.
 report.colony.birth.description=Число ходов до того как новый поселенец прибудет или начнет голодать
 report.colony.explore.description=Количество единиц площади, которые необходимо исследовать рядом с этой колонией
 report.colony.explore.header=И
@@ -2697,6 +2696,7 @@ report.colony.exploring.description=%colony% извлечёт выгоду из
 report.colony.grow.description=Количество единиц, на которое может вырасти колония без ущерба для производства
 report.colony.grow.header=+
 report.colony.growing.description=%colony% может быть увеличена на {{plural:%amount%|one=одного  жителя|few=%amount% жителя|many=%amount% жителей}} без ущерба для производства.
+report.colony.growing.summary.description=Общее число колонистов, которое может присоединиться к колониям на этом континенте, не навредив производству.
 # Fuzzy
 report.colony.improve.description=Средства, которые могут повысить производительность по сравнению со средствами, используемыми в настоящий момент
 report.colony.improve.header=Улучшение
@@ -2791,6 +2791,7 @@ report.turn.ignore=Игнорировать это сообщение (Коло
 report.turn.playerNation=%player% - %nation%
 aboutPanel.copyright=Авторские права © 2002—2015 Команда FreeCol
 aboutPanel.legalDisclaimer=FreeCol является свободным программным обеспечением. Вы можете распространять и/или изменять его в соответствии с условиями лицензии GNU GPL, опубликованной Фондом свободного программного обеспечения, версии 2 либо более поздней по вашему выбору.
+aboutPanel.manual=Скачать руководство по FreeCol
 aboutPanel.officialSite=Сайт:
 aboutPanel.sfProject=Проект в SourceForge:
 aboutPanel.version=Версия:
@@ -2813,8 +2814,7 @@ colonyPanel.buildQueue=Очередь постройки
 colonyPanel.colonyUnits=Колониальные юниты
 colonyPanel.inPort=В порту
 colonyPanel.outsideColony=Снаружи колонии
-# Fuzzy
-colonyPanel.producing=Производство:
+colonyPanel.producing=производство:
 colonyPanel.reducePopulation=Если вы уменьшите население колонии ниже %number%, то %colony% не сможет больше строить %buildable%.
 colonyPanel.unitChange=В %colony% ваш %oldType% стал %newType%.
 colonyPanel.warehouse=Склад
@@ -2909,6 +2909,8 @@ findSettlementPanel.name=Найти поселение
 # Fuzzy
 firstContactDialog.meeting.natives=Встреча аборигенов…
 firstContactDialog.meeting.natives.tutorial=Вы встретили местных уроженцев. Посылайте ваших разведчиков к их поселениям для того, чтобы узнать о них больше, а закупов и свободных колонистов — чтобы учиться у них. Посылайте ваши корабли и обозы к их поселениям, если желаете торговать с ними.
+firstContactDialog.meeting.aztec=Нация ацтеков
+firstContactDialog.meeting.inca=Империи инков
 firstContactDialog.welcomeOffer.text=%nation% приветствуют вас. Мы выдающаяся нация, у нас %camps% {{plural:%camps%|%settlementType%}}. Чтобы отпраздновать нашу дружбу, мы щедро дарим вам земли, которые вы сейчас занимаете. Примете ли вы наш договор, будете ли жить с нами в мире как братья?
 firstContactDialog.welcomeSimple.text=%nation% приветствуют вас. Мы выдающаяся нация, у нас %camps% {{plural:%camps%|%settlementType%}}. Примете ли вы наш договор, будите ли жить с нами в мире как братья?
 abandonColony.no=Отмена
diff --git a/data/strings/FreeColMessages_sk.properties b/data/strings/FreeColMessages_sk.properties
index 3cd26557c..0629f9b83 100644
--- a/data/strings/FreeColMessages_sk.properties
+++ b/data/strings/FreeColMessages_sk.properties
@@ -97,6 +97,7 @@ cashInTreasureTrain=Hotovosť v poklade
 clearOrders=Vymazať príkazy
 colonists=Kolonisti
 colopedia=Colopedia
+countryName={{tag:country|%nation%}}
 difficulty=Obtiažnosť
 docks=Doky
 dumpCargo=Vyhodiť náklad
@@ -170,6 +171,7 @@ cli.error.home.notDir=%string% nieje adresár.
 cli.error.home.notExists=Adresár %string% neexistuje.
 cli.error.save=Nemožno čítať uloženú hru %string%.
 cli.error.serverPort=%string% nieje platné číslo portu.
+cli.error.splash=Súbor s úvodným obrázkom %name% nenájdený.
 cli.error.timeout=%string% je príliš krátke (menej než %minimum%).
 cli.advantages=nastaviť typ VÝHOD (%advantages%)
 cli.check-savegame.failure=Kontrola konzistencie uloženej hry zlyhala, skontrolujte podrobnosti v denníku.
@@ -197,6 +199,7 @@ cli.no-intro=vynechať úvodné video
 cli.no-java-check=vynechať kontrolu verzie javy
 cli.no-memory-check=vynechať kontrolu pamäte
 cli.no-sound=spustiť FreeCol bez zvuku
+cli.no-splash=preskočiť úvodnú obrayovku
 cli.private=spustiť súkromný server (nepublikovaný na metaserver)
 cli.seed=zadať SEED pre pseudo generátor náhodných čísiel
 cli.server-name=zadať vlastný NÁZOV servera
@@ -208,8 +211,7 @@ cli.user-cache-directory=nastaviť cache ADRESÁRA užívateľa FreeCol
 cli.user-config-directory=nastaviť ADRESÁR užívateľovej konfigurácie FreeCol
 cli.user-data-directory=nastaviť ADRESÁR údajov užívateľa FreeCol
 cli.version=zobraziť číslo verzie a odísť
-# Fuzzy
-cli.windowed=spustiť FreeCol vo vlastnom okne namiesto na celú obrazovku
+cli.windowed=spustiť FreeCol v okne, s voliteľnými DIMENSIONS
 menuBar.colopedia=Kolopédia
 menuBar.game=Zver
 menuBar.orders=Príkazy
@@ -450,6 +452,8 @@ model.option.interventionForce.name=Intervenčné sily
 model.option.interventionForce.shortDescription=Intervenčné sily vyslané na podporu Vašej vojny za nezávislosť.
 model.option.mercenaryForce.name=Vojsko žoldierov
 model.option.mercenaryForce.shortDescription=Vojsko žoldnierov ponúknuté na podporu Vašej vojny za nezávislosť.
+model.option.warSupportGold.name=Zlato na podporu vojny
+model.option.warSupportGold.shortDescription=Maximum zlata ponúknuté monarchom na podporu Vašich vojen.
 model.difficulty.government.name=Vláda
 model.option.badGovernmentLimit.name=Limit zlej vlády
 model.option.badGovernmentLimit.shortDescription=Maximálny počet rojalistov, ktorý nespôsobia obmedzenie výroby.
@@ -757,6 +761,16 @@ model.option.humidity.veryWet.name=Veľmi vlhko
 model.option.humidity.veryWet.shortDescription=Veľmi vysoká vlhkosť
 model.option.temperature.name=Teplota
 model.option.temperature.shortDescription=Možnosť nastavenia priemernej teploty mapy.
+model.option.temperature.cold.name=Mrazivo
+model.option.temperature.cold.shortDescription=Veľmi nízka teplota
+model.option.temperature.chilly.name=Chladno
+model.option.temperature.chilly.shortDescription=Nízka teplota
+model.option.temperature.temperate.name=Mierna
+model.option.temperature.temperate.shortDescription=Normálna teplota
+model.option.temperature.warm.name=Teplo
+model.option.temperature.warm.shortDescription=Vysoká teplota
+model.option.temperature.hot.name=Horúco
+model.option.temperature.hot.shortDescription=Veľmi vzsoká teplota
 mapGeneratorOptions.import.name=Import
 mapGeneratorOptions.import.shortDescription=Možnosť importovania mapy alebo uloženej hry.
 model.option.importFile.name=Importovať súbor
@@ -772,6 +786,7 @@ model.option.importSettlements.shortDescription=Umožňuje importovať domorodé
 clientOptions.name=Nastavenia
 clientOptions.shortDescription=Uprednostňované možnosti klienta
 clientOptions.personal.name=Osobné
+clientOptions.personal.shortDescription=Možnosti špecifické pre hráča.
 model.option.playerName.name=Meno hráča:
 clientOptions.gui.name=Zobraziť
 clientOptions.gui.shortDescription=Obsahuje nastavenia pre prispôsobenie vzhľadu hry.
@@ -818,6 +833,10 @@ model.option.miniMapToggleBorders.name=Prepnúť okraje na mini mape
 model.option.miniMapToggleBorders.shortDescription=Ak je vybrané: vykreslí na mini mape okraje.
 model.option.mapControls.name=Ovládanie mapy
 model.option.mapControls.shortDescription=Ktoré ovládacie prvky mapy zobraziť.
+clientOptions.gui.mapControls.CornerMapControls.name=Rohy
+clientOptions.gui.mapControls.CornerMapControls.shortDescription=Ovládanie mapy zaberá rohy a spodnú hranu.
+clientOptions.gui.mapControls.ClassicMapControls.name=Klasické
+clientOptions.gui.mapControls.ClassicMapControls.shortDescription=Ovládanie mapy zaberá pravú hranu.
 model.option.color.background.name=Farba pozadia
 model.option.color.background.shortDescription=Keď je mini mapa úplne vzdialená, táto farba obklopuje mapu a hmlu vojny.
 clientOptions.minimap.color.background.black=Čierne
@@ -883,8 +902,8 @@ clientOptions.messages.guiMessagesGroupBy.source.name=Zdroj
 clientOptions.messages.guiMessagesGroupBy.source.shortDescription=Správy sú triedené podľa toho čo ich vytvorilo
 model.option.guiShowWarning.name=Varovné správy
 model.option.guiShowWarning.shortDescription=Určuje, či zobrazovať rôzne varovné správy.
-model.option.guiShowSonsOfLiberty.name=Správy o slobode
-model.option.guiShowSonsOfLiberty.shortDescription=Určuje, či zobrazovať správy o slobode na začiatku každého ťahu.
+model.option.guiShowSonsOfLiberty.name=Správy o Synoch slobody
+model.option.guiShowSonsOfLiberty.shortDescription=Určuje, či zobrazovať správy o Synoch slobody na začiatku každého ťahu.
 model.option.guiShowGovernmentEfficiency.name=Správy o výkonnosti vlády
 model.option.guiShowGovernmentEfficiency.shortDescription=Určuje, či zobrazovať správy o výkonnosti vlády na začiatku každého ťahu.
 model.option.guiShowWarehouseCapacity.name=Správy o kapacite skladu
@@ -921,8 +940,16 @@ model.option.guiShowNotBestTile.name=Nie najlepšie políčko
 model.option.guiShowNotBestTile.shortDescription=Určuje, či zobrazovať, že jednotky nepracujú na najlepšom políčku.
 model.option.colonyReport.name=Hlásenie kolónie
 model.option.colonyReport.shortDescription=Súhrn činnosti v každej kolóne.
+clientOptions.messages.colonyReport.classic.name=Klasické
+clientOptions.messages.colonyReport.classic.shortDescription=Podrobné správy o kolónii.
+clientOptions.messages.colonyReport.compact.name=Kompaktné
+clientOptions.messages.colonyReport.compact.shortDescription=Kompaktné správy o kolónii sa snažia zobraziť čo najviac o kolónii v jedinom riadku.
 model.option.labourReport.name=Pracovné hlásenie
 model.option.labourReport.shortDescription=Súhrn činnosti každej jednotky
+clientOptions.messages.labourReport.classic.name=Klasická
+clientOptions.messages.labourReport.classic.shortDescription=Klasická správa o zamestnanosti.
+clientOptions.messages.labourReport.compact.name=Kompaktná
+clientOptions.messages.labourReport.compact.shortDescription=Kompaktnejšia verzia klasickej správy.
 clientOptions.savegames.name=Uložené hry
 clientOptions.savegames.shortDescription=Uložené hry
 model.option.showSavegameSettings.name=Uložiť dialógové okno hry
@@ -955,6 +982,7 @@ model.option.lowLevel.name=Varovanie nízkej úrovne
 model.option.lowLevel.shortDescription=Vytvoriť varovanie keď zásoby klesnú pod túto úroveň.
 model.option.highLevel.name=Varovanie vysokej úrovne
 model.option.highLevel.shortDescription=Vytvoriť varovanie keď zásoby presiahnu túto úroveň.
+model.option.stockAccountsForProduction.shortDescription=Obchodné cesty kontrolujú množstvo tovarov vrátane predpokladanej výroby aby určili, či majú navštíviť zastávku.
 clientOptions.audio.name=Zvuk
 clientOptions.audio.shortDescription=Nastavenia zvuku
 clientOptions.audio.audioMixer.automatic=Automatická detekcia audio výstupu
@@ -968,16 +996,32 @@ clientOptions.other.name=Iné
 clientOptions.other.shortDescription=Možnosti, ktoré sa nehodia do ostatných kategórii
 model.option.autoloadEmigrants.name=Automaticky nalodiť prisťahovalcov pri plavbe do Ameriky
 model.option.autoloadEmigrants.shortDescription=Opýtať sa, či nalodiť prisťahovalcov pri plavbe do Ameriky.
+model.option.autoloadSentries.name=Automaticky naložiť hliadkujúce jednotky keď príde vhodný prepravca.
+model.option.autoloadSentries.shortDescription=Hliadkujúce jednotky budú automaticky naložené na dostupného dopravcu.
 model.option.autoEndTurn.name=Automaticky ukončiť ťah
 model.option.autoEndTurn.shortDescription=Automaticky ukončí ťah keď už nie sú jednotky, ktoré by sa mohli hýbať.
 model.option.showEndTurnDialog.name=Dialógové okno pri konci ťahu
 model.option.showEndTurnDialog.shortDescription=Ukázať dialógové okno pri konci ťahu ak ešte sú jednotky, ktoré by sa mohli hýbať.
 model.option.indianDemandResponse.name=Odpovedať na požiadavky indiánov
 model.option.indianDemandResponse.shortDescription=Čo urobiť keď domorodci žiadajú tovar.
+clientOptions.other.indianDemandResponse.ask.name=Spýtať sa
+clientOptions.other.indianDemandResponse.ask.shortDescription=Spýtať sa, čo robiť
+clientOptions.other.indianDemandResponse.accept.name=Prijať
+clientOptions.other.indianDemandResponse.accept.shortDescription=Prijať všetky požiadavky domorodcov
+clientOptions.other.indianDemandResponse.reject.name=Odmietnuť
+clientOptions.other.indianDemandResponse.reject.shortDescription=Odmietnuť všetky požiadavky domorodcov
 model.option.unloadOverflowResponse.name=Vyhodiť prebytok
 model.option.unloadOverflowResponse.shortDescription=Čo urobiť keď sa pri vykladaní tovaru z lode preplní sklad.
+clientOptions.other.unloadOverflowResponse.ask.name=Spýtať sa
+clientOptions.other.unloadOverflowResponse.ask.shortDescription=Spýtať sa, čo robiť
+clientOptions.other.unloadOverflowResponse.never.name=Nikdy
+clientOptions.other.unloadOverflowResponse.never.shortDescription=Nikdy nevykladať tovar, ktorý môže preplniť skladisko
+clientOptions.other.unloadOverflowResponse.always.name=Vždy
+clientOptions.other.unloadOverflowResponse.always.shortDescription=Vždy vyložiť tovar, aj keď preplní skladisko
 clientOptions.mods.name=Mody
 clientOptions.mods.shortDescription=Možnosti umožňujúce herné úpravy.
+clientOptions.mods.userMods.name=Užívateľské úpravy
+clientOptions.mods.userMods.shortDescription=Možnosti umožňujúce úpravy hry.
 model.ability.addTaxToBells.name=Pridať daň na zvony
 model.ability.addTaxToBells.shortDescription=Sadzba dane sa chová ako bonus výroby zvonov
 model.ability.alwaysOfferedPeace.name=Vždy ponúkaný mier
@@ -1032,6 +1076,8 @@ model.ability.carryTreasure.name=Môže prevážať poklad
 model.ability.carryTreasure.shortDescription=Táto jednotka môže niesť poklad
 model.ability.carryUnits.name=Prepravné jednotky
 model.ability.carryUnits.shortDescription=Táto jednotka má schopnosť prepravovať iné jednotky.
+model.ability.coastalOnly.name=Len pobrežné
+model.ability.coastalOnly.shortDescription=Obmedziť niektoré stavby len na pobrežné kolónie
 model.ability.consumeAllOrNothing.name=Spotrebovať všetko alebo nič
 model.ability.consumeAllOrNothing.shortDescription=Spotrebiteľ, ktorý môže spotrebovať všetok dostupný tovar na jeden ťah
 model.ability.customHouseTradesWithForeignCountries.name=Zahraničný predaj vlastným domom
@@ -1139,6 +1185,8 @@ model.modifier.breedingDivisor.shortDescription=Veľkosť jedného stáda. Môž
 model.modifier.breedingFactor.name=Odchov z jedného stáda
 model.modifier.breedingFactor.shortDescription=Počet potomokov, ktoré bude každé stádo produkovať.
 model.modifier.buildingPriceBonus.name=Bonus ceny stavby/výroby
+model.modifier.cargoPenalty.name=Znevýhodnenie nákladu
+model.modifier.cargoPenalty.shortDescription=Zníženie bojovej efektivity za každý náklad
 model.modifier.consumeOnlySurplusProduction.name=Množstvo spotrebovaného prebytku
 model.modifier.consumeOnlySurplusProduction.shortDescription=Spotrebuje iba časť prebytku výroby, nespotrebúva zo skladovaných tovarov.
 model.modifier.conversionAlarmRate.name=Poplach konverzie
@@ -1283,12 +1331,12 @@ model.disaster.effect.damagedUnit.name=Poškodenie jednotiek
 model.disaster.effect.damagedUnit=Bola poškodená jednotka %unit%.
 model.disaster.effect.lossOfBuilding.name=Strata budov
 model.disaster.effect.lossOfBuilding=Bola zničená budova %building%.
-model.disaster.effect.lossOfBuildingProduction.name=Strata možnosti stavebných prác
+model.disaster.effect.lossOfBuildingProduction.name=Strata produktivity budov
 model.disaster.effect.lossOfBuildingProduction=Niektoré budovy boli poškodené. Výroba sa znížila.
 model.disaster.effect.lossOfGoods.name=Strata tovaru
 model.disaster.effect.lossOfGoods=%goods% bolo stratené.
 model.disaster.effect.lossOfMoney.name=Strata peňazí
-model.disaster.effect.lossOfMoney=%amount% ks zlata bolo stratené.
+model.disaster.effect.lossOfMoney=%amount% zlata sa stratilo.
 model.disaster.effect.lossOfTileProduction.name=Strata výroby políčok
 model.disaster.effect.lossOfTileProduction=Boli poškodené polia a lesy. Znížila sa výroba.
 model.disaster.effect.lossOfUnit.name=Strata jednotiek
@@ -1299,6 +1347,7 @@ model.event.freeBuilding.name=Budovy sú stavané zadarmo
 model.event.increaseSonsOfLiberty.name=Povstalecká nálada sa zvyšuje
 model.event.movementChange.name=Pohyb je zmenený
 model.event.newRecruits.name=Zmena povolávania Európanov
+model.event.resetBannedMissions.name=Domorodci opäť prijmú vašich misionárov
 model.event.resetNativeAlarm.name=Poplach u domorodcov bol odstránený
 model.event.seeAllColonies.name=Všetky kolónie sú viditeľné
 model.foundingFather.adamSmith.description=Umožňuje budovanie tovární.
@@ -1381,7 +1430,7 @@ model.goods.crosses.description=Kríže vyjadrujú náboženské nepokoje v Eur
 model.goods.crosses.workAs=Pracovať ako Kazateľ %claim%(%amount% ks krížov)
 model.goods.crosses.workingAs=Kazateľ
 model.goods.fish.name={{plural:%amount%|one=Ryba|other=Rýb|default=Ryba}}
-model.goods.fish.description=Ryby sú automaticky spracované na jedenie.
+model.goods.fish.description=Ryby sú automaticky zmenené na potraviny.
 model.goods.fish.workAs=Pracovať ako Rybár %claim%(%amount% ks rýb)
 model.goods.fish.workingAs=Rybár
 model.goods.food.name={{plural:%amount%|one=Potravina|other=Potravín|default=Potraviny}}
@@ -1458,8 +1507,7 @@ model.improvement.road.description=Cesta
 model.improvement.road.name=Cesta
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limit pobrežných kolónií
-# Fuzzy
-model.limit.independence.coastalColonies.description=Potrebujete mať najmenej %limit% pobrežných kolónií pre vyhlásenie nezávislosti.
+model.limit.independence.coastalColonies.description=Potrebujete mať najmenej %limit% {{plural:%limit%|one=pobrežnú kolóniu|two=pobrežné kolónie|three=pobrežné kolónie|four=pobrežné kolónie|other=pobrežných kolónií}} na vyhlásenie nezávislosti.
 model.limit.independence.rebels.name=Limit rebelov
 model.limit.independence.rebels.description=Najmenej %limit%% Vašich kolonistov musí podporovať nezávislosť.
 model.limit.independence.year.name=Limit roku
@@ -1559,6 +1607,7 @@ model.resource.sugar.name=Cukrová trstina
 model.resource.sugar.description=Pôda tejto savany je mimoriadne vhodná na pestovanie cukrovej trstiny.
 model.resource.tobacco.name=Tabak
 model.resource.tobacco.description=Pôda tejto lúky je mimoriadne vhodná na pestovanie tabaku.
+model.role.name=Úloha
 model.role.armedBrave.name=Ozbrojený bojovník
 model.role.cavalry.name=Jazdectvo
 model.role.default.name=Predvolené
@@ -1567,6 +1616,7 @@ model.role.dragoon.noequipment=žiadne pušky
 model.role.infantry.name=Pechota
 model.role.missionary.name=Misionár
 model.role.missionary.noequipment=nepoverený
+model.role.missionary.equipment=Biblia
 model.role.mountedBrave.name=Bojovník na koni
 model.role.nativeDragoon.name=Domorodý dragún
 model.role.pioneer.name=Priekopník
@@ -1575,6 +1625,20 @@ model.role.scout.name=Prieskumník
 model.role.scout.noequipment=žiadne kone
 model.role.soldier.name=Vojak
 model.role.soldier.noequipment=žiadne pušky
+model.role.change.dragoon=Vyzbrojiť ako dragúna
+model.role.change.missionary=Vyslať ako misionára
+model.role.change.pioneer=Vybaviť nástrojmi
+model.role.change.scout=Vybaviť ako prieskumníka
+model.role.change.default.soldier=Vyzbrojiť
+model.role.change.dragoon.default=Odobrať všetko vybavenie
+model.role.change.dragoon.soldier=Zosadiť z koňa
+model.role.change.missionary.default=Zrušiť poslanie misionára
+model.role.change.missionary.soldier=Ozbrojiť
+model.role.change.pioneer.default=Odobrať nástroje
+model.role.change.pioneer.soldier=Ozbroj
+model.role.change.scout.default=Zosadiť z koňa
+model.role.change.scout.soldier=Zosadiť z koňa a ozbrojiť
+model.role.change.soldier.default=Odzbrojiť
 model.settlement.aztec.capital.name=Mesto Aztékov
 model.settlement.aztec.name=Mesto Aztékov
 model.settlement.aztec.plural=mestá
@@ -1732,6 +1796,7 @@ model.unit.kingsRegular.infantry=Pechota
 model.unit.seasonedScout.scout={{plural:%number%|one=Skúsený prieskumník|other=Skúsení prieskumníci|default=Skúsený prieskumník}}
 model.unit.veteranSoldier.dragoon={{plural:%number%|one=Dragún veterán|other=Dragúni veteráni|default=Dragún veterán}}
 model.unit.veteranSoldier.soldier={{plural:%number%|one=Vojak veterán|other=Vojaci veteráni|default=Vojak veterán}}
+model.unit.colonialRegular.workingAs=Vojak
 model.unit.elderStatesman.workingAs=Štátnik
 model.unit.expertFarmer.workingAs=Farmár
 model.unit.expertFisherman.workingAs=Rybár
@@ -1762,8 +1827,7 @@ model.colony.badGovernment=Vláda v kolónii %colony% je málo účinná. Výrob
 model.colony.goodGovernment=Zvýšila sa výkonnosť vlády! Rebelanstvo v kolónii %colony% sa teraz rovná alebo je väčšie ako %number% percent.
 model.colony.governmentImproved1=Vláda v kolónii %colony% sa zlepšila, ale stále nieje dosť efektívna. Zníženie produkcie stále trvá.
 model.colony.governmentImproved2=Vláda v kolónii %colony% sa zlepšila. Výroba sa vrátila do normálu.
-# Fuzzy
-model.colony.insufficientProduction=V kolónii %colony% by sa dalo vyrobiť o %outputAmount% ks viac tovaru %outputType%, keby sme mali o %inputAmount% ks viac tovaru %inputType%.
+model.colony.insufficientProduction=V kolónii %colony% by sa dalo vyrobiť o %outputAmount% kusov viac %outputType%, keby sme mali o %consumptionDeficit% kusov naviac.
 model.colony.lostGoodGovernment=Znížila sa výkonnosť vlády! Rebelanstvo v kolónii %colony% sa už teraz viac nerovná alebo nie je väčšie ako %number% percent. Výrobný bonus v kolónii skončil.
 model.colony.lostVeryGoodGovernment=Znížila sa výkonnosť vlády! Rebelanstvo v kolónii %colony% sa už teraz viac nerovná alebo nie je väčšie ako %number% percent.
 model.colony.minimumColonySize=%object% zabraňuje ďalšiemu zníženiu populácie.
@@ -1777,18 +1841,13 @@ model.colony.veryBadGovernment=Vláda v kolónii %colony% je veľmi neúčinná.
 model.colony.veryGoodGovernment=Zvýšila sa výkonnosť vlády! Rebelanstvo v kolónii %colony% sa teraz rovná alebo je väčšie ako %number% percent.
 model.colonyTile.claim=(nárokovať si %direction%)
 model.diplomaticTrade.receive.contact=Bratské pozdravy od slávneho národa %nation%.
-# Fuzzy
-model.diplomaticTrade.receive.diplomatic=Dovoľte nám vyjednávať s národom %nation%.
+model.diplomaticTrade.receive.diplomatic=Poďme rokovať s {{tag:country|%nation%}}.
 model.diplomaticTrade.receive.trade=Uvažujme o ponuke od %nation%.
-# Fuzzy
-model.diplomaticTrade.receive.tribute=%nation% od nás požadujú poplatok!
+model.diplomaticTrade.receive.tribute={{tag:country|%nation%}} od nás požadujú poplatok!
 model.diplomaticTrade.send.contact=Stretli sme členov národa %nation%.
-# Fuzzy
-model.diplomaticTrade.send.diplomatic=Uvažujme o našej diplomatickej situácii s %nation%.
-# Fuzzy
-model.diplomaticTrade.send.trade=Navrhnime obchod s %nation% v %settlement%.
-# Fuzzy
-model.diplomaticTrade.send.tribute=Požadujeme poplatok od %nation% v %settlement%.
+model.diplomaticTrade.send.diplomatic=Uvažujme o našej diplomatickej situácii s {{tag:country|%nation%}}.
+model.diplomaticTrade.send.trade=Navrhnime obchod s {{tag:country|%nation%}} v %settlement%.
+model.diplomaticTrade.send.tribute=Požadujeme poplatok od {{tag:country|%nation%}} v %settlement%.
 model.direction.N.name=sever
 model.direction.NE.name=severovýchod
 model.direction.E.name=východ
@@ -1798,36 +1857,25 @@ model.direction.SW.name=juhozápad
 model.direction.W.name=západ
 model.direction.NW.name=severozápad
 model.historyEventType.abandonColony.description=Opustili ste kolóniu %colony%.
-# Fuzzy
-model.historyEventType.ceaseFire.description=%nation% s nami podpísali dohodu o neútoční.
-# Fuzzy
-model.historyEventType.cityOfGold.description=Národ %nation% objavili mesto %city% a v ňom poklad v hodnote %treasure% ks zlata.
-# Fuzzy
-model.historyEventType.colonyConquered.description=Vašu kolóniu %colony% dobyli %nation%.
-# Fuzzy
-model.historyEventType.colonyDestroyed.description=Vašu kolóniu %colony% zničili %nation%.
+model.historyEventType.ceaseFire.description=Zastaviť paľbu s {{tag:country|%nation%}}.
+model.historyEventType.cityOfGold.description={{tag:country|%nation%}} objavili %city%, jedno zo Siedmych zlatých miest a v ňom poklad %treasure% zlata.
+model.historyEventType.colonyConquered.description=Vašu kolóniu %colony% dobyli {{tag:country|%nation%}}.
+model.historyEventType.colonyDestroyed.description=Vašu kolóniu %colony% zničili {{tag:country|%nation%}}.
 model.historyEventType.conquerColony.description=Dobyli ste %nation% kolóniu %colony%.
 model.historyEventType.declareIndependence.description=Vyhlásili ste nezávislosť od Koruny.
-# Fuzzy
-model.historyEventType.declareWar.description=%nation% nám vyhlásili vojnu.
-# Fuzzy
-model.historyEventType.destroyNation.description=%nation% zničili domorodý národ %nativeNation%.
+model.historyEventType.declareWar.description={{tag:country|%nation%}} nám vyhlásili vojnu.
+model.historyEventType.destroyNation.description={{tag:country|%nation%}} zničili domorodý národ %nativeNation%.
+model.historyEventType.destroySettlement.description=Zničíte osadu %settlement% národa  %nation%.
 model.historyEventType.discoverNewWorld.description=Objavili ste Nový svet.
-# Fuzzy
-model.historyEventType.discoverRegion.description=Národ %nation% objavili %region%.
-# Fuzzy
-model.historyEventType.formAlliance.description=%nation% s nami uzavreli alianciu.
+model.historyEventType.discoverRegion.description={{tag:country|%nation%}} objavili %region%.
+model.historyEventType.formAlliance.description={{tag:country|%nation%}} s nami uzavreli alianciu.
 model.historyEventType.foundColony.description=Založili ste kolóniu %colony%.
 model.historyEventType.foundingFather.description=Zakladateľ %father% sa pridal ku Kontinentálnemu kongresu.
 model.historyEventType.independence.description=Dosiahli ste nezávislosť od kráľovstva.
-# Fuzzy
-model.historyEventType.makePeace.description=%nation% s nami podpísali mier.
-# Fuzzy
+model.historyEventType.makePeace.description=Mierová dohoda s {{tag:country|%nation%}}.
 model.historyEventType.meetNation.description=Stretli ste príslušníkov národa %nation%.
-# Fuzzy
 model.historyEventType.nationDestroyed.description=Národ %nation% sa už v Novom svete nenachádza.
-# Fuzzy
-model.historyEventType.spanishSuccession.description=%loserNation% odovzdali všetky svoje kolónie Nového sveta národu %nation%.
+model.historyEventType.spanishSuccession.description={{tag:country|%loserNation%}} odovzdali všetky svoje kolónie v Novom svete národu {{tag:country|%nation%}}.
 model.indianSettlement.mostHatedNone=Žiadne
 model.indianSettlement.mostHatedUnknown=Neznámy
 model.indianSettlement.nameUnknown=Neznáme
@@ -1840,6 +1888,9 @@ model.indianSettlement.tension.happy=Členovia národa %nation% šťastne tancuj
 model.indianSettlement.tension.hateful=Bojovníci národa %nation% hrozia svojimi zbraňami. Opasky si ozdobili skalpami svojich nepriateľov na ktorých sú znaky strašného mučenia.
 model.indianSettlement.tension.unknown=Neznámy
 model.indianSettlement.tension.wary=Ostražití
+model.indianSettlement.wantedGoodsNone=Žiadny
+model.indianSettlement.wantedGoodsUnknown=Neznámy
+model.lostCityRumour.name=Povesti o stratenom meste
 model.lostCityRumour.burialGround.description=Znesvätili ste posvätné pohrebiská národa %nation% a preto musíte zomrieť!
 model.lostCityRumour.cibola.description=Objavili ste mesto %city% a ukoristili poklad v hodnote %money% ks zlata. Odvezte poklad do jednej z Vašich kolónií.
 model.lostCityRumour.colonist.description=Stretli ste pozostalých zo stratenej kolónie. Výmenou za jedlo prisahajú vernosť kráľovstvu.
@@ -1877,11 +1928,10 @@ model.messageType.warehouseCapacity.name=Kapacita skladu
 model.messageType.warning.name=Upozornenia
 model.monarch.action.addToRef.text=Kráľovstvo pridalo %number% {{plural:%number%|%unit%}} do Kráľovských expedičných síl. Vodcovia kolonistov vyjadrujú znepokojenie.
 model.monarch.action.addToRef.no=Hotovo
-# Fuzzy
-model.monarch.action.declarePeace.text=Milostivo sme sa s národom %nation% dohodli na mierovej zmluve.
+model.monarch.action.declarePeace.text=Milostivo sme sa dohodli na mierovej zmluve s národom {{tag:country|%nation%}}.
 model.monarch.action.declarePeace.no=Hotovo
-# Fuzzy
-model.monarch.action.declareWar.text=Drzosť národa %nation% Nás núti im vyhlásiť vojnu!
+model.monarch.action.declareWar.text=Drzosť národa {{tag:country|%nation%}} Nás núti im vyhlásiť vojnu!
+model.monarch.action.declareWarSupported.text=Drzosť národa {{tag:country|%nation%}} Nás núti im vyhlásiť vojnu! Pre urýchlenie tejto záležitosti vaše rozkazy očakávajú  naše verný vojaci (%force%) a do vášej pokladnice bola pridaná suma %gold% zlata.
 model.monarch.action.declareWar.no=Hotovo
 model.monarch.action.displeasure.text=Opovážili ste sa prijať Naše veľkorysé podmienky a teraz sa vyhýbate plateniu? Za takú neúprimnosť zožnete horkú odmenu Našej  nespokojnosti.
 model.monarch.action.displeasure.no=Hotovo
@@ -1923,9 +1973,11 @@ model.advantages.fixed.shortDescription=Všetky národy používajú svoje predv
 model.advantages.selectable.name=Voliteľné
 model.advantages.selectable.shortDescription=Výhody národov sú voliteľné a nemusia byť jedinečné.
 model.nationState.aiOnly.name=iba počítač
+model.nationState.aiOnly.shortDescription=Tento národ je k dispozícii len pre UI hráčov
 model.nationState.available.name=dostupné
 model.nationState.available.shortDescription=Možete hrať ako tento národ
 model.nationState.notAvailable.name=nie je k dispozícii
+model.nationState.notAvailable.shortDescription=Tento národ nie je k dispozícii
 model.noClaimReason.europeans.description=Tento pozemok si nárokuje iný Európsky národ.
 model.noClaimReason.natives.description=Tento pozemok si nárokuje domorodý kmeň.
 model.noClaimReason.occupied.description=Tento pozemok je obsadený nebezpečným nepriateľom.
@@ -1938,8 +1990,7 @@ model.player.colonialIndependence=Len koloniálny hráči môžu vyhlásiť nez
 model.player.forces=sily národa %nation%
 model.player.independentMarket=Európa
 model.player.startGame=Po mesiacoch na mori ste konečne prišli k pobrežiu neznámeho kontinentu. Plaviť sa {{tag:%direction%|západ=západne|východ=východne|default=po vetre}} pre objavenie Nového sveta a získať ho pre kráľa.
-# Fuzzy
-model.player.waitingFor=Čakanie na: %nation%
+model.player.waitingFor=Čakanie na: {{tag:country|%nation%}}
 model.regionType.coast.name=Pobrežie
 model.regionType.coast.unknown=Neznáma pobrežná oblasť
 model.regionType.desert.name=Púšť
@@ -1957,6 +2008,7 @@ model.regionType.river.unknown=Neznáma rieka
 model.stance.alliance.name=Aliancia
 model.stance.ceaseFire.name=Zastaviť paľbu
 model.stance.peace.name=Mier
+model.stance.uncontacted.name=Nekontaktovaný
 model.stance.war.name=Vojna
 model.tension.happy.name=Šťastní
 model.tension.content.name=Obsah
@@ -1978,10 +2030,11 @@ model.tradeItem.gold.name=Zlato
 model.tradeItem.gold.description=suma %amount% ks zlata
 model.tradeItem.goods.name=Tovar
 model.tradeItem.incite.name=Vyhlásiť vojnu proti
-# Fuzzy
-model.tradeItem.incite.description=vojna proti %nation%
+model.tradeItem.incite.description=vojna proti {{tag:country|%nation%}}
 model.tradeItem.stance.name=Postoj
 model.tradeItem.unit.name=Jednotka
+model.tradeRoute.allEmpty=Všetky zastávky sú prázdne.
+model.tradeRoute.alwaysPresent=%goodsType% sa naloží na všetkých zastávkach.
 model.tradeRoute.duplicateName=Táto obchodná cesta má taký istý názov ako už existujúca obchodná cesta:  %name%. Prosím, vyberte iný názov.
 model.tradeRoute.notEnoughStops=Obchodná trasa potrebuje najmenej 2 zastávky!
 model.tradeRoute.nullOwner=Táto obchodná trasa nemá majiteľa!
@@ -1995,12 +2048,12 @@ model.unit.occupation.inTradeRoute=T
 model.unit.occupation.underRepair=R
 model.unit.onBoard=Na palube jednotky %unit%
 model.unit.underRepair=Oprava(%turns%)
+model.unit.unitState.active=-
 model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.alreadyPresent.description=Už sa na tomto mieste nachádza.
@@ -2027,6 +2080,7 @@ model.colony.colonyStarved=Posledný hladujúci kolonista opustil kolóniu %colo
 model.colony.customs.sale=Vlastný dom v kolónii %colony% predaný: %data%.
 model.colony.customs.saleData=%amount% %goods% za %gold%
 model.colony.famineFeared=V kolónii %colony% hrozí hladomor. Jedla ostáva už len na počet ťahov %number%.
+model.colony.starving=%colony% hladuje.
 model.colony.newColonist=Nový kolonista v kolónii %colony%.
 model.colony.newConvert=Domorodec národa %nation% konvertoval a prišiel do kolónie %colony%.
 model.colony.notBuildingAnything=V kolónii %colony% sa nič nestavia.
@@ -2040,8 +2094,7 @@ model.colony.warehouseSoonFull=Váš sklad v kolónii %colony% pri ďalšom ťah
 model.colony.warehouseWaste=Váš sklad v kolónii %colony% presiahol maximálnu kapacitu tovaru %goods%. %waste% ks bolo zničených.
 model.colony.workersEvicted=Vaši kolonisti v kolónii %colony% na políčku %location% prestali pracovať pretože sa tam nachádzajú nepriateľské jednotky %enemyUnit%.
 model.colonyTile.resourceExhausted=Zdroj %resource% v kolónii %colony% vyčerpaný
-# Fuzzy
-model.game.spanishSuccession=Vaša excelencia, v Európe sa skončila vojna o španielske dedičstvo. V zmluve z Utrechtu sa %loserNation% zaviazali odovzdať všetky svoje kolónie Nového sveta národu %nation%!
+model.game.spanishSuccession=Vaša excelencia, v Európe sa skončila Vojna o španielske dedičstvo. V zmluve z Utrechtu sa {{tag:country|%loserNation%}} zaviazali odovzdať všetky svoje kolónie v Novom svete národu {{tag:country|%nation%}}!
 model.indianSettlement.mission.denounced=Váš misionár v osade %settlement% bol popravený.
 model.indianSettlement.mission.destroyed=Váš misionár v osade %settlement% zomrel pri zničení osady.
 model.player.alarmIncrease.tension.angry=Náčelník %nation% národa v osade %settlement% nás varuje, že ich bojovníci otvorene požadujú vojnu s národom %enemy% a chcú vyhnať osadníkov z ich územia.
@@ -2050,8 +2103,7 @@ model.player.autoRecruit=Náboženské nepokoje v kraji %europe% nútia jednotku
 model.player.colonyGoodsParty.harbour=Na znak protestu proti vysokým daniam, Vaši kolonisti v kolónii %colony% vyhodili %amount% ks tovaru %goods% do mora!
 model.player.colonyGoodsParty.horses=Na protest proti nespravodlivým daniam, ktoré treba platiť kráľovstvu Vaši kolonisti v kolónii %colony% pustili na slobodu %amount% ks koní.
 model.player.colonyGoodsParty.landLocked=Na znak protestu proti vysokým daniam, Vaši kolonisti v kolónii %colony% spálili %amount% ks tovaru %goods%!
-# Fuzzy
-model.player.dead.european=Vaša excelencia, %nation% vyhlásili bezpodmienečné vysťahovanie z Nového sveta!
+model.player.dead.european=Vaša excelencia, {{tag:country|%nation%}} vyhlásili bezpodmienečné stiahnutie sa zo záležitostí Nového sveta!
 model.player.dead.native=Vaša excelencia, %nation% boli zničení.
 model.player.disaster.bankruptcy.start=Nedokázali ste platiť za údržbu všetkých budov. Výroba niektorých tovarov sa znížila.
 model.player.disaster.bankruptcy.stop=Znovu ste neboli schopní zaplatiť za údržbu všetkých budov. Výroba tovarov sa zastavuje.
@@ -2064,17 +2116,13 @@ model.player.ignoredTax=Kráľovstvo zaviedlo avizované zvýšenie dane na  %am
 model.player.interventionForceArrives=Sľúbené intervenčné sily práve prišli!
 model.player.soLDecrease=Členský klub Synova slobody vo Vašich kolóniách klesol na %newSoL% percent!
 model.player.soLIncrease=Členský klub Synovia slobody vo Vašich kolóniách vzrástol na %newSoL% percent!
-# Fuzzy
 model.player.stance.alliance.declared=Vaša excelencia, %nation% sú naši spojenci!
 model.player.stance.alliance.others=Vaša excelencia, %attacker% uzavreli alianciu s národom %defender%.
-# Fuzzy
-model.player.stance.ceaseFire.declared=Vaša excelencia, %nation% súhlasili s nami podpísať dohodu o neútočení!
+model.player.stance.ceaseFire.declared=Vaša excelencia, %nation% súhlasili s podpisom dohody o neútočení!
 model.player.stance.ceaseFire.others=Vaša excelencia, %attacker% súhlasili podpísať dohodu o neútočení s národom %defender%.
-# Fuzzy
 model.player.stance.peace.declared=Vaša excelencia, medzi nami a národom %nation% je mier!
 model.player.stance.peace.others=Vaša excelencia, %attacker% uzavreli mier s národom %defender%.
-# Fuzzy
-model.player.stance.war.declared=Zlé správy Vaša excelencia. %nation% nám vyhlásili vojnu!
+model.player.stance.war.declared=Zlé správy, Vaša excelencia, %nation% nám vyhlásili vojnu!
 model.player.stance.war.others=Vaša excelencia, %attacker% vyhlásili vojnu národu %defender%.
 combat.automaticDefence=Vaša jednotka %unit% v kolónii %colony% pozdvihla zbrane na obranu kolónie!
 combat.buildingDamaged=Nepriateľská jednotka %enemyUnit% národa %enemyNation% zničila v kolónii %colony% budovu %building%!
@@ -2089,7 +2137,6 @@ combat.enemyShipEvaded=Nepriateľská jednotka %enemyUnit% národa %enemyNation%
 combat.enemyShipSunk=Jednotka %unit% potopila nepriateľskú jednotku %enemyUnit% národa %enemyNation%!
 combat.equipmentCaptured=Pozor, bojovníci národa %nation% získali vybavenie %equipment%!
 combat.goodsStolen=Nepriateľská jednotka %enemyUnit% národa %enemyNation% ukradla %amount% ks tovaru %goods% z kolónie %colony%!
-# Fuzzy
 combat.indianPlunder=Nepriateľská jednotka %enemyUnit% národa %enemyNation% ukoristila %amount% ks zlata z kolónie %colony%.
 combat.indianRaid=Naši špehovia hlásia, že %nation% vylúpili %colony% národa %colonyNation%.
 combat.indianSurprise=%nation% prekvapivo zaútočili na %colony%. Náčelník národa %nation% však účasť popiera.
@@ -2144,9 +2191,9 @@ main.javaVersion=Java %minVersion% alebo vyššia verzia je odporúčaná na hra
 main.memory=Potrebujete priradiť viac než %memory% bytov pamäte pre JVM.\n  Reštartujte FreeCol s:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol nemôže nájsť vhodné adresáre na uloženie používateľských dát.\nPokračuje sa, ale očakávajte problémy.
 client.baseData=Nemožno nájsť základný adresár %dir%.\nHra FreeCol nemôže nájsť dátové súbory.\nUistite sa, že ich máte.\nAk hra FreeCol hľadá v zlom adresári, tak spustite hru príkazom: --freecol-data<sem napíšte adresár so súbormi>
-# Fuzzy
-client.choicePlayer=Prosím zvoľte hráča:
+client.choicePlayer=Prosím zvoľte národ:
 client.classic=Nepodarilo sa načítať nastavenia pre "klasickú hru".
+client.ending=Hra sa končí.
 client.headlessDebug=Bezhlavý režim vyžaduje spustenie ladenia.
 client.headlessRequires=Bezhlavý režim vyžaduje uloženú hru alebo špecifikáciu.
 client.laf=Nemožno nainštalovať FreeCol pozeraj-a-cíť.
@@ -2154,11 +2201,9 @@ metaServer.couldNotConnect=Ospravedlňujeme sa, nedá sa pripojiť na meta-serve
 metaServer.communicationError=Pri komunikácii s meta-serverom sa vyskytla chyba. Prosím skúste znovu neskôr.
 abandonEducation.action.studying=štúdium
 abandonEducation.action.teaching=výučba
-# Fuzzy
-abandonEducation.no=Nie, pokračovať vo vzdelávaní
+abandonEducation.no=Pokračovať vo vzdelávaní
 abandonEducation.text=Ak Vaša jednotka %unit% opustí kolóniu %colony% prestane %action% v %building%. Naozaj chcete, aby odišla?
-# Fuzzy
-abandonEducation.yes=Áno, opustiť kolóniu
+abandonEducation.yes=Opustiť kolóniu
 abandonTeaching.text=Ak Vaša jednotka %unit% opustí budovu %building% prestane sa učiť. Naozaj chcete, aby odišla?
 armedUnitSettlement.attack=Zaútočiť
 armedUnitSettlement.tribute=Požadovať poplatok
@@ -2169,14 +2214,11 @@ buy.takeOffer=Prijať ponuku
 buy.text=%nation% by radi predali svoje %goods% za %gold%:
 clearTradeRoute.text=Vaša jednotka %unit% je priradená k obchodnej ceste %route%. Nastavenie jej cieľa vymaže priradenú obchodnú cestu. Ste si istý, že to chcete urobiť?
 client.fullScreen=Toto grafické zariadenie nepodporuje režim celej obrazovky.\nVracia sa späť do režimu zobrazenia v okne.
-# Fuzzy
-confirmHostile.alliance=Nemôžete zaútočiť na spojenecký národ. Naozaj chcete zrušiť alianciu s národom %nation% a vyhlásiť im vojnu?
-# Fuzzy
-confirmHostile.ceaseFire=Podpísali ste dohodu o neútočení s národom %nation%. Naozaj si prajete zaútočiť?
-# Fuzzy
-confirmHostile.peace=Medzi Vami a národom %nation% je mier. Naozaj si prajete vyhlásiť vojnu?
-# Fuzzy
-confirmTribute.broke=Naši špióni nám hlásia, že %nation% sú úplne zlomení. Nemrhajme časom na poplatky.
+confirmHostile.alliance=Nemôžete zaútočiť na spojenecký národ! Naozaj chcete zrušiť spojenectvo s národom {{tag:country|%nation%}} a vyhlásiť im vojnu?
+confirmHostile.ceaseFire=Podpísali ste dohodu o neútočení s národom {{tag:country|%nation%}}. Naozaj si želáte zaútočiť?
+confirmHostile.peace=Medzi Vami a národom {{tag:country|%nation%}} je mier. Naozaj si želáte vyhlásiť im vojnu?
+confirmHostile.yes=Áno, rozpútať vojnu!
+confirmTribute.broke=Naši špióni nám hlásia, že {tag:country|%nation%}} sú úplne na mizine. Nemrhajme časom požiadavkami na poplatky.
 confirmTribute.european=%nation% %danger%, a %finance%. Aký veľký poplatok od nich požadovať?
 confirmTribute.happy=%nation% v %settlement% sú naši dobrí priatelia. Je to škoda ničiť naše priateľstvo.
 confirmTribute.no=Možno by sme nemali
@@ -2195,8 +2237,7 @@ indianLand.cancel=Opustiť pozemok.
 indianLand.pay=Ponúknuť %amount% kusov zlata za pozemok.
 indianLand.take=Vziať si, čo nám právom patrí.
 indianLand.text=Toto územie vlastní hráč %player%. Chceli by ste:
-# Fuzzy
-indianLand.unknown=V tomto kraji žijú nejaký neznámi ľudia. Chceli by ste:
+indianLand.unknown=V tomto kraji žijú nejakí neznámi ľudia. Chcete:
 info.autodetectLanguageSelected=Vybrali ste si autodetekciu jazyka. Tá sa uskutoční po nasledujúcom reštartovaní hry.
 info.enterSomeText=Prosím, zadajte nejaký text.
 info.newLanguageSelected=Nastavuje sa jazyk %language%. Je potrebné hru reštartovať, aby sa zmeny plne prejavili.
@@ -2241,10 +2282,8 @@ defeated.text=Porazili Vás! Čo chcete urobiť:
 defeated.yes=Ostať a dívať sa
 defeatedSinglePlayer.text=Porazili Vás!\n\nToto je teraz čarovná noc keď kostoly spánkom zívajú a peklo závistlivo dýcha na tento svet. Teraz by som mohol preliať krv a pohľadom zatriasť zem.
 defeatedSinglePlayer.yes=Vstúpiť do režimu pomsty
-# Fuzzy
-diplomacy.offerAccepted=%nation% prijali vašu veľkorysú ponuku.
-# Fuzzy
-diplomacy.offerRejected=%nation% odmietli Vašu štedrú ponuku.
+diplomacy.offerAccepted={{tag:country|%nation%}} prijali vašu veľkorysú ponuku.
+diplomacy.offerRejected={{tag:country|%nation%}} odmietli Vašu veľkorysú ponuku.
 disbandUnit.text=Naozaj chcete odstrániť túto jednotku?
 disbandUnit.yes=Rozpustiť
 disembark.text=Zdravíme ťa námorník, prajete si niekoho vylodiť?
@@ -2289,9 +2328,7 @@ move.noAccessGoods=Národ %nation% nebude obchodovať s prázdnou jednotkou %uni
 move.noAccessMissionBan=%nation% odmietli všetky kontakty s našimi misionármi.
 move.noAccessSettlement=Národ %nation% nedovoľuje našej jednotke %unit% vstúpiť do ich osady.
 move.noAccessSkill=Naša jednotka %unit% sa nemôže učiť od domorodcov.
-# Fuzzy
-move.noAccessTrade=Nemáme oprávnenie na obchodovanie s inými európskymi národmi ako aj s národom %nation%.
-# Fuzzy
+move.noAccessTrade=Nemáme oprávnenie na obchodovanie s inými európskymi národmi ako napríklad s {{tag:country|%nation%}}.
 move.noAccessWar=Počas vojny nemôžeme obchodovať s národom %nation%.
 move.noAccessWater=Naša jednotka %unit% musí pred vstupom do osady pristáť na pevnine.
 move.noAttackWater=Naša jednotka %unit% musí pred útokom pristáť na pevnine.
@@ -2337,6 +2374,7 @@ server.badColor=Neplatná farba
 server.badNation=Neplatný národ
 server.badNationType=Neplatný typ národa
 server.couldNotConnect=Nedá sa pripojiť k serveru.
+server.couldNotLogin=Nie je možné prihlásiť sa na server.
 server.errorStartingGame=Pri spúšťaní hry došlo k chybe.
 server.fileNotFound=Nepodarilo sa nájsť súbor so zadaným názvom.
 server.incompatibleVersions=Uloženú hru ktorú sa snažíte nahrať nieje kompatibilná s touto verziou FreeCol.
@@ -2346,6 +2384,7 @@ server.maximumPlayers=Je nám ľúto. Bol dosiahnutý maximálny počet hráčov
 server.missingUserName=Prihláseniu chýba užívateľské meno.
 server.missingVersion=Prihláseniu chýba verzia hry FreeCol.
 server.noRouteToServer=Server sa nedá zverejniť. Mali by ste upraviť Vaše nastavenie brány firewall.
+server.noSuchPlayer=Hra neobsahuje hrávča menom: %player%
 server.notAllReady=Nie všetci hráči sú pripravení na začiatok hry!
 server.onlyAdminCanLaunch=Je nám ľúto, hru môže spustiť iba administrátor servera.
 server.reject=Server to nemôže urobiť.
@@ -2353,8 +2392,7 @@ server.timeOut=Časový limit pre pripojenie k serveru.
 server.userNameInUse=Zadané užívateľské meno sa už používa.
 server.userNameNotPresent=V tejto hre sa zadané užívateľské meno nenachádza.
 server.wrongFreeColVersion=Klient a verzia hry FreeCol sa nezhodujú.
-# Fuzzy
-buildColony.others=Národ %nation% založil novú kolóniu %colony% v %region%.
+buildColony.others=Národ {{tag:country|%nation%}} založil novú kolóniu %colony% v oblasti %region%.
 cashInTreasureTrain.colonial=Poklad s %amount% ks zlata pristál v Európe. Zinkasovali sme %cashInAmount% ks zlata.
 cashInTreasureTrain.independent=Do národnej pokladice bolo pridané %amount% ks zlata.
 cashInTreasureTrain.otherColonial=Poklad v hodnote %amount% ks zlata pristál v Európe. Kráľ národa %nation% sa zjavne potešil.
@@ -2362,6 +2400,7 @@ cashInTreasureTrain.otherIndependent=Do národnej pokladnice národa %nation% bo
 declareIndependence.announce=Kolónie %oldNation% vyhlásili nezávislosť od %ruler% a sú teraz známe ako %newNation%.
 declareIndependence.continentalArmyMuster=Pre posilnenie Vášho vyhlásenia nezávislosti boli nasledovné jednotky %number% {{plural:%number%|%oldUnit%}} v kolónii %colony% povýšené na {{plural:%number%|%unit%}}!
 declareIndependence.interventionForce={{tag:country|%nation%}} slávnostne sľubuje vyslať intervenčné sily na podporu Vášho legitímneho boja za nezávislosť, v prípade, že vyprodukujete %number% {{plural:%number%|one=Zvon slobody|two=Zvony|other=Zvonov}} slobody, aby ste preukázali Vaše odhodlanie.
+declareIndependence.nativeHostile=Naši špióni oynamujú, že Kráľovské expedičné sily sa spriatelili s národom %nation%. Dajte si pozor, môžu plánovať útok!
 declareIndependence.resolution=V tento deň prijal Kongres najdôležitejšie uznesenia aké kedy boli v Amerike vytvorené.\n\nVeľmi dobre si uvedomujem koľko driny, krvi a peňazí bude stáť udržanie deklarácie a podpora a obrana týchto štátov. Napriek všetkým chmáram vidím lúče svetla a slávy. Vidím, že koniec bude stáť za to, že naši potomkovia zvíťazia a verím v Boha, že to nebudeme ľutovať.\n\nKráľovské vojsko nás čoskoro napadne. Poriadne pripravme našu obranu a zvýšme počet dobrovoľníkov v novej Kontinentálnej armáde.
 declareIndependence.unitsSeized=Ako reakciu na Vaše vyhlásenie nezávislosti, kráľovstvo zabavila nasledovné jednotky v Európe a na mori: %units%
 deliverGift.goods=Hráč %player% doviezol do osady %settlement% dar %amount% %type%.
@@ -2399,6 +2438,8 @@ colopedia.concepts.education.name=Vzdelávanie
 colopedia.concepts.education.description=<html><p>Najúčinnejší spôsob ako vzdelávať Vašich kolonistov je postaviť <a href="http:///id/model.building.schoolhouse">základnú školu</a> a priradiť nejakého experta/majstra ako učiteľa. Učiteľ potom vyučí <a href="http:///id/model.unit.freeColonist">slobodného kolonistu</a> svojmu remeslu. Učitelia sú schopný zmeniť <a href="http:///id/model.unit.pettyCriminal">kriminálnika</a> na <a href="http:///id/model.unit.indenturedServant">sluhu</a> a sluhu na slobodného kolonistu.</p><p>Niektoré zručnosti sa dajú naučiť aj od domorodcov a to tak, že k nim do osady pošlete žiť slobodného kolonistu alebo sluhu. Niektoré zručnosti sa dajú naučiť aj vďaka skúsenostiam. Slobodný kolonista, ktorý pracuje na určitom políčku v kolónii získava za svoju prácu skúsenosti čo mu dáva šancu na dosiahnutie špecializácie.</p></html>
 colopedia.concepts.efficiency.name=Účinnosť
 colopedia.concepts.efficiency.description=<html><p>Efektívnosť Vašich kolónií závisí od ich podpory myšlienky o nezávislosti. Ak 50% kolonistov podporuje nezávislosť, kolónii sa udelí výrobný bonus +1. Akonáhle sa podpora zvýši na 100%, kolónii sa udelí výrobný bonus +2. </p><p>Na druhej strane ak počet feudalistov presiahne <i>stanovený limit pre zlú vládu</i>, kolóniu zasiahne zníženie výroby na -1. Ak počet feudalistov presiahne <i>limit per veľmi zlú vládu</i>, zníženie výroby sa zvýši na -2. Tieto dva limity závisia od úrovne obtiažnosti a môžete si ich skontrolovať kliknutím na <a href="http:///action/difficultyAction">hlásenie úrovne obtiažnosti</a>.</p><p>V záujme zvýšenia efektívnosti kolónie musíte znížiť jej populáciu alebo zvýšiť výrobu <a href="http:///id/model.goods.bells">Zvonov slobody</a>.</p></html>
+colopedia.concepts.fortification.name=Opevnenie
+colopedia.concepts.fortification.description=<html><p>Jednotky sa môžu na políčku <em>opevniť</em>  (vybudovaním dočasných zákopov a prekážok), aby tým zvýšili svoju obranyschopnosť. Plne sa opevniť trvá jeden ťah. Opevnenie taktiež chráni pred prepadnutím a opevnené delostrelectvo už nie je považované za "nechránené" aj keď útok poškodí opevnenie.  Opevnenie poskytuje obranný bonus len v prípade neprítomnosti iných zvýhodňujúcich obranných vlastností, preto opevnenie na horách alebo v kolónii s pevnosťou alebo veľkou pevnosťou nepridá žiadny obranný bonus.
 colopedia.concepts.independence.name=Nezávislosť
 colopedia.concepts.independence.description=<html><p>Hru začínate ako prieskumník s niekoľkými jednotkami k dispozícii. Kráľ od Vás očakáva, že v Novom svete založíte kolóniu a budete domov nosiť poklady a exotický tovar. Vy však máte iné plány: založiť nezávislý národ.</p><p>Na vyhlásenie nezávislosti potrebujete presvedčiť aspoň 50% populácie Vašich kolónií. To sa dá dosiahnuť výrobou takzvaných <a href="http:///id/model.goods.bells">zvonov slobody</a>, ktoré zároveň zvyšujú <a href="http:///id/colopedia.concepts.efficiency">efektívnosť</a> Vašich kolónií.</p><p>Určite si uvedomujete, že kráľa to nenechá chladným. Po vyhlásení nezávislosti musíte bojovať a zničiť <a href="http:///id/colopedia.concepts.ref">Kráľovské expedičné sily</a> (KES). Ak KES budú ovládať všetky Vaše prímorské kolónie, alebo najmenej 90% populácie, Vaša snaha o nezávislosť skončí neúspechom.</p></html>
 colopedia.concepts.interventionForce.name=Intervenčné sily
@@ -2455,8 +2496,7 @@ colopedia.unit.offensivePower=Útočná sila:
 colopedia.unit.price=Cena v Európe:
 colopedia.unit.productionBonus=Výrobná/é {{plural:%number%|one=úprava|other=úpravy}}:
 colopedia.unit.requirements=Požiadavky:
-# Fuzzy
-colopedia.unit.school=Požadovaná škola na výcvik:
+colopedia.unit.school=Môže sa vyučiť v:
 colopedia.unit.skill=Úroveň zručností:
 report.labour.allColonists=Všetci kolonisti
 report.labour.amateursWorking=amatéri
@@ -2490,8 +2530,7 @@ report.colony.grow.header=+
 report.colony.growing.description=%colony% môže vychovať {{plural:%amount%|one=jednu jednotku||two=dve jednotky|three=tri jednotky|four=štyri jednotky|other=%amount% jednotiek}} bez toho, aby sa znížila výroba
 report.colony.improve.description=Jednotky, ktoré môžu zvýšiť výrobu.
 report.colony.improve.header=Vylepšiť
-# Fuzzy
-report.colony.improving.description=%colony%: Aby ste vyrábali o %amount% ks viac tovaru %goods%, vymeňte jednotku %oldUnit% za jednotku %unit%
+report.colony.improving.description=%colony% %location%: Aby ste vyrábali o %amount% ks viac tovaru %goods%, vymeňte jednotku %oldUnit% za jednotku %unit%
 report.colony.making.blocking.description=%colony%: %amount% ks tovaru %goods% bude treba na %buildable% {{plural:%turns%|one=na ďalší ťah|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
 report.colony.making.constructing.description=%colony%: %buildable% budova dokončená {{plural:%turns%|one=na ďalší ťah|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
 report.colony.making.description=Čo táto kolónia práve vytvára
@@ -2501,21 +2540,19 @@ report.colony.making.noconstruction.description=%colony%: žiadne prebiehajúce
 report.colony.making.noteach.description=%colony%: učiteľ %teacher% nemá študenta
 report.colony.name.description=Zoznam kolónií
 report.colony.name.header=Kolónia
-# Fuzzy
-report.colony.production.description=%colony%: čistá výroba tovaru %goods% = %amount%
-# Fuzzy
-report.colony.production.export.description=%colony%: čistá výroba tovaru %goods% je %amount% (exportovať nad %export%)
+report.colony.production.description=%colony%: Vyrába sa %amount% ks tovaru %goods%
+report.colony.production.export.description=%colony%: Vyrába sa %amount% ks tovaru %goods% (exportovať nad %export%)
 report.colony.production.header=Čistá výroba tovaru %goods%
-# Fuzzy
-report.colony.production.high.description=%colony%: čistá výroba tovaru %goods% = %amount%, plná {{plural:%turns%|one=ďalším ťahom|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
-# Fuzzy
-report.colony.production.low.description=%colony%: čistá výroba tovaru %goods% = %amount%, zmizne {{plural:%turns%|one=ďaľším ťahom|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
-# Fuzzy
-report.colony.production.waste.description=%colony%: čistá výroba tovaru %goods% = %amount%, sklad bude preplnený, %waste% ks bude vyhodených
+report.colony.production.high.description=%colony%: Vyrába sa %amount% ks tovaru %goods%, zaplnenie {{plural:%turns%|one=ďalším ťahom|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
+report.colony.production.low.description=%colony%: Spotrebúva sa %amount% ks tovaru %goods%, spotrebuje sa {{plural:%turns%|one=v ďaľšom ťahu|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
+report.colony.production.waste.description=%colony%: Vyrába sa %amount% ks tovaru %goods% , sklad bude preplnený, %waste% ks bude vyhodených
+report.colony.tile.road.header=R
+report.colony.tile.road.header.description=Počet políčok kolónie, ktoré by profitovali z postavenej cesty.
+report.colony.tile.road.summary.description=Celkový počet políčok kolónie na tomto kontinente, ktoré by profitovali z postavenej cesty.
 report.colony.shrinking.description=Kolónia %colony% musí byť zmenšená o{{plural:%amount%|one=jednu jednotku|two=dve jednotky|three=tri jednotky|four=štyri jednotky|other=%amount% jednotiek}} pre zvýšenie výroby
 report.colony.starving.description=%colony%: hladomor {{plural:%turns%|one=na ďalší ťah|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
-# Fuzzy
-report.colony.wanting.description=%colony%: Na vyrobenie o %amount% ks viac tovaru %goods%, pridajte jednotku %unit%
+report.colony.wanting.description=%colony% %location%: Na vyrobenie o %amount% kusov tovaru %goods%  naviac pridajte jednotku %unit%
+report.continentalCongress.available=Dostupný
 report.continentalCongress.elected=Zvolený: %turn%
 report.continentalCongress.none=(žiadny)
 report.continentalCongress.recruiting=Nábor
@@ -2553,32 +2590,34 @@ report.indian.tension=Napätie
 report.indian.tradeInterests=Obchodné záujmy
 report.indian.tribeTension=Domorodé napätie:
 report.indian.typeOfSettlements=Druh osád:
+report.labour.details.name=Podrobnosti Správy o zamestnanosti
 report.production.selectGoods=Výber tovaru
 report.production.update=Aktualizovať
 report.requirements.badAssignment=V kolónii %colony% pracuje %expert% ako %expertWork%, kým %nonExpert% pracuje ako %nonExpertWork%. Keby si títo kolonisti vymenili prácu, výroba by sa zvýšila.
 report.requirements.canTrainExperts={{plural:2 jedotky|%unit%}} sa môžu vytrénovať v
-# Fuzzy
-report.requirements.exploreTile=%type% smerom na %direction% od kolónie %colony% bude profitovať z prieskumu.
+report.requirements.exploreTile=%location% by profitoval z prieskumu.
 report.requirements.met=Všetky požiadavky sú splnené.
 report.requirements.missingGoods=%colony% vyrába %goods%, ale potrebuje viac %input%.
 report.requirements.misusedExperts={{plural:2 jednotky|%unit%}} nepracujú ako %work% v kolónii
 report.requirements.noExpert=%colony% vyrába %goods%, ale nevyrába %unit%.
+report.requirements.tile.clearForest=%location% by mal prospech z výrubu.
+report.requirements.tile.road=%location% by mal prospech zo stavby cesty.
 report.requirements.severalExperts={{plural:2 jednotky|%unit%}} sú prítomné v
 report.requirements.surplus=Vyrobil sa prebytok tovaru %goods% v
 report.trade.afterTaxes=Príjem po zdanení
 report.trade.beforeTaxes=Príjem pred zdanením
 report.trade.cargoUnits=Jednotiek v náklade
-# Fuzzy
-report.trade.hasCustomHouse=* Táto kolónia má vlastný dom, tento tovar je exportovaný.
+report.trade.export=Vyvážať %goods% nad %amount%
+report.trade.hasCustomHouse=* Táto kolónia má colnicu, a môže vyvážať tovar.
 report.trade.totalDelta=Výroba celkom
 report.trade.totalUnits=Jednotiek celkom
 report.trade.unitsSold=Kúpené alebo predané jednotky
 report.turn.filter=Nezobrazovať tento druh správ (%type%)
 report.turn.ignore=Ignorovať túto správu (Kolónia: %colony%, Tovar: %goods%)
-# Fuzzy
-report.turn.playerNation=%player% %nation%
+report.turn.playerNation=%player% {{tag:country|%nation%}}
 aboutPanel.copyright=Copyright © 2002-2015 FreeCol Team
 aboutPanel.legalDisclaimer=FreeCol je softvér zadarmo: môžete ho šíri a upravovať podľa všeobecných užívateľských podmienok publikovaných Free Software Foundation verzie 2 a viac.
+aboutPanel.manual=Manuálne stiahnutie FreeCol
 aboutPanel.officialSite=Oficiálna stránka:
 aboutPanel.sfProject=SourceForge projekt:
 aboutPanel.version=Verzia:
@@ -2586,6 +2625,7 @@ buildingToolTip.breeding=Potrebujete najmenej %number% {{plural:%number%|%goods%
 buildQueuePanel.buildings=Budovy
 buildQueuePanel.buildQueue=Stavebné poradie
 buildQueuePanel.buyBuilding=Kúpiť %buildable%
+buildQueuePanel.coastalOnly=Pobrežná kolónia
 buildQueuePanel.compactView=Kompaktné zobrazenie
 buildQueuePanel.currentlyBuilding=Budova: %buildable%
 buildQueuePanel.populationTooSmall=Populácia: %number%
@@ -2596,13 +2636,14 @@ captureGoodsDialog.title=Korisť
 cargoPanel.cargoAndSpace=Náklad na %name% (%space% {{plural:%space%|one=miesto|other=miesta|default=miesto}}ostáva)
 chatPanel.message=Správa
 chooseFoundingFatherDialog.title=Nominovať Otca zakladateľa
+colonyPanel.buildQueue=Stavebné poradie
 colonyPanel.colonyUnits=Jednotky kolónie
 colonyPanel.inPort=V prístave
 colonyPanel.outsideColony=Mimo kolónie
-# Fuzzy
-colonyPanel.producing=Vyrába:
+colonyPanel.producing=vyrába:
 colonyPanel.reducePopulation=Ak znížite populáciu pod %number%, %colony% nebude môcť vybudovať %buildable%.
 colonyPanel.unitChange=Pri vstupe do kolónie sa Vaša jednotka %oldType% stala jednotkou %newType%.
+colonyPanel.warehouse=Skladisko
 colonyPanel.bonusLabel=Bonus: %number%%extra%
 colonyPanel.populationLabel=Populácia: %number%
 colonyPanel.rebelLabel=Rebeli: %number%
@@ -2612,10 +2653,8 @@ confirmDeclarationDialog.areYouSure.no=Možno neskôr
 confirmDeclarationDialog.areYouSure.text=Vzdajme sa nespravodlivej tyranie kráľa %monarch% a vyhlásme nezávislosť našich kolónii od kráľovstva.
 confirmDeclarationDialog.areYouSure.yes=Sloboda alebo smrť!
 confirmDeclarationDialog.createFlag=a naši nepriatelia sa budú triasť pri pohľade na náš nezlomný banner.
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=Spojené štáty %nation%
-# Fuzzy
-confirmDeclarationDialog.defaultNation=Slobodný %nation%
+confirmDeclarationDialog.defaultCountry=Spojené štáty {{tag:country|%nation%}}
+confirmDeclarationDialog.defaultNation=Slobodný {{tag:country|%nation%}}
 confirmDeclarationDialog.enterCountry=Odteraz bude naša krajina známa ako
 confirmDeclarationDialog.enterNation=a každý občan nášho slávneho národa bude hrdý na to, že je známy ako
 flag.background.FESSES=Delené
@@ -2660,16 +2699,16 @@ flag.unionShape.TRIANGLE=Trojuholník
 flag.unionShape.label=Union Shape
 constructionPanel.clickToBuild=Klikni na stavenisko pre výber stavby budovy alebo vytvorenie jednotky.
 constructionPanel.turnsToComplete=(Ťahov na dokončenie: %number%)
+difficultyDialog.name=Obtiažnosť
 negotiationDialog.accept=Súhlasiť
 negotiationDialog.add=Pridať
 negotiationDialog.cancel=Zrušiť
 negotiationDialog.clear=Vyčistiť
 negotiationDialog.contact.tutorial=Stretáte kolegov Európanov. Budú s Vami súťažiť o pôdu a bohatstvo a možno Vám aj vyhlásia vojnu. Ale potom ako sa Jan de Witt pripojil ku Kontinentálnemu kongresu môžete s nimi obchodovať.
-# Fuzzy
-negotiationDialog.demand=%nation% požaduje od %otherNation%
+negotiationDialog.demand={{tag:country|%nation%}} požaduje od {{tag:country|%otherNation%}}
 negotiationDialog.exchange=výmenou za
-# Fuzzy
-negotiationDialog.offer=%nation% za %otherNation%
+negotiationDialog.goldAvailable=(%amount% zlata k dispozícii)
+negotiationDialog.offer={{tag:country|%nation%}} ponúka {{tag:country|%otherNation%}}
 negotiationDialog.send=Poslať
 negotiationDialog.title.contact=Stretnutie kolegov Európanov
 negotiationDialog.title.diplomatic=Diplomatické vyjednávanie
@@ -2691,9 +2730,10 @@ findSettlementPanel.displayAll=Nájsť všetky osady
 findSettlementPanel.displayOnlyEuropean=Nájsť iba európske osady
 findSettlementPanel.displayOnlyNatives=Nájsť iba pôvodné osady
 findSettlementPanel.name=Nájsť osadu
-# Fuzzy
-firstContactDialog.meeting.natives=Stretnutie s domorodcami...
+firstContactDialog.meeting.natives=Stretnutie s domorodcami
 firstContactDialog.meeting.natives.tutorial=Stretli ste sa s domorodcami. Pošlite do ich osád svojich prieskumníkov, aby ste sa o nich dozvedeli viac a sluhov a slobodných kolonistov, aby ste sa od nich učili. Pošlite do ich osád svoje vozy a lode ak si s nimi prajete obchodovať.
+firstContactDialog.meeting.aztec=Národ Aztékov
+firstContactDialog.meeting.inca=Ríša Inkov
 firstContactDialog.welcomeOffer.text=Víta Vás národ %nation%. Náš slávny národ sa skladá z %camps% %settlementType%. Na oslavu nášho priateľstva Vám veľkoryso darujeme pozemok na ktorom sa práve nachádzate. Chcete s nami žiť v mieri ako bratia?
 firstContactDialog.welcomeSimple.text=Víta Vás národ %nation%. Náš slávny národ sa skladá z %camps% %settlementType%.  Chcete s nami žiť v mieri ako bratia?
 abandonColony.no=Zrušiť
@@ -2715,11 +2755,15 @@ indianSettlementPanel.learnableSkill=V tejto osade sa dá naučiť nasledovná z
 indianSettlementPanel.highlyWanted=Táto osada sa veľmi zaujíma o obchodovanie s:
 indianSettlementPanel.otherWanted=Ostatný tovar s ktorým sa dá obchodovať v tejto osade je:
 indianSettlementPanel.mostHated=V tejto osade najviac nenávidia národ:
+infoPanel.defenseBonus=Obrana %bonus%%
 infoPanel.endTurn=Na ukončenie ťahu stlačte enter.
+infoPanel.movementCost=Presun %cost%
 infoPanel.moves=Ťahy:
+informationPanel.display=Zobraziť %object%
 loadingSavegameDialog.port=Brána:
 loadingSavegameDialog.privateMultiplayer=Súkromná hra pre viacerých hráčov
 loadingSavegameDialog.publicMultiplayer=Verejná hra pre viacerých hráčov
+loadingSavegameDialog.serverName=Meno servera:
 loadingSavegameDialog.singlePlayer=Hra jedného hráča
 loadingSavegameDialog.name=Nahrávanie uloženej hry
 mapEditorTransformPanel.chooseResource=Vybrať zdroj
@@ -2731,6 +2775,8 @@ freecol.map.America_large=Amerika (veľká)
 freecol.map.Australia=Austrália
 freecol.map.Caribbean_basin=Karibská oblasť
 mapSizeDialog.mapSize=Zvoliť veľkosť mapy
+modifierFormat.unknown=???
+modifierFormat.scopeMethod.isIndian.name=domorodci
 monarchDialog.default=Správa z kráľovstva
 newPanel.editDifficulty=Upraviť obtiažnosť
 newPanel.getServerList=Získať zoznam serverov
@@ -2755,6 +2801,7 @@ quickActionMenu.clearSpeciality=Vymazať špecialitu
 quickActionMenu.experience=Skúsenosti ako  %job% :
 quickActionMenu.leaveTown=Opustiť mesto
 quickActionMenu.loadOnTo=Naložiť na %unit%
+quickActionMenu.profit=Európske čisté imanie: %amount%
 quickActionMenu.teaching=Výučba %unit%
 quickActionMenu.upgrade=Pravdepodobnosť zvýšenia úrovne:
 rebelToolTip.100percent=Ťahov na dosiahnutie 100%
@@ -2762,6 +2809,8 @@ rebelToolTip.50percent=Ťahov na dosiahnutie 50%
 rebelToolTip.changeLess=Odobrať kolonistov na zlepšenie bonusu
 rebelToolTip.changeMore=Pridať kolonistov k aktuálnemu bonusu
 rebelToolTip.nextMember=Ťahov na zvýšenie počtu rebelov
+rebelToolTip.rebelLabel=Rebeli: %number%
+rebelToolTip.royalistLabel=Rojalisti: %number%
 recruitPanel.clickOn=Kliknite na jednu z osôb pre rekrutovanie. Budete musieť zaplatiť %money% zlata za jeho prechod. On sám bude schopný zaplatiť za svoj prechod za %number% ťahy/ov.
 riverStyleDialog.text=Štýl rieky
 selectAmountDialog.text=Prosím, zadajte presné množstvo tovaru na prenos:
@@ -2781,7 +2830,9 @@ info.noEuropeans=Podmienka poraziť všetkých ostatných Európanov už bola sp
 memoryManager.freeMemory=Voľná
 memoryManager.maxMemory=Max
 memoryManager.totalMemory=Celkom
+tilePanel.defenseBonus=Obranný bonus:
 tilePanel.label=%label% (%x%, %y%)
+tilePanel.movementCost=Cena presunu:
 tilePanel.owner=Vlastník:
 tilePanel.region=Oblasť:
 tilePanel.settlement=Osada:
@@ -2811,16 +2862,39 @@ warehouseDialog.exportLevel.shortDescription=Nič neexportovať pod touto úrov
 warehouseDialog.highLevel.shortDescription=Upozorniť ma, keď zásoby presiahnu toto percento kapacity.
 warehouseDialog.lowLevel.shortDescription=Upozorniť ma, keď zásoby klesnú pod toto percento kapacity.
 warehouseDialog.name=Sklad
-# Fuzzy
-workProductionPanel.zeroThreshold=Žiadny
+workProductionPanel.zeroThreshold=Žiadny záporná výroba
 nameCache.base.colony=Kolónia
 nameCache.base.settlement=Osada
 nameCache.base.ship=Loď
 nameCache.base.tradeRoute=Nová obchodná cesta
+nameCache.lostCityRumour.cityName.0=Aira
+nameCache.lostCityRumour.cityName.1=Anhuib
+nameCache.lostCityRumour.cityName.2=Ansalli
+nameCache.lostCityRumour.cityName.3=Ansesseli
+nameCache.lostCityRumour.cityName.4=Ansodi
+nameCache.lostCityRumour.cityName.5=Ansolli
+nameCache.lostCityRumour.cityName.6=Con
 nameCache.mercenaries.0=Frederik II, kieža z Hesse-Kassel
 nameCache.mercenaries.1=Frederick Augustus, princ z Anhalt-Zerbst
 nameCache.mercenaries.2=Charles Alexander, gróf z Brandenburg-Ansbach
 nameCache.mercenaries.3=Charles I, vojvoda z Brunswick-Wolfenbüttel
+nameCache.season.default=Ročné obdobie %number%
+nameCache.season.0=Jar
+nameCache.season.1=Jeseň
+error.disasterAvoided=Katastrofa %disaster% sa vyhla kolónii %colony%
+error.notAIColony=%colony% nie je kolónia UI
+info.rgb=Hodnota RGB: %red%,%green%,%blue%
+prompt.selectDisaster=Vyberte katastrofu
+prompt.selectGoodsAmount=Vyberte množstvo tovaru
+prompt.selectGoodsType=Vyberte druh tovaru
+prompt.selectImmigration=Vyberte množstvo prisťahovalcov
+prompt.selectLostCityRumour=Vyberte povesti o Stratenom meste
+prompt.selectOwner=Vyberte vlastníka
+prompt.selectRole=Vyberte úlohu
+prompt.selectTurnsToSkip=Vyberte počet ťahov na preskočenie
+prompt.selectUnitType=Vyberte typ jednotky
+prompt.stepRNG=Krok generátora náhodných čísel (%value%)
+prompt.selectGold=Vyberte množstvo zlata
 installer.FreeCol.description=FreeCol aplikácia a dátové súbory.
 installer.FreeColLanguage.autodetect=Autodetekcia pri spustení hry
 installer.FreeColLanguage.description=Toto nastavenie môžete zmeniť neskôr v hre pomocou menu Nastavenia.
diff --git a/data/strings/FreeColMessages_sv_SE.properties b/data/strings/FreeColMessages_sv_SE.properties
index 0c4143986..9078ba36b 100644
--- a/data/strings/FreeColMessages_sv_SE.properties
+++ b/data/strings/FreeColMessages_sv_SE.properties
@@ -2407,6 +2407,7 @@ findSettlementPanel.name=Hitta bosättning
 # Fuzzy
 firstContactDialog.meeting.natives=Träffar infödingarna...
 firstContactDialog.meeting.natives.tutorial=Du träffar på indianer. Sänd dina spejare till deras bosättningar för att lära dig mer om dem, och dina kontraktarbetare och nybyggare för att lära sig mer av dem. Sänd dina skepp och konvojer till deras bosättningar om du önskar handla med dem.
+firstContactDialog.meeting.inca=Inkariket
 firstContactDialog.welcomeOffer.text=%nation% välkomnar dig. Vi är en strålande nation på %camps% %settlementType%. För att fira vår vänskap erbjuder vi generöst det land du nu bor på som en gåva. Vill du acceptera vårt fördrag och leva i fred med oss som bröder?
 firstContactDialog.welcomeSimple.text=%nation% välkomar dig. Vi är en strålande nation på %camps% %settlementType%. Vill du leva i fred med oss som bröder?
 abandonColony.no=Avbryt
diff --git a/data/strings/FreeColMessages_tr.properties b/data/strings/FreeColMessages_tr.properties
index 67a4d82c4..8720d5ec4 100644
--- a/data/strings/FreeColMessages_tr.properties
+++ b/data/strings/FreeColMessages_tr.properties
@@ -7,6 +7,7 @@
 # Author: Erdemaslancan
 # Author: Joseph
 # Author: Karduelis
+# Author: KorkmazO
 # Author: McAang
 # Author: Meelo
 # Author: Nighteagle2000
@@ -106,6 +107,7 @@ cargoOnCarrier=Taşıyıcının kargosu
 cashInTreasureTrain=Hazine trenindeki para
 clearOrders=Siparişleri temizle
 colonists=Koloniciler
+colonyCenter=Koloni merkezi
 colopedia=Colopedi
 difficulty=Zorluk
 docks=Rıhtım
diff --git a/data/strings/FreeColMessages_zh-hant.properties b/data/strings/FreeColMessages_zh-hant.properties
index 3072a7ef4..c2a18d6a5 100644
--- a/data/strings/FreeColMessages_zh-hant.properties
+++ b/data/strings/FreeColMessages_zh-hant.properties
@@ -1475,8 +1475,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.alreadyPresent.description=已存在於這個位置。
@@ -1845,6 +1844,7 @@ colopedia.goods.buildings=建築物：
 colopedia.unit.natives=從原住民學到
 colopedia.unit.requirements=需求：
 colopedia.unit.skill=技能等級：
+report.colony.tile.plow.header=P
 report.continentalCongress.none=(無)
 report.foreignAffair.stance=狀態
 report.highScores.difficulty=難易度：
@@ -1970,8 +1970,7 @@ findSettlementPanel.displayAll=尋找所有聚落
 findSettlementPanel.displayOnlyEuropean=只找歐洲人聚落
 findSettlementPanel.displayOnlyNatives=只找原住民聚落
 findSettlementPanel.name=尋找聚落
-# Fuzzy
-firstContactDialog.meeting.natives=遇見原住民……
+firstContactDialog.meeting.natives=遇見原住民
 firstContactDialog.meeting.natives.tutorial=你發現了原住民。派你的探索者會瞭解原住民們、派你的長工和自由移民會讓他們學到技術、派你的船與貨車則可以與他們交易。
 firstContactDialog.welcomeOffer.text=%nation% 歡迎您。我們是一個光榮的民族 %camps%   %settlementType% 。為慶祝我們的友誼，我們慷慨地為您提供您現在佔據作為禮物的土地。你將會接受我們的條約和謊言與我們在和平中作為兄弟嗎？
 firstContactDialog.welcomeSimple.text=%nation% 歡迎您。我們是一個光榮的民族 %camps%   %settlementType% 。你將會接受我們的條約和謊言與我們在和平中作為兄弟嗎？
diff --git a/data/strings/FreeColMessages_zh_CN.properties b/data/strings/FreeColMessages_zh_CN.properties
index 56c815462..5063e7f67 100644
--- a/data/strings/FreeColMessages_zh_CN.properties
+++ b/data/strings/FreeColMessages_zh_CN.properties
@@ -116,7 +116,9 @@ cargoOnCarrier=货仓
 cashInTreasureTrain=兑现财宝车中的财宝
 clearOrders=清除命令
 colonists=移民
+colonyCenter=殖民地中心
 colopedia=Colopedia
+countryName={{tag:country|%nation%}}
 difficulty=难度
 docks=码头
 dumpCargo=卸货
@@ -190,6 +192,7 @@ cli.error.home.notDir=%string%不是目录。
 cli.error.home.notExists=目录%string%不存在。
 cli.error.save=不能读取已保存的游戏 %string% 。
 cli.error.serverPort=%string%不是一个有效的端口号。
+cli.error.splash=找不到污点文件%name%。
 cli.error.timeout=%string%太短 (少于 %minimum% )。
 cli.advantages=设置优势类型（%advantages%）
 cli.check-savegame.failure=存档完整性检查失败，检查日志细节。
@@ -468,6 +471,7 @@ model.option.interventionForce.name=干涉军
 model.option.interventionForce.shortDescription=被派来支持你的独立战争的干涉部队。
 model.option.mercenaryForce.name=雇佣兵部队
 model.option.mercenaryForce.shortDescription=表示愿意支持你的独立战争的雇佣军。
+model.option.warSupportForce.name=战争支持力量
 model.difficulty.government.name=政府
 model.option.badGovernmentLimit.name=糟糕政府限制
 model.option.badGovernmentLimit.shortDescription=不造成生产处罚的最大保皇党人数目。
@@ -881,7 +885,7 @@ clientOptions.gui.enemyMoveAnimationSpeed.off=关闭
 clientOptions.gui.enemyMoveAnimationSpeed.slow=慢
 clientOptions.gui.enemyMoveAnimationSpeed.normal=一般
 clientOptions.gui.enemyMoveAnimationSpeed.fast=快
-clientOptions.messages.name=信息
+clientOptions.messages.name=消息
 clientOptions.messages.shortDescription=允许/禁止消息选项
 model.option.guiMessagesGroupBy.name=群消息
 model.option.guiMessagesGroupBy.shortDescription=决定是否发送群消息
@@ -1883,18 +1887,14 @@ model.colony.veryBadGovernment=%colony%城政府效率非常低下!高生产惩
 model.colony.veryGoodGovernment=政府效率改善了!%colony%城中自由党比例现在等于或超过%number%%了。
 model.colonyTile.claim=(索要 %direction% )
 model.diplomaticTrade.receive.contact=兄弟般的问候从光荣 %nation% 的国家。
-# Fuzzy
-model.diplomaticTrade.receive.diplomatic=让我们与谈判 %nation% 。
+model.diplomaticTrade.receive.diplomatic=让我们与{{tag:country|%nation%}}谈判。
 model.diplomaticTrade.receive.trade=让我们考虑一下 %nation% 贸易优惠。
-# Fuzzy
-model.diplomaticTrade.receive.tribute=%nation% 要求我们致敬 ！
+model.diplomaticTrade.receive.tribute={{tag:country|%nation%}}正在要求我们致敬 ！
 model.diplomaticTrade.send.contact=我们遇到的成员 %nation% 的国家。
 # Fuzzy
 model.diplomaticTrade.send.diplomatic=让我们考虑一下我们外交处境与 %nation% 。
-# Fuzzy
-model.diplomaticTrade.send.trade=让我们提出与贸易 %nation% 在 %settlement% 。
-# Fuzzy
-model.diplomaticTrade.send.tribute=我们要求进贡的 %nation% 在 %settlement% 。
+model.diplomaticTrade.send.trade=让我们提出与贸易{{tag:country|%nation%}}在 %settlement% 。
+model.diplomaticTrade.send.tribute=我们要求进贡的{{tag:country|%nation%}}在 %settlement% 。
 model.direction.N.name=北
 model.direction.NE.name=东北
 model.direction.E.name=东
@@ -1904,36 +1904,27 @@ model.direction.SW.name=西南
 model.direction.W.name=西
 model.direction.NW.name=西北
 model.historyEventType.abandonColony.description=你遗弃了殖民城市%colony%。
-# Fuzzy
-model.historyEventType.ceaseFire.description=对%nation%停火。
+model.historyEventType.ceaseFire.description=对{{tag:country|%nation%}}停火。
 # Fuzzy
 model.historyEventType.cityOfGold.description=%nation%发现了七座黄金城之一的%city%，和一笔价值%treasure%黄金的财富。
-# Fuzzy
-model.historyEventType.colonyConquered.description=你的殖民城市%colony%被%nation%人占领了。
-# Fuzzy
-model.historyEventType.colonyDestroyed.description=你的殖民城市%colony%被%nation%人摧毁了。
+model.historyEventType.colonyConquered.description=你的殖民城市%colony%被{{tag:country|%nation%}}人占领了。
+model.historyEventType.colonyDestroyed.description=你的殖民城市%colony%被{{tag:country|%nation%}}人摧毁了。
 model.historyEventType.conquerColony.description=您战胜了%colony%的%nation%殖民地。
 model.historyEventType.declareIndependence.description=你宣布脱离王国独立。
-# Fuzzy
-model.historyEventType.declareWar.description=向%nation%宣战的战争。
-# Fuzzy
-model.historyEventType.destroyNation.description=%nation% 摧毁了 %nativeNation% 。
+model.historyEventType.declareWar.description=向{{tag:country|%nation%}}宣战的战争。
+model.historyEventType.destroyNation.description={{tag:country|%nation%}}摧毁了 %nativeNation% 。
 model.historyEventType.discoverNewWorld.description=你发现了新大陆。
-# Fuzzy
-model.historyEventType.discoverRegion.description=%nation%发现了%region%地区。
+model.historyEventType.discoverRegion.description={{tag:country|%nation%}}发现了%region%地区。
 # Fuzzy
 model.historyEventType.formAlliance.description=联盟谈判与 %nation% 。
 model.historyEventType.foundColony.description=你完成了殖民城市%colony%。
 model.historyEventType.foundingFather.description=%father%加入了大陆议会。
 model.historyEventType.independence.description=你成功脱离王国并获得了独立。
-# Fuzzy
-model.historyEventType.makePeace.description=决定与%nation%和平。
-# Fuzzy
-model.historyEventType.meetNation.description=你遇到了%nation%人。
+model.historyEventType.makePeace.description=决定与{{tag:country|%nation%}}和平。
+model.historyEventType.meetNation.description=您见到了%nation%国。
 # Fuzzy
 model.historyEventType.nationDestroyed.description=在新的世界中， %nation%势力不再存在了。
-# Fuzzy
-model.historyEventType.spanishSuccession.description=%loserNation%割让所有新大陆的殖民地给%nation%。
+model.historyEventType.spanishSuccession.description={{tag:country|%loserNation%}}割让所有新大陆的殖民地给{{tag:country|%nation%}}。
 model.indianSettlement.mostHatedNone=无
 model.indianSettlement.mostHatedUnknown=未知
 model.indianSettlement.nameUnknown=未知
@@ -1985,8 +1976,7 @@ model.messageType.warehouseCapacity.name=仓库容量
 model.messageType.warning.name=警告
 model.monarch.action.addToRef.text=王国向皇家远征军增加了%number% {{plural:%number%|%unit%}}。殖民地首领们表现出了担忧。
 model.monarch.action.addToRef.no=完成
-# Fuzzy
-model.monarch.action.declarePeace.text=我们大方地同意与%nation%签署和平条约。
+model.monarch.action.declarePeace.text=我们大方地同意与{{tag:country|%nation%}}签署和平条约。
 model.monarch.action.declarePeace.no=完成
 # Fuzzy
 model.monarch.action.declareWar.text=傲慢的%nation%人逼我们向他们开战了!
@@ -2046,8 +2036,7 @@ model.player.colonialIndependence=只有殖民地球员可以宣布独立。
 model.player.forces=%nation%的武斗力量
 model.player.independentMarket=欧洲
 model.player.startGame=经过几个月的航海之后，你终于来到了一片未知大陆附近了。{{tag:%direction%|west=向西|east=向东|default=随风而}}航行来探索这个新世界并将它加入王国的版图。
-# Fuzzy
-model.player.waitingFor=等待：%nation%
+model.player.waitingFor=正在等待：{{tag:country|%nation%}}
 model.regionType.coast.name=海岸
 model.regionType.coast.unknown=未知海岸区域
 model.regionType.desert.name=沙漠
@@ -2087,8 +2076,7 @@ model.tradeItem.gold.name=黄金
 model.tradeItem.gold.description=总计有%amount%黄金
 model.tradeItem.goods.name=货物
 model.tradeItem.incite.name=声明反对战争
-# Fuzzy
-model.tradeItem.incite.description=反对战争%nation%
+model.tradeItem.incite.description=反对战争{{tag:country|%nation%}}
 model.tradeItem.stance.name=和平状态
 model.tradeItem.unit.name=单位
 model.tradeRoute.allEmpty=所有停靠站都是空的。
@@ -2113,8 +2101,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.alreadyPresent.description=已存在于此位置。
@@ -2141,6 +2128,7 @@ model.colony.colonyStarved=%colony%城中的最后一名移民已经饿死了，
 model.colony.customs.sale=%colony%的海关销售了：%data%。
 model.colony.customs.saleData=%amount%个%goods%卖%gold%
 model.colony.famineFeared=关于饥荒的恐惧在%colony%城中蔓延。城中的粮食中够维持%number%个回合。
+model.colony.starving=%colony%正在挨饿。
 model.colony.newColonist=%colony%城产生新移民。
 model.colony.newConvert=一个新的%nation%皈依者已到达%colony%城。
 model.colony.notBuildingAnything=%colony%城中没有东西被建造。
@@ -2164,8 +2152,7 @@ model.player.autoRecruit=%europe%的宗教动乱使%unit%决定移民。
 model.player.colonyGoodsParty.harbour=在%colony%城中的移民将%amount%%goods%倾倒入港口来表达他们对于国王不公平的税收政策的抗议!
 model.player.colonyGoodsParty.horses=你%colony%城中的移民释放了%amount%的马匹来表达他们对于国王不平等的税收制度的反抗!
 model.player.colonyGoodsParty.landLocked=Y在%colony%城中的移民将市场中%amount%%goods%烧毁来表达他们对于国王不公平的税收政策的抗议!
-# Fuzzy
-model.player.dead.european=阁下，%nation%无条件的宣布将不再参与新大陆的事务了!
+model.player.dead.european=阁下，{{tag:country|%nation%}}无条件的宣布将不再参与新大陆的事务了！
 model.player.dead.native=阁下，%nation%已被消灭了。
 model.player.disaster.bankruptcy.start=您未能支付的所有建筑物的维护费用。严重生产的惩罚产生了。
 model.player.disaster.bankruptcy.stop=您再次能够支付所有建筑物的维持费用。生产的惩罚被解除。
@@ -2178,14 +2165,12 @@ model.player.ignoredTax=如先前宣布的一样，官方已经将税率提高
 model.player.interventionForceArrives=许诺的干涉部队到达！
 model.player.soLDecrease=在你的殖民城市中自由党的比例下降至%newSoL%%!
 model.player.soLIncrease=在你的殖民城市中自由党的比例上升至%newSoL%%!
-# Fuzzy
-model.player.stance.alliance.declared=阁下，%nation%与我们结盟!
+model.player.stance.alliance.declared=阁下，%nation%国与我们同盟！
 model.player.stance.alliance.others=阁下, %attacker%和%defender%是盟友关系。
 # Fuzzy
 model.player.stance.ceaseFire.declared=阁下，%nation%人同意停火了!
 model.player.stance.ceaseFire.others=阁下，%attacker%人同意和%defender%人停火了。
-# Fuzzy
-model.player.stance.peace.declared=阁下，%nation%同我们处于和平状态!
+model.player.stance.peace.declared=阁下，%nation%国与我们处于和平状态！
 model.player.stance.peace.others=阁下，%attacker%同%defender%处于和平状态。
 # Fuzzy
 model.player.stance.war.declared=坏消息，阁下，%nation%人向我们宣战了!
@@ -2258,8 +2243,7 @@ main.javaVersion=%minVersion%或更高版本的Java被推荐来运行FreeCol !(
 main.memory=您需要分配多于%memory%字节的内存给JVM。重新启动 FreeCol： java -Xmx %minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol找不到合适的文件夹来存储数据。正在继续，但可能遇到麻烦。
 client.baseData=找不到基础数据目录 %dir% 。\n由 FreeCol 找不到数据文件。 ！N!请确保他们都存在。\n如果 FreeCol 然后在错误的目录中查找 ！N!使用命令行参数运行游戏： ！N!— — freecol 数据<data-directory></data-directory>
-# Fuzzy
-client.choicePlayer=选择玩家：
+client.choicePlayer=请选择一个国家：
 client.classic=未能从规则集 '经典'中加载资源映射。
 client.debugConnect=您不可以在调试模式下连接现有游戏。
 client.ending=游戏结束。
@@ -2271,11 +2255,9 @@ metaServer.couldNotConnect=在与meta-server服务器进行通信时发生错误
 metaServer.communicationError=在与meta-server服务器进行通信时发生错误。请稍后再试。
 abandonEducation.action.studying=学习
 abandonEducation.action.teaching=教授
-# Fuzzy
-abandonEducation.no=否，继续教育
+abandonEducation.no=继续教育
 abandonEducation.text=如果您 %unit%离开%colony%它将放弃在 %building%中的%action%，确实应该离开吗？
-# Fuzzy
-abandonEducation.yes=是的离开殖民城市
+abandonEducation.yes=放弃教育
 abandonTeaching.text=您的%unit%离开%building%后将会停止教育，确定么？
 armedUnitSettlement.attack=进攻
 armedUnitSettlement.tribute=已索要贡物
@@ -2286,12 +2268,9 @@ buy.takeOffer=同意要价
 buy.text=%nation%希望以%gold%黄金的价格卖出他们的%goods%：
 clearTradeRoute.text=你的%unit%被指定运行于贸易路线 %route%。设定它的目的地将会让它放弃当前的贸易路线。你确定要这样做吗？
 client.fullScreen=全屏幕模式下不支持此 GraphicsDevice。\n降回窗口模式。
-# Fuzzy
-confirmHostile.alliance=你不能攻击盟友!你当真希望撕毁同%nation%盟约并开战吗？
-# Fuzzy
-confirmHostile.ceaseFire=你已同%nation%签定了停火协议。你真的想发动进攻吗？
-# Fuzzy
-confirmHostile.peace=你现在同%nation%处于和平状态。你真的希望对其宣战吗?
+confirmHostile.alliance=您不能攻击同盟国！您真的希望破坏您与{{tag:country|%nation%}}之间的同盟关系并开战吗？
+confirmHostile.ceaseFire=您已同{{tag:country|%nation%}}签定了停火协议。您真的想发动进攻吗？
+confirmHostile.peace=您现在同{{tag:country|%nation%}}处于和平状态。您真的希望对其宣战吗?
 confirmHostile.yes=好，开战吧！
 # Fuzzy
 confirmTribute.broke=报告说，我们的间谍 %nation% 是完全打破了。让我们不浪费我们的时间与进贡的要求。
@@ -2361,10 +2340,8 @@ defeated.text=你被击败了!你希望：
 defeated.yes=继续观看
 defeatedSinglePlayer.text=你被击败了!\n\n今晚正是使用巫术的好时间，墓地裂开并呼出瘟疫，此时也正是我品尝鲜血的时候!通过这个痛苦仪式,世界将会在你面前颤抖。
 defeatedSinglePlayer.yes=进入复仇模式
-# Fuzzy
-diplomacy.offerAccepted=%nation% 接受了你大方的馈赠。
-# Fuzzy
-diplomacy.offerRejected=%nation% 拒绝了你大方的馈赠。
+diplomacy.offerAccepted={{tag:country|%nation%}}接受了你大方的馈赠。
+diplomacy.offerRejected={{tag:country|%nation%}}拒绝了你大方的馈赠。
 disbandUnit.text=你确信要解散这个单位吗？
 disbandUnit.yes=解散
 disembark.text=你好，水手，你确定想下船吗？
@@ -2409,8 +2386,7 @@ move.noAccessGoods=%nation%不会与一个空的%unit%贸易。
 move.noAccessMissionBan=%nation%拒绝与您的传教士的任何联系。
 move.noAccessSettlement=%nation%人不允许我们的%unit%进入他们的聚落。
 move.noAccessSkill=我们的%unit%无法从土著人处学到什么。
-# Fuzzy
-move.noAccessTrade=我们未被授权同例如%nation%的其它欧洲国家进行贸易。
+move.noAccessTrade=我们未被授权同例如{{tag:country|%nation%}}的其它欧洲国家进行贸易。
 # Fuzzy
 move.noAccessWar=我们不能在战时同%nation%人进行贸易。
 move.noAccessWater=在进入聚落前，%unit%必须先登陆。
@@ -2475,8 +2451,7 @@ server.timeOut=连接服务器超时。
 server.userNameInUse=指定的用户名称已被使用。
 server.userNameNotPresent=指定的用户名不在这个游戏中。
 server.wrongFreeColVersion=客户端和服务器的FreeCol版本不匹配。
-# Fuzzy
-buildColony.others=%nation%发现了%colony%在%region%的殖民地。
+buildColony.others={{tag:country|%nation%}}发现了%colony%在%region%的殖民地。
 cashInTreasureTrain.colonial=一笔价值%amount%黄金的财宝被运到了欧洲。%cashInAmount%黄金流入了你的金库。
 cashInTreasureTrain.independent=一笔价值%amount%黄金的财宝被加入进国库。
 cashInTreasureTrain.otherColonial=%amount%的财宝被运到了欧洲。显然%nation%的君主感到高兴。
@@ -2540,7 +2515,7 @@ colopedia.goods.description=说明：
 colopedia.goods.equipment=装备：
 colopedia.goods.improvedBy=改善:
 colopedia.goods.improvement=%name%(%amount%)
-colopedia.goods.initialPrice=初始价格
+colopedia.goods.initialPrice=初始价格：
 colopedia.goods.isFarmed=初级产品:
 colopedia.goods.madeFrom=原料:
 colopedia.goods.makes=被用来制造：
@@ -2622,6 +2597,7 @@ report.colony.making.blocking.description=%colony%：{{plural:%turns%|one=下一
 report.colony.making.constructing.description=%colony%: %buildable% 完成 {{复数： %turns% 或 = 下一 turn|other = 在 %turns% 转}}
 report.colony.making.description=这个殖民城市在生产什么
 report.colony.making.educating.description=%colony%: %teacher% 毕业生 {{复数： %turns% 或 = 下一 turn|other = 在 %turns% 转}}
+report.colony.making.educationVacancy.description=%colony%：{{plural:%number%|one=一位学生座位|other=%number%位学生座位}}是空的
 report.colony.making.header=制作
 report.colony.making.noconstruction.description=%colony%：没有建设进行
 report.colony.making.noteach.description=%colony%：%teacher%缺少一名学生
@@ -2634,10 +2610,14 @@ report.colony.production.export.description=%colony%：%goods% 净产量是%amou
 report.colony.production.header=%goods%净产量
 # Fuzzy
 report.colony.production.high.description=%colony%： 净额 %goods% 生产 =  %amount% 、 充分 {{复数： %turns% 或 = 下一 turn|other = 在 %turns% 转}}
-# Fuzzy
-report.colony.production.low.description=%colony%： 净额 %goods% 生产 =  %amount% 、 走 {{复数： %turns% 或 = 下一 turn|other = 在 %turns% 变成}}
+report.colony.production.low.description=%colony%：已消耗%amount%个%goods%，{{plural:%turns%|one=下一回合|other=%turns%回合后}}将消耗殆尽
 # Fuzzy
 report.colony.production.waste.description=%colony%：%goods% 净产量 = %amount%，仓库将溢出，%waste% 将被浪费
+report.colony.tile.clearForest.description=%colony%会从结算{{plural:%amount%|one=一格|other=%amount%格}}中获利
+report.colony.tile.clearForest.header=C
+report.colony.tile.plow.description=%colony% 会从耕种{{plural:%amount%|one=一格|other=%amount% 格}}中获利
+report.colony.tile.plow.header=P
+report.colony.tile.road.header=R
 report.colony.shrinking.description=%colony%必须由收缩 {{复数： %amount% 或 = 一 unit|other = %amount% 单位}} 以改善生产
 report.colony.starving.description=%colony%: 饥荒{{plural:%turns%|one=下回合|other=在%turns%回合内}}
 # Fuzzy
@@ -2690,11 +2670,13 @@ report.requirements.met=所有需求均已达到。
 report.requirements.missingGoods=%colony%虽然现在还能生产%goods%，但还是需要更多的%input%。
 report.requirements.misusedExperts=现在有{{plural:2|%unit%}}并没有做%work%工作位于
 report.requirements.noExpert=%colony%正在生产%goods%，但没有%unit%。
+report.requirements.tile.clearForest=%location%会从结算中获利。
 report.requirements.severalExperts=若干{{plural:2|%unit%}}可用于
 report.requirements.surplus=下列城市中%goods%生产过剩：
 report.trade.afterTaxes=税后收入
 report.trade.beforeTaxes=税前收入
 report.trade.cargoUnits=货仓中的单位
+report.trade.export=正在出口 %goods%，价格为 %amount%
 # Fuzzy
 report.trade.hasCustomHouse=* 这个城市拥有一个海关；这些货物可以出口了。
 report.trade.totalDelta=总产量
@@ -2702,10 +2684,10 @@ report.trade.totalUnits=总单位数
 report.trade.unitsSold=单位买卖
 report.turn.filter=不显示该种(%type%)消息
 report.turn.ignore=忽略消息(殖民城市：%colony%，产品： %goods%)
-# Fuzzy
-report.turn.playerNation=%player%的国家是%nation%
+report.turn.playerNation=%player%的国家是{{tag:country|%nation%}}
 aboutPanel.copyright=版权所有 © 2002~2015 FreeCol团队
 aboutPanel.legalDisclaimer=FreeCol是一款自由软件：你可以在自由软件基金会关于GNU公共许可证第2版或后绪版本条款约束下对其进行重新发布或修改。
+aboutPanel.manual=FreeCol手动下载
 aboutPanel.officialSite=官方网址：
 aboutPanel.sfProject=SourceForge工程：
 aboutPanel.version=版本：
@@ -2728,8 +2710,7 @@ colonyPanel.buildQueue=建造队列
 colonyPanel.colonyUnits=殖民地单位
 colonyPanel.inPort=港内
 colonyPanel.outsideColony=殖民城外
-# Fuzzy
-colonyPanel.producing=生产：
+colonyPanel.producing=正在生产：
 colonyPanel.reducePopulation=如果你将人口降到%number%以下, %colony%将不能修建%buildable%。
 colonyPanel.setGoods=设置货物
 colonyPanel.traceWork=追踪工作
@@ -2744,10 +2725,8 @@ confirmDeclarationDialog.areYouSure.no=也许以后吧
 confirmDeclarationDialog.areYouSure.text=让我们从%monarch%不公平的暴政下解放出来并宣布我们的殖民地脱离王国独立了!
 confirmDeclarationDialog.areYouSure.yes=不自由毋宁死!
 confirmDeclarationDialog.createFlag=和我们的敌人应发抖我们违抗横幅的视线。
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=%nation%合众国
-# Fuzzy
-confirmDeclarationDialog.defaultNation=%nation%自由国
+confirmDeclarationDialog.defaultCountry={{tag:country|%nation%}}合众国
+confirmDeclarationDialog.defaultNation={{tag:country|%nation%}}自由国
 confirmDeclarationDialog.enterCountry=从今以后，我们的国家将被称作
 confirmDeclarationDialog.enterNation=并且我们光荣的民族中的每个公民都将被骄傲的知晓
 flag.background.FESSES=供认
@@ -2798,12 +2777,10 @@ negotiationDialog.add=添加
 negotiationDialog.cancel=取消
 negotiationDialog.clear=清除
 negotiationDialog.contact.tutorial=你碰到了欧洲的同行. 他们会和你争夺土地和财富，还有可能发动战争来对付你.不过在约翰·德·维特加入大陆议会后,你以可以同他们贸易。
-# Fuzzy
-negotiationDialog.demand=%nation% 的要求%otherNation%
+negotiationDialog.demand={{tag:country|%otherNation%}}的{{tag:country|%nation%}}需求
 negotiationDialog.exchange=回应
 negotiationDialog.goldAvailable=（%amount% 黄金可用）
-# Fuzzy
-negotiationDialog.offer=%nation%由%otherNation%提供
+negotiationDialog.offer={{tag:country|%nation%}}提供{{tag:country|%otherNation%}}
 negotiationDialog.send=发送
 negotiationDialog.title.contact=遇到欧洲同行。
 negotiationDialog.title.diplomatic=外交谈判
@@ -2826,9 +2803,10 @@ findSettlementPanel.displayOnlyEuropean=只找到欧洲定居点
 findSettlementPanel.displayOnlyNatives=找到仅本机住区
 findSettlementPanel.name=寻找聚落
 findSettlementPanel.settlement=%name%%capital%（%nation%）
-# Fuzzy
-firstContactDialog.meeting.natives=遇到了土著人...
+firstContactDialog.meeting.natives=正在与土著人见面
 firstContactDialog.meeting.natives.tutorial=你碰到了土著人.你可以派探索者到他们的部落去了解更多他们的事,也可以让契约仆人或自由移民去那里学习他们的技术.如果想和他们贸易就派船或货车去到那儿去吧。
+firstContactDialog.meeting.aztec=阿兹特克国
+firstContactDialog.meeting.inca=印加帝国
 firstContactDialog.welcomeOffer.text=%nation%人民欢迎你。我们是一个拥有%camps%座 %settlementType%的强大部落。为了表达我们的友好，我们慷慨地将我们被你占用的土地送给你。你同意接受我们提议并同我们如同兄弟般和平共处吗？
 firstContactDialog.welcomeSimple.text=%nation%人民欢迎你。我们是一个拥有%camps%座%settlementType%的强大部落。你同意接受我们提议并同我们如同兄弟般和平共处吗？
 abandonColony.no=取消
@@ -2871,6 +2849,7 @@ freecol.map.Australia=澳大利亚
 freecol.map.Caribbean_basin=加勒比海盆地
 mapSizeDialog.mapSize=选择地图大小
 modifierFormat.unknown=???
+modifierFormat.scopeMethod.isIndian.name=土著人
 monarchDialog.default=来自皇家的消息
 newPanel.editDifficulty=编辑难度
 newPanel.getServerList=取得服务器列表

From 127ee763a501789b1d76ca7e33e63cc5cf0c7142 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Fri, 25 Sep 2015 16:48:12 +0200
Subject: [PATCH 255/323] Clean up unused imports

---
 src/net/sf/freecol/FreeCol.java                            | 1 -
 src/net/sf/freecol/client/gui/GUI.java                     | 1 -
 src/net/sf/freecol/client/gui/ImageLibrary.java            | 1 -
 src/net/sf/freecol/client/gui/SwingGUI.java                | 1 -
 src/net/sf/freecol/client/gui/panel/FreeColDialog.java     | 1 -
 src/net/sf/freecol/client/gui/panel/LabourData.java        | 1 -
 .../client/gui/panel/MapGeneratorOptionsDialog.java        | 1 -
 src/net/sf/freecol/client/gui/panel/MiniMap.java           | 1 -
 src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java   | 2 --
 src/net/sf/freecol/client/gui/panel/UnitLabel.java         | 2 --
 src/net/sf/freecol/common/io/FreeColDataFile.java          | 7 +------
 src/net/sf/freecol/common/io/FreeColModFile.java           | 2 --
 src/net/sf/freecol/common/io/FreeColTcFile.java            | 2 --
 src/net/sf/freecol/common/io/Mods.java                     | 1 -
 src/net/sf/freecol/common/model/SimpleCombatModel.java     | 2 +-
 src/net/sf/freecol/common/model/Specification.java         | 1 -
 .../freecol/common/model/mission/ImprovementMission.java   | 1 -
 src/net/sf/freecol/tools/MergeTranslations.java            | 1 -
 src/net/sf/freecol/tools/SaveGameValidator.java            | 2 +-
 test/src/net/sf/freecol/common/model/SchoolTest.java       | 1 -
 test/src/net/sf/freecol/common/model/TileTest.java         | 1 -
 .../net/sf/freecol/server/generator/MapGeneratorTest.java  | 1 -
 .../net/sf/freecol/server/model/ServerBuildingTest.java    | 1 -
 23 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index 827e116e6..4f0bf29f4 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -21,7 +21,6 @@ package net.sf.freecol;
 
 import java.awt.Dimension;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
index f7587697c..b3cf083b6 100644
--- a/src/net/sf/freecol/client/gui/GUI.java
+++ b/src/net/sf/freecol/client/gui/GUI.java
@@ -64,7 +64,6 @@ import net.sf.freecol.common.model.Monarch.MonarchAction;
 import net.sf.freecol.common.model.Nation;
 import net.sf.freecol.common.model.NationSummary;
 import net.sf.freecol.common.model.Player;
-import net.sf.freecol.common.model.Region;
 import net.sf.freecol.common.model.Settlement;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.Stance;
diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index cd156a137..210189e18 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -32,7 +32,6 @@ import java.awt.RenderingHints;
 import java.awt.TexturePaint;
 import java.awt.image.BufferedImage;
 import java.awt.image.RescaleOp;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 8c150fb9c..e95a36644 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -86,7 +86,6 @@ import net.sf.freecol.common.model.ModelMessage;
 import net.sf.freecol.common.model.Monarch.MonarchAction;
 import net.sf.freecol.common.model.Nation;
 import net.sf.freecol.common.model.Player;
-import net.sf.freecol.common.model.Region;
 import net.sf.freecol.common.model.Settlement;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
diff --git a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
index a932de616..c4df42e99 100644
--- a/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
@@ -52,7 +52,6 @@ import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.ImageLibrary;
 import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.client.gui.plaf.FreeColOptionPaneUI;
-import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Specification;
diff --git a/src/net/sf/freecol/client/gui/panel/LabourData.java b/src/net/sf/freecol/client/gui/panel/LabourData.java
index bc1950e70..b5da7c793 100644
--- a/src/net/sf/freecol/client/gui/panel/LabourData.java
+++ b/src/net/sf/freecol/client/gui/panel/LabourData.java
@@ -19,7 +19,6 @@
 
 package net.sf.freecol.client.gui.panel;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java b/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
index 82c224445..7da9f2f8d 100644
--- a/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/MapGeneratorOptionsDialog.java
@@ -36,7 +36,6 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
-import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.option.BooleanOptionUI;
diff --git a/src/net/sf/freecol/client/gui/panel/MiniMap.java b/src/net/sf/freecol/client/gui/panel/MiniMap.java
index 92af0d9b3..80dcbc318 100644
--- a/src/net/sf/freecol/client/gui/panel/MiniMap.java
+++ b/src/net/sf/freecol/client/gui/panel/MiniMap.java
@@ -24,7 +24,6 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Image;
 import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
 import java.awt.geom.AffineTransform;
diff --git a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
index 4def259d8..45868da3f 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportTurnPanel.java
@@ -51,12 +51,10 @@ import net.sf.freecol.common.model.Europe;
 import net.sf.freecol.common.model.FreeColGameObject;
 import net.sf.freecol.common.model.FreeColObject;
 import net.sf.freecol.common.model.Game;
-import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.Market;
 import net.sf.freecol.common.model.ModelMessage;
 import net.sf.freecol.common.model.Nameable;
 import net.sf.freecol.common.model.Player;
-import net.sf.freecol.common.model.Settlement;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Unit;
diff --git a/src/net/sf/freecol/client/gui/panel/UnitLabel.java b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
index 293ac3b92..bb867ce85 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitLabel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitLabel.java
@@ -47,8 +47,6 @@ import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.GoodsType;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Specification;
-import net.sf.freecol.common.model.Tile;
-import net.sf.freecol.common.model.TileType;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.WorkLocation;
 
diff --git a/src/net/sf/freecol/common/io/FreeColDataFile.java b/src/net/sf/freecol/common/io/FreeColDataFile.java
index 6d77b90a1..1aaed140f 100644
--- a/src/net/sf/freecol/common/io/FreeColDataFile.java
+++ b/src/net/sf/freecol/common/io/FreeColDataFile.java
@@ -28,14 +28,12 @@ import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLConnection;
-
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
-import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.logging.Level;
@@ -44,9 +42,6 @@ import java.util.logging.Logger;
 import net.sf.freecol.common.resources.ResourceFactory;
 import net.sf.freecol.common.resources.ResourceMapper;
 import net.sf.freecol.common.resources.ResourceMapping;
-
-import static net.sf.freecol.common.util.CollectionUtils.*;
-
 import net.sf.freecol.common.util.LogBuilder;
 
 import static net.sf.freecol.common.util.StringUtils.*;
diff --git a/src/net/sf/freecol/common/io/FreeColModFile.java b/src/net/sf/freecol/common/io/FreeColModFile.java
index 8cfd8107e..bcab2e9bd 100644
--- a/src/net/sf/freecol/common/io/FreeColModFile.java
+++ b/src/net/sf/freecol/common/io/FreeColModFile.java
@@ -27,8 +27,6 @@ import java.io.InputStream;
 
 import javax.xml.stream.XMLStreamException;
 
-import java.util.Set;
-
 import net.sf.freecol.common.ObjectWithId;
 import net.sf.freecol.common.model.Specification;
 
diff --git a/src/net/sf/freecol/common/io/FreeColTcFile.java b/src/net/sf/freecol/common/io/FreeColTcFile.java
index 7b42e9fbf..d5ae91a06 100644
--- a/src/net/sf/freecol/common/io/FreeColTcFile.java
+++ b/src/net/sf/freecol/common/io/FreeColTcFile.java
@@ -21,10 +21,8 @@ package net.sf.freecol.common.io;
 
 import java.io.File;
 import java.io.FileFilter;
-import java.io.InputStream;
 import java.io.IOException;
 
-import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.resources.ResourceMapping;
 
 
diff --git a/src/net/sf/freecol/common/io/Mods.java b/src/net/sf/freecol/common/io/Mods.java
index 99ef6297c..650c446d9 100644
--- a/src/net/sf/freecol/common/io/Mods.java
+++ b/src/net/sf/freecol/common/io/Mods.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.common.io;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/net/sf/freecol/common/model/SimpleCombatModel.java b/src/net/sf/freecol/common/model/SimpleCombatModel.java
index 5a9876056..22fb198cb 100644
--- a/src/net/sf/freecol/common/model/SimpleCombatModel.java
+++ b/src/net/sf/freecol/common/model/SimpleCombatModel.java
@@ -20,7 +20,6 @@
 package net.sf.freecol.common.model;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
@@ -32,6 +31,7 @@ import java.util.stream.Collectors;
 import net.sf.freecol.common.model.Modifier.ModifierType;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
 import net.sf.freecol.common.util.LogBuilder;
+
 import static net.sf.freecol.common.util.RandomUtils.*;
 
 
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index b6bb0b275..5f2ab0bb0 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -24,7 +24,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
-import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/net/sf/freecol/common/model/mission/ImprovementMission.java b/src/net/sf/freecol/common/model/mission/ImprovementMission.java
index 350c5762d..6e50e50e0 100644
--- a/src/net/sf/freecol/common/model/mission/ImprovementMission.java
+++ b/src/net/sf/freecol/common/model/mission/ImprovementMission.java
@@ -26,7 +26,6 @@ import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.TileImprovement;
-import net.sf.freecol.common.model.TileImprovementType;
 import net.sf.freecol.common.model.Unit;
 
 import org.w3c.dom.Element;
diff --git a/src/net/sf/freecol/tools/MergeTranslations.java b/src/net/sf/freecol/tools/MergeTranslations.java
index 4832e5fa0..9d2550507 100644
--- a/src/net/sf/freecol/tools/MergeTranslations.java
+++ b/src/net/sf/freecol/tools/MergeTranslations.java
@@ -25,7 +25,6 @@ import java.io.FilenameFilter;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.text.DateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/net/sf/freecol/tools/SaveGameValidator.java b/src/net/sf/freecol/tools/SaveGameValidator.java
index fb53e03a5..b7e96b5b6 100644
--- a/src/net/sf/freecol/tools/SaveGameValidator.java
+++ b/src/net/sf/freecol/tools/SaveGameValidator.java
@@ -30,8 +30,8 @@ import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
-import net.sf.freecol.FreeCol;
 import net.sf.freecol.common.io.FreeColSavegameFile;
+
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
diff --git a/test/src/net/sf/freecol/common/model/SchoolTest.java b/test/src/net/sf/freecol/common/model/SchoolTest.java
index 16e97b011..cbd685c64 100644
--- a/test/src/net/sf/freecol/common/model/SchoolTest.java
+++ b/test/src/net/sf/freecol/common/model/SchoolTest.java
@@ -19,7 +19,6 @@
 
 package net.sf.freecol.common.model;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/test/src/net/sf/freecol/common/model/TileTest.java b/test/src/net/sf/freecol/common/model/TileTest.java
index f09020d77..d6ec5c54f 100644
--- a/test/src/net/sf/freecol/common/model/TileTest.java
+++ b/test/src/net/sf/freecol/common/model/TileTest.java
@@ -21,7 +21,6 @@ package net.sf.freecol.common.model;
 
 import java.util.List;
 
-import net.sf.freecol.client.gui.MapViewer;
 import net.sf.freecol.util.test.FreeColTestCase;
 import net.sf.freecol.util.test.FreeColTestUtils;
 
diff --git a/test/src/net/sf/freecol/server/generator/MapGeneratorTest.java b/test/src/net/sf/freecol/server/generator/MapGeneratorTest.java
index 51faf2aa6..1ddc4cf22 100644
--- a/test/src/net/sf/freecol/server/generator/MapGeneratorTest.java
+++ b/test/src/net/sf/freecol/server/generator/MapGeneratorTest.java
@@ -23,7 +23,6 @@ import java.io.File;
 import java.util.Random;
 import java.util.Vector;
 
-import net.sf.freecol.FreeCol;
 import net.sf.freecol.common.io.FreeColSavegameFile;
 import net.sf.freecol.common.model.FreeColObject;
 import net.sf.freecol.common.model.Game;
diff --git a/test/src/net/sf/freecol/server/model/ServerBuildingTest.java b/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
index 96a6344b4..c470166be 100644
--- a/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
+++ b/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
@@ -19,7 +19,6 @@
 
 package net.sf.freecol.server.model;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;

From 7c7dd93d15ca8685203c4edf8253ac037c346cb0 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 25 Sep 2015 20:14:17 +0930
Subject: [PATCH 256/323] Many uses of Unit.getClosestSettlement checked the
 wrong return.

---
 src/net/sf/freecol/common/model/Unit.java     | 56 ++++++++++++-------
 src/net/sf/freecol/server/ai/AIUnit.java      |  2 +-
 .../freecol/server/ai/EuropeanAIPlayer.java   | 45 ++++++---------
 src/net/sf/freecol/server/ai/REFAIPlayer.java | 16 ++----
 .../mission/CashInTreasureTrainMission.java   |  2 +-
 .../server/ai/mission/TransportMission.java   |  2 +-
 .../ai/mission/TransportMissionTest.java      |  4 +-
 7 files changed, 61 insertions(+), 66 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index 28bfa0d3e..4754cf666 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -25,7 +25,9 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.logging.Logger;
 
 import javax.xml.stream.XMLStreamConstants;
@@ -1860,31 +1862,17 @@ public class Unit extends GoodsLocation
 
     /**
      * Finds the closest <code>Location</code> to this tile where
-     * this ship can be repaired.
+     * this ship can be repaired, excluding the current colony.
      *
      * @return The closest <code>Location</code> where a ship can be
      *     repaired.
      */
     public Location getRepairLocation() {
         final Player player = getOwner();
-        final Tile tile = getTile();
-        Location bestLocation = null;
-        int bestTurns = INFINITY;
-        for (Colony colony : player.getColonies()) {
-            int turns;
-            if (colony != null && colony != tile.getColony()
-                && colony.hasAbility(Ability.REPAIR_UNITS)
-                && (turns = getTurnsToReach(colony)) >= 0
-                && turns < bestTurns) {
-                // Tile.getDistanceTo(Tile) doesn't care about
-                // connectivity, so we need to check for an available
-                // path to target colony instead
-                bestTurns = turns;
-                bestLocation = colony;
-            }
-        }
-        if (bestLocation == null) bestLocation = player.getEurope();
-        return bestLocation;
+        final Colony notHere = getTile().getColony();
+        Location best = getClosestColony(player.getColonies().stream()
+            .filter(c -> c != notHere && c.hasAbility(Ability.REPAIR_UNITS)));
+        return (best != null) ? best : player.getEurope();
     }
 
     /**
@@ -2738,7 +2726,7 @@ public class Unit extends GoodsLocation
      *
      * @param end The destination <code>Location</code>.
      * @return The number of turns it will take to reach the destination,
-     *         or <code>INFINITY</code> if no path can be found.
+     *         or <code>MANY_TURNS</code> if no path can be found.
      */
     public int getTurnsToReach(Location end) {
         return getTurnsToReach(getLocation(), end);
@@ -2752,7 +2740,7 @@ public class Unit extends GoodsLocation
      * @param start The <code>Location</code> to start the search from.
      * @param end The destination <code>Location</code>.
      * @return The number of turns it will take to reach the <code>end</code>,
-     *         or <code>INFINITY</code> if no path can be found.
+     *         or <code>MANY_TURNS</code> if no path can be found.
      */
     public int getTurnsToReach(Location start, Location end) {
         return getTurnsToReach(start, end, getCarrier(),
@@ -2778,6 +2766,32 @@ public class Unit extends GoodsLocation
         return (path == null) ? MANY_TURNS : path.getTotalTurns();
     }
 
+    /**
+     * Get the colony that can be reached by this unit in the least number
+     * of turns.
+     *
+     * @param colonies A list of <code>Colony</code>s.
+     * @return The nearest <code>Colony</code>, or null if none found.
+     */
+    public Colony getClosestColony(List<Colony> colonies) {
+        return getClosestColony(colonies.stream());
+    }
+    
+    /**
+     * Get the colony that can be reached by this unit in the least number
+     * of turns.
+     *
+     * @param colonies A stream of <code>Colony</code>s.
+     * @return The nearest <code>Colony</code>, or null if none found.
+     */
+    public Colony getClosestColony(Stream<Colony> colonies) {
+        ToIntFunction<Colony> closeness = c -> (c == null) ? MANY_TURNS-1
+            : this.getTurnsToReach(c);
+        return Stream.concat(Stream.of((Colony)null), colonies)
+            .collect(Collectors.minBy(Comparator.comparingInt(closeness)))
+            .orElse(null);
+    }
+    
     /**
      * Find a path for this unit to the nearest settlement with the
      * same owner that is reachable without a carrier.
diff --git a/src/net/sf/freecol/server/ai/AIUnit.java b/src/net/sf/freecol/server/ai/AIUnit.java
index fa34086c3..4afef1e3d 100644
--- a/src/net/sf/freecol/server/ai/AIUnit.java
+++ b/src/net/sf/freecol/server/ai/AIUnit.java
@@ -563,7 +563,7 @@ public class AIUnit extends TransportableAIObject {
         final Player player = unit.getOwner();
         Tile safe = tiles.get(0);
         Tile best = null;
-        int bestTurns = Integer.MAX_VALUE;
+        int bestTurns = Unit.MANY_TURNS;
         Settlement settlement = null;
         for (Tile t : tiles) {
             if (settlement == null || t.isConnectedTo(settlement.getTile())) {
diff --git a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
index f1ce47646..546fa3f86 100644
--- a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
@@ -1242,35 +1242,24 @@ public class EuropeanAIPlayer extends AIPlayer {
         if (wishes == null) return null;
 
         final Unit carrier = aiUnit.getUnit();
-        WorkerWish nonTransported = null;
-        WorkerWish transported = null;
-        float bestNonTransportedValue = -1.0f;
-        float bestTransportedValue = -1.0f;
+        WorkerWish carried = null;
+        WorkerWish other = null;
+        double bestCarriedValue = -1.0, bestOtherValue = -1.0;
         for (WorkerWish w : wishes) {
-            int turns;
-            try {
-                turns = carrier.getTurnsToReach(w.getDestination());
-            } catch (Exception e) {
-                logger.log(Level.WARNING, "Bogus wish destination for "
-                    + aiUnit + ": " + w.getDestination()
-                    + " for wish: " + w, e);
-                continue;
-            }
-            if (turns == INFINITY) {
-                if (bestTransportedValue < w.getValue()) {
-                    bestTransportedValue = w.getValue();
-                    transported = w;
+            int turns = carrier.getTurnsToReach(w.getDestination());
+            if (turns < Unit.MANY_TURNS) {
+                if (bestCarriedValue < (double)w.getValue() / turns) {
+                    bestCarriedValue = (double)w.getValue() / turns;
+                    carried = w;
                 }
             } else {
-                if (bestNonTransportedValue < (float)w.getValue() / turns) {
-                    bestNonTransportedValue = (float)w.getValue() / turns;
-                    nonTransported = w;
+                if (bestOtherValue < w.getValue()) {
+                    bestOtherValue = w.getValue();
+                    other = w;
                 }
             }
         }
-        return (nonTransported != null) ? nonTransported
-            : (transported != null) ? transported
-            : null;
+        return (carried != null) ? carried : (other != null) ? other : null;
     }
 
     /**
@@ -1285,14 +1274,14 @@ public class EuropeanAIPlayer extends AIPlayer {
         if (wishes == null) return null;
 
         final Unit carrier = aiUnit.getUnit();
-        float bestValue = 0.0f;
+        double bestValue = 0.0f;
         GoodsWish best = null;
         for (GoodsWish w : wishes) {
             int turns = carrier.getTurnsToReach(carrier.getLocation(),
                                                 w.getDestination());
-            if (turns == INFINITY) continue;
-            float value = (float)w.getValue() / turns;
-            if (bestValue > value) {
+            if (turns >= Unit.MANY_TURNS) continue;
+            double value = (double)w.getValue() / turns;
+            if (bestValue < value) {
                 bestValue = value;
                 best = w;
             }
@@ -2138,7 +2127,7 @@ public class EuropeanAIPlayer extends AIPlayer {
                 int ttr = 1 + unit.getTurnsToReach(loc, colony.getTile(),
                     unit.getCarrier(),
                     ((relaxed) ? CostDeciders.numberOfTiles() : null));
-                if (ttr < 0) continue;
+                if (ttr >= Unit.MANY_TURNS) continue;
                 double value = colony.getDefenceRatio() * 100.0 / ttr;
                 if (worstValue > value) {
                     worstValue = value;
diff --git a/src/net/sf/freecol/server/ai/REFAIPlayer.java b/src/net/sf/freecol/server/ai/REFAIPlayer.java
index d3001e0ce..37ff55051 100644
--- a/src/net/sf/freecol/server/ai/REFAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/REFAIPlayer.java
@@ -660,16 +660,8 @@ public class REFAIPlayer extends EuropeanAIPlayer {
             }
 
             // Go defend the nearest colony needing defence
-            int bestValue = Integer.MAX_VALUE;
-            Colony best = null;
-            for (AIColony aic : getBadlyDefended()) {
-                Colony c = aic.getColony();
-                int value = u.getTurnsToReach(c);
-                if (value >= 0 && value < bestValue) {
-                    bestValue = value;
-                    best = c;
-                }
-            }
+            Colony best = u.getClosestColony(getBadlyDefended().stream()
+                .map(AIColony::getColony));
             if (best != null
                 && (m = getDefendSettlementMission(aiu, best)) != null) {
                 lb.add(" GO-DEFEND-", best.getName(), " " , m);
@@ -825,11 +817,11 @@ public class REFAIPlayer extends EuropeanAIPlayer {
                 boolean bad = false;
                 while (!bad && !todo.isEmpty()) {
                     for (Location l : idlePorts) {
-                        int bestValue = INFINITY;
+                        int bestValue = Unit.MANY_TURNS;
                         AIUnit best = null;
                         for (AIUnit aiu : todo) {
                             int value = aiu.getUnit().getTurnsToReach(l);
-                            if (value >= 0 && value < bestValue) {
+                            if (bestValue > value) {
                                 bestValue = value;
                                 best = aiu;
                             }
diff --git a/src/net/sf/freecol/server/ai/mission/CashInTreasureTrainMission.java b/src/net/sf/freecol/server/ai/mission/CashInTreasureTrainMission.java
index 0a69ff601..0e1c50084 100644
--- a/src/net/sf/freecol/server/ai/mission/CashInTreasureTrainMission.java
+++ b/src/net/sf/freecol/server/ai/mission/CashInTreasureTrainMission.java
@@ -109,7 +109,7 @@ public class CashInTreasureTrainMission extends Mission {
 
         // Pick the closest carrier and queue this unit.
         final Location here = unit.getLocation();
-        int turns = INFINITY;
+        int turns = Unit.MANY_TURNS;
         Unit closest = null;
         for (Unit c : carriers) {
             int t = c.getTurnsToReach(here);
diff --git a/src/net/sf/freecol/server/ai/mission/TransportMission.java b/src/net/sf/freecol/server/ai/mission/TransportMission.java
index 176758d1a..67127ab7e 100644
--- a/src/net/sf/freecol/server/ai/mission/TransportMission.java
+++ b/src/net/sf/freecol/server/ai/mission/TransportMission.java
@@ -1113,7 +1113,7 @@ public class TransportMission extends Mission {
 
         for (Cargo cargo : order) {
             int turns = carrier.getTurnsToReach(now, cargo.getCarrierTarget());
-            totalTurns += turns; // Might be INFINITY!
+            totalTurns += turns; // Might be MANY_TURNS!
             totalHoldTurns += holds * turns * favourEarly;
             holds += cargo.getNewSpace();
             if (holds < 0 || holds > maxHolds) return -1.0f;
diff --git a/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java b/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java
index b386705c3..df30f76a7 100644
--- a/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java
+++ b/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java
@@ -189,8 +189,8 @@ public class TransportMissionTest extends FreeColTestCase {
         // Test
         assertNotNull("Unit should have a destination", dest);
         assertEquals("Destination should be Europe", europe, dest);
-        assertFalse("Unit should have a path", 
-                    galleon.getTurnsToReach(dest) == FreeColObject.INFINITY);
+        assertTrue("Unit should have a path", 
+            galleon.getTurnsToReach(dest) < Unit.MANY_TURNS);
     }
 
     public void testGetNextStopIsColony() {

From f197e587615a5aefee2c02aff99c7fe7f9cec617 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 26 Sep 2015 11:38:56 +0200
Subject: [PATCH 257/323] Add gc call to ResourceManager.clean, as dozens of MB
 can be collected there

---
 src/net/sf/freecol/common/resources/ResourceManager.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/net/sf/freecol/common/resources/ResourceManager.java b/src/net/sf/freecol/common/resources/ResourceManager.java
index 1010a07e6..408f55741 100644
--- a/src/net/sf/freecol/common/resources/ResourceManager.java
+++ b/src/net/sf/freecol/common/resources/ResourceManager.java
@@ -154,6 +154,7 @@ public class ResourceManager {
                 resource.clean();
             }
         }
+        System.gc();
     }
 
     /**

From b18b82e27929d3aeda6ea12440c3272325387b14 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 26 Sep 2015 20:30:09 +0930
Subject: [PATCH 258/323] Do not keep trying to talk to the metaserver after
 first failure.

---
 data/strings/FreeColMessages.properties       |  2 +-
 src/net/sf/freecol/FreeCol.java               |  8 +-
 .../client/control/ConnectController.java     | 19 ++---
 .../client/control/MapEditorController.java   |  4 -
 .../networking/NoRouteToServerException.java  | 34 --------
 src/net/sf/freecol/server/FreeColServer.java  | 85 +++++++++++--------
 .../freecol/server/ai/EuropeanAIPlayer.java   |  2 +-
 .../server/control/InGameController.java      | 10 +--
 .../server/control/InGameInputHandler.java    |  8 +-
 .../server/control/PreGameController.java     |  6 +-
 .../server/control/PreGameInputHandler.java   |  6 +-
 .../server/control/UserConnectionHandler.java |  9 +-
 src/net/sf/freecol/tools/MapConverter.java    |  3 +-
 .../sf/freecol/server/ServerTestHelper.java   |  3 +-
 14 files changed, 76 insertions(+), 123 deletions(-)
 delete mode 100644 src/net/sf/freecol/common/networking/NoRouteToServerException.java

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index c9c602247..c919a2ca2 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -2876,7 +2876,7 @@ server.invalidPlayerNations=All players need to pick a unique nation before the
 server.maximumPlayers=Sorry, the maximum number of players has been reached.
 server.missingUserName=The user name is missing from the login request.
 server.missingVersion=The FreeCol version is missing from the login request.
-server.noRouteToServer=The server cannot be made public. You should modify your firewall settings to allow connections on the port you specified.
+server.noRouteToServer=The server cannot be made public as it could not connect to the metaserver.
 server.noSuchPlayer=The game does not contain a player called: %player%
 server.notAllReady=Not all players are ready to begin the game!
 server.onlyAdminCanLaunch=Sorry, only the server admin can launch the game.
diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index 4f0bf29f4..f9b3d70ae 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -50,7 +50,6 @@ import net.sf.freecol.common.logging.DefaultHandler;
 import net.sf.freecol.common.model.NationOptions.Advantages;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
-import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.server.FreeColServer;
 
@@ -1390,14 +1389,15 @@ public final class FreeCol {
             try {
                 freeColServer = new FreeColServer(publicServer, false, spec,
                                                   serverPort, serverName);
-            } catch (NoRouteToServerException nrtse) {
-                fatal(Messages.message("server.noRouteToServer"));
-                return;
             } catch (Exception e) {
                 fatal(Messages.message("server.initialize")
                     + ": " + e.getMessage());
                 return;
             }
+            if (publicServer && freeColServer != null
+                && !freeColServer.getPublicServer()) {
+                gripe(Messages.message("server.noRouteToServer"));
+            }
         }
 
         String quit = FreeCol.SERVER_THREAD + "Quit Game";
diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
index f8f46921e..1762df29b 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -55,7 +55,6 @@ import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.networking.Connection;
 import net.sf.freecol.common.networking.DOMMessage;
 import net.sf.freecol.common.networking.LoginMessage;
-import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.common.resources.ResourceManager;
 import net.sf.freecol.server.FreeColServer;
 import net.sf.freecol.server.FreeColServer.GameState;
@@ -132,17 +131,20 @@ public final class ConnectController {
      */
     private FreeColServer startServer(boolean publicServer,
         boolean singlePlayer, Specification spec, int port) {
+        FreeColServer freeColServer;
         try {
-            return new FreeColServer(publicServer, singlePlayer, spec, port,
-                                     null);
-        } catch (NoRouteToServerException e) {
-            gui.showErrorMessage("server.noRouteToServer");
-            logger.log(Level.WARNING, "No route to server.", e);
+            freeColServer = new FreeColServer(publicServer, singlePlayer,
+                                              spec, port, null);
         } catch (IOException e) {
+            freeColServer = null;
             gui.showErrorMessage("server.initialize");
             logger.log(Level.WARNING, "Could not start server.", e);
         }
-        return null;
+        if (publicServer && freeColServer != null
+            && !freeColServer.getPublicServer()) {
+            gui.showErrorMessage("server.noRouteToServer");
+        }
+        return freeColServer;
     }
 
     /**
@@ -632,9 +634,6 @@ public final class ConnectController {
             } catch (IOException e) {
                 err = StringTemplate.key("server.initialize");
                 logger.log(Level.WARNING, "Error starting game.", e);
-            } catch (NoRouteToServerException e) {
-                err = StringTemplate.key("server.noRouteToServer");
-                logger.log(Level.WARNING, "No route to server.", e);
             } catch (XMLStreamException e) {
                 err = FreeCol.badLoad(theFile);
                 logger.log(Level.WARNING, "Stream error.", e);
diff --git a/src/net/sf/freecol/client/control/MapEditorController.java b/src/net/sf/freecol/client/control/MapEditorController.java
index 1e9ea5aca..e1bcb1f02 100644
--- a/src/net/sf/freecol/client/control/MapEditorController.java
+++ b/src/net/sf/freecol/client/control/MapEditorController.java
@@ -42,7 +42,6 @@ import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Tile;
-import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.common.option.MapGeneratorOptions;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.util.LogBuilder;
@@ -116,9 +115,6 @@ public final class MapEditorController {
             freeColClient.setInGame(true);
             gui.changeViewMode(GUI.VIEW_TERRAIN_MODE);
             gui.startMapEditorGUI();
-        } catch (NoRouteToServerException e) {
-            gui.showErrorMessage("server.noRouteToServer");
-            return;
         } catch (IOException e) {
             gui.showErrorMessage("server.initialize");
             return;
diff --git a/src/net/sf/freecol/common/networking/NoRouteToServerException.java b/src/net/sf/freecol/common/networking/NoRouteToServerException.java
deleted file mode 100644
index 19a18cf51..000000000
--- a/src/net/sf/freecol/common/networking/NoRouteToServerException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *  Copyright (C) 2002-2015   The FreeCol Team
- *
- *  This file is part of FreeCol.
- *
- *  FreeCol 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, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  FreeCol 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 FreeCol.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sf.freecol.common.networking;
-
-
-/**
- * Thrown if there is no route to a server.
- */
-public class NoRouteToServerException extends Exception {
-    
-    /**
-     * The constructor to use.
-     */
-    public NoRouteToServerException() {
-        super();
-    }
-}
diff --git a/src/net/sf/freecol/server/FreeColServer.java b/src/net/sf/freecol/server/FreeColServer.java
index 0931a8291..41b050ca5 100644
--- a/src/net/sf/freecol/server/FreeColServer.java
+++ b/src/net/sf/freecol/server/FreeColServer.java
@@ -66,7 +66,6 @@ import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.networking.Connection;
 import net.sf.freecol.common.networking.DOMMessage;
-import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.common.option.BooleanOption;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.util.LogBuilder;
@@ -195,7 +194,7 @@ public final class FreeColServer {
     /** An active unit specified in a saved game. */
     private Unit activeUnit = null;
 
-
+    
     /**
      * Starts a new server, with a new game.
      *
@@ -205,12 +204,10 @@ public final class FreeColServer {
      * @param port The TCP port to use for the public socket.
      * @param name An optional name for the server.
      * @exception IOException If the public socket cannot be created.
-     * @exception NoRouteToServerException If there is a problem with the
-     *     meta-server.
      */
     public FreeColServer(boolean publicServer, boolean singlePlayer,
                          Specification specification, int port, String name)
-        throws IOException, NoRouteToServerException {
+        throws IOException {
         this.publicServer = publicServer;
         this.singlePlayer = singlePlayer;
         this.name = name;
@@ -230,9 +227,7 @@ public final class FreeColServer {
         this.inGameController = new InGameController(this, random);
         this.mapGenerator = new SimpleMapGenerator(game, random);
 
-        if (publicServer) {
-            updateMetaServer(true); // Throws NoRouteToServerException
-        }
+        this.publicServer = updateMetaServer(true);
     }
 
     /**
@@ -248,13 +243,10 @@ public final class FreeColServer {
      * @param name An optional name for the server.
      * @exception IOException If save game can not be found.
      * @exception FreeColException If the savegame could not be loaded.
-     * @exception NoRouteToServerException If there is a problem with the
-     *     meta-server.
      */
     public FreeColServer(final FreeColSavegameFile savegame, 
                          Specification specification, int port, String name)
-        throws FreeColException, IOException, NoRouteToServerException,
-               XMLStreamException {
+        throws FreeColException, IOException, XMLStreamException {
         // publicServer will be read from the saved game
         // singlePlayer will be read from the saved game
         this.name = name;
@@ -279,9 +271,7 @@ public final class FreeColServer {
         this.inGameController = new InGameController(this, random);
         this.mapGenerator = null;
 
-        if (publicServer) {
-            updateMetaServer(true); // Throws NoRouteToServerException
-        }
+        this.publicServer = updateMetaServer(true);
     }
 
 
@@ -290,7 +280,7 @@ public final class FreeColServer {
      *
      * @return True if this is a single player game.
      */
-    public boolean isSinglePlayer() {
+    public boolean getSinglePlayer() {
         return this.singlePlayer;
     }
 
@@ -303,6 +293,15 @@ public final class FreeColServer {
         this.singlePlayer = singlePlayer;
     }
 
+    /**
+     * Get the public server state.
+     *
+     * @return The public server state.
+     */
+    public boolean getPublicServer() {
+        return this.publicServer;
+    }
+
     /**
      * Sets the public server state.
      *
@@ -380,7 +379,8 @@ public final class FreeColServer {
                 break;
             } catch (BindException be) {
                 if (i == 1) {
-                    throw new IOException("Bind exception starting server", be);
+                    throw new IOException("Bind exception starting server at: "
+                        + host + ":" + port, be);
                 }
             } catch (IOException ie) {
                 if (i == 1) throw ie;
@@ -587,9 +587,11 @@ public final class FreeColServer {
      * Sends information about this server to the meta-server.
      *
      * Publically visible version, that is called in game.
+     *
+     * @return True if the MetaServer was updated.
      */
-    public void updateMetaServer() throws NoRouteToServerException {
-        if (publicServer) updateMetaServer(false);
+    public boolean updateMetaServer() {
+        return updateMetaServer(false);
     }
 
     /**
@@ -599,12 +601,10 @@ public final class FreeColServer {
      * when called from the constructors.
      *
      * @param firstTime Must be true when called for the first time.
-     * @throws NoRouteToServerException if the meta-server cannot connect to
-     *     this server.
+     * @return True if the MetaServer was updated.
      */
-    private void updateMetaServer(boolean firstTime)
-        throws NoRouteToServerException {
-        if (!publicServer) return;
+    private boolean updateMetaServer(boolean firstTime) {
+        if (!this.publicServer) return false;
 
         Connection mc;
         try {
@@ -612,8 +612,10 @@ public final class FreeColServer {
                                 FreeCol.META_SERVER_PORT, null,
                                 FreeCol.SERVER_THREAD);
         } catch (IOException e) {
-            logger.log(Level.WARNING, "Could not connect to meta-server.", e);
-            return;
+            logger.log(Level.WARNING, "Could not connect to meta-server: ",
+                FreeCol.META_SERVER_ADDRESS + ":" + FreeCol.META_SERVER_PORT);
+            this.publicServer = false;
+            return false;
         }
 
         String tag = (firstTime) ? "register" : "update";
@@ -633,11 +635,14 @@ public final class FreeColServer {
                     "gameState", Integer.toString(getGameState().ordinal())));
             if (reply != null
                 && "noRouteToServer".equals(reply.getTagName())) {
-                throw new NoRouteToServerException();
+                this.publicServer = false;
+                return false;
             }
-        } catch (IOException e) {
-            logger.log(Level.WARNING, "Network error with meta-server.", e);
-            return;
+        } catch (IOException ioe) {
+            logger.log(Level.WARNING, "Network error with meta-server:" + addr,
+                ioe);
+            this.publicServer = false;
+            return false;
         } finally {
             mc.close();
         }
@@ -651,20 +656,21 @@ public final class FreeColServer {
             t.scheduleAtFixedRate(new TimerTask() {
                     @Override
                     public void run() {
-                        try {
-                            updateMetaServer();
-                        } catch (NoRouteToServerException e) {}
+                        if (!updateMetaServer()) cancel();
                     }
                 }, META_SERVER_UPDATE_INTERVAL, META_SERVER_UPDATE_INTERVAL);
         }
+        return true;
     }
 
     /**
      * Removes this server from the metaserver's list. The information is only
      * sent if <code>public == true</code>.
+     *
+     * @return True if the MetaServer was updated.
      */
-    public void removeFromMetaServer() {
-        if (!publicServer) return;
+    public boolean removeFromMetaServer() {
+        if (!this.publicServer) return false;
 
         try (
             Connection mc = new Connection(FreeCol.META_SERVER_ADDRESS,
@@ -673,9 +679,14 @@ public final class FreeColServer {
         ) {
             mc.send(DOMMessage.createMessage("remove",
                     "port", Integer.toString(mc.getSocket().getPort())));
-        } catch (IOException e) {
-            logger.log(Level.WARNING, "Network error with meta-server.", e);
+        } catch (IOException ioe) {
+            logger.log(Level.WARNING, "Network error leaving meta-server: "
+                + FreeCol.META_SERVER_ADDRESS + ":" + FreeCol.META_SERVER_PORT,
+                ioe);
+            this.publicServer = false;
+            return false;
         }
+        return true;
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
index 546fa3f86..663297b47 100644
--- a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
@@ -442,7 +442,7 @@ public class EuropeanAIPlayer extends AIPlayer {
      */
     private void cheat(LogBuilder lb) {
         final AIMain aiMain = getAIMain();
-        if (!aiMain.getFreeColServer().isSinglePlayer()) return;
+        if (!aiMain.getFreeColServer().getSinglePlayer()) return;
 
         final Player player = getPlayer();
         if (player.getPlayerType() != PlayerType.COLONIAL) return;
diff --git a/src/net/sf/freecol/server/control/InGameController.java b/src/net/sf/freecol/server/control/InGameController.java
index 3f45bdbe1..18105ce17 100644
--- a/src/net/sf/freecol/server/control/InGameController.java
+++ b/src/net/sf/freecol/server/control/InGameController.java
@@ -488,7 +488,7 @@ public final class InGameController extends Controller {
             });
         DOMMessage reply;
         try {
-            boolean single = getFreeColServer().isSinglePlayer();
+            boolean single = getFreeColServer().getSinglePlayer();
             reply = future.get(FreeCol.getTimeout(single), TimeUnit.SECONDS);
         } catch (TimeoutException te) {
             serverPlayer.send(new ChangeSet()
@@ -633,7 +633,7 @@ public final class InGameController extends Controller {
             // Do not end single player games where an AI has won,
             // that would stop revenge mode.
             if (winner == player
-                && !(freeColServer.isSinglePlayer() && winner.isAI())) {
+                && !(freeColServer.getSinglePlayer() && winner.isAI())) {
                 boolean highScore = !winner.isAI()
                     && HighScore.newHighScore(winner);
                 cs.addTrivial(See.all(), "gameEnded",
@@ -695,7 +695,7 @@ public final class InGameController extends Controller {
             // current player which requested the end-of-turn, unless
             // it is doing a debug run.
             boolean debugSkip = !player.isAI()
-                && freeColServer.isSinglePlayer()
+                && freeColServer.getSinglePlayer()
                 && debugOnlyAITurns > 0;
             if (debugSkip) {
                 game.sendToOthers(player, cs);
@@ -1074,7 +1074,7 @@ public final class InGameController extends Controller {
     public Element continuePlaying(ServerPlayer serverPlayer) {
         final ServerGame game = getGame();
         Element reply = null;
-        if (!getFreeColServer().isSinglePlayer()) {
+        if (!getFreeColServer().getSinglePlayer()) {
             logger.warning("Can not continue playing in multiplayer!");
         } else if (serverPlayer != game.checkForWinner()) {
             logger.warning("Can not continue playing, as "
@@ -4199,7 +4199,7 @@ public final class InGameController extends Controller {
      * @return An <code>Element</code> encapsulating this action.
      */
     public Element enterRevengeMode(ServerPlayer serverPlayer) {
-        if (!getFreeColServer().isSinglePlayer()) {
+        if (!getFreeColServer().getSinglePlayer()) {
             return DOMMessage.clientError("Can not enter revenge mode,"
                 + " as this is not a single player game.");
         }
diff --git a/src/net/sf/freecol/server/control/InGameInputHandler.java b/src/net/sf/freecol/server/control/InGameInputHandler.java
index 805e4da24..b80da2098 100644
--- a/src/net/sf/freecol/server/control/InGameInputHandler.java
+++ b/src/net/sf/freecol/server/control/InGameInputHandler.java
@@ -71,7 +71,6 @@ import net.sf.freecol.common.networking.MoveToMessage;
 import net.sf.freecol.common.networking.NetworkConstants;
 import net.sf.freecol.common.networking.NewLandNameMessage;
 import net.sf.freecol.common.networking.NewRegionNameMessage;
-import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.common.networking.PayArrearsMessage;
 import net.sf.freecol.common.networking.PayForBuildingMessage;
 import net.sf.freecol.common.networking.PutOutsideColonyMessage;
@@ -678,13 +677,10 @@ public final class InGameInputHandler extends InputHandler
         Element reply = null;
         player.setConnected(false);
         if (getFreeColServer().getGame().getCurrentPlayer() == player
-                && !getFreeColServer().isSinglePlayer()) {
+                && !getFreeColServer().getSinglePlayer()) {
             reply = getFreeColServer().getInGameController().endTurn(player);
         }
-        try {
-            getFreeColServer().updateMetaServer();
-        } catch (NoRouteToServerException e) {}
-        
+        getFreeColServer().updateMetaServer();
         return reply;
     }
 }
diff --git a/src/net/sf/freecol/server/control/PreGameController.java b/src/net/sf/freecol/server/control/PreGameController.java
index cdb521b05..e8080c17f 100644
--- a/src/net/sf/freecol/server/control/PreGameController.java
+++ b/src/net/sf/freecol/server/control/PreGameController.java
@@ -28,7 +28,6 @@ import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.networking.Connection;
 import net.sf.freecol.common.networking.DOMMessage;
-import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.server.FreeColServer;
 import net.sf.freecol.server.model.ServerPlayer;
 
@@ -96,10 +95,7 @@ public final class PreGameController extends Controller {
 
         // Start the game:
         freeColServer.setGameState(FreeColServer.GameState.IN_GAME);
-        try {
-            freeColServer.updateMetaServer();
-        } catch (NoRouteToServerException e) {}
-
+        freeColServer.updateMetaServer();
         freeColServer.getServer()
             .sendToAll(DOMMessage.createMessage("startGame"));
         freeColServer.getServer().setMessageHandlerToAllConnections(freeColServer.getInGameInputHandler());
diff --git a/src/net/sf/freecol/server/control/PreGameInputHandler.java b/src/net/sf/freecol/server/control/PreGameInputHandler.java
index 50612369b..5872b1514 100644
--- a/src/net/sf/freecol/server/control/PreGameInputHandler.java
+++ b/src/net/sf/freecol/server/control/PreGameInputHandler.java
@@ -32,7 +32,6 @@ import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.networking.Connection;
 import net.sf.freecol.common.networking.DOMMessage;
-import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.server.FreeColServer;
 import net.sf.freecol.server.model.ServerPlayer;
@@ -110,10 +109,7 @@ public final class PreGameInputHandler extends InputHandler {
                     "reason", "User has logged out.",
                     "player", player.getId()),
                 connection);
-
-        try {
-            getFreeColServer().updateMetaServer();
-        } catch (NoRouteToServerException e) {}
+        getFreeColServer().updateMetaServer();
         return null;
     }
 
diff --git a/src/net/sf/freecol/server/control/UserConnectionHandler.java b/src/net/sf/freecol/server/control/UserConnectionHandler.java
index c8633ec8a..c25714e88 100644
--- a/src/net/sf/freecol/server/control/UserConnectionHandler.java
+++ b/src/net/sf/freecol/server/control/UserConnectionHandler.java
@@ -30,7 +30,6 @@ import net.sf.freecol.common.networking.Connection;
 import net.sf.freecol.common.networking.DOMMessage;
 import net.sf.freecol.common.networking.LoginMessage;
 import net.sf.freecol.common.networking.MessageHandler;
-import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.server.FreeColServer;
 import net.sf.freecol.server.model.ServerPlayer;
 import net.sf.freecol.server.networking.Server;
@@ -259,13 +258,9 @@ public final class UserConnectionHandler extends FreeColServerHolder
 
         connection.setMessageHandler(mh);
         server.addConnection(connection);
-        try {
-            freeColServer.updateMetaServer();
-        } catch (NoRouteToServerException e) {
-            logger.log(Level.WARNING, "Unable to update meta-server.", e);
-        }
+        freeColServer.updateMetaServer();
         return new LoginMessage(player, userName, version, !starting,
-                                freeColServer.isSinglePlayer(),
+                                freeColServer.getSinglePlayer(),
                                 isCurrentPlayer, active,
                                 game).toXMLElement();
     }
diff --git a/src/net/sf/freecol/tools/MapConverter.java b/src/net/sf/freecol/tools/MapConverter.java
index 04f84d8f7..cbdb0ce59 100644
--- a/src/net/sf/freecol/tools/MapConverter.java
+++ b/src/net/sf/freecol/tools/MapConverter.java
@@ -32,7 +32,6 @@ import net.sf.freecol.common.FreeColException;
 import net.sf.freecol.common.io.FreeColSavegameFile;
 import net.sf.freecol.common.io.FreeColTcFile;
 import net.sf.freecol.common.model.Specification;
-import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.server.FreeColServer;
 
 
@@ -70,7 +69,7 @@ public class MapConverter {
                     System.out.println("Saved updated savegame.");
                     server.shutdown();
                     System.out.println("Shut down server.");
-                } catch (IOException | XMLStreamException | FreeColException | NoRouteToServerException e) {
+                } catch (IOException | XMLStreamException | FreeColException e) {
                     System.out.println(e);
                 }
             }
diff --git a/test/src/net/sf/freecol/server/ServerTestHelper.java b/test/src/net/sf/freecol/server/ServerTestHelper.java
index 6c977785f..5532f6965 100644
--- a/test/src/net/sf/freecol/server/ServerTestHelper.java
+++ b/test/src/net/sf/freecol/server/ServerTestHelper.java
@@ -30,7 +30,6 @@ import net.sf.freecol.common.io.FreeColSavegameFile;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.Map;
 import net.sf.freecol.common.model.Specification;
-import net.sf.freecol.common.networking.NoRouteToServerException;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.server.control.ChangeSet;
 import net.sf.freecol.server.control.Controller;
@@ -93,7 +92,7 @@ public final class ServerTestHelper {
             // FIXME: Pass tc
             server = new FreeColServer(publicServer, singlePlayer,
                                        spec, port, name);
-        } catch (IOException|NoRouteToServerException ex) {
+        } catch (IOException ex) {
             fail(ex.getMessage());
         }
         assertNotNull(server);

From 170614ef1c2d05c19d27d32567d1d93391757211 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 26 Sep 2015 14:31:25 +0200
Subject: [PATCH 259/323] Simplify ImageLibrary.drawTiledImage

---
 src/net/sf/freecol/client/gui/ImageLibrary.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index 210189e18..0c955d5a0 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -885,10 +885,7 @@ public final class ImageLibrary {
                                       JComponent c, Insets insets) {
         int width = c.getWidth();
         int height = c.getHeight();
-        BufferedImage image = ResourceManager.hasImageResource(resource)
-            ? ResourceManager.getImage(resource) : null;
-        int dx, dy, xmin, ymin;
-
+        int xmin, ymin;
         if (insets == null) {
             xmin = 0;
             ymin = 0;
@@ -898,11 +895,13 @@ public final class ImageLibrary {
             width -= insets.left + insets.right;
             height -= insets.top + insets.bottom;
         }
-        if (image != null && (dx = image.getWidth()) > 0
-            && (dy = image.getHeight()) > 0) {
-            int xmax, ymax;
-            xmax = xmin + width;
-            ymax = ymin + height;
+
+        if (ResourceManager.hasImageResource(resource)) {
+            BufferedImage image = ResourceManager.getImage(resource);
+            int dx = image.getWidth();
+            int dy = image.getHeight();
+            int xmax = xmin + width;
+            int ymax = ymin + height;
             for (int x = xmin; x < xmax; x += dx) {
                 for (int y = ymin; y < ymax; y += dy) {
                     g.drawImage(image, x, y, null);

From f57e2f0982ff26230bd6195a384a08cfddbcf831 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 26 Sep 2015 21:24:51 +0200
Subject: [PATCH 260/323] Rewrite MapViewer.displayMap and draw more layers
 separately

This allows easier repair of the draw ordering and more optimizations.
Included bug fixes:
- Gridlines are now correctly drawn on border of unexplored tiles.
- Region borders are correctly drawn now, these were in some cases hidden.
---
 src/net/sf/freecol/client/gui/MapViewer.java | 641 ++++++++++---------
 src/net/sf/freecol/common/model/Map.java     |  36 ++
 2 files changed, 372 insertions(+), 305 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 43a50ca31..e93a0c7de 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -585,7 +585,7 @@ public final class MapViewer {
             displaySettlementWithChipsOrPopulationNumber(freeColClient, lib,
                 g, tile, tileWidth, tileHeight, false);
             displayFogOfWar(freeColClient, fog, g, tile);
-            displayOptionalTileTextAndRegionBorder(g, tile);
+            displayOptionalTileText(g, tile);
         }
 
         if (tileCannotBeWorked) {
@@ -1529,35 +1529,22 @@ public final class MapViewer {
     }
 
     /**
-     * Displays the Map onto the given Graphics2D object.  The Tile at
-     * location (x, y) is displayed in the center.
+     * Displays the Map.
      *
      * @param g The Graphics2D object on which to draw the Map.
      */
     void displayMap(Graphics2D g) {
         final ClientOptions options = freeColClient.getClientOptions();
-        final Player player = freeColClient.getMyPlayer();
+        Map map = freeColClient.getGame().getMap();
+
+        // Remember transform
         AffineTransform originTransform = g.getTransform();
         Rectangle clipBounds = g.getClipBounds();
-        Map map = freeColClient.getGame().getMap();
-        FontLibrary fontLibrary = new FontLibrary(lib.getScaleFactor());
-
-        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                           RenderingHints.VALUE_ANTIALIAS_ON);
-
-        /*
-        PART 1
-        ======
-        Position the map if it is not positioned yet.
-        */
 
+        // Position the map if it is not positioned yet
         repositionMapIfNeeded();
 
-        /*
-        PART 1a
-        =======
-        Determine which tiles need to be redrawn.
-        */
+        // Determine which tiles need to be redrawn
         int firstRow = (clipBounds.y - topRowY) / (halfHeight) - 1;
         int clipTopY = topRowY + firstRow * (halfHeight);
         firstRow = topRow + firstRow;
@@ -1574,301 +1561,353 @@ public final class MapViewer {
             / tileWidth;
         lastColumn = leftColumn + lastColumn;
 
-        /*
-        PART 1b
-        =======
-        Create a GeneralPath to draw the grid with, if needed.
-        */
-        GeneralPath gridPath = null;
+        // Clear background
+        g.setColor(Color.black);
+        g.fillRect(clipBounds.x, clipBounds.y,
+                   clipBounds.width, clipBounds.height);
+
+        // Set and remember transform for upper left corner
+        g.translate(clipLeftX, clipTopY);
+        AffineTransform baseTransform = g.getTransform();
+
+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                           RenderingHints.VALUE_ANTIALIAS_ON);
+
+        // Display the base Tiles
+        final int x0 = firstColumn;
+        final int y0 = firstRow;
+        map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+            (Tile tile) -> {
+                final int x = tile.getX();
+                final int y = tile.getY();
+                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                            (y-y0) * halfHeight);
+
+                displayTileWithBeachAndBorder(g, lib, tile);
+                for (Direction direction : Direction.values()) {
+                    Tile borderingTile = tile.getNeighbourOrNull(direction);
+                    if (borderingTile != null && !borderingTile.isExplored()) {
+                        g.drawImage(lib.getBorderImage(
+                                null, direction, tile.getX(), tile.getY()),
+                            0, 0, null);
+                    }
+                }
+
+                g.setTransform(baseTransform);
+            });
+
+        // Draw the grid, if needed
         if (options.getBoolean(ClientOptions.DISPLAY_GRID)) {
-            gridPath = new GeneralPath();
+            // Generate a zigzag GeneralPath
+            GeneralPath gridPath = new GeneralPath();
             gridPath.moveTo(0, 0);
             int nextX = halfWidth;
             int nextY = -halfHeight;
-
             for (int i = 0; i <= ((lastColumn - firstColumn) * 2 + 1); i++) {
                 gridPath.lineTo(nextX, nextY);
                 nextX += halfWidth;
                 nextY = (nextY == 0 ? -halfHeight : 0);
             }
-        }
 
-        /*
-        PART 2
-        ======
-        Display the Tiles and the Units.
-        */
-
-        g.setColor(Color.black);
-        g.fillRect(clipBounds.x, clipBounds.y,
-                   clipBounds.width, clipBounds.height);
-
-        /*
-        PART 2a
-        =======
-        Display the base Tiles
-        */
-        g.translate(clipLeftX, clipTopY);
-        AffineTransform baseTransform = g.getTransform();
-        AffineTransform rowTransform = null;
-
-        // Row per row; start with the top modified row
-        for (int row = firstRow; row <= lastRow; row++) {
-            rowTransform = g.getTransform();
-            if ((row & 1) == 1) {
-                g.translate(halfWidth, 0);
-            }
-
-            // Column per column; start at the left side to display the tiles.
-            for (int column = firstColumn; column <= lastColumn; column++) {
-                Tile tile = map.getTile(column, row);
-                displayTileWithBeachAndBorder(g, lib, tile);
-                g.translate(tileWidth, 0);
-            }
-            g.setTransform(rowTransform);
-            g.translate(0, halfHeight);
-        }
-        g.setTransform(baseTransform);
-
-        /*
-        PART 2b
-        =======
-        Display the Tile overlays and Units
-        */
-
-        List<Unit> units = new ArrayList<>();
-        List<AffineTransform> unitTransforms = new ArrayList<>();
-        List<Settlement> settlements = new ArrayList<>();
-        List<AffineTransform> settlementTransforms = new ArrayList<>();
-        Set<String> overlayCache = ImageLibrary.createOverlayCache();
-
-        int colonyLabels = options.getInteger(ClientOptions.COLONY_LABELS);
-        boolean withNumbers = colonyLabels == ClientOptions.COLONY_LABELS_CLASSIC;
-        // Row per row; start with the top modified row
-        for (int row = firstRow; row <= lastRow; row++) {
-            rowTransform = g.getTransform();
-            if ((row & 1) == 1) {
-                g.translate(halfWidth, 0);
-            }
-
-            if (options.getBoolean(ClientOptions.DISPLAY_GRID)) {
-                // Display the grid.
-                g.translate(0, halfHeight);
-                g.setStroke(gridStroke);
-                g.setColor(Color.BLACK);
-                g.draw(gridPath);
-                g.translate(0, -halfHeight);
-            }
-
-            // Column per column; start at the left side to display the tiles.
-            for (int column = firstColumn; column <= lastColumn; column++) {
-                Tile tile = map.getTile(column, row);
-
-                // paint full borders
-                displayTerritorialBorders(g, tile, BorderType.COUNTRY, true);
-                // Display the Tile overlays:
-                g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                                   RenderingHints.VALUE_ANTIALIAS_OFF);
-                if (tile != null && tile.isExplored()) {
-                    for (Direction direction : Direction.values()) {
-                        Tile borderingTile = tile.getNeighbourOrNull(direction);
-                        if (borderingTile != null && !borderingTile.isExplored()) {
-                            g.drawImage(lib.getBorderImage(
-                                    null, direction, tile.getX(), tile.getY()),
-                                0, 0, null);
-                        }
-                    }
-                    Image overlayImage = lib.getOverlayImage(tile, overlayCache);
-                    displayTileItems(g, tile, overlayImage);
-                    displaySettlementWithChipsOrPopulationNumber(freeColClient,
-                        lib, g, tile, tileWidth, tileHeight, withNumbers);
-                    displayFogOfWar(freeColClient, fog, g, tile);
-                    displayOptionalTileTextAndRegionBorder(g, tile);
-                }
-                g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                                   RenderingHints.VALUE_ANTIALIAS_ON);
-                // paint transparent borders
-                displayTerritorialBorders(g, tile, BorderType.COUNTRY, false);
-
-                if (viewMode == GUI.VIEW_TERRAIN_MODE
-                        && tile != null && tile.equals(selectedTile)) {
-                    displayCursor(g);
-                }
-                // check for units
-                if (tile != null) {
-                    Unit unitInFront = findUnitInFront(tile);
-                    if (unitInFront != null && !isOutForAnimation(unitInFront)) {
-                        units.add(unitInFront);
-                        unitTransforms.add(g.getTransform());
-                    }
-                    // check for settlements
-                    Settlement settlement = tile.getSettlement();
-                    if (settlement != null) {
-                        settlements.add(settlement);
-                        settlementTransforms.add(g.getTransform());
-                    }
-                }
-                g.translate(tileWidth, 0);
-            }
-
-            g.setTransform(rowTransform);
-            g.translate(0, halfHeight);
-        }
-        g.setTransform(baseTransform);
-
-        /*
-        PART 2c
-        =======
-        Display units
-        */
-        if (!units.isEmpty()) {
+            // Display the grid
+            g.setStroke(gridStroke);
             g.setColor(Color.BLACK);
-            Image darkness = null;
-            for (int index = 0; index < units.size(); index++) {
-                final Unit unit = units.get(index);
-                g.setTransform(unitTransforms.get(index));
-                if (unit.isUndead()) {
-                    if(darkness == null) {
-                        // Rescale dark halo only in rare case its needed!
-                        darkness = lib.getMiscImage(ImageLibrary.DARKNESS);
-                    }
-                    // display darkness
-                    displayCenteredImage(g, darkness, tileWidth, tileHeight);
+            for (int row = firstRow; row <= lastRow; row++) {
+                g.translate(0, halfHeight);
+                AffineTransform rowTransform = g.getTransform();
+                if ((row & 1) == 1) {
+                    g.translate(halfWidth, 0);
                 }
-                displayUnit(g, unit);
+                g.draw(gridPath);
+                g.setTransform(rowTransform);
             }
             g.setTransform(baseTransform);
         }
 
-        /*
-        PART 3
-        ======
-        Display the colony names.
-        */
-        if (!settlements.isEmpty()
-            && colonyLabels != ClientOptions.COLONY_LABELS_NONE) {
-            for (int index = 0; index < settlements.size(); index++) {
-                final Settlement settlement = settlements.get(index);
-                if (settlement.isDisposed()) {
-                    logger.warning("Settlement display race detected: "
-                                   + settlement.getName());
-                    continue;
-                }
-                String name
-                    = Messages.message(settlement.getLocationLabelFor(player));
-                if (name == null) continue;
-                Color backgroundColor = settlement.getOwner().getNationColor();
-                if (backgroundColor == null) backgroundColor = Color.WHITE;
-                Font font = fontLibrary.createScaledFont(FontLibrary.FontType.NORMAL, FontLibrary.FontSize.SMALLER, Font.BOLD);
-                Font italicFont = fontLibrary.createScaledFont(FontLibrary.FontType.NORMAL, FontLibrary.FontSize.SMALLER, Font.BOLD | Font.ITALIC);
-                Font productionFont = fontLibrary.createScaledFont(FontLibrary.FontType.NORMAL, FontLibrary.FontSize.TINY, Font.BOLD);
-                // int yOffset = lib.getSettlementImage(settlement).getHeight(null) + 1;
-                int yOffset = tileHeight;
-                g.setTransform(settlementTransforms.get(index));
-                switch (colonyLabels) {
-                case ClientOptions.COLONY_LABELS_CLASSIC:
-                    Image img = lib.getStringImage(g, name, backgroundColor, font);
-                    g.drawImage(img, (tileWidth - img.getWidth(null))/2 + 1,
-                                yOffset, null);
-                    break;
-                case ClientOptions.COLONY_LABELS_MODERN:
-                default:
-                    backgroundColor = new Color(backgroundColor.getRed(),
-                                                backgroundColor.getGreen(),
-                                                backgroundColor.getBlue(), 128);
-                    TextSpecification[] specs = new TextSpecification[1];
-                    if (settlement instanceof Colony
-                        && settlement.getOwner() == player) {
-                        Colony colony = (Colony) settlement;
-                        BuildableType buildable = colony.getCurrentlyBuilding();
-                        if (buildable != null) {
-                            specs = new TextSpecification[2];
-                            String t = Messages.getName(buildable)
-                                + " " + Turn.getTurnsText(colony.getTurnsToComplete(buildable));
-                            specs[1] = new TextSpecification(t, productionFont);
-                        }
-                    }
-                    specs[0] = new TextSpecification(name, font);
+        // Paint full region borders
+        if (options.getInteger(ClientOptions.DISPLAY_TILE_TEXT) ==
+                ClientOptions.DISPLAY_TILE_TEXT_REGIONS) {
+            map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+                (Tile tile) -> {
+                    final int x = tile.getX();
+                    final int y = tile.getY();
+                    g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                                (y-y0) * halfHeight);
+                    displayTerritorialBorders(g, tile, BorderType.REGION, true);
+                    g.setTransform(baseTransform);
+                });
+        }
 
-                    Image nameImage = createLabel(g, specs, backgroundColor);
-                    if (nameImage != null) {
-                        int spacing = 3;
-                        Image leftImage = null;
-                        Image rightImage = null;
-                        if (settlement instanceof Colony) {
-                            Colony colony = (Colony)settlement;
-                            String string = Integer.toString(colony.getDisplayUnitCount());
-                            leftImage = createLabel(g, string,
-                                ((colony.getPreferredSizeChange() > 0) ? italicFont : font),
-                                backgroundColor);
-                            if (player.owns(settlement)) {
-                                int bonusProduction = colony.getProductionBonus();
-                                if (bonusProduction != 0) {
-                                    String bonus = (bonusProduction > 0)
-                                        ? "+" + bonusProduction
-                                        : Integer.toString(bonusProduction);
-                                    rightImage = createLabel(g, bonus, font,
-                                                             backgroundColor);
-                                }
-                            }
-                        } else if (settlement instanceof IndianSettlement) {
-                            IndianSettlement is = (IndianSettlement) settlement;
-                            if (is.getType().isCapital()) {
-                                leftImage = createCapitalLabel(nameImage.getHeight(null), 5, backgroundColor);
-                            }
+        // Paint full country borders
+        map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+            (Tile tile) -> {
+                final int x = tile.getX();
+                final int y = tile.getY();
+                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                            (y-y0) * halfHeight);
+                displayTerritorialBorders(g, tile, BorderType.COUNTRY, true);
+                g.setTransform(baseTransform);
+            });
 
-                            Unit missionary = is.getMissionary();
-                            if (missionary != null) {
-                                boolean expert = missionary.hasAbility(Ability.EXPERT_MISSIONARY);
-                                backgroundColor = missionary.getOwner().getNationColor();
-                                backgroundColor = new Color(backgroundColor.getRed(), backgroundColor.getGreen(), backgroundColor.getBlue(), 128);
-                                rightImage = createReligiousMissionLabel(nameImage.getHeight(null), 5, backgroundColor, expert);
-                            }
-                        }
+        // Display the Tile overlays
+        Set<String> overlayCache = ImageLibrary.createOverlayCache();
+        int colonyLabels = options.getInteger(ClientOptions.COLONY_LABELS);
+        boolean withNumbers = colonyLabels == ClientOptions.COLONY_LABELS_CLASSIC;
+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                           RenderingHints.VALUE_ANTIALIAS_OFF);
+        map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+            (Tile tile) -> {
+                if (!tile.isExplored())
+                    return;
 
-                        int width = (int)((nameImage.getWidth(null)
-                                * lib.getScaleFactor())
-                            + ((leftImage != null)
-                                ? (leftImage.getWidth(null)
-                                    * lib.getScaleFactor()) + spacing
-                                : 0)
-                            + ((rightImage != null)
-                                ? (rightImage.getWidth(null)
-                                    * lib.getScaleFactor()) + spacing
-                                : 0));
-                        int labelOffset = (tileWidth - width)/2;
-                        yOffset -= (nameImage.getHeight(null)
-                            * lib.getScaleFactor())/2;
-                        if (leftImage != null) {
-                            g.drawImage(leftImage, labelOffset, yOffset, null);
-                            labelOffset += (leftImage.getWidth(null)
-                                * lib.getScaleFactor()) + spacing;
-                        }
-                        g.drawImage(nameImage, labelOffset, yOffset, null);
-                        if (rightImage != null) {
-                            labelOffset += (nameImage.getWidth(null)
-                                * lib.getScaleFactor()) + spacing;
-                            g.drawImage(rightImage, labelOffset, yOffset, null);
-                        }
-                        break;
-                    }
-                }
+                final int x = tile.getX();
+                final int y = tile.getY();
+                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                            (y-y0) * halfHeight);
+
+                Image overlayImage = lib.getOverlayImage(tile, overlayCache);
+                displayTileItems(g, tile, overlayImage);
+                displaySettlementWithChipsOrPopulationNumber(freeColClient,
+                    lib, g, tile, tileWidth, tileHeight, withNumbers);
+                displayFogOfWar(freeColClient, fog, g, tile);
+                displayOptionalTileText(g, tile);
+
+                g.setTransform(baseTransform);
+            });
+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                           RenderingHints.VALUE_ANTIALIAS_ON);
+
+        // Paint transparent region borders
+        if (options.getInteger(ClientOptions.DISPLAY_TILE_TEXT) ==
+                ClientOptions.DISPLAY_TILE_TEXT_REGIONS) {
+            map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+                (Tile tile) -> {
+                    final int x = tile.getX();
+                    final int y = tile.getY();
+                    g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                                (y-y0) * halfHeight);
+                    displayTerritorialBorders(g, tile, BorderType.REGION, false);
+                    g.setTransform(baseTransform);
+                });
+        }
+
+        // Paint transparent country borders
+        map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+            (Tile tile) -> {
+                final int x = tile.getX();
+                final int y = tile.getY();
+                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                            (y-y0) * halfHeight);
+                displayTerritorialBorders(g, tile, BorderType.COUNTRY, false);
+                g.setTransform(baseTransform);
+            });
+
+        // Display cursor for selected tile or active unit
+        Tile cursorTile = null;
+        switch (viewMode) {
+            case GUI.MOVE_UNITS_MODE:
+                if (activeUnit != null &&
+                        (cursor.isActive() || activeUnit.getMovesLeft() <= 0))
+                    cursorTile = activeUnit.getTile();
+                break;
+            case GUI.VIEW_TERRAIN_MODE:
+                if (selectedTile != null)
+                    cursorTile = selectedTile;
+        }
+        if (cursorTile != null) {
+            final int x = cursorTile.getX();
+            final int y = cursorTile.getY();
+            if(x >= x0 && y >= y0 && x <= lastColumn && y <= lastRow) {
+                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                            (y-y0) * halfHeight);
+                displayCursor(g);
+                g.setTransform(baseTransform);
             }
         }
+
+        // Display units
+        g.setColor(Color.BLACK);
+        map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+            (Tile tile) -> {
+                // check for units
+                Unit unit = findUnitInFront(tile);
+                if (unit == null || isOutForAnimation(unit))
+                    return;
+
+                final int x = tile.getX();
+                final int y = tile.getY();
+                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                            (y-y0) * halfHeight);
+
+                if (unit.isUndead()) {
+                    // Rescale dark halo only in rare case its needed!
+                    Image darkness = lib.getMiscImage(ImageLibrary.DARKNESS);
+                    displayCenteredImage(g, darkness, tileWidth, tileHeight);
+                }
+                displayUnit(g, unit);
+
+                g.setTransform(baseTransform);
+            });
+
+        // Display the colony names, if needed
+        if (colonyLabels != ClientOptions.COLONY_LABELS_NONE) {
+            final Player player = freeColClient.getMyPlayer();
+            FontLibrary fontLibrary = new FontLibrary(lib.getScaleFactor());
+            Font font = fontLibrary.createScaledFont(
+                FontLibrary.FontType.NORMAL, FontLibrary.FontSize.SMALLER,
+                Font.BOLD);
+            Font italicFont = fontLibrary.createScaledFont(
+                FontLibrary.FontType.NORMAL, FontLibrary.FontSize.SMALLER,
+                Font.BOLD | Font.ITALIC);
+            Font productionFont = fontLibrary.createScaledFont(
+                FontLibrary.FontType.NORMAL, FontLibrary.FontSize.TINY,
+                Font.BOLD);
+
+            map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+                (Tile tile) -> {
+                    Settlement settlement = tile.getSettlement();
+                    if(settlement == null)
+                        return;
+
+                    final int x = tile.getX();
+                    final int y = tile.getY();
+                    g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                                (y-y0) * halfHeight);
+
+                    displaySettlementLabels(g, settlement, player, colonyLabels,
+                                            font, italicFont, productionFont);
+
+                    g.setTransform(baseTransform);
+                });
+        }
+
+        // Restore original transform to allow for more drawing
         g.setTransform(originTransform);
 
-        /*
-        PART 4
-        ======
-        Display goto path
-        */
+        // Display goto path
         if (currentPath != null) {
             displayPath(g, currentPath);
         }
         if (gotoPath != null) {
             displayPath(g, gotoPath);
         }
+    }
 
+    private void displaySettlementLabels(Graphics2D g, Settlement settlement,
+                                         Player player, int colonyLabels,
+                                         Font font, Font italicFont,
+                                         Font productionFont) {
+        if (settlement.isDisposed()) {
+            logger.warning("Settlement display race detected: "
+                           + settlement.getName());
+            return;
+        }
+        String name = Messages.message(settlement.getLocationLabelFor(player));
+        if (name == null) return;
+
+        Color backgroundColor = settlement.getOwner().getNationColor();
+        if (backgroundColor == null) backgroundColor = Color.WHITE;
+        // int yOffset = lib.getSettlementImage(settlement).getHeight(null) + 1;
+        int yOffset = tileHeight;
+        switch (colonyLabels) {
+        case ClientOptions.COLONY_LABELS_CLASSIC:
+            Image img = lib.getStringImage(g, name, backgroundColor, font);
+            g.drawImage(img, (tileWidth - img.getWidth(null))/2 + 1,
+                        yOffset, null);
+            break;
+
+        case ClientOptions.COLONY_LABELS_MODERN:
+        default:
+            backgroundColor = new Color(backgroundColor.getRed(),
+                                        backgroundColor.getGreen(),
+                                        backgroundColor.getBlue(), 128);
+            TextSpecification[] specs = new TextSpecification[1];
+            if (settlement instanceof Colony
+                && settlement.getOwner() == player) {
+                Colony colony = (Colony) settlement;
+                BuildableType buildable = colony.getCurrentlyBuilding();
+                if (buildable != null) {
+                    specs = new TextSpecification[2];
+                    String t = Messages.getName(buildable) + " " +
+                        Turn.getTurnsText(colony.getTurnsToComplete(buildable));
+                    specs[1] = new TextSpecification(t, productionFont);
+                }
+            }
+            specs[0] = new TextSpecification(name, font);
+
+            Image nameImage = createLabel(g, specs, backgroundColor);
+            if (nameImage != null) {
+                int spacing = 3;
+                Image leftImage = null;
+                Image rightImage = null;
+                if (settlement instanceof Colony) {
+                    Colony colony = (Colony)settlement;
+                    String string = Integer.toString(
+                        colony.getDisplayUnitCount());
+                    leftImage = createLabel(g, string,
+                        ((colony.getPreferredSizeChange() > 0)
+                            ? italicFont : font),
+                        backgroundColor);
+                    if (player.owns(settlement)) {
+                        int bonusProduction = colony.getProductionBonus();
+                        if (bonusProduction != 0) {
+                            String bonus = (bonusProduction > 0)
+                                ? "+" + bonusProduction
+                                : Integer.toString(bonusProduction);
+                            rightImage = createLabel(g, bonus, font,
+                                                     backgroundColor);
+                        }
+                    }
+                } else if (settlement instanceof IndianSettlement) {
+                    IndianSettlement is = (IndianSettlement) settlement;
+                    if (is.getType().isCapital()) {
+                        leftImage = createCapitalLabel(
+                            nameImage.getHeight(null), 5, backgroundColor);
+                    }
+
+                    Unit missionary = is.getMissionary();
+                    if (missionary != null) {
+                        boolean expert = missionary.hasAbility(
+                            Ability.EXPERT_MISSIONARY);
+                        backgroundColor = missionary.getOwner()
+                                                    .getNationColor();
+                        backgroundColor = new Color(
+                            backgroundColor.getRed(),
+                            backgroundColor.getGreen(),
+                            backgroundColor.getBlue(), 128);
+                        rightImage = createReligiousMissionLabel(
+                            nameImage.getHeight(null), 5,
+                            backgroundColor, expert);
+                    }
+                }
+
+                int width = (int)((nameImage.getWidth(null)
+                        * lib.getScaleFactor())
+                    + ((leftImage != null)
+                        ? (leftImage.getWidth(null)
+                            * lib.getScaleFactor()) + spacing
+                        : 0)
+                    + ((rightImage != null)
+                        ? (rightImage.getWidth(null)
+                            * lib.getScaleFactor()) + spacing
+                        : 0));
+                int labelOffset = (tileWidth - width)/2;
+                yOffset -= (nameImage.getHeight(null)
+                    * lib.getScaleFactor())/2;
+                if (leftImage != null) {
+                    g.drawImage(leftImage, labelOffset, yOffset, null);
+                    labelOffset += (leftImage.getWidth(null)
+                        * lib.getScaleFactor()) + spacing;
+                }
+                g.drawImage(nameImage, labelOffset, yOffset, null);
+                if (rightImage != null) {
+                    labelOffset += (nameImage.getWidth(null)
+                        * lib.getScaleFactor()) + spacing;
+                    g.drawImage(rightImage, labelOffset, yOffset, null);
+                }
+                break;
+            }
+        }
     }
 
     /**
@@ -2196,14 +2235,13 @@ public final class MapViewer {
     }
 
     /**
-     * Displays the given Tile onto the given Graphics2D object at the
-     * location specified by the coordinates. Show tile names,
-     * coordinates and colony values.
+     * Displays the Tile text for a Tile.
+     * Shows tile names, coordinates and colony values.
      *
-     * @param g The Graphics2D object on which to draw the Tile.
-     * @param tile The Tile to draw.
+     * @param g The Graphics2D object on which the text gets drawn.
+     * @param tile The Tile to draw the text on.
      */
-    private void displayOptionalTileTextAndRegionBorder(Graphics2D g, Tile tile) {
+    private void displayOptionalTileText(Graphics2D g, Tile tile) {
         String text = null;
         int op = freeColClient.getClientOptions()
             .getInteger(ClientOptions.DISPLAY_TILE_TEXT);
@@ -2225,7 +2263,6 @@ public final class MapViewer {
                     text = Messages.message(tile.getRegion().getLabel());
                 }
             }
-            displayTerritorialBorders(g, tile, BorderType.REGION, true);
             break;
         case ClientOptions.DISPLAY_TILE_TEXT_EMPTY:
             break;
@@ -2415,11 +2452,6 @@ public final class MapViewer {
     private void displayUnit(Graphics2D g, Unit unit) {
         final Player player = freeColClient.getMyPlayer();
 
-        // Draw the 'selected unit' image if needed.
-        if (viewMode == GUI.MOVE_UNITS_MODE && unit == activeUnit
-                && (cursor.isActive() || unit.getMovesLeft() <= 0))
-            displayCursor(g);
-
         // Draw the unit.
         // If unit is sentry, draw in grayscale
         boolean fade = (unit.getState() == Unit.UnitState.SENTRY)
@@ -2571,14 +2603,13 @@ public final class MapViewer {
             Stroke oldStroke = g.getStroke();
             g.setStroke(borderStroke);
             Color oldColor = g.getColor();
-            Color newColor = Color.WHITE;
-            if (type == BorderType.COUNTRY) {
-                Color c = owner.getNationColor();
-                if (c != null) {
-                    newColor = new Color(c.getRed(), c.getGreen(), c.getBlue(),
-                                         (opaque) ? 255 : 100);
-                }
-            }
+            Color c = null;
+            if (type == BorderType.COUNTRY)
+                c = owner.getNationColor();
+            if (c == null)
+                c = Color.WHITE;
+            Color newColor = new Color(c.getRed(), c.getGreen(), c.getBlue(),
+                                 (opaque) ? 255 : 100);
             g.setColor(newColor);
             GeneralPath path = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
             path.moveTo(borderPoints.get(Direction.longSides.get(0)).x,
diff --git a/src/net/sf/freecol/common/model/Map.java b/src/net/sf/freecol/common/model/Map.java
index 0e54080c3..8622c6733 100644
--- a/src/net/sf/freecol/common/model/Map.java
+++ b/src/net/sf/freecol/common/model/Map.java
@@ -1954,6 +1954,42 @@ public class Map extends FreeColGameObject implements Location {
         return null;
     }
 
+    /**
+     * Iterates through a rectangular subpart of the Map.
+     * Intentionally avoids calling methods doing redundant checks,
+     * which would slow down map display.
+     * 
+     * @param x X-component of the position of first tile.
+     * @param y Y-component of the position of first tile.
+     * @param w Width of the rectangle.
+     * @param h Height of the rectangle.
+     * @param consumer Provides a function to call for each tile.
+     */
+    public void forSubMap(int x, int y, int w, int h,
+                          java.util.function.Consumer<Tile> consumer) {
+        if (x < 0) {
+            w += x;
+            x = 0;
+        }
+        if (y < 0) {
+            h += y;
+            y = 0;
+        }
+        if (w <= 0 || h <= 0)
+            return;
+        int width = getWidth();
+        int height = getHeight();
+        if (x > width || y > height)
+            return;
+        if (x+w > width)
+            w = width - x;
+        if (y+h > height)
+            h = height - y;
+        for (int yi = y; yi < y+h; ++yi)
+            for (int xi = x; xi < x+w; ++xi)
+                consumer.accept(tiles[xi][yi]);
+    }
+
     /**
      * Flood fills from a given <code>Position</code> p, based on
      * connectivity information encoded in boolmap

From 0ebea5e1c2f6ca124ff14ae6073d655391e0f557 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 25 Sep 2015 12:32:20 +0930
Subject: [PATCH 261/323] More Java 8 streams *match() simplifications.

---
 .../client/gui/panel/BuildQueuePanel.java     | 14 +++---
 .../gui/panel/DefaultTransferHandler.java     | 12 ++---
 .../client/gui/panel/ModifierFormat.java      |  8 +---
 .../gui/panel/TradeRouteInputPanel.java       | 16 ++-----
 .../client/gui/panel/UnitDetailPanel.java     | 13 +++---
 src/net/sf/freecol/common/i18n/Rule.java      | 19 ++++----
 .../freecol/common/model/BuildableType.java   | 12 +++--
 src/net/sf/freecol/common/model/Colony.java   | 45 ++++++++-----------
 src/net/sf/freecol/common/model/Player.java   | 11 ++---
 .../sf/freecol/common/model/RandomRange.java  | 12 ++++-
 .../sf/freecol/common/model/Settlement.java   | 13 +++---
 .../freecol/common/model/SettlementType.java  | 26 +++--------
 .../common/model/SimpleCombatModel.java       |  9 ++--
 .../freecol/common/model/Specification.java   | 40 +++++++----------
 src/net/sf/freecol/common/model/Tile.java     |  2 +-
 .../sf/freecol/common/model/TradeRoute.java   | 10 ++---
 src/net/sf/freecol/common/model/UnitType.java | 10 ++---
 src/net/sf/freecol/server/ai/AIColony.java    | 12 ++---
 src/net/sf/freecol/server/ai/REFAIPlayer.java | 15 +++----
 .../server/generator/SimpleMapGenerator.java  | 18 ++++----
 .../server/generator/TerrainGenerator.java    | 37 +++++++--------
 .../sf/freecol/server/model/ServerColony.java | 11 ++---
 .../sf/freecol/server/model/ServerGame.java   | 17 +++----
 23 files changed, 149 insertions(+), 233 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
index 33f233ac5..b17828b2d 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
@@ -32,6 +32,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -164,10 +165,8 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
              */
             @Override
             public boolean isDataFlavorSupported(DataFlavor flavor) {
-                for (DataFlavor myFlavor : supportedFlavors) {
-                    if (myFlavor.equals(flavor)) return true;
-                }
-                return false;
+                return Arrays.stream(supportedFlavors)
+                    .anyMatch(f -> f.equals(flavor));
             }
         }
 
@@ -338,11 +337,8 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
          */
         @Override
         public boolean canImport(JComponent comp, DataFlavor[] flavors) {
-            if (flavors == null) return false;
-            for (DataFlavor flavor : flavors) {
-                if (flavor.equals(BUILD_LIST_FLAVOR)) return true;
-            }
-            return false;
+            return flavors != null && Arrays.stream(flavors)
+                .anyMatch(f -> f.equals(BUILD_LIST_FLAVOR));
         }
 
         /**
diff --git a/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java b/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
index 2bcc69204..944ed897a 100644
--- a/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
+++ b/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
@@ -37,6 +37,7 @@ import java.awt.dnd.DragSourceListener;
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
+import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -277,14 +278,9 @@ public final class DefaultTransferHandler extends TransferHandler {
      */
     @Override
     public boolean canImport(JComponent comp, DataFlavor[] flavor) {
-        if (comp instanceof JPanel || comp instanceof JLabel) {
-            for (DataFlavor aFlavor : flavor) {
-                if (aFlavor.equals(DefaultTransferHandler.flavor)) {
-                    return true;
-                }
-            }
-        }
-        return false;
+        return (comp instanceof JPanel || comp instanceof JLabel)
+            && Arrays.stream(flavor)
+                .anyMatch(f -> f.equals(DefaultTransferHandler.flavor));
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/panel/ModifierFormat.java b/src/net/sf/freecol/client/gui/panel/ModifierFormat.java
index 6afada512..f9fc12bd0 100644
--- a/src/net/sf/freecol/client/gui/panel/ModifierFormat.java
+++ b/src/net/sf/freecol/client/gui/panel/ModifierFormat.java
@@ -99,12 +99,8 @@ public class ModifierFormat {
                                              FreeColGameObjectType fcgot,
                                              Turn turn) {
         String sourceName = getSourceName(modifier.getSource());
-        if (fcgot != null) {
-            for (Scope scope : modifier.getScopes()) {
-                if (scope.appliesTo(fcgot)) {
-                    sourceName += " (" + Messages.getName(fcgot) + ")";
-                }
-            }
+        if (fcgot != null && modifier.appliesTo(fcgot)) {
+            sourceName += " (" + Messages.getName(fcgot) + ")";
         }
         float value = modifier.getValue(turn);
         String[] bonus = getModifierStrings(value, modifier.getType());
diff --git a/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java b/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
index 6e541293a..0bf7a41cc 100644
--- a/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
@@ -31,6 +31,7 @@ import java.awt.event.KeyListener;
 import java.awt.event.MouseListener;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -223,12 +224,8 @@ public final class TradeRouteInputPanel extends FreeColPanel
 
         @Override
         public boolean canImport(JComponent c, DataFlavor[] flavors) {
-            for (DataFlavor flavor : flavors) {
-                if (flavor.equals(DefaultTransferHandler.flavor)) {
-                    return true;
-                }
-            }
-            return false;
+            return Arrays.stream(flavors)
+                .anyMatch(f -> f.equals(DefaultTransferHandler.flavor));
         }
     }
 
@@ -345,12 +342,7 @@ public final class TradeRouteInputPanel extends FreeColPanel
          */
         @Override
         public boolean canImport(JComponent c, DataFlavor[] flavors) {
-            for (DataFlavor flavor : flavors) {
-                if (flavor.equals(STOP_FLAVOR)) {
-                    return true;
-                }
-            }
-            return false;
+            return Arrays.stream(flavors).anyMatch(f -> f.equals(STOP_FLAVOR));
         }
 
         /**
diff --git a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
index dfd8b46b9..8822d8b4e 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
@@ -23,6 +23,7 @@ import java.awt.GridLayout;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -154,14 +155,10 @@ public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
                 }
             }
 
-            List<IndianNationType> nations = new ArrayList<>();
-            for (IndianNationType nation : spec.getIndianNationTypes()) {
-                for (RandomChoice<UnitType> choice : nation.getSkills()) {
-                    if (choice.getObject() == type) {
-                        nations.add(nation);
-                    }
-                }
-            }
+            List<IndianNationType> nations = spec.getIndianNationTypes().stream()
+                .filter(nt -> nt.getSkills().stream()
+                    .anyMatch(ut -> ut.getObject() == type))
+                .collect(Collectors.toList());
             if (!nations.isEmpty()) {
                 panel.add(Utility.localizedLabel("colopedia.unit.natives"), "newline");
                 int count = 0;
diff --git a/src/net/sf/freecol/common/i18n/Rule.java b/src/net/sf/freecol/common/i18n/Rule.java
index c9ffb030d..6c096b859 100644
--- a/src/net/sf/freecol/common/i18n/Rule.java
+++ b/src/net/sf/freecol/common/i18n/Rule.java
@@ -52,19 +52,16 @@ public class Rule {
     /**
      * Returns true if this rule matches the given number.
      *
-     * @param number a <code>double</code> value
-     * @return a <code>boolean</code> value
+     * The outer conditions are or-combined (using anyMatch), the
+     * inner conditions are and-combined (using allMatch).
+     *
+     * @param number The number to test.
+     * @return True if the number matches this rule.
      */
     public boolean matches(double number) {
-        outer: for (List<Relation> andCondition : conditions) {
-            for (Relation relation : andCondition) {
-                if (!relation.matches(number)) {
-                    continue outer;
-                }
-            }
-            return true;
-        }
-        return false;
+        return conditions.stream()
+            .anyMatch(andConditions ->
+                andConditions.stream().allMatch(r -> r.matches(number)));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/BuildableType.java b/src/net/sf/freecol/common/model/BuildableType.java
index 81df3874e..860fe051f 100644
--- a/src/net/sf/freecol/common/model/BuildableType.java
+++ b/src/net/sf/freecol/common/model/BuildableType.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -133,13 +134,10 @@ public abstract class BuildableType extends FreeColGameObjectType {
      * @return True if the buildable is available.
      */
     public boolean isAvailableTo(FreeColObject... fco) {
-        if (requiredAbilities != null) {
-            for (Entry<String, Boolean> entry : requiredAbilities.entrySet()) {
-                if (entry.getValue() != Arrays.stream(fco)
-                    .anyMatch(o -> o.hasAbility(entry.getKey()))) return false;
-            }
-        }
-        return true;
+        return (requiredAbilities == null) ? true
+            : requiredAbilities.entrySet().stream()
+                .allMatch(e -> e.getValue() == Arrays.stream(fco)
+                    .anyMatch(o -> o.hasAbility(e.getKey())));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 10d88ee51..cc0b53807 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -661,13 +661,10 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      *     the given type of goods.
      */
     public List<WorkLocation> getWorkLocationsForConsuming(GoodsType goodsType) {
-        List<WorkLocation> result = new ArrayList<>();
-        for (WorkLocation wl : getCurrentWorkLocations()) {
-            for (AbstractGoods input : wl.getInputs()) {
-                if (input.getType() == goodsType) result.add(wl);
-            }
-        }
-        return result;
+        return getCurrentWorkLocations().stream()
+            .filter(wl -> wl.getInputs().stream()
+                .anyMatch(ag -> ag.getType() == goodsType))
+            .collect(Collectors.toList());
     }
 
     /**
@@ -678,13 +675,10 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      *     the given type of goods.
      */
     public List<WorkLocation> getWorkLocationsForProducing(GoodsType goodsType) {
-        List<WorkLocation> result = new ArrayList<>();
-        for (WorkLocation wl : getCurrentWorkLocations()) {
-            for (AbstractGoods ag : wl.getOutputs()) {
-                if (ag.getType() == goodsType) result.add(wl);
-            }
-        }
-        return result;
+        return getCurrentWorkLocations().stream()
+            .filter(wl -> wl.getOutputs().stream()
+                .anyMatch(ag -> ag.getType() == goodsType))
+            .collect(Collectors.toList());
     }
 
     /**
@@ -2029,20 +2023,19 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return True if the goods can be produced.
      */
     public boolean canProduce(GoodsType goodsType) {
-        if (getNetProductionOf(goodsType) > 0) return true; // Obviously:-)
+        return (getNetProductionOf(goodsType) > 0)
+            ? true // Obviously:-)
 
-        if (goodsType.isBreedable()) {
-            return getGoodsCount(goodsType) >= goodsType.getBreedingNumber();
-        }
+            // Breeding requires the breedable number to be present
+            : (goodsType.isBreedable())
+            ? getGoodsCount(goodsType) >= goodsType.getBreedingNumber()
 
-        // Is there a work location that can produce the goods, with
-        // satisfied inputs and positive generic production potential?
-        for (WorkLocation wl : getWorkLocationsForProducing(goodsType)) {
-            if (!wl.getInputs().stream()
-                .allMatch(ag -> canProduce(ag.getType()))) continue;
-            if (wl.getGenericPotential(goodsType) > 0) return true;
-        }
-        return false;
+            // Is there a work location that can produce the goods, with
+            // positive generic production potential and all inputs satisfied?
+            : getWorkLocationsForProducing(goodsType).stream()
+                .anyMatch(wl -> wl.getGenericPotential(goodsType) > 0
+                    && wl.getInputs().stream()
+                        .allMatch(ag -> canProduce(ag.getType())));
     }
 
   
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 83dc71b0c..beb52fd58 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -3191,13 +3191,10 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return The reason why/not the tile can be owned by this player.
      */
     private NoClaimReason canOwnTileReason(Tile tile) {
-        for (Unit u : tile.getUnitList()) {
-            Player owner = u.getOwner();
-            if (owner == this) break; // Not hostile
-            // If the unit is military, the tile is held against us.
-            if (u.isOffensiveUnit()) return NoClaimReason.OCCUPIED;
-        }
-        return (isEuropean())
+        return (tile.getUnitList().stream()
+            .anyMatch(u -> u.getOwner() != this && u.isOffensiveUnit()))
+            ? NoClaimReason.OCCUPIED // The tile is held against us
+            : (isEuropean())
             ? ((tile.hasLostCityRumour())
                 ? NoClaimReason.RUMOUR
                 : NoClaimReason.NONE)
diff --git a/src/net/sf/freecol/common/model/RandomRange.java b/src/net/sf/freecol/common/model/RandomRange.java
index 07ff63b7b..90e201450 100644
--- a/src/net/sf/freecol/common/model/RandomRange.java
+++ b/src/net/sf/freecol/common/model/RandomRange.java
@@ -147,7 +147,17 @@ public class RandomRange {
         scopes.add(scope);
     }
 
-
+    /**
+     * Does an object satisfy the scopes?
+     *
+     * @param fco The <code>FreeColObject</code> to test.
+     * @return True if the scopes are satisfied.
+     */
+    public boolean appliesTo(FreeColObject fco) {
+        List<Scope> scs = getScopes();
+        return scs.isEmpty() || scs.stream().anyMatch(s -> s.appliesTo(fco));
+    }
+    
     /**
      * Gets a random value from this range.
      *
diff --git a/src/net/sf/freecol/common/model/Settlement.java b/src/net/sf/freecol/common/model/Settlement.java
index b2809697f..b649e8a39 100644
--- a/src/net/sf/freecol/common/model/Settlement.java
+++ b/src/net/sf/freecol/common/model/Settlement.java
@@ -298,10 +298,8 @@ public abstract class Settlement extends GoodsLocation
      * @return True if the settlement is connected to the high seas.
      */
     public boolean isConnectedPort() {
-        for (Tile t : getTile().getSurroundingTiles(1)) {
-            if (!t.isLand() && t.isHighSeasConnected()) return true;
-        }
-        return false;
+        return getTile().getSurroundingTiles(1, 1).stream()
+            .anyMatch(t -> !t.isLand() && t.isHighSeasConnected());
     }
 
     /**
@@ -572,10 +570,9 @@ public abstract class Settlement extends GoodsLocation
      */
     @Override
     public int priceGoods(List<AbstractGoods> goods) {
-        for (AbstractGoods ag : goods) {
-            if (getGoodsCount(ag.getType()) < ag.getAmount()) return -1;
-        }
-        return 0;
+        return (goods.stream()
+            .anyMatch(ag -> getGoodsCount(ag.getType()) < ag.getAmount())) ? -1
+            : 0;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/SettlementType.java b/src/net/sf/freecol/common/model/SettlementType.java
index 07cdb920e..eb07ce05e 100644
--- a/src/net/sf/freecol/common/model/SettlementType.java
+++ b/src/net/sf/freecol/common/model/SettlementType.java
@@ -212,16 +212,9 @@ public class SettlementType extends FreeColGameObjectType {
      * @return The plunder range, or null if none applicable.
      */
     public final RandomRange getPlunderRange(Unit unit) {
-        if (plunder == null) return null;
-
-        for (RandomRange range : plunder) {
-            List<Scope> scopes = range.getScopes();
-            if (scopes.isEmpty()) return range;
-            for (Scope scope : scopes) {
-                if (scope.appliesTo(unit)) return range;
-            }
-        }
-        return null;
+        return (plunder == null) ? null
+            : plunder.stream()
+                .filter(p -> p.appliesTo(unit)).findFirst().orElse(null);
     }
 
     /**
@@ -231,16 +224,9 @@ public class SettlementType extends FreeColGameObjectType {
      * @return A range of gifts, or null if none applicable.
      */
     public final RandomRange getGifts(Unit unit) {
-        if (gifts == null) return null;
-
-        for (RandomRange range : gifts) {
-            List<Scope> scopes = range.getScopes();
-            if (scopes.isEmpty()) return range;
-            for (Scope scope : scopes) {
-                if (scope.appliesTo(unit)) return range;
-            }
-        }
-        return null;
+        return (gifts == null) ? null
+            : gifts.stream()
+                .filter(g -> g.appliesTo(unit)).findFirst().orElse(null);
     }
 
 
diff --git a/src/net/sf/freecol/common/model/SimpleCombatModel.java b/src/net/sf/freecol/common/model/SimpleCombatModel.java
index 22fb198cb..a96d35edb 100644
--- a/src/net/sf/freecol/common/model/SimpleCombatModel.java
+++ b/src/net/sf/freecol/common/model/SimpleCombatModel.java
@@ -799,12 +799,9 @@ public class SimpleCombatModel extends CombatModel {
                             lose++;
                         }
                     } else if (r >= 1.0 - winner.getBurnProbability()) {
-                        for (IndianSettlement s
-                                 : loserPlayer.getIndianSettlements()) {
-                            if (s.hasMissionary(winnerPlayer)) {
-                                crs.add(CombatResult.BURN_MISSIONS);
-                                break;
-                            }
+                        if (loserPlayer.getIndianSettlements().stream()
+                            .anyMatch(s -> s.hasMissionary(winnerPlayer))) {
+                            crs.add(CombatResult.BURN_MISSIONS);
                         }
                     }
                 }
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index 5f2ab0bb0..9c92ae610 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -32,10 +33,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
@@ -57,7 +58,6 @@ import net.sf.freecol.common.option.RangeOption;
 import net.sf.freecol.common.option.StringOption;
 import net.sf.freecol.common.option.TextOption;
 import net.sf.freecol.common.option.UnitListOption;
-
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -1847,18 +1847,12 @@ public final class Specification {
     public <T extends FreeColGameObjectType> List<T>
                       getTypesWithAbility(Class<T> resultType,
                                           String... abilities) {
-        List<T> result = new ArrayList<>();
-        for (FreeColGameObjectType type : allTypes.values()) {
-            if (resultType.isInstance(type)) {
-                for (String ability : abilities) {
-                    if (type.hasAbility(ability)) {
-                        result.add(resultType.cast(type));
-                        break;
-                    }
-                }
-            }
-        }
-        return result;
+        return allTypes.values().stream()
+            .filter(type -> resultType.isInstance(type)
+                    && Arrays.stream(abilities)
+                        .anyMatch(a -> type.hasAbility(a)))
+            .map(type -> resultType.cast(type))
+            .collect(Collectors.toList());
     }
 
     /**
@@ -1871,16 +1865,12 @@ public final class Specification {
     public <T extends FreeColGameObjectType> List<T>
                       getTypesWithoutAbility(Class<T> resultType,
                                              String... abilities) {
-        List<T> result = new ArrayList<>();
-        type: for (FreeColGameObjectType type : allTypes.values()) {
-            if (resultType.isInstance(type)) {
-                for (String ability : abilities) {
-                    if (type.hasAbility(ability)) continue type;
-                }
-                result.add(resultType.cast(type));
-            }
-        }
-        return result;
+        return allTypes.values().stream()
+            .filter(type -> resultType.isInstance(type)
+                    && Arrays.stream(abilities)
+                        .noneMatch(a -> type.hasAbility(a)))
+            .map(type -> resultType.cast(type))
+            .collect(Collectors.toList());
     }
 
 
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 3792a5061..eb7302ea8 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -1259,7 +1259,7 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      *     unexplored.
      */
     public boolean hasUnexploredAdjacent() {
-        return getSurroundingTiles(0, 1).stream()
+        return getSurroundingTiles(1, 1).stream()
             .anyMatch(t -> !t.isExplored());
     }
 
diff --git a/src/net/sf/freecol/common/model/TradeRoute.java b/src/net/sf/freecol/common/model/TradeRoute.java
index 20d00fa4b..ffd49a79c 100644
--- a/src/net/sf/freecol/common/model/TradeRoute.java
+++ b/src/net/sf/freecol/common/model/TradeRoute.java
@@ -264,12 +264,10 @@ public class TradeRoute extends FreeColGameObject
         }
 
         // Check that the name is unique
-        for (TradeRoute route : owner.getTradeRoutes()) {
-            if (route == this) continue;
-            if (route.getName().equals(name)) {
-                return StringTemplate.template("model.tradeRoute.duplicateName")
-                    .addName("%name%", name);
-            }
+        if (owner.getTradeRoutes().stream()
+            .anyMatch(tr -> tr != this && tr.getName().equals(name))) {
+            return StringTemplate.template("model.tradeRoute.duplicateName")
+                .addName("%name%", name);
         }
 
         // Verify that it has at least two stops
diff --git a/src/net/sf/freecol/common/model/UnitType.java b/src/net/sf/freecol/common/model/UnitType.java
index 29871e3d9..93da4ab49 100644
--- a/src/net/sf/freecol/common/model/UnitType.java
+++ b/src/net/sf/freecol/common/model/UnitType.java
@@ -499,13 +499,9 @@ public final class UnitType extends BuildableType implements Consumer {
      * @return True if this unit type can learn.
      */
     public boolean canBeUpgraded(UnitType newType, ChangeType changeType) {
-        for (UnitTypeChange change : getTypeChanges()) {
-            if ((newType == null || newType == change.getNewUnitType())
-                && change.getProbability(changeType) > 0) {
-                return true;
-            }
-        }
-        return false;
+        return getTypeChanges().stream()
+            .anyMatch(c -> (newType == null || newType == c.getNewUnitType())
+                && c.getProbability(changeType) > 0);
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/AIColony.java b/src/net/sf/freecol/server/ai/AIColony.java
index 25809d827..d717e61ef 100644
--- a/src/net/sf/freecol/server/ai/AIColony.java
+++ b/src/net/sf/freecol/server/ai/AIColony.java
@@ -614,15 +614,9 @@ public class AIColony extends AIObject implements PropertyChangeListener {
         final Specification spec = getSpecification();
         final Tile tile = colony.getTile();
         final Player player = colony.getOwner();
-        boolean hasDefender = false;
-        for (Unit u : tile.getUnitList()) {
-            if (u.isDefensiveUnit()
-                && getAIUnit(u).getMission(DefendSettlementMission.class) != null) {
-                // FIXME: be smarter
-                hasDefender = true;
-                break;
-            }
-        }
+        boolean hasDefender = tile.getUnitList().stream()
+            .anyMatch(u -> u.isDefensiveUnit()
+                && getAIUnit(u).getMission(DefendSettlementMission.class) != null);
         if (!hasDefender) return;
 
         // What goods are really needed?
diff --git a/src/net/sf/freecol/server/ai/REFAIPlayer.java b/src/net/sf/freecol/server/ai/REFAIPlayer.java
index 37ff55051..a6e71c324 100644
--- a/src/net/sf/freecol/server/ai/REFAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/REFAIPlayer.java
@@ -912,14 +912,13 @@ public class REFAIPlayer extends EuropeanAIPlayer {
                         return Integer.MIN_VALUE;
                     }
                     // Do not chase the same unit!
-                    for (AIUnit au : getAIUnits()) {
-                        Mission m = au.getMission(UnitSeekAndDestroyMission.class);
-                        Location loc;
-                        if (m != null
-                            && (loc = m.getTarget()) != null
-                            && loc instanceof Unit
-                            && loc == target) return Integer.MIN_VALUE;
-                    }
+                    if (getAIUnits().stream()
+                        .filter(aiu -> aiu != aiUnit)
+                        .map(aiu -> aiu.getMission(UnitSeekAndDestroyMission.class))
+                        .anyMatch(m -> m != null
+                            && m.getTarget() instanceof Unit
+                            && (Unit)m.getTarget() == target))
+                        return Integer.MIN_VALUE;
                     // The REF is more interested in colonies.
                     value /= 2;
                 }
diff --git a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
index 53c3f5916..ecb8ef48b 100644
--- a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
+++ b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
@@ -436,18 +436,18 @@ public class SimpleMapGenerator implements MapGenerator {
         // order picking out as many as possible suitable tiles for
         // native settlements such that can be guaranteed at least one
         // layer of surrounding tiles to own.
-        int minSettlementDistance
+        List<Tile> allTiles = new ArrayList<>();
+        for (Tile t : map.getAllTiles()) allTiles.add(t);
+        randomShuffle(logger, "All tile shuffle", allTiles, random);
+        final int minDistance
             = spec.getRangeOption(GameOptions.SETTLEMENT_NUMBER).getValue();
         List<Tile> settlementTiles = new ArrayList<>();
-        tiles: for (Tile tile : map.getAllTiles()) {
-            if (!tile.isPolar() && suitableForNativeSettlement(tile)) {
-                for (Tile t : settlementTiles) {
-                    if (tile.getDistanceTo(t) < minSettlementDistance) {
-                        continue tiles;
-                    }
-                }
+        for (Tile tile : allTiles) {
+            if (!tile.isPolar()
+                && suitableForNativeSettlement(tile)
+                && settlementTiles.stream()
+                    .noneMatch(t -> t.getDistanceTo(tile) < minDistance))
                 settlementTiles.add(tile);
-            }
         }
         randomShuffle(logger, "Settlement tiles", settlementTiles, random);
 
diff --git a/src/net/sf/freecol/server/generator/TerrainGenerator.java b/src/net/sf/freecol/server/generator/TerrainGenerator.java
index f320c8b60..78b272d2a 100644
--- a/src/net/sf/freecol/server/generator/TerrainGenerator.java
+++ b/src/net/sf/freecol/server/generator/TerrainGenerator.java
@@ -474,30 +474,25 @@ public class TerrainGenerator {
     private Tile getGoodMountainTile(Map map) {
         final TileType hills = spec.getTileType("model.tile.hills");
         final TileType mountains = spec.getTileType("model.tile.mountains");
-        Tile t = null;
-        nextTry: for (;;) {
-            if ((t = map.getRandomLandTile(random)) == null) break;
-            
-            if (t.getType() == hills || t.getType() == mountains) {
-                continue; // Already on high ground
-            }
+        Tile tile = null;
+        while ((tile = map.getRandomLandTile(random)) != null) {
+            // Can not be high ground already
+            if (tile.getType() != hills && tile.getType() != mountains
+                
+                // Not too close to a mountain range as this would
+                // defeat the purpose of adding random hills
+                && tile.getSurroundingTiles(1, 3).stream()
+                    .noneMatch(t -> t.getType() == mountains)
 
-            // Do not add hills too close to a mountain range
-            // this would defeat the purpose of adding random hills.
-            for (Tile tile : t.getSurroundingTiles(3)) {
-                if (tile.getType() == mountains) continue nextTry;
+                // Do not add hills too close to the ocean/lake, as
+                // this helps with good locations for building
+                // colonies on shore.
+                && tile.getSurroundingTiles(1, 1).stream()
+                    .noneMatch(t -> !t.isLand())) {
+                return tile;
             }
-
-            // Do not add hills too close to the ocean/lake this
-            // helps with good locations for building colonies on
-            // shore.
-            for (Tile tile : t.getSurroundingTiles(1)) {
-                if (!tile.isLand()) continue nextTry;
-            }
-
-            break; // OK, good tile found.
         }
-        return t;
+        return null;
     }
 
     /**
diff --git a/src/net/sf/freecol/server/model/ServerColony.java b/src/net/sf/freecol/server/model/ServerColony.java
index 6bf558912..93555c302 100644
--- a/src/net/sf/freecol/server/model/ServerColony.java
+++ b/src/net/sf/freecol/server/model/ServerColony.java
@@ -517,14 +517,9 @@ public class ServerColony extends Colony implements ServerModelObject {
         List<BuildableType> buildables = new ArrayList<>();
         buildables.addAll(spec.getBuildingTypeList());
         buildables.addAll(spec.getUnitTypesWithoutAbility(Ability.PERSON));
-        for (BuildableType bt : buildables) {
-            if (canBuild(bt)) {
-                AbstractGoods ag = AbstractGoods.findByType(goodsType,
-                    bt.getRequiredGoods());
-                if (ag != null) return true;
-            }
-        }
-        return false;
+        return buildables.stream()
+            .anyMatch(bt -> canBuild(bt)
+                && AbstractGoods.findByType(goodsType, bt.getRequiredGoods()) != null);
     }
 
     /**
diff --git a/src/net/sf/freecol/server/model/ServerGame.java b/src/net/sf/freecol/server/model/ServerGame.java
index 79934e17d..78274fcc5 100644
--- a/src/net/sf/freecol/server/model/ServerGame.java
+++ b/src/net/sf/freecol/server/model/ServerGame.java
@@ -21,6 +21,7 @@ package net.sf.freecol.server.model;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -28,6 +29,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -113,16 +115,11 @@ public class ServerGame extends Game implements ServerModelObject {
      * @return A list of all connected server players, with exclusions.
      */
     public List<ServerPlayer> getConnectedPlayers(ServerPlayer... serverPlayers) {
-        List<ServerPlayer> result = new ArrayList<>();
-        outer: for (Player otherPlayer : getLivePlayers(null)) {
-            ServerPlayer enemyPlayer = (ServerPlayer)otherPlayer;
-            if (!enemyPlayer.isConnected()) continue;
-            for (ServerPlayer exclude : serverPlayers) {
-                if (enemyPlayer == exclude) continue outer;
-            }
-            result.add(enemyPlayer);
-        }
-        return result;
+        return getLivePlayers(null).stream()
+            .map(p -> (ServerPlayer)p)
+            .filter(sp -> sp.isConnected()
+                && Arrays.stream(serverPlayers).noneMatch(s -> s == sp))
+            .collect(Collectors.toList());
     }
 
     /**

From 02fea10eb9fcdebf526a998fc497bdc4312fb720 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 27 Sep 2015 18:57:27 +0200
Subject: [PATCH 262/323] Specialize createColonyTileImage and
 displayColonyTile methods, allowing code simplifications

---
 src/net/sf/freecol/client/gui/MapViewer.java  | 91 ++++++++++++-------
 src/net/sf/freecol/client/gui/SwingGUI.java   |  4 +
 .../freecol/client/gui/panel/TilePanel.java   |  2 +-
 3 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index e93a0c7de..bf76e8285 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -491,6 +491,30 @@ public final class MapViewer {
         return image;
     }
 
+    /**
+     * Create a <code>BufferedImage</code> and draw a <code>Tile</code> on it.
+     *
+     * @param tile The <code>Tile</code> to draw.
+     * @return The image.
+     */
+    BufferedImage createTileImage(Tile tile) {
+        final TileType tileType = tile.getType();
+        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        BufferedImage overlayImage = lib.getOverlayImage(tile);
+        final int compoundHeight = (overlayImage != null)
+            ? overlayImage.getHeight()
+            : tileType.isForested()
+                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
+                : terrainTileSize.height;
+        BufferedImage image = new BufferedImage(
+            terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = image.createGraphics();
+        g.translate(0, compoundHeight - terrainTileSize.height);
+        displayTile(g, tile, overlayImage);
+        g.dispose();
+        return image;
+    }
+
     /**
      * Create a <code>BufferedImage</code> and draw a <code>Tile</code> on it.
      * The visualization of the <code>Tile</code> also includes information
@@ -548,56 +572,37 @@ public final class MapViewer {
     }
 
     /**
-     * Displays the given <code>Tile</code> onto the given
-     * <code>Graphics2D</code> object at the location specified
-     * by the coordinates. The visualization of the <code>Tile</code>
-     * also includes information from the corresponding
-     * <code>ColonyTile</code> from the given <code>Colony</code>.
+     * Displays the given colony tile.
+     * The visualization of the <code>Tile</code> also includes information
+     * from the corresponding <code>ColonyTile</code> from the given
+     * <code>Colony</code>.
      *
-     * @param g The <code>Graphics2D</code> object on which to draw
-     *      the <code>Tile</code>.
+     * @param g The <code>Graphics2D</code> on which to draw.
      * @param tile The <code>Tile</code> to draw.
      * @param colony The <code>Colony</code> to create the visualization
      *      of the <code>Tile</code> for. This object is also used to
      *      get the <code>ColonyTile</code> for the given <code>Tile</code>.
-     * @param overlayImage The Image for the tile overlay.
+     * @param overlayImage The Image of the tile overlay.
      */
     private void displayColonyTile(Graphics2D g, Tile tile, Colony colony,
                                   Image overlayImage) {
-        boolean tileCannotBeWorked = false;
-        Unit unit = null;
-        int price = 0;
-        if (colony != null) {
-            ColonyTile colonyTile = colony.getColonyTile(tile);
-            unit = colonyTile.getOccupyingUnit();
-            price = colony.getOwner().getLandPrice(tile);
-            switch (colonyTile.getNoWorkReason()) {
-            case NONE: case COLONY_CENTER: case CLAIM_REQUIRED:
-                break;
-            default:
-                tileCannotBeWorked = true;
-            }
-        }
+        displayTile(g, tile, overlayImage);
 
-        displayTileWithBeachAndBorder(g, lib, tile);
-        if (tile != null && tile.isExplored()) {
-            displayTileItems(g, tile, overlayImage);
-            displaySettlementWithChipsOrPopulationNumber(freeColClient, lib,
-                g, tile, tileWidth, tileHeight, false);
-            displayFogOfWar(freeColClient, fog, g, tile);
-            displayOptionalTileText(g, tile);
-        }
-
-        if (tileCannotBeWorked) {
+        ColonyTile colonyTile = colony.getColonyTile(tile);
+        switch (colonyTile.getNoWorkReason()) {
+        case NONE: case COLONY_CENTER: case CLAIM_REQUIRED:
+            break;
+        default:
             g.drawImage(lib.getMiscImage(ImageLibrary.TILE_TAKEN),
                         0, 0, null);
         }
-
-        if (price > 0 && tile != null && !tile.hasSettlement()) {
+        int price = colony.getOwner().getLandPrice(tile);
+        if (price > 0 && !tile.hasSettlement()) {
             Image image = lib.getMiscImage(ImageLibrary.TILE_OWNED_BY_INDIANS);
             displayCenteredImage(g, image, tileWidth, tileHeight);
         }
 
+        Unit unit = colonyTile.getOccupyingUnit();
         if (unit != null) {
             BufferedImage image = lib.getSmallerUnitImage(unit);
             g.drawImage(image,
@@ -612,6 +617,24 @@ public final class MapViewer {
         }
     }
 
+    /**
+     * Displays the given <code>Tile</code>.
+     *
+     * @param g The Graphics2D on which to draw the <code>Tile</code>.
+     * @param tile The <code>Tile</code> to draw.
+     * @param overlayImage The Image for the tile overlay.
+     */
+    private void displayTile(Graphics2D g, Tile tile, Image overlayImage) {
+        displayTileWithBeachAndBorder(g, lib, tile);
+        if (tile.isExplored()) {
+            displayTileItems(g, tile, overlayImage);
+            displaySettlementWithChipsOrPopulationNumber(freeColClient, lib,
+                g, tile, tileWidth, tileHeight, false);
+            displayFogOfWar(freeColClient, fog, g, tile);
+            displayOptionalTileText(g, tile);
+        }
+    }
+
     /**
      * Run some code with the given unit made invisible.  You can nest
      * several of these method calls in order to hide multiple
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index e95a36644..bb5fd8270 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1624,6 +1624,10 @@ public class SwingGUI extends GUI {
         return tileMapViewer.createTileImageWithBeachBorderAndItems(tile);
     }
 
+    public BufferedImage createTileImage(Tile tile) {
+        return tileMapViewer.createTileImage(tile);
+    }
+
     public BufferedImage createColonyTileImage(Tile tile, Colony colony) {
         return tileMapViewer.createColonyTileImage(tile, colony);
     }
diff --git a/src/net/sf/freecol/client/gui/panel/TilePanel.java b/src/net/sf/freecol/client/gui/panel/TilePanel.java
index 8964e1aae..c7653316d 100644
--- a/src/net/sf/freecol/client/gui/panel/TilePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TilePanel.java
@@ -91,7 +91,7 @@ public final class TilePanel extends FreeColPanel {
         add(Utility.localizedLabel(template), "span, center");
 
         final ImageLibrary lib = getImageLibrary();
-        BufferedImage image = getGUI().createColonyTileImage(tile, null);
+        BufferedImage image = getGUI().createTileImage(tile);
         add(new JLabel(new ImageIcon(image)), "span, center");
 
         if (tile.getRegion() != null) {

From 401ff3d93bf7d13dcfdb2a2ae8c4a61b8eba5463 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 27 Sep 2015 20:40:05 +0200
Subject: [PATCH 263/323] Split off TileViewer from MapViewer and replace
 SwingGUI.tileMapViewer with it

---
 src/net/sf/freecol/client/gui/MapViewer.java  | 708 +---------------
 src/net/sf/freecol/client/gui/SwingGUI.java   |  20 +-
 src/net/sf/freecol/client/gui/TileViewer.java | 773 ++++++++++++++++++
 3 files changed, 810 insertions(+), 691 deletions(-)
 create mode 100644 src/net/sf/freecol/client/gui/TileViewer.java

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index bf76e8285..a9ca21b81 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -19,10 +19,8 @@
 
 package net.sf.freecol.client.gui;
 
-import java.awt.AlphaComposite;
 import java.awt.BasicStroke;
 import java.awt.Color;
-import java.awt.Composite;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
@@ -39,8 +37,6 @@ import java.awt.geom.GeneralPath;
 import java.awt.geom.Point2D;
 import java.awt.geom.RoundRectangle2D;
 import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
@@ -54,33 +50,23 @@ import javax.swing.JLayeredPane;
 
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.common.debug.DebugUtils;
 import net.sf.freecol.common.debug.FreeColDebugger;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.BuildableType;
 import net.sf.freecol.common.model.Colony;
-import net.sf.freecol.common.model.ColonyTile;
+import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.FreeColGameObject;
 import net.sf.freecol.common.model.Game;
-import net.sf.freecol.common.model.GameOptions;
 import net.sf.freecol.common.model.IndianSettlement;
-import net.sf.freecol.common.model.LostCityRumour;
 import net.sf.freecol.common.model.Map;
-import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.PathNode;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Region;
-import net.sf.freecol.common.model.Resource;
 import net.sf.freecol.common.model.Settlement;
 import net.sf.freecol.common.model.Tile;
-import net.sf.freecol.common.model.TileImprovement;
-import net.sf.freecol.common.model.TileItem;
-import net.sf.freecol.common.model.TileType;
 import net.sf.freecol.common.model.Turn;
 import net.sf.freecol.common.model.Unit;
-import net.sf.freecol.common.resources.ResourceManager;
-import net.sf.freecol.common.util.Utils;
 
 import static net.sf.freecol.common.util.StringUtils.*;
 
@@ -100,7 +86,6 @@ public final class MapViewer {
 
     private static enum BorderType { COUNTRY, REGION }
 
-
     private static class TextSpecification {
 
         public final String text;
@@ -112,46 +97,6 @@ public final class MapViewer {
         }
     }
 
-    private static class SortableImage implements Comparable<SortableImage> {
-
-        public final Image image;
-        public final int index;
-
-        public SortableImage(Image image, int index) {
-            this.image = image;
-            this.index = index;
-        }
-
-        // Implement Comparable<SortableImage>
-
-        @Override
-        public int compareTo(SortableImage other) {
-            return other.index - this.index;
-        }
-
-        // Override Object
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public boolean equals(Object other) {
-            if (other instanceof SortableImage) {
-                return this.compareTo((SortableImage)other) == 0;
-            }
-            return super.equals(other);
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public int hashCode() {
-            int hash = super.hashCode();
-            hash = 37 * hash + Utils.hashCode(image);
-            return 37 * hash + index;
-        }
-    }
 
     private final FreeColClient freeColClient;
 
@@ -162,7 +107,7 @@ public final class MapViewer {
     /** Scaled ImageLibrary only used for map painting. */
     private ImageLibrary lib;
 
-    private RoadPainter rp;
+    private final TileViewer tv;
 
     private TerrainCursor cursor;
     private volatile boolean blinkingMarqueeEnabled;
@@ -220,15 +165,11 @@ public final class MapViewer {
 
     // The height offset to paint a Unit at (in pixels).
     private static final int UNIT_OFFSET = 20,
-        STATE_OFFSET_X = 25,
-        STATE_OFFSET_Y = 10,
         OTHER_UNITS_OFFSET_X = -5, // Relative to the state indicator.
         OTHER_UNITS_OFFSET_Y = 1,
         OTHER_UNITS_WIDTH = 3,
         MAX_OTHER_UNITS = 10;
 
-    private final GeneralPath fog = new GeneralPath();
-
     private final java.util.Map<Unit, Integer> unitsOutForAnimation;
     private final java.util.Map<Unit, JLabel> unitsOutForAnimationLabels;
 
@@ -254,6 +195,7 @@ public final class MapViewer {
         this.gui = (SwingGUI)freeColClient.getGUI();
         this.size = null;
 
+        tv = new TileViewer(freeColClient);
         setImageLibraryAndUpdateData(new ImageLibrary());
 
         cursor = null;
@@ -421,220 +363,6 @@ public final class MapViewer {
 
     }
 
-    /**
-     * Returns the scaled terrain-image for a terrain type (and position 0, 0).
-     *
-     * @param type The type of the terrain-image to return.
-     * @param scale The scale of the terrain image to return.
-     * @return The terrain-image
-     */
-    static BufferedImage createTileImageWithOverlayAndForest(
-            TileType type, float scale) {
-        BufferedImage terrainImage = ImageLibrary.getTerrainImage(
-            type, 0, 0, scale);
-        BufferedImage overlayImage = ImageLibrary.getOverlayImage(
-            type, type.getId(), scale);
-        BufferedImage forestImage = type.isForested()
-            ? ImageLibrary.getForestImage(type, scale)
-            : null;
-        if (overlayImage == null && forestImage == null) {
-            return terrainImage;
-        } else {
-            int width = terrainImage.getWidth();
-            int height = terrainImage.getHeight();
-            if (overlayImage != null) {
-                height = Math.max(height, overlayImage.getHeight());
-            }
-            if (forestImage != null) {
-                height = Math.max(height, forestImage.getHeight());
-            }
-            BufferedImage compositeImage = new BufferedImage(width, height,
-                BufferedImage.TYPE_INT_ARGB);
-            Graphics2D g = compositeImage.createGraphics();
-            g.drawImage(terrainImage, 0, height - terrainImage.getHeight(), null);
-            if (overlayImage != null) {
-                g.drawImage(overlayImage, 0, height - overlayImage.getHeight(), null);
-            }
-            if (forestImage != null) {
-                g.drawImage(forestImage, 0, height - forestImage.getHeight(), null);
-            }
-            g.dispose();
-            return compositeImage;
-        }
-    }
-
-    /**
-     * Create a <code>BufferedImage</code> and draw a <code>Tile</code> on it.
-     * Draws the terrain and improvements.
-     *
-     * @param tile The Tile to draw.
-     * @return The image.
-     */
-    BufferedImage createTileImageWithBeachBorderAndItems(Tile tile) {
-        if (!tile.isExplored())
-            return lib.getTerrainImage(null, tile.getX(), tile.getY());
-        final TileType tileType = tile.getType();
-        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
-        BufferedImage overlayImage = lib.getOverlayImage(tile);
-        final int compoundHeight = (overlayImage != null)
-            ? overlayImage.getHeight()
-            : tileType.isForested()
-                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
-                : terrainTileSize.height;
-        BufferedImage image = new BufferedImage(
-            terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = image.createGraphics();
-        g.translate(0, compoundHeight - terrainTileSize.height);
-        displayTileWithBeachAndBorder(g, lib, tile);
-        displayTileItems(g, tile, overlayImage);
-        g.dispose();
-        return image;
-    }
-
-    /**
-     * Create a <code>BufferedImage</code> and draw a <code>Tile</code> on it.
-     *
-     * @param tile The <code>Tile</code> to draw.
-     * @return The image.
-     */
-    BufferedImage createTileImage(Tile tile) {
-        final TileType tileType = tile.getType();
-        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
-        BufferedImage overlayImage = lib.getOverlayImage(tile);
-        final int compoundHeight = (overlayImage != null)
-            ? overlayImage.getHeight()
-            : tileType.isForested()
-                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
-                : terrainTileSize.height;
-        BufferedImage image = new BufferedImage(
-            terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = image.createGraphics();
-        g.translate(0, compoundHeight - terrainTileSize.height);
-        displayTile(g, tile, overlayImage);
-        g.dispose();
-        return image;
-    }
-
-    /**
-     * Create a <code>BufferedImage</code> and draw a <code>Tile</code> on it.
-     * The visualization of the <code>Tile</code> also includes information
-     * from the corresponding <code>ColonyTile</code> of the given
-     * <code>Colony</code>.
-     *
-     * @param tile The <code>Tile</code> to draw.
-     * @param colony The <code>Colony</code> to create the visualization
-     *      of the <code>Tile</code> for. This object is also used to
-     *      get the <code>ColonyTile</code> for the given <code>Tile</code>.
-     * @return The image.
-     */
-    BufferedImage createColonyTileImage(Tile tile, Colony colony) {
-        final TileType tileType = tile.getType();
-        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
-        BufferedImage overlayImage = lib.getOverlayImage(tile);
-        final int compoundHeight = (overlayImage != null)
-            ? overlayImage.getHeight()
-            : tileType.isForested()
-                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
-                : terrainTileSize.height;
-        BufferedImage image = new BufferedImage(
-            terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = image.createGraphics();
-        g.translate(0, compoundHeight - terrainTileSize.height);
-        displayColonyTile(g, tile, colony, overlayImage);
-        g.dispose();
-        return image;
-    }
-
-    /**
-     * Displays the 3x3 tiles for the TilesPanel in ColonyPanel.
-     * 
-     * @param g The <code>Graphics2D</code> object on which to draw
-     *      the <code>Tile</code>.
-     * @param tiles The array containing the <code>Tile</code> objects to draw.
-     * @param colony The <code>Colony</code> to create the visualization
-     *      of the <code>Tile</code> objects for.
-     */
-    void displayColonyTiles(Graphics2D g, Tile[][] tiles, Colony colony) {
-        Set<String> overlayCache = ImageLibrary.createOverlayCache();
-        Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
-        for (int x = 0; x < 3; x++) {
-            for (int y = 0; y < 3; y++) {
-                if (tiles[x][y] != null) {
-                    int xx = (((2 - x) + y) * tileSize.width) / 2;
-                    int yy = ((x + y) * tileSize.height) / 2;
-                    g.translate(xx, yy);
-                    Image overlayImage = lib.getOverlayImage(tiles[x][y], overlayCache);
-                    displayColonyTile(g, tiles[x][y], colony, overlayImage);
-                    g.translate(-xx, -yy);
-                }
-            }
-        }
-    }
-
-    /**
-     * Displays the given colony tile.
-     * The visualization of the <code>Tile</code> also includes information
-     * from the corresponding <code>ColonyTile</code> from the given
-     * <code>Colony</code>.
-     *
-     * @param g The <code>Graphics2D</code> on which to draw.
-     * @param tile The <code>Tile</code> to draw.
-     * @param colony The <code>Colony</code> to create the visualization
-     *      of the <code>Tile</code> for. This object is also used to
-     *      get the <code>ColonyTile</code> for the given <code>Tile</code>.
-     * @param overlayImage The Image of the tile overlay.
-     */
-    private void displayColonyTile(Graphics2D g, Tile tile, Colony colony,
-                                  Image overlayImage) {
-        displayTile(g, tile, overlayImage);
-
-        ColonyTile colonyTile = colony.getColonyTile(tile);
-        switch (colonyTile.getNoWorkReason()) {
-        case NONE: case COLONY_CENTER: case CLAIM_REQUIRED:
-            break;
-        default:
-            g.drawImage(lib.getMiscImage(ImageLibrary.TILE_TAKEN),
-                        0, 0, null);
-        }
-        int price = colony.getOwner().getLandPrice(tile);
-        if (price > 0 && !tile.hasSettlement()) {
-            Image image = lib.getMiscImage(ImageLibrary.TILE_OWNED_BY_INDIANS);
-            displayCenteredImage(g, image, tileWidth, tileHeight);
-        }
-
-        Unit unit = colonyTile.getOccupyingUnit();
-        if (unit != null) {
-            BufferedImage image = lib.getSmallerUnitImage(unit);
-            g.drawImage(image,
-                        tileWidth/4 - image.getWidth() / 2,
-                        halfHeight - image.getHeight() / 2, null);
-            // Draw an occupation and nation indicator.
-            Player owner = freeColClient.getMyPlayer();
-            String text = Messages.message(unit.getOccupationLabel(owner, false));
-            g.drawImage(lib.getOccupationIndicatorChip(g, unit, text),
-                        (int)(STATE_OFFSET_X * lib.getScaleFactor()),
-                        0, null);
-        }
-    }
-
-    /**
-     * Displays the given <code>Tile</code>.
-     *
-     * @param g The Graphics2D on which to draw the <code>Tile</code>.
-     * @param tile The <code>Tile</code> to draw.
-     * @param overlayImage The Image for the tile overlay.
-     */
-    private void displayTile(Graphics2D g, Tile tile, Image overlayImage) {
-        displayTileWithBeachAndBorder(g, lib, tile);
-        if (tile.isExplored()) {
-            displayTileItems(g, tile, overlayImage);
-            displaySettlementWithChipsOrPopulationNumber(freeColClient, lib,
-                g, tile, tileWidth, tileHeight, false);
-            displayFogOfWar(freeColClient, fog, g, tile);
-            displayOptionalTileText(g, tile);
-        }
-    }
-
     /**
      * Run some code with the given unit made invisible.  You can nest
      * several of these method calls in order to hide multiple
@@ -645,9 +373,9 @@ public final class MapViewer {
      * @param sourceTile The source <code>Tile</code>.
      * @param r The code to be executed.
      */
-    public void executeWithUnitOutForAnimation(final Unit unit,
-                                               final Tile sourceTile,
-                                               final OutForAnimationCallback r) {
+    void executeWithUnitOutForAnimation(final Unit unit,
+                                        final Tile sourceTile,
+                                        final OutForAnimationCallback r) {
         final JLabel unitLabel = enterUnitOutForAnimation(unit, sourceTile);
         try {
             r.executeWithUnitOutForAnimation(unitLabel);
@@ -1507,9 +1235,9 @@ public final class MapViewer {
      */
     private void setImageLibraryAndUpdateData(ImageLibrary lib) {
         this.lib = lib;
+        tv.setImageLibraryAndUpdateData(lib);
         // ATTENTION: we assume that all base tiles have the same size
         Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
-        rp = new RoadPainter(tileSize);
         tileHeight = tileSize.height;
         tileWidth = tileSize.width;
         halfHeight = tileHeight/2;
@@ -1542,13 +1270,6 @@ public final class MapViewer {
 
         borderStroke = new BasicStroke(dy);
         gridStroke = new BasicStroke(lib.getScaleFactor());
-
-        fog.reset();
-        fog.moveTo(halfWidth, 0);
-        fog.lineTo(tileWidth, halfHeight);
-        fog.lineTo(halfWidth, tileHeight);
-        fog.lineTo(0, halfHeight);
-        fog.closePath();
     }
 
     /**
@@ -1606,15 +1327,8 @@ public final class MapViewer {
                 g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
                             (y-y0) * halfHeight);
 
-                displayTileWithBeachAndBorder(g, lib, tile);
-                for (Direction direction : Direction.values()) {
-                    Tile borderingTile = tile.getNeighbourOrNull(direction);
-                    if (borderingTile != null && !borderingTile.isExplored()) {
-                        g.drawImage(lib.getBorderImage(
-                                null, direction, tile.getX(), tile.getY()),
-                            0, 0, null);
-                    }
-                }
+                TileViewer.displayTileWithBeachAndBorder(g, lib, tile);
+                TileViewer.displayUnknownTileBorder(g, lib, tile);
 
                 g.setTransform(baseTransform);
             });
@@ -1689,11 +1403,12 @@ public final class MapViewer {
                             (y-y0) * halfHeight);
 
                 Image overlayImage = lib.getOverlayImage(tile, overlayCache);
-                displayTileItems(g, tile, overlayImage);
-                displaySettlementWithChipsOrPopulationNumber(freeColClient,
-                    lib, g, tile, tileWidth, tileHeight, withNumbers);
-                displayFogOfWar(freeColClient, fog, g, tile);
-                displayOptionalTileText(g, tile);
+                tv.displayTileItems(g, tile, overlayImage);
+                TileViewer.displaySettlementWithChipsOrPopulationNumber(
+                    freeColClient, lib, g,
+                    tile, tileWidth, tileHeight, withNumbers);
+                tv.displayFogOfWar(g, tile);
+                tv.displayOptionalTileText(g, tile);
 
                 g.setTransform(baseTransform);
             });
@@ -1765,7 +1480,8 @@ public final class MapViewer {
                 if (unit.isUndead()) {
                     // Rescale dark halo only in rare case its needed!
                     Image darkness = lib.getMiscImage(ImageLibrary.DARKNESS);
-                    displayCenteredImage(g, darkness, tileWidth, tileHeight);
+                    TileViewer.displayCenteredImage(g, darkness,
+                                                    tileWidth, tileHeight);
                 }
                 displayUnit(g, unit);
 
@@ -1933,25 +1649,11 @@ public final class MapViewer {
         }
     }
 
-    /**
-     * Centers the given Image on the tile.
-     *
-     * @param g a <code>Graphics2D</code>
-     * @param image an <code>Image</code>
-     */
-    private static void displayCenteredImage(Graphics2D g, Image image,
-                                    int tileWidth, int tileHeight) {
-        g.drawImage(image,
-                    (tileWidth - image.getWidth(null))/2,
-                    (tileHeight - image.getHeight(null))/2,
-                    null);
-    }
-
     /**
      * Draws the pentagram indicating a native capital.
      */
     private static BufferedImage createCapitalLabel(int extent, int padding,
-                                     Color backgroundColor) {
+                                                    Color backgroundColor) {
         // create path
         double deg2rad = Math.PI/180.0;
         double angle = -90.0 * deg2rad;
@@ -1982,7 +1684,6 @@ public final class MapViewer {
         return bi;
     }
 
-
     /**
      * Creates an BufferedImage that shows the given text centred on a
      * translucent rounded rectangle with the given color.
@@ -2105,105 +1806,6 @@ public final class MapViewer {
         return bi;
     }
 
-    /**
-     * Displays the given Tile onto the given Graphics2D object at the
-     * location specified by the coordinates. Only base terrain will be drawn.
-     *
-     * @param g The Graphics2D object on which to draw the Tile.
-     * @param library The <code>ImageLibrary</code> to use.
-     * @param tile The Tile to draw.
-     */
-    private static void displayTileWithBeachAndBorder(Graphics2D g,
-                                                      ImageLibrary library,
-                                                      Tile tile) {
-        if (tile != null) {
-            int x = tile.getX();
-            int y = tile.getY();
-            // ATTENTION: we assume that all base tiles have the same size
-            g.drawImage(library.getTerrainImage(tile.getType(), x, y),
-                        0, 0, null);
-            if (tile.isExplored()) {
-                if (!tile.isLand() && tile.getStyle() > 0) {
-                    int edgeStyle = tile.getStyle() >> 4;
-                    if (edgeStyle > 0) {
-                        g.drawImage(library.getBeachEdgeImage(edgeStyle, x, y),
-                                    0, 0, null);
-                    }
-                    int cornerStyle = tile.getStyle() & 15;
-                    if (cornerStyle > 0) {
-                        g.drawImage(library.getBeachCornerImage(cornerStyle, x, y),
-                                    0, 0, null);
-                    }
-                }
-
-                List<SortableImage> imageBorders = new ArrayList<>(8);
-                SortableImage si;
-                for (Direction direction : Direction.values()) {
-                    Tile borderingTile = tile.getNeighbourOrNull(direction);
-                    if (borderingTile != null && borderingTile.isExplored()) {
-                        if (tile.getType() == borderingTile.getType()) {
-                            // Equal tiles, no need to draw border
-                        } else if (tile.isLand() && !borderingTile.isLand()) {
-                            // The beach borders are drawn on the side of water tiles only
-                        } else if (!tile.isLand() && borderingTile.isLand()) {
-                            // If there is a Coast image (eg. beach) defined, use it, otherwise skip
-                            // Draw the grass from the neighboring tile, spilling over on the side of this tile
-                            si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction, x, y),
-                                                   borderingTile.getType().getIndex());
-                            imageBorders.add(si);
-                            TileImprovement river = borderingTile.getRiver();
-                            if (river != null && river.isConnectedTo(direction.getReverseDirection())) {
-                                si = new SortableImage(library.getRiverMouthImage(direction, borderingTile
-                                                                                  .getRiver().getMagnitude(), x, y),
-                                                       -1);
-                                imageBorders.add(si);
-                            }
-                        } else {
-                            if (library.getTerrainImage(tile.getType(), 0, 0)
-                                .equals(library.getTerrainImage(borderingTile.getType(), 0, 0))) {
-                                // Do not draw limit between tile that share same graphics (ocean & great river)
-                            } else if (borderingTile.getType().getIndex() < tile.getType().getIndex()) {
-                                // Draw land terrain with bordering land type, or ocean/high seas limit
-                                si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction,
-                                                                              x, y), borderingTile.getType().getIndex());
-                                imageBorders.add(si);
-                            }
-                        }
-                    }
-                }
-                Collections.sort(imageBorders);
-                for (SortableImage sorted : imageBorders) {
-                    g.drawImage(sorted.image, 0, 0, null);
-                }
-            }
-        }
-    }
-
-    /**
-     * Displays the given Tile onto the given Graphics2D object at the
-     * location specified by the coordinates.  Fog of war will be
-     * drawn.
-     *
-     * @param g The <code>Graphics2D</code> object on which to draw
-     *     the <code>Tile</code>.
-     * @param tile The <code>Tile</code> to draw.
-     */
-    private static void displayFogOfWar(FreeColClient freeColClient,
-            GeneralPath fog, Graphics2D g, Tile tile) {
-        if (freeColClient.getGame() != null
-            && freeColClient.getGame().getSpecification()
-                .getBoolean(GameOptions.FOG_OF_WAR)
-            && freeColClient.getMyPlayer() != null
-            && !freeColClient.getMyPlayer().canSee(tile)) {
-            g.setColor(Color.BLACK);
-            Composite oldComposite = g.getComposite();
-            g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
-                                                      0.2f));
-            g.fill(fog);
-            g.setComposite(oldComposite);
-        }
-    }
-
 
     /**
      * Display a path.
@@ -2249,222 +1851,17 @@ public final class MapViewer {
                 g.setColor(Color.BLACK);
                 g.drawOval(halfWidth, halfHeight, 10, 10);
             } else {
-                displayCenteredImage(g, image, tileWidth, tileHeight);
-                if (turns != null)
-                    displayCenteredImage(g, turns, tileWidth, tileHeight);
+                TileViewer.displayCenteredImage(g, image,
+                                                tileWidth, tileHeight);
+                if (turns != null) {
+                    TileViewer.displayCenteredImage(g, turns,
+                                                    tileWidth, tileHeight);
+                }
             }
             g.translate(-point.x, -point.y);
         }
     }
 
-    /**
-     * Displays the Tile text for a Tile.
-     * Shows tile names, coordinates and colony values.
-     *
-     * @param g The Graphics2D object on which the text gets drawn.
-     * @param tile The Tile to draw the text on.
-     */
-    private void displayOptionalTileText(Graphics2D g, Tile tile) {
-        String text = null;
-        int op = freeColClient.getClientOptions()
-            .getInteger(ClientOptions.DISPLAY_TILE_TEXT);
-        switch (op) {
-        case ClientOptions.DISPLAY_TILE_TEXT_NAMES:
-            text = Messages.getName(tile);
-            break;
-        case ClientOptions.DISPLAY_TILE_TEXT_OWNERS:
-            if (tile.getOwner() != null) {
-                text = Messages.message(tile.getOwner().getNationLabel());
-            }
-            break;
-        case ClientOptions.DISPLAY_TILE_TEXT_REGIONS:
-            if (tile.getRegion() != null) {
-                if (FreeColDebugger.isInDebugMode(FreeColDebugger.DebugMode.MENUS)
-                    && tile.getRegion().getName() == null) {
-                    text = tile.getRegion().getSuffix();
-                } else {
-                    text = Messages.message(tile.getRegion().getLabel());
-                }
-            }
-            break;
-        case ClientOptions.DISPLAY_TILE_TEXT_EMPTY:
-            break;
-        default:
-            logger.warning("displayTileText option " + op + " out of range");
-            break;
-        }
-
-        g.setColor(Color.BLACK);
-        g.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
-            FontLibrary.FontSize.TINY, lib.getScaleFactor()));
-        if (text != null) {
-            int b = getBreakingPoint(text);
-            if (b == -1) {
-                g.drawString(text,
-                    (tileWidth - g.getFontMetrics().stringWidth(text)) / 2,
-                    (tileHeight - g.getFontMetrics().getAscent()) / 2);
-            } else {
-                g.drawString(text.substring(0, b),
-                    (tileWidth - g.getFontMetrics().stringWidth(text.substring(0, b)))/2,
-                    halfHeight - (g.getFontMetrics().getAscent()*2)/3);
-                g.drawString(text.substring(b+1),
-                    (tileWidth - g.getFontMetrics().stringWidth(text.substring(b+1)))/2,
-                    halfHeight + (g.getFontMetrics().getAscent()*2)/3);
-            }
-        }
-
-        if (FreeColDebugger.debugDisplayCoordinates()) {
-            String posString = tile.getX() + ", " + tile.getY();
-            if (tile.getHighSeasCount() >= 0) {
-                posString += "/" + Integer.toString(tile.getHighSeasCount());
-            }
-            g.drawString(posString,
-                (tileWidth - g.getFontMetrics().stringWidth(posString)) / 2,
-                (tileHeight - g.getFontMetrics().getAscent()) / 2);
-        }
-        String value = DebugUtils.getColonyValue(tile);
-        if (value != null) {
-            g.drawString(value,
-                (tileWidth - g.getFontMetrics().stringWidth(value)) / 2,
-                (tileHeight - g.getFontMetrics().getAscent()) / 2);
-        }
-    }
-
-    /**
-     * Displays the given Tile onto the given Graphics2D object at the
-     * location specified by the coordinates. Settlements and Lost
-     * City Rumours will be shown.
-     *
-     * @param g The Graphics2D object on which to draw the Tile.
-     * @param tile The Tile to draw.
-     * @param withNumber Whether to display the number of units present.
-     */
-    private static void displaySettlementWithChipsOrPopulationNumber(
-            FreeColClient freeColClient, ImageLibrary lib, Graphics2D g,
-            Tile tile, int tileWidth, int tileHeight, boolean withNumber) {
-        final Player player = freeColClient.getMyPlayer();
-        final Settlement settlement = tile.getSettlement();
-
-        if (settlement != null) {
-            if (settlement instanceof Colony) {
-                Colony colony = (Colony)settlement;
-
-                // Draw image of colony in center of the tile.
-                Image colonyImage = lib.getSettlementImage(settlement);
-                displayCenteredImage(g, colonyImage, tileWidth, tileHeight);
-
-                if (withNumber) {
-                    String populationString = Integer.toString(
-                        colony.getDisplayUnitCount());
-                    int bonus = colony.getProductionBonus();
-                    Color theColor = ResourceManager.getColor(
-                        "color.map.productionBonus." + bonus);
-                    // if government admits even more units, use
-                    // italic and bigger number icon
-                    Font font = (colony.getPreferredSizeChange() > 0)
-                        ? FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
-                            FontLibrary.FontSize.SMALLER, Font.BOLD | Font.ITALIC,
-                            lib.getScaleFactor())
-                        : FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
-                            FontLibrary.FontSize.TINY, Font.BOLD,
-                            lib.getScaleFactor());
-                    Image stringImage = lib.getStringImage(g,
-                        populationString, theColor, font);
-                    displayCenteredImage(g, stringImage, tileWidth, tileHeight);
-                }
-
-            } else if (settlement instanceof IndianSettlement) {
-                IndianSettlement is = (IndianSettlement)settlement;
-                Image settlementImage = lib.getSettlementImage(settlement);
-
-                // Draw image of indian settlement in center of the tile.
-                displayCenteredImage(g, settlementImage, tileWidth, tileHeight);
-
-                Image chip;
-                float xOffset = STATE_OFFSET_X * lib.getScaleFactor();
-                float yOffset = STATE_OFFSET_Y * lib.getScaleFactor();
-                final int colonyLabels = freeColClient.getClientOptions()
-                    .getInteger(ClientOptions.COLONY_LABELS);
-                if (colonyLabels != ClientOptions.COLONY_LABELS_MODERN) {
-                    // Draw the settlement chip
-                    chip = lib.getIndianSettlementChip(g, is);
-                    g.drawImage(chip, (int)xOffset, (int)yOffset, null);
-                    xOffset += chip.getWidth(null) + 2;
-
-                    // Draw the mission chip if needed.
-                    Unit missionary = is.getMissionary();
-                    if (missionary != null) {
-                        boolean expert
-                            = missionary.hasAbility(Ability.EXPERT_MISSIONARY);
-                        g.drawImage(lib.getMissionChip(g, missionary.getOwner(),
-                                                       expert),
-                                    (int)xOffset, (int)yOffset, null);
-                        xOffset += chip.getWidth(null) + 2;
-                    }
-                }
-
-                // Draw the alarm chip if needed.
-                if ((chip = lib.getAlarmChip(g, is, player)) != null) {
-                    g.drawImage(chip, (int)xOffset, (int)yOffset, null);
-                }
-            } else {
-                logger.warning("Bogus settlement: " + settlement);
-            }
-        }
-    }
-
-    /**
-     * Displays the given tile's items onto the given Graphics2D object.
-     * Additions and improvements to Tile will be drawn.
-     * Only works for explored tiles.
-     *
-     * @param g The Graphics2D object on which to draw the Tile.
-     * @param tile The Tile to draw.
-     * @param overlayImage The Image for the tile overlay.
-     */
-    private void displayTileItems(Graphics2D g, Tile tile, Image overlayImage) {
-        // ATTENTION: we assume that only overlays and forests
-        // might be taller than a tile.
-
-        // layer additions and improvements according to zIndex
-        List<TileItem> tileItems = (tile.getTileItemContainer() != null)
-            ? tile.getTileItemContainer().getTileItems()
-            : new ArrayList<TileItem>();
-        int startIndex = 0;
-        for (int index = startIndex; index < tileItems.size(); index++) {
-            if (tileItems.get(index).getZIndex() < Tile.OVERLAY_ZINDEX) {
-                displayTileItem(g, tile, tileItems.get(index));
-                startIndex = index + 1;
-            } else {
-                startIndex = index;
-                break;
-            }
-        }
-        // Tile Overlays (eg. hills and mountains)
-        if (overlayImage != null) {
-            g.drawImage(overlayImage, 0, (tileHeight - overlayImage.getHeight(null)), null);
-        }
-        for (int index = startIndex; index < tileItems.size(); index++) {
-            if (tileItems.get(index).getZIndex() < Tile.FOREST_ZINDEX) {
-                displayTileItem(g, tile, tileItems.get(index));
-                startIndex = index + 1;
-            } else {
-                startIndex = index;
-                break;
-            }
-        }
-        // Forest
-        if (tile.isForested()) {
-            Image forestImage = lib.getForestImage(tile.getType(), tile.getRiverStyle());
-            g.drawImage(forestImage, 0, (tileHeight - forestImage.getHeight(null)), null);
-        }
-
-        // draw all remaining items
-        for (TileItem ti : tileItems.subList(startIndex, tileItems.size())) {
-            displayTileItem(g, tile, ti);
-        }
-    }
-
     /**
      * Displays the given Unit onto the given Graphics2D object at the
      * location specified by the coordinates.
@@ -2487,7 +1884,7 @@ public final class MapViewer {
         // Draw an occupation and nation indicator.
         String text = Messages.message(unit.getOccupationLabel(player, false));
         g.drawImage(lib.getOccupationIndicatorChip(g, unit, text),
-                    (int)(STATE_OFFSET_X * lib.getScaleFactor()), 0,
+                    (int)(TileViewer.STATE_OFFSET_X * lib.getScaleFactor()), 0,
                     null);
 
         // Draw one small line for each additional unit (like in civ3).
@@ -2502,9 +1899,9 @@ public final class MapViewer {
         if (unitsOnTile > 1) {
             g.setColor(Color.WHITE);
             int unitLinesY = OTHER_UNITS_OFFSET_Y;
-            int x1 = (int)((STATE_OFFSET_X + OTHER_UNITS_OFFSET_X)
+            int x1 = (int)((TileViewer.STATE_OFFSET_X + OTHER_UNITS_OFFSET_X)
                 * lib.getScaleFactor());
-            int x2 = (int)((STATE_OFFSET_X + OTHER_UNITS_OFFSET_X
+            int x2 = (int)((TileViewer.STATE_OFFSET_X + OTHER_UNITS_OFFSET_X
                     + OTHER_UNITS_WIDTH) * lib.getScaleFactor());
             for (int i = 0; i < unitsOnTile && i < MAX_OTHER_UNITS; i++) {
                 g.drawLine(x1, unitLinesY, x2, unitLinesY);
@@ -2553,57 +1950,6 @@ public final class MapViewer {
         g.drawImage(cursorImage, 0, 0, null);
     }
 
-    /**
-     * Draws the given TileItem on the given Tile.
-     */
-    private void displayTileItem(Graphics2D g, Tile tile, TileItem item) {
-        if (item instanceof Resource) {
-            displayResourceTileItem(g, lib, (Resource) item, tileWidth, tileHeight);
-        } else if (item instanceof LostCityRumour) {
-            displayLostCityRumour(g, lib, tileWidth, tileHeight);
-        } else {
-            displayTileImprovement(g, lib, rp, tile, (TileImprovement)item);
-        }
-    }
-
-    private static void displayResourceTileItem(Graphics2D g, ImageLibrary lib,
-                                         Resource item,
-                                         int tileWidth, int tileHeight) {
-        Image bonusImage = lib.getMiscImage("image.tileitem." + item.getType().getId());
-        displayCenteredImage(g, bonusImage, tileWidth, tileHeight);
-    }
-
-    private static void displayLostCityRumour(Graphics2D g, ImageLibrary lib,
-                                           int tileWidth, int tileHeight) {
-        displayCenteredImage(g, lib.getMiscImage(ImageLibrary.LOST_CITY_RUMOUR),
-            tileWidth, tileHeight);
-    }
-
-    private static void displayTileImprovement(Graphics2D g, ImageLibrary lib,
-                                               RoadPainter rp,
-                                               Tile tile, TileImprovement  ti) {
-        if (ti.isComplete()) {
-            if (ti.isRoad()) {
-                rp.displayRoad(g, tile);
-            } else if (ti.isRiver()
-                    && ti.getMagnitude() < TileImprovement.FJORD_RIVER) {
-                // @compat 0.10.5
-                // America_large had some bogus rivers in 0.10.5
-                if (ti.getStyle() != null)
-                // end @compat 0.10.5
-                    g.drawImage(lib.getRiverImage(ti.getStyle()), 0, 0, null);
-            } else {
-                String key = "image.tile." + ti.getType().getId();
-                if (ResourceManager.hasImageResource(key)) {
-                    // Has its own Overlay Image in Misc, use it
-                    Image overlay = ResourceManager.getImage(key,
-                        lib.scaleDimension(ImageLibrary.TILE_SIZE));
-                    g.drawImage(overlay, 0, 0, null);
-                }
-            }
-        }
-    }
-
     /**
      * Draws the borders of a territory on the given Tile. The
      * territory is either a country or a region.
diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index bb5fd8270..378deb15a 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -115,11 +115,11 @@ public class SwingGUI extends GUI {
     private final GraphicsDevice graphicsDevice;
 
     /**
-     * This is the MapViewer instance used to paint the map tiles
+     * This is the TileViewer instance used to paint the map tiles
      * in the ColonyPanel and other panels.  It should not be scaled
      * along with the default MapViewer.
      */
-    private MapViewer tileMapViewer;
+    private TileViewer tileViewer;
 
     /**
      * The MapViewer instance used by canvas to paint the main map.
@@ -155,7 +155,7 @@ public class SwingGUI extends GUI {
     }
 
     public ImageLibrary getTileImageLibrary() {
-        return tileMapViewer.getImageLibrary();
+        return tileViewer.getImageLibrary();
     }
 
     @Override
@@ -406,7 +406,7 @@ public class SwingGUI extends GUI {
         this.mapViewer = new MapViewer(freeColClient);
         this.canvas = new Canvas(freeColClient, graphicsDevice, this,
                                  desiredWindowSize, mapViewer);
-        this.tileMapViewer = new MapViewer(freeColClient);
+        this.tileViewer = new TileViewer(freeColClient);
 
         // Now that there is a canvas, prepare for language changes.
         LanguageOption o = (LanguageOption)freeColClient.getClientOptions()
@@ -1613,27 +1613,27 @@ public class SwingGUI extends GUI {
         mapViewer.toggleViewMode();
     }
 
-    // Forwarding to tileMapViewer
+    // Forwarding to tileViewer
 
     public static BufferedImage createTileImageWithOverlayAndForest(
             TileType type, float scale) {
-        return MapViewer.createTileImageWithOverlayAndForest(type, scale);
+        return TileViewer.createTileImageWithOverlayAndForest(type, scale);
     }
 
     public BufferedImage createTileImageWithBeachBorderAndItems(Tile tile) {
-        return tileMapViewer.createTileImageWithBeachBorderAndItems(tile);
+        return tileViewer.createTileImageWithBeachBorderAndItems(tile);
     }
 
     public BufferedImage createTileImage(Tile tile) {
-        return tileMapViewer.createTileImage(tile);
+        return tileViewer.createTileImage(tile);
     }
 
     public BufferedImage createColonyTileImage(Tile tile, Colony colony) {
-        return tileMapViewer.createColonyTileImage(tile, colony);
+        return tileViewer.createColonyTileImage(tile, colony);
     }
 
     public void displayColonyTiles(Graphics2D g, Tile[][] tiles, Colony colony) {
-        tileMapViewer.displayColonyTiles(g, tiles, colony);
+        tileViewer.displayColonyTiles(g, tiles, colony);
     }
 
 }
diff --git a/src/net/sf/freecol/client/gui/TileViewer.java b/src/net/sf/freecol/client/gui/TileViewer.java
new file mode 100644
index 000000000..1f8a638a7
--- /dev/null
+++ b/src/net/sf/freecol/client/gui/TileViewer.java
@@ -0,0 +1,773 @@
+/**
+ *  Copyright (C) 2002-2015   The FreeCol Team
+ *
+ *  This file is part of FreeCol.
+ *
+ *  FreeCol 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, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  FreeCol 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 FreeCol.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sf.freecol.client.gui;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.geom.GeneralPath;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import net.sf.freecol.client.ClientOptions;
+import net.sf.freecol.client.FreeColClient;
+import net.sf.freecol.common.debug.DebugUtils;
+import net.sf.freecol.common.debug.FreeColDebugger;
+import net.sf.freecol.common.i18n.Messages;
+import net.sf.freecol.common.model.Ability;
+import net.sf.freecol.common.model.Colony;
+import net.sf.freecol.common.model.ColonyTile;
+import net.sf.freecol.common.model.Direction;
+import net.sf.freecol.common.model.GameOptions;
+import net.sf.freecol.common.model.IndianSettlement;
+import net.sf.freecol.common.model.LostCityRumour;
+import net.sf.freecol.common.model.Player;
+import net.sf.freecol.common.model.Resource;
+import net.sf.freecol.common.model.Settlement;
+import net.sf.freecol.common.model.Tile;
+import net.sf.freecol.common.model.TileImprovement;
+import net.sf.freecol.common.model.TileItem;
+import net.sf.freecol.common.model.TileType;
+import net.sf.freecol.common.model.Unit;
+import net.sf.freecol.common.resources.ResourceManager;
+import net.sf.freecol.common.util.Utils;
+
+import static net.sf.freecol.common.util.StringUtils.*;
+
+
+/**
+ * TileViewer is a private helper class of MapViewer and SwingGUI.
+ * 
+ * This class is responsible for drawing map tiles
+ * for MapViewer and some GUI-panels.
+ */
+public final class TileViewer {
+
+    private static final Logger logger = Logger.getLogger(TileViewer.class.getName());
+
+
+    private static class SortableImage implements Comparable<SortableImage> {
+
+        public final Image image;
+        public final int index;
+
+        public SortableImage(Image image, int index) {
+            this.image = image;
+            this.index = index;
+        }
+
+        // Implement Comparable<SortableImage>
+
+        @Override
+        public int compareTo(SortableImage other) {
+            return other.index - this.index;
+        }
+
+        // Override Object
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean equals(Object other) {
+            if (other instanceof SortableImage) {
+                return this.compareTo((SortableImage)other) == 0;
+            }
+            return super.equals(other);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public int hashCode() {
+            int hash = super.hashCode();
+            hash = 37 * hash + Utils.hashCode(image);
+            return 37 * hash + index;
+        }
+    }
+
+    private final FreeColClient freeColClient;
+
+    private ImageLibrary lib;
+
+    private RoadPainter rp;
+
+    // Helper variables for displaying.
+    private int tileHeight, tileWidth, halfHeight, halfWidth;
+
+    // The height offset to paint at (in pixels).
+    static final int STATE_OFFSET_X = 25,
+                     STATE_OFFSET_Y = 10;
+
+    private final GeneralPath fog = new GeneralPath();
+
+
+    /**
+     * The constructor to use.
+     *
+     * @param freeColClient The <code>FreeColClient</code> for the game.
+     */
+    TileViewer(FreeColClient freeColClient) {
+        this.freeColClient = freeColClient;
+
+        setImageLibraryAndUpdateData(new ImageLibrary());
+    }
+
+
+    /**
+     * Gets the contained <code>ImageLibrary</code>.
+     * 
+     * @return The image library;
+     */
+    ImageLibrary getImageLibrary() {
+        return lib;
+    }
+
+    /**
+     * Returns the scaled terrain-image for a terrain type (and position 0, 0).
+     *
+     * @param type The type of the terrain-image to return.
+     * @param scale The scale of the terrain image to return.
+     * @return The terrain-image
+     */
+    static BufferedImage createTileImageWithOverlayAndForest(
+            TileType type, float scale) {
+        BufferedImage terrainImage = ImageLibrary.getTerrainImage(
+            type, 0, 0, scale);
+        BufferedImage overlayImage = ImageLibrary.getOverlayImage(
+            type, type.getId(), scale);
+        BufferedImage forestImage = type.isForested()
+            ? ImageLibrary.getForestImage(type, scale)
+            : null;
+        if (overlayImage == null && forestImage == null) {
+            return terrainImage;
+        } else {
+            int width = terrainImage.getWidth();
+            int height = terrainImage.getHeight();
+            if (overlayImage != null) {
+                height = Math.max(height, overlayImage.getHeight());
+            }
+            if (forestImage != null) {
+                height = Math.max(height, forestImage.getHeight());
+            }
+            BufferedImage compositeImage = new BufferedImage(width, height,
+                BufferedImage.TYPE_INT_ARGB);
+            Graphics2D g = compositeImage.createGraphics();
+            g.drawImage(terrainImage, 0, height - terrainImage.getHeight(), null);
+            if (overlayImage != null) {
+                g.drawImage(overlayImage, 0, height - overlayImage.getHeight(), null);
+            }
+            if (forestImage != null) {
+                g.drawImage(forestImage, 0, height - forestImage.getHeight(), null);
+            }
+            g.dispose();
+            return compositeImage;
+        }
+    }
+
+    /**
+     * Create a <code>BufferedImage</code> and draw a <code>Tile</code> on it.
+     * Draws the terrain and improvements.
+     *
+     * @param tile The Tile to draw.
+     * @return The image.
+     */
+    BufferedImage createTileImageWithBeachBorderAndItems(Tile tile) {
+        if (!tile.isExplored())
+            return lib.getTerrainImage(null, tile.getX(), tile.getY());
+        final TileType tileType = tile.getType();
+        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        BufferedImage overlayImage = lib.getOverlayImage(tile);
+        final int compoundHeight = (overlayImage != null)
+            ? overlayImage.getHeight()
+            : tileType.isForested()
+                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
+                : terrainTileSize.height;
+        BufferedImage image = new BufferedImage(
+            terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = image.createGraphics();
+        g.translate(0, compoundHeight - terrainTileSize.height);
+        displayTileWithBeachAndBorder(g, lib, tile);
+        displayTileItems(g, tile, overlayImage);
+        g.dispose();
+        return image;
+    }
+
+    /**
+     * Create a <code>BufferedImage</code> and draw a <code>Tile</code> on it.
+     *
+     * @param tile The <code>Tile</code> to draw.
+     * @return The image.
+     */
+    BufferedImage createTileImage(Tile tile) {
+        final TileType tileType = tile.getType();
+        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        BufferedImage overlayImage = lib.getOverlayImage(tile);
+        final int compoundHeight = (overlayImage != null)
+            ? overlayImage.getHeight()
+            : tileType.isForested()
+                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
+                : terrainTileSize.height;
+        BufferedImage image = new BufferedImage(
+            terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = image.createGraphics();
+        g.translate(0, compoundHeight - terrainTileSize.height);
+        displayTile(g, tile, overlayImage);
+        g.dispose();
+        return image;
+    }
+
+    /**
+     * Create a <code>BufferedImage</code> and draw a <code>Tile</code> on it.
+     * The visualization of the <code>Tile</code> also includes information
+     * from the corresponding <code>ColonyTile</code> of the given
+     * <code>Colony</code>.
+     *
+     * @param tile The <code>Tile</code> to draw.
+     * @param colony The <code>Colony</code> to create the visualization
+     *      of the <code>Tile</code> for. This object is also used to
+     *      get the <code>ColonyTile</code> for the given <code>Tile</code>.
+     * @return The image.
+     */
+    BufferedImage createColonyTileImage(Tile tile, Colony colony) {
+        final TileType tileType = tile.getType();
+        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        BufferedImage overlayImage = lib.getOverlayImage(tile);
+        final int compoundHeight = (overlayImage != null)
+            ? overlayImage.getHeight()
+            : tileType.isForested()
+                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
+                : terrainTileSize.height;
+        BufferedImage image = new BufferedImage(
+            terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = image.createGraphics();
+        g.translate(0, compoundHeight - terrainTileSize.height);
+        displayColonyTile(g, tile, colony, overlayImage);
+        g.dispose();
+        return image;
+    }
+
+    /**
+     * Displays the 3x3 tiles for the TilesPanel in ColonyPanel.
+     * 
+     * @param g The <code>Graphics2D</code> object on which to draw
+     *      the <code>Tile</code>.
+     * @param tiles The array containing the <code>Tile</code> objects to draw.
+     * @param colony The <code>Colony</code> to create the visualization
+     *      of the <code>Tile</code> objects for.
+     */
+    void displayColonyTiles(Graphics2D g, Tile[][] tiles, Colony colony) {
+        Set<String> overlayCache = ImageLibrary.createOverlayCache();
+        Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        for (int x = 0; x < 3; x++) {
+            for (int y = 0; y < 3; y++) {
+                if (tiles[x][y] != null) {
+                    int xx = (((2 - x) + y) * tileSize.width) / 2;
+                    int yy = ((x + y) * tileSize.height) / 2;
+                    g.translate(xx, yy);
+                    Image overlayImage = lib.getOverlayImage(tiles[x][y], overlayCache);
+                    displayColonyTile(g, tiles[x][y], colony, overlayImage);
+                    g.translate(-xx, -yy);
+                }
+            }
+        }
+    }
+
+    /**
+     * Displays the given colony tile.
+     * The visualization of the <code>Tile</code> also includes information
+     * from the corresponding <code>ColonyTile</code> from the given
+     * <code>Colony</code>.
+     *
+     * @param g The <code>Graphics2D</code> on which to draw.
+     * @param tile The <code>Tile</code> to draw.
+     * @param colony The <code>Colony</code> to create the visualization
+     *      of the <code>Tile</code> for. This object is also used to
+     *      get the <code>ColonyTile</code> for the given <code>Tile</code>.
+     * @param overlayImage The Image of the tile overlay.
+     */
+    private void displayColonyTile(Graphics2D g, Tile tile, Colony colony,
+                                  Image overlayImage) {
+        displayTile(g, tile, overlayImage);
+
+        ColonyTile colonyTile = colony.getColonyTile(tile);
+        switch (colonyTile.getNoWorkReason()) {
+        case NONE: case COLONY_CENTER: case CLAIM_REQUIRED:
+            break;
+        default:
+            g.drawImage(lib.getMiscImage(ImageLibrary.TILE_TAKEN),
+                        0, 0, null);
+        }
+        int price = colony.getOwner().getLandPrice(tile);
+        if (price > 0 && !tile.hasSettlement()) {
+            Image image = lib.getMiscImage(ImageLibrary.TILE_OWNED_BY_INDIANS);
+            displayCenteredImage(g, image, tileWidth, tileHeight);
+        }
+
+        Unit unit = colonyTile.getOccupyingUnit();
+        if (unit != null) {
+            BufferedImage image = lib.getSmallerUnitImage(unit);
+            g.drawImage(image,
+                        tileWidth/4 - image.getWidth() / 2,
+                        halfHeight - image.getHeight() / 2, null);
+            // Draw an occupation and nation indicator.
+            Player owner = freeColClient.getMyPlayer();
+            String text = Messages.message(unit.getOccupationLabel(owner, false));
+            g.drawImage(lib.getOccupationIndicatorChip(g, unit, text),
+                        (int)(STATE_OFFSET_X * lib.getScaleFactor()),
+                        0, null);
+        }
+    }
+
+    /**
+     * Displays the given <code>Tile</code>.
+     *
+     * @param g The Graphics2D on which to draw the <code>Tile</code>.
+     * @param tile The <code>Tile</code> to draw.
+     * @param overlayImage The Image for the tile overlay.
+     */
+    private void displayTile(Graphics2D g, Tile tile, Image overlayImage) {
+        displayTileWithBeachAndBorder(g, lib, tile);
+        if (tile.isExplored()) {
+            displayTileItems(g, tile, overlayImage);
+            displaySettlementWithChipsOrPopulationNumber(freeColClient, lib,
+                g, tile, tileWidth, tileHeight, false);
+            displayFogOfWar(g, tile);
+            displayOptionalTileText(g, tile);
+        }
+    }
+
+    /**
+     * Sets the ImageLibrary and calculates various items that depend
+     * on tile size.
+     *
+     * @param lib an <code>ImageLibrary</code> value
+     */
+    void setImageLibraryAndUpdateData(ImageLibrary lib) {
+        this.lib = lib;
+        // ATTENTION: we assume that all base tiles have the same size
+        Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        rp = new RoadPainter(tileSize);
+        tileHeight = tileSize.height;
+        tileWidth = tileSize.width;
+        halfHeight = tileHeight/2;
+        halfWidth = tileWidth/2;
+
+        fog.reset();
+        fog.moveTo(halfWidth, 0);
+        fog.lineTo(tileWidth, halfHeight);
+        fog.lineTo(halfWidth, tileHeight);
+        fog.lineTo(0, halfHeight);
+        fog.closePath();
+    }
+
+    /**
+     * Centers the given Image on the tile.
+     *
+     * @param g a <code>Graphics2D</code>
+     * @param image an <code>Image</code>
+     */
+    static void displayCenteredImage(Graphics2D g, Image image,
+                                     int tileWidth, int tileHeight) {
+        g.drawImage(image,
+                    (tileWidth - image.getWidth(null))/2,
+                    (tileHeight - image.getHeight(null))/2,
+                    null);
+    }
+
+    /**
+     * Displays the given Tile onto the given Graphics2D object at the
+     * location specified by the coordinates. Only base terrain will be drawn.
+     *
+     * @param g The Graphics2D object on which to draw the Tile.
+     * @param library The <code>ImageLibrary</code> to use.
+     * @param tile The Tile to draw.
+     */
+    static void displayTileWithBeachAndBorder(Graphics2D g,
+                                              ImageLibrary library,
+                                              Tile tile) {
+        if (tile != null) {
+            int x = tile.getX();
+            int y = tile.getY();
+            // ATTENTION: we assume that all base tiles have the same size
+            g.drawImage(library.getTerrainImage(tile.getType(), x, y),
+                        0, 0, null);
+            if (tile.isExplored()) {
+                if (!tile.isLand() && tile.getStyle() > 0) {
+                    int edgeStyle = tile.getStyle() >> 4;
+                    if (edgeStyle > 0) {
+                        g.drawImage(library.getBeachEdgeImage(edgeStyle, x, y),
+                                    0, 0, null);
+                    }
+                    int cornerStyle = tile.getStyle() & 15;
+                    if (cornerStyle > 0) {
+                        g.drawImage(library.getBeachCornerImage(cornerStyle, x, y),
+                                    0, 0, null);
+                    }
+                }
+
+                List<SortableImage> imageBorders = new ArrayList<>(8);
+                SortableImage si;
+                for (Direction direction : Direction.values()) {
+                    Tile borderingTile = tile.getNeighbourOrNull(direction);
+                    if (borderingTile != null && borderingTile.isExplored()) {
+                        if (tile.getType() == borderingTile.getType()) {
+                            // Equal tiles, no need to draw border
+                        } else if (tile.isLand() && !borderingTile.isLand()) {
+                            // The beach borders are drawn on the side of water tiles only
+                        } else if (!tile.isLand() && borderingTile.isLand()) {
+                            // If there is a Coast image (eg. beach) defined, use it, otherwise skip
+                            // Draw the grass from the neighboring tile, spilling over on the side of this tile
+                            si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction, x, y),
+                                                   borderingTile.getType().getIndex());
+                            imageBorders.add(si);
+                            TileImprovement river = borderingTile.getRiver();
+                            if (river != null && river.isConnectedTo(direction.getReverseDirection())) {
+                                si = new SortableImage(library.getRiverMouthImage(direction, borderingTile
+                                                                                  .getRiver().getMagnitude(), x, y),
+                                                       -1);
+                                imageBorders.add(si);
+                            }
+                        } else {
+                            if (library.getTerrainImage(tile.getType(), 0, 0)
+                                .equals(library.getTerrainImage(borderingTile.getType(), 0, 0))) {
+                                // Do not draw limit between tile that share same graphics (ocean & great river)
+                            } else if (borderingTile.getType().getIndex() < tile.getType().getIndex()) {
+                                // Draw land terrain with bordering land type, or ocean/high seas limit
+                                si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction,
+                                                                              x, y), borderingTile.getType().getIndex());
+                                imageBorders.add(si);
+                            }
+                        }
+                    }
+                }
+                Collections.sort(imageBorders);
+                for (SortableImage sorted : imageBorders) {
+                    g.drawImage(sorted.image, 0, 0, null);
+                }
+            }
+        }
+    }
+
+    static void displayUnknownTileBorder(Graphics2D g, ImageLibrary lib,
+                                         Tile tile) {
+        for (Direction direction : Direction.values()) {
+            Tile borderingTile = tile.getNeighbourOrNull(direction);
+            if (borderingTile != null && !borderingTile.isExplored()) {
+                g.drawImage(lib.getBorderImage(
+                        null, direction, tile.getX(), tile.getY()),
+                    0, 0, null);
+            }
+        }
+    }
+
+    /**
+     * Displays the given Tile onto the given Graphics2D object at the
+     * location specified by the coordinates.  Fog of war will be
+     * drawn.
+     *
+     * @param g The <code>Graphics2D</code> object on which to draw
+     *     the <code>Tile</code>.
+     * @param tile The <code>Tile</code> to draw.
+     */
+    void displayFogOfWar(Graphics2D g, Tile tile) {
+        if (freeColClient.getGame() != null
+            && freeColClient.getGame().getSpecification()
+                .getBoolean(GameOptions.FOG_OF_WAR)
+            && freeColClient.getMyPlayer() != null
+            && !freeColClient.getMyPlayer().canSee(tile)) {
+            g.setColor(Color.BLACK);
+            Composite oldComposite = g.getComposite();
+            g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
+                                                      0.2f));
+            g.fill(fog);
+            g.setComposite(oldComposite);
+        }
+    }
+
+    /**
+     * Displays the Tile text for a Tile.
+     * Shows tile names, coordinates and colony values.
+     *
+     * @param g The Graphics2D object on which the text gets drawn.
+     * @param tile The Tile to draw the text on.
+     */
+    void displayOptionalTileText(Graphics2D g, Tile tile) {
+        String text = null;
+        int op = freeColClient.getClientOptions()
+            .getInteger(ClientOptions.DISPLAY_TILE_TEXT);
+        switch (op) {
+        case ClientOptions.DISPLAY_TILE_TEXT_NAMES:
+            text = Messages.getName(tile);
+            break;
+        case ClientOptions.DISPLAY_TILE_TEXT_OWNERS:
+            if (tile.getOwner() != null) {
+                text = Messages.message(tile.getOwner().getNationLabel());
+            }
+            break;
+        case ClientOptions.DISPLAY_TILE_TEXT_REGIONS:
+            if (tile.getRegion() != null) {
+                if (FreeColDebugger.isInDebugMode(FreeColDebugger.DebugMode.MENUS)
+                    && tile.getRegion().getName() == null) {
+                    text = tile.getRegion().getSuffix();
+                } else {
+                    text = Messages.message(tile.getRegion().getLabel());
+                }
+            }
+            break;
+        case ClientOptions.DISPLAY_TILE_TEXT_EMPTY:
+            break;
+        default:
+            logger.warning("displayTileText option " + op + " out of range");
+            break;
+        }
+
+        g.setColor(Color.BLACK);
+        g.setFont(FontLibrary.createFont(FontLibrary.FontType.NORMAL,
+            FontLibrary.FontSize.TINY, lib.getScaleFactor()));
+        if (text != null) {
+            int b = getBreakingPoint(text);
+            if (b == -1) {
+                g.drawString(text,
+                    (tileWidth - g.getFontMetrics().stringWidth(text)) / 2,
+                    (tileHeight - g.getFontMetrics().getAscent()) / 2);
+            } else {
+                g.drawString(text.substring(0, b),
+                    (tileWidth - g.getFontMetrics().stringWidth(text.substring(0, b)))/2,
+                    halfHeight - (g.getFontMetrics().getAscent()*2)/3);
+                g.drawString(text.substring(b+1),
+                    (tileWidth - g.getFontMetrics().stringWidth(text.substring(b+1)))/2,
+                    halfHeight + (g.getFontMetrics().getAscent()*2)/3);
+            }
+        }
+
+        if (FreeColDebugger.debugDisplayCoordinates()) {
+            String posString = tile.getX() + ", " + tile.getY();
+            if (tile.getHighSeasCount() >= 0) {
+                posString += "/" + Integer.toString(tile.getHighSeasCount());
+            }
+            g.drawString(posString,
+                (tileWidth - g.getFontMetrics().stringWidth(posString)) / 2,
+                (tileHeight - g.getFontMetrics().getAscent()) / 2);
+        }
+        String value = DebugUtils.getColonyValue(tile);
+        if (value != null) {
+            g.drawString(value,
+                (tileWidth - g.getFontMetrics().stringWidth(value)) / 2,
+                (tileHeight - g.getFontMetrics().getAscent()) / 2);
+        }
+    }
+
+    /**
+     * Displays the given Tile onto the given Graphics2D object at the
+     * location specified by the coordinates. Settlements and Lost
+     * City Rumours will be shown.
+     *
+     * @param g The Graphics2D object on which to draw the Tile.
+     * @param tile The Tile to draw.
+     * @param withNumber Whether to display the number of units present.
+     */
+    static void displaySettlementWithChipsOrPopulationNumber(
+            FreeColClient freeColClient, ImageLibrary lib, Graphics2D g,
+            Tile tile, int tileWidth, int tileHeight, boolean withNumber) {
+        final Player player = freeColClient.getMyPlayer();
+        final Settlement settlement = tile.getSettlement();
+
+        if (settlement != null) {
+            if (settlement instanceof Colony) {
+                Colony colony = (Colony)settlement;
+
+                // Draw image of colony in center of the tile.
+                Image colonyImage = lib.getSettlementImage(settlement);
+                displayCenteredImage(g, colonyImage, tileWidth, tileHeight);
+
+                if (withNumber) {
+                    String populationString = Integer.toString(
+                        colony.getDisplayUnitCount());
+                    int bonus = colony.getProductionBonus();
+                    Color theColor = ResourceManager.getColor(
+                        "color.map.productionBonus." + bonus);
+                    // if government admits even more units, use
+                    // italic and bigger number icon
+                    Font font = (colony.getPreferredSizeChange() > 0)
+                        ? FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
+                            FontLibrary.FontSize.SMALLER, Font.BOLD | Font.ITALIC,
+                            lib.getScaleFactor())
+                        : FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
+                            FontLibrary.FontSize.TINY, Font.BOLD,
+                            lib.getScaleFactor());
+                    Image stringImage = lib.getStringImage(g,
+                        populationString, theColor, font);
+                    displayCenteredImage(g, stringImage, tileWidth, tileHeight);
+                }
+
+            } else if (settlement instanceof IndianSettlement) {
+                IndianSettlement is = (IndianSettlement)settlement;
+                Image settlementImage = lib.getSettlementImage(settlement);
+
+                // Draw image of indian settlement in center of the tile.
+                displayCenteredImage(g, settlementImage, tileWidth, tileHeight);
+
+                Image chip;
+                float xOffset = STATE_OFFSET_X * lib.getScaleFactor();
+                float yOffset = STATE_OFFSET_Y * lib.getScaleFactor();
+                final int colonyLabels = freeColClient.getClientOptions()
+                    .getInteger(ClientOptions.COLONY_LABELS);
+                if (colonyLabels != ClientOptions.COLONY_LABELS_MODERN) {
+                    // Draw the settlement chip
+                    chip = lib.getIndianSettlementChip(g, is);
+                    g.drawImage(chip, (int)xOffset, (int)yOffset, null);
+                    xOffset += chip.getWidth(null) + 2;
+
+                    // Draw the mission chip if needed.
+                    Unit missionary = is.getMissionary();
+                    if (missionary != null) {
+                        boolean expert
+                            = missionary.hasAbility(Ability.EXPERT_MISSIONARY);
+                        g.drawImage(lib.getMissionChip(g, missionary.getOwner(),
+                                                       expert),
+                                    (int)xOffset, (int)yOffset, null);
+                        xOffset += chip.getWidth(null) + 2;
+                    }
+                }
+
+                // Draw the alarm chip if needed.
+                if ((chip = lib.getAlarmChip(g, is, player)) != null) {
+                    g.drawImage(chip, (int)xOffset, (int)yOffset, null);
+                }
+            } else {
+                logger.warning("Bogus settlement: " + settlement);
+            }
+        }
+    }
+
+    /**
+     * Displays the given tile's items onto the given Graphics2D object.
+     * Additions and improvements to Tile will be drawn.
+     * Only works for explored tiles.
+     *
+     * @param g The Graphics2D object on which to draw the Tile.
+     * @param tile The Tile to draw.
+     * @param overlayImage The Image for the tile overlay.
+     */
+    void displayTileItems(Graphics2D g, Tile tile, Image overlayImage) {
+        // ATTENTION: we assume that only overlays and forests
+        // might be taller than a tile.
+
+        // layer additions and improvements according to zIndex
+        List<TileItem> tileItems = (tile.getTileItemContainer() != null)
+            ? tile.getTileItemContainer().getTileItems()
+            : new ArrayList<TileItem>();
+        int startIndex = 0;
+        for (int index = startIndex; index < tileItems.size(); index++) {
+            if (tileItems.get(index).getZIndex() < Tile.OVERLAY_ZINDEX) {
+                displayTileItem(g, tile, tileItems.get(index));
+                startIndex = index + 1;
+            } else {
+                startIndex = index;
+                break;
+            }
+        }
+        // Tile Overlays (eg. hills and mountains)
+        if (overlayImage != null) {
+            g.drawImage(overlayImage, 0, (tileHeight - overlayImage.getHeight(null)), null);
+        }
+        for (int index = startIndex; index < tileItems.size(); index++) {
+            if (tileItems.get(index).getZIndex() < Tile.FOREST_ZINDEX) {
+                displayTileItem(g, tile, tileItems.get(index));
+                startIndex = index + 1;
+            } else {
+                startIndex = index;
+                break;
+            }
+        }
+        // Forest
+        if (tile.isForested()) {
+            Image forestImage = lib.getForestImage(tile.getType(), tile.getRiverStyle());
+            g.drawImage(forestImage, 0, (tileHeight - forestImage.getHeight(null)), null);
+        }
+
+        // draw all remaining items
+        for (TileItem ti : tileItems.subList(startIndex, tileItems.size())) {
+            displayTileItem(g, tile, ti);
+        }
+    }
+
+    /**
+     * Draws the given TileItem on the given Tile.
+     */
+    private void displayTileItem(Graphics2D g, Tile tile, TileItem item) {
+        if (item instanceof Resource) {
+            displayResourceTileItem(g, lib, (Resource) item, tileWidth, tileHeight);
+        } else if (item instanceof LostCityRumour) {
+            displayLostCityRumour(g, lib, tileWidth, tileHeight);
+        } else {
+            displayTileImprovement(g, lib, rp, tile, (TileImprovement)item);
+        }
+    }
+
+    private static void displayResourceTileItem(Graphics2D g, ImageLibrary lib,
+                                         Resource item,
+                                         int tileWidth, int tileHeight) {
+        Image bonusImage = lib.getMiscImage("image.tileitem." + item.getType().getId());
+        displayCenteredImage(g, bonusImage, tileWidth, tileHeight);
+    }
+
+    private static void displayLostCityRumour(Graphics2D g, ImageLibrary lib,
+                                           int tileWidth, int tileHeight) {
+        displayCenteredImage(g, lib.getMiscImage(ImageLibrary.LOST_CITY_RUMOUR),
+            tileWidth, tileHeight);
+    }
+
+    private static void displayTileImprovement(Graphics2D g, ImageLibrary lib,
+                                               RoadPainter rp,
+                                               Tile tile, TileImprovement  ti) {
+        if (ti.isComplete()) {
+            if (ti.isRoad()) {
+                rp.displayRoad(g, tile);
+            } else if (ti.isRiver()
+                    && ti.getMagnitude() < TileImprovement.FJORD_RIVER) {
+                // @compat 0.10.5
+                // America_large had some bogus rivers in 0.10.5
+                if (ti.getStyle() != null)
+                // end @compat 0.10.5
+                    g.drawImage(lib.getRiverImage(ti.getStyle()), 0, 0, null);
+            } else {
+                String key = "image.tile." + ti.getType().getId();
+                if (ResourceManager.hasImageResource(key)) {
+                    // Has its own Overlay Image in Misc, use it
+                    Image overlay = ResourceManager.getImage(key,
+                        lib.scaleDimension(ImageLibrary.TILE_SIZE));
+                    g.drawImage(overlay, 0, 0, null);
+                }
+            }
+        }
+    }
+
+}

From b943a4fdf10b12e8b5400938bd1dc46fc996890f Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 27 Sep 2015 22:23:53 +0200
Subject: [PATCH 264/323] Update comment about responsibilities of MapViewer

---
 src/net/sf/freecol/client/gui/MapViewer.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index a9ca21b81..acb6bea7f 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -76,7 +76,6 @@ import static net.sf.freecol.common.util.StringUtils.*;
  * 
  * This class is responsible for drawing the map/background on the
  * <code>Canvas</code>.
- * It is also used to draw map tiles for some GUI-panels.
  * In addition, the graphical state of the map (focus, active unit..)
  * is currently handled by this class.
  */

From ca77900e6b0546757c55264c1b411993413223f8 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 28 Sep 2015 10:29:14 +0930
Subject: [PATCH 265/323] Another test fix for occasional fail of
 testTrackerBug1616384.

---
 .../server/model/ServerBuildingTest.java      | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/test/src/net/sf/freecol/server/model/ServerBuildingTest.java b/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
index c470166be..e6f990a91 100644
--- a/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
+++ b/test/src/net/sf/freecol/server/model/ServerBuildingTest.java
@@ -254,24 +254,26 @@ public class ServerBuildingTest extends FreeColTestCase {
         // prevent starvation
         colony.addGoods(foodType, 100);
 
+        Building townHall = colony.getBuilding(townHallType);
+        Building lumberMill = colony.getBuilding(lumberMillType);
         Building college = colony.getBuilding(collegeType);
         Iterator<Unit> units = colony.getUnitIterator();
 
+        clearWorkLocation(townHall);
         Unit colonist1 = units.next();
         colonist1.setType(freeColonistType);
-        colonist1.setLocation(colony.getBuilding(townHallType));
-
+        colonist1.setLocation(townHall);
         Unit colonist2 = units.next();
         colonist2.setType(freeColonistType);
-        colonist2.setLocation(colony.getBuilding(townHallType));
+        colonist2.setLocation(townHall);
 
+        clearWorkLocation(lumberMill);
         Unit colonist3 = units.next();
         colonist3.setType(freeColonistType);
-        colonist3.setLocation(colony.getBuilding(lumberMillType));
-
+        colonist3.setLocation(lumberMill);
         Unit colonist4 = units.next();
         colonist4.setType(freeColonistType);
-        colonist4.setLocation(colony.getBuilding(lumberMillType));
+        colonist4.setLocation(lumberMill);
 
         Unit lumberjack = units.next();
         lumberjack.setType(expertLumberJackType);
@@ -285,22 +287,23 @@ public class ServerBuildingTest extends FreeColTestCase {
         Unit ore = units.next();
         ore.setType(expertOreMinerType);
 
-        blacksmith.setLocation(college);
+        clearWorkLocation(college);
         lumberjack.setLocation(college);
-        assertNotNull(blacksmith.getStudent());
         assertNotNull(lumberjack.getStudent());
-
+        blacksmith.setLocation(college);
+        assertNotNull(blacksmith.getStudent());
+        
         assertEquals(4, getUnitList(colony, freeColonistType).size());
-        assertEquals(1, getUnitList(colony, masterBlacksmithType).size());
         assertEquals(1, getUnitList(colony, expertLumberJackType).size());
+        assertEquals(1, getUnitList(colony, masterBlacksmithType).size());
 
         while (4 == getUnitList(colony, freeColonistType).size()) {
             ServerTestHelper.newTurn();
         }
 
         assertEquals(3, getUnitList(colony, freeColonistType).size());
-        assertEquals(1, getUnitList(colony, masterBlacksmithType).size());
         assertEquals(2, getUnitList(colony, expertLumberJackType).size());
+        assertEquals(1, getUnitList(colony, masterBlacksmithType).size());
 
         lumberjack.setLocation(colony.getWorkLocationFor(lumberjack,
                                                          grainType));

From 7dd02838813dfe895f090a9e836350e0449b7d26 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 28 Sep 2015 15:08:03 +0200
Subject: [PATCH 266/323] Cache scaled tile sizes in ImageLibrary

---
 .../sf/freecol/client/gui/ImageLibrary.java    | 13 +++++++++----
 src/net/sf/freecol/client/gui/MapViewer.java   |  2 +-
 src/net/sf/freecol/client/gui/TileViewer.java  | 18 +++++++++---------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index 0c955d5a0..6a1868cfd 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -150,6 +150,8 @@ public final class ImageLibrary {
      */
     private final float scaleFactor;
 
+    final Dimension tileSize, tileOverlaySize, tileForestSize;
+
     private final HashMap<String,BufferedImage> stringImageCache;
 
     /**
@@ -174,6 +176,9 @@ public final class ImageLibrary {
      */
     public ImageLibrary(float scaleFactor) {
         this.scaleFactor = scaleFactor;
+        tileSize = scaleDimension(TILE_SIZE, scaleFactor);
+        tileOverlaySize = scaleDimension(TILE_OVERLAY_SIZE, scaleFactor);
+        tileForestSize = scaleDimension(TILE_FOREST_SIZE, scaleFactor);
         stringImageCache = new HashMap<>();
     }
 
@@ -256,7 +261,7 @@ public final class ImageLibrary {
     public BufferedImage getBeachCornerImage(int index, int x, int y) {
         return ResourceManager.getImage("image.tile.model.tile.beach.corner" + index
                                         + ".r" + ((isEven(x, y)) ? "0" : "1"),
-                                        scaleDimension(TILE_SIZE));
+                                        tileSize);
     }
 
     /**
@@ -270,7 +275,7 @@ public final class ImageLibrary {
     public BufferedImage getBeachEdgeImage(int index, int x, int y) {
         return ResourceManager.getImage("image.tile.model.tile.beach.edge" + index
                                         + ".r"+ ((isEven(x, y)) ? "0" : "1"),
-                                        scaleDimension(TILE_SIZE));
+                                        tileSize);
     }
 
     /**
@@ -289,7 +294,7 @@ public final class ImageLibrary {
         String key = (type == null) ? "model.tile.unexplored" : type.getId();
         return ResourceManager.getImage("image.tile." + key + ".border." + direction
                                         + ".r" + ((isEven(x, y)) ?  "0" : "1"),
-                                        scaleDimension(TILE_SIZE));
+                                        tileSize);
     }
 
     /**
@@ -662,7 +667,7 @@ public final class ImageLibrary {
                                     int x, int y) {
         String key = "image.tile.model.tile.delta." + direction
             + (magnitude == 1 ? ".small" : ".large");
-        return ResourceManager.getImage(key, scaleDimension(TILE_SIZE));
+        return ResourceManager.getImage(key, tileSize);
     }
 
     public BufferedImage getSmallSettlementImage(Settlement settlement) {
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index acb6bea7f..75b8cfb3d 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1236,7 +1236,7 @@ public final class MapViewer {
         this.lib = lib;
         tv.setImageLibraryAndUpdateData(lib);
         // ATTENTION: we assume that all base tiles have the same size
-        Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        Dimension tileSize = lib.tileSize;
         tileHeight = tileSize.height;
         tileWidth = tileSize.width;
         halfHeight = tileHeight/2;
diff --git a/src/net/sf/freecol/client/gui/TileViewer.java b/src/net/sf/freecol/client/gui/TileViewer.java
index 1f8a638a7..5ee7899c0 100644
--- a/src/net/sf/freecol/client/gui/TileViewer.java
+++ b/src/net/sf/freecol/client/gui/TileViewer.java
@@ -202,12 +202,12 @@ public final class TileViewer {
         if (!tile.isExplored())
             return lib.getTerrainImage(null, tile.getX(), tile.getY());
         final TileType tileType = tile.getType();
-        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        Dimension terrainTileSize = lib.tileSize;
         BufferedImage overlayImage = lib.getOverlayImage(tile);
         final int compoundHeight = (overlayImage != null)
             ? overlayImage.getHeight()
             : tileType.isForested()
-                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
+                ? lib.tileForestSize.height
                 : terrainTileSize.height;
         BufferedImage image = new BufferedImage(
             terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
@@ -227,12 +227,12 @@ public final class TileViewer {
      */
     BufferedImage createTileImage(Tile tile) {
         final TileType tileType = tile.getType();
-        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        Dimension terrainTileSize = lib.tileSize;
         BufferedImage overlayImage = lib.getOverlayImage(tile);
         final int compoundHeight = (overlayImage != null)
             ? overlayImage.getHeight()
             : tileType.isForested()
-                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
+                ? lib.tileForestSize.height
                 : terrainTileSize.height;
         BufferedImage image = new BufferedImage(
             terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
@@ -257,12 +257,12 @@ public final class TileViewer {
      */
     BufferedImage createColonyTileImage(Tile tile, Colony colony) {
         final TileType tileType = tile.getType();
-        Dimension terrainTileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        Dimension terrainTileSize = lib.tileSize;
         BufferedImage overlayImage = lib.getOverlayImage(tile);
         final int compoundHeight = (overlayImage != null)
             ? overlayImage.getHeight()
             : tileType.isForested()
-                ? lib.scaleDimension(ImageLibrary.TILE_FOREST_SIZE).height
+                ? lib.tileForestSize.height
                 : terrainTileSize.height;
         BufferedImage image = new BufferedImage(
             terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
@@ -284,7 +284,7 @@ public final class TileViewer {
      */
     void displayColonyTiles(Graphics2D g, Tile[][] tiles, Colony colony) {
         Set<String> overlayCache = ImageLibrary.createOverlayCache();
-        Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        Dimension tileSize = lib.tileSize;
         for (int x = 0; x < 3; x++) {
             for (int y = 0; y < 3; y++) {
                 if (tiles[x][y] != null) {
@@ -372,7 +372,7 @@ public final class TileViewer {
     void setImageLibraryAndUpdateData(ImageLibrary lib) {
         this.lib = lib;
         // ATTENTION: we assume that all base tiles have the same size
-        Dimension tileSize = lib.scaleDimension(ImageLibrary.TILE_SIZE);
+        Dimension tileSize = lib.tileSize;
         rp = new RoadPainter(tileSize);
         tileHeight = tileSize.height;
         tileWidth = tileSize.width;
@@ -763,7 +763,7 @@ public final class TileViewer {
                 if (ResourceManager.hasImageResource(key)) {
                     // Has its own Overlay Image in Misc, use it
                     Image overlay = ResourceManager.getImage(key,
-                        lib.scaleDimension(ImageLibrary.TILE_SIZE));
+                        lib.tileSize);
                     g.drawImage(overlay, 0, 0, null);
                 }
             }

From 77839e9f1f91e2858c6e76627cd6b2793b13a649 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 28 Sep 2015 15:12:59 +0200
Subject: [PATCH 267/323] Make most TileViewer methods non-static to reduce
 needless parameter passing

---
 src/net/sf/freecol/client/gui/MapViewer.java  |  9 ++-
 src/net/sf/freecol/client/gui/TileViewer.java | 65 +++++++++----------
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 75b8cfb3d..2aba4836f 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1326,8 +1326,8 @@ public final class MapViewer {
                 g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
                             (y-y0) * halfHeight);
 
-                TileViewer.displayTileWithBeachAndBorder(g, lib, tile);
-                TileViewer.displayUnknownTileBorder(g, lib, tile);
+                tv.displayTileWithBeachAndBorder(g, tile);
+                tv.displayUnknownTileBorder(g, tile);
 
                 g.setTransform(baseTransform);
             });
@@ -1403,9 +1403,8 @@ public final class MapViewer {
 
                 Image overlayImage = lib.getOverlayImage(tile, overlayCache);
                 tv.displayTileItems(g, tile, overlayImage);
-                TileViewer.displaySettlementWithChipsOrPopulationNumber(
-                    freeColClient, lib, g,
-                    tile, tileWidth, tileHeight, withNumbers);
+                tv.displaySettlementWithChipsOrPopulationNumber(
+                    g, tile, withNumbers);
                 tv.displayFogOfWar(g, tile);
                 tv.displayOptionalTileText(g, tile);
 
diff --git a/src/net/sf/freecol/client/gui/TileViewer.java b/src/net/sf/freecol/client/gui/TileViewer.java
index 5ee7899c0..05eb70dc4 100644
--- a/src/net/sf/freecol/client/gui/TileViewer.java
+++ b/src/net/sf/freecol/client/gui/TileViewer.java
@@ -213,7 +213,7 @@ public final class TileViewer {
             terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
         Graphics2D g = image.createGraphics();
         g.translate(0, compoundHeight - terrainTileSize.height);
-        displayTileWithBeachAndBorder(g, lib, tile);
+        displayTileWithBeachAndBorder(g, tile);
         displayTileItems(g, tile, overlayImage);
         g.dispose();
         return image;
@@ -353,11 +353,10 @@ public final class TileViewer {
      * @param overlayImage The Image for the tile overlay.
      */
     private void displayTile(Graphics2D g, Tile tile, Image overlayImage) {
-        displayTileWithBeachAndBorder(g, lib, tile);
+        displayTileWithBeachAndBorder(g, tile);
         if (tile.isExplored()) {
             displayTileItems(g, tile, overlayImage);
-            displaySettlementWithChipsOrPopulationNumber(freeColClient, lib,
-                g, tile, tileWidth, tileHeight, false);
+            displaySettlementWithChipsOrPopulationNumber(g, tile, false);
             displayFogOfWar(g, tile);
             displayOptionalTileText(g, tile);
         }
@@ -406,28 +405,25 @@ public final class TileViewer {
      * location specified by the coordinates. Only base terrain will be drawn.
      *
      * @param g The Graphics2D object on which to draw the Tile.
-     * @param library The <code>ImageLibrary</code> to use.
      * @param tile The Tile to draw.
      */
-    static void displayTileWithBeachAndBorder(Graphics2D g,
-                                              ImageLibrary library,
-                                              Tile tile) {
+    void displayTileWithBeachAndBorder(Graphics2D g, Tile tile) {
         if (tile != null) {
             int x = tile.getX();
             int y = tile.getY();
             // ATTENTION: we assume that all base tiles have the same size
-            g.drawImage(library.getTerrainImage(tile.getType(), x, y),
+            g.drawImage(lib.getTerrainImage(tile.getType(), x, y),
                         0, 0, null);
             if (tile.isExplored()) {
                 if (!tile.isLand() && tile.getStyle() > 0) {
                     int edgeStyle = tile.getStyle() >> 4;
                     if (edgeStyle > 0) {
-                        g.drawImage(library.getBeachEdgeImage(edgeStyle, x, y),
+                        g.drawImage(lib.getBeachEdgeImage(edgeStyle, x, y),
                                     0, 0, null);
                     }
                     int cornerStyle = tile.getStyle() & 15;
                     if (cornerStyle > 0) {
-                        g.drawImage(library.getBeachCornerImage(cornerStyle, x, y),
+                        g.drawImage(lib.getBeachCornerImage(cornerStyle, x, y),
                                     0, 0, null);
                     }
                 }
@@ -444,24 +440,27 @@ public final class TileViewer {
                         } else if (!tile.isLand() && borderingTile.isLand()) {
                             // If there is a Coast image (eg. beach) defined, use it, otherwise skip
                             // Draw the grass from the neighboring tile, spilling over on the side of this tile
-                            si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction, x, y),
-                                                   borderingTile.getType().getIndex());
+                            si = new SortableImage(
+                                lib.getBorderImage(borderingTile.getType(), direction, x, y),
+                                borderingTile.getType().getIndex());
                             imageBorders.add(si);
                             TileImprovement river = borderingTile.getRiver();
                             if (river != null && river.isConnectedTo(direction.getReverseDirection())) {
-                                si = new SortableImage(library.getRiverMouthImage(direction, borderingTile
-                                                                                  .getRiver().getMagnitude(), x, y),
-                                                       -1);
+                                si = new SortableImage(
+                                    lib.getRiverMouthImage(direction,
+                                        borderingTile.getRiver().getMagnitude(), x, y),
+                                    -1);
                                 imageBorders.add(si);
                             }
                         } else {
-                            if (library.getTerrainImage(tile.getType(), 0, 0)
-                                .equals(library.getTerrainImage(borderingTile.getType(), 0, 0))) {
+                            if (lib.getTerrainImage(tile.getType(), 0, 0)
+                                .equals(lib.getTerrainImage(borderingTile.getType(), 0, 0))) {
                                 // Do not draw limit between tile that share same graphics (ocean & great river)
                             } else if (borderingTile.getType().getIndex() < tile.getType().getIndex()) {
                                 // Draw land terrain with bordering land type, or ocean/high seas limit
-                                si = new SortableImage(library.getBorderImage(borderingTile.getType(), direction,
-                                                                              x, y), borderingTile.getType().getIndex());
+                                si = new SortableImage(
+                                    lib.getBorderImage(borderingTile.getType(), direction, x, y),
+                                    borderingTile.getType().getIndex());
                                 imageBorders.add(si);
                             }
                         }
@@ -475,8 +474,7 @@ public final class TileViewer {
         }
     }
 
-    static void displayUnknownTileBorder(Graphics2D g, ImageLibrary lib,
-                                         Tile tile) {
+    void displayUnknownTileBorder(Graphics2D g, Tile tile) {
         for (Direction direction : Direction.values()) {
             Tile borderingTile = tile.getNeighbourOrNull(direction);
             if (borderingTile != null && !borderingTile.isExplored()) {
@@ -593,9 +591,8 @@ public final class TileViewer {
      * @param tile The Tile to draw.
      * @param withNumber Whether to display the number of units present.
      */
-    static void displaySettlementWithChipsOrPopulationNumber(
-            FreeColClient freeColClient, ImageLibrary lib, Graphics2D g,
-            Tile tile, int tileWidth, int tileHeight, boolean withNumber) {
+    void displaySettlementWithChipsOrPopulationNumber(
+            Graphics2D g, Tile tile, boolean withNumber) {
         final Player player = freeColClient.getMyPlayer();
         final Settlement settlement = tile.getSettlement();
 
@@ -724,30 +721,26 @@ public final class TileViewer {
      */
     private void displayTileItem(Graphics2D g, Tile tile, TileItem item) {
         if (item instanceof Resource) {
-            displayResourceTileItem(g, lib, (Resource) item, tileWidth, tileHeight);
+            displayResourceTileItem(g, (Resource) item);
         } else if (item instanceof LostCityRumour) {
-            displayLostCityRumour(g, lib, tileWidth, tileHeight);
+            displayLostCityRumour(g);
         } else {
-            displayTileImprovement(g, lib, rp, tile, (TileImprovement)item);
+            displayTileImprovement(g, tile, (TileImprovement)item);
         }
     }
 
-    private static void displayResourceTileItem(Graphics2D g, ImageLibrary lib,
-                                         Resource item,
-                                         int tileWidth, int tileHeight) {
+    private void displayResourceTileItem(Graphics2D g, Resource item) {
         Image bonusImage = lib.getMiscImage("image.tileitem." + item.getType().getId());
         displayCenteredImage(g, bonusImage, tileWidth, tileHeight);
     }
 
-    private static void displayLostCityRumour(Graphics2D g, ImageLibrary lib,
-                                           int tileWidth, int tileHeight) {
+    private void displayLostCityRumour(Graphics2D g) {
         displayCenteredImage(g, lib.getMiscImage(ImageLibrary.LOST_CITY_RUMOUR),
             tileWidth, tileHeight);
     }
 
-    private static void displayTileImprovement(Graphics2D g, ImageLibrary lib,
-                                               RoadPainter rp,
-                                               Tile tile, TileImprovement  ti) {
+    private void displayTileImprovement(Graphics2D g,
+                                        Tile tile, TileImprovement  ti) {
         if (ti.isComplete()) {
             if (ti.isRoad()) {
                 rp.displayRoad(g, tile);

From aaa52b33ed794c08a7ba4fff529e0c8fa5b0472c Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 28 Sep 2015 16:36:35 +0200
Subject: [PATCH 268/323] Update ImageLibrary methods for tiles to take
 Dimension parameters instead of a scale

---
 .../sf/freecol/client/gui/ImageLibrary.java   | 76 +++++++++----------
 src/net/sf/freecol/client/gui/TileViewer.java |  9 ++-
 .../gui/panel/MapEditorTransformPanel.java    |  6 +-
 3 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/ImageLibrary.java b/src/net/sf/freecol/client/gui/ImageLibrary.java
index 6a1868cfd..337782fb8 100644
--- a/src/net/sf/freecol/client/gui/ImageLibrary.java
+++ b/src/net/sf/freecol/client/gui/ImageLibrary.java
@@ -304,20 +304,22 @@ public final class ImageLibrary {
      * @return The image at the given index.
      */
     public BufferedImage getForestImage(TileType type) {
-        return getForestImage(type, scaleFactor);
+        return getForestImage(type, tileForestSize);
     }
 
-    public BufferedImage getForestImage(TileType type, TileImprovementStyle riverStyle) {
-        return getForestImage(type, riverStyle, scaleFactor);
-    }
-
-    public static BufferedImage getForestImage(TileType type, float scale) {
+    public static BufferedImage getForestImage(TileType type, Dimension size) {
         return ResourceManager.getImage("image.tileforest." + type.getId(),
-                                        scaleDimension(TILE_FOREST_SIZE, scale));
+                                        size);
     }
 
-    public static BufferedImage getForestImage(TileType type, TileImprovementStyle riverStyle, float scale) {
-        Dimension size = scaleDimension(TILE_FOREST_SIZE, scale);
+    public BufferedImage getForestImage(TileType type,
+                                        TileImprovementStyle riverStyle) {
+        return getForestImage(type, riverStyle, tileForestSize);
+    }
+
+    public static BufferedImage getForestImage(TileType type,
+                                               TileImprovementStyle riverStyle,
+                                               Dimension size) {
         if (riverStyle != null) {
             String key = "image.tileforest." + type.getId() + ".s" + riverStyle.getMask();
             // @compat 0.10.6
@@ -522,7 +524,7 @@ public final class ImageLibrary {
      * @return A pseudo-random terrain image.
      */
     public BufferedImage getOverlayImage(Tile tile) {
-        return getOverlayImage(tile.getType(), tile.getId(), scaleFactor);
+        return getOverlayImage(tile.getType(), tile.getId(), tileOverlaySize);
     }
 
     /**
@@ -531,13 +533,14 @@ public final class ImageLibrary {
      *
      * @param type The type of the terrain-image to return.
      * @param id A string used to get a random image.
-     * @param scale The scale of the image to return.
+     * @param size The size of the image to return.
      * @return The terrain-image at the given index.
      */
-    public static BufferedImage getOverlayImage(TileType type, String id, float scale) {
+    public static BufferedImage getOverlayImage(TileType type, String id,
+                                                Dimension size) {
         String prefix = "image.tileoverlay." + type.getId();
         List<String> keys = ResourceManager.getImageKeys(prefix);
-        return getRandomizedImage(keys, id, scale);
+        return getRandomizedImage(keys, id, size);
     }
 
     public static Set<String> createOverlayCache() {
@@ -545,32 +548,32 @@ public final class ImageLibrary {
     }
 
     public BufferedImage getOverlayImage(Tile tile, Set<String> overlayCache) {
-        return getOverlayImage(tile.getType(), tile.getId(), scaleFactor,
+        return getOverlayImage(tile.getType(), tile.getId(), tileOverlaySize,
                                overlayCache);
     }
 
-    public static BufferedImage getOverlayImage(TileType type, String id, float scale,
-                                        Set<String> overlayCache) {
+    public static BufferedImage getOverlayImage(TileType type, String id,
+                                                Dimension size,
+                                                Set<String> overlayCache) {
         final String prefix = "image.tileoverlay." + type.getId() + ".r";
         final List<String> keys = overlayCache.stream()
             .filter(k -> k.startsWith(prefix))
             .collect(Collectors.toList());
-        return getRandomizedImage(keys, id, scale);
+        return getRandomizedImage(keys, id, size);
     }
 
-    private static BufferedImage getRandomizedImage(List<String> keys, String id, float scale) {
+    private static BufferedImage getRandomizedImage(List<String> keys,
+                                                    String id, Dimension size) {
         int count = keys.size();
         switch(count) {
             case 0:
                 return null;
             case 1:
-                return ResourceManager.getImage(keys.get(0),
-                    scaleDimension(TILE_OVERLAY_SIZE, scale));
+                return ResourceManager.getImage(keys.get(0), size);
             default:
                 Collections.sort(keys);
                 return ResourceManager.getImage(
-                    keys.get(Math.abs(id.hashCode() % count)),
-                    scaleDimension(TILE_OVERLAY_SIZE, scale));
+                    keys.get(Math.abs(id.hashCode() % count)), size);
         }
     }
 
@@ -625,31 +628,19 @@ public final class ImageLibrary {
      * @return The image with the given style.
      */
     public BufferedImage getRiverImage(TileImprovementStyle style) {
-        return getRiverImage(style, scaleFactor);
+        return getRiverImage(style.getString(), tileSize);
     }
 
     /**
      * Returns the river image with the given style.
      *
-     * @param style a <code>TileImprovementStyle</code> value
-     * @param scale a <code>double</code> value
+     * @param style the style code
+     * @param size the image size
      * @return The image with the given style.
      */
-    public static BufferedImage getRiverImage(TileImprovementStyle style, float scale) {
-        return getRiverImage(style.getString(), scale);
-    }
-
-    /**
-     * Returns the river image with the given style.
-     *
-     * @param style a <code>String</code> value
-     * @param scale a <code>double</code> value
-     * @return The image with the given style.
-     */
-    public static BufferedImage getRiverImage(String style, float scale) {
+    public static BufferedImage getRiverImage(String style, Dimension size) {
         return ResourceManager.getImage(
-            "image.tile.model.improvement.river.s" + style,
-            scaleDimension(TILE_SIZE, scale));
+            "image.tile.model.improvement.river.s" + style, size);
     }
 
     /**
@@ -727,13 +718,14 @@ public final class ImageLibrary {
      * @return The terrain-image at the given index.
      */
     public BufferedImage getTerrainImage(TileType type, int x, int y) {
-        return getTerrainImage(type, x, y, scaleFactor);
+        return getTerrainImage(type, x, y, tileSize);
     }
 
-    public static BufferedImage getTerrainImage(TileType type, int x, int y, float scale) {
+    public static BufferedImage getTerrainImage(TileType type, int x, int y,
+                                                Dimension size) {
         String key = (type == null) ? "model.tile.unexplored" : type.getId();
         return ResourceManager.getImage("image.tile." + key + ".center.r"
-            + (isEven(x, y) ? "0" : "1"), scaleDimension(TILE_SIZE, scale));
+            + (isEven(x, y) ? "0" : "1"), size);
     }
 
     public BufferedImage getSmallerUnitImage(Unit unit) {
diff --git a/src/net/sf/freecol/client/gui/TileViewer.java b/src/net/sf/freecol/client/gui/TileViewer.java
index 05eb70dc4..63b70c847 100644
--- a/src/net/sf/freecol/client/gui/TileViewer.java
+++ b/src/net/sf/freecol/client/gui/TileViewer.java
@@ -159,11 +159,14 @@ public final class TileViewer {
     static BufferedImage createTileImageWithOverlayAndForest(
             TileType type, float scale) {
         BufferedImage terrainImage = ImageLibrary.getTerrainImage(
-            type, 0, 0, scale);
+            type, 0, 0,
+            ImageLibrary.scaleDimension(ImageLibrary.TILE_SIZE, scale));
         BufferedImage overlayImage = ImageLibrary.getOverlayImage(
-            type, type.getId(), scale);
+            type, type.getId(),
+            ImageLibrary.scaleDimension(ImageLibrary.TILE_OVERLAY_SIZE, scale));
         BufferedImage forestImage = type.isForested()
-            ? ImageLibrary.getForestImage(type, scale)
+            ? ImageLibrary.getForestImage(type,
+                ImageLibrary.scaleDimension(ImageLibrary.TILE_FOREST_SIZE, scale))
             : null;
         if (overlayImage == null && forestImage == null) {
             return terrainImage;
diff --git a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
index edea7fc65..fef450b15 100644
--- a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
@@ -21,6 +21,7 @@ package net.sf.freecol.client.gui.panel;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
@@ -122,10 +123,11 @@ public final class MapEditorTransformPanel extends FreeColPanel {
                                       Messages.getName(type),
                                       new TileTypeTransform(type)));
         }
-        listPanel.add(buildButton(ImageLibrary.getRiverImage("0101", 0.5f),
+        Dimension riverSize = ImageLibrary.scaleDimension(ImageLibrary.TILE_SIZE, 0.5f);
+        listPanel.add(buildButton(ImageLibrary.getRiverImage("0101", riverSize),
                                   Messages.message("mapEditorTransformPanel.minorRiver"),
                                   new RiverTransform(TileImprovement.SMALL_RIVER)));
-        listPanel.add(buildButton(ImageLibrary.getRiverImage("0202", 0.5f),
+        listPanel.add(buildButton(ImageLibrary.getRiverImage("0202", riverSize),
                                   Messages.message("mapEditorTransformPanel.majorRiver"),
                                   new RiverTransform(TileImprovement.LARGE_RIVER)));
         listPanel.add(buildButton(ImageLibrary.getMiscImage("image.tileitem."

From b2d097d3fd8c4925c31963bc5a5bba9da38f99f9 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 28 Sep 2015 18:23:42 +0200
Subject: [PATCH 269/323] Update createTileImageWithOverlayAndForest to take a
 pixel size according to usage

---
 src/net/sf/freecol/client/gui/SwingGUI.java   |  4 ++--
 src/net/sf/freecol/client/gui/TileViewer.java | 19 +++++++++++--------
 .../gui/panel/MapEditorTransformPanel.java    |  3 ++-
 .../client/gui/panel/TerrainDetailPanel.java  |  9 ++++-----
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
index 378deb15a..772e5bce5 100644
--- a/src/net/sf/freecol/client/gui/SwingGUI.java
+++ b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -1616,8 +1616,8 @@ public class SwingGUI extends GUI {
     // Forwarding to tileViewer
 
     public static BufferedImage createTileImageWithOverlayAndForest(
-            TileType type, float scale) {
-        return TileViewer.createTileImageWithOverlayAndForest(type, scale);
+            TileType type, Dimension size) {
+        return TileViewer.createTileImageWithOverlayAndForest(type, size);
     }
 
     public BufferedImage createTileImageWithBeachBorderAndItems(Tile tile) {
diff --git a/src/net/sf/freecol/client/gui/TileViewer.java b/src/net/sf/freecol/client/gui/TileViewer.java
index 63b70c847..098935550 100644
--- a/src/net/sf/freecol/client/gui/TileViewer.java
+++ b/src/net/sf/freecol/client/gui/TileViewer.java
@@ -153,20 +153,23 @@ public final class TileViewer {
      * Returns the scaled terrain-image for a terrain type (and position 0, 0).
      *
      * @param type The type of the terrain-image to return.
-     * @param scale The scale of the terrain image to return.
+     * @param size The maximum size of the terrain image to return.
      * @return The terrain-image
      */
     static BufferedImage createTileImageWithOverlayAndForest(
-            TileType type, float scale) {
+            TileType type, Dimension size) {
+        Dimension size2 = new Dimension(
+            (size.width > 0) ? size.width
+                             : (2*ImageLibrary.TILE_SIZE.width*size.height +
+                                   (ImageLibrary.TILE_OVERLAY_SIZE.height+1)) /
+                               (2*ImageLibrary.TILE_OVERLAY_SIZE.height),
+            -1);
         BufferedImage terrainImage = ImageLibrary.getTerrainImage(
-            type, 0, 0,
-            ImageLibrary.scaleDimension(ImageLibrary.TILE_SIZE, scale));
+            type, 0, 0, size2);
         BufferedImage overlayImage = ImageLibrary.getOverlayImage(
-            type, type.getId(),
-            ImageLibrary.scaleDimension(ImageLibrary.TILE_OVERLAY_SIZE, scale));
+            type, type.getId(), size2);
         BufferedImage forestImage = type.isForested()
-            ? ImageLibrary.getForestImage(type,
-                ImageLibrary.scaleDimension(ImageLibrary.TILE_FOREST_SIZE, scale))
+            ? ImageLibrary.getForestImage(type, size2)
             : null;
         if (overlayImage == null && forestImage == null) {
             return terrainImage;
diff --git a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
index fef450b15..27bc20319 100644
--- a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
@@ -118,8 +118,9 @@ public final class MapEditorTransformPanel extends FreeColPanel {
     private void buildList() {
         final Specification spec = getSpecification();
         List<TileType> tileList = spec.getTileTypeList();
+        Dimension terrainSize = ImageLibrary.scaleDimension(ImageLibrary.TILE_OVERLAY_SIZE, 0.5f);
         for (TileType type : tileList) {
-            listPanel.add(buildButton(SwingGUI.createTileImageWithOverlayAndForest(type, 0.5f),
+            listPanel.add(buildButton(SwingGUI.createTileImageWithOverlayAndForest(type, terrainSize),
                                       Messages.getName(type),
                                       new TileTypeTransform(type)));
         }
diff --git a/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java b/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
index 50911f50d..0b3b12463 100644
--- a/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TerrainDetailPanel.java
@@ -19,6 +19,7 @@
 
 package net.sf.freecol.client.gui.panel;
 
+import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -74,11 +75,8 @@ public class TerrainDetailPanel
             = new DefaultMutableTreeNode(new ColopediaTreeItem(this, getId(),
                                          getName(), null));
         for (TileType t : getSpecification().getTileTypeList()) {
-            // FIXME: Use different method supporting a direct request of an
-            //        image of fixed ICON_SIZE.
-            final float maxTileImageHeight = ImageLibrary.TILE_OVERLAY_SIZE.height;
             Image tile = SwingGUI.createTileImageWithOverlayAndForest(t,
-                ImageLibrary.ICON_SIZE.height / maxTileImageHeight);
+                new Dimension(-1, ImageLibrary.ICON_SIZE.height));
             BufferedImage image = new BufferedImage(tile.getWidth(null),
                 ImageLibrary.ICON_SIZE.height, BufferedImage.TYPE_INT_ARGB);
             Graphics2D g = image.createGraphics();
@@ -111,7 +109,8 @@ public class TerrainDetailPanel
         panel.add(nameLabel, "span, align center");
 
         panel.add(Utility.localizedLabel("colopedia.terrain.terrainImage"), "spany 3");
-        Image terrainImage = SwingGUI.createTileImageWithOverlayAndForest(tileType, 1);
+        Image terrainImage = SwingGUI.createTileImageWithOverlayAndForest(
+            tileType, ImageLibrary.TILE_OVERLAY_SIZE);
         panel.add(new JLabel(new ImageIcon(terrainImage)), "spany 3");
 
         List<ResourceType> resourceList = tileType.getResourceTypes();

From be3df27a3c1682ce6fc9f479d06fe83f7718c125 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Mon, 28 Sep 2015 21:33:59 +0200
Subject: [PATCH 270/323] Fix map cursor to be correctly (de)activated

---
 src/net/sf/freecol/client/gui/Canvas.java    |  2 +-
 src/net/sf/freecol/client/gui/MapViewer.java | 21 +++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index d491c915b..8563d6cfa 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -963,6 +963,7 @@ public final class Canvas extends JDesktopPane {
      * for the presence of other dialogs.
      */
     private void restartBlinking() {
+        if (mapViewer.getViewMode() != GUI.MOVE_UNITS_MODE) return;
         for (FreeColDialog<?> f : dialogs) {
             if (f.isModal()) return;
         }
@@ -973,7 +974,6 @@ public final class Canvas extends JDesktopPane {
      * Stop blinking on the map.
      */
     private void stopBlinking() {
-        if (mapViewer.getViewMode() != GUI.MOVE_UNITS_MODE) return;
         mapViewer.stopBlinking();
     }
 
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 2aba4836f..0d3e8f2d1 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -109,7 +109,6 @@ public final class MapViewer {
     private final TileViewer tv;
 
     private TerrainCursor cursor;
-    private volatile boolean blinkingMarqueeEnabled;
 
     private Tile selectedTile;
     private Tile focus = null;
@@ -198,7 +197,6 @@ public final class MapViewer {
         setImageLibraryAndUpdateData(new ImageLibrary());
 
         cursor = null;
-        blinkingMarqueeEnabled = false;
 
         unitsOutForAnimation = new HashMap<>();
         unitsOutForAnimationLabels = new HashMap<>();
@@ -240,6 +238,18 @@ public final class MapViewer {
             logger.fine("Changed to " + ((newViewMode == GUI.MOVE_UNITS_MODE)
                     ? "Move Units" : "View Terrain") + " mode");
             viewMode = newViewMode;
+            if(viewMode == GUI.MOVE_UNITS_MODE)
+                restartBlinking();
+            else
+                stopBlinking();
+            if(activeUnit != null) {
+                Tile tile = activeUnit.getTile();
+                if(isTileVisible(tile))
+                    gui.refreshTile(tile);
+                if(selectedTile != tile && isTileVisible(selectedTile))
+                    gui.refreshTile(selectedTile);
+            } else if(isTileVisible(selectedTile))
+                gui.refreshTile(selectedTile);
             gui.updateMapControls();
         }
     }
@@ -547,11 +557,8 @@ public final class MapViewer {
      * Starts the unit-selection-cursor blinking animation.
      */
     void startCursorBlinking() {
-        blinkingMarqueeEnabled = true;
-
         cursor = new TerrainCursor();
         cursor.addActionListener((ActionEvent ae) -> {
-                if (!blinkingMarqueeEnabled) return;
                 Unit unit = activeUnit;
                 if (unit != null) {
                     Tile tile = unit.getTile();
@@ -562,11 +569,11 @@ public final class MapViewer {
     }
 
     void stopBlinking() {
-        blinkingMarqueeEnabled = false;
+        cursor.stopBlinking();
     }
 
     void restartBlinking() {
-        blinkingMarqueeEnabled = true;
+        cursor.startBlinking();
     }
 
     /**

From cd85d41b2c46bccc5cbd9531544fabe9e99abe69 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 28 Sep 2015 10:46:31 +0930
Subject: [PATCH 271/323] Map position handling simplifications.

---
 src/net/sf/freecol/common/model/Map.java | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Map.java b/src/net/sf/freecol/common/model/Map.java
index 8622c6733..2fe353e23 100644
--- a/src/net/sf/freecol/common/model/Map.java
+++ b/src/net/sf/freecol/common/model/Map.java
@@ -119,14 +119,10 @@ public class Map extends FreeColGameObject implements Location {
          * @param direction An optional <code>Direction</code> to step.
          */
         public Position(Position start, Direction direction) {
-            int xx = start.x, yy = start.y;
-            if (direction != null) {
-                Position step = direction.step(xx, yy);
-                xx = step.x;
-                yy = step.y;
-            }
-            this.x = xx;
-            this.y = yy;
+            Position step = (direction == null) ? start
+                : direction.step(start.x, start.y);
+            this.x = step.x;
+            this.y = step.y;
         }
 
 
@@ -591,12 +587,8 @@ public class Map extends FreeColGameObject implements Location {
      *      specified tiles are not neighbours.
      */
     public Direction getDirection(Tile t1, Tile t2) {
-        for (Direction d : Direction.values()) {
-            Position step = d.step(t1.getX(), t1.getY());
-            if (step.x == t2.getX()
-                && step.y == t2.getY()) return d;
-        }
-        return null;
+        return (t1 == null || t2 == null) ? null
+            : new Position(t1).getDirection(new Position(t2));
     }
 
     /**
@@ -626,8 +618,7 @@ public class Map extends FreeColGameObject implements Location {
      *     direction, or null if invalid.
      */
     public Tile getAdjacentTile(int x, int y, Direction direction) {
-        Position step = direction.step(x, y);
-        return getTile(step.x, step.y);
+        return getTile(direction.step(x, y));
     }
 
     /**

From 8a482888a8d508ee095783e567799122627ff653 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 29 Sep 2015 00:15:54 +0200
Subject: [PATCH 272/323] Draw one extra row of settlement names and
 territorial borders, mostly fixing BR#2580

---
 src/net/sf/freecol/client/gui/MapViewer.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 0d3e8f2d1..8397688ff 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1370,7 +1370,7 @@ public final class MapViewer {
         // Paint full region borders
         if (options.getInteger(ClientOptions.DISPLAY_TILE_TEXT) ==
                 ClientOptions.DISPLAY_TILE_TEXT_REGIONS) {
-            map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+            map.forSubMap(x0, y0-1, lastColumn-firstColumn+1, lastRow-firstRow+1+1,
                 (Tile tile) -> {
                     final int x = tile.getX();
                     final int y = tile.getY();
@@ -1382,7 +1382,7 @@ public final class MapViewer {
         }
 
         // Paint full country borders
-        map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+        map.forSubMap(x0, y0-1, lastColumn-firstColumn+1, lastRow-firstRow+1+1,
             (Tile tile) -> {
                 final int x = tile.getX();
                 final int y = tile.getY();
@@ -1423,7 +1423,7 @@ public final class MapViewer {
         // Paint transparent region borders
         if (options.getInteger(ClientOptions.DISPLAY_TILE_TEXT) ==
                 ClientOptions.DISPLAY_TILE_TEXT_REGIONS) {
-            map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+            map.forSubMap(x0, y0-1, lastColumn-firstColumn+1, lastRow-firstRow+1+1,
                 (Tile tile) -> {
                     final int x = tile.getX();
                     final int y = tile.getY();
@@ -1435,7 +1435,7 @@ public final class MapViewer {
         }
 
         // Paint transparent country borders
-        map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+        map.forSubMap(x0, y0-1, lastColumn-firstColumn+1, lastRow-firstRow+1+1,
             (Tile tile) -> {
                 final int x = tile.getX();
                 final int y = tile.getY();
@@ -1507,7 +1507,10 @@ public final class MapViewer {
                 FontLibrary.FontType.NORMAL, FontLibrary.FontSize.TINY,
                 Font.BOLD);
 
-            map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+            /* For settlement names and territorial borders 1 extra row needs
+               to be drawn in north to prevent missing parts on partial redraws,
+               as they can reach below their tiles, see BR#2580 */
+            map.forSubMap(x0, y0-1, lastColumn-firstColumn+1, lastRow-firstRow+1+1,
                 (Tile tile) -> {
                     Settlement settlement = tile.getSettlement();
                     if(settlement == null)

From 65030705fad1b652f9e3643f518c5bb89f28a568 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Tue, 29 Sep 2015 16:36:55 +0930
Subject: [PATCH 273/323] Add Game.isInRevengeMode.

---
 src/net/sf/freecol/common/model/Game.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/net/sf/freecol/common/model/Game.java b/src/net/sf/freecol/common/model/Game.java
index cea648a3a..a7b638185 100644
--- a/src/net/sf/freecol/common/model/Game.java
+++ b/src/net/sf/freecol/common/model/Game.java
@@ -707,6 +707,16 @@ public class Game extends FreeColGameObject {
         return clientUserName == null;
     }
 
+    /**
+     * Is this game in revenge mode?
+     *
+     * @return True if an undead player is present.
+     */
+    public boolean isInRevengeMode() {
+        return getPlayers().stream()
+            .filter(p -> p.isUndead()).findFirst().isPresent();
+    }
+
     /**
      * Gets the current player.
      *

From 6477d117719556316e2967e1d13fa429f9756b47 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 29 Sep 2015 10:15:08 +0930
Subject: [PATCH 274/323] Game.getPlayer -> getPlayerByNation{,Id}.

---
 .../client/control/MapEditorController.java   |   2 +-
 .../gui/panel/MapEditorTransformPanel.java    |   2 +-
 src/net/sf/freecol/common/model/Game.java     |  39 ++++---
 src/net/sf/freecol/common/model/Nation.java   |   2 +-
 src/net/sf/freecol/common/model/Player.java   |   2 +-
 src/net/sf/freecol/server/FreeColServer.java  |   2 +-
 .../server/generator/FreeColMapLoader.java    |   2 +-
 .../server/generator/SimpleMapGenerator.java  |   8 +-
 .../sf/freecol/server/model/ServerUnit.java   |   2 +-
 .../sf/freecol/client/control/MoveTest.java   |   2 +-
 .../sf/freecol/common/i18n/MessagesTest.java  |   6 +-
 .../common/model/ColonyProductionTest.java    |   4 +-
 .../sf/freecol/common/model/ColonyTest.java   |   4 +-
 .../sf/freecol/common/model/CombatTest.java   |  40 +++----
 .../sf/freecol/common/model/EuropeTest.java   |   2 +-
 .../common/model/FoundingFatherTest.java      |   8 +-
 .../sf/freecol/common/model/GoodsTest.java    |   2 +-
 .../sf/freecol/common/model/HighSeasTest.java |   2 +-
 .../common/model/IndividualFatherTest.java    |  10 +-
 .../sf/freecol/common/model/LimitTest.java    |   6 +-
 .../net/sf/freecol/common/model/MapTest.java  |  22 ++--
 .../sf/freecol/common/model/MarketTest.java   |   2 +-
 .../common/model/ModelMessageTest.java        |   2 +-
 .../sf/freecol/common/model/MonarchTest.java  |   4 +-
 .../sf/freecol/common/model/MovementTest.java |  20 ++--
 .../freecol/common/model/PathfindingTest.java |   2 +-
 .../sf/freecol/common/model/PlayerTest.java   |  92 +++++++--------
 .../net/sf/freecol/common/model/RoleTest.java |   6 +-
 .../sf/freecol/common/model/ScopeTest.java    |   2 +-
 .../common/model/SerializationTest.java       |   4 +-
 .../freecol/common/model/SettlementTest.java  |   6 +-
 .../net/sf/freecol/common/model/TileTest.java |   2 +-
 .../net/sf/freecol/common/model/UnitTest.java |  44 ++++----
 .../common/model/UnitTypeChangeTest.java      |   6 +-
 .../sf/freecol/server/ai/ColonyPlanTest.java  |   2 +-
 .../net/sf/freecol/server/ai/ContactTest.java |  28 ++---
 .../server/ai/MissionAssignmentTest.java      |  18 +--
 .../src/net/sf/freecol/server/ai/REFTest.java |   2 +-
 .../net/sf/freecol/server/ai/TensionTest.java |   4 +-
 .../ai/mission/PioneeringMissionTest.java     |   2 +-
 .../ai/mission/PrivateerMissionTest.java      |   4 +-
 .../ai/mission/ScoutingMissionTest.java       |   4 +-
 .../ai/mission/TransportMissionTest.java      |  12 +-
 .../UnitSeekAndDestroyMissionTest.java        |   8 +-
 .../server/control/InGameControllerTest.java  | 106 +++++++++---------
 .../server/model/ServerColonyTest.java        |   2 +-
 .../server/model/ServerPlayerTest.java        |  34 +++---
 .../freecol/server/model/ServerUnitTest.java  |  10 +-
 .../sf/freecol/util/test/FreeColTestCase.java |   4 +-
 .../freecol/util/test/FreeColTestUtils.java   |   2 +-
 50 files changed, 308 insertions(+), 295 deletions(-)

diff --git a/src/net/sf/freecol/client/control/MapEditorController.java b/src/net/sf/freecol/client/control/MapEditorController.java
index e1bcb1f02..4142d64e1 100644
--- a/src/net/sf/freecol/client/control/MapEditorController.java
+++ b/src/net/sf/freecol/client/control/MapEditorController.java
@@ -247,7 +247,7 @@ public final class MapEditorController {
     public void requireNativeNations(Game game) {
         final Specification spec = game.getSpecification();
         for (Nation n : spec.getIndianNations()) {
-            Player p = game.getPlayer(n.getId());
+            Player p = game.getPlayerByNation(n);
             if (p == null) {
                 p = new ServerPlayer(game, false, n, null, null);
                 game.addPlayer(p);
diff --git a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
index 27bc20319..64db864ba 100644
--- a/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java
@@ -348,7 +348,7 @@ public final class MapEditorTransformPanel extends FreeColPanel {
                 || nativeNation == null) return;
             UnitType skill = ((IndianNationType)nativeNation.getType())
                 .getSkills().get(0).getObject();
-            Player nativePlayer = getGame().getPlayer(nativeNation.getId());
+            Player nativePlayer = getGame().getPlayerByNation(nativeNation);
             if (nativePlayer == null) return;
             String name = nativePlayer.getSettlementName(null);
             ServerIndianSettlement settlement
diff --git a/src/net/sf/freecol/common/model/Game.java b/src/net/sf/freecol/common/model/Game.java
index a7b638185..de77f0755 100644
--- a/src/net/sf/freecol/common/model/Game.java
+++ b/src/net/sf/freecol/common/model/Game.java
@@ -490,6 +490,31 @@ public class Game extends FreeColGameObject {
         return players;
     }
 
+    /**
+     * Get a <code>Player</code> identified by its nation.
+     *
+     * @param nation The <code>Nation</code> to search for.
+     * @return The <code>Player</code> of the given nation, or null if
+     *     not found.
+     */
+    public Player getPlayerByNation(Nation nation) {
+        return getPlayerByNationId(nation.getId());
+    }
+
+    /**
+     * Get a <code>Player</code> identified by its nation identifier.
+     *
+     * @param nationId The nation identifier to search for.
+     * @return The <code>Player</code> of the given nation, or null if
+     *     not found.
+     */
+    public Player getPlayerByNationId(String nationId) {
+        for (Player player : players) {
+            if (player.getNationId().equals(nationId)) return player;
+        }
+        return null;
+    }
+
     /**
      * Get live players in the game.
      *
@@ -540,20 +565,6 @@ public class Game extends FreeColGameObject {
             .collect(Collectors.toList());
     }
 
-    /**
-     * Get a <code>Player</code> identified by its nation identifier.
-     *
-     * @param nationId The nation identifier to search for.
-     * @return The <code>Player</code> of the given nation, or null if
-     *     not found.
-     */
-    public Player getPlayer(String nationId) {
-        for (Player player : players) {
-            if (player.getNationId().equals(nationId)) return player;
-        }
-        return null;
-    }
-
     /**
      * Gets the next current player.
      *
diff --git a/src/net/sf/freecol/common/model/Nation.java b/src/net/sf/freecol/common/model/Nation.java
index a6eae8ed7..ba5acabd3 100644
--- a/src/net/sf/freecol/common/model/Nation.java
+++ b/src/net/sf/freecol/common/model/Nation.java
@@ -261,7 +261,7 @@ public class Nation extends FreeColGameObjectType {
         for (int index = 0; index < nations; index++) {
             String nationId = "model.nation."
                 + EUROPEAN_NATIONS.get((start + index) % nations);
-            if (game.getPlayer(nationId) == null) {
+            if (game.getPlayerByNationId(nationId) == null) {
                 return Messages.nameKey(nationId);
             }
         }
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index beb52fd58..c2e87c595 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -1167,7 +1167,7 @@ public class Player extends FreeColGameObject implements Nameable {
      */
     public Player getREFPlayer() {
         Nation ref = getNation().getREFNation();
-        return (ref == null) ? null : getGame().getPlayer(ref.getId());
+        return (ref == null) ? null : getGame().getPlayerByNation(ref);
     }
 
     /**
diff --git a/src/net/sf/freecol/server/FreeColServer.java b/src/net/sf/freecol/server/FreeColServer.java
index 41b050ca5..643323329 100644
--- a/src/net/sf/freecol/server/FreeColServer.java
+++ b/src/net/sf/freecol/server/FreeColServer.java
@@ -1136,7 +1136,7 @@ public final class FreeColServer {
                  : game.getNationOptions().getNations().entrySet()) {
             if (entry.getKey().isUnknownEnemy()) continue;
             if (entry.getValue() != NationState.NOT_AVAILABLE
-                && game.getPlayer(entry.getKey().getId()) == null) {
+                && game.getPlayerByNation(entry.getKey()) == null) {
                 newAI.add(makeAIPlayer(entry.getKey()));
             }
         }
diff --git a/src/net/sf/freecol/server/generator/FreeColMapLoader.java b/src/net/sf/freecol/server/generator/FreeColMapLoader.java
index 9c15092d5..71b0f9a4e 100644
--- a/src/net/sf/freecol/server/generator/FreeColMapLoader.java
+++ b/src/net/sf/freecol/server/generator/FreeColMapLoader.java
@@ -104,7 +104,7 @@ public class FreeColMapLoader implements MapLoader {
                                 // import native settlements
                                 if (template.getOwner() != null) {
                                     String nationId = template.getOwner().getNationId();
-                                    Player player = game.getPlayer(nationId);
+                                    Player player = game.getPlayerByNationId(nationId);
                                     if (player == null) {
                                         Nation nation = game.getSpecification().getNation(nationId);
                                         player = new ServerPlayer(game, false, nation, null, null);
diff --git a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
index ecb8ef48b..527094819 100644
--- a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
+++ b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
@@ -267,7 +267,7 @@ public class SimpleMapGenerator implements MapGenerator {
         int nSettlements = 0;
         
         for (Player player : importGame.getLiveNativePlayers(null)) {
-            Player indian = game.getPlayer(player.getNationId());
+            Player indian = game.getPlayerByNationId(player.getNationId());
             if (indian == null) {
                 Nation nation = spec.getNation(player.getNationId());
                 if (nation == null) {
@@ -287,7 +287,7 @@ public class SimpleMapGenerator implements MapGenerator {
         for (Tile tile : importGame.getMap().getAllTiles()) {
             IndianSettlement is = tile.getIndianSettlement();
             if (is == null) continue;
-            Player indian = game.getPlayer(is.getOwner().getNationId());
+            Player indian = game.getPlayerByNationId(is.getOwner().getNationId());
             ServerIndianSettlement settlement
                 = new ServerIndianSettlement(game, indian, is.getName(),
                     map.getTile(tile.getX(), tile.getY()), is.isCapital(),
@@ -331,8 +331,8 @@ public class SimpleMapGenerator implements MapGenerator {
         if (nSettlements > 0) {
             for (Tile t : importGame.getMap().getAllTiles()) {
                 if (t.getOwner() == null) continue;
-                String nationId = t.getOwner().getNationId();
-                Player owner = game.getPlayer(nationId);
+                Player owner = game.getPlayerByNationId(t.getOwner()
+                    .getNationId());
                 if (owner == null) continue;
                 Tile tile = map.getTile(t.getX(), t.getY());
                 if (tile == null) continue;
diff --git a/src/net/sf/freecol/server/model/ServerUnit.java b/src/net/sf/freecol/server/model/ServerUnit.java
index c4dccfac7..4b3fac9b6 100644
--- a/src/net/sf/freecol/server/model/ServerUnit.java
+++ b/src/net/sf/freecol/server/model/ServerUnit.java
@@ -125,7 +125,7 @@ public class ServerUnit extends Unit implements ServerModelObject {
      */
     public ServerUnit(Game game, Location location, Unit template) {
         this(game, location,
-            game.getPlayer(template.getOwner().getNationId()),
+            game.getPlayerByNationId(template.getOwner().getNationId()),
             game.getSpecification().getUnitType(template.getType().getId()),
             game.getSpecification().getDefaultRole());
 
diff --git a/test/src/net/sf/freecol/client/control/MoveTest.java b/test/src/net/sf/freecol/client/control/MoveTest.java
index f812bd2ac..dcb4f9177 100644
--- a/test/src/net/sf/freecol/client/control/MoveTest.java
+++ b/test/src/net/sf/freecol/client/control/MoveTest.java
@@ -59,7 +59,7 @@ public class MoveTest extends FreeColTestCase {
             client = ClientTestHelper
                 .startClient(ServerTestHelper.getServer());
 
-            Player dutch = game.getPlayer("model.nation.dutch");
+            Player dutch = game.getPlayerByNationId("model.nation.dutch");
             Tile plain1 = map.getTile(5, 8);
             plain1.setExplored(dutch, true);
             Tile plain2 = map.getTile(5, 7);
diff --git a/test/src/net/sf/freecol/common/i18n/MessagesTest.java b/test/src/net/sf/freecol/common/i18n/MessagesTest.java
index bc0deb49c..325ec22ca 100644
--- a/test/src/net/sf/freecol/common/i18n/MessagesTest.java
+++ b/test/src/net/sf/freecol/common/i18n/MessagesTest.java
@@ -401,11 +401,13 @@ public class MessagesTest extends FreeColTestCase {
         // Unit.getDescription/getFullDescription are just wrappers around
         // Messages.getTemplate/getFullTemplate.
         Game game = getStandardGame();
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game
+            .getPlayerByNationId("model.nation.dutch");
         Nation refNation = dutch.getNation().getREFNation();
         ServerPlayer dutchREF = new ServerPlayer(game, false, refNation, 
                                                  null, null);
-        ServerPlayer sioux = (ServerPlayer)game.getPlayer("model.nation.sioux");
+        ServerPlayer sioux = (ServerPlayer)game
+            .getPlayerByNationId("model.nation.sioux");
         Unit unit;
 
         // King's regulars
diff --git a/test/src/net/sf/freecol/common/model/ColonyProductionTest.java b/test/src/net/sf/freecol/common/model/ColonyProductionTest.java
index 4de996fae..62fdc162f 100644
--- a/test/src/net/sf/freecol/common/model/ColonyProductionTest.java
+++ b/test/src/net/sf/freecol/common/model/ColonyProductionTest.java
@@ -69,7 +69,7 @@ public class ColonyProductionTest extends FreeColTestCase {
         Game game = getStandardGame();
         Map map = getTestMap();
         game.setMap(map);
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         Tile tile = map.getTile(5, 8);
         Resource grain = new Resource(game, tile, grainResource);
@@ -117,7 +117,7 @@ public class ColonyProductionTest extends FreeColTestCase {
         Game game = getStandardGame();
         Map map = getTestMap();
         game.setMap(map);
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         Tile tile = map.getTile(5, 8);
         Resource grain = new Resource(game, tile, grainResource);
diff --git a/test/src/net/sf/freecol/common/model/ColonyTest.java b/test/src/net/sf/freecol/common/model/ColonyTest.java
index f0c2faa51..a9a28503d 100644
--- a/test/src/net/sf/freecol/common/model/ColonyTest.java
+++ b/test/src/net/sf/freecol/common/model/ColonyTest.java
@@ -334,7 +334,7 @@ public class ColonyTest extends FreeColTestCase {
         }
         assertEquals(nativeTile.getOwner(), indianPlayer);
 
-        Player french = game.getPlayer("model.nation.french");
+        Player french = game.getPlayerByNationId("model.nation.french");
         Colony frenchColony = getStandardColony(3, 9, 8);
         frenchColony.changeOwner(french);
         assertEquals(frenchColony.getTile().getType(), plainsTileType);
@@ -432,7 +432,7 @@ public class ColonyTest extends FreeColTestCase {
         game.setMap(getTestMap(true));
         Colony colony = getStandardColony(5);
         Tile tile = colony.getTile().getNeighbourOrNull(Direction.N);
-        Player iroquois = game.getPlayer("model.nation.iroquois");
+        Player iroquois = game.getPlayerByNationId("model.nation.iroquois");
 
         assertFalse("No enemy units present.", colony.isUnderSiege());
 
diff --git a/test/src/net/sf/freecol/common/model/CombatTest.java b/test/src/net/sf/freecol/common/model/CombatTest.java
index 9fbd1d760..0460cfdd8 100644
--- a/test/src/net/sf/freecol/common/model/CombatTest.java
+++ b/test/src/net/sf/freecol/common/model/CombatTest.java
@@ -92,8 +92,8 @@ public class CombatTest extends FreeColTestCase {
     public void testColonistAttackedByVeteran() throws Exception {
         Game game = getStandardGame();
         CombatModel combatModel = game.getCombatModel();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
         Map map = getTestMap(plains);
         game.setMap(map);
         FreeColTestCase.spec();
@@ -157,8 +157,8 @@ public class CombatTest extends FreeColTestCase {
     public void testGalleonAttackedByPrivateer() throws Exception {
         Game game = getStandardGame();
         CombatModel combatModel = game.getCombatModel();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
         Map map = getTestMap(ocean);
         game.setMap(map);
         FreeColTestCase.spec();
@@ -259,8 +259,8 @@ public class CombatTest extends FreeColTestCase {
         game.setMap(map);
 
         Colony colony = getStandardColony();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player inca = game.getPlayer("model.nation.inca");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player inca = game.getPlayerByNationId("model.nation.inca");
 
         Tile tile2 = map.getTile(4, 8);
         tile2.setExplored(dutch, true);
@@ -285,8 +285,8 @@ public class CombatTest extends FreeColTestCase {
         game.setMap(map);
 
         final SimpleCombatModel combatModel = new SimpleCombatModel();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player inca = game.getPlayer("model.nation.inca");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player inca = game.getPlayerByNationId("model.nation.inca");
         Colony colony = getStandardColony();
         Tile tile2 = map.getTile(4, 8);
         tile2.setExplored(dutch, true);
@@ -319,8 +319,8 @@ public class CombatTest extends FreeColTestCase {
         game.setMap(map);
 
         SimpleCombatModel combatModel = new SimpleCombatModel();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player inca = game.getPlayer("model.nation.inca");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player inca = game.getPlayerByNationId("model.nation.inca");
 
         Tile tile1 = map.getTile(5, 8);
         tile1.setExplored(dutch, true);
@@ -350,8 +350,8 @@ public class CombatTest extends FreeColTestCase {
 
     public void testAttackIgnoresMovementPoints() throws Exception {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
         Map map = getTestMap(plains, true);
         game.setMap(map);
         Tile tile1 = map.getTile(5, 8);
@@ -381,9 +381,9 @@ public class CombatTest extends FreeColTestCase {
 
     public void testSpanishAgainstNatives() throws Exception {
         final Game game = getStandardGame();
-        final Player spanish = game.getPlayer("model.nation.spanish");
-        final Player dutch = game.getPlayer("model.nation.dutch");
-        Player tupi = game.getPlayer("model.nation.tupi");
+        final Player spanish = game.getPlayerByNationId("model.nation.spanish");
+        final Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player tupi = game.getPlayerByNationId("model.nation.tupi");
         Map map = getTestMap(plains, true);
         game.setMap(map);
 
@@ -434,8 +434,8 @@ public class CombatTest extends FreeColTestCase {
 
     public void testAttackShipWithLandUnit() {
         Game game = getStandardGame();
-        Player spanish = game.getPlayer("model.nation.spanish");
-        Player tupi = game.getPlayer("model.nation.tupi");
+        Player spanish = game.getPlayerByNationId("model.nation.spanish");
+        Player tupi = game.getPlayerByNationId("model.nation.tupi");
         Map map = getTestMap(plains, true);
         game.setMap(map);
 
@@ -470,7 +470,7 @@ public class CombatTest extends FreeColTestCase {
         Game game = ServerTestHelper.startServerGame(getTestMap(plains, true));
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         french.addAbility(new Ability(Ability.INDEPENDENCE_DECLARED));
         ServerPlayer refPlayer = igc.createREFPlayer(french);
 
@@ -546,8 +546,8 @@ public class CombatTest extends FreeColTestCase {
         CombatModel combatModel = game.getCombatModel();
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer inca = (ServerPlayer)game.getPlayer("model.nation.inca");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
         dutch.setStance(inca, Stance.WAR);
         inca.setStance(dutch, Stance.WAR);
 
diff --git a/test/src/net/sf/freecol/common/model/EuropeTest.java b/test/src/net/sf/freecol/common/model/EuropeTest.java
index ef312368b..dbddcfee0 100644
--- a/test/src/net/sf/freecol/common/model/EuropeTest.java
+++ b/test/src/net/sf/freecol/common/model/EuropeTest.java
@@ -31,7 +31,7 @@ public class EuropeTest extends FreeColTestCase {
 
     public void testMissionary() {
         Game game = getGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Europe amsterdam = dutch.getEurope();
 
         Unit colonist = new ServerUnit(game, amsterdam, dutch, colonistType);
diff --git a/test/src/net/sf/freecol/common/model/FoundingFatherTest.java b/test/src/net/sf/freecol/common/model/FoundingFatherTest.java
index 316f31afe..5989fe94d 100644
--- a/test/src/net/sf/freecol/common/model/FoundingFatherTest.java
+++ b/test/src/net/sf/freecol/common/model/FoundingFatherTest.java
@@ -48,7 +48,7 @@ public class FoundingFatherTest extends FreeColTestCase {
 
     public void testFeatures() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         FoundingFather father1 = new FoundingFather("father1", spec());
         father1.setType(FoundingFatherType.TRADE);
@@ -109,7 +109,7 @@ public class FoundingFatherTest extends FreeColTestCase {
         int[] expectedValues = new int[] { 40, 161, 241, 321, 401 };
 
         Game game = getGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         //assertEquals(2, getGame().getGameOptions().getInteger(GameOptions.DIFFICULTY));
         assertEquals(40, spec().getInteger(GameOptions.FOUNDING_FATHER_FACTOR));
 
@@ -132,8 +132,8 @@ public class FoundingFatherTest extends FreeColTestCase {
             }
         }
 
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
         FoundingFather newFather = new FoundingFather("father", spec());
         newFather.setType(FoundingFatherType.TRADE);
 
diff --git a/test/src/net/sf/freecol/common/model/GoodsTest.java b/test/src/net/sf/freecol/common/model/GoodsTest.java
index de08fc810..9ca8a34e8 100644
--- a/test/src/net/sf/freecol/common/model/GoodsTest.java
+++ b/test/src/net/sf/freecol/common/model/GoodsTest.java
@@ -227,7 +227,7 @@ public class GoodsTest extends FreeColTestCase {
     }
 
     public Player dutch(){
-        return getGame().getPlayer("model.nation.dutch");
+        return getGame().getPlayerByNationId("model.nation.dutch");
     }
 
     public void testAdjustAmount() {
diff --git a/test/src/net/sf/freecol/common/model/HighSeasTest.java b/test/src/net/sf/freecol/common/model/HighSeasTest.java
index 76fddb4ba..7f3dc692a 100644
--- a/test/src/net/sf/freecol/common/model/HighSeasTest.java
+++ b/test/src/net/sf/freecol/common/model/HighSeasTest.java
@@ -28,7 +28,7 @@ public class HighSeasTest extends FreeColTestCase {
     public void test() {
 
         Game game = getGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         HighSeas highSeas = dutch.getHighSeas();
         UnitType caravel = spec().getUnitType("model.unit.caravel");
         Unit unit = new ServerUnit(game, highSeas, dutch, caravel);
diff --git a/test/src/net/sf/freecol/common/model/IndividualFatherTest.java b/test/src/net/sf/freecol/common/model/IndividualFatherTest.java
index a3c4f6d75..59b6471a6 100644
--- a/test/src/net/sf/freecol/common/model/IndividualFatherTest.java
+++ b/test/src/net/sf/freecol/common/model/IndividualFatherTest.java
@@ -129,7 +129,7 @@ public class IndividualFatherTest extends FreeColTestCase {
 
     public void testBrebeuf() {
         Game game = getGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         String ability = Ability.EXPERT_MISSIONARY;
 
         assertTrue(jeanDeBrebeuf.hasAbility(ability));
@@ -148,7 +148,7 @@ public class IndividualFatherTest extends FreeColTestCase {
 
     public void testBrewster() {
         Game game = getGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         String ability = Ability.CAN_RECRUIT_UNIT;
         assertTrue(dutch.hasAbility(ability));
@@ -224,8 +224,8 @@ public class IndividualFatherTest extends FreeColTestCase {
 
     public void testDeWitt() {
         Game game = getGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
         dutch.getMarket().setArrears(musketsType, 1);
 
         assertFalse(dutch.canTrade(musketsType, Market.Access.EUROPE));
@@ -284,7 +284,7 @@ public class IndividualFatherTest extends FreeColTestCase {
         Colony colony = getStandardColony();
         Unit unit = colony.getUnitList().get(0);
         Player player = colony.getOwner();
-        Player iroquois = getGame().getPlayer("model.nation.iroquois");
+        Player iroquois = getGame().getPlayerByNationId("model.nation.iroquois");
         Tile colonyCenterTile = colony.getTile();
         Tile disputedTile = colonyCenterTile.getNeighbourOrNull(Direction.N);
         Tile settlementTile = disputedTile.getNeighbourOrNull(Direction.N);
diff --git a/test/src/net/sf/freecol/common/model/LimitTest.java b/test/src/net/sf/freecol/common/model/LimitTest.java
index 97510c8d5..d64f2f413 100644
--- a/test/src/net/sf/freecol/common/model/LimitTest.java
+++ b/test/src/net/sf/freecol/common/model/LimitTest.java
@@ -48,7 +48,7 @@ public class LimitTest extends FreeColTestCase {
     public void testWagonTrainLimit() {
 
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Map map = getTestMap();
         game.setMap(map);
 
@@ -78,7 +78,7 @@ public class LimitTest extends FreeColTestCase {
 
     public void testIndependenceLimits() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Map map = getTestMap();
         game.setMap(map);
 
@@ -145,7 +145,7 @@ public class LimitTest extends FreeColTestCase {
     public void testSuccessionLimits() {
 
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Map map = getTestMap();
         game.setMap(map);
 
diff --git a/test/src/net/sf/freecol/common/model/MapTest.java b/test/src/net/sf/freecol/common/model/MapTest.java
index b35c935ba..5f5d4cd5b 100644
--- a/test/src/net/sf/freecol/common/model/MapTest.java
+++ b/test/src/net/sf/freecol/common/model/MapTest.java
@@ -221,7 +221,7 @@ public class MapTest extends FreeColTestCase {
         builder.settlementTile(settlementTile).build();
 
         // set unit
-        Player dutchPlayer = game.getPlayer("model.nation.dutch");
+        Player dutchPlayer = game.getPlayerByNationId("model.nation.dutch");
         Tile unitTile = map.getTile(1, 11);
         Tile destinationTile = map.getTile(3,7);
         Unit colonist = new ServerUnit(game, unitTile, dutchPlayer,
@@ -242,14 +242,14 @@ public class MapTest extends FreeColTestCase {
         game.setMap(map);
 
         // set obstructing french colony
-        Player frenchPlayer = game.getPlayer("model.nation.french");
+        Player frenchPlayer = game.getPlayerByNationId("model.nation.french");
         Tile settlementTile = map.getTile(2,10);
         FreeColTestUtils.getColonyBuilder().player(frenchPlayer)
             .colonyTile(settlementTile).build();
         assertTrue("French colony was not set properly on the map",
             settlementTile.hasSettlement());
         // set unit
-        Player dutchPlayer = game.getPlayer("model.nation.dutch");
+        Player dutchPlayer = game.getPlayerByNationId("model.nation.dutch");
         Tile unitTile = map.getTile(1, 11);
         Tile destinationTile = map.getTile(3,7);
         Unit colonist = new ServerUnit(game, unitTile, dutchPlayer,
@@ -267,12 +267,12 @@ public class MapTest extends FreeColTestCase {
 
         //Setup
         Tile enemyUnitTile = map.getTile(2,1);
-        Player frenchPlayer = game.getPlayer("model.nation.french");
+        Player frenchPlayer = game.getPlayerByNationId("model.nation.french");
         new ServerUnit(game, enemyUnitTile, frenchPlayer, pioneerType);
 
         Tile unitTile = map.getTile(1, 1);
         Tile otherTile = map.getTile(1, 2);
-        Player dutchPlayer = game.getPlayer("model.nation.dutch");
+        Player dutchPlayer = game.getPlayerByNationId("model.nation.dutch");
         Unit unit = new ServerUnit(game, unitTile, dutchPlayer, pioneerType);
         // unit is going somewhere else
         Tile unitDestination = map.getTile(3, 1);
@@ -299,11 +299,11 @@ public class MapTest extends FreeColTestCase {
 
         // set obstructing unit
         Tile unitObstructionTile = map.getTile(2,10);
-        Player frenchPlayer = game.getPlayer("model.nation.french");
+        Player frenchPlayer = game.getPlayerByNationId("model.nation.french");
         new ServerUnit(game, unitObstructionTile, frenchPlayer, colonistType);
 
         // set unit
-        Player dutchPlayer = game.getPlayer("model.nation.dutch");
+        Player dutchPlayer = game.getPlayerByNationId("model.nation.dutch");
         Tile unitTile = map.getTile(1, 11);
         Tile destinationTile = map.getTile(3,7);
         Unit colonist = new ServerUnit(game, unitTile, dutchPlayer,
@@ -328,7 +328,7 @@ public class MapTest extends FreeColTestCase {
         builder.settlementTile(settlementTile).build();
 
         // set unit
-        Player dutchPlayer = game.getPlayer("model.nation.dutch");
+        Player dutchPlayer = game.getPlayerByNationId("model.nation.dutch");
         Tile unitTile = map.getTile(1, 11);
         Unit colonist = new ServerUnit(game, unitTile, dutchPlayer,
                                        colonistType);
@@ -344,8 +344,8 @@ public class MapTest extends FreeColTestCase {
         Map map = getCoastTestMap(plainsType, true);
         game.setMap(map);
 
-        Player dutchPlayer = game.getPlayer("model.nation.dutch");
-        Player frenchPlayer = game.getPlayer("model.nation.french");
+        Player dutchPlayer = game.getPlayerByNationId("model.nation.dutch");
+        Player frenchPlayer = game.getPlayerByNationId("model.nation.french");
         Tile unitTile = map.getTile(15, 5);
         Tile colonyTile = map.getTile(9, 9); // should be on coast
         Unit galleon = new ServerUnit(game, unitTile, dutchPlayer, galleonType);
@@ -455,7 +455,7 @@ public class MapTest extends FreeColTestCase {
         Map map = getCoastTestMap(plainsType, true);
         game.setMap(map);
 
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Europe europe = dutch.getEurope();
         PathNode path;
 
diff --git a/test/src/net/sf/freecol/common/model/MarketTest.java b/test/src/net/sf/freecol/common/model/MarketTest.java
index 9bbc81cc0..6acdf6c4a 100644
--- a/test/src/net/sf/freecol/common/model/MarketTest.java
+++ b/test/src/net/sf/freecol/common/model/MarketTest.java
@@ -33,7 +33,7 @@ public class MarketTest extends FreeColTestCase {
 
         Game g = getStandardGame();
 
-        Player p = g.getPlayer("model.nation.dutch");
+        Player p = g.getPlayerByNationId("model.nation.dutch");
 
         Market dm = p.getMarket();
 
diff --git a/test/src/net/sf/freecol/common/model/ModelMessageTest.java b/test/src/net/sf/freecol/common/model/ModelMessageTest.java
index 0b023b3e0..93d0c5618 100644
--- a/test/src/net/sf/freecol/common/model/ModelMessageTest.java
+++ b/test/src/net/sf/freecol/common/model/ModelMessageTest.java
@@ -87,7 +87,7 @@ public class ModelMessageTest extends FreeColTestCase {
         Game game = getGame();
         game.setMap(getTestMap(true));
     	
-        Player player = game.getPlayer("model.nation.dutch");
+        Player player = game.getPlayerByNationId("model.nation.dutch");
         String realMessageId = "player"; // Must exist
         String fakeMessageId = "no.such.messageId"; // Must no exist
         ModelMessage mm1 = new ModelMessage(MessageType.WAREHOUSE_CAPACITY,
diff --git a/test/src/net/sf/freecol/common/model/MonarchTest.java b/test/src/net/sf/freecol/common/model/MonarchTest.java
index 65ad7223b..dbdb4c7b1 100644
--- a/test/src/net/sf/freecol/common/model/MonarchTest.java
+++ b/test/src/net/sf/freecol/common/model/MonarchTest.java
@@ -33,7 +33,7 @@ public class MonarchTest extends FreeColTestCase {
 
     public void testSerialize() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         try {
             StringWriter sw = new StringWriter();
@@ -52,7 +52,7 @@ public class MonarchTest extends FreeColTestCase {
     public void testTaxActionChoices() {
         Game game = getStandardGame();
         game.setMap(getTestMap());
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         // grace period has not yet expired
         List<RandomChoice<MonarchAction>> choices
diff --git a/test/src/net/sf/freecol/common/model/MovementTest.java b/test/src/net/sf/freecol/common/model/MovementTest.java
index 1db877020..d530eaf44 100644
--- a/test/src/net/sf/freecol/common/model/MovementTest.java
+++ b/test/src/net/sf/freecol/common/model/MovementTest.java
@@ -65,7 +65,7 @@ public class MovementTest extends FreeColTestCase {
     public void testMoveFromPlainsToPlains() throws Exception {
 
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Map map = getTestMap(plains);
         game.setMap(map);
         Tile tile1 = map.getTile(5, 8);
@@ -94,7 +94,7 @@ public class MovementTest extends FreeColTestCase {
     public void testMoveFromPlainsToHills() throws Exception {
 
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Map map = getTestMap(plains);
         game.setMap(map);
         Tile tile1 = map.getTile(5, 8);
@@ -115,7 +115,7 @@ public class MovementTest extends FreeColTestCase {
     public void testMoveAlongRoad() throws Exception {
 
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Map map = getTestMap(plains);
         game.setMap(map);
         Tile tile1 = map.getTile(5, 8);
@@ -150,7 +150,7 @@ public class MovementTest extends FreeColTestCase {
     public void testMoveAlongRiver() throws Exception {
 
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Map map = getTestMap(plains);
         game.setMap(map);
         Tile tile1 = map.getTile(5, 8);
@@ -211,9 +211,9 @@ public class MovementTest extends FreeColTestCase {
         Map map = getTestMap(true);
         game.setMap(map);
 
-        Player french = game.getPlayer("model.nation.french");
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player iroquois = game.getPlayer("model.nation.iroquois");
+        Player french = game.getPlayerByNationId("model.nation.french");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player iroquois = game.getPlayerByNationId("model.nation.iroquois");
 
         Tile tile1 = map.getTile(5, 8);
         Tile tile2 = map.getTile(4, 8);
@@ -262,9 +262,9 @@ public class MovementTest extends FreeColTestCase {
         Map map = getTestMap(plains);
         game.setMap(map);
 
-        Player french = game.getPlayer("model.nation.french");
-        Player inca = game.getPlayer("model.nation.inca");
-        Player iroquois = game.getPlayer("model.nation.iroquois");
+        Player french = game.getPlayerByNationId("model.nation.french");
+        Player inca = game.getPlayerByNationId("model.nation.inca");
+        Player iroquois = game.getPlayerByNationId("model.nation.iroquois");
 
         Tile tile1 = map.getTile(5, 8);
         Tile tile2 = map.getTile(4, 8);
diff --git a/test/src/net/sf/freecol/common/model/PathfindingTest.java b/test/src/net/sf/freecol/common/model/PathfindingTest.java
index f4f184107..262dc17a8 100644
--- a/test/src/net/sf/freecol/common/model/PathfindingTest.java
+++ b/test/src/net/sf/freecol/common/model/PathfindingTest.java
@@ -47,7 +47,7 @@ public class PathfindingTest extends FreeColTestCase {
         final Game game = getStandardGame();
         final Map map = getCoastTestMap(plainsType, true);
         game.setMap(map);
-        final Player dutch = game.getPlayer("model.nation.dutch");
+        final Player dutch = game.getPlayerByNationId("model.nation.dutch");
         PathNode path;
         GoalDecider gd;
 
diff --git a/test/src/net/sf/freecol/common/model/PlayerTest.java b/test/src/net/sf/freecol/common/model/PlayerTest.java
index 073308bd5..e47c95c69 100644
--- a/test/src/net/sf/freecol/common/model/PlayerTest.java
+++ b/test/src/net/sf/freecol/common/model/PlayerTest.java
@@ -37,8 +37,8 @@ public class PlayerTest extends FreeColTestCase {
 
     public void testUnits() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
         Map map = getTestMap(spec().getTileType("model.tile.plains"));
         game.setMap(map);
         map.getTile(4, 7).setExplored(dutch, true);
@@ -114,10 +114,10 @@ public class PlayerTest extends FreeColTestCase {
         Game game = getStandardGame("classic");
 
         // europeans
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
-        Player english = game.getPlayer("model.nation.english");
-        Player spanish = game.getPlayer("model.nation.spanish");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
+        Player english = game.getPlayerByNationId("model.nation.english");
+        Player spanish = game.getPlayerByNationId("model.nation.spanish");
 
         testEuropeanPlayer(dutch);
         testEuropeanPlayer(french);
@@ -125,14 +125,14 @@ public class PlayerTest extends FreeColTestCase {
         testEuropeanPlayer(spanish);
 
         // indians
-        Player inca = game.getPlayer("model.nation.inca");
-        Player aztec = game.getPlayer("model.nation.aztec");
-        Player arawak = game.getPlayer("model.nation.arawak");
-        Player cherokee = game.getPlayer("model.nation.cherokee");
-        Player iroquois = game.getPlayer("model.nation.iroquois");
-        Player sioux = game.getPlayer("model.nation.sioux");
-        Player apache = game.getPlayer("model.nation.apache");
-        Player tupi = game.getPlayer("model.nation.tupi");
+        Player inca = game.getPlayerByNationId("model.nation.inca");
+        Player aztec = game.getPlayerByNationId("model.nation.aztec");
+        Player arawak = game.getPlayerByNationId("model.nation.arawak");
+        Player cherokee = game.getPlayerByNationId("model.nation.cherokee");
+        Player iroquois = game.getPlayerByNationId("model.nation.iroquois");
+        Player sioux = game.getPlayerByNationId("model.nation.sioux");
+        Player apache = game.getPlayerByNationId("model.nation.apache");
+        Player tupi = game.getPlayerByNationId("model.nation.tupi");
         testIndianPlayer(inca);
         testIndianPlayer(aztec);
         testIndianPlayer(arawak);
@@ -143,10 +143,10 @@ public class PlayerTest extends FreeColTestCase {
         testIndianPlayer(tupi);
 
         // royal
-        Player dutchREF = game.getPlayer("model.nation.dutchREF");
-        Player frenchREF = game.getPlayer("model.nation.frenchREF");
-        Player englishREF = game.getPlayer("model.nation.englishREF");
-        Player spanishREF = game.getPlayer("model.nation.spanishREF");
+        Player dutchREF = game.getPlayerByNationId("model.nation.dutchREF");
+        Player frenchREF = game.getPlayerByNationId("model.nation.frenchREF");
+        Player englishREF = game.getPlayerByNationId("model.nation.englishREF");
+        Player spanishREF = game.getPlayerByNationId("model.nation.spanishREF");
         testRoyalPlayer(dutchREF);
         testRoyalPlayer(frenchREF);
         testRoyalPlayer(englishREF);
@@ -179,14 +179,14 @@ public class PlayerTest extends FreeColTestCase {
         }
 
         // europeans
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
-        Player english = game.getPlayer("model.nation.english");
-        Player spanish = game.getPlayer("model.nation.spanish");
-        Player portuguese = game.getPlayer("model.nation.portuguese");
-        Player swedish = game.getPlayer("model.nation.swedish");
-        Player danish = game.getPlayer("model.nation.danish");
-        Player russian = game.getPlayer("model.nation.russian");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
+        Player english = game.getPlayerByNationId("model.nation.english");
+        Player spanish = game.getPlayerByNationId("model.nation.spanish");
+        Player portuguese = game.getPlayerByNationId("model.nation.portuguese");
+        Player swedish = game.getPlayerByNationId("model.nation.swedish");
+        Player danish = game.getPlayerByNationId("model.nation.danish");
+        Player russian = game.getPlayerByNationId("model.nation.russian");
 
         testEuropeanPlayer(dutch);
         testEuropeanPlayer(french);
@@ -198,14 +198,14 @@ public class PlayerTest extends FreeColTestCase {
         testEuropeanPlayer(russian);
 
         // indians
-        Player inca = game.getPlayer("model.nation.inca");
-        Player aztec = game.getPlayer("model.nation.aztec");
-        Player arawak = game.getPlayer("model.nation.arawak");
-        Player cherokee = game.getPlayer("model.nation.cherokee");
-        Player iroquois = game.getPlayer("model.nation.iroquois");
-        Player sioux = game.getPlayer("model.nation.sioux");
-        Player apache = game.getPlayer("model.nation.apache");
-        Player tupi = game.getPlayer("model.nation.tupi");
+        Player inca = game.getPlayerByNationId("model.nation.inca");
+        Player aztec = game.getPlayerByNationId("model.nation.aztec");
+        Player arawak = game.getPlayerByNationId("model.nation.arawak");
+        Player cherokee = game.getPlayerByNationId("model.nation.cherokee");
+        Player iroquois = game.getPlayerByNationId("model.nation.iroquois");
+        Player sioux = game.getPlayerByNationId("model.nation.sioux");
+        Player apache = game.getPlayerByNationId("model.nation.apache");
+        Player tupi = game.getPlayerByNationId("model.nation.tupi");
         testIndianPlayer(inca);
         testIndianPlayer(aztec);
         testIndianPlayer(arawak);
@@ -216,14 +216,14 @@ public class PlayerTest extends FreeColTestCase {
         testIndianPlayer(tupi);
 
         // royal
-        Player dutchREF = game.getPlayer("model.nation.dutchREF");
-        Player frenchREF = game.getPlayer("model.nation.frenchREF");
-        Player englishREF = game.getPlayer("model.nation.englishREF");
-        Player spanishREF = game.getPlayer("model.nation.spanishREF");
-        Player portugueseREF = game.getPlayer("model.nation.portugueseREF");
-        Player swedishREF = game.getPlayer("model.nation.swedishREF");
-        Player danishREF = game.getPlayer("model.nation.danishREF");
-        Player russianREF = game.getPlayer("model.nation.russianREF");
+        Player dutchREF = game.getPlayerByNationId("model.nation.dutchREF");
+        Player frenchREF = game.getPlayerByNationId("model.nation.frenchREF");
+        Player englishREF = game.getPlayerByNationId("model.nation.englishREF");
+        Player spanishREF = game.getPlayerByNationId("model.nation.spanishREF");
+        Player portugueseREF = game.getPlayerByNationId("model.nation.portugueseREF");
+        Player swedishREF = game.getPlayerByNationId("model.nation.swedishREF");
+        Player danishREF = game.getPlayerByNationId("model.nation.danishREF");
+        Player russianREF = game.getPlayerByNationId("model.nation.russianREF");
         testRoyalPlayer(dutchREF);
         testRoyalPlayer(frenchREF);
         testRoyalPlayer(englishREF);
@@ -246,8 +246,8 @@ public class PlayerTest extends FreeColTestCase {
         String errMsg = "";
         Game game = getStandardGame();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
 
         int initialTension = 500;
         int change = 250;
@@ -271,8 +271,8 @@ public class PlayerTest extends FreeColTestCase {
         Map map = getTestMap();
         game.setMap(map);
 
-        Player dutch =  game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
+        Player dutch =  game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
 
         assertEquals("Wrong number of units for dutch player",0,dutch.getUnits().size());
         assertEquals("Wrong number of units for french player",0,french.getUnits().size());
diff --git a/test/src/net/sf/freecol/common/model/RoleTest.java b/test/src/net/sf/freecol/common/model/RoleTest.java
index f58b86f8c..0a201380f 100644
--- a/test/src/net/sf/freecol/common/model/RoleTest.java
+++ b/test/src/net/sf/freecol/common/model/RoleTest.java
@@ -148,7 +148,7 @@ public class RoleTest extends FreeColTestCase {
         expectedRoles.add(soldier);
         expectedRoles.add(scout);
         List<Role> colonialRoles
-            = Role.getAvailableRoles(game.getPlayer("model.nation.dutch"),
+            = Role.getAvailableRoles(game.getPlayerByNationId("model.nation.dutch"),
                                      colonistType, military);
         assertTrue(expectedRoles.equals(colonialRoles));
 
@@ -156,7 +156,7 @@ public class RoleTest extends FreeColTestCase {
         expectedRoles.add(cavalry);
         expectedRoles.add(infantry);
         List<Role> royalRoles
-            = Role.getAvailableRoles(game.getPlayer("model.nation.dutchREF"),
+            = Role.getAvailableRoles(game.getPlayerByNationId("model.nation.dutchREF"),
                                      kingsRegularType, military);
         assertTrue(expectedRoles.equals(royalRoles));
 
@@ -165,7 +165,7 @@ public class RoleTest extends FreeColTestCase {
         expectedRoles.add(armedBrave);
         expectedRoles.add(mountedBrave);
         List<Role> nativeRoles
-            = Role.getAvailableRoles(game.getPlayer("model.nation.inca"),
+            = Role.getAvailableRoles(game.getPlayerByNationId("model.nation.inca"),
                                      braveType, military);
         assertTrue(expectedRoles.equals(nativeRoles));
     }
diff --git a/test/src/net/sf/freecol/common/model/ScopeTest.java b/test/src/net/sf/freecol/common/model/ScopeTest.java
index 8a0598c9f..1c84d959f 100644
--- a/test/src/net/sf/freecol/common/model/ScopeTest.java
+++ b/test/src/net/sf/freecol/common/model/ScopeTest.java
@@ -203,7 +203,7 @@ public class ScopeTest extends FreeColTestCase {
 
     public void testGameObjects() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Map map = getTestMap();
         game.setMap(map);
 
diff --git a/test/src/net/sf/freecol/common/model/SerializationTest.java b/test/src/net/sf/freecol/common/model/SerializationTest.java
index cf597271b..e7ca6465e 100644
--- a/test/src/net/sf/freecol/common/model/SerializationTest.java
+++ b/test/src/net/sf/freecol/common/model/SerializationTest.java
@@ -87,7 +87,7 @@ public class SerializationTest extends FreeColTestCase {
         Game game = ServerTestHelper.startServerGame(getTestMap(true));
 
         Colony colony = getStandardColony(6);
-        Player player = game.getPlayer("model.nation.dutch");
+        Player player = game.getPlayerByNationId("model.nation.dutch");
 
         ServerTestHelper.newTurn();
         ServerTestHelper.newTurn();
@@ -138,7 +138,7 @@ public class SerializationTest extends FreeColTestCase {
             .addStringTemplate("%goods%", t1);
 
         Game game = getGame();
-        Player player = game.getPlayer("model.nation.dutch");
+        Player player = game.getPlayerByNationId("model.nation.dutch");
 
         try {
             Validator validator = buildValidator("schema/data/data-stringTemplate.xsd");
diff --git a/test/src/net/sf/freecol/common/model/SettlementTest.java b/test/src/net/sf/freecol/common/model/SettlementTest.java
index a11b7d96d..bee5cfd14 100644
--- a/test/src/net/sf/freecol/common/model/SettlementTest.java
+++ b/test/src/net/sf/freecol/common/model/SettlementTest.java
@@ -52,7 +52,7 @@ public class SettlementTest extends FreeColTestCase {
         FreeColTestCase.IndianSettlementBuilder builder =
             new FreeColTestCase.IndianSettlementBuilder(game);
 
-        Player arawak = game.getPlayer("model.nation.arawak");
+        Player arawak = game.getPlayerByNationId("model.nation.arawak");
         builder.player(arawak);
         IndianSettlement settlement = builder.build();
         assertEquals(1, arawak.getNationType().getSettlementType(false).getClaimableRadius());
@@ -65,7 +65,7 @@ public class SettlementTest extends FreeColTestCase {
         assertEquals(2, settlement.getType().getClaimableRadius());
         settlement.dispose();
 
-        Player inca = game.getPlayer("model.nation.inca");
+        Player inca = game.getPlayerByNationId("model.nation.inca");
         builder.player(inca);
         builder.capital(false);
         settlement = builder.build();
@@ -186,7 +186,7 @@ public class SettlementTest extends FreeColTestCase {
         assertNull(colony.canImproveUnitMilitaryRole(colonist));
 
         // Repeat previous tests for natives
-        Player arawak = game.getPlayer("model.nation.arawak");
+        Player arawak = game.getPlayerByNationId("model.nation.arawak");
         FreeColTestCase.IndianSettlementBuilder builder
             = new FreeColTestCase.IndianSettlementBuilder(game)
             .player(arawak).initialBravesInCamp(4);
diff --git a/test/src/net/sf/freecol/common/model/TileTest.java b/test/src/net/sf/freecol/common/model/TileTest.java
index d6ec5c54f..247c1878c 100644
--- a/test/src/net/sf/freecol/common/model/TileTest.java
+++ b/test/src/net/sf/freecol/common/model/TileTest.java
@@ -752,7 +752,7 @@ public class TileTest extends FreeColTestCase {
         Map map = getCoastTestMap(plains, true);
         game.setMap(map);
 
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Tile settlementTile = map.getTile(9, 2);
         FreeColTestUtils.getColonyBuilder().player(dutch)
             .colonyTile(settlementTile).build();
diff --git a/test/src/net/sf/freecol/common/model/UnitTest.java b/test/src/net/sf/freecol/common/model/UnitTest.java
index d29a3221e..2d85f8e04 100644
--- a/test/src/net/sf/freecol/common/model/UnitTest.java
+++ b/test/src/net/sf/freecol/common/model/UnitTest.java
@@ -104,8 +104,8 @@ public class UnitTest extends FreeColTestCase {
      */
     public void testIsColonist() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player sioux = game.getPlayer("model.nation.sioux");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player sioux = game.getPlayerByNationId("model.nation.sioux");
         Map map = getTestMap(plains, true);
         game.setMap(map);
 
@@ -124,7 +124,7 @@ public class UnitTest extends FreeColTestCase {
 
     public void testCanAdd() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         Unit galleon = new ServerUnit(game, null, dutch, galleonType);
         Unit caravel = new ServerUnit(game, null, dutch, caravelType);
@@ -181,7 +181,7 @@ public class UnitTest extends FreeColTestCase {
         assertEquals("Setup error, colony does goods quantity wrong",
                      foodInColony, colony.getGoodsCount(foodType));
 
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Unit wagonTrain = new ServerUnit(game, colony.getTile(), dutch, 
                                          wagonType);
         assertEquals("Setup error, unit should not carry anything", 0,
@@ -204,8 +204,8 @@ public class UnitTest extends FreeColTestCase {
         Game game = getStandardGame();
         Map map = getTestMap(plains, true);
         game.setMap(map);
-        Player sioux = game.getPlayer("model.nation.sioux");
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player sioux = game.getPlayerByNationId("model.nation.sioux");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Tile tile = map.getTile(6, 9);
 
         Colony colony = getStandardColony(3);
@@ -242,7 +242,7 @@ public class UnitTest extends FreeColTestCase {
         final Map map = getTestMap(plains, true);
         game.setMap(map);
 
-        Player player = game.getPlayer("model.nation.dutch");
+        Player player = game.getPlayerByNationId("model.nation.dutch");
         Tile tile = map.getTile(6, 9);
         Unit frigate = new ServerUnit(game, tile, player, frigateType);
 
@@ -271,8 +271,8 @@ public class UnitTest extends FreeColTestCase {
 
     public void testUnitCanBuildColony() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player sioux = game.getPlayer("model.nation.sioux");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player sioux = game.getPlayerByNationId("model.nation.sioux");
 
         Map map = getTestMap(plains, true);
         game.setMap(map);
@@ -306,7 +306,7 @@ public class UnitTest extends FreeColTestCase {
         Map map = getTestMap();
         game.setMap(map);
 
-        Player indianPlayer = game.getPlayer("model.nation.sioux");
+        Player indianPlayer = game.getPlayerByNationId("model.nation.sioux");
         FreeColTestCase.IndianSettlementBuilder builder
             = new FreeColTestCase.IndianSettlementBuilder(game)
             .player(indianPlayer);
@@ -335,9 +335,9 @@ public class UnitTest extends FreeColTestCase {
 
     public void testUnitAvailability() {
         Game game = getStandardGame();
-        Player indian = game.getPlayer("model.nation.sioux");
-        Player european = game.getPlayer("model.nation.dutch");
-        Player king = game.getPlayer("model.nation.dutchREF");
+        Player indian = game.getPlayerByNationId("model.nation.sioux");
+        Player european = game.getPlayerByNationId("model.nation.dutch");
+        Player king = game.getPlayerByNationId("model.nation.dutchREF");
 
         assertTrue(kingsRegularType.isAvailableTo(king));
         assertFalse(kingsRegularType.isAvailableTo(indian));
@@ -363,7 +363,7 @@ public class UnitTest extends FreeColTestCase {
         Game game = getStandardGame();
         Map map = getTestMap();
         game.setMap(map);
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         Tile colonyTile = map.getTile(6, 8);
 
@@ -410,7 +410,7 @@ public class UnitTest extends FreeColTestCase {
         Map map = getTestMap();
         game.setMap(map);
 
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         Unit colonist = new ServerUnit(game, map.getTile(6, 8), dutch,
                                        colonistType);
@@ -434,8 +434,8 @@ public class UnitTest extends FreeColTestCase {
         Map map = getTestMap();
         game.setMap(map);
 
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
 
         Unit colonist = new ServerUnit(game, map.getTile(6, 8), dutch,
                                        colonistType);
@@ -461,8 +461,8 @@ public class UnitTest extends FreeColTestCase {
         Map map = getTestMap(ocean);
         game.setMap(map);
 
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player french = game.getPlayer("model.nation.french");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player french = game.getPlayerByNationId("model.nation.french");
 
         Unit galleon = new ServerUnit(game, map.getTile(6, 8), dutch,
                                       galleonType);
@@ -524,7 +524,7 @@ public class UnitTest extends FreeColTestCase {
 
     public void testTreasureTransportFee() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         Unit treasureTrain = new ServerUnit(game, null, dutch,
                                             treasureTrainType);
@@ -559,7 +559,7 @@ public class UnitTest extends FreeColTestCase {
 
     public void testCopy() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Map map = getTestMap(plains, true);
         game.setMap(map);
 
@@ -590,7 +590,7 @@ public class UnitTest extends FreeColTestCase {
 
     public void testElement() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Map map = getTestMap(plains, true);
         game.setMap(map);
 
diff --git a/test/src/net/sf/freecol/common/model/UnitTypeChangeTest.java b/test/src/net/sf/freecol/common/model/UnitTypeChangeTest.java
index 23097378f..3352a1bdb 100644
--- a/test/src/net/sf/freecol/common/model/UnitTypeChangeTest.java
+++ b/test/src/net/sf/freecol/common/model/UnitTypeChangeTest.java
@@ -48,8 +48,8 @@ public class UnitTypeChangeTest extends FreeColTestCase {
 
     public void testAbilityScope() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
-        Player inca = game.getPlayer("model.nation.inca");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
+        Player inca = game.getPlayerByNationId("model.nation.inca");
 
         UnitType gardener = new UnitType("gardener", spec());
 
@@ -84,7 +84,7 @@ public class UnitTypeChangeTest extends FreeColTestCase {
 
     public void testCreation() {
         Game game = getStandardGame();
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
 
         UnitType gardener = new UnitType("gardener", spec());
 
diff --git a/test/src/net/sf/freecol/server/ai/ColonyPlanTest.java b/test/src/net/sf/freecol/server/ai/ColonyPlanTest.java
index 6e3cc2f15..90c52e0df 100644
--- a/test/src/net/sf/freecol/server/ai/ColonyPlanTest.java
+++ b/test/src/net/sf/freecol/server/ai/ColonyPlanTest.java
@@ -278,7 +278,7 @@ public class ColonyPlanTest extends FreeColTestCase {
 
         Colony colony = getStandardColony();
         game.setCurrentPlayer(colony.getOwner());
-        Player dutch = getGame().getPlayer("model.nation.dutch");
+        Player dutch = getGame().getPlayerByNationId("model.nation.dutch");
         List<Unit> units = new ArrayList<>();
         Unit servant = new ServerUnit(getGame(), colony.getTile(),
                                       dutch, servantType);
diff --git a/test/src/net/sf/freecol/server/ai/ContactTest.java b/test/src/net/sf/freecol/server/ai/ContactTest.java
index 858f5bd4e..cb3b72ab9 100644
--- a/test/src/net/sf/freecol/server/ai/ContactTest.java
+++ b/test/src/net/sf/freecol/server/ai/ContactTest.java
@@ -95,8 +95,8 @@ public class ContactTest extends FreeColTestCase {
         Map map = game.getMap();
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
-        ServerPlayer iroquois = (ServerPlayer) game.getPlayer("model.nation.iroquois");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer iroquois = (ServerPlayer) game.getPlayerByNationId("model.nation.iroquois");
         Tile tile1 = map.getTile(6, 8);
         tile1.setExplored(dutch, true);
         Tile tile2 = map.getTile(5, 8);
@@ -160,8 +160,8 @@ public class ContactTest extends FreeColTestCase {
         Map map = game.getMap();
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
-        ServerPlayer iroquois = (ServerPlayer) game.getPlayer("model.nation.iroquois");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer iroquois = (ServerPlayer) game.getPlayerByNationId("model.nation.iroquois");
         Tile tile1 = map.getTile(5, 8);
         tile1.setExplored(dutch, true);
         Tile tile2 = map.getTile(4, 8);
@@ -193,8 +193,8 @@ public class ContactTest extends FreeColTestCase {
         Map map = game.getMap();
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer apache = (ServerPlayer) game.getPlayer("model.nation.apache");
-        ServerPlayer french = (ServerPlayer) game.getPlayer("model.nation.french");
+        ServerPlayer apache = (ServerPlayer) game.getPlayerByNationId("model.nation.apache");
+        ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
         Tile tile1 = map.getTile(5, 8);
         tile1.setExplored(french, true);
         Tile tile2 = map.getTile(4, 8);
@@ -223,8 +223,8 @@ public class ContactTest extends FreeColTestCase {
         Map map = game.getMap();
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer apache = (ServerPlayer) game.getPlayer("model.nation.apache");
-        ServerPlayer iroquois = (ServerPlayer) game.getPlayer("model.nation.iroquois");
+        ServerPlayer apache = (ServerPlayer) game.getPlayerByNationId("model.nation.apache");
+        ServerPlayer iroquois = (ServerPlayer) game.getPlayerByNationId("model.nation.iroquois");
         Tile tile1 = map.getTile(5, 8);
         Tile tile2 = map.getTile(4, 8);
         Tile tile3 = map.getTile(3, 8);
@@ -250,8 +250,8 @@ public class ContactTest extends FreeColTestCase {
         Map map = game.getMap();
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer apache = (ServerPlayer) game.getPlayer("model.nation.apache");
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer apache = (ServerPlayer) game.getPlayerByNationId("model.nation.apache");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
         Tile tile1 = map.getTile(5, 8);
         tile1.setExplored(dutch, true);
         Tile tile2 = map.getTile(4, 8);
@@ -278,8 +278,8 @@ public class ContactTest extends FreeColTestCase {
         Map map = game.getMap();
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer apache = (ServerPlayer) game.getPlayer("model.nation.apache");
-        ServerPlayer iroquois = (ServerPlayer) game.getPlayer("model.nation.iroquois");
+        ServerPlayer apache = (ServerPlayer) game.getPlayerByNationId("model.nation.apache");
+        ServerPlayer iroquois = (ServerPlayer) game.getPlayerByNationId("model.nation.iroquois");
         Tile tile1 = map.getTile(5, 8);
         Tile tile2 = map.getTile(4, 8);
         Tile tile3 = map.getTile(3, 8);
@@ -306,8 +306,8 @@ public class ContactTest extends FreeColTestCase {
         Map map = game.getMap();
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer) game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
         Tile tile1 = map.getTile(5, 8);
         tile1.setExplored(dutch, true);
         tile1.setExplored(french, true);
diff --git a/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java b/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java
index bab9bbb2c..4b45e7bdc 100644
--- a/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java
+++ b/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java
@@ -83,7 +83,7 @@ public class MissionAssignmentTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
 
         // Create attacking player and units
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
         EuropeanAIPlayer aiDutch = (EuropeanAIPlayer)aiMain.getAIPlayer(dutch);
 
         Tile tile1 = map.getTile(2, 2);
@@ -95,7 +95,7 @@ public class MissionAssignmentTest extends FreeColTestCase {
         assertNotNull(aiUnit);
 
         // Create defending player and unit
-        ServerPlayer french = (ServerPlayer) game.getPlayer("model.nation.french");
+        ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
 
         Tile tile3 = map.getTile(1, 2);
         Unit enemyColonist = new ServerUnit(game, tile3, french, colonistType);
@@ -127,9 +127,9 @@ public class MissionAssignmentTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
 
         // Create player and unit
-        ServerPlayer incaPlayer = (ServerPlayer) game.getPlayer("model.nation.inca");
+        ServerPlayer incaPlayer = (ServerPlayer) game.getPlayerByNationId("model.nation.inca");
         NativeAIPlayer aiInca = (NativeAIPlayer)aiMain.getAIPlayer(incaPlayer);
-        ServerPlayer dutchPlayer = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer dutchPlayer = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
 
         Tile dutchUnitTile = map.getTile(9, 9);
         Tile braveUnitTile = map.getTile(9, 8);;
@@ -155,7 +155,7 @@ public class MissionAssignmentTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
 
         // Create player and unit
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
         EuropeanAIPlayer aiDutch = (EuropeanAIPlayer)aiMain.getAIPlayer(dutch);
 
         Tile tile1 = map.getTile(2, 2);
@@ -186,9 +186,9 @@ public class MissionAssignmentTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
 
         // Create player and unit
-        ServerPlayer inca = (ServerPlayer) game.getPlayer("model.nation.inca");
+        ServerPlayer inca = (ServerPlayer) game.getPlayerByNationId("model.nation.inca");
         NativeAIPlayer aiInca = (NativeAIPlayer)aiMain.getAIPlayer(inca);
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
 
         Tile settlementTile = map.getTile(9, 9);
         Tile adjacentTile = settlementTile.getNeighbourOrNull(Direction.N);
@@ -263,9 +263,9 @@ public class MissionAssignmentTest extends FreeColTestCase {
         InGameController igc = ServerTestHelper.getInGameController();
 
         // Create player and unit
-        ServerPlayer inca = (ServerPlayer) game.getPlayer("model.nation.inca");
+        ServerPlayer inca = (ServerPlayer) game.getPlayerByNationId("model.nation.inca");
         NativeAIPlayer aiInca = (NativeAIPlayer)aiMain.getAIPlayer(inca);
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
 
         Tile settlementTile = map.getTile(9, 9);
         Tile seaTile = map.getTile(10, 9);
diff --git a/test/src/net/sf/freecol/server/ai/REFTest.java b/test/src/net/sf/freecol/server/ai/REFTest.java
index f97421fb0..bed87d248 100644
--- a/test/src/net/sf/freecol/server/ai/REFTest.java
+++ b/test/src/net/sf/freecol/server/ai/REFTest.java
@@ -52,7 +52,7 @@ public class REFTest extends FreeColTestCase {
         InGameController igc = ServerTestHelper.getInGameController();
 
         // Create player
-        ServerPlayer player1 = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer player1 = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
         List<AbstractUnit> refUnitsBeforeIndependence = player1.getMonarch()
             .getExpeditionaryForce().getUnits();
         int soldiersBeforeIndependence = 0;
diff --git a/test/src/net/sf/freecol/server/ai/TensionTest.java b/test/src/net/sf/freecol/server/ai/TensionTest.java
index ac7ac508d..fa450aebf 100644
--- a/test/src/net/sf/freecol/server/ai/TensionTest.java
+++ b/test/src/net/sf/freecol/server/ai/TensionTest.java
@@ -57,8 +57,8 @@ public class TensionTest extends FreeColTestCase {
         InGameController igc = ServerTestHelper.getInGameController();
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
 
-        ServerPlayer european = (ServerPlayer) game.getPlayer("model.nation.dutch");
-        ServerPlayer indian = (ServerPlayer) game.getPlayer("model.nation.tupi");
+        ServerPlayer european = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer indian = (ServerPlayer) game.getPlayerByNationId("model.nation.tupi");
         NativeAIPlayer indianAI = (NativeAIPlayer)aiMain.getAIPlayer(indian);
 
         // initially, the players are unknown to each other
diff --git a/test/src/net/sf/freecol/server/ai/mission/PioneeringMissionTest.java b/test/src/net/sf/freecol/server/ai/mission/PioneeringMissionTest.java
index 1a9fb8f63..5ac16d9e2 100644
--- a/test/src/net/sf/freecol/server/ai/mission/PioneeringMissionTest.java
+++ b/test/src/net/sf/freecol/server/ai/mission/PioneeringMissionTest.java
@@ -69,7 +69,7 @@ public class PioneeringMissionTest extends FreeColTestCase {
 
         // Get player, colony and unit
         final ServerPlayer player
-            = (ServerPlayer)game.getPlayer("model.nation.dutch");
+            = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         final EuropeanAIPlayer aiPlayer
             = (EuropeanAIPlayer)aiMain.getAIPlayer(player);
         final Colony colony = getStandardColony();
diff --git a/test/src/net/sf/freecol/server/ai/mission/PrivateerMissionTest.java b/test/src/net/sf/freecol/server/ai/mission/PrivateerMissionTest.java
index cfc496739..2dd502684 100644
--- a/test/src/net/sf/freecol/server/ai/mission/PrivateerMissionTest.java
+++ b/test/src/net/sf/freecol/server/ai/mission/PrivateerMissionTest.java
@@ -60,8 +60,8 @@ public class PrivateerMissionTest extends FreeColTestCase {
         Map map = game.getMap();
 
         // Create player and unit
-        ServerPlayer french = (ServerPlayer) game.getPlayer("model.nation.french");
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
 
         Tile colonyTile = map.getTile(9, 9);
         Tile privateerTile = map.getTile(10, 9);
diff --git a/test/src/net/sf/freecol/server/ai/mission/ScoutingMissionTest.java b/test/src/net/sf/freecol/server/ai/mission/ScoutingMissionTest.java
index 2fe0afd81..fee6ed779 100644
--- a/test/src/net/sf/freecol/server/ai/mission/ScoutingMissionTest.java
+++ b/test/src/net/sf/freecol/server/ai/mission/ScoutingMissionTest.java
@@ -62,8 +62,8 @@ public class ScoutingMissionTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
 
         // Create players, settlement and unit
-        ServerPlayer inca = (ServerPlayer)game.getPlayer("model.nation.inca");
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         dutch.exploreMap(true);
 
         Tile settlementTile = map.getTile(2, 1);
diff --git a/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java b/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java
index df30f76a7..cce0d4919 100644
--- a/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java
+++ b/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java
@@ -83,7 +83,7 @@ public class TransportMissionTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
         assertNotNull(aiMain);
 
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
         AIPlayer aiPlayer = aiMain.getAIPlayer(dutch);
 
         // Create a ship at sea carrying a colonist
@@ -99,7 +99,7 @@ public class TransportMissionTest extends FreeColTestCase {
         assertTrue(colonist.getLocation()==galleon);
 
         // Create the attacker, also at sea
-        ServerPlayer french = (ServerPlayer) game.getPlayer("model.nation.french");
+        ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
         Tile tile2 = map.getTile(11, 9);
         Unit privateer = new ServerUnit(game, tile2, french, privateerType);
 
@@ -129,7 +129,7 @@ public class TransportMissionTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
         assertNotNull(aiMain);
 
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
         dutch.exploreMap(true);
         
         // create a ship carrying a colonist
@@ -162,7 +162,7 @@ public class TransportMissionTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
         assertNotNull(aiMain);
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         dutch.exploreMap(true);
         Europe europe = dutch.getEurope();
         assertNotNull("Setup error, europe is null", europe);
@@ -200,7 +200,7 @@ public class TransportMissionTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
         assertNotNull(aiMain);
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Europe europe = dutch.getEurope();
         assertNotNull("Setup error, europe is null", europe);
 
@@ -239,7 +239,7 @@ public class TransportMissionTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
         assertNotNull(aiMain);
 
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
         dutch.exploreMap(true);
         Europe europe = dutch.getEurope();
         assertNotNull("Setup error, europe is null", europe);
diff --git a/test/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMissionTest.java b/test/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMissionTest.java
index 05c0e498f..6a73481d8 100644
--- a/test/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMissionTest.java
+++ b/test/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMissionTest.java
@@ -57,7 +57,7 @@ public class UnitSeekAndDestroyMissionTest extends FreeColTestCase {
 
         // Create attacking player and unit
         ServerPlayer player1
-            = (ServerPlayer)game.getPlayer("model.nation.dutch");
+            = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Tile tile1 = map.getTile(2, 2);
         Unit attacker = new ServerUnit(game, tile1, player1, veteranType);
         AIUnit aiUnit = aiMain.getAIUnit(attacker);
@@ -65,7 +65,7 @@ public class UnitSeekAndDestroyMissionTest extends FreeColTestCase {
 
         // Create defending player and unit
         ServerPlayer player2
-            = (ServerPlayer)game.getPlayer("model.nation.french");
+            = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         Tile tile2 = map.getTile(2, 1);
         Role soldierRole = spec().getRole("model.role.soldier");
         Unit defender = new ServerUnit(game, tile2, player2,
@@ -96,14 +96,14 @@ public class UnitSeekAndDestroyMissionTest extends FreeColTestCase {
         AIMain aiMain = ServerTestHelper.getServer().getAIMain();
 
         // Create attacking player and unit
-        ServerPlayer player1 = (ServerPlayer) game.getPlayer("model.nation.dutch");
+        ServerPlayer player1 = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
         Tile tile1 = map.getTile(2, 2);
         Unit attacker = new ServerUnit(game, tile1, player1, veteranType);
         AIUnit aiUnit = aiMain.getAIUnit(attacker);
         assertNotNull(aiUnit);
 
         // Create defending player and unit
-        ServerPlayer player2 = (ServerPlayer) game.getPlayer("model.nation.french");
+        ServerPlayer player2 = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
         Tile defenderTile = map.getTile(2, 1);
         Role soldierRole = spec().getRole("model.role.soldier");
         Unit defender = new ServerUnit(game, defenderTile, player2, veteranType, soldierRole);
diff --git a/test/src/net/sf/freecol/server/control/InGameControllerTest.java b/test/src/net/sf/freecol/server/control/InGameControllerTest.java
index 95cc147eb..d2059d134 100644
--- a/test/src/net/sf/freecol/server/control/InGameControllerTest.java
+++ b/test/src/net/sf/freecol/server/control/InGameControllerTest.java
@@ -223,8 +223,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final InGameController igc = ServerTestHelper.getInGameController();
 
         // Setup
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         int initialTensionValue = 500;
         dutch.setStance(french, Stance.PEACE);
         french.setStance(dutch, Stance.PEACE);
@@ -269,8 +269,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Game game = ServerTestHelper.startServerGame(getTestMap());
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         FreeColTestCase.IndianSettlementBuilder builder
             = new FreeColTestCase.IndianSettlementBuilder(game);
         ServerIndianSettlement camp = (ServerIndianSettlement)builder.build();
@@ -307,7 +307,7 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Tile tile = map.getTile(1, 1);
         Unit privateer = new ServerUnit(game, tile, dutch, privateerType);
         assertEquals("Privateer should not carry anything",
@@ -341,7 +341,7 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Tile tile = map.getTile(10, 4);
         Unit ship = new ServerUnit(game, tile, dutch, galleonType);
         Unit treasure = new ServerUnit(game, tile, dutch, treasureTrainType);
@@ -408,7 +408,7 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Tile landTile = map.getTile(9, 9);
         Tile seaTile = map.getTile(10, 9);
         ServerUnit colonist = new ServerUnit(game, landTile, dutch, colonistType);
@@ -449,7 +449,7 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Unit unit = new ServerUnit(game, map.getTile(5, 8), dutch,
                                    hardyPioneerType);
         assertTrue("Unit should be a hardy pioneer",
@@ -486,8 +486,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(french, Stance.WAR, dutch, true);
         assertEquals("Dutch should be at war with french",
                      dutch.getStance(french), Stance.WAR);
@@ -541,8 +541,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(french, Stance.WAR, dutch, true);
 
         dutch.addAbility(new Ability(Ability.INDEPENDENCE_DECLARED));
@@ -610,8 +610,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(french, Stance.WAR, dutch, true);
         Colony colony = getStandardColony();
 
@@ -727,8 +727,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer inca = (ServerPlayer)game.getPlayer("model.nation.inca");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
         igc.changeStance(dutch, Stance.WAR, inca, true);
         Colony colony = getStandardColony(1, 5, 8);
 
@@ -943,8 +943,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer inca = (ServerPlayer)game.getPlayer("model.nation.inca");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
         igc.changeStance(dutch, Stance.WAR, inca, true);
         Colony colony = getStandardColony();
 
@@ -990,8 +990,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         Tile tile1 = map.getTile(5, 8);
         tile1.setExplored(dutch, true);
         tile1.setExplored(french, true);
@@ -1018,8 +1018,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
         
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(dutch, Stance.WAR, french, true);
 
         Tile tile1 = map.getTile(5, 8);
@@ -1051,8 +1051,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(dutch, Stance.WAR, french, true);
 
         // UnitType promotion
@@ -1165,8 +1165,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(dutch, Stance.WAR, french, true);
 
         Tile tile1 = map.getTile(5, 8);
@@ -1206,8 +1206,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(dutch, Stance.WAR, french, true);
 
         Tile tile1 = map.getTile(5, 8);
@@ -1256,8 +1256,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(dutch, Stance.WAR, french, true);
 
         Tile tile1 = map.getTile(5, 8);
@@ -1333,8 +1333,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer inca = (ServerPlayer)game.getPlayer("model.nation.inca");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
         igc.changeStance(dutch, Stance.WAR, inca, true);
 
         Tile tile1 = map.getTile(5, 8);
@@ -1415,8 +1415,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(dutch, Stance.WAR, french, true);
 
         Tile tile1 = map.getTile(5, 8);
@@ -1447,8 +1447,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(dutch, Stance.WAR, french, true);
 
         Tile tile1 = map.getTile(5, 8);
@@ -1500,8 +1500,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         igc.changeStance(dutch, Stance.WAR, french, true);
 
         Tile tile1 = map.getTile(5, 8);
@@ -1544,8 +1544,8 @@ public class InGameControllerTest extends FreeColTestCase {
     private void setPlayersAt(Stance stance,Tension tension) {
         final Game game = getGame();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
 
         // Setup
         dutch.setStance(french, stance);
@@ -1591,8 +1591,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Game game = ServerTestHelper.startServerGame(getTestMap());
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         Tension hateful = new Tension(Tension.Level.HATEFUL.getLimit());
         Stance initialStance = Stance.WAR;
         Stance newStance =  Stance.PEACE;
@@ -1624,8 +1624,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Game game = ServerTestHelper.startServerGame(getTestMap());
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         Tension hateful = new Tension(Tension.Level.HATEFUL.getLimit());
         Stance initialStance = Stance.CEASE_FIRE;
         Stance newStance =  Stance.PEACE;
@@ -1660,8 +1660,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Game game = ServerTestHelper.startServerGame(getTestMap());
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         Tension hateful = new Tension(Tension.Level.HATEFUL.getLimit());
         Stance initialStance = Stance.WAR;
         Stance newStance =  Stance.CEASE_FIRE;
@@ -1689,8 +1689,8 @@ public class InGameControllerTest extends FreeColTestCase {
         final Game game = ServerTestHelper.startServerGame(getTestMap());
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer inca = (ServerPlayer)game.getPlayer("model.nation.inca");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
         Player.makeContact(inca, dutch);
 
         FreeColTestCase.IndianSettlementBuilder builder
@@ -1818,7 +1818,7 @@ public class InGameControllerTest extends FreeColTestCase {
         final Game game = ServerTestHelper.startServerGame(getTestMap());
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         assertTrue(dutch.getUnits().isEmpty());
         List<AbstractUnit> units = new ArrayList<>();
         units.add(new AbstractUnit(colonistType, Specification.DEFAULT_ROLE_ID, 1));
@@ -1946,7 +1946,7 @@ public class InGameControllerTest extends FreeColTestCase {
         final Game game = ServerTestHelper.startServerGame(getTestMap(true));
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         FoundingFather father = new FoundingFather("father", spec());
         father.setType(FoundingFatherType.TRADE);
         Modifier priceBonus = new Modifier(Modifier.BUILDING_PRICE_BONUS,
@@ -1969,7 +1969,7 @@ public class InGameControllerTest extends FreeColTestCase {
         final Map map = game.getMap();
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Colony colony = getStandardColony(1);
         Unit colonist = new ServerUnit(game, map.getTile(6, 8), dutch,
                                        colonistType);
@@ -1992,7 +1992,7 @@ public class InGameControllerTest extends FreeColTestCase {
         game = ServerTestHelper.startServerGame(getTestMap(tileType));
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Tile tile = game.getMap().getTile(3, 3);
         assertEquals(tile.getType(), tileType);
 
@@ -2097,7 +2097,7 @@ public class InGameControllerTest extends FreeColTestCase {
         final Game game = ServerTestHelper.startServerGame(getTestMap(true));
         final InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Colony colony = getStandardColony();
 
         UnitType gardenerType = new UnitType("gardener", spec());
diff --git a/test/src/net/sf/freecol/server/model/ServerColonyTest.java b/test/src/net/sf/freecol/server/model/ServerColonyTest.java
index 9ab257933..96efd3486 100644
--- a/test/src/net/sf/freecol/server/model/ServerColonyTest.java
+++ b/test/src/net/sf/freecol/server/model/ServerColonyTest.java
@@ -89,7 +89,7 @@ public class ServerColonyTest extends FreeColTestCase {
 
     public void testFoodConsumption() {
         Game game = ServerTestHelper.startServerGame(getTestMap(plains));
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         // Setting test colony and colonist
         Colony colony = FreeColTestUtils.getColonyBuilder()
             .colonyTile(game.getMap().getTile(5, 8)).build();
diff --git a/test/src/net/sf/freecol/server/model/ServerPlayerTest.java b/test/src/net/sf/freecol/server/model/ServerPlayerTest.java
index 6bf09fcb3..c7643278f 100644
--- a/test/src/net/sf/freecol/server/model/ServerPlayerTest.java
+++ b/test/src/net/sf/freecol/server/model/ServerPlayerTest.java
@@ -83,8 +83,8 @@ public class ServerPlayerTest extends FreeColTestCase {
         Game game = ServerTestHelper.startServerGame(getTestMap());
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer french = (ServerPlayer) game.getPlayer("model.nation.french");
-        ServerPlayer english = (ServerPlayer) game.getPlayer("model.nation.english");
+        ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
+        ServerPlayer english = (ServerPlayer) game.getPlayerByNationId("model.nation.english");
         Market frenchMarket = french.getMarket();
         Market englishMarket = english.getMarket();
         int frenchGold = french.getGold();
@@ -146,8 +146,8 @@ public class ServerPlayerTest extends FreeColTestCase {
         Game game = ServerTestHelper.startServerGame(getTestMap());
         
         Map map = game.getMap();
-        ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer) game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
         InGameController igc = ServerTestHelper.getInGameController();
         Tile tile0 = map.getTile(0, 0);
         Tile tile1 = map.getTile(6, 8);
@@ -177,7 +177,7 @@ public class ServerPlayerTest extends FreeColTestCase {
         Colony colony = getStandardColony();
         colony.addGoods(cottonType, 200);
         ServerPlayer dutch
-            = (ServerPlayer)game.getPlayer("model.nation.dutch");
+            = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Unit wagonInColony
             = new ServerUnit(game, colony.getTile(), dutch, wagonTrainType);
         Unit wagonNotInColony
@@ -222,7 +222,7 @@ public class ServerPlayerTest extends FreeColTestCase {
         InGameController igc = ServerTestHelper.getInGameController();
 
         ServerPlayer dutch
-            = (ServerPlayer)game.getPlayer("model.nation.dutch");
+            = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Europe europe = dutch.getEurope();
         Unit privateer1
             = new ServerUnit(game, europe, dutch, privateerType);
@@ -254,7 +254,7 @@ public class ServerPlayerTest extends FreeColTestCase {
 
     public void testCheckGameOverNoUnits() {
         Game game = ServerTestHelper.startServerGame(getTestMap());
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
 
         dutch.setGold(0);
         assertEquals("Should not have units", 0, dutch.getUnits().size());
@@ -264,7 +264,7 @@ public class ServerPlayerTest extends FreeColTestCase {
 
     public void testCheckNoGameOverEnoughMoney() {
         Game game = ServerTestHelper.startServerGame(getTestMap());
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
 
         dutch.setGold(10000);
         assertEquals("Should not be game, enough money", 0,
@@ -274,7 +274,7 @@ public class ServerPlayerTest extends FreeColTestCase {
     public void testCheckNoGameOverHasColonistInNewWorld() {
         Game game = ServerTestHelper.startServerGame(getTestMap());
         Map map = game.getMap();
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         dutch.setGold(0);
 
         new ServerUnit(game, map.getTile(4, 7), dutch, colonistType);
@@ -284,7 +284,7 @@ public class ServerPlayerTest extends FreeColTestCase {
 
     public void testCheckGameOver1600Threshold() {
         Game game = ServerTestHelper.startServerGame(getTestMap());
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         dutch.setGold(0);
 
         new ServerUnit(game, dutch.getEurope(), dutch, galleonType);
@@ -306,7 +306,7 @@ public class ServerPlayerTest extends FreeColTestCase {
         Game game = ServerTestHelper.startServerGame(getTestMap(spec().getTileType("model.tile.highSeas")));
         Map map = game.getMap();
         InGameController igc = ServerTestHelper.getInGameController();
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         dutch.setGold(0);
 
         Unit galleon = new ServerUnit(game, map.getTile(6, 8), dutch,
@@ -330,7 +330,7 @@ public class ServerPlayerTest extends FreeColTestCase {
         Game game = ServerTestHelper.startServerGame(getTestMap());
         Map map = game.getMap();
         InGameController igc = ServerTestHelper.getInGameController();
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         dutch.setGold(0);
 
         Unit galleon = new ServerUnit(game, dutch.getEurope(), dutch,
@@ -352,7 +352,7 @@ public class ServerPlayerTest extends FreeColTestCase {
 
     public void testSellingMakesPricesFall() {
         Game g = ServerTestHelper.startServerGame(getTestMap());
-        ServerPlayer p = (ServerPlayer)g.getPlayer("model.nation.dutch");
+        ServerPlayer p = (ServerPlayer)g.getPlayerByNationId("model.nation.dutch");
 
         Market dm = p.getMarket();
         int previousGold = p.getGold();
@@ -365,7 +365,7 @@ public class ServerPlayerTest extends FreeColTestCase {
 
     public void testBuyingMakesPricesRaise() {
         Game game = ServerTestHelper.startServerGame(getTestMap());
-        ServerPlayer player = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer player = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
 
         Market dm = player.getMarket();
         player.modifyGold(1000000);
@@ -428,8 +428,8 @@ public class ServerPlayerTest extends FreeColTestCase {
     public void testDutchMarket() {
 
         Game game = getStandardGame();
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
-        ServerPlayer french = (ServerPlayer)game.getPlayer("model.nation.french");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
+        ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
         assertEquals("model.nationType.trade", dutch.getNationType().getId());
         assertTrue(dutch.getNationType().hasModifier(Modifier.TRADE_BONUS));
         assertTrue(dutch.hasModifier(Modifier.TRADE_BONUS));
@@ -438,7 +438,7 @@ public class ServerPlayerTest extends FreeColTestCase {
             int dutchSellAmount = sellUntilPriceDrop(game, dutch, silverType);
 
             Game g2 = getStandardGame();
-            ServerPlayer french2 = (ServerPlayer)g2.getPlayer("model.nation.french");
+            ServerPlayer french2 = (ServerPlayer)g2.getPlayerByNationId("model.nation.french");
             int frenchSellAmount = sellUntilPriceDrop(g2, french2, silverType);
 
             assertTrue(dutchSellAmount > frenchSellAmount);
diff --git a/test/src/net/sf/freecol/server/model/ServerUnitTest.java b/test/src/net/sf/freecol/server/model/ServerUnitTest.java
index 7797f048a..5c72de525 100644
--- a/test/src/net/sf/freecol/server/model/ServerUnitTest.java
+++ b/test/src/net/sf/freecol/server/model/ServerUnitTest.java
@@ -110,7 +110,7 @@ public class ServerUnitTest extends FreeColTestCase {
     public void testToggleHorses() {
         Game game = ServerTestHelper.startServerGame(getTestMap(plains));
 
-        Player dutch = game.getPlayer("model.nation.dutch");
+        Player dutch = game.getPlayerByNationId("model.nation.dutch");
         Tile tile1 = game.getMap().getTile(5, 8);
         tile1.setExplored(dutch, true);
         ServerUnit scout = new ServerUnit(game, tile1, dutch, colonistType);
@@ -140,7 +140,7 @@ public class ServerUnitTest extends FreeColTestCase {
         Game game = ServerTestHelper.startServerGame(getTestMap(plains));
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Tile plain = game.getMap().getTile(5, 8);
         plain.setExplored(dutch, true);
         plain.setOwner(dutch);
@@ -184,7 +184,7 @@ public class ServerUnitTest extends FreeColTestCase {
         Game game = ServerTestHelper.startServerGame(getTestMap(plains));
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Map map = game.getMap();
         map.getTile(5, 8).setExplored(dutch, true);
         map.getTile(6, 8).setExplored(dutch, true);
@@ -268,7 +268,7 @@ public class ServerUnitTest extends FreeColTestCase {
         Game game = ServerTestHelper.startServerGame(getTestMap(savannahForest));
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Map map = game.getMap();
         Tile tile = map.getTile(5, 8);
         map.getTile(5, 8).setExplored(dutch, true);
@@ -428,7 +428,7 @@ public class ServerUnitTest extends FreeColTestCase {
         Game game = ServerTestHelper.startServerGame(getTestMap(savannahForest));
         InGameController igc = ServerTestHelper.getInGameController();
 
-        ServerPlayer dutch = (ServerPlayer)game.getPlayer("model.nation.dutch");
+        ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
         Map map = game.getMap();
         Tile tile = map.getTile(5, 8);
         tile.setOwner(dutch);
diff --git a/test/src/net/sf/freecol/util/test/FreeColTestCase.java b/test/src/net/sf/freecol/util/test/FreeColTestCase.java
index d20f69c6a..7f72a020c 100644
--- a/test/src/net/sf/freecol/util/test/FreeColTestCase.java
+++ b/test/src/net/sf/freecol/util/test/FreeColTestCase.java
@@ -567,8 +567,8 @@ public class FreeColTestCase extends TestCase {
             }
 
             // indianPlayer not set, get default
-            if(indianPlayer == null){
-                indianPlayer = game.getPlayer(defaultIndianPlayer);
+            if (indianPlayer == null) {
+                indianPlayer = game.getPlayerByNationId(defaultIndianPlayer);
                 if(indianPlayer == null){
                     throw new IllegalArgumentException("Default Indian player " + defaultIndianPlayer + " not in game");
                 }
diff --git a/test/src/net/sf/freecol/util/test/FreeColTestUtils.java b/test/src/net/sf/freecol/util/test/FreeColTestUtils.java
index 16849523d..130a0451a 100644
--- a/test/src/net/sf/freecol/util/test/FreeColTestUtils.java
+++ b/test/src/net/sf/freecol/util/test/FreeColTestUtils.java
@@ -134,7 +134,7 @@ public class FreeColTestUtils {
         public Colony build() {
             // player not set, get default
             if (player == null) {
-                player = game.getPlayer(defaultPlayer);
+                player = game.getPlayerByNationId(defaultPlayer);
                 if (player == null) {
                     throw new IllegalArgumentException("Default Player "
                         + defaultPlayer + " not in game");

From bda8e1ecfe6f7e516241c4f25803b92898052d49 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 29 Sep 2015 09:58:42 +0930
Subject: [PATCH 275/323] getMixerWrapper -> getMixerWrapperByName.

---
 src/net/sf/freecol/common/option/AudioMixerOption.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/common/option/AudioMixerOption.java b/src/net/sf/freecol/common/option/AudioMixerOption.java
index fe3ed500c..80a5c24bd 100644
--- a/src/net/sf/freecol/common/option/AudioMixerOption.java
+++ b/src/net/sf/freecol/common/option/AudioMixerOption.java
@@ -144,7 +144,7 @@ public class AudioMixerOption extends AbstractOption<AudioMixerOption.MixerWrapp
      * @param name The mixer wrapper name.
      * @return The mixer wrapper with the name given, or null if none.
      */
-    public MixerWrapper getMixerWrapper(String name) {
+    private MixerWrapper getMixerWrapperByName(String name) {
         for (MixerWrapper mw : audioMixers) {
             if (mw.getKey().equals(name)) return mw;
         }
@@ -205,10 +205,10 @@ public class AudioMixerOption extends AbstractOption<AudioMixerOption.MixerWrapp
     protected void setValue(String valueString, String defaultValueString) {
         MixerWrapper mw = null;
         if (mw == null && valueString != null) {
-            mw = getMixerWrapper(valueString);
+            mw = getMixerWrapperByName(valueString);
         }
         if (mw == null && defaultValueString != null) {
-            mw = getMixerWrapper(defaultValueString);
+            mw = getMixerWrapperByName(defaultValueString);
         }
         if (mw == null) mw = DEFAULT_MIXER_WRAPPER;
         setValue(mw);

From 9f6e4a9f31dbbbdb6cb7a37868587bb949a1cc5f Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 29 Sep 2015 21:06:05 +0200
Subject: [PATCH 276/323] Fix display of the dark halo on animations and
 partial redraws, see BR#2580

---
 src/net/sf/freecol/client/gui/MapViewer.java | 63 +++++++++++++-------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 8397688ff..a850fd9af 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1285,7 +1285,8 @@ public final class MapViewer {
      */
     void displayMap(Graphics2D g) {
         final ClientOptions options = freeColClient.getClientOptions();
-        Map map = freeColClient.getGame().getMap();
+        Game game = freeColClient.getGame();
+        Map map = game.getMap();
 
         // Remember transform
         AffineTransform originTransform = g.getTransform();
@@ -1470,28 +1471,50 @@ public final class MapViewer {
 
         // Display units
         g.setColor(Color.BLACK);
-        map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
-            (Tile tile) -> {
-                // check for units
-                Unit unit = findUnitInFront(tile);
-                if (unit == null || isOutForAnimation(unit))
-                    return;
+        if(!game.isInRevengeMode()) {
+            map.forSubMap(x0, y0, lastColumn-firstColumn+1, lastRow-firstRow+1,
+                (Tile tile) -> {
+                    // check for units
+                    Unit unit = findUnitInFront(tile);
+                    if (unit == null || isOutForAnimation(unit))
+                        return;
 
-                final int x = tile.getX();
-                final int y = tile.getY();
-                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                            (y-y0) * halfHeight);
+                    final int x = tile.getX();
+                    final int y = tile.getY();
+                    g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                                (y-y0) * halfHeight);
 
-                if (unit.isUndead()) {
-                    // Rescale dark halo only in rare case its needed!
-                    Image darkness = lib.getMiscImage(ImageLibrary.DARKNESS);
-                    TileViewer.displayCenteredImage(g, darkness,
-                                                    tileWidth, tileHeight);
-                }
-                displayUnit(g, unit);
+                    displayUnit(g, unit);
 
-                g.setTransform(baseTransform);
-            });
+                    g.setTransform(baseTransform);
+                });
+        } else {
+            /* Add extra rows and colums, as the dark halo is huge to enable
+               a very slow fade into transparency, see BR#2580 */
+            map.forSubMap(x0-2, y0-4, lastColumn-firstColumn+1+4, lastRow-firstRow+1+8,
+                (Tile tile) -> {
+                    // check for units
+                    Unit unit = findUnitInFront(tile);
+                    if (unit == null)
+                        return;
+
+                    final int x = tile.getX();
+                    final int y = tile.getY();
+                    g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
+                                (y-y0) * halfHeight);
+
+                    if (unit.isUndead()) {
+                        // Rescale dark halo only in rare case its needed!
+                        Image darkness = lib.getMiscImage(ImageLibrary.DARKNESS);
+                        TileViewer.displayCenteredImage(g, darkness,
+                                                        tileWidth, tileHeight);
+                    }
+                    if (!isOutForAnimation(unit))
+                        displayUnit(g, unit);
+
+                    g.setTransform(baseTransform);
+                });
+        }
 
         // Display the colony names, if needed
         if (colonyLabels != ClientOptions.COLONY_LABELS_NONE) {

From 3a0953907cc6dff83002f61d1626e1d9c0075757 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 29 Sep 2015 21:27:18 +0200
Subject: [PATCH 277/323] Fix drawing of colonies to ensure no part of
 forts/fortresses overlaps the tile south of it, BR#2580

---
 src/net/sf/freecol/client/gui/TileViewer.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/TileViewer.java b/src/net/sf/freecol/client/gui/TileViewer.java
index 098935550..cf8b3a6b1 100644
--- a/src/net/sf/freecol/client/gui/TileViewer.java
+++ b/src/net/sf/freecol/client/gui/TileViewer.java
@@ -406,6 +406,20 @@ public final class TileViewer {
                     null);
     }
 
+    /**
+     * Centers the given Image on the tile, ensuring it is not drawing
+     * over tiles south of it.
+     *
+     * @param g a <code>Graphics2D</code>
+     * @param image the image
+     */
+    void displayLargeCenteredImage(Graphics2D g, BufferedImage image) {
+        int y = tileHeight - image.getHeight();
+        if(y > 0)
+            y /= 2;
+        g.drawImage(image, (tileWidth - image.getWidth())/2, y, null);
+    }
+
     /**
      * Displays the given Tile onto the given Graphics2D object at the
      * location specified by the coordinates. Only base terrain will be drawn.
@@ -607,8 +621,8 @@ public final class TileViewer {
                 Colony colony = (Colony)settlement;
 
                 // Draw image of colony in center of the tile.
-                Image colonyImage = lib.getSettlementImage(settlement);
-                displayCenteredImage(g, colonyImage, tileWidth, tileHeight);
+                BufferedImage colonyImage = lib.getSettlementImage(settlement);
+                displayLargeCenteredImage(g, colonyImage);
 
                 if (withNumber) {
                     String populationString = Integer.toString(

From 709c0fd1e50d11d18eb7c4bda2cd966c95292b8e Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 29 Sep 2015 23:03:29 +0200
Subject: [PATCH 278/323] Upgrade TileViewer and MapViewer to consistently use
 the more modern BufferedImage

---
 src/net/sf/freecol/client/gui/MapViewer.java  | 64 ++++++++---------
 src/net/sf/freecol/client/gui/TileViewer.java | 70 ++++++++++---------
 2 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index a850fd9af..f5a4e346c 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -24,7 +24,6 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
-import java.awt.Image;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
@@ -443,15 +442,15 @@ public final class MapViewer {
      * @return A JLabel object with the unit's image.
      */
     private JLabel createUnitLabel(Unit unit) {
-        final Image unitImg = lib.getUnitImage(unit);
-        final int width = halfWidth + unitImg.getWidth(null)/2;
-        final int height = unitImg.getHeight(null);
+        final BufferedImage unitImg = lib.getUnitImage(unit);
+        final int width = halfWidth + unitImg.getWidth()/2;
+        final int height = unitImg.getHeight();
 
         BufferedImage img = new BufferedImage(width, height,
                                               BufferedImage.TYPE_INT_ARGB);
         Graphics2D g = img.createGraphics();
 
-        final int unitX = (width - unitImg.getWidth(null)) / 2;
+        final int unitX = (width - unitImg.getWidth()) / 2;
         g.drawImage(unitImg, unitX, 0, null);
 
         Player player = freeColClient.getMyPlayer();
@@ -1409,7 +1408,7 @@ public final class MapViewer {
                 g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
                             (y-y0) * halfHeight);
 
-                Image overlayImage = lib.getOverlayImage(tile, overlayCache);
+                BufferedImage overlayImage = lib.getOverlayImage(tile, overlayCache);
                 tv.displayTileItems(g, tile, overlayImage);
                 tv.displaySettlementWithChipsOrPopulationNumber(
                     g, tile, withNumbers);
@@ -1505,9 +1504,8 @@ public final class MapViewer {
 
                     if (unit.isUndead()) {
                         // Rescale dark halo only in rare case its needed!
-                        Image darkness = lib.getMiscImage(ImageLibrary.DARKNESS);
-                        TileViewer.displayCenteredImage(g, darkness,
-                                                        tileWidth, tileHeight);
+                        BufferedImage darkness = lib.getMiscImage(ImageLibrary.DARKNESS);
+                        tv.displayCenteredImage(g, darkness);
                     }
                     if (!isOutForAnimation(unit))
                         displayUnit(g, unit);
@@ -1577,12 +1575,12 @@ public final class MapViewer {
 
         Color backgroundColor = settlement.getOwner().getNationColor();
         if (backgroundColor == null) backgroundColor = Color.WHITE;
-        // int yOffset = lib.getSettlementImage(settlement).getHeight(null) + 1;
+        // int yOffset = lib.getSettlementImage(settlement).getHeight() + 1;
         int yOffset = tileHeight;
         switch (colonyLabels) {
         case ClientOptions.COLONY_LABELS_CLASSIC:
-            Image img = lib.getStringImage(g, name, backgroundColor, font);
-            g.drawImage(img, (tileWidth - img.getWidth(null))/2 + 1,
+            BufferedImage img = lib.getStringImage(g, name, backgroundColor, font);
+            g.drawImage(img, (tileWidth - img.getWidth())/2 + 1,
                         yOffset, null);
             break;
 
@@ -1605,11 +1603,11 @@ public final class MapViewer {
             }
             specs[0] = new TextSpecification(name, font);
 
-            Image nameImage = createLabel(g, specs, backgroundColor);
+            BufferedImage nameImage = createLabel(g, specs, backgroundColor);
             if (nameImage != null) {
                 int spacing = 3;
-                Image leftImage = null;
-                Image rightImage = null;
+                BufferedImage leftImage = null;
+                BufferedImage rightImage = null;
                 if (settlement instanceof Colony) {
                     Colony colony = (Colony)settlement;
                     String string = Integer.toString(
@@ -1632,7 +1630,7 @@ public final class MapViewer {
                     IndianSettlement is = (IndianSettlement) settlement;
                     if (is.getType().isCapital()) {
                         leftImage = createCapitalLabel(
-                            nameImage.getHeight(null), 5, backgroundColor);
+                            nameImage.getHeight(), 5, backgroundColor);
                     }
 
                     Unit missionary = is.getMissionary();
@@ -1646,32 +1644,32 @@ public final class MapViewer {
                             backgroundColor.getGreen(),
                             backgroundColor.getBlue(), 128);
                         rightImage = createReligiousMissionLabel(
-                            nameImage.getHeight(null), 5,
+                            nameImage.getHeight(), 5,
                             backgroundColor, expert);
                     }
                 }
 
-                int width = (int)((nameImage.getWidth(null)
+                int width = (int)((nameImage.getWidth()
                         * lib.getScaleFactor())
                     + ((leftImage != null)
-                        ? (leftImage.getWidth(null)
+                        ? (leftImage.getWidth()
                             * lib.getScaleFactor()) + spacing
                         : 0)
                     + ((rightImage != null)
-                        ? (rightImage.getWidth(null)
+                        ? (rightImage.getWidth()
                             * lib.getScaleFactor()) + spacing
                         : 0));
                 int labelOffset = (tileWidth - width)/2;
-                yOffset -= (nameImage.getHeight(null)
+                yOffset -= (nameImage.getHeight()
                     * lib.getScaleFactor())/2;
                 if (leftImage != null) {
                     g.drawImage(leftImage, labelOffset, yOffset, null);
-                    labelOffset += (leftImage.getWidth(null)
+                    labelOffset += (leftImage.getWidth()
                         * lib.getScaleFactor()) + spacing;
                 }
                 g.drawImage(nameImage, labelOffset, yOffset, null);
                 if (rightImage != null) {
-                    labelOffset += (nameImage.getWidth(null)
+                    labelOffset += (nameImage.getWidth()
                         * lib.getScaleFactor()) + spacing;
                     g.drawImage(rightImage, labelOffset, yOffset, null);
                 }
@@ -1856,13 +1854,13 @@ public final class MapViewer {
             Point point = calculateTilePosition(tile);
             if (point == null) continue;
 
-            Image image = (p.isOnCarrier())
+            BufferedImage image = (p.isOnCarrier())
                 ? ImageLibrary.getPathImage(ImageLibrary.PathType.NAVAL)
                 : (activeUnit != null)
                 ? ImageLibrary.getPathImage(activeUnit)
                 : null;
 
-            Image turns = (p.getTurns() <= 0) ? null
+            BufferedImage turns = (p.getTurns() <= 0) ? null
                 : lib.getStringImage(g, Integer.toString(p.getTurns()),
                                       Color.WHITE, font);
             g.setColor((turns == null) ? Color.GREEN : Color.RED);
@@ -1882,11 +1880,9 @@ public final class MapViewer {
                 g.setColor(Color.BLACK);
                 g.drawOval(halfWidth, halfHeight, 10, 10);
             } else {
-                TileViewer.displayCenteredImage(g, image,
-                                                tileWidth, tileHeight);
+                tv.displayCenteredImage(g, image);
                 if (turns != null) {
-                    TileViewer.displayCenteredImage(g, turns,
-                                                    tileWidth, tileHeight);
+                    tv.displayCenteredImage(g, turns);
                 }
             }
             g.translate(-point.x, -point.y);
@@ -1908,7 +1904,7 @@ public final class MapViewer {
         boolean fade = (unit.getState() == Unit.UnitState.SENTRY)
             || (unit.hasTile()
                 && player != null && !player.canSee(unit.getTile()));
-        Image image = lib.getUnitImage(unit, fade);
+        BufferedImage image = lib.getUnitImage(unit, fade);
         Point p = calculateUnitImagePositionInTile(image);
         g.drawImage(image, p.x, p.y, null);
 
@@ -1968,16 +1964,16 @@ public final class MapViewer {
      * @param unitImage The unit's image
      * @return The coordinates where the unit should be drawn onscreen
      */
-    private Point calculateUnitImagePositionInTile(Image unitImage) {
-        int unitX = (tileWidth - unitImage.getWidth(null)) / 2;
-        int unitY = (tileHeight - unitImage.getHeight(null)) / 2 -
+    private Point calculateUnitImagePositionInTile(BufferedImage unitImage) {
+        int unitX = (tileWidth - unitImage.getWidth()) / 2;
+        int unitY = (tileHeight - unitImage.getHeight()) / 2 -
                     (int) (UNIT_OFFSET * lib.getScaleFactor());
 
         return new Point(unitX, unitY);
     }
 
     private void displayCursor(Graphics2D g) {
-        Image cursorImage = lib.getMiscImage(ImageLibrary.UNIT_SELECT);
+        BufferedImage cursorImage = lib.getMiscImage(ImageLibrary.UNIT_SELECT);
         g.drawImage(cursorImage, 0, 0, null);
     }
 
diff --git a/src/net/sf/freecol/client/gui/TileViewer.java b/src/net/sf/freecol/client/gui/TileViewer.java
index cf8b3a6b1..684ea73e7 100644
--- a/src/net/sf/freecol/client/gui/TileViewer.java
+++ b/src/net/sf/freecol/client/gui/TileViewer.java
@@ -25,7 +25,6 @@ import java.awt.Composite;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
-import java.awt.Image;
 import java.awt.geom.GeneralPath;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
@@ -73,10 +72,10 @@ public final class TileViewer {
 
     private static class SortableImage implements Comparable<SortableImage> {
 
-        public final Image image;
+        public final BufferedImage image;
         public final int index;
 
-        public SortableImage(Image image, int index) {
+        public SortableImage(BufferedImage image, int index) {
             this.image = image;
             this.index = index;
         }
@@ -297,7 +296,8 @@ public final class TileViewer {
                     int xx = (((2 - x) + y) * tileSize.width) / 2;
                     int yy = ((x + y) * tileSize.height) / 2;
                     g.translate(xx, yy);
-                    Image overlayImage = lib.getOverlayImage(tiles[x][y], overlayCache);
+                    BufferedImage overlayImage = lib.getOverlayImage(
+                        tiles[x][y], overlayCache);
                     displayColonyTile(g, tiles[x][y], colony, overlayImage);
                     g.translate(-xx, -yy);
                 }
@@ -316,10 +316,10 @@ public final class TileViewer {
      * @param colony The <code>Colony</code> to create the visualization
      *      of the <code>Tile</code> for. This object is also used to
      *      get the <code>ColonyTile</code> for the given <code>Tile</code>.
-     * @param overlayImage The Image of the tile overlay.
+     * @param overlayImage The BufferedImage of the tile overlay.
      */
     private void displayColonyTile(Graphics2D g, Tile tile, Colony colony,
-                                  Image overlayImage) {
+                                  BufferedImage overlayImage) {
         displayTile(g, tile, overlayImage);
 
         ColonyTile colonyTile = colony.getColonyTile(tile);
@@ -332,8 +332,9 @@ public final class TileViewer {
         }
         int price = colony.getOwner().getLandPrice(tile);
         if (price > 0 && !tile.hasSettlement()) {
-            Image image = lib.getMiscImage(ImageLibrary.TILE_OWNED_BY_INDIANS);
-            displayCenteredImage(g, image, tileWidth, tileHeight);
+            BufferedImage image = lib.getMiscImage(
+                ImageLibrary.TILE_OWNED_BY_INDIANS);
+            displayCenteredImage(g, image);
         }
 
         Unit unit = colonyTile.getOccupyingUnit();
@@ -356,9 +357,9 @@ public final class TileViewer {
      *
      * @param g The Graphics2D on which to draw the <code>Tile</code>.
      * @param tile The <code>Tile</code> to draw.
-     * @param overlayImage The Image for the tile overlay.
+     * @param overlayImage The BufferedImage for the tile overlay.
      */
-    private void displayTile(Graphics2D g, Tile tile, Image overlayImage) {
+    private void displayTile(Graphics2D g, Tile tile, BufferedImage overlayImage) {
         displayTileWithBeachAndBorder(g, tile);
         if (tile.isExplored()) {
             displayTileItems(g, tile, overlayImage);
@@ -396,13 +397,12 @@ public final class TileViewer {
      * Centers the given Image on the tile.
      *
      * @param g a <code>Graphics2D</code>
-     * @param image an <code>Image</code>
+     * @param image the BufferedImage
      */
-    static void displayCenteredImage(Graphics2D g, Image image,
-                                     int tileWidth, int tileHeight) {
+    void displayCenteredImage(Graphics2D g, BufferedImage image) {
         g.drawImage(image,
-                    (tileWidth - image.getWidth(null))/2,
-                    (tileHeight - image.getHeight(null))/2,
+                    (tileWidth - image.getWidth())/2,
+                    (tileHeight - image.getHeight())/2,
                     null);
     }
 
@@ -411,7 +411,7 @@ public final class TileViewer {
      * over tiles south of it.
      *
      * @param g a <code>Graphics2D</code>
-     * @param image the image
+     * @param image the BufferedImage
      */
     void displayLargeCenteredImage(Graphics2D g, BufferedImage image) {
         int y = tileHeight - image.getHeight();
@@ -639,19 +639,19 @@ public final class TileViewer {
                         : FontLibrary.createFont(FontLibrary.FontType.SIMPLE,
                             FontLibrary.FontSize.TINY, Font.BOLD,
                             lib.getScaleFactor());
-                    Image stringImage = lib.getStringImage(g,
+                    BufferedImage stringImage = lib.getStringImage(g,
                         populationString, theColor, font);
-                    displayCenteredImage(g, stringImage, tileWidth, tileHeight);
+                    displayCenteredImage(g, stringImage);
                 }
 
             } else if (settlement instanceof IndianSettlement) {
                 IndianSettlement is = (IndianSettlement)settlement;
-                Image settlementImage = lib.getSettlementImage(settlement);
+                BufferedImage settlementImage = lib.getSettlementImage(settlement);
 
                 // Draw image of indian settlement in center of the tile.
-                displayCenteredImage(g, settlementImage, tileWidth, tileHeight);
+                displayCenteredImage(g, settlementImage);
 
-                Image chip;
+                BufferedImage chip;
                 float xOffset = STATE_OFFSET_X * lib.getScaleFactor();
                 float yOffset = STATE_OFFSET_Y * lib.getScaleFactor();
                 final int colonyLabels = freeColClient.getClientOptions()
@@ -660,7 +660,7 @@ public final class TileViewer {
                     // Draw the settlement chip
                     chip = lib.getIndianSettlementChip(g, is);
                     g.drawImage(chip, (int)xOffset, (int)yOffset, null);
-                    xOffset += chip.getWidth(null) + 2;
+                    xOffset += chip.getWidth() + 2;
 
                     // Draw the mission chip if needed.
                     Unit missionary = is.getMissionary();
@@ -670,7 +670,7 @@ public final class TileViewer {
                         g.drawImage(lib.getMissionChip(g, missionary.getOwner(),
                                                        expert),
                                     (int)xOffset, (int)yOffset, null);
-                        xOffset += chip.getWidth(null) + 2;
+                        xOffset += chip.getWidth() + 2;
                     }
                 }
 
@@ -691,9 +691,9 @@ public final class TileViewer {
      *
      * @param g The Graphics2D object on which to draw the Tile.
      * @param tile The Tile to draw.
-     * @param overlayImage The Image for the tile overlay.
+     * @param overlayImage The BufferedImage for the tile overlay.
      */
-    void displayTileItems(Graphics2D g, Tile tile, Image overlayImage) {
+    void displayTileItems(Graphics2D g, Tile tile, BufferedImage overlayImage) {
         // ATTENTION: we assume that only overlays and forests
         // might be taller than a tile.
 
@@ -713,7 +713,8 @@ public final class TileViewer {
         }
         // Tile Overlays (eg. hills and mountains)
         if (overlayImage != null) {
-            g.drawImage(overlayImage, 0, (tileHeight - overlayImage.getHeight(null)), null);
+            g.drawImage(overlayImage,
+                0, (tileHeight - overlayImage.getHeight()), null);
         }
         for (int index = startIndex; index < tileItems.size(); index++) {
             if (tileItems.get(index).getZIndex() < Tile.FOREST_ZINDEX) {
@@ -726,8 +727,10 @@ public final class TileViewer {
         }
         // Forest
         if (tile.isForested()) {
-            Image forestImage = lib.getForestImage(tile.getType(), tile.getRiverStyle());
-            g.drawImage(forestImage, 0, (tileHeight - forestImage.getHeight(null)), null);
+            BufferedImage forestImage = lib.getForestImage(
+                tile.getType(), tile.getRiverStyle());
+            g.drawImage(forestImage,
+                0, (tileHeight - forestImage.getHeight()), null);
         }
 
         // draw all remaining items
@@ -750,13 +753,14 @@ public final class TileViewer {
     }
 
     private void displayResourceTileItem(Graphics2D g, Resource item) {
-        Image bonusImage = lib.getMiscImage("image.tileitem." + item.getType().getId());
-        displayCenteredImage(g, bonusImage, tileWidth, tileHeight);
+        BufferedImage bonusImage = lib.getMiscImage(
+            "image.tileitem." + item.getType().getId());
+        displayCenteredImage(g, bonusImage);
     }
 
     private void displayLostCityRumour(Graphics2D g) {
-        displayCenteredImage(g, lib.getMiscImage(ImageLibrary.LOST_CITY_RUMOUR),
-            tileWidth, tileHeight);
+        displayCenteredImage(g,
+            lib.getMiscImage(ImageLibrary.LOST_CITY_RUMOUR));
     }
 
     private void displayTileImprovement(Graphics2D g,
@@ -775,7 +779,7 @@ public final class TileViewer {
                 String key = "image.tile." + ti.getType().getId();
                 if (ResourceManager.hasImageResource(key)) {
                     // Has its own Overlay Image in Misc, use it
-                    Image overlay = ResourceManager.getImage(key,
+                    BufferedImage overlay = ResourceManager.getImage(key,
                         lib.tileSize);
                     g.drawImage(overlay, 0, 0, null);
                 }

From d6a699de6fa1a1cd0e616808e4cbdfdc89cca1f0 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 29 Sep 2015 23:58:29 +0200
Subject: [PATCH 279/323] Use faster backwards translate to replace most calls
 to setTransform in MapViewer.displayMap

---
 src/net/sf/freecol/client/gui/MapViewer.java | 70 +++++++++++---------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index f5a4e346c..d4b404a53 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1330,13 +1330,14 @@ public final class MapViewer {
             (Tile tile) -> {
                 final int x = tile.getX();
                 final int y = tile.getY();
-                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                            (y-y0) * halfHeight);
+                final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                final int yt = (y-y0) * halfHeight;
+                g.translate(xt, yt);
 
                 tv.displayTileWithBeachAndBorder(g, tile);
                 tv.displayUnknownTileBorder(g, tile);
 
-                g.setTransform(baseTransform);
+                g.translate(-xt, -yt);
             });
 
         // Draw the grid, if needed
@@ -1374,10 +1375,11 @@ public final class MapViewer {
                 (Tile tile) -> {
                     final int x = tile.getX();
                     final int y = tile.getY();
-                    g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                                (y-y0) * halfHeight);
+                    final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                    final int yt = (y-y0) * halfHeight;
+                    g.translate(xt, yt);
                     displayTerritorialBorders(g, tile, BorderType.REGION, true);
-                    g.setTransform(baseTransform);
+                    g.translate(-xt, -yt);
                 });
         }
 
@@ -1386,10 +1388,11 @@ public final class MapViewer {
             (Tile tile) -> {
                 final int x = tile.getX();
                 final int y = tile.getY();
-                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                            (y-y0) * halfHeight);
+                final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                final int yt = (y-y0) * halfHeight;
+                g.translate(xt, yt);
                 displayTerritorialBorders(g, tile, BorderType.COUNTRY, true);
-                g.setTransform(baseTransform);
+                g.translate(-xt, -yt);
             });
 
         // Display the Tile overlays
@@ -1405,8 +1408,9 @@ public final class MapViewer {
 
                 final int x = tile.getX();
                 final int y = tile.getY();
-                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                            (y-y0) * halfHeight);
+                final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                final int yt = (y-y0) * halfHeight;
+                g.translate(xt, yt);
 
                 BufferedImage overlayImage = lib.getOverlayImage(tile, overlayCache);
                 tv.displayTileItems(g, tile, overlayImage);
@@ -1415,7 +1419,7 @@ public final class MapViewer {
                 tv.displayFogOfWar(g, tile);
                 tv.displayOptionalTileText(g, tile);
 
-                g.setTransform(baseTransform);
+                g.translate(-xt, -yt);
             });
         g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
                            RenderingHints.VALUE_ANTIALIAS_ON);
@@ -1427,10 +1431,11 @@ public final class MapViewer {
                 (Tile tile) -> {
                     final int x = tile.getX();
                     final int y = tile.getY();
-                    g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                                (y-y0) * halfHeight);
+                    final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                    final int yt = (y-y0) * halfHeight;
+                    g.translate(xt, yt);
                     displayTerritorialBorders(g, tile, BorderType.REGION, false);
-                    g.setTransform(baseTransform);
+                    g.translate(-xt, -yt);
                 });
         }
 
@@ -1439,10 +1444,11 @@ public final class MapViewer {
             (Tile tile) -> {
                 final int x = tile.getX();
                 final int y = tile.getY();
-                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                            (y-y0) * halfHeight);
+                final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                final int yt = (y-y0) * halfHeight;
+                g.translate(xt, yt);
                 displayTerritorialBorders(g, tile, BorderType.COUNTRY, false);
-                g.setTransform(baseTransform);
+                g.translate(-xt, -yt);
             });
 
         // Display cursor for selected tile or active unit
@@ -1461,10 +1467,11 @@ public final class MapViewer {
             final int x = cursorTile.getX();
             final int y = cursorTile.getY();
             if(x >= x0 && y >= y0 && x <= lastColumn && y <= lastRow) {
-                g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                            (y-y0) * halfHeight);
+                final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                final int yt = (y-y0) * halfHeight;
+                g.translate(xt, yt);
                 displayCursor(g);
-                g.setTransform(baseTransform);
+                g.translate(-xt, -yt);
             }
         }
 
@@ -1480,12 +1487,13 @@ public final class MapViewer {
 
                     final int x = tile.getX();
                     final int y = tile.getY();
-                    g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                                (y-y0) * halfHeight);
+                    final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                    final int yt = (y-y0) * halfHeight;
+                    g.translate(xt, yt);
 
                     displayUnit(g, unit);
 
-                    g.setTransform(baseTransform);
+                    g.translate(-xt, -yt);
                 });
         } else {
             /* Add extra rows and colums, as the dark halo is huge to enable
@@ -1499,8 +1507,9 @@ public final class MapViewer {
 
                     final int x = tile.getX();
                     final int y = tile.getY();
-                    g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                                (y-y0) * halfHeight);
+                    final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                    final int yt = (y-y0) * halfHeight;
+                    g.translate(xt, yt);
 
                     if (unit.isUndead()) {
                         // Rescale dark halo only in rare case its needed!
@@ -1510,7 +1519,7 @@ public final class MapViewer {
                     if (!isOutForAnimation(unit))
                         displayUnit(g, unit);
 
-                    g.setTransform(baseTransform);
+                    g.translate(-xt, -yt);
                 });
         }
 
@@ -1539,13 +1548,14 @@ public final class MapViewer {
 
                     final int x = tile.getX();
                     final int y = tile.getY();
-                    g.translate((x-x0) * tileWidth + (y&1) * halfWidth,
-                                (y-y0) * halfHeight);
+                    final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                    final int yt = (y-y0) * halfHeight;
+                    g.translate(xt, yt);
 
                     displaySettlementLabels(g, settlement, player, colonyLabels,
                                             font, italicFont, productionFont);
 
-                    g.setTransform(baseTransform);
+                    g.translate(-xt, -yt);
                 });
         }
 

From e2104cee9ecf05bfbd044d5e558fc72067fca204 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 30 Sep 2015 01:44:32 +0200
Subject: [PATCH 280/323] Optimize displayTileItem for TileImprovement, which
 appear most frequently

---
 src/net/sf/freecol/client/gui/TileViewer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/TileViewer.java b/src/net/sf/freecol/client/gui/TileViewer.java
index 684ea73e7..9b13cf11c 100644
--- a/src/net/sf/freecol/client/gui/TileViewer.java
+++ b/src/net/sf/freecol/client/gui/TileViewer.java
@@ -743,12 +743,12 @@ public final class TileViewer {
      * Draws the given TileItem on the given Tile.
      */
     private void displayTileItem(Graphics2D g, Tile tile, TileItem item) {
-        if (item instanceof Resource) {
-            displayResourceTileItem(g, (Resource) item);
+        if (item instanceof TileImprovement) {
+            displayTileImprovement(g, tile, (TileImprovement)item);
         } else if (item instanceof LostCityRumour) {
             displayLostCityRumour(g);
         } else {
-            displayTileImprovement(g, tile, (TileImprovement)item);
+            displayResourceTileItem(g, (Resource) item);
         }
     }
 

From 14e5fde8f98dffa77c102589bd1088487fceb421 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 28 Sep 2015 09:27:38 +0930
Subject: [PATCH 281/323] Add and use WorkLocation.getCurrentWorkType().

---
 .../sf/freecol/common/model/ColonyTile.java   | 37 +++++++------------
 .../sf/freecol/common/model/WorkLocation.java | 30 ++++++++++-----
 src/net/sf/freecol/server/ai/AIColony.java    |  2 +-
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/net/sf/freecol/common/model/ColonyTile.java b/src/net/sf/freecol/common/model/ColonyTile.java
index cee3d7320..99fe98b82 100644
--- a/src/net/sf/freecol/common/model/ColonyTile.java
+++ b/src/net/sf/freecol/common/model/ColonyTile.java
@@ -243,29 +243,20 @@ public class ColonyTile extends WorkLocation {
             return food;
         }
 
-        // Units are at work here.  Find out what work is being done.
-        GoodsType work = null;
-        UnitType type = null;
-        for (Unit u : getUnitList()) {
-            if (u != null && (type = u.getType()) != null
-                && (work = u.getWorkType()) != null) break;
-        }
-        if (work == null) return 0; // No work, no reason to improve.
-            
-        if (newType != null) { // Tile type change
-            // Return the production impact on the work being done.
-            int diff = newType.getPotentialProduction(work, type);
-            if (resource == null) {
-                diff -= oldType.getPotentialProduction(work, type);
-            } else {
-                diff -= resource.applyBonus(work, type,
-                    oldType.getPotentialProduction(work, type));
-            }
-            return diff;
-        }
-
-        // Otherwise return any new bonus that impacts the current work.
-        return ti.getBonus(work);
+        // Units are present, see what the change would do to their work.
+        final GoodsType work = getCurrentWorkType();
+        final UnitType unitType = getFirstUnit().getType();
+        return (work == null) // No work, improvement does nothing
+            ? 0
+            : (newType == null) // No tile change, but return the new bonus
+            ? ti.getBonus(work)
+            : (resource == null) // The tile change impact on the work
+            ? newType.getPotentialProduction(work, unitType)
+                - oldType.getPotentialProduction(work, unitType)
+            // The production impact with the new resource in place
+            : newType.getPotentialProduction(work, unitType)
+                - resource.applyBonus(work, unitType,
+                    oldType.getPotentialProduction(work, unitType));
     }
         
     /**
diff --git a/src/net/sf/freecol/common/model/WorkLocation.java b/src/net/sf/freecol/common/model/WorkLocation.java
index 74ca3ab13..992ed47c2 100644
--- a/src/net/sf/freecol/common/model/WorkLocation.java
+++ b/src/net/sf/freecol/common/model/WorkLocation.java
@@ -167,15 +167,29 @@ public abstract class WorkLocation extends UnitLocation
         }
     }
 
+    /**
+     * Get the current work type of any unit present.
+     *
+     * This assumes that all units in a work location are doing the same
+     * work, which is true for now.
+     *
+     * @return The current <code>GoodsType</code> being produced, or
+     *     null if none.
+     */
+    public GoodsType getCurrentWorkType() {
+        Unit unit = getFirstUnit();
+        return (unit != null && unit.getType() != null) ? unit.getWorkType()
+            : null;
+    }
+
     /**
      * Update production type on the basis of the current work
      * location type (which might change due to an upgrade) and the
      * work type of units present.
      */
     public void updateProductionType() {
-        Unit unit = getFirstUnit();
-        GoodsType workType = (unit == null) ? null : unit.getWorkType();
-        setProductionType(getBestProductionType(unit == null, workType));
+        setProductionType(getBestProductionType(isEmpty(),
+                getCurrentWorkType()));
     }
 
     /**
@@ -560,17 +574,15 @@ public abstract class WorkLocation extends UnitLocation
      * @return The maximum return from this unit.
      */
     public int getUnitProduction(Unit unit, GoodsType goodsType) {
-        if (unit == null) return 0;
+        if (unit == null || unit.getWorkType() != goodsType) return 0;
         final UnitType unitType = unit.getType();
-        if (unit.getWorkType() != goodsType) return 0;
         final Turn turn = getGame().getTurn();
         int bestAmount = 0;
         for (AbstractGoods output : getOutputs()) {
             if (output.getType() != goodsType) continue;
-            int amount = getBaseProduction(getProductionType(), goodsType,
-                                           unitType);
-            amount = (int)applyModifiers(amount, turn,
-                getProductionModifiers(goodsType, unitType));
+            int amount = (int)applyModifiers(getBaseProduction(getProductionType(),
+                    goodsType, unitType),
+                turn, getProductionModifiers(goodsType, unitType));
             if (bestAmount < amount) bestAmount = amount;
         }
         return bestAmount;
diff --git a/src/net/sf/freecol/server/ai/AIColony.java b/src/net/sf/freecol/server/ai/AIColony.java
index d717e61ef..bddcdc9f8 100644
--- a/src/net/sf/freecol/server/ai/AIColony.java
+++ b/src/net/sf/freecol/server/ai/AIColony.java
@@ -1384,7 +1384,7 @@ public class AIColony extends AIObject implements PropertyChangeListener {
                 }
             } else {
                 if (colonyTile.isEmpty()) continue;
-                goodsType = colonyTile.getUnitList().get(0).getWorkType();
+                goodsType = colonyTile.getCurrentWorkType();
             }
             if (goodsType == null) continue;
 

From 6becb37916c7977ff2480d68e55f9b01c75c9d0c Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 30 Sep 2015 17:39:57 +0200
Subject: [PATCH 282/323] Slightly simplify convoluted if-structure in
 TileViewer.displayTileWithBeachAndBorder

---
 src/net/sf/freecol/client/gui/TileViewer.java | 55 +++++++++----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/TileViewer.java b/src/net/sf/freecol/client/gui/TileViewer.java
index 9b13cf11c..63f8278b1 100644
--- a/src/net/sf/freecol/client/gui/TileViewer.java
+++ b/src/net/sf/freecol/client/gui/TileViewer.java
@@ -429,10 +429,11 @@ public final class TileViewer {
      */
     void displayTileWithBeachAndBorder(Graphics2D g, Tile tile) {
         if (tile != null) {
+            TileType tileType = tile.getType();
             int x = tile.getX();
             int y = tile.getY();
             // ATTENTION: we assume that all base tiles have the same size
-            g.drawImage(lib.getTerrainImage(tile.getType(), x, y),
+            g.drawImage(lib.getTerrainImage(tileType, x, y),
                         0, 0, null);
             if (tile.isExplored()) {
                 if (!tile.isLand() && tile.getStyle() > 0) {
@@ -453,35 +454,33 @@ public final class TileViewer {
                 for (Direction direction : Direction.values()) {
                     Tile borderingTile = tile.getNeighbourOrNull(direction);
                     if (borderingTile != null && borderingTile.isExplored()) {
-                        if (tile.getType() == borderingTile.getType()) {
-                            // Equal tiles, no need to draw border
-                        } else if (tile.isLand() && !borderingTile.isLand()) {
-                            // The beach borders are drawn on the side of water tiles only
-                        } else if (!tile.isLand() && borderingTile.isLand()) {
-                            // If there is a Coast image (eg. beach) defined, use it, otherwise skip
-                            // Draw the grass from the neighboring tile, spilling over on the side of this tile
-                            si = new SortableImage(
-                                lib.getBorderImage(borderingTile.getType(), direction, x, y),
-                                borderingTile.getType().getIndex());
-                            imageBorders.add(si);
-                            TileImprovement river = borderingTile.getRiver();
-                            if (river != null && river.isConnectedTo(direction.getReverseDirection())) {
+                        TileType borderingTileType = borderingTile.getType();
+                        if (borderingTileType != tileType) {
+                            if (!tile.isLand() && borderingTile.isLand()) {
+                                // If there is a Coast image (eg. beach) defined, use it, otherwise skip
+                                // Draw the grass from the neighboring tile, spilling over on the side of this tile
                                 si = new SortableImage(
-                                    lib.getRiverMouthImage(direction,
-                                        borderingTile.getRiver().getMagnitude(), x, y),
-                                    -1);
-                                imageBorders.add(si);
-                            }
-                        } else {
-                            if (lib.getTerrainImage(tile.getType(), 0, 0)
-                                .equals(lib.getTerrainImage(borderingTile.getType(), 0, 0))) {
-                                // Do not draw limit between tile that share same graphics (ocean & great river)
-                            } else if (borderingTile.getType().getIndex() < tile.getType().getIndex()) {
-                                // Draw land terrain with bordering land type, or ocean/high seas limit
-                                si = new SortableImage(
-                                    lib.getBorderImage(borderingTile.getType(), direction, x, y),
-                                    borderingTile.getType().getIndex());
+                                    lib.getBorderImage(borderingTileType, direction, x, y),
+                                    borderingTileType.getIndex());
                                 imageBorders.add(si);
+                                TileImprovement river = borderingTile.getRiver();
+                                if (river != null && river.isConnectedTo(direction.getReverseDirection())) {
+                                    si = new SortableImage(
+                                        lib.getRiverMouthImage(direction,
+                                            borderingTile.getRiver().getMagnitude(), x, y),
+                                        -1);
+                                    imageBorders.add(si);
+                                }
+                            } else if (!tile.isLand() || borderingTile.isLand()) {
+                                if (borderingTileType.getIndex() < tileType.getIndex() &&
+                                        !lib.getTerrainImage(tileType, 0, 0).equals(lib.getTerrainImage(borderingTileType, 0, 0))) {
+                                    // Draw land terrain with bordering land type, or ocean/high seas limit,
+                                    // if the tiles do not share same graphics (ocean & great river)
+                                    si = new SortableImage(
+                                            lib.getBorderImage(borderingTileType, direction, x, y),
+                                            borderingTileType.getIndex());
+                                    imageBorders.add(si);
+                                }
                             }
                         }
                     }

From a88f507ca51fe5f223d84259577ca722346c4af9 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 30 Sep 2015 18:35:17 +0200
Subject: [PATCH 283/323] Use stream for Direction in RoadPainter.displayRoad

---
 .../sf/freecol/client/gui/RoadPainter.java    | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/RoadPainter.java b/src/net/sf/freecol/client/gui/RoadPainter.java
index 753f6ac30..1ffdba487 100644
--- a/src/net/sf/freecol/client/gui/RoadPainter.java
+++ b/src/net/sf/freecol/client/gui/RoadPainter.java
@@ -31,8 +31,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.common.model.Direction;
+import net.sf.freecol.common.model.Map;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.TileImprovement;
 import net.sf.freecol.common.resources.ResourceManager;
@@ -95,20 +97,23 @@ public final class RoadPainter {
         Color oldColor = g.getColor();
         g.setColor(ResourceManager.getColor("color.map.road"));
         g.setStroke(roadStroke);
-        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                           RenderingHints.VALUE_ANTIALIAS_ON);
         GeneralPath path = new GeneralPath();
+        Map map = tile.getMap();
+        int x = tile.getX();
+        int y = tile.getY();
         List<Point2D.Float> points = new ArrayList<>(8);
-        List<Direction> directions = new ArrayList<>(8);
-        for (Direction direction : Direction.values()) {
-            Tile borderingTile = tile.getNeighbourOrNull(direction);
-            TileImprovement r;
-            if (borderingTile != null
-                && (r = borderingTile.getRoad()) != null
-                && r.isComplete()) {
-                points.add(corners.get(direction));
-                directions.add(direction);
-            }
-        }
+        List<Direction> directions = Direction.allDirections.stream()
+            .filter((Direction direction) -> {
+                    Tile borderingTile = map.getTile(direction.step(x, y));
+                    TileImprovement r;
+                    return (borderingTile != null
+                        && (r = borderingTile.getRoad()) != null
+                        && r.isComplete());
+                })
+            .peek((Direction direction) -> points.add(corners.get(direction)))
+            .collect(Collectors.toList());
 
         switch(points.size()) {
         case 0:

From 7d549c5de851e3ae73a2319f3ca41abf6035d077 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 30 Sep 2015 19:37:06 +0200
Subject: [PATCH 284/323] Pull ClientOptions test out of
 MapViewer.displayTerritorialBorders, to prevent doing useless preparations

---
 src/net/sf/freecol/client/gui/MapViewer.java | 49 ++++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index d4b404a53..82fd0907d 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -1384,16 +1384,18 @@ public final class MapViewer {
         }
 
         // Paint full country borders
-        map.forSubMap(x0, y0-1, lastColumn-firstColumn+1, lastRow-firstRow+1+1,
-            (Tile tile) -> {
-                final int x = tile.getX();
-                final int y = tile.getY();
-                final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
-                final int yt = (y-y0) * halfHeight;
-                g.translate(xt, yt);
-                displayTerritorialBorders(g, tile, BorderType.COUNTRY, true);
-                g.translate(-xt, -yt);
-            });
+        if (options.getBoolean(ClientOptions.DISPLAY_BORDERS)) {
+            map.forSubMap(x0, y0-1, lastColumn-firstColumn+1, lastRow-firstRow+1+1,
+                (Tile tile) -> {
+                    final int x = tile.getX();
+                    final int y = tile.getY();
+                    final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                    final int yt = (y-y0) * halfHeight;
+                    g.translate(xt, yt);
+                    displayTerritorialBorders(g, tile, BorderType.COUNTRY, true);
+                    g.translate(-xt, -yt);
+                });
+        }
 
         // Display the Tile overlays
         Set<String> overlayCache = ImageLibrary.createOverlayCache();
@@ -1440,16 +1442,18 @@ public final class MapViewer {
         }
 
         // Paint transparent country borders
-        map.forSubMap(x0, y0-1, lastColumn-firstColumn+1, lastRow-firstRow+1+1,
-            (Tile tile) -> {
-                final int x = tile.getX();
-                final int y = tile.getY();
-                final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
-                final int yt = (y-y0) * halfHeight;
-                g.translate(xt, yt);
-                displayTerritorialBorders(g, tile, BorderType.COUNTRY, false);
-                g.translate(-xt, -yt);
-            });
+        if (options.getBoolean(ClientOptions.DISPLAY_BORDERS)) {
+            map.forSubMap(x0, y0-1, lastColumn-firstColumn+1, lastRow-firstRow+1+1,
+                (Tile tile) -> {
+                    final int x = tile.getX();
+                    final int y = tile.getY();
+                    final int xt = (x-x0) * tileWidth + (y&1) * halfWidth;
+                    final int yt = (y-y0) * halfHeight;
+                    g.translate(xt, yt);
+                    displayTerritorialBorders(g, tile, BorderType.COUNTRY, false);
+                    g.translate(-xt, -yt);
+                });
+        }
 
         // Display cursor for selected tile or active unit
         Tile cursorTile = null;
@@ -1997,11 +2001,6 @@ public final class MapViewer {
      * @param opaque a <code>boolean</code>
      */
     private void displayTerritorialBorders(Graphics2D g, Tile tile, BorderType type, boolean opaque) {
-        if (tile == null ||
-            (type == BorderType.COUNTRY
-             && !freeColClient.getClientOptions().getBoolean(ClientOptions.DISPLAY_BORDERS))) {
-            return;
-        }
         Player owner = tile.getOwner();
         Region region = tile.getRegion();
         if ((type == BorderType.COUNTRY && owner != null)

From ff7a2b3b6f4cf0e193f2be3b40db55394696df19 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 30 Sep 2015 20:57:46 +0200
Subject: [PATCH 285/323] Remove unnecessary null tests inside
 Map.getWidth/Height, which are the most called methods of the game

---
 src/net/sf/freecol/common/model/Map.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Map.java b/src/net/sf/freecol/common/model/Map.java
index 2fe353e23..8b047a393 100644
--- a/src/net/sf/freecol/common/model/Map.java
+++ b/src/net/sf/freecol/common/model/Map.java
@@ -390,7 +390,7 @@ public class Map extends FreeColGameObject implements Location {
      * @return The width of this map.
      */
     public int getWidth() {
-        return (tiles == null) ? 0 : tiles.length;
+        return tiles.length;
     }
 
     /**
@@ -399,7 +399,7 @@ public class Map extends FreeColGameObject implements Location {
      * @return The height of this map.
      */
     public int getHeight() {
-        return (tiles == null) ? 0 : tiles[0].length;
+        return tiles[0].length;
     }
 
     public final Layer getLayer() {

From 9a73ce4efdbe6fdcdac1c89d6cec369c97c8f234 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 30 Jul 2015 11:30:56 +0930
Subject: [PATCH 286/323] Add buildBuilding.

---
 .../sf/freecol/common/model/BuildQueue.java   |  1 +
 src/net/sf/freecol/common/model/Colony.java   | 14 +++++--
 .../sf/freecol/server/model/ServerColony.java | 40 +++++++++++--------
 .../sf/freecol/common/model/BuildingTest.java | 16 +++++---
 4 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/net/sf/freecol/common/model/BuildQueue.java b/src/net/sf/freecol/common/model/BuildQueue.java
index b9e5e14d6..5d489d8c3 100644
--- a/src/net/sf/freecol/common/model/BuildQueue.java
+++ b/src/net/sf/freecol/common/model/BuildQueue.java
@@ -143,6 +143,7 @@ public class BuildQueue<T extends BuildableType> implements Consumer {
         this.completionAction = newCompletionAction;
     }
 
+
     // Interface Consumer
 
     /**
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index cc0b53807..8f8d805e7 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -552,16 +552,22 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
     /**
      * Add a Building to this Colony.
      *
+     * Lower level routine, do not use directly in-game (use buildBuilding).
+     * Used for serialization and public for the test suite.
+     *
      * -til: Could change the tile appearance if the building is
      * stockade-type
      *
-     * @param building a <code>Building</code> value
+     * @param building The <code>Building</code> to build.
+     * @return True if the building was added.
      */
-    public void addBuilding(final Building building) {
-        BuildingType buildingType = building.getType().getFirstLevel();
+    public boolean addBuilding(final Building building) {
+        if (building == null || building.getType() == null) return false;
+        final BuildingType buildingType = building.getType().getFirstLevel();
+        if (buildingType == null || buildingType.getId() == null) return false;
         buildingMap.put(buildingType.getId(), building);
         addFeatures(building.getType());
-        invalidateCache();
+        return true;
     }
 
     /**
diff --git a/src/net/sf/freecol/server/model/ServerColony.java b/src/net/sf/freecol/server/model/ServerColony.java
index 93555c302..92193e3f8 100644
--- a/src/net/sf/freecol/server/model/ServerColony.java
+++ b/src/net/sf/freecol/server/model/ServerColony.java
@@ -424,18 +424,13 @@ public class ServerColony extends Colony implements ServerModelObject {
         }
 
         // Check for free buildings
-        boolean found = false;
         for (BuildingType buildingType : spec.getBuildingTypeList()) {
             if (isAutomaticBuild(buildingType)) {
-                if (buildingType.isDefenceType()) {
-                    getTile().cacheUnseen();//+til
-                }
-                addBuilding(new ServerBuilding(getGame(), this,
-                                               buildingType));//-til
-                found = true;
+                buildBuilding(new ServerBuilding(getGame(), this,
+                                                 buildingType));//-til
             }
         }
-        if (found) checkBuildQueueIntegrity(true);
+        checkBuildQueueIntegrity(true);
 
         // If a build queue is empty, check that we are not producing
         // any goods types useful for BuildableTypes, except if that
@@ -597,18 +592,14 @@ public class ServerColony extends Colony implements ServerModelObject {
         BuildingType from = type.getUpgradesFrom();
         boolean success;
         if (from == null) {
-            addBuilding(new ServerBuilding(getGame(), this, type));//-til
-            success = true;
-            if (type.isDefenceType()) getTile().cacheUnseen(copied);//+til
+            success = buildBuilding(new ServerBuilding(getGame(), this, type));//-til
         } else {
             Building building = getBuilding(from);
             List<Unit> eject = building.upgrade();//-til
             success = eject != null;
             if (success) {
                 ejectUnits(building, eject);//-til
-                if (!eject.isEmpty() || type.isDefenceType()) {
-                    getTile().cacheUnseen(copied);//+til
-                }
+                if (!eject.isEmpty()) getTile().cacheUnseen(copied);//+til
             } else {
                 cs.addMessage(See.only((ServerPlayer)owner),
                               getUnbuildableMessage(type));
@@ -773,9 +764,8 @@ public class ServerColony extends Colony implements ServerModelObject {
     public void csFreeBuilding(BuildingType type, ChangeSet cs) {
         if (canBuild(type)) {
             final ServerPlayer owner = (ServerPlayer)getOwner();
-            if (type.isDefenceType()) getTile().cacheUnseen();//+til
-            addBuilding(new ServerBuilding(getGame(), this, type));//-til
-            getBuildQueue().remove(type);
+            buildBuilding(new ServerBuilding(getGame(), this, type));//-til
+            checkBuildQueueIntegrity(true);
             cs.add(See.only(owner), this);
             if (owner.isAI()) {
                 firePropertyChange(Colony.REARRANGE_WORKERS, true, false);
@@ -783,6 +773,22 @@ public class ServerColony extends Colony implements ServerModelObject {
         }
     }
 
+    /**
+     * Build a new building in this colony.
+     *
+     * @param building The <code>Building</code> to build.
+     * @return True if the building was built.
+     */
+    public boolean buildBuilding(Building building) {
+net.sf.freecol.common.debug.FreeColDebugger.debugLog("BUILD " + building + "\n" +net.sf.freecol.common.debug.FreeColDebugger.stackTraceToString());
+        Tile copied = (building.getType().isDefenceType())
+            ? getTile().getTileToCache() : null;
+        if (!addBuilding(building)) return false;
+        getTile().cacheUnseen(copied);
+        invalidateCache();
+        return true;
+    }
+
     /**
      * Equip a unit for a specific role.
      *
diff --git a/test/src/net/sf/freecol/common/model/BuildingTest.java b/test/src/net/sf/freecol/common/model/BuildingTest.java
index 15da45e85..52b21b00d 100644
--- a/test/src/net/sf/freecol/common/model/BuildingTest.java
+++ b/test/src/net/sf/freecol/common/model/BuildingTest.java
@@ -831,24 +831,28 @@ public class BuildingTest extends FreeColTestCase {
         Colony colony = getStandardColony(6);
         Unit unit = colony.getUnitList().get(0);
         Building building = colony.getBuilding(townHallType);
-        Tile tile = colony.getTile();
-        for (Unit u : building.getUnitList()) u.setLocation(tile);
+        clearWorkLocation(building);
 
         int bellProduction = building.getTotalProductionOf(bellsType);
         int expectBellProd = 1;
-        assertEquals("Wrong initial bell production",expectBellProd,bellProduction);
+        assertEquals("Wrong initial bell production", expectBellProd,
+                     bellProduction);
 
-        Building newspaper = new ServerBuilding(getGame(), colony, newspaperType);
+        Building newspaper = new ServerBuilding(getGame(), colony,
+                                                newspaperType);
         colony.addBuilding(newspaper);
+        colony.invalidateCache();
 
         bellProduction = building.getTotalProductionOf(bellsType);
         expectBellProd = 2;
-        assertEquals("Wrong bell production with newspaper",expectBellProd,bellProduction);
+        assertEquals("Wrong bell production with newspaper", expectBellProd,
+                     bellProduction);
 
         unit.setLocation(building);
         bellProduction = building.getTotalProductionOf(bellsType);
         expectBellProd = 8; // 1 initial plus 3 from the colonist + 4 from newspaper
-        assertEquals("Wrong final bell production",expectBellProd,bellProduction);
+        assertEquals("Wrong final bell production", expectBellProd,
+                     bellProduction);
     }
 
     public void testUnitProduction() {

From a0617f203545b00428a64ecac3a031ba493be4f1 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 1 Oct 2015 10:52:55 +0930
Subject: [PATCH 287/323] Use J8 BinaryOperator for
 CollectionUtils.Accumulator.

---
 .../gui/panel/ReportCompactColonyPanel.java   | 32 ++++++++---------
 .../freecol/common/util/CollectionUtils.java  | 35 +++++++------------
 2 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
index 2bc268bbd..8ee3331fe 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportCompactColonyPanel.java
@@ -31,6 +31,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.HashMap;
 import java.util.List;
+import java.util.function.BinaryOperator;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -68,8 +69,6 @@ import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.model.WorkLocation;
 import net.sf.freecol.common.model.WorkLocation.Suggestion;
 import net.sf.freecol.common.resources.ResourceManager;
-import net.sf.freecol.common.util.CollectionUtils.Accumulator;
-
 import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
@@ -96,21 +95,18 @@ public final class ReportCompactColonyPanel extends ReportPanel
             CONSUMPTION, // Positive production but could consume more
         };
 
-        public static Accumulator<GoodsProduction> goodsProductionAccumulator
-            = new Accumulator<GoodsProduction>() {
-                    public GoodsProduction accumulate(GoodsProduction g1,
-                                                      GoodsProduction g2) {
-                        g1.amount += g2.amount;
-                        g1.status = (g1.status == ProductionStatus.NONE
-                            && g2.status == ProductionStatus.NONE)
-                            ? ProductionStatus.NONE
-                            : (g1.amount < 0) ? ProductionStatus.BAD
-                            : (g1.amount > 0) ? ProductionStatus.GOOD
-                            : ProductionStatus.ZERO;
-                        g1.extra = 0;
-                        return g1;
-                    }
-                };
+        public static BinaryOperator<GoodsProduction> goodsProductionAccumulator
+            = (g1, g2) -> {
+                g1.amount += g2.amount;
+                g1.status = (g1.status == ProductionStatus.NONE
+                        && g2.status == ProductionStatus.NONE)
+                    ? ProductionStatus.NONE
+                    : (g1.amount < 0) ? ProductionStatus.BAD
+                    : (g1.amount > 0) ? ProductionStatus.GOOD
+                    : ProductionStatus.ZERO;
+                g1.extra = 0;
+                return g1;
+            };
 
         /** Container class for goods production. */
         public static class GoodsProduction {
@@ -120,7 +116,7 @@ public final class ReportCompactColonyPanel extends ReportPanel
             public int extra;
 
             public GoodsProduction(int amount, ProductionStatus status,
-                int extra) {
+                                   int extra) {
                 this.amount = amount;
                 this.status = status;
                 this.extra = extra;
diff --git a/src/net/sf/freecol/common/util/CollectionUtils.java b/src/net/sf/freecol/common/util/CollectionUtils.java
index 103deb741..95359a0e0 100644
--- a/src/net/sf/freecol/common/util/CollectionUtils.java
+++ b/src/net/sf/freecol/common/util/CollectionUtils.java
@@ -29,6 +29,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.BinaryOperator;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 
@@ -37,6 +39,14 @@ import java.util.stream.Collectors;
  */
 public class CollectionUtils {
 
+    /** Trivial integer accumulator. */
+    public static final BinaryOperator<Integer> integerAccumulator
+        = (i1, i2) -> i1 + i2;
+
+    /** Trivial double accumulator. */
+    public static final BinaryOperator<Double> doubleAccumulator
+        = (d1, d2) -> d1 + d2;
+
     /** Useful comparators for mapEntriesBy* */
     public static final Comparator<Integer> descendingIntegerComparator
         = new Comparator<Integer>() {
@@ -117,36 +127,17 @@ public class CollectionUtils {
         }
     }
 
-    public abstract static class Accumulator<T> {
-        public abstract T accumulate(T t1, T t2);
-    };
-
-    /** Trivial integer accumulator. */
-    public static Accumulator<Integer> integerAccumulator
-        = new Accumulator<Integer>() {
-            public Integer accumulate(Integer i1, Integer i2) {
-                return i1 + i2;
-            }
-        };
-    /** Trivial double accumulator. */
-    public static Accumulator<Double> doubleAccumulator
-        = new Accumulator<Double>() {
-            public Double accumulate(Double d1, Double d2) {
-                return d1 + d2;
-            }
-        };
-
     public static <K,V> void accumulateToMap(Map<K,V> map, K key, V value,
-                                             Accumulator<V> accumulator) {
+                                             BinaryOperator<V> accumulator) {
         if (map.containsKey(key)) {
-            map.put(key, accumulator.accumulate(map.get(key), value));
+            map.put(key, accumulator.apply(map.get(key), value));
         } else {
             map.put(key, value);
         }
     }
 
     public static <K,V> void accumulateMap(Map<K,V> map1, Map<K,V> map2,
-                                           Accumulator<V> accumulator) {
+                                           BinaryOperator<V> accumulator) {
         for (Entry<K,V> e : map2.entrySet()) {
             accumulateToMap(map1, e.getKey(), e.getValue(), accumulator);
         }

From 6abcf519f08fb17fc53005c53a779f6186edb50d Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 1 Oct 2015 13:56:17 +0930
Subject: [PATCH 288/323] Use standard Java7 Files.copy routine instead of our
 replacements.

---
 .../freecol/common/io/FreeColDirectories.java | 56 +++----------------
 1 file changed, 9 insertions(+), 47 deletions(-)

diff --git a/src/net/sf/freecol/common/io/FreeColDirectories.java b/src/net/sf/freecol/common/io/FreeColDirectories.java
index 34df9d996..ceed04ca6 100644
--- a/src/net/sf/freecol/common/io/FreeColDirectories.java
+++ b/src/net/sf/freecol/common/io/FreeColDirectories.java
@@ -22,6 +22,8 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 
 import javax.swing.filechooser.FileSystemView;
 
@@ -431,52 +433,6 @@ public class FreeColDirectories {
         return null;
     }
 
-    /**
-     * Copy files/directories from one path to another.
-     *
-     * FIXME: Use Java7 copyFile and copyDirectory routines
-     *
-     * @param src The source directory.
-     * @param dst The destination directory.
-     * @return True if the copy succeeded.
-     */
-    private static boolean copyDir(File src, File dst) {
-        if (!dst.mkdir()) return false;
-        for (String f : src.list()) {
-            File srcFile = new File(src, f);
-            File dstFile = new File(dst, f);
-            if (srcFile.isDirectory()) {
-                if (!copyDir(srcFile, dstFile)) return false;
-            } else if (srcFile.isFile()) {
-                if (!copyFile(srcFile, dstFile)) return false;
-            } else {
-                // do not copy other objects
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Copy a file.
-     *
-     * @param src The source <code>File</code>.
-     * @param dst The destination <code>File</code>.
-     * @return True if the copy succeeded.
-     */
-    private static boolean copyFile(File src, File dst) {
-        byte[] buf = new byte[16384];
-        int len;
-    		try (
-            FileInputStream in = new FileInputStream(src);
-            FileOutputStream out = new FileOutputStream(dst);
-        ) {
-            while ((len = in.read(buf)) > 0) out.write(buf, 0, len);
-        } catch (IOException ioe) {
-            return false;
-        }
-        return true;
-    }
-
     /**
      * Copy directory with given name under an old directory to a new
      * directory.
@@ -489,7 +445,13 @@ public class FreeColDirectories {
         File src = new File(oldDir, name);
         File dst = new File(newDir, name);
         if (src.exists() && src.isDirectory() && !dst.exists()) {
-            copyDir(src, dst);
+            try {
+                Files.copy(src.toPath(), dst.toPath(),
+                    StandardCopyOption.COPY_ATTRIBUTES);
+            } catch (IOException ioe) {
+                System.err.println("Could not copy " + src.toString() + " to "
+                    + dst.toString() + ": " + ioe.getMessage());
+            }
         }
     }
 

From d8fc29e27ca7bd92463caa4f848743e21a810388 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Wed, 30 Sep 2015 20:04:19 +0930
Subject: [PATCH 289/323] More get* -> get*ByName.

---
 src/net/sf/freecol/client/gui/panel/Utility.java  |  2 +-
 src/net/sf/freecol/common/i18n/NameCache.java     | 12 ++++++------
 .../sf/freecol/common/model/AbstractGoods.java    |  4 +---
 src/net/sf/freecol/common/model/Direction.java    |  8 +++-----
 src/net/sf/freecol/common/model/Game.java         |  7 ++-----
 src/net/sf/freecol/common/model/Operand.java      | 15 ++++++---------
 src/net/sf/freecol/common/model/Player.java       |  4 ++--
 .../common/networking/BuildColonyMessage.java     |  2 +-
 .../server/generator/SimpleMapGenerator.java      |  2 +-
 9 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/Utility.java b/src/net/sf/freecol/client/gui/panel/Utility.java
index 3d4b643fa..0e9796a4b 100644
--- a/src/net/sf/freecol/client/gui/panel/Utility.java
+++ b/src/net/sf/freecol/client/gui/panel/Utility.java
@@ -194,7 +194,7 @@ public final class Utility {
         Player player, FreeColGameObject source) {
         FreeColGameObject link = null;
         if ("%colony%".equals(key) || key.endsWith("Colony%")) {
-            Settlement settlement = player.getGame().getSettlement(val);
+            Settlement settlement = player.getGame().getSettlementByName(val);
             link = (settlement == null) ? null
                 : (player.owns(settlement)) ? settlement
                 : settlement.getTile();
diff --git a/src/net/sf/freecol/common/i18n/NameCache.java b/src/net/sf/freecol/common/i18n/NameCache.java
index 72cf8756c..f49eb1bb9 100644
--- a/src/net/sf/freecol/common/i18n/NameCache.java
+++ b/src/net/sf/freecol/common/i18n/NameCache.java
@@ -478,7 +478,7 @@ public class NameCache {
             List<String> names = settlementNames.get(player);
             while (!names.isEmpty()) {
                 String name = names.remove(0);
-                if (game.getSettlement(name) == null) return name;
+                if (game.getSettlementByName(name) == null) return name;
             }
         }
 
@@ -486,7 +486,7 @@ public class NameCache {
         final String base = getFallbackSettlementName(player);
         int i = player.getSettlements().size() + 1;
         String name = null;
-        while (game.getSettlement(name = base + i++) != null);
+        while (game.getSettlementByName(name = base + i++) != null);
         return name;
     }           
 
@@ -514,10 +514,10 @@ public class NameCache {
      */
     public static String getTradeRouteName(Player player) {
         String base = Messages.message("nameCache.base.tradeRoute");
-        if (player.getTradeRoute(base) == null) return base;
+        if (player.getTradeRouteByName(base) == null) return base;
         String name;
         int i = 1;
-        while (player.getTradeRoute(name = base + i++) != null);
+        while (player.getTradeRouteByName(name = base + i++) != null);
         return name;
     }
 
@@ -543,14 +543,14 @@ public class NameCache {
             List<String> names = shipNames.get(player);
             while (!names.isEmpty()) {
                 name = names.remove(0);
-                if (player.getUnit(name) == null) return name;
+                if (player.getUnitByName(name) == null) return name;
             }
         }
 
         // Get a fallback ship name
         final String base = Messages.message("nameCache.base.ship") + "-";
         int i = 1;
-        while (player.getUnit(name = base + i++) != null);
+        while (player.getUnitByName(name = base + i++) != null);
         return name;
     }
 }
diff --git a/src/net/sf/freecol/common/model/AbstractGoods.java b/src/net/sf/freecol/common/model/AbstractGoods.java
index 01cc99dae..ac7287ecc 100644
--- a/src/net/sf/freecol/common/model/AbstractGoods.java
+++ b/src/net/sf/freecol/common/model/AbstractGoods.java
@@ -183,9 +183,7 @@ public class AbstractGoods extends FreeColObject implements Named {
      */
     public static AbstractGoods findByType(GoodsType type,
                                            Collection<AbstractGoods> goods) {
-        for (AbstractGoods ag : goods) {
-            if (ag.getType() == type) return ag;
-        }
+        for (AbstractGoods ag : goods) if (ag.getType() == type) return ag;
         return null;
     }
 
diff --git a/src/net/sf/freecol/common/model/Direction.java b/src/net/sf/freecol/common/model/Direction.java
index 97bd8d952..e9b851f99 100644
--- a/src/net/sf/freecol/common/model/Direction.java
+++ b/src/net/sf/freecol/common/model/Direction.java
@@ -91,11 +91,9 @@ public enum Direction implements Named {
      * @return The map position after the step.
      */
     public Map.Position step(int x, int y) {
-        if((y & 1) != 0) {
-            return new Map.Position(x + oddDX, y + oddDY);
-        } else {
-            return new Map.Position(x + evenDX, y + evenDY);
-        }
+        return ((y & 1) != 0)
+            ? new Map.Position(x + oddDX, y + oddDY)
+            : new Map.Position(x + evenDX, y + evenDY);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Game.java b/src/net/sf/freecol/common/model/Game.java
index de77f0755..30ce0b201 100644
--- a/src/net/sf/freecol/common/model/Game.java
+++ b/src/net/sf/freecol/common/model/Game.java
@@ -626,10 +626,7 @@ public class Game extends FreeColGameObject {
      * @return True if the name is already in use.
      */
     public boolean playerNameInUse(String name) {
-        for (Player player : players) {
-            if (player.getName().equals(name)) return true;
-        }
-        return false;
+        return getPlayerByName(name) != null;
     }
 
     /**
@@ -980,7 +977,7 @@ public class Game extends FreeColGameObject {
      *     if there is no known <code>Settlement</code> with the
      *     specified name (the settlement might not be visible to a client).
      */
-    public Settlement getSettlement(String name) {
+    public Settlement getSettlementByName(String name) {
         for (Player p : getLivePlayers(null)) {
             for (Settlement s : p.getSettlements()) {
                 if (name.equals(s.getName())) return s;
diff --git a/src/net/sf/freecol/common/model/Operand.java b/src/net/sf/freecol/common/model/Operand.java
index 55bfb41ca..6b8c7ca30 100644
--- a/src/net/sf/freecol/common/model/Operand.java
+++ b/src/net/sf/freecol/common/model/Operand.java
@@ -319,15 +319,12 @@ public class Operand extends Scope {
      */
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o instanceof Operand) {
-            Operand op = (Operand)o;
-            return operandType == op.operandType
-                && scopeLevel == op.scopeLevel
-                && Utils.equals(value, op.value)
-                && super.equals(o);
-        }
-        return false;
+        return this == o
+            || (o instanceof Operand
+                && operandType == ((Operand)o).operandType
+                && scopeLevel == ((Operand)o).scopeLevel
+                && Utils.equals(value, ((Operand)o).value)
+                && super.equals(o));
     }
 
 
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index c2e87c595..adc941e10 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -2020,7 +2020,7 @@ public class Player extends FreeColGameObject implements Nameable {
      * @param name The name of the unit.
      * @return The unit with the given name, or null if none found.
      */
-    public Unit getUnit(String name) {
+    public Unit getUnitByName(String name) {
         for (Unit u : units) {
             if (name.equals(u.getName())) return u;
         }
@@ -2222,7 +2222,7 @@ public class Player extends FreeColGameObject implements Nameable {
      *
      * @param name The trade route name.
      */
-    public TradeRoute getTradeRoute(String name) {
+    public TradeRoute getTradeRouteByName(String name) {
         for (TradeRoute t : tradeRoutes) {
             if (t.getName().equals(name)) return t;
         }
diff --git a/src/net/sf/freecol/common/networking/BuildColonyMessage.java b/src/net/sf/freecol/common/networking/BuildColonyMessage.java
index 3f3109359..830092040 100644
--- a/src/net/sf/freecol/common/networking/BuildColonyMessage.java
+++ b/src/net/sf/freecol/common/networking/BuildColonyMessage.java
@@ -99,7 +99,7 @@ public class BuildColonyMessage extends DOMMessage {
             return DOMMessage.clientError("Null colony name");
         } else if (Player.ASSIGN_SETTLEMENT_NAME.equals(colonyName)) {
             ; // ok
-        } else if (game.getSettlement(colonyName) != null) {
+        } else if (game.getSettlementByName(colonyName) != null) {
             return DOMMessage.clientError("Non-unique colony name "
                 + colonyName);
         }
diff --git a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
index 527094819..156ec3965 100644
--- a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
+++ b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
@@ -339,7 +339,7 @@ public class SimpleMapGenerator implements MapGenerator {
                 tile.setOwner(owner);
                 if (tile.getOwningSettlement() != null) {
                     String name = tile.getOwningSettlement().getName();
-                    Settlement is = game.getSettlement(name);
+                    Settlement is = game.getSettlementByName(name);
                     tile.setOwningSettlement(is);
                 }
             }

From 58da5daaeef86cc53861ed38c72403b7eecb0310 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Thu, 1 Oct 2015 09:47:53 +0930
Subject: [PATCH 290/323] Add and use CollectionUtils.contains, cleaning up
 some AbstractGoods.findByType use.

---
 .../client/gui/panel/GoodsDetailPanel.java     | 14 ++++++--------
 .../sf/freecol/common/model/AbstractGoods.java | 17 +++++++++++++++--
 src/net/sf/freecol/common/model/Colony.java    | 18 ++++++------------
 .../sf/freecol/common/model/ColonyTile.java    |  6 ++----
 src/net/sf/freecol/common/model/Game.java      |  4 ++--
 .../freecol/common/model/ProductionCache.java  |  6 ++----
 .../freecol/common/model/ProductionType.java   |  3 +--
 src/net/sf/freecol/common/model/Role.java      |  3 +--
 .../freecol/common/model/TradeRouteStop.java   |  2 +-
 .../sf/freecol/common/model/WorkLocation.java  | 13 +++++--------
 .../freecol/common/util/CollectionUtils.java   | 12 ++++++++++++
 .../sf/freecol/server/model/ServerColony.java  |  2 +-
 12 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java b/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java
index 8aacd48f6..4036e8098 100644
--- a/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/GoodsDetailPanel.java
@@ -211,15 +211,13 @@ public class GoodsDetailPanel extends ColopediaGameObjectTypePanel<GoodsType> {
     private <T extends BuildableType> boolean filterBuildables(List<T> input,
         List<T> output, GoodsType type) {
         boolean result = true;
-        for (T buildableType : input) {
-            if (buildableType.needsGoodsToBuild()) {
-                AbstractGoods goods = AbstractGoods.findByType(type,
-                    buildableType.getRequiredGoods());
-                if (goods != null) {
-                    output.add(buildableType);
-                    continue;
+        for (T bt : input) {
+            if (bt.needsGoodsToBuild()) {
+                if (AbstractGoods.containsType(type, bt.getRequiredGoods())) {
+                    output.add(bt);
+                } else {
+                    result = false;
                 }
-                result = false;
             }
         }
         return result;
diff --git a/src/net/sf/freecol/common/model/AbstractGoods.java b/src/net/sf/freecol/common/model/AbstractGoods.java
index ac7287ecc..59e6152d6 100644
--- a/src/net/sf/freecol/common/model/AbstractGoods.java
+++ b/src/net/sf/freecol/common/model/AbstractGoods.java
@@ -27,6 +27,7 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.GoodsType;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.Utils;
 
 
@@ -182,7 +183,7 @@ public class AbstractGoods extends FreeColObject implements Named {
      * @return The <code>AbstractGoods</code> found, or null if not.
      */
     public static AbstractGoods findByType(GoodsType type,
-                                           Collection<AbstractGoods> goods) {
+        Collection<? extends AbstractGoods> goods) {
         for (AbstractGoods ag : goods) if (ag.getType() == type) return ag;
         return null;
     }
@@ -196,11 +197,23 @@ public class AbstractGoods extends FreeColObject implements Named {
      * @return The goods count found, or zero if not found.
      */
     public static int getCount(GoodsType type,
-                               Collection<AbstractGoods> goods) {
+        Collection<? extends AbstractGoods> goods) {
         AbstractGoods ag = findByType(type, goods);
         return (ag == null) ? 0 : ag.getAmount();
     }
 
+    /**
+     * Does a goods collection contain an element with a given type?
+     *
+     * @param goods The <code>Goods<code> collection to search.
+     * @param type The <code>GoodsType</code> to search for.
+     * @return True if the goods type was found.
+     */
+    public static boolean containsType(GoodsType type,
+        Collection<? extends AbstractGoods> goods) {
+        return contains(goods, ag -> ag.getType() == type);
+    }
+
     /**
      * Evaluate goods for trade purposes.
      *
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 8f8d805e7..6e36be20a 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -595,8 +595,7 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     public Building getBuildingForProducing(final GoodsType goodsType) {
         for (Building b : buildingMap.values()) {
-            if (AbstractGoods.findByType(goodsType, b.getOutputs()) != null)
-                return b;
+            if (AbstractGoods.containsType(goodsType, b.getOutputs())) return b;
         }
         return null;
     }
@@ -858,15 +857,10 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
                 satisfied++;
                 continue;
             }
-            int production = productionCache.getNetProductionOf(type);
-            if (info != null) {
-                AbstractGoods consumption = AbstractGoods.findByType(type,
-                    info.getConsumption());
-                if (consumption != null) {
+            int production = productionCache.getNetProductionOf(type)
+                + ((info == null) ? 0
                     // add the amount the build queue itself will consume
-                    production += consumption.getAmount();
-                }
-            }
+                    : AbstractGoods.getCount(type, info.getConsumption()));
             if (production <= 0) {
                 failing++;
                 if (needed != null) {
@@ -1988,8 +1982,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
                                                          populationQueue }) {
             ProductionInfo info = productionCache.getProductionInfo(queue);
             if (info != null) {
-                AbstractGoods goods = AbstractGoods.findByType(goodsType, info.getConsumption());
-                if (goods != null) result += goods.getAmount();
+                result += AbstractGoods.getCount(goodsType,
+                    info.getConsumption());
             }
         }
         return result;
diff --git a/src/net/sf/freecol/common/model/ColonyTile.java b/src/net/sf/freecol/common/model/ColonyTile.java
index 99fe98b82..42fe2eee0 100644
--- a/src/net/sf/freecol/common/model/ColonyTile.java
+++ b/src/net/sf/freecol/common/model/ColonyTile.java
@@ -228,10 +228,8 @@ public class ColonyTile extends WorkLocation {
                 if (goodsType.isFoodType()) {
                     food -= ag.getAmount();
                 } else if (colony.isConsuming(goodsType)) {
-                    int change = -ag.getAmount();
-                    AbstractGoods ng
-                        = AbstractGoods.findByType(goodsType, newProd);
-                    change += (ng == null) ? 0 : ng.getAmount();
+                    int change = -ag.getAmount()
+                        + AbstractGoods.getCount(goodsType, newProd);
                     if (change < 0
                         && change + colony.getNetProductionOf(goodsType) < 0) {
                         // The change drives the net production (more?)
diff --git a/src/net/sf/freecol/common/model/Game.java b/src/net/sf/freecol/common/model/Game.java
index 30ce0b201..1469038df 100644
--- a/src/net/sf/freecol/common/model/Game.java
+++ b/src/net/sf/freecol/common/model/Game.java
@@ -42,6 +42,7 @@ import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.NationOptions.NationState;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.util.LogBuilder;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
 import net.sf.freecol.common.util.Utils;
 
@@ -721,8 +722,7 @@ public class Game extends FreeColGameObject {
      * @return True if an undead player is present.
      */
     public boolean isInRevengeMode() {
-        return getPlayers().stream()
-            .filter(p -> p.isUndead()).findFirst().isPresent();
+        return contains(getPlayers(), Player::isUndead);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/ProductionCache.java b/src/net/sf/freecol/common/model/ProductionCache.java
index 76b5947e9..6ba19a75a 100644
--- a/src/net/sf/freecol/common/model/ProductionCache.java
+++ b/src/net/sf/freecol/common/model/ProductionCache.java
@@ -218,8 +218,7 @@ public class ProductionCache {
     public boolean isProducing(GoodsType goodsType) {
         update();
         return productionAndConsumption.values().stream()
-            .anyMatch(pi -> AbstractGoods.findByType(goodsType,
-                    pi.getProduction()) != null);
+            .anyMatch(pi -> AbstractGoods.containsType(goodsType, pi.getProduction()));
     }
 
     /**
@@ -231,8 +230,7 @@ public class ProductionCache {
     public boolean isConsuming(GoodsType goodsType) {
         update();
         return productionAndConsumption.values().stream()
-            .anyMatch(pi -> AbstractGoods.findByType(goodsType,
-                    pi.getConsumption()) != null);
+            .anyMatch(pi -> AbstractGoods.containsType(goodsType, pi.getConsumption()));
     }
     
     /**
diff --git a/src/net/sf/freecol/common/model/ProductionType.java b/src/net/sf/freecol/common/model/ProductionType.java
index ef2880422..1eb3552a5 100644
--- a/src/net/sf/freecol/common/model/ProductionType.java
+++ b/src/net/sf/freecol/common/model/ProductionType.java
@@ -290,8 +290,7 @@ public class ProductionType extends FreeColObject {
     public static boolean canProduce(GoodsType goodsType,
                                      Collection<ProductionType> types) {
         return types.stream()
-            .anyMatch(pt -> AbstractGoods.findByType(goodsType,
-                                                     pt.getOutputs()) != null);
+            .anyMatch(pt -> AbstractGoods.containsType(goodsType, pt.getOutputs()));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Role.java b/src/net/sf/freecol/common/model/Role.java
index 8d9e1d228..4f4ec66da 100644
--- a/src/net/sf/freecol/common/model/Role.java
+++ b/src/net/sf/freecol/common/model/Role.java
@@ -31,7 +31,6 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
-
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -387,7 +386,7 @@ public class Role extends BuildableType {
                 }
             }
             for (AbstractGoods ag : fromGoods) {
-                if (AbstractGoods.findByType(ag.getType(), toGoods) == null) {
+                if (!AbstractGoods.containsType(ag.getType(), toGoods)) {
                     result.add(new AbstractGoods(ag.getType(), -ag.getAmount()));
                 }
             }
diff --git a/src/net/sf/freecol/common/model/TradeRouteStop.java b/src/net/sf/freecol/common/model/TradeRouteStop.java
index 56b7cd809..88329507f 100644
--- a/src/net/sf/freecol/common/model/TradeRouteStop.java
+++ b/src/net/sf/freecol/common/model/TradeRouteStop.java
@@ -205,7 +205,7 @@ public class TradeRouteStop extends FreeColObject implements TradeLocation {
 
         // Look for goods to unload.
         if (unit.getCompactGoodsList().stream()
-            .filter(ag -> AbstractGoods.findByType(ag.getType(), stopGoods) == null)
+            .filter(ag -> !AbstractGoods.containsType(ag.getType(), stopGoods))
             .anyMatch(ag -> getImportAmount(ag.getType(), turns) > 0))
             return true;
 
diff --git a/src/net/sf/freecol/common/model/WorkLocation.java b/src/net/sf/freecol/common/model/WorkLocation.java
index 992ed47c2..ab5f22fd4 100644
--- a/src/net/sf/freecol/common/model/WorkLocation.java
+++ b/src/net/sf/freecol/common/model/WorkLocation.java
@@ -32,6 +32,7 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.util.LogBuilder;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.Utils;
 
 
@@ -368,8 +369,7 @@ public abstract class WorkLocation extends UnitLocation
                     ok = true;
                 } else if (colony.getTotalProductionOf(goodsType) == 0
                     && (bt = colony.getCurrentlyBuilding()) != null
-                    && AbstractGoods.findByType(goodsType,
-                        bt.getRequiredGoods()) != null) {
+                    && AbstractGoods.containsType(goodsType, bt.getRequiredGoods())) {
                     ok = true;
                 }
             }
@@ -439,7 +439,7 @@ public abstract class WorkLocation extends UnitLocation
      *     given <code>GoodsType</code>.
      */
     public boolean produces(GoodsType goodsType) {
-        return AbstractGoods.findByType(goodsType, getOutputs()) != null;
+        return AbstractGoods.containsType(goodsType, getOutputs());
     }
 
     /**
@@ -597,11 +597,8 @@ public abstract class WorkLocation extends UnitLocation
      */
     public int getProductionOf(Unit unit, GoodsType goodsType) {
         if (unit == null) throw new IllegalArgumentException("Null unit.");
-
-        final UnitType unitType = unit.getType();
-        AbstractGoods goods = AbstractGoods.findByType(goodsType, getOutputs());
-        return (goods == null) ? 0
-            : Math.max(0, getPotentialProduction(goodsType, unitType));
+        return (!produces(goodsType)) ? 0
+            : Math.max(0, getPotentialProduction(goodsType, unit.getType()));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/util/CollectionUtils.java b/src/net/sf/freecol/common/util/CollectionUtils.java
index 95359a0e0..59f9ffb6e 100644
--- a/src/net/sf/freecol/common/util/CollectionUtils.java
+++ b/src/net/sf/freecol/common/util/CollectionUtils.java
@@ -348,4 +348,16 @@ public class CollectionUtils {
             .sorted((e1, e2) -> comparator.compare(e1.getValue(), e2.getValue()))
             .collect(Collectors.toList());
     }
+
+    /**
+     * Does a collection contain at least one element that matches a predicate?
+     *
+     * @param collection The <code>Collection</code> to search.
+     * @param predicate A <code>Predicate</code> to test with.
+     * @return True if the predicate ever succeeds.
+     */
+    public static <T> boolean contains(Collection<T> collection,
+                                       Predicate<T> predicate) {
+        return collection.stream().filter(predicate).findFirst().isPresent();
+    }
 }
diff --git a/src/net/sf/freecol/server/model/ServerColony.java b/src/net/sf/freecol/server/model/ServerColony.java
index 92193e3f8..818eae371 100644
--- a/src/net/sf/freecol/server/model/ServerColony.java
+++ b/src/net/sf/freecol/server/model/ServerColony.java
@@ -514,7 +514,7 @@ public class ServerColony extends Colony implements ServerModelObject {
         buildables.addAll(spec.getUnitTypesWithoutAbility(Ability.PERSON));
         return buildables.stream()
             .anyMatch(bt -> canBuild(bt)
-                && AbstractGoods.findByType(goodsType, bt.getRequiredGoods()) != null);
+                && AbstractGoods.containsType(goodsType, bt.getRequiredGoods()));
     }
 
     /**

From 7fc9ba1ed1fe5771198199aa75d1316602d952fc Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 3 Oct 2015 20:53:19 +0930
Subject: [PATCH 291/323] Mishandled save file extension.

---
 src/net/sf/freecol/client/control/InGameController.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 27b68d6af..54da4ba6f 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -583,7 +583,8 @@ public final class InGameController implements NetworkConstants {
         final Turn turn = game.getTurn();
         return (/* player.getName() + "_" */ gid
             + "_" + Messages.message(player.getNationLabel())
-            + "_" + turn.getSaveGameSuffix())
+            + "_" + turn.getSaveGameSuffix()
+            + "." + FreeCol.FREECOL_SAVE_EXTENSION)
             .replaceAll(" ", "_");
     }
 
@@ -619,8 +620,7 @@ public final class InGameController implements NetworkConstants {
         int saveGamePeriod = options.getInteger(ClientOptions.AUTOSAVE_PERIOD);
         int turnNumber = game.getTurn().getNumber();
         if (saveGamePeriod >= 1 && turnNumber % saveGamePeriod == 0) {
-            String fileName = prefix + "-" + getSaveGameString(game)
-                + "." + FreeCol.FREECOL_SAVE_EXTENSION;
+            String fileName = prefix + "-" + getSaveGameString(game);
             saveGame(new File(autoSaveDir, fileName));
         }
     }
@@ -4386,7 +4386,6 @@ public final class InGameController implements NetworkConstants {
         File file = gui.showSaveDialog(FreeColDirectories.getSaveDirectory(),
                                        fileName);
         if (file == null) return false;
-        
         final boolean confirm = freeColClient.getClientOptions()
             .getBoolean(ClientOptions.CONFIRM_SAVE_OVERWRITE);
         if (!confirm

From 354537bfdb4a0974d7efa038717d2c8fb0bf0cfd Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sun, 4 Oct 2015 09:13:16 +1030
Subject: [PATCH 292/323] Defend against NPE in integrity check.

---
 src/net/sf/freecol/common/model/Game.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Game.java b/src/net/sf/freecol/common/model/Game.java
index 1469038df..d1e856d29 100644
--- a/src/net/sf/freecol/common/model/Game.java
+++ b/src/net/sf/freecol/common/model/Game.java
@@ -1141,15 +1141,19 @@ public class Game extends FreeColGameObject {
         Iterator<FreeColGameObject> iterator = getFreeColGameObjectIterator();
         while (iterator.hasNext()) {
             FreeColGameObject fcgo = iterator.next();
-            if (fcgo.isUninitialized()) {
+            if (fcgo == null) {
+                lb.add(" null-fcgo");
+            } else if (fcgo.isUninitialized()) {
                 lb.add(" ", fcgo.getId(),
                     "(", lastPart(fcgo.getClass().getName(), "."), ")");
-                if (fix) {
-                    iterator.remove();
-                    result = Math.min(result, 0);
-                } else {
-                    result = -1;
-                }
+            } else {
+                continue;
+            }
+            if (fix) {
+                iterator.remove();
+                result = Math.min(result, 0);
+            } else {
+                result = -1;
             }
         }
         if (lb.grew()) {

From 97be2901fc98a6bcd03b49eb2ec46bca0e2b18ca Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 4 Oct 2015 12:48:34 +0200
Subject: [PATCH 293/323] Fix missing updates to UnitInfoPanel on unit moves

---
 src/net/sf/freecol/client/control/InGameController.java | 1 +
 src/net/sf/freecol/client/gui/panel/InfoPanel.java      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
index 54da4ba6f..e2792ea41 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -329,6 +329,7 @@ public final class InGameController implements NetworkConstants {
         } else if (updateActiveUnit(tile)) {
             ; // setActiveUnit will update the menu bar
         } else {
+            gui.updateMapControls();
             gui.updateMenuBar();
         }
     }
diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index ead22b6c2..91a4d62b3 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -267,8 +267,8 @@ public final class InfoPanel extends FreeColPanel {
                     if (gc != null) gc.addPropertyChangeListener(this);
                 }
                 this.unit = unit;
-                update();
             }
+            update();
         }
 
         /**

From 74d4b571f038e766729b7429d4757ffc6f2ac928 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 28 Sep 2015 09:05:14 +0930
Subject: [PATCH 294/323] Add and use CollectionUtils.find/map wrapping J8
 streams findFirst routine.

---
 src/net/sf/freecol/FreeCol.java               | 26 ++----
 .../gui/panel/EditSettlementDialog.java       |  9 +-
 .../client/gui/panel/QuickActionMenu.java     |  8 +-
 .../gui/panel/SelectDestinationDialog.java    | 10 +--
 .../sf/freecol/common/debug/DebugUtils.java   |  8 +-
 .../common/i18n/DefaultNumberRule.java        | 12 ++-
 src/net/sf/freecol/common/i18n/Messages.java  | 11 +--
 src/net/sf/freecol/common/model/Colony.java   | 19 ++--
 .../freecol/common/model/DiplomaticTrade.java | 26 ++----
 src/net/sf/freecol/common/model/Game.java     | 21 ++---
 src/net/sf/freecol/common/model/Map.java      | 22 ++---
 src/net/sf/freecol/common/model/Nation.java   |  6 +-
 .../sf/freecol/common/model/NationType.java   | 13 +--
 src/net/sf/freecol/common/model/Player.java   | 35 +++-----
 .../sf/freecol/common/model/Settlement.java   |  7 +-
 .../freecol/common/model/SettlementType.java  |  7 +-
 .../freecol/common/model/Specification.java   | 36 ++++----
 src/net/sf/freecol/common/model/Tension.java  |  7 +-
 src/net/sf/freecol/common/model/Tile.java     | 19 ++--
 .../common/model/TileItemContainer.java       | 42 +++------
 src/net/sf/freecol/common/model/UnitType.java | 41 +++------
 .../sf/freecol/common/model/WorkLocation.java | 12 ++-
 .../common/option/AudioMixerOption.java       |  6 +-
 .../freecol/common/option/LanguageOption.java |  6 +-
 .../freecol/common/util/CollectionUtils.java  | 86 +++++++++++++++++++
 src/net/sf/freecol/server/FreeColServer.java  |  8 +-
 src/net/sf/freecol/server/ai/AIColony.java    | 26 ++----
 src/net/sf/freecol/server/ai/ColonyPlan.java  | 17 ++--
 src/net/sf/freecol/server/ai/REFAIPlayer.java |  9 +-
 .../ai/goal/ManageMissionariesGoal.java       | 21 ++---
 .../server/ai/mission/TransportMission.java   | 31 ++-----
 .../server/generator/SimpleMapGenerator.java  |  7 +-
 .../sf/freecol/server/model/ServerGame.java   | 44 +++-------
 33 files changed, 273 insertions(+), 385 deletions(-)

diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index f9b3d70ae..0b890721e 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -51,6 +51,7 @@ import net.sf.freecol.common.model.NationOptions.Advantages;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.option.OptionGroup;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.server.FreeColServer;
 
 import org.apache.commons.cli.CommandLine;
@@ -917,14 +918,10 @@ public final class FreeCol {
      * @return The type of advantages set, or null if none.
      */
     private static Advantages selectAdvantages(String advantages) {
-        for (Advantages a : Advantages.values()) {
-            String msg = Messages.getName(a);
-            if (msg.equals(advantages)) {
-                setAdvantages(a);
-                return a;
-            }
-        }
-        return null;
+        Advantages adv = find(Advantages.values(),
+            a -> Messages.getName(a).equals(advantages), null);
+        if (adv != null) setAdvantages(adv);
+        return adv;
     }
 
     /**
@@ -965,15 +962,10 @@ public final class FreeCol {
      * @return The name of the selected difficulty, or null if none.
      */
     public static String selectDifficulty(String arg) {
-        for (String d : DIFFICULTIES) {
-            String key = "model.difficulty." + d;
-            String value = Messages.getName(key);
-            if (value.equals(arg)) {
-                setDifficulty(key);
-                return key;
-            }
-        }
-        return null;
+        String difficulty = find(map(DIFFICULTIES, d -> "model.difficulty."+d),
+            k -> Messages.getName(k).equals(arg), null);
+        if (difficulty != null) setDifficulty(difficulty);
+        return difficulty;
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java b/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
index e32e83ca1..223c717c3 100644
--- a/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
@@ -50,6 +50,7 @@ import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.UnitType;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.RandomChoice;
 import net.sf.freecol.server.model.ServerUnit;
 
@@ -152,11 +153,9 @@ public final class EditSettlementDialog extends FreeColDialog<IndianSettlement>
     }
 
     private Player getOwnerPlayer() {
-        Nation n = getOwnerNation();
-        for (Player player : settlement.getGame().getLivePlayers(null)) {
-            if (player.getNationId().equals(n.getId())) return player;
-        }
-        return null;
+        final Nation n = getOwnerNation();
+        return find(settlement.getGame().getLivePlayers(null),
+            p -> p.getNationId().equals(n.getId()));
     }
 
     private SettlementType getSettlementType() {
diff --git a/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java b/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
index 10279357f..293fe1d4f 100644
--- a/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
+++ b/src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
@@ -69,6 +69,7 @@ import net.sf.freecol.common.model.UnitLocation;
 import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
 import net.sf.freecol.common.model.WorkLocation;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -588,12 +589,7 @@ public final class QuickActionMenu extends JPopupMenu {
             change = need.get(0);
             break;
         default:
-            for (AbstractGoods ag : need) {
-                if (ag.getAmount() > 0) {
-                    change = ag;
-                    break;
-                }
-            }
+            change = find(need, ag -> ag.getAmount() > 0);
             break;
         }
         Icon icon = (change == null) ? null : new ImageIcon(
diff --git a/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java b/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
index 63c103b5b..a08dc0357 100644
--- a/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
+++ b/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
@@ -72,6 +72,7 @@ import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
 import net.sf.freecol.common.model.pathfinding.GoalDeciders.MultipleAdjacentDecider;
 import net.sf.freecol.common.resources.ResourceManager;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.LogBuilder;
 
 
@@ -194,13 +195,8 @@ public final class SelectDestinationDialog extends FreeColDialog<Location>
                         Unit up = (unit.getType().canBeUpgraded(sk,
                                 ChangeType.NATIVES)) ? unit : null;
                         if (unit.isCarrier()) {
-                            for (Unit u : unit.getUnitList()) {
-                                if (u.getType().canBeUpgraded(sk,
-                                        ChangeType.NATIVES)) {
-                                    up = u;
-                                    break;
-                                }
-                            }
+                            up = find(unit.getUnitList(),
+                                u -> u.getType().canBeUpgraded(sk, ChangeType.NATIVES));
                         }
                         if (up != null) {
                             lb.add("[", Messages.getName(sk), "]");
diff --git a/src/net/sf/freecol/common/debug/DebugUtils.java b/src/net/sf/freecol/common/debug/DebugUtils.java
index 2ae9d919e..ab8d1b203 100644
--- a/src/net/sf/freecol/common/debug/DebugUtils.java
+++ b/src/net/sf/freecol/common/debug/DebugUtils.java
@@ -64,8 +64,8 @@ import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.option.BooleanOption;
 import net.sf.freecol.common.util.LogBuilder;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.RandomChoice;
-
 import static net.sf.freecol.common.util.StringUtils.*;
 
 import net.sf.freecol.server.FreeColServer;
@@ -329,10 +329,8 @@ public class DebugUtils {
 
         Unit carrier = null, sCarrier = null;
         if (!sTile.isLand() && !unitChoice.isNaval()) {
-            sCarrier = sTile.getUnitList().stream()
-                .filter(u -> u.isNaval()
-                    && u.getSpaceLeft() >= unitChoice.getSpaceTaken())
-                .findFirst().orElse(null);
+            sCarrier = find(sTile.getUnitList(), u -> u.isNaval()
+                && u.getSpaceLeft() >= unitChoice.getSpaceTaken());
         }
         Location loc = (sCarrier != null) ? sCarrier : sTile;
         ServerUnit sUnit = new ServerUnit(sGame, loc, sPlayer,
diff --git a/src/net/sf/freecol/common/i18n/DefaultNumberRule.java b/src/net/sf/freecol/common/i18n/DefaultNumberRule.java
index 6831cc457..839f13cb0 100644
--- a/src/net/sf/freecol/common/i18n/DefaultNumberRule.java
+++ b/src/net/sf/freecol/common/i18n/DefaultNumberRule.java
@@ -22,6 +22,8 @@ package net.sf.freecol.common.i18n;
 import java.util.EnumMap;
 import java.util.Map;
 
+import static net.sf.freecol.common.util.CollectionUtils.*;
+
 
 /**
  * This class handles zero or one rule for each number category.
@@ -75,12 +77,8 @@ public class DefaultNumberRule extends Number {
      */
     @Override
     public Category getCategory(double input) {
-        for (Category number : Category.values()) {
-            Rule r = rules.get(number);
-            if (r != null && r.matches(input)) {
-                return number;
-            }
-        }
-        return Category.other;
+        return find(Category.values(),
+            category -> rules.containsKey(category)
+                && rules.get(category).matches(input), Category.other);
     }
 }
diff --git a/src/net/sf/freecol/common/i18n/Messages.java b/src/net/sf/freecol/common/i18n/Messages.java
index 2ea617495..685555d31 100644
--- a/src/net/sf/freecol/common/i18n/Messages.java
+++ b/src/net/sf/freecol/common/i18n/Messages.java
@@ -45,6 +45,7 @@ import net.sf.freecol.common.model.Named;
 import net.sf.freecol.common.model.Role;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.StringTemplate.TemplateType;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -415,13 +416,9 @@ public class Messages {
     }
 
     public static String getBestDescription(String id) {
-        for (String suffix : DESCRIPTION_KEYS) {
-            String key = id + suffix;
-            if (containsKey(key)) {
-                return message(key);
-            }
-        }
-        return id;
+        String key = find(map(DESCRIPTION_KEYS, s -> id + s),
+            k -> containsKey(k), null);
+        return (key == null) ? id : message(key);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 6e36be20a..32bf35fc3 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -218,10 +218,7 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      * @return The corresponding <code>ColonyTile</code>, or null if not found.
      */
     public ColonyTile getColonyTile(Tile t) {
-        for (ColonyTile c : colonyTiles) {
-            if (c.getWorkTile() == t) return c;
-        }
-        return null;
+        return find(colonyTiles, ct -> ct.getWorkTile() == t);
     }
 
     /**
@@ -595,7 +592,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     public Building getBuildingForProducing(final GoodsType goodsType) {
         for (Building b : buildingMap.values()) {
-            if (AbstractGoods.containsType(goodsType, b.getOutputs())) return b;
+            if (AbstractGoods.findByType(goodsType, b.getOutputs()) != null)
+                return b;
         }
         return null;
     }
@@ -857,10 +855,15 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
                 satisfied++;
                 continue;
             }
-            int production = productionCache.getNetProductionOf(type)
-                + ((info == null) ? 0
+            int production = productionCache.getNetProductionOf(type);
+            if (info != null) {
+                AbstractGoods consumption = AbstractGoods.findByType(type,
+                    info.getConsumption());
+                if (consumption != null) {
                     // add the amount the build queue itself will consume
-                    : AbstractGoods.getCount(type, info.getConsumption()));
+                    production += consumption.getAmount();
+                }
+            }
             if (production <= 0) {
                 failing++;
                 if (needed != null) {
diff --git a/src/net/sf/freecol/common/model/DiplomaticTrade.java b/src/net/sf/freecol/common/model/DiplomaticTrade.java
index 458bc5b1c..4e13b6fc4 100644
--- a/src/net/sf/freecol/common/model/DiplomaticTrade.java
+++ b/src/net/sf/freecol/common/model/DiplomaticTrade.java
@@ -29,6 +29,7 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.Stance;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
 
 import org.w3c.dom.Element;
@@ -323,12 +324,8 @@ public class DiplomaticTrade extends FreeColObject {
      * @return The <code>Stance</code> offered in this trade, or null if none.
      */
     public Stance getStance() {
-        for (TradeItem ti : items) {
-            if (ti instanceof StanceTradeItem) {
-                return ti.getStance();
-            }
-        }
-        return null;
+        TradeItem ti = find(items, i -> i instanceof StanceTradeItem);
+        return (ti == null) ? null : ti.getStance();
     }
 
     /**
@@ -353,12 +350,9 @@ public class DiplomaticTrade extends FreeColObject {
      * @return The gold offered in this trade.
      */
     public int getGoldGivenBy(Player player) {
-        for (TradeItem ti : items) {
-            if (ti instanceof GoldTradeItem && player == ti.getSource()) {
-                return ti.getGold();
-            }
-        }
-        return -1;
+        TradeItem ti = find(items, i -> i instanceof GoldTradeItem
+            && player == i.getSource());
+        return (ti == null) ? -1 : ti.getGold();
     }
 
     /**
@@ -382,12 +376,8 @@ public class DiplomaticTrade extends FreeColObject {
      * @return The <code>Player</code> to be incited against.
      */
     public Player getVictim() {
-        for (TradeItem ti : items) {
-            if (ti instanceof InciteTradeItem) {
-                return ti.getVictim();
-            }
-        }
-        return null;
+        TradeItem ti = find(items, i -> i instanceof InciteTradeItem);
+        return (ti == null) ? null : ti.getVictim();
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Game.java b/src/net/sf/freecol/common/model/Game.java
index d1e856d29..032e3f65c 100644
--- a/src/net/sf/freecol/common/model/Game.java
+++ b/src/net/sf/freecol/common/model/Game.java
@@ -510,10 +510,7 @@ public class Game extends FreeColGameObject {
      *     not found.
      */
     public Player getPlayerByNationId(String nationId) {
-        for (Player player : players) {
-            if (player.getNationId().equals(nationId)) return player;
-        }
-        return null;
+        return find(players, p -> p.getNationId().equals(nationId));
     }
 
     /**
@@ -614,10 +611,7 @@ public class Game extends FreeColGameObject {
      * @return The <code>Player</code> or null if none found.
      */
     public Player getPlayerByName(String name) {
-        for (Player player : players) {
-            if (player.getName().equals(name)) return player;
-        }
-        return null;
+        return find(players, p -> p.getName().equals(name));
     }
 
     /**
@@ -793,13 +787,10 @@ public class Game extends FreeColGameObject {
      * @return A vacant <code>Nation</code> or null if none found.
      */
     public Nation getVacantNation() {
-        for (Entry<Nation, NationState> entry
-                 : nationOptions.getNations().entrySet()) {
-            if (entry.getValue() == NationState.AVAILABLE) {
-                return entry.getKey();
-            }
-        }
-        return null;
+        Entry<Nation,NationState> entry
+            = find(nationOptions.getNations().entrySet(),
+                e -> e.getValue() == NationState.AVAILABLE, null);
+        return (entry == null) ? null : entry.getKey();
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Map.java b/src/net/sf/freecol/common/model/Map.java
index 8b047a393..69305df02 100644
--- a/src/net/sf/freecol/common/model/Map.java
+++ b/src/net/sf/freecol/common/model/Map.java
@@ -43,6 +43,7 @@ import net.sf.freecol.common.model.pathfinding.CostDeciders;
 import net.sf.freecol.common.model.pathfinding.GoalDecider;
 import net.sf.freecol.common.model.pathfinding.GoalDeciders;
 import net.sf.freecol.common.util.LogBuilder;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.RandomUtils.*;
 // @compat 0.10.x
 import net.sf.freecol.server.generator.TerrainGenerator;
@@ -201,11 +202,8 @@ public class Map extends FreeColGameObject implements Location {
          * @return The <code>Direction</code>, or null if not adjacent.
          */
         public Direction getDirection(Position other) {
-            for (Direction d : Direction.values()) {
-                Position step = d.step(x, y);
-                if (step.x == other.x && step.y == other.y) return d;
-            }
-            return null;
+            return find(Direction.values(),
+                d -> new Position(this, d).equals(other), null);
         }
 
         // Override Object
@@ -502,11 +500,8 @@ public class Map extends FreeColGameObject implements Location {
      * @return The region with the given name key, or null if not found.
      */
     public Region getRegionByKey(final String key) {
-        if (key == null) return null;
-        for (Region r : regions) {
-            if (key.equals(r.getKey())) return r;
-        }
-        return null;
+        return (key == null) ? null
+            : find(getRegions(), r -> key.equals(r.getKey()));
     }
 
     /**
@@ -517,11 +512,8 @@ public class Map extends FreeColGameObject implements Location {
      *     not found.
      */
     public Region getRegionByName(final String name) {
-        if (name == null) return null;
-        for (Region r : regions) {
-            if (name.equals(r.getName())) return r;
-        }
-        return null;
+        return (name == null) ? null
+            : find(getRegions(), r -> name.equals(r.getName()));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Nation.java b/src/net/sf/freecol/common/model/Nation.java
index ba5acabd3..9794a1110 100644
--- a/src/net/sf/freecol/common/model/Nation.java
+++ b/src/net/sf/freecol/common/model/Nation.java
@@ -173,10 +173,8 @@ public class Nation extends FreeColGameObjectType {
      * @return The rebel <code>Nation</code>, or null if not applicable.
      */
     public final Nation getRebelNation() {
-        for (Nation n : getSpecification().getEuropeanNations()) {
-            if (n.getREFNation() == this) return n;
-        }
-        return null;
+        return find(getSpecification().getEuropeanNations(),
+            n -> n.getREFNation() == this);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/NationType.java b/src/net/sf/freecol/common/model/NationType.java
index 901af7503..47db2fa00 100644
--- a/src/net/sf/freecol/common/model/NationType.java
+++ b/src/net/sf/freecol/common/model/NationType.java
@@ -27,6 +27,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -130,12 +131,7 @@ public abstract class NationType extends FreeColGameObjectType {
      * @return The settlement type.
      */
     public SettlementType getSettlementType(boolean isCapital) {
-        for (SettlementType settlementType : getSettlementTypes()) {
-            if (settlementType.isCapital() == isCapital) {
-                return settlementType;
-            }
-        }
-        return null;
+        return find(getSettlementTypes(), s -> s.isCapital() == isCapital);
     }
 
     /**
@@ -145,10 +141,7 @@ public abstract class NationType extends FreeColGameObjectType {
      * @return The settlement type.
      */
     public SettlementType getSettlementType(String id) {
-        for (SettlementType settlementType : getSettlementTypes()) {
-            if (id.equals(settlementType.getId())) return settlementType;
-        }
-        return null;
+        return find(getSettlementTypes(), s -> id.equals(s.getId()));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index adc941e10..09d7d956e 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -1657,16 +1657,13 @@ public class Player extends FreeColGameObject implements Nameable {
     public StringTemplate checkDeclareIndependence() {
         if (getPlayerType() != PlayerType.COLONIAL)
             return StringTemplate.template("model.player.colonialIndependence");
-        Event event = getSpecification()
+        final Event event = getSpecification()
             .getEvent("model.event.declareIndependence");
-        for (Limit limit : event.getLimits()) {
-            if (!limit.evaluate(this)) {
-                return StringTemplate.template(limit.getDescriptionKey())
-                    .addAmount("%limit%",
-                        limit.getRightHandSide().getValue(getGame()));
-            }
-        }
-        return null;
+        Limit limit = find(event.getLimits(), l -> !l.evaluate(this));
+        return (limit == null) ? null
+            : StringTemplate.template(limit.getDescriptionKey())
+                .addAmount("%limit%", limit.getRightHandSide()
+                    .getValue(getGame()));
     }
 
     /**
@@ -2021,10 +2018,7 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return The unit with the given name, or null if none found.
      */
     public Unit getUnitByName(String name) {
-        for (Unit u : units) {
-            if (name.equals(u.getName())) return u;
-        }
-        return null;
+        return find(units, u -> name.equals(u.getName()));
     }
 
     /**
@@ -2223,10 +2217,7 @@ public class Player extends FreeColGameObject implements Nameable {
      * @param name The trade route name.
      */
     public TradeRoute getTradeRouteByName(String name) {
-        for (TradeRoute t : tradeRoutes) {
-            if (t.getName().equals(name)) return t;
-        }
-        return null;
+        return find(tradeRoutes, t -> t.getName().equals(name));
     }
 
     /**
@@ -2378,10 +2369,7 @@ public class Player extends FreeColGameObject implements Nameable {
      *     not found.
      */
     public Colony getColonyByName(String name) {
-        for (Colony colony : getColonies()) {
-            if (colony.getName().equals(name)) return colony;
-        }
-        return null;
+        return find(getColonies(), c -> c.getName().equals(name));
     }
 
     /**
@@ -2392,10 +2380,7 @@ public class Player extends FreeColGameObject implements Nameable {
      *     or null if not found.
      */
     public IndianSettlement getIndianSettlementByName(String name) {
-        for (IndianSettlement settlement : getIndianSettlements()) {
-            if (settlement.getName().equals(name)) return settlement;
-        }
-        return null;
+        return find(getIndianSettlements(), is -> is.getName().equals(name));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Settlement.java b/src/net/sf/freecol/common/model/Settlement.java
index b649e8a39..5c2f3e565 100644
--- a/src/net/sf/freecol/common/model/Settlement.java
+++ b/src/net/sf/freecol/common/model/Settlement.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -412,10 +413,8 @@ public abstract class Settlement extends GoodsLocation
 
         // To succeed, there must exist an available role for the unit
         // where the extra equipment for the role is present.
-        for (Role r : unit.getAvailableRoles(military)) {
-            if (canProvideGoods(unit.getGoodsDifference(r, 1))) return r;
-        }
-        return null;
+        return find(unit.getAvailableRoles(military),
+            r -> canProvideGoods(unit.getGoodsDifference(r, 1)));
     }
 
 
diff --git a/src/net/sf/freecol/common/model/SettlementType.java b/src/net/sf/freecol/common/model/SettlementType.java
index eb07ce05e..5ee3c2de4 100644
--- a/src/net/sf/freecol/common/model/SettlementType.java
+++ b/src/net/sf/freecol/common/model/SettlementType.java
@@ -26,6 +26,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -213,8 +214,7 @@ public class SettlementType extends FreeColGameObjectType {
      */
     public final RandomRange getPlunderRange(Unit unit) {
         return (plunder == null) ? null
-            : plunder.stream()
-                .filter(p -> p.appliesTo(unit)).findFirst().orElse(null);
+            : find(plunder, p -> p.appliesTo(unit));
     }
 
     /**
@@ -225,8 +225,7 @@ public class SettlementType extends FreeColGameObjectType {
      */
     public final RandomRange getGifts(Unit unit) {
         return (gifts == null) ? null
-            : gifts.stream()
-                .filter(g -> g.appliesTo(unit)).findFirst().orElse(null);
+            : find(gifts, g -> g.appliesTo(unit));
     }
 
 
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index 9c92ae610..810681dc6 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -33,6 +33,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -58,6 +59,7 @@ import net.sf.freecol.common.option.RangeOption;
 import net.sf.freecol.common.option.StringOption;
 import net.sf.freecol.common.option.TextOption;
 import net.sf.freecol.common.option.UnitListOption;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -1303,22 +1305,18 @@ public final class Specification {
      * @return The free colonist unit type.
      */
     public UnitType getDefaultUnitType(NationType nationType) {
-        for (UnitType ut : defaultUnitTypes) {
-            if (nationType == null) { // European is default
-                if (!ut.hasAbility(Ability.BORN_IN_INDIAN_SETTLEMENT)
-                    && !ut.hasAbility(Ability.REF_UNIT)) return ut;
-            } else if (nationType.isIndian()) {
-                if (ut.hasAbility(Ability.BORN_IN_INDIAN_SETTLEMENT)
-                    && !ut.hasAbility(Ability.REF_UNIT)) return ut;
-            } else if (nationType.isREF()) {
-                if (!ut.hasAbility(Ability.BORN_IN_INDIAN_SETTLEMENT)
-                    && ut.hasAbility(Ability.REF_UNIT)) return ut;
-            } else { // European
-                if (!ut.hasAbility(Ability.BORN_IN_INDIAN_SETTLEMENT)
-                    && !ut.hasAbility(Ability.REF_UNIT)) return ut;
-            }
-        }
-        return getDefaultUnitType();
+        Predicate<UnitType> p = (nationType == null)
+            ? ut -> !ut.hasAbility(Ability.BORN_IN_INDIAN_SETTLEMENT)
+                && !ut.hasAbility(Ability.REF_UNIT)
+            : (nationType.isIndian())
+            ? ut -> ut.hasAbility(Ability.BORN_IN_INDIAN_SETTLEMENT)
+                && !ut.hasAbility(Ability.REF_UNIT)
+            : (nationType.isREF())
+            ? ut -> !ut.hasAbility(Ability.BORN_IN_INDIAN_SETTLEMENT)
+                && ut.hasAbility(Ability.REF_UNIT)
+            : ut -> !ut.hasAbility(Ability.BORN_IN_INDIAN_SETTLEMENT)
+                && !ut.hasAbility(Ability.REF_UNIT);
+        return find(defaultUnitTypes, p, getDefaultUnitType());
     }
     
     /**
@@ -1564,11 +1562,7 @@ public final class Specification {
      *     ability, or null if none found.
      */
     public Role getRoleWithAbility(String id, List<Role> roles) {
-        if (roles == null) roles = getRoles();
-        for (Role r : roles) {
-            if (r.hasAbility(id)) return r;
-        }
-        return null;
+        return find(getRoles(), r -> r.hasAbility(id));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Tension.java b/src/net/sf/freecol/common/model/Tension.java
index 22c4c6099..ad4c0f7f1 100644
--- a/src/net/sf/freecol/common/model/Tension.java
+++ b/src/net/sf/freecol/common/model/Tension.java
@@ -20,6 +20,7 @@
 package net.sf.freecol.common.model;
 
 import net.sf.freecol.common.i18n.Messages;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -144,10 +145,8 @@ public class Tension implements Named {
      * @return The current level.
      */
     public final Level getLevel() {
-        for (Level level : Level.values()) {
-            if (value <= level.getLimit()) return level;
-        }
-        return Level.HATEFUL;
+        return find(Level.values(), level -> value <= level.getLimit(),
+            Level.HATEFUL);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index eb7302ea8..e1a4e9f85 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -38,8 +38,8 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.Direction;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.RandomChoice;
-
 import static net.sf.freecol.common.util.RandomUtils.*;
 
 
@@ -1390,10 +1390,8 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      * @return The most defensible adjacent land <code>Tile</code>.
      */
     public Tile getBestDisembarkTile(Player player) {
-        for (Tile t : getSafestSurroundingLandTiles(player)) {
-            if (t.isHighSeasConnected()) return t;
-        }
-        return null;
+        return find(getSafestSurroundingLandTiles(player),
+            Tile::isHighSeasConnected);
     }
 
     /**
@@ -2092,13 +2090,10 @@ public final class Tile extends UnitLocation implements Named, Ownable {
         if (getOwningSettlement() != null) {
             owner = getOwningSettlement().getOwner();
         }
-        if (owner != null && unit != null && unit.getOwner() != owner
-            && unit.getOwner().atWarWith(owner)) {
-            for (Unit enemyUnit : getUnitList()) {
-                if (enemyUnit.isOffensiveUnit()) return enemyUnit;
-            }
-        }
-        return null;
+        return (owner != null && unit != null && unit.getOwner() != owner
+            && unit.getOwner().atWarWith(owner))
+            ? find(getUnitList(), Unit::isOffensiveUnit)
+            : null;
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/TileItemContainer.java b/src/net/sf/freecol/common/model/TileItemContainer.java
index 35ea67466..717c695db 100644
--- a/src/net/sf/freecol/common/model/TileItemContainer.java
+++ b/src/net/sf/freecol/common/model/TileItemContainer.java
@@ -31,6 +31,7 @@ import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.Direction;
 import net.sf.freecol.common.model.Map.Layer;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -179,10 +180,8 @@ public class TileItemContainer extends FreeColGameObject {
      *     not found.
      */
     public final LostCityRumour getLostCityRumour() {
-        for (TileItem item : tileItems) {
-            if (item instanceof LostCityRumour) return (LostCityRumour)item;
-        }
-        return null;
+        return (LostCityRumour)find(tileItems,
+            ti -> ti instanceof LostCityRumour);
     }
 
     /**
@@ -191,10 +190,7 @@ public class TileItemContainer extends FreeColGameObject {
      * @return A <code>Resource</code> item, or null is none found.
      */
     public final Resource getResource() {
-        for (TileItem item : tileItems) {
-            if (item instanceof Resource) return (Resource)item;
-        }
-        return null;
+        return (Resource)find(tileItems, ti -> ti instanceof Resource);
     }
 
     /**
@@ -218,13 +214,9 @@ public class TileItemContainer extends FreeColGameObject {
      *     present, otherwise null.
      */
     public TileImprovement getImprovement(TileImprovementType type) {
-        for (TileItem item : tileItems) {
-            if (item instanceof TileImprovement
-                && ((TileImprovement)item).getType() == type) {
-                return (TileImprovement)item;
-            }
-        }
-        return null;
+        return (TileImprovement)find(tileItems,
+            ti -> ti instanceof TileImprovement
+                && ((TileImprovement)ti).getType() == type);
     }
 
     /**
@@ -234,13 +226,9 @@ public class TileItemContainer extends FreeColGameObject {
      *     not found.
      */
     public TileImprovement getRoad() {
-        for (TileItem item : tileItems) {
-            if (item instanceof TileImprovement
-                && ((TileImprovement)item).isRoad()) {
-                return (TileImprovement)item;
-            }
-        }
-        return null;
+        return (TileImprovement)find(tileItems,
+            ti -> ti instanceof TileImprovement
+                && ((TileImprovement)ti).isRoad());
     }
 
     /**
@@ -250,13 +238,9 @@ public class TileItemContainer extends FreeColGameObject {
      *     not found.
      */
     public TileImprovement getRiver() {
-        for (TileItem item : tileItems) {
-            if (item instanceof TileImprovement
-                && ((TileImprovement)item).isRiver()) {
-                return (TileImprovement)item;
-            }
-        }
-        return null;
+        return (TileImprovement)find(tileItems,
+            ti -> ti instanceof TileImprovement
+                && ((TileImprovement)ti).isRiver());
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/UnitType.java b/src/net/sf/freecol/common/model/UnitType.java
index 93da4ab49..8b89b525e 100644
--- a/src/net/sf/freecol/common/model/UnitType.java
+++ b/src/net/sf/freecol/common/model/UnitType.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -463,13 +464,9 @@ public final class UnitType extends BuildableType implements Consumer {
      */
     public UnitTypeChange getUnitTypeChange(ChangeType changeType,
                                             Player player) {
-        for (UnitTypeChange change : getTypeChanges()) {
-            if (change.asResultOf(changeType) && change.appliesTo(player)) {
-                UnitType result = change.getNewUnitType();
-                if (result.isAvailableTo(player)) return change;
-            }
-        }
-        return null;
+        return find(getTypeChanges(),
+            c -> c.asResultOf(changeType) && c.appliesTo(player)
+                && c.getNewUnitType().isAvailableTo(player));
     }
 
     /**
@@ -479,10 +476,7 @@ public final class UnitType extends BuildableType implements Consumer {
      * @return The type change, or null if impossible.
      */
     public UnitTypeChange getUnitTypeChange(UnitType newType) {
-        for (UnitTypeChange change : getTypeChanges()) {
-            if (change.getNewUnitType() == newType) return change;
-        }
-        return null;
+        return find(getTypeChanges(), c -> c.getNewUnitType() == newType);
     }
 
     /**
@@ -528,15 +522,10 @@ public final class UnitType extends BuildableType implements Consumer {
      *     maximum.
      */
     public UnitType getEducationUnit(int maximumSkill) {
-        for (UnitTypeChange change : getTypeChanges()) {
-            if (change.canBeTaught()) {
-                UnitType unitType = change.getNewUnitType();
-                if (unitType.hasSkill() && unitType.getSkill() <= maximumSkill) {
-                    return unitType;
-                }
-            }
-        }
-        return null;
+        return find(getTypeChanges().stream()
+                .filter(c -> c.canBeTaught())
+                .map(UnitTypeChange::getNewUnitType),
+            ut -> ut.hasSkill() && ut.getSkill() <= maximumSkill, null);
     }
 
     /**
@@ -547,14 +536,10 @@ public final class UnitType extends BuildableType implements Consumer {
      * @return The number of turns, or UNDEFINED if impossible.
      */
     public int getEducationTurns(UnitType unitType) {
-        for (UnitTypeChange change : getTypeChanges()) {
-            if (change.asResultOf(UnitTypeChange.ChangeType.EDUCATION)) {
-                if (unitType == change.getNewUnitType()) {
-                    return change.getTurnsToLearn();
-                }
-            }
-        }
-        return UNDEFINED;
+        UnitTypeChange utc = find(getTypeChanges(),
+            c -> c.asResultOf(UnitTypeChange.ChangeType.EDUCATION)
+                && unitType == c.getNewUnitType());
+        return (utc == null) ? UNDEFINED : utc.getTurnsToLearn();
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/WorkLocation.java b/src/net/sf/freecol/common/model/WorkLocation.java
index ab5f22fd4..126c1c714 100644
--- a/src/net/sf/freecol/common/model/WorkLocation.java
+++ b/src/net/sf/freecol/common/model/WorkLocation.java
@@ -31,6 +31,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.LogBuilder;
 import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.Utils;
@@ -542,13 +543,10 @@ public abstract class WorkLocation extends UnitLocation
     public UnitType getExpertUnitType() {
         final Specification spec = getSpecification();
         ProductionType pt = getBestProductionType(false, null);
-        if (pt != null) {
-            for (AbstractGoods goods : pt.getOutputs()) {
-                UnitType expert = spec.getExpertForProducing(goods.getType());
-                if (expert != null) return expert;
-            }
-        }
-        return null;
+        return (pt == null) ? null
+            : find(map(pt.getOutputs(),
+                    ag -> spec.getExpertForProducing(ag.getType())),
+                ut -> ut != null, null);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/option/AudioMixerOption.java b/src/net/sf/freecol/common/option/AudioMixerOption.java
index 80a5c24bd..e2c81db26 100644
--- a/src/net/sf/freecol/common/option/AudioMixerOption.java
+++ b/src/net/sf/freecol/common/option/AudioMixerOption.java
@@ -31,6 +31,7 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.Specification;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -145,10 +146,7 @@ public class AudioMixerOption extends AbstractOption<AudioMixerOption.MixerWrapp
      * @return The mixer wrapper with the name given, or null if none.
      */
     private MixerWrapper getMixerWrapperByName(String name) {
-        for (MixerWrapper mw : audioMixers) {
-            if (mw.getKey().equals(name)) return mw;
-        }
-        return null;
+        return find(audioMixers, mw -> mw.getKey().equals(name));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/option/LanguageOption.java b/src/net/sf/freecol/common/option/LanguageOption.java
index f0621e645..52e0627e3 100644
--- a/src/net/sf/freecol/common/option/LanguageOption.java
+++ b/src/net/sf/freecol/common/option/LanguageOption.java
@@ -35,6 +35,7 @@ import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.io.FreeColDirectories;
 import net.sf.freecol.common.model.Specification;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.Utils;
 
 
@@ -230,10 +231,7 @@ public class LanguageOption extends AbstractOption<LanguageOption.Language> {
      * @return The corresponding language, or null if none found.
      */
     private Language getLanguage(String key) {
-        for (Language l : languages) {
-            if (key.equals(l.getKey())) return l;
-        }
-        return null;
+        return find(languages, l -> key.equals(l.getKey()));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/util/CollectionUtils.java b/src/net/sf/freecol/common/util/CollectionUtils.java
index 59f9ffb6e..07d48527e 100644
--- a/src/net/sf/freecol/common/util/CollectionUtils.java
+++ b/src/net/sf/freecol/common/util/CollectionUtils.java
@@ -20,6 +20,7 @@
 package net.sf.freecol.common.util;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -30,8 +31,10 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.BinaryOperator;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -360,4 +363,87 @@ public class CollectionUtils {
                                        Predicate<T> predicate) {
         return collection.stream().filter(predicate).findFirst().isPresent();
     }
+
+    /**
+     * Simple stream search for the first item that matches a predicate.
+     *
+     * @param array The array to search.
+     * @param predicate A <code>Predicate</code> to match with.
+     * @return The item found, or fail if not found.
+     */
+    public static <T> T find(T[] array, Predicate<T> predicate, T fail) {
+        return find(Arrays.stream(array), predicate, fail);
+    }
+
+    /**
+     * Simple stream search for the first item that matches a predicate.
+     *
+     * @param collection The <code>Collection</code> to search.
+     * @param predicate A <code>Predicate</code> to match with.
+     * @return The item found, or fail if not found.
+     */
+    public static <T> T find(Collection<T> collection, Predicate<T> predicate) {
+        return find(collection, predicate, (T)null);
+    }
+
+    /**
+     * Simple stream search for the first item that matches a predicate.
+     *
+     * @param collection The <code>Collection</code> to search.
+     * @param predicate A <code>Predicate</code> to match with.
+     * @param fail The value to return if nothing is found.
+     * @return The item found, or fail if not found.
+     */
+    public static <T> T find(Collection<T> collection, Predicate<T> predicate,
+                             T fail) {
+        return find(collection.stream(), predicate, fail);
+    }
+
+    /**
+     * Simple stream search for the first item that matches a predicate.
+     *
+     * @param stream A <code>Stream</code> to search.
+     * @param predicate A <code>Predicate</code> to match with.
+     * @return The item found, or null if not found.
+     */
+    public static <T> T find(Stream<T> stream, Predicate<T> predicate) {
+        return find(stream, predicate, null);
+    }
+
+    /**
+     * Simple stream search for the first item that matches a predicate.
+     *
+     * @param stream A <code>Stream</code> to search.
+     * @param predicate A <code>Predicate</code> to match with.
+     * @param fail The value to return if nothing is found.
+     * @return The item found, or fail if not found.
+     */
+    public static <T> T find(Stream<T> stream, Predicate<T> predicate,
+                             T fail) {
+        return stream.filter(predicate).findFirst().orElse(fail);
+    }
+
+    /**
+     * Create a stream from an array and an immediate mapping transform.
+     *
+     * @param array The array to search.
+     * @param mapper A mapping <code>Function</code> to apply.
+     * @return The resulting <code>Stream</code>.
+     */
+    public static <T,R> Stream<R> map(T[] array,
+        Function<? super T,? extends R> mapper) {
+        return Arrays.stream(array).map(mapper);
+    }
+
+    /**
+     * Create a stream from a collection and an immediate mapping transform.
+     *
+     * @param collection The <code>Collection</code> to search.
+     * @param mapper A mapping <code>Function</code> to apply.
+     * @return The resulting <code>Stream</code>.
+     */
+    public static <T,R> Stream<R> map(Collection<T> collection,
+        Function<? super T,? extends R> mapper) {
+        return collection.stream().map(mapper);
+    }
 }
diff --git a/src/net/sf/freecol/server/FreeColServer.java b/src/net/sf/freecol/server/FreeColServer.java
index 643323329..333143143 100644
--- a/src/net/sf/freecol/server/FreeColServer.java
+++ b/src/net/sf/freecol/server/FreeColServer.java
@@ -68,6 +68,7 @@ import net.sf.freecol.common.networking.Connection;
 import net.sf.freecol.common.networking.DOMMessage;
 import net.sf.freecol.common.option.BooleanOption;
 import net.sf.freecol.common.option.OptionGroup;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.common.util.Utils;
 import net.sf.freecol.server.ai.AIInGameInputHandler;
@@ -1263,11 +1264,8 @@ public final class FreeColServer {
      * @return The player.
      */
     public ServerPlayer getPlayer(Connection connection) {
-        for (Player p : game.getPlayers()) {
-            ServerPlayer serverPlayer = (ServerPlayer)p;
-            if (serverPlayer.getConnection() == connection) return serverPlayer;
-        }
-        return null;
+        return (ServerPlayer)find(game.getPlayers(),
+            p -> ((ServerPlayer)p).getConnection() == connection);
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/AIColony.java b/src/net/sf/freecol/server/ai/AIColony.java
index bddcdc9f8..984c29743 100644
--- a/src/net/sf/freecol/server/ai/AIColony.java
+++ b/src/net/sf/freecol/server/ai/AIColony.java
@@ -63,6 +63,7 @@ import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.model.UnitWas;
 import net.sf.freecol.common.model.WorkLocation;
 import net.sf.freecol.common.networking.NetworkConstants;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.server.ai.mission.BuildColonyMission;
 import net.sf.freecol.server.ai.mission.DefendSettlementMission;
@@ -1064,14 +1065,8 @@ public class AIColony extends AIObject implements PropertyChangeListener {
      */
     public void requireGoodsWish(GoodsType type, int amount, int value,
                                  LogBuilder lb) {
-        GoodsWish gw = null;
-        for (Wish w : wishes) {
-            if (w instanceof GoodsWish
-                && ((GoodsWish)w).getGoodsType() == type) {
-                gw = (GoodsWish)w;
-                break;
-            }
-        }
+        GoodsWish gw = (GoodsWish)find(wishes, w -> w instanceof GoodsWish
+            && ((GoodsWish)w).getGoodsType() == type);
         if (gw != null) {
             gw.update(type, amount, gw.getValue() + 1);
             lb.add(", update ", gw);
@@ -1094,14 +1089,8 @@ public class AIColony extends AIObject implements PropertyChangeListener {
      */
     public void requireWorkerWish(UnitType type, boolean expertNeeded,
                                   int value, LogBuilder lb) {
-        WorkerWish ww = null;
-        for (Wish w : wishes) {
-            if (w instanceof WorkerWish
-                && ((WorkerWish)w).getUnitType() == type) {
-                ww = (WorkerWish)w;
-                break;
-            }
-        }
+        WorkerWish ww = (WorkerWish)find(wishes, w -> w instanceof WorkerWish
+            && ((WorkerWish)w).getUnitType() == type);
         if (ww != null) {
             ww.update(type, expertNeeded, ww.getValue() + 1);
             lb.add(", update ", ww);
@@ -1349,10 +1338,7 @@ public class AIColony extends AIObject implements PropertyChangeListener {
      */
     private TileImprovementPlan getPlanFor(Tile tile,
                                            List<TileImprovementPlan> plans) {
-        for (TileImprovementPlan tip : plans) {
-            if (tip.getTarget() == tile) return tip;
-        }
-        return null;
+        return find(plans, tip -> tip.getTarget() == tile);
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/ColonyPlan.java b/src/net/sf/freecol/server/ai/ColonyPlan.java
index 0b45b9815..55a7234f6 100644
--- a/src/net/sf/freecol/server/ai/ColonyPlan.java
+++ b/src/net/sf/freecol/server/ai/ColonyPlan.java
@@ -50,6 +50,7 @@ import net.sf.freecol.common.model.Role;
 import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
 import net.sf.freecol.common.model.WorkLocation;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.LogBuilder;
 
 
@@ -246,10 +247,8 @@ public class ColonyPlan {
      * @return The best current <code>BuildableType</code>.
      */
     public BuildableType getBestBuildableType() {
-        for (BuildPlan b : buildPlans) {
-            if (colony.canBuild(b.type)) return b.type;
-        }
-        return null;
+        BuildPlan bp = find(buildPlans, p -> colony.canBuild(p.type));
+        return (bp == null) ? null : bp.type;
     }
 
     /**
@@ -596,10 +595,7 @@ public class ColonyPlan {
      * @return A <code>BuildPlan</code> with this type, or null if not found.
      */
     private BuildPlan findBuildPlan(BuildableType type) {
-        for (BuildPlan bp : buildPlans) {
-            if (bp.type == type) return bp;
-        }
-        return null;
+        return find(buildPlans, bp -> bp.type == type);
     }
 
     /**
@@ -1030,10 +1026,7 @@ public class ColonyPlan {
      */
     private WorkLocationPlan findPlan(GoodsType goodsType,
                                       List<WorkLocationPlan> plans) {
-        for (WorkLocationPlan wlp : plans) {
-            if (wlp.getGoodsType() == goodsType) return wlp;
-        }
-        return null;
+        return find(plans, wlp -> wlp.getGoodsType() == goodsType);
     }
 
     /**
diff --git a/src/net/sf/freecol/server/ai/REFAIPlayer.java b/src/net/sf/freecol/server/ai/REFAIPlayer.java
index a6e71c324..ff195816c 100644
--- a/src/net/sf/freecol/server/ai/REFAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/REFAIPlayer.java
@@ -258,13 +258,8 @@ public class REFAIPlayer extends EuropeanAIPlayer {
         final Random aiRandom = getAIRandom();
         // Find a representative offensive land unit to use to search
         // for the initial target.
-        AIUnit aiUnit = null;
-        for (AIUnit aiu : getAIUnits()) {
-            if (!aiu.getUnit().isNaval() && aiu.getUnit().isOffensiveUnit()) {
-                aiUnit = aiu;
-                break;
-            }
-        }
+        AIUnit aiUnit = find(getAIUnits(), aiu -> !aiu.getUnit().isNaval()
+            && aiu.getUnit().isOffensiveUnit());
         if (aiUnit == null) {
             logger.warning("REF has no army?!?");
             return false;
diff --git a/src/net/sf/freecol/server/ai/goal/ManageMissionariesGoal.java b/src/net/sf/freecol/server/ai/goal/ManageMissionariesGoal.java
index 90282c884..d9b5c949f 100644
--- a/src/net/sf/freecol/server/ai/goal/ManageMissionariesGoal.java
+++ b/src/net/sf/freecol/server/ai/goal/ManageMissionariesGoal.java
@@ -31,6 +31,7 @@ import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.IndianSettlement;
 import net.sf.freecol.common.model.PathNode;
 import net.sf.freecol.common.model.Tile;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.server.ai.AIPlayer;
 import net.sf.freecol.server.ai.AIUnit;
 
@@ -160,24 +161,16 @@ public class ManageMissionariesGoal extends Goal {
 
 
     private IndianSettlement findSettlement(Tile tile) {
-        if (tile == null) {
+        return (tile == null)
             //FIXME: We're in europe - let's deal with it.
-            return null;
-        } else {
+            ? null
             //Possible FIXME: Slightly randomize findings?
             //Otherwise, missionaries starting from the same position will find
             //the same settlement.
-
-            for (Tile t : tile.getSurroundingTiles(MAX_SEARCH_RADIUS)) {
-                IndianSettlement is = t.getIndianSettlement();
-                if (is != null && !is.hasMissionary(player.getPlayer())) {
-                    //FIXME: Check if this settlement is reachable
-                    return is;
-                }
-            }
-        }
-        //FIXME: We didn't find a settlement in range - what now?
-        return null;
+            : find(map(tile.getSurroundingTiles(1, MAX_SEARCH_RADIUS),
+                    t -> t.getIndianSettlement()),
+                is -> is != null && !is.hasMissionary(player.getPlayer()),
+                null);
     }
 
 
diff --git a/src/net/sf/freecol/server/ai/mission/TransportMission.java b/src/net/sf/freecol/server/ai/mission/TransportMission.java
index 67127ab7e..b62c14e76 100644
--- a/src/net/sf/freecol/server/ai/mission/TransportMission.java
+++ b/src/net/sf/freecol/server/ai/mission/TransportMission.java
@@ -243,16 +243,9 @@ public class TransportMission extends Mission {
      * @return The <code>Cargo</code> found, or null if none found.
      */
     private Cargo tFind(TransportableAIObject t) {
-        Cargo result = null;
         synchronized (cargoes) {
-            for (Cargo cargo : cargoes) {
-                if (cargo.getTransportable() == t) {
-                    result = cargo;
-                    break;
-                }
-            }
+            return find(cargoes, c -> c.getTransportable() == t);
         }
-        return result;
     }
 
     /**
@@ -261,16 +254,9 @@ public class TransportMission extends Mission {
      * @return The first valid cargo, or null if none found.
      */
     private Cargo tFirst() {
-        Cargo cargo = null;
         synchronized (cargoes) {
-            for (Cargo c : cargoes) {
-                if (c.isValid()) {
-                    cargo = c;
-                    break;
-                }
-            }
+            return find(cargoes, Cargo::isValid);
         }
-        return cargo;
     }
 
     /**
@@ -340,17 +326,12 @@ public class TransportMission extends Mission {
      * Reset the carrier target after a change to the first cargo.
      */
     private void tRetarget() {
-        Location next = null;
+        Cargo c;
         synchronized (cargoes) {
-            for (Cargo cargo : cargoes) {
-                if (cargo.isValid()) {
-                    next = cargo.getCarrierTarget();
-                    break;
-                }
-            }
-            if (next == null) next = getAIUnit().getTrivialTarget();
+            c = find(cargoes, Cargo::isValid);
         }
-        setTarget(Location.upLoc(next));
+        setTarget(Location.upLoc((c == null) ? getAIUnit().getTrivialTarget()
+                : c.getCarrierTarget()));
     }
 
     // Medium-level cargo and target manipulation, should be kept
diff --git a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
index 156ec3965..673288190 100644
--- a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
+++ b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
@@ -966,12 +966,7 @@ public class SimpleMapGenerator implements MapGenerator {
             lb.add("Could not find a debug colony site.\n");
             return;
         }
-        for (TileType t : spec.getTileTypeList()) {
-            if (!t.isWater()) {
-                colonyTile.setType(t);
-                break;
-            }
-        }
+        colonyTile.setType(find(spec.getTileTypeList(), t -> !t.isWater()));
         unitType = spec.getUnitType("model.unit.expertFarmer");
         Unit buildColonyUnit = new ServerUnit(game, colonyTile,
                                               player, unitType);
diff --git a/src/net/sf/freecol/server/model/ServerGame.java b/src/net/sf/freecol/server/model/ServerGame.java
index 78274fcc5..21413438e 100644
--- a/src/net/sf/freecol/server/model/ServerGame.java
+++ b/src/net/sf/freecol/server/model/ServerGame.java
@@ -55,6 +55,7 @@ import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Tile;
 import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.server.control.ChangeSet;
 import net.sf.freecol.server.control.ChangeSet.ChangePriority;
@@ -229,39 +230,23 @@ public class ServerGame extends Game implements ServerModelObject {
      * @return The <code>Player</code> who has won the game or null if none.
      */
     public Player checkForWinner() {
-        Specification spec = getSpecification();
+        final Specification spec = getSpecification();
         if (spec.getBoolean(GameOptions.VICTORY_DEFEAT_REF)) {
-            for (Player player : getLiveEuropeanPlayers(null)) {
-                if (player.getPlayerType() == Player.PlayerType.INDEPENDENT) {
-                    return player;
-                }
-            }
+            Player winner = find(getLiveEuropeanPlayers(null),
+                p -> p.getPlayerType() == Player.PlayerType.INDEPENDENT);
+            if (winner != null) return winner;
         }
         if (spec.getBoolean(GameOptions.VICTORY_DEFEAT_EUROPEANS)) {
-            Player winner = null;
-            for (Player player : getLiveEuropeanPlayers(null)) {
-                if (!player.isREF()) {
-                    if (winner != null) { // A live European player
-                        winner = null;
-                        break;
-                    }
-                    winner = player;
-                }
-            }
-            if (winner != null) return winner;
+            List<Player> winners = getLiveEuropeanPlayers(null).stream()
+                .filter(p -> !p.isREF())
+                .collect(Collectors.toList());
+            if (winners.size() == 1) return winners.get(0);
         }
         if (spec.getBoolean(GameOptions.VICTORY_DEFEAT_HUMANS)) {
-            Player winner = null;
-            for (Player player : getLiveEuropeanPlayers(null)) {
-                if (!player.isAI()) {
-                    if (winner != null) { // A live human player
-                        winner = null;
-                        break;
-                    }
-                    winner = player;
-                }
-            }
-            if (winner != null) return winner;
+            List<Player> winners = getLiveEuropeanPlayers(null).stream()
+                .filter(p -> !p.isAI())
+                .collect(Collectors.toList());
+            if (winners.size() == 1) return winners.get(0);
         }
         return null;
     }
@@ -351,8 +336,7 @@ public class ServerGame extends Game implements ServerModelObject {
             // Human players can trigger the event, but only transfer assets
             // between AI players.
             if (player.isAI()) { 
-                scores.put(player,
-                        player.getSpanishSuccessionScore());
+                scores.put(player, player.getSpanishSuccessionScore());
             }
         }
         if (!ready) return null; // No player meets the support limit.

From a6ef5596a73785370b3b7295fcc157e6703a7c66 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 4 Oct 2015 18:56:43 +0200
Subject: [PATCH 295/323] Update tested minimum version number to Java 1.8

---
 src/net/sf/freecol/FreeCol.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index 0b890721e..8fb6b2a22 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -112,7 +112,7 @@ public final class FreeCol {
     private static final int    EUROPEANS_DEFAULT = 4;
     private static final int    EUROPEANS_MIN = 1;
     private static final Level  LOGLEVEL_DEFAULT = Level.INFO;
-    private static final String JAVA_VERSION_MIN = "1.7";
+    private static final String JAVA_VERSION_MIN = "1.8";
     private static final int    MEMORY_MIN = 128; // Mbytes
     private static final int    PORT_DEFAULT = 3541;
     private static final String SPLASH_DEFAULT = "splash.jpg";

From 788407926d2ec7d28ddc834d79d75ea586f37865 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 5 Oct 2015 10:30:50 +1030
Subject: [PATCH 296/323] Tighten UnitListOption backward compatibility,
 BR#2920.

---
 src/net/sf/freecol/common/model/Specification.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index 810681dc6..772a78d71 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -2541,7 +2541,7 @@ public final class Specification {
             Option op = level.getOption(gr);
             if (op instanceof OptionGroup) {
                 OptionGroup og = (OptionGroup)op;
-                if ((op = og.getOption(id)) != null) return null;
+                if (og.getOption(id) instanceof UnitListOption) continue;
                 if (ulo == null) ulo = new UnitListOption(id, this);
                 og.add(ulo);
             }

From 81cebbd2bc5f49e38322c3903106a180ff7ba9d9 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Mon, 5 Oct 2015 10:48:29 +1030
Subject: [PATCH 297/323] Lazy initialization of monarch forces, preventing
 sequence problem in multiplayer, BR#2920.

---
 src/net/sf/freecol/common/model/Monarch.java | 137 +++++++++----------
 1 file changed, 65 insertions(+), 72 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Monarch.java b/src/net/sf/freecol/common/model/Monarch.java
index c13206bb0..1fda92651 100644
--- a/src/net/sf/freecol/common/model/Monarch.java
+++ b/src/net/sf/freecol/common/model/Monarch.java
@@ -358,17 +358,6 @@ public final class Monarch extends FreeColGameObject implements Named {
      */
     private Force interventionForce;
 
-    /**
-     * A force of mercenaries, which some random country will offer to
-     * send to support the player's rebellion.
-     */
-    private Force mercenaryForce;
-
-    /**
-     * A force of military units typically provided when the monarch declares
-     * war.
-     */
-    private Force warSupportForce;
     
     // Caches.  Do not serialize.
     /** The naval unit types suitable for support actions. */
@@ -403,7 +392,9 @@ public final class Monarch extends FreeColGameObject implements Named {
         }
         this.player = player;
 
-        requireForces();
+        // The Forces rely on the spec, but in the client we have to
+        // create a player(with monarch) before the spec arrives from
+        // the server, so the Forces *must* be instantiated lazily.
     }
 
     /**
@@ -417,59 +408,61 @@ public final class Monarch extends FreeColGameObject implements Named {
     public Monarch(Game game, String id) {
         super(game, id);
 
-        // @compat 0.10.7(REF), 0.11.1(Intervention,Mecenary),
-        //   0.11.3(War Support)
-        requireForces();
-        // end @compat 0.11.3
+        // The Forces rely on the spec, but in the client we have to
+        // create a player(with monarch) before the spec arrives from
+        // the server, so the Forces *must* be instantiated lazily.
     }
 
 
-    /**
-     * Various Forces have been introduced (or renamed in the case of
-     * the REF) at various points of FreeCol history.  To ensure
-     * compatibility, check if they are empty and if so initialize
-     * from the corresponding option.
-     *
-     * Can be moved back into the main constructor in due course.
-     */
-    private void requireForces() {
-        final Specification spec = getSpecification();
-        UnitListOption op;
-        op = (UnitListOption)spec.getOption(GameOptions.REF_FORCE);
-        expeditionaryForce = new Force(op, Ability.REF_UNIT);
-        op = (UnitListOption)spec.getOption(GameOptions.MERCENARY_FORCE);
-        mercenaryForce = new Force(op, null);
-        op = (UnitListOption)spec.getOption(GameOptions.INTERVENTION_FORCE);
-        interventionForce = new Force(op, null);
-        op = (UnitListOption)spec.getOption(GameOptions.WAR_SUPPORT_FORCE);
-        warSupportForce = new Force(op, null);
-    }
-
     /**
      * Get the force describing the REF.
      *
-     * @return The REF.
+     * @return The REF <code>Force</code>.
      */
     public Force getExpeditionaryForce() {
+        if (expeditionaryForce == null) {
+            final Specification spec = getSpecification();
+            expeditionaryForce = new Force((UnitListOption)spec.getOption(GameOptions.REF_FORCE), null);
+        }
         return expeditionaryForce;
     }
 
     /**
      * Get the force describing the Intervention Force.
      *
-     * @return The Intervention Force.
+     * @return The intervention <code>Force</code>.
      */
     public Force getInterventionForce() {
+        if (interventionForce == null) {
+            final Specification spec = getSpecification();
+            interventionForce = new Force((UnitListOption)spec.getOption(GameOptions.INTERVENTION_FORCE), null);
+        }
         return interventionForce;
     }
 
     /**
      * Gets the force describing the Mercenary Force.
      *
-     * @return The Mercenary Force.
+     * This is never updated, and directly derived from the spec.
+     *
+     * @return The mercenary <code>Force</code>.
      */
     public Force getMercenaryForce() {
-        return mercenaryForce;
+        final Specification spec = getSpecification();
+        return new Force((UnitListOption)spec.getOption(GameOptions.MERCENARY_FORCE), null);
+    }
+
+    /**
+     * Get the war support force.
+     *
+     * This is never updated, and directly derived from the spec.
+     *
+     * @return The war support <code>Force</code>.
+     */
+    public Force getWarSupportForce() {
+        final Specification spec = getSpecification();
+        return new Force((UnitListOption)spec
+            .getOption(GameOptions.WAR_SUPPORT_FORCE), null);
     }
 
     /**
@@ -747,8 +740,9 @@ public final class Monarch extends FreeColGameObject implements Named {
         // Preserve some extra naval capacity so that not all the REF
         // navy is completely loaded
         // FIXME: magic number 2.5 * Manowar-capacity = 15
-        boolean needNaval = expeditionaryForce.getCapacity()
-            < expeditionaryForce.getSpaceRequired() + 15;
+        Force ref = getExpeditionaryForce();
+        boolean needNaval = ref.getCapacity()
+            < ref.getSpaceRequired() + 15;
         List<UnitType> types = (needNaval) ? navalREFUnitTypes
             : landREFUnitTypes;
         if (types.isEmpty()) return null;
@@ -764,8 +758,8 @@ public final class Monarch extends FreeColGameObject implements Named {
             : randomInt(logger, "Choose land#", random, 3) + 1;
         AbstractUnit result = new AbstractUnit(unitType, role.getId(), number);
         logger.info("Add to " + player.getDebugName()
-            + " REF: capacity=" + expeditionaryForce.getCapacity()
-            + " spaceRequired=" + expeditionaryForce.getSpaceRequired()
+            + " REF: capacity=" + ref.getCapacity()
+            + " spaceRequired=" + ref.getSpaceRequired()
             + " => " + result);
         return result;
     }
@@ -779,16 +773,17 @@ public final class Monarch extends FreeColGameObject implements Named {
         Specification spec = getSpecification();
         int interventionTurns = spec.getInteger(GameOptions.INTERVENTION_TURNS);
         if (interventionTurns > 0) {
+            Force ivf = getInterventionForce();
             int updates = getGame().getTurn().getNumber() / interventionTurns;
-            for (AbstractUnit unit : interventionForce.getLandUnits()) {
+            for (AbstractUnit unit : ivf.getLandUnits()) {
                 // add units depending on current turn
                 int value = unit.getNumber() + updates;
                 unit.setNumber(value);
             }
-            interventionForce.updateSpaceAndCapacity();
-            while (interventionForce.getCapacity() < interventionForce.getSpaceRequired()) {
+            ivf.updateSpaceAndCapacity();
+            while (ivf.getCapacity() < ivf.getSpaceRequired()) {
                 boolean progress = false;
-                for (AbstractUnit ship : interventionForce.getNavalUnits()) {
+                for (AbstractUnit ship : ivf.getNavalUnits()) {
                     // add ships until all units can be transported at once
                     if (ship.getType(spec).canCarryUnits()
                         && ship.getType(spec).getSpace() > 0) {
@@ -798,7 +793,7 @@ public final class Monarch extends FreeColGameObject implements Named {
                     }
                 }
                 if (!progress) break;
-                interventionForce.updateSpaceAndCapacity();
+                ivf.updateSpaceAndCapacity();
             }
         }
     }
@@ -902,9 +897,10 @@ public final class Monarch extends FreeColGameObject implements Named {
         double p = 10.0 * (NOSUPPORT - strengthRatio);
         if (p >= 1.0 // Avoid calling randomDouble if unnecessary
             || (p > 0.0 && p > randomDouble(logger, "War support?", random))) {
-            result.addAll(warSupportForce.getUnits());
+            Force wsf = getWarSupportForce();
+            result.addAll(wsf.getUnits());
             double supportStrength, fullRatio, strength, ratio;
-            supportStrength = warSupportForce.calculateStrength(false);
+            supportStrength = wsf.calculateStrength(false);
             fullRatio = Player.strengthRatio(baseStrength + supportStrength,
                                              enemyStrength);
             if (fullRatio < NOSUPPORT) { // Full support, some randomization
@@ -1016,7 +1012,8 @@ public final class Monarch extends FreeColGameObject implements Named {
         // @compat 0.10.x
         // Detects/fixes bogus expeditionary force roles
         List<AbstractUnit> todo = new ArrayList<>();
-        Iterator<AbstractUnit> it = expeditionaryForce.getLandUnits()
+        Force ref = getExpeditionaryForce();
+        Iterator<AbstractUnit> it = ref.getLandUnits()
             .iterator();
         while (it.hasNext()) {
             AbstractUnit au = it.next();
@@ -1041,7 +1038,7 @@ public final class Monarch extends FreeColGameObject implements Named {
                 }
             }
         }
-        for (AbstractUnit au : todo) expeditionaryForce.add(au);
+        for (AbstractUnit au : todo) ref.add(au);
         // end @compat 0.10.x
         return result;
     }
@@ -1052,12 +1049,14 @@ public final class Monarch extends FreeColGameObject implements Named {
     private static final String DISPLEASURE_TAG = "displeasure";
     private static final String EXPEDITIONARY_FORCE_TAG = "expeditionaryForce";
     private static final String INTERVENTION_FORCE_TAG = "interventionForce";
-    private static final String MERCENARY_FORCE_TAG = "mercenaryForce";
     private static final String PLAYER_TAG = "player";
     private static final String SUPPORT_SEA_TAG = "supportSea";
     // @compat 0.11.1
     private static final String NAME_TAG = "name";
     // end @compat 0.11.1
+    // @compat 0.11.5
+    private static final String MERCENARY_FORCE_TAG = "mercenaryForce";
+    // end @compat 0.11.5
 
 
     /**
@@ -1086,11 +1085,9 @@ public final class Monarch extends FreeColGameObject implements Named {
 
         if (xw.validFor(this.player)) {
 
-            expeditionaryForce.toXML(xw, EXPEDITIONARY_FORCE_TAG);
+            getExpeditionaryForce().toXML(xw, EXPEDITIONARY_FORCE_TAG);
 
-            interventionForce.toXML(xw, INTERVENTION_FORCE_TAG);
-
-            mercenaryForce.toXML(xw, MERCENARY_FORCE_TAG);
+            getInterventionForce().toXML(xw, INTERVENTION_FORCE_TAG);
         }
     }
 
@@ -1114,19 +1111,11 @@ public final class Monarch extends FreeColGameObject implements Named {
      */
     @Override
     protected void readChildren(FreeColXMLReader xr) throws XMLStreamException {
-        super.readChildren(xr);
+        // Provide dummy forces to read into.
+        if (expeditionaryForce == null) expeditionaryForce = new Force();
+        if (interventionForce == null) interventionForce = new Force();
 
-        // @compat 0.10.5
-        // Intervention and mercenary forces introduced here.  Add
-        // default definitions for the benefit of earlier versions.        
-        final Specification spec = getSpecification();
-        if (interventionForce.getUnits().isEmpty()) {
-            interventionForce = new Force((UnitListOption)spec.getOption(GameOptions.INTERVENTION_FORCE), null);
-        }
-        if (mercenaryForce.getUnits().isEmpty()) {
-            mercenaryForce = new Force((UnitListOption)spec.getOption(GameOptions.MERCENARY_FORCE), null);
-        }
-        // end @compat
+        super.readChildren(xr);
     }
 
     /**
@@ -1154,8 +1143,12 @@ public final class Monarch extends FreeColGameObject implements Named {
             }
         // end @compat
 
+        // @compat 0.11.5
+        // Mercenary force is never updated, and lives in the spec now, so
+        // just read and discard it.
         } else if (MERCENARY_FORCE_TAG.equals(tag)) {
-            mercenaryForce.readFromXML(xr);
+            new Force().readFromXML(xr);
+        // end @compat 0.11.5
             
         // @compat 0.10.5
         } else if (Force.NAVAL_UNITS_TAG.equals(tag)) {

From 93a95e020189b27cce228519be39a70a40cda5f6 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 2 Oct 2015 10:46:30 +0930
Subject: [PATCH 298/323] Syntactic sugar for the *Match routines.

---
 .../client/gui/panel/BuildQueuePanel.java     |  9 ++--
 .../gui/panel/DefaultTransferHandler.java     |  4 +-
 .../gui/panel/TradeRouteInputPanel.java       |  6 +--
 .../client/gui/panel/UnitDetailPanel.java     |  4 +-
 src/net/sf/freecol/common/i18n/Rule.java      |  7 ++--
 .../sf/freecol/common/io/FreeColDataFile.java |  4 +-
 .../freecol/common/model/BuildableType.java   |  6 +--
 src/net/sf/freecol/common/model/Colony.java   | 33 +++++++--------
 src/net/sf/freecol/common/model/Effect.java   |  3 +-
 src/net/sf/freecol/common/model/Feature.java  | 10 ++---
 .../common/model/FeatureContainer.java        |  4 +-
 .../freecol/common/model/FoundingFather.java  |  3 +-
 src/net/sf/freecol/common/model/Game.java     |  2 +-
 .../freecol/common/model/GoodsContainer.java  | 10 ++---
 .../freecol/common/model/GoodsLocation.java   |  4 +-
 .../common/model/IndianSettlement.java        |  2 +-
 src/net/sf/freecol/common/model/LandMap.java  | 10 ++---
 src/net/sf/freecol/common/model/Player.java   | 24 +++++------
 .../freecol/common/model/ProductionCache.java | 10 +++--
 .../freecol/common/model/ProductionType.java  |  4 +-
 .../sf/freecol/common/model/RandomRange.java  |  3 +-
 .../sf/freecol/common/model/Settlement.java   | 10 ++---
 .../common/model/SimpleCombatModel.java       | 10 ++---
 .../freecol/common/model/Specification.java   |  6 +--
 src/net/sf/freecol/common/model/Tile.java     | 27 ++++++------
 .../common/model/TileImprovementType.java     |  6 +--
 .../common/model/TileItemContainer.java       |  3 +-
 .../sf/freecol/common/model/TradeRoute.java   |  5 ++-
 .../freecol/common/model/TradeRouteStop.java  | 15 ++++---
 src/net/sf/freecol/common/model/Unit.java     |  7 ++--
 .../sf/freecol/common/model/UnitLocation.java |  6 +--
 src/net/sf/freecol/common/model/UnitType.java |  4 +-
 .../freecol/common/model/UnitTypeChange.java  |  3 +-
 .../common/model/mission/CompoundMission.java |  3 +-
 .../model/mission/ImprovementMission.java     |  7 +++-
 .../sf/freecol/common/option/ListOption.java  |  3 +-
 .../sf/freecol/common/option/OptionGroup.java |  4 +-
 .../freecol/common/util/CollectionUtils.java  | 42 +++++++++++++++++++
 src/net/sf/freecol/server/ai/AIColony.java    |  4 +-
 src/net/sf/freecol/server/ai/REFAIPlayer.java | 12 +++---
 .../server/control/InGameController.java      |  3 +-
 .../sf/freecol/server/generator/River.java    | 18 ++++----
 .../server/generator/SimpleMapGenerator.java  |  3 +-
 .../server/generator/TerrainGenerator.java    | 13 +++---
 .../sf/freecol/server/model/ServerColony.java |  6 +--
 .../sf/freecol/server/model/ServerGame.java   |  2 +-
 46 files changed, 211 insertions(+), 173 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
index b17828b2d..8f57b3cd0 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
@@ -86,7 +86,7 @@ import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Turn;
 import net.sf.freecol.common.model.UnitType;
-
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -165,8 +165,7 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
              */
             @Override
             public boolean isDataFlavorSupported(DataFlavor flavor) {
-                return Arrays.stream(supportedFlavors)
-                    .anyMatch(f -> f.equals(flavor));
+                return any(supportedFlavors, f -> f.equals(flavor));
             }
         }
 
@@ -337,8 +336,8 @@ public class BuildQueuePanel extends FreeColPanel implements ItemListener {
          */
         @Override
         public boolean canImport(JComponent comp, DataFlavor[] flavors) {
-            return flavors != null && Arrays.stream(flavors)
-                .anyMatch(f -> f.equals(BUILD_LIST_FLAVOR));
+            return flavors != null
+                && any(flavors, f -> f.equals(BUILD_LIST_FLAVOR));
         }
 
         /**
diff --git a/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java b/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
index 944ed897a..cb1e23196 100644
--- a/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
+++ b/src/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java
@@ -59,6 +59,7 @@ import net.sf.freecol.common.model.GoodsLocation;
 import net.sf.freecol.common.model.GoodsType;
 import net.sf.freecol.common.model.Role;
 import net.sf.freecol.common.model.Unit;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -279,8 +280,7 @@ public final class DefaultTransferHandler extends TransferHandler {
     @Override
     public boolean canImport(JComponent comp, DataFlavor[] flavor) {
         return (comp instanceof JPanel || comp instanceof JLabel)
-            && Arrays.stream(flavor)
-                .anyMatch(f -> f.equals(DefaultTransferHandler.flavor));
+            && any(flavor, f -> f.equals(DefaultTransferHandler.flavor));
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java b/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
index 0bf7a41cc..056e1fdae 100644
--- a/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
@@ -69,6 +69,7 @@ import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.TradeRoute;
 import net.sf.freecol.common.model.TradeRouteStop;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -224,8 +225,7 @@ public final class TradeRouteInputPanel extends FreeColPanel
 
         @Override
         public boolean canImport(JComponent c, DataFlavor[] flavors) {
-            return Arrays.stream(flavors)
-                .anyMatch(f -> f.equals(DefaultTransferHandler.flavor));
+            return any(flavors, f -> f.equals(DefaultTransferHandler.flavor));
         }
     }
 
@@ -342,7 +342,7 @@ public final class TradeRouteInputPanel extends FreeColPanel
          */
         @Override
         public boolean canImport(JComponent c, DataFlavor[] flavors) {
-            return Arrays.stream(flavors).anyMatch(f -> f.equals(STOP_FLAVOR));
+            return any(flavors, f -> f.equals(STOP_FLAVOR));
         }
 
         /**
diff --git a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
index 8822d8b4e..1390a4472 100644
--- a/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/UnitDetailPanel.java
@@ -50,6 +50,7 @@ import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.UnitType;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.RandomChoice;
 
 
@@ -156,8 +157,7 @@ public class UnitDetailPanel extends ColopediaGameObjectTypePanel<UnitType> {
             }
 
             List<IndianNationType> nations = spec.getIndianNationTypes().stream()
-                .filter(nt -> nt.getSkills().stream()
-                    .anyMatch(ut -> ut.getObject() == type))
+                .filter(nt -> any(nt.getSkills(), ut -> ut.getObject() == type))
                 .collect(Collectors.toList());
             if (!nations.isEmpty()) {
                 panel.add(Utility.localizedLabel("colopedia.unit.natives"), "newline");
diff --git a/src/net/sf/freecol/common/i18n/Rule.java b/src/net/sf/freecol/common/i18n/Rule.java
index 6c096b859..3b47383ac 100644
--- a/src/net/sf/freecol/common/i18n/Rule.java
+++ b/src/net/sf/freecol/common/i18n/Rule.java
@@ -24,6 +24,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
+import static net.sf.freecol.common.util.CollectionUtils.*;
+
 
 /**
  * A rule consists of any number of relations combined with "and" and
@@ -59,9 +61,8 @@ public class Rule {
      * @return True if the number matches this rule.
      */
     public boolean matches(double number) {
-        return conditions.stream()
-            .anyMatch(andConditions ->
-                andConditions.stream().allMatch(r -> r.matches(number)));
+        return any(conditions,
+            andConditions -> all(andConditions, r -> r.matches(number)));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/io/FreeColDataFile.java b/src/net/sf/freecol/common/io/FreeColDataFile.java
index 1aaed140f..7e361a362 100644
--- a/src/net/sf/freecol/common/io/FreeColDataFile.java
+++ b/src/net/sf/freecol/common/io/FreeColDataFile.java
@@ -43,7 +43,7 @@ import net.sf.freecol.common.resources.ResourceFactory;
 import net.sf.freecol.common.resources.ResourceMapper;
 import net.sf.freecol.common.resources.ResourceMapping;
 import net.sf.freecol.common.util.LogBuilder;
-
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -285,7 +285,7 @@ public class FreeColDataFile {
                 ? false
                 : (requiredFile != null && f.isDirectory())
                 ? new File(f, requiredFile).exists()
-                : Arrays.stream(endings).anyMatch(e -> name.endsWith("." + e)
+                : any(endings, e -> name.endsWith("." + e)
                     && name.length() > e.length());
         };
     }
diff --git a/src/net/sf/freecol/common/model/BuildableType.java b/src/net/sf/freecol/common/model/BuildableType.java
index 860fe051f..5e6c3e22c 100644
--- a/src/net/sf/freecol/common/model/BuildableType.java
+++ b/src/net/sf/freecol/common/model/BuildableType.java
@@ -33,6 +33,7 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.StringTemplate;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -135,9 +136,8 @@ public abstract class BuildableType extends FreeColGameObjectType {
      */
     public boolean isAvailableTo(FreeColObject... fco) {
         return (requiredAbilities == null) ? true
-            : requiredAbilities.entrySet().stream()
-                .allMatch(e -> e.getValue() == Arrays.stream(fco)
-                    .anyMatch(o -> o.hasAbility(e.getKey())));
+            : all(requiredAbilities.entrySet(),
+                e -> e.getValue() == any(fco, o -> o.hasAbility(e.getKey())));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
index 32bf35fc3..a51da52fa 100644
--- a/src/net/sf/freecol/common/model/Colony.java
+++ b/src/net/sf/freecol/common/model/Colony.java
@@ -665,8 +665,7 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     public List<WorkLocation> getWorkLocationsForConsuming(GoodsType goodsType) {
         return getCurrentWorkLocations().stream()
-            .filter(wl -> wl.getInputs().stream()
-                .anyMatch(ag -> ag.getType() == goodsType))
+            .filter(wl -> any(wl.getInputs(), ag -> ag.getType() == goodsType))
             .collect(Collectors.toList());
     }
 
@@ -679,8 +678,7 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     public List<WorkLocation> getWorkLocationsForProducing(GoodsType goodsType) {
         return getCurrentWorkLocations().stream()
-            .filter(wl -> wl.getOutputs().stream()
-                .anyMatch(ag -> ag.getType() == goodsType))
+            .filter(wl -> any(wl.getOutputs(), ag -> ag.getType() == goodsType))
             .collect(Collectors.toList());
     }
 
@@ -955,12 +953,11 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
             && !getTile().isCoastland()) {
             return NoBuildReason.COASTAL;
         } else {
-            if (!buildableType.getRequiredAbilities().entrySet().stream()
-                .allMatch(e -> e.getValue() == hasAbility(e.getKey()))) {
+            if (!all(buildableType.getRequiredAbilities().entrySet(),
+                    e -> e.getValue() == hasAbility(e.getKey()))) {
                 return NoBuildReason.MISSING_ABILITY;
             }
-            if (!buildableType.getLimits().stream()
-                .allMatch(l -> l.evaluate(this))) {
+            if (!all(buildableType.getLimits(), l -> l.evaluate(this))) {
                 return NoBuildReason.LIMIT_EXCEEDED;
             }
         }
@@ -991,9 +988,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
             // Non-person units need a BUILD ability, present or assumed.
             if (!buildableType.hasAbility(Ability.PERSON)
                 && !hasAbility(Ability.BUILD, buildableType)
-                && assumeBuilt.stream()
-                    .noneMatch(bt -> bt.hasAbility(Ability.BUILD,
-                                                   buildableType))) {
+                && none(assumeBuilt, bt -> bt.hasAbility(Ability.BUILD,
+                        buildableType))) {
                 return NoBuildReason.MISSING_BUILD_ABILITY;
             }
         }
@@ -1749,8 +1745,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
      */
     public boolean canTrain(UnitType unitType) {
         return hasAbility(Ability.TEACH)
-            && buildingMap.values().stream()
-                .anyMatch(b -> b.canTeach() && b.canAddType(unitType));
+            && any(buildingMap.values(),
+                b -> b.canTeach() && b.canAddType(unitType));
     }
 
     /**
@@ -2035,10 +2031,9 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
 
             // Is there a work location that can produce the goods, with
             // positive generic production potential and all inputs satisfied?
-            : getWorkLocationsForProducing(goodsType).stream()
-                .anyMatch(wl -> wl.getGenericPotential(goodsType) > 0
-                    && wl.getInputs().stream()
-                        .allMatch(ag -> canProduce(ag.getType())));
+            : any(getWorkLocationsForProducing(goodsType),
+                wl -> wl.getGenericPotential(goodsType) > 0
+                    && all(wl.getInputs(),ag -> canProduce(ag.getType())));
     }
 
   
@@ -2480,8 +2475,8 @@ public class Colony extends Settlement implements Nameable, TradeLocation {
     @Override
     public boolean contains(Locatable locatable) {
         if (locatable instanceof Unit) {
-            return getAvailableWorkLocations().stream()
-                .anyMatch(wl -> wl.contains(locatable));
+            return any(getAvailableWorkLocations(),
+                wl -> wl.contains(locatable));
         }
         return super.contains(locatable);
     }
diff --git a/src/net/sf/freecol/common/model/Effect.java b/src/net/sf/freecol/common/model/Effect.java
index 5e2a8fba6..612c2d23e 100644
--- a/src/net/sf/freecol/common/model/Effect.java
+++ b/src/net/sf/freecol/common/model/Effect.java
@@ -27,6 +27,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -132,7 +133,7 @@ public class Effect extends FreeColGameObjectType {
      */
     public boolean appliesTo(final FreeColGameObjectType objectType) {
         return (scopes == null || scopes.isEmpty()) ? true
-            : scopes.stream().anyMatch(s -> s.appliesTo(objectType));
+            : any(scopes, s -> s.appliesTo(objectType));
     }
 
 
diff --git a/src/net/sf/freecol/common/model/Feature.java b/src/net/sf/freecol/common/model/Feature.java
index 997771e62..c48d60e61 100644
--- a/src/net/sf/freecol/common/model/Feature.java
+++ b/src/net/sf/freecol/common/model/Feature.java
@@ -28,6 +28,7 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.Utils;
 
 
@@ -225,7 +226,7 @@ public abstract class Feature extends FreeColObject implements Named {
      */
     public boolean appliesTo(final FreeColGameObjectType objectType) {
         return (!hasScope()) ? true
-            : scopes.stream().anyMatch(s -> s.appliesTo(objectType));
+            : any(scopes, s -> s.appliesTo(objectType));
     }
 
     /**
@@ -330,10 +331,9 @@ public abstract class Feature extends FreeColObject implements Named {
                 return false;
             } else {
                 // Not very efficient, but we do not expect many scopes
-                if (!scopes.stream()
-                    .allMatch(s -> feature.scopes.contains(s))
-                    || !feature.scopes.stream()
-                    .allMatch(s -> scopes.contains(s))) return false;
+                if (!all(scopes, s -> feature.scopes.contains(s))
+                    || !all(feature.scopes, s -> scopes.contains(s)))
+                    return false;
             }
             return true;
         }
diff --git a/src/net/sf/freecol/common/model/FeatureContainer.java b/src/net/sf/freecol/common/model/FeatureContainer.java
index 9e8d5b64c..81188b9d2 100644
--- a/src/net/sf/freecol/common/model/FeatureContainer.java
+++ b/src/net/sf/freecol/common/model/FeatureContainer.java
@@ -30,6 +30,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.logging.Logger;
 
+import static net.sf.freecol.common.util.CollectionUtils.*;
+
 
 /**
  * A container to hold abilities and modifiers for some FreeColObject-subclass.
@@ -108,7 +110,7 @@ public final class FeatureContainer {
     public static boolean hasAbility(Set<Ability> abilitySet) {
         return (abilitySet == null || abilitySet.isEmpty())
             ? false
-            : abilitySet.stream().allMatch(Ability::getValue);
+            : all(abilitySet, Ability::getValue);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/FoundingFather.java b/src/net/sf/freecol/common/model/FoundingFather.java
index ec63ce285..e3fc24298 100644
--- a/src/net/sf/freecol/common/model/FoundingFather.java
+++ b/src/net/sf/freecol/common/model/FoundingFather.java
@@ -29,6 +29,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -278,7 +279,7 @@ public class FoundingFather extends FreeColGameObjectType {
     public boolean isAvailableTo(Player player) {
         return (!player.isEuropean()) ? false
             : (scopes == null) ? true
-            : scopes.stream().anyMatch(s -> s.appliesTo(player));
+            : any(scopes, s -> s.appliesTo(player));
     }
 
 
diff --git a/src/net/sf/freecol/common/model/Game.java b/src/net/sf/freecol/common/model/Game.java
index 032e3f65c..06adf9ae8 100644
--- a/src/net/sf/freecol/common/model/Game.java
+++ b/src/net/sf/freecol/common/model/Game.java
@@ -957,7 +957,7 @@ public class Game extends FreeColGameObject {
      * @return True if all players are ready to launch.
      */
     public boolean allPlayersReadyToLaunch() {
-        return getLivePlayers(null).stream().allMatch(Player::isReady);
+        return all(getLivePlayers(null), Player::isReady);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/GoodsContainer.java b/src/net/sf/freecol/common/model/GoodsContainer.java
index e75aac82d..48db85e4e 100644
--- a/src/net/sf/freecol/common/model/GoodsContainer.java
+++ b/src/net/sf/freecol/common/model/GoodsContainer.java
@@ -32,6 +32,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 import org.w3c.dom.Element;
 
@@ -330,9 +331,8 @@ public class GoodsContainer extends FreeColGameObject implements Ownable {
      */
     public boolean hasReachedCapacity(int amount) {
         synchronized (storedGoods) {
-            return storedGoods.keySet().stream()
-                .anyMatch(gt -> gt.isStorable() && !gt.limitIgnored()
-                    && storedGoods.get(gt) > amount);
+            return any(storedGoods.keySet(), gt -> gt.isStorable()
+                && !gt.limitIgnored() && storedGoods.get(gt) > amount);
         }
     }
 
@@ -437,8 +437,8 @@ public class GoodsContainer extends FreeColGameObject implements Ownable {
      * @return True if the contents have changed.
      */
     public boolean hasChanged() {
-        return getSpecification().getGoodsTypeList().stream()
-            .anyMatch(gt -> getOldGoodsCount(gt) != getGoodsCount(gt));
+        return any(getSpecification().getGoodsTypeList(),
+            gt -> getOldGoodsCount(gt) != getGoodsCount(gt));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/GoodsLocation.java b/src/net/sf/freecol/common/model/GoodsLocation.java
index 843350e4d..179738503 100644
--- a/src/net/sf/freecol/common/model/GoodsLocation.java
+++ b/src/net/sf/freecol/common/model/GoodsLocation.java
@@ -29,6 +29,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 import org.w3c.dom.Element;
 
@@ -146,8 +147,7 @@ public abstract class GoodsLocation extends UnitLocation {
      * @return True if the goods are all present.
      */
     public final boolean containsGoods(List<AbstractGoods> goods) {
-        return goods.stream()
-            .allMatch(ag -> ag.getAmount() <= getGoodsCount(ag.getType()));
+        return all(goods, ag -> ag.getAmount() <= getGoodsCount(ag.getType()));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/IndianSettlement.java b/src/net/sf/freecol/common/model/IndianSettlement.java
index 2f867e6e8..f5a689a75 100644
--- a/src/net/sf/freecol/common/model/IndianSettlement.java
+++ b/src/net/sf/freecol/common/model/IndianSettlement.java
@@ -556,7 +556,7 @@ public class IndianSettlement extends Settlement implements TradeLocation {
      * @return True if any European player has spoken with the chief.
      */
     public boolean hasAnyScouted() {
-        return contactLevels.keySet().stream().anyMatch(p -> hasScouted(p));
+        return any(contactLevels.keySet(), p -> hasScouted(p));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/LandMap.java b/src/net/sf/freecol/common/model/LandMap.java
index c5d9947fc..850ab6e3b 100644
--- a/src/net/sf/freecol/common/model/LandMap.java
+++ b/src/net/sf/freecol/common/model/LandMap.java
@@ -30,6 +30,7 @@ import net.sf.freecol.common.model.Map.Position;
 import net.sf.freecol.common.option.MapGeneratorOptions;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.option.SelectOption;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.RandomUtils.*;
 
 
@@ -286,11 +287,10 @@ public class LandMap {
      */
     private boolean isSingleTile(int x, int y) {
         final Position p = new Position(x, y);
-        return Arrays.stream(Direction.values())
-            .noneMatch(d -> {
-                    Position n = new Position(p, d);
-                    return n.isValid(width, height) && map[n.getX()][n.getY()];
-                });
+        return none(Direction.values(), d -> {
+                Position n = new Position(p, d);
+                return n.isValid(width, height) && map[n.getX()][n.getY()];
+            });
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 09d7d956e..42c0db1c7 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -1141,7 +1141,7 @@ public class Player extends FreeColGameObject implements Nameable {
      *     world or a nation is in rebellion against us.
      */
     public boolean isWorkForREF() {
-        return (getUnits().stream().anyMatch(Unit::hasTile))
+        return (any(getUnits(), Unit::hasTile))
             ? true // Work to do still if there exists a unit in the new world
             : !getRebels().isEmpty();
     }
@@ -1801,8 +1801,8 @@ public class Player extends FreeColGameObject implements Nameable {
             || (access == Market.Access.CUSTOM_HOUSE
                 && (getSpecification().getBoolean(GameOptions.CUSTOM_IGNORE_BOYCOTT)
                     || (hasAbility(Ability.CUSTOM_HOUSE_TRADES_WITH_FOREIGN_COUNTRIES)
-                        && getGame().getLiveEuropeanPlayers(this).stream()
-                            .anyMatch(p -> getStance(p) == Stance.PEACE
+                        && any(getGame().getLiveEuropeanPlayers(this),
+                            p -> getStance(p) == Stance.PEACE
                                 || getStance(p) == Stance.ALLIANCE))));
     }
 
@@ -2115,8 +2115,7 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return True if this player owns at least one of the specified unit type.
      */
     public boolean hasUnitType(String typeId) {
-        return getUnits().stream()
-            .anyMatch(u -> typeId.equals(u.getType().getId()));
+        return any(getUnits(), u -> typeId.equals(u.getType().getId()));
     }
 
     /**
@@ -2976,8 +2975,7 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return True if this player is at war with any other.
      */
     public boolean isAtWar() {
-        return getGame().getLivePlayers(null).stream()
-            .anyMatch(p -> atWarWith(p));
+        return any(getGame().getLivePlayers(null), p -> atWarWith(p));
     }
 
     /**
@@ -2996,8 +2994,8 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return True if this <code>Player</code> has contacted any Europeans.
      */
     public boolean hasContactedEuropeans() {
-        return getGame().getLiveEuropeanPlayers(this).stream()
-            .anyMatch(p -> hasContacted(p));
+        return any(getGame().getLiveEuropeanPlayers(this),
+            p -> hasContacted(p));
     }
 
     /**
@@ -3006,8 +3004,8 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return True if this <code>Player</code> has contacted any natives.
      */
     public boolean hasContactedIndians() {
-        return getGame().getLiveNativePlayers(this).stream()
-            .anyMatch(p -> hasContacted(p));
+        return any(getGame().getLiveNativePlayers(this),
+            p -> hasContacted(p));
     }
 
     /**
@@ -3176,8 +3174,8 @@ public class Player extends FreeColGameObject implements Nameable {
      * @return The reason why/not the tile can be owned by this player.
      */
     private NoClaimReason canOwnTileReason(Tile tile) {
-        return (tile.getUnitList().stream()
-            .anyMatch(u -> u.getOwner() != this && u.isOffensiveUnit()))
+        return (any(tile.getUnitList(),
+                u -> u.getOwner() != this && u.isOffensiveUnit()))
             ? NoClaimReason.OCCUPIED // The tile is held against us
             : (isEuropean())
             ? ((tile.hasLostCityRumour())
diff --git a/src/net/sf/freecol/common/model/ProductionCache.java b/src/net/sf/freecol/common/model/ProductionCache.java
index 6ba19a75a..2bff866c2 100644
--- a/src/net/sf/freecol/common/model/ProductionCache.java
+++ b/src/net/sf/freecol/common/model/ProductionCache.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static net.sf.freecol.common.util.CollectionUtils.*;
+
 
 /**
  * The <code>ProductionCache</code> is contains all relevant
@@ -217,8 +219,8 @@ public class ProductionCache {
      */
     public boolean isProducing(GoodsType goodsType) {
         update();
-        return productionAndConsumption.values().stream()
-            .anyMatch(pi -> AbstractGoods.containsType(goodsType, pi.getProduction()));
+        return any(productionAndConsumption.values(),
+            pi -> AbstractGoods.containsType(goodsType, pi.getProduction()));
     }
 
     /**
@@ -229,8 +231,8 @@ public class ProductionCache {
      */
     public boolean isConsuming(GoodsType goodsType) {
         update();
-        return productionAndConsumption.values().stream()
-            .anyMatch(pi -> AbstractGoods.containsType(goodsType, pi.getConsumption()));
+        return any(productionAndConsumption.values(),
+            pi -> AbstractGoods.containsType(goodsType, pi.getConsumption()));
     }
     
     /**
diff --git a/src/net/sf/freecol/common/model/ProductionType.java b/src/net/sf/freecol/common/model/ProductionType.java
index 1eb3552a5..50a3e75d7 100644
--- a/src/net/sf/freecol/common/model/ProductionType.java
+++ b/src/net/sf/freecol/common/model/ProductionType.java
@@ -289,8 +289,8 @@ public class ProductionType extends FreeColObject {
      */
     public static boolean canProduce(GoodsType goodsType,
                                      Collection<ProductionType> types) {
-        return types.stream()
-            .anyMatch(pt -> AbstractGoods.containsType(goodsType, pt.getOutputs()));
+        return any(types, pt -> AbstractGoods.containsType(goodsType,
+                pt.getOutputs()));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/RandomRange.java b/src/net/sf/freecol/common/model/RandomRange.java
index 90e201450..6c109ee10 100644
--- a/src/net/sf/freecol/common/model/RandomRange.java
+++ b/src/net/sf/freecol/common/model/RandomRange.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.RandomUtils.*;
 
 
@@ -155,7 +156,7 @@ public class RandomRange {
      */
     public boolean appliesTo(FreeColObject fco) {
         List<Scope> scs = getScopes();
-        return scs.isEmpty() || scs.stream().anyMatch(s -> s.appliesTo(fco));
+        return scs.isEmpty() || any(scs, s -> s.appliesTo(fco));
     }
     
     /**
diff --git a/src/net/sf/freecol/common/model/Settlement.java b/src/net/sf/freecol/common/model/Settlement.java
index 5c2f3e565..04ff9a001 100644
--- a/src/net/sf/freecol/common/model/Settlement.java
+++ b/src/net/sf/freecol/common/model/Settlement.java
@@ -299,8 +299,8 @@ public abstract class Settlement extends GoodsLocation
      * @return True if the settlement is connected to the high seas.
      */
     public boolean isConnectedPort() {
-        return getTile().getSurroundingTiles(1, 1).stream()
-            .anyMatch(t -> !t.isLand() && t.isHighSeasConnected());
+        return any(getTile().getSurroundingTiles(1, 1),
+            t -> !t.isLand() && t.isHighSeasConnected());
     }
 
     /**
@@ -363,7 +363,7 @@ public abstract class Settlement extends GoodsLocation
      * @return True if the settlement can provide the equipment.
      */
     public boolean canProvideGoods(List<AbstractGoods> goods) {
-        return goods.stream().allMatch(ag -> {
+        return all(goods, ag -> {
                 int available = getGoodsCount(ag.getType());
                 int breedingNumber = ag.getType().getBreedingNumber();
                 if (breedingNumber != GoodsType.INFINITY) {
@@ -569,8 +569,8 @@ public abstract class Settlement extends GoodsLocation
      */
     @Override
     public int priceGoods(List<AbstractGoods> goods) {
-        return (goods.stream()
-            .anyMatch(ag -> getGoodsCount(ag.getType()) < ag.getAmount())) ? -1
+        return (any(goods,
+                ag -> getGoodsCount(ag.getType()) < ag.getAmount())) ? -1
             : 0;
     }
 
diff --git a/src/net/sf/freecol/common/model/SimpleCombatModel.java b/src/net/sf/freecol/common/model/SimpleCombatModel.java
index a96d35edb..784edd5e9 100644
--- a/src/net/sf/freecol/common/model/SimpleCombatModel.java
+++ b/src/net/sf/freecol/common/model/SimpleCombatModel.java
@@ -30,8 +30,8 @@ import java.util.stream.Collectors;
 
 import net.sf.freecol.common.model.Modifier.ModifierType;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.LogBuilder;
-
 import static net.sf.freecol.common.util.RandomUtils.*;
 
 
@@ -509,8 +509,8 @@ public class SimpleCombatModel extends CombatModel {
      * @return True if a strong defence bonus is present.
      */
     private boolean hasStrongDefenceModifier(FreeColObject fco) {
-        return fco.getDefenceModifiers().stream()
-            .anyMatch(m -> m.getType() == ModifierType.PERCENTAGE
+        return any(fco.getDefenceModifiers(),
+            m -> m.getType() == ModifierType.PERCENTAGE
                 && m.getValue() >= STRONG_DEFENCE_THRESHOLD);
     }
 
@@ -799,8 +799,8 @@ public class SimpleCombatModel extends CombatModel {
                             lose++;
                         }
                     } else if (r >= 1.0 - winner.getBurnProbability()) {
-                        if (loserPlayer.getIndianSettlements().stream()
-                            .anyMatch(s -> s.hasMissionary(winnerPlayer))) {
+                        if (any(loserPlayer.getIndianSettlements(),
+                                s -> s.hasMissionary(winnerPlayer))) {
                             crs.add(CombatResult.BURN_MISSIONS);
                         }
                     }
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index 772a78d71..1810a6e31 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -1843,8 +1843,7 @@ public final class Specification {
                                           String... abilities) {
         return allTypes.values().stream()
             .filter(type -> resultType.isInstance(type)
-                    && Arrays.stream(abilities)
-                        .anyMatch(a -> type.hasAbility(a)))
+                && any(abilities, a -> type.hasAbility(a)))
             .map(type -> resultType.cast(type))
             .collect(Collectors.toList());
     }
@@ -1861,8 +1860,7 @@ public final class Specification {
                                              String... abilities) {
         return allTypes.values().stream()
             .filter(type -> resultType.isInstance(type)
-                    && Arrays.stream(abilities)
-                        .noneMatch(a -> type.hasAbility(a)))
+                && none(abilities, a -> type.hasAbility(a)))
             .map(type -> resultType.cast(type))
             .collect(Collectors.toList());
     }
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index e1a4e9f85..6c61626f1 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -1189,7 +1189,7 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      */
     public boolean isLandLocked() {
         return (!isLand()) ? false
-            : getSurroundingTiles(0, 1).stream().allMatch(Tile::isLand);
+            : all(getSurroundingTiles(0, 1), Tile::isLand);
     }
 
     /**
@@ -1202,8 +1202,8 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      * @return True if this <code>Tile</code> is on the shore.
      */
     public boolean isShore() {
-        return getSurroundingTiles(0, 1).stream()
-            .anyMatch(t -> t.isLand() != this.isLand());
+        return any(getSurroundingTiles(0, 1),
+            t -> t.isLand() != this.isLand());
     }
 
 
@@ -1259,8 +1259,7 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      *     unexplored.
      */
     public boolean hasUnexploredAdjacent() {
-        return getSurroundingTiles(1, 1).stream()
-            .anyMatch(t -> !t.isExplored());
+        return any(getSurroundingTiles(1, 1), t -> !t.isExplored());
     }
 
     /**
@@ -1403,15 +1402,15 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      */
     public boolean isDangerousToShip(Unit ship) {
         final Player player = ship.getOwner();
-        return getSurroundingTiles(0, 1).stream()
-            .filter(Tile::hasSettlement)
-            .anyMatch(t -> {
-                    Settlement settlement = t.getSettlement();
-                    return !player.owns(settlement)
-                        && settlement.canBombardEnemyShip()
-                        && (player.atWarWith(settlement.getOwner())
-                            || ship.hasAbility(Ability.PIRACY));
-                });
+        return any(getSurroundingTiles(0, 1).stream()
+            .filter(Tile::hasSettlement),
+            t -> {
+                Settlement settlement = t.getSettlement();
+                return !player.owns(settlement)
+                    && settlement.canBombardEnemyShip()
+                    && (player.atWarWith(settlement.getOwner())
+                        || ship.hasAbility(Ability.PIRACY));
+            });
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/TileImprovementType.java b/src/net/sf/freecol/common/model/TileImprovementType.java
index 5cda5c1a1..eb28ab0da 100644
--- a/src/net/sf/freecol/common/model/TileImprovementType.java
+++ b/src/net/sf/freecol/common/model/TileImprovementType.java
@@ -285,7 +285,7 @@ public final class TileImprovementType extends FreeColGameObjectType {
      * @return True if improvement is possible.
      */
     public boolean isTileTypeAllowed(TileType tileType) {
-        return getScopes().stream().allMatch(s -> s.appliesTo(tileType));
+        return all(getScopes(), s -> s.appliesTo(tileType));
     }
 
     public int getBonus(GoodsType goodsType) {
@@ -353,8 +353,8 @@ public final class TileImprovementType extends FreeColGameObjectType {
      */
     public boolean changeContainsTarget(TileType tileType) {
         return (tileTypeChanges == null) ? false
-            : tileTypeChanges.values().stream()
-                .anyMatch(change -> change.getTo() == tileType);
+            : any(tileTypeChanges.values(),
+                change -> change.getTo() == tileType);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/TileItemContainer.java b/src/net/sf/freecol/common/model/TileItemContainer.java
index 717c695db..ca70b969e 100644
--- a/src/net/sf/freecol/common/model/TileItemContainer.java
+++ b/src/net/sf/freecol/common/model/TileItemContainer.java
@@ -419,8 +419,7 @@ public class TileItemContainer extends FreeColGameObject {
      * @return True if this container allows the goods type to be produced.
      */
     public boolean canProduce(GoodsType goodsType, UnitType unitType) {
-        return tileItems.stream()
-            .anyMatch(ti -> ti.canProduce(goodsType, unitType));
+        return any(tileItems, ti -> ti.canProduce(goodsType, unitType));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/TradeRoute.java b/src/net/sf/freecol/common/model/TradeRoute.java
index ffd49a79c..01a8ce35b 100644
--- a/src/net/sf/freecol/common/model/TradeRoute.java
+++ b/src/net/sf/freecol/common/model/TradeRoute.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 import org.w3c.dom.Element;
 
@@ -264,8 +265,8 @@ public class TradeRoute extends FreeColGameObject
         }
 
         // Check that the name is unique
-        if (owner.getTradeRoutes().stream()
-            .anyMatch(tr -> tr != this && tr.getName().equals(name))) {
+        if (any(owner.getTradeRoutes(),
+                tr -> tr != this && tr.getName().equals(name))) {
             return StringTemplate.template("model.tradeRoute.duplicateName")
                 .addName("%name%", name);
         }
diff --git a/src/net/sf/freecol/common/model/TradeRouteStop.java b/src/net/sf/freecol/common/model/TradeRouteStop.java
index 88329507f..c6e5bde5b 100644
--- a/src/net/sf/freecol/common/model/TradeRouteStop.java
+++ b/src/net/sf/freecol/common/model/TradeRouteStop.java
@@ -27,6 +27,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -198,16 +199,14 @@ public class TradeRouteStop extends FreeColObject implements TradeLocation {
         List<AbstractGoods> stopGoods = getCompactCargo();
         // There is space on the unit to load some more of this goods
         // type, so return true if there is some available at the stop.
-        if (stopGoods.stream()
-            .filter(ag -> unit.getGoodsCount(ag.getType()) < ag.getAmount())
-            .anyMatch(ag -> getExportAmount(ag.getType(), turns) > 0))
-            return true;
+        if (any(stopGoods.stream()
+                .filter(ag -> unit.getGoodsCount(ag.getType()) < ag.getAmount()),
+                ag -> getExportAmount(ag.getType(), turns) > 0)) return true;
 
         // Look for goods to unload.
-        if (unit.getCompactGoodsList().stream()
-            .filter(ag -> !AbstractGoods.containsType(ag.getType(), stopGoods))
-            .anyMatch(ag -> getImportAmount(ag.getType(), turns) > 0))
-            return true;
+        if (any(unit.getCompactGoodsList().stream()
+                .filter(ag -> !AbstractGoods.containsType(ag.getType(), stopGoods)),
+                ag -> getImportAmount(ag.getType(), turns) > 0)) return true;
 
         return false;
     }
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index 4754cf666..385e3488d 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -2237,8 +2237,7 @@ public class Unit extends GoodsLocation
         } else { // moving to sea, check for embarkation
             return (defender == null || !getOwner().owns(defender))
                 ? MoveType.MOVE_NO_ACCESS_EMBARK
-                : (target.getUnitList().stream()
-                    .anyMatch(u -> u.canAdd(this)))
+                : (any(target.getUnitList(), u -> u.canAdd(this)))
                 ? MoveType.EMBARK
                 : MoveType.MOVE_NO_ACCESS_FULL;
         }
@@ -2421,8 +2420,8 @@ public class Unit extends GoodsLocation
         return (canMoveToHighSeas())
             ? true
             : (hasTile() && getMovesLeft() > 0)
-            ? getTile().getSurroundingTiles(1, 1).stream()
-                .anyMatch(Tile::isDirectlyHighSeasConnected)
+            ? any(getTile().getSurroundingTiles(1, 1),
+                Tile::isDirectlyHighSeasConnected)
             : false;
     }
 
diff --git a/src/net/sf/freecol/common/model/UnitLocation.java b/src/net/sf/freecol/common/model/UnitLocation.java
index 80c3c8966..418420b93 100644
--- a/src/net/sf/freecol/common/model/UnitLocation.java
+++ b/src/net/sf/freecol/common/model/UnitLocation.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.StringUtils.*;
 
 import org.w3c.dom.Element;
@@ -229,9 +230,8 @@ public abstract class UnitLocation extends FreeColGameObject implements Location
      * @see Unit#isCarrier
      */
     public boolean hasCarrierWithSpace(int space) {
-        return getUnitList().stream()
-            .anyMatch(u -> u.isCarrier() && !u.isDamaged()
-                && u.getSpaceLeft() >= space);
+        return any(getUnitList(),
+            u -> u.isCarrier() && !u.isDamaged() && u.getSpaceLeft() >= space);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/UnitType.java b/src/net/sf/freecol/common/model/UnitType.java
index 8b89b525e..81fc1dc96 100644
--- a/src/net/sf/freecol/common/model/UnitType.java
+++ b/src/net/sf/freecol/common/model/UnitType.java
@@ -493,8 +493,8 @@ public final class UnitType extends BuildableType implements Consumer {
      * @return True if this unit type can learn.
      */
     public boolean canBeUpgraded(UnitType newType, ChangeType changeType) {
-        return getTypeChanges().stream()
-            .anyMatch(c -> (newType == null || newType == c.getNewUnitType())
+        return any(getTypeChanges(),
+            c -> (newType == null || newType == c.getNewUnitType())
                 && c.getProbability(changeType) > 0);
     }
 
diff --git a/src/net/sf/freecol/common/model/UnitTypeChange.java b/src/net/sf/freecol/common/model/UnitTypeChange.java
index b019e6f9e..30bc0180b 100644
--- a/src/net/sf/freecol/common/model/UnitTypeChange.java
+++ b/src/net/sf/freecol/common/model/UnitTypeChange.java
@@ -29,6 +29,7 @@ import javax.xml.stream.XMLStreamException;
 
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -231,7 +232,7 @@ public class UnitTypeChange extends FreeColObject {
     public boolean appliesTo(Player player) {
         List<Scope> scopeList = getScopes();
         return (scopeList.isEmpty()) ? true
-            : scopeList.stream().anyMatch(s -> s.appliesTo(player));
+            : any(scopeList, s -> s.appliesTo(player));
     }
 
 
diff --git a/src/net/sf/freecol/common/model/mission/CompoundMission.java b/src/net/sf/freecol/common/model/mission/CompoundMission.java
index 3bed29d7f..d2d6e058c 100644
--- a/src/net/sf/freecol/common/model/mission/CompoundMission.java
+++ b/src/net/sf/freecol/common/model/mission/CompoundMission.java
@@ -27,6 +27,7 @@ import javax.xml.stream.XMLStreamException;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.Game;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 import org.w3c.dom.Element;
 
@@ -134,7 +135,7 @@ public class CompoundMission extends AbstractMission {
     @Override
     public boolean isValid() {
         return (super.isValid() && !missions.isEmpty())
-            ? missions.stream().allMatch(Mission::isValid)
+            ? all(missions, Mission::isValid)
             : false;
     }
 
diff --git a/src/net/sf/freecol/common/model/mission/ImprovementMission.java b/src/net/sf/freecol/common/model/mission/ImprovementMission.java
index 6e50e50e0..03b0ceb6b 100644
--- a/src/net/sf/freecol/common/model/mission/ImprovementMission.java
+++ b/src/net/sf/freecol/common/model/mission/ImprovementMission.java
@@ -25,8 +25,10 @@ import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.Ability;
 import net.sf.freecol.common.model.Game;
+import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.TileImprovement;
 import net.sf.freecol.common.model.Unit;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 import org.w3c.dom.Element;
 
@@ -139,8 +141,9 @@ public class ImprovementMission extends AbstractMission {
      * @return false
      */
     public static boolean isValidFor(Unit unit) {
-        return unit.getGame().getSpecification().getTileImprovementTypeList().stream()
-            .anyMatch(ti -> ti.isWorkerAllowed(unit));
+        final Specification spec = unit.getGame().getSpecification();
+        return any(spec.getTileImprovementTypeList(),
+            ti -> ti.isWorkerAllowed(unit));
     }
 
 
diff --git a/src/net/sf/freecol/common/option/ListOption.java b/src/net/sf/freecol/common/option/ListOption.java
index 6dd594469..9aa1bebc5 100644
--- a/src/net/sf/freecol/common/option/ListOption.java
+++ b/src/net/sf/freecol/common/option/ListOption.java
@@ -31,6 +31,7 @@ import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.io.Mods;
 import net.sf.freecol.common.model.Specification;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -142,7 +143,7 @@ public abstract class ListOption<T> extends AbstractOption<List<AbstractOption<T
      */
     public boolean canAdd(AbstractOption<T> ao) {
         return (allowDuplicates) ? true
-            : value.stream().noneMatch(o -> o.equals(ao));
+            : none(value, o -> o.equals(ao));
     }
 
 
diff --git a/src/net/sf/freecol/common/option/OptionGroup.java b/src/net/sf/freecol/common/option/OptionGroup.java
index 3ef37389e..c26df3bd5 100644
--- a/src/net/sf/freecol/common/option/OptionGroup.java
+++ b/src/net/sf/freecol/common/option/OptionGroup.java
@@ -32,6 +32,7 @@ import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
 import net.sf.freecol.common.model.Specification;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 
 
 /**
@@ -160,8 +161,7 @@ public class OptionGroup extends AbstractOption<OptionGroup> {
      * @return True if there are any child <code>OptionGroup</code>s present.
      */
     public boolean hasOptionGroup() {
-        return options.stream()
-            .anyMatch(o -> o instanceof OptionGroup);
+        return any(options, o -> o instanceof OptionGroup);
     }
 
     /**
diff --git a/src/net/sf/freecol/common/util/CollectionUtils.java b/src/net/sf/freecol/common/util/CollectionUtils.java
index 07d48527e..fb7b34706 100644
--- a/src/net/sf/freecol/common/util/CollectionUtils.java
+++ b/src/net/sf/freecol/common/util/CollectionUtils.java
@@ -352,6 +352,48 @@ public class CollectionUtils {
             .collect(Collectors.toList());
     }
 
+    public static <T> boolean all(T[] array, Predicate<T> predicate) {
+        return all(Arrays.stream(array), predicate);
+    }
+
+    public static <T> boolean any(T[] array, Predicate<T> predicate) {
+        return any(Arrays.stream(array), predicate);
+    }
+
+    public static <T> boolean none(T[] array, Predicate<T> predicate) {
+        return none(Arrays.stream(array), predicate);
+    }
+
+    public static <T> boolean all(Collection<T> collection,
+                                  Predicate<T> predicate) {
+        return all(collection.stream(), predicate);
+    }
+
+    public static <T> boolean any(Collection<T> collection,
+                                  Predicate<T> predicate) {
+        return any(collection.stream(), predicate);
+    }
+
+    public static <T> boolean none(Collection<T> collection,
+                                   Predicate<T> predicate) {
+        return none(collection.stream(), predicate);
+    }
+
+    public static <T> boolean all(Stream<T> stream,
+                                  Predicate<T> predicate) {
+        return stream.allMatch(predicate);
+    }
+
+    public static <T> boolean any(Stream<T> stream,
+                                  Predicate<T> predicate) {
+        return stream.anyMatch(predicate);
+    }
+
+    public static <T> boolean none(Stream<T> stream,
+                                   Predicate<T> predicate) {
+        return stream.noneMatch(predicate);
+    }
+
     /**
      * Does a collection contain at least one element that matches a predicate?
      *
diff --git a/src/net/sf/freecol/server/ai/AIColony.java b/src/net/sf/freecol/server/ai/AIColony.java
index 984c29743..54e32848c 100644
--- a/src/net/sf/freecol/server/ai/AIColony.java
+++ b/src/net/sf/freecol/server/ai/AIColony.java
@@ -615,8 +615,8 @@ public class AIColony extends AIObject implements PropertyChangeListener {
         final Specification spec = getSpecification();
         final Tile tile = colony.getTile();
         final Player player = colony.getOwner();
-        boolean hasDefender = tile.getUnitList().stream()
-            .anyMatch(u -> u.isDefensiveUnit()
+        boolean hasDefender = any(tile.getUnitList(),
+            u -> u.isDefensiveUnit()
                 && getAIUnit(u).getMission(DefendSettlementMission.class) != null);
         if (!hasDefender) return;
 
diff --git a/src/net/sf/freecol/server/ai/REFAIPlayer.java b/src/net/sf/freecol/server/ai/REFAIPlayer.java
index ff195816c..d20792641 100644
--- a/src/net/sf/freecol/server/ai/REFAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/REFAIPlayer.java
@@ -907,12 +907,12 @@ public class REFAIPlayer extends EuropeanAIPlayer {
                         return Integer.MIN_VALUE;
                     }
                     // Do not chase the same unit!
-                    if (getAIUnits().stream()
-                        .filter(aiu -> aiu != aiUnit)
-                        .map(aiu -> aiu.getMission(UnitSeekAndDestroyMission.class))
-                        .anyMatch(m -> m != null
-                            && m.getTarget() instanceof Unit
-                            && (Unit)m.getTarget() == target))
+                    if (any(getAIUnits().stream()
+                            .filter(aiu -> aiu != aiUnit)
+                            .map(aiu -> aiu.getMission(UnitSeekAndDestroyMission.class)),
+                            m -> m != null
+                                && m.getTarget() instanceof Unit
+                                && (Unit)m.getTarget() == target))
                         return Integer.MIN_VALUE;
                     // The REF is more interested in colonies.
                     value /= 2;
diff --git a/src/net/sf/freecol/server/control/InGameController.java b/src/net/sf/freecol/server/control/InGameController.java
index 18105ce17..797c78081 100644
--- a/src/net/sf/freecol/server/control/InGameController.java
+++ b/src/net/sf/freecol/server/control/InGameController.java
@@ -614,8 +614,7 @@ public final class InGameController extends Controller {
             // Are there humans left?
             // FIXME: see if this can be relaxed so we can run large
             // AI-only simulations.
-            boolean onlyAI = game.getConnectedPlayers().stream()
-                .allMatch(Player::isAI);
+            boolean onlyAI = all(game.getConnectedPlayers(), Player::isAI);
             if (onlyAI) {
                 logger.info("No human player left.");
                 if (debugOnlyAITurns > 0) { // Complete debug runs
diff --git a/src/net/sf/freecol/server/generator/River.java b/src/net/sf/freecol/server/generator/River.java
index 0f3f4cae5..58377080d 100644
--- a/src/net/sf/freecol/server/generator/River.java
+++ b/src/net/sf/freecol/server/generator/River.java
@@ -31,6 +31,7 @@ import net.sf.freecol.common.model.TileImprovement;
 import net.sf.freecol.common.model.TileImprovementType;
 import net.sf.freecol.common.model.TileType;
 import net.sf.freecol.server.model.ServerRegion;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.RandomUtils.*;
 
 
@@ -229,8 +230,8 @@ public class River {
      * @return true if the given tile is next to this river.
      */
     public boolean isNextToSelf(Tile tile) {
-        return Direction.longSides.stream()
-            .anyMatch(d -> this.contains(tile.getNeighbourOrNull(d)));
+        return any(Direction.longSides,
+            d -> this.contains(tile.getNeighbourOrNull(d)));
     }
 
     /**
@@ -240,11 +241,11 @@ public class River {
      * @return true if the given tile is next to a river, lake or sea.
      */
     public boolean isNextToWater(Tile tile) {
-        return Direction.longSides.stream()
-            .anyMatch(d -> {
-                    Tile t = tile.getNeighbourOrNull(d);
-                    return t != null && (!t.isLand() || t.hasRiver());
-                });
+        return any(Direction.longSides,
+            d -> {
+                Tile t = tile.getNeighbourOrNull(d);
+                return t != null && (!t.isLand() || t.hasRiver());
+            });
     }
 
     /**
@@ -254,8 +255,7 @@ public class River {
      * @return true if this river already contains the given tile.
      */
     public boolean contains(Tile tile) {
-        return getSections().stream()
-            .anyMatch(rs -> rs.getTile() == tile);
+        return any(getSections(), rs -> rs.getTile() == tile);
     }
 
     /**
diff --git a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
index 673288190..76849e206 100644
--- a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
+++ b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
@@ -445,8 +445,7 @@ public class SimpleMapGenerator implements MapGenerator {
         for (Tile tile : allTiles) {
             if (!tile.isPolar()
                 && suitableForNativeSettlement(tile)
-                && settlementTiles.stream()
-                    .noneMatch(t -> t.getDistanceTo(tile) < minDistance))
+                && none(settlementTiles, t -> t.getDistanceTo(tile) < minDistance))
                 settlementTiles.add(tile);
         }
         randomShuffle(logger, "Settlement tiles", settlementTiles, random);
diff --git a/src/net/sf/freecol/server/generator/TerrainGenerator.java b/src/net/sf/freecol/server/generator/TerrainGenerator.java
index 78b272d2a..77fbdb077 100644
--- a/src/net/sf/freecol/server/generator/TerrainGenerator.java
+++ b/src/net/sf/freecol/server/generator/TerrainGenerator.java
@@ -45,10 +45,9 @@ import net.sf.freecol.common.model.TileType;
 import net.sf.freecol.common.option.MapGeneratorOptions;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.util.LogBuilder;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.RandomChoice;
-
 import static net.sf.freecol.common.util.RandomUtils.*;
-
 import net.sf.freecol.server.model.ServerRegion;
 
 
@@ -481,14 +480,12 @@ public class TerrainGenerator {
                 
                 // Not too close to a mountain range as this would
                 // defeat the purpose of adding random hills
-                && tile.getSurroundingTiles(1, 3).stream()
-                    .noneMatch(t -> t.getType() == mountains)
+                && none(tile.getSurroundingTiles(1, 3), t -> t.getType() == mountains)
 
                 // Do not add hills too close to the ocean/lake, as
                 // this helps with good locations for building
                 // colonies on shore.
-                && tile.getSurroundingTiles(1, 1).stream()
-                    .noneMatch(t -> !t.isLand())) {
+                && none(tile.getSurroundingTiles(1, 1), t -> !t.isLand())) {
                 return tile;
             }
         }
@@ -613,8 +610,8 @@ public class TerrainGenerator {
                 if (!riverType.isTileTypeAllowed(tile.getType())) continue;
 
                 // check the river source/spring is not too close to the ocean
-                if (!tile.getSurroundingTiles(1, 2).stream()
-                    .allMatch(Tile::isLand)) continue;
+                if (!all(tile.getSurroundingTiles(1, 2),
+                        Tile::isLand)) continue;
 
                 if (riverMap.get(tile) == null) {
                     // no river here yet
diff --git a/src/net/sf/freecol/server/model/ServerColony.java b/src/net/sf/freecol/server/model/ServerColony.java
index 818eae371..b46c432b4 100644
--- a/src/net/sf/freecol/server/model/ServerColony.java
+++ b/src/net/sf/freecol/server/model/ServerColony.java
@@ -53,6 +53,7 @@ import net.sf.freecol.common.model.UnitType;
 import net.sf.freecol.common.model.UnitTypeChange.ChangeType;
 import net.sf.freecol.common.model.WorkLocation;
 import net.sf.freecol.common.util.LogBuilder;
+import static net.sf.freecol.common.util.CollectionUtils.*;
 import static net.sf.freecol.common.util.RandomUtils.*;
 import net.sf.freecol.server.control.ChangeSet;
 import net.sf.freecol.server.control.ChangeSet.See;
@@ -512,9 +513,8 @@ public class ServerColony extends Colony implements ServerModelObject {
         List<BuildableType> buildables = new ArrayList<>();
         buildables.addAll(spec.getBuildingTypeList());
         buildables.addAll(spec.getUnitTypesWithoutAbility(Ability.PERSON));
-        return buildables.stream()
-            .anyMatch(bt -> canBuild(bt)
-                && AbstractGoods.containsType(goodsType, bt.getRequiredGoods()));
+        return any(buildables, bt -> canBuild(bt)
+            && AbstractGoods.containsType(goodsType, bt.getRequiredGoods()));
     }
 
     /**
diff --git a/src/net/sf/freecol/server/model/ServerGame.java b/src/net/sf/freecol/server/model/ServerGame.java
index 21413438e..9c2b0eeaf 100644
--- a/src/net/sf/freecol/server/model/ServerGame.java
+++ b/src/net/sf/freecol/server/model/ServerGame.java
@@ -119,7 +119,7 @@ public class ServerGame extends Game implements ServerModelObject {
         return getLivePlayers(null).stream()
             .map(p -> (ServerPlayer)p)
             .filter(sp -> sp.isConnected()
-                && Arrays.stream(serverPlayers).noneMatch(s -> s == sp))
+                && none(serverPlayers, s -> s == sp))
             .collect(Collectors.toList());
     }
 

From 2248deb3419944a2c91708ea358fac5af3e28d4b Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 2 Oct 2015 09:39:49 +0930
Subject: [PATCH 299/323] Use J8 joining() construct.

---
 data/strings/FreeColMessages.properties       |  3 ++
 src/net/sf/freecol/FreeCol.java               | 19 ++++-----
 .../client/gui/panel/ModifierFormat.java      | 42 +++++++------------
 .../gui/panel/ResourcesDetailPanel.java       | 20 ++++-----
 .../freecol/common/debug/FreeColDebugger.java | 11 ++---
 src/net/sf/freecol/common/model/Scope.java    | 12 ++++++
 .../freecol/common/model/Specification.java   |  7 ++--
 7 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index c919a2ca2..7c13463d9 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -2434,6 +2434,9 @@ model.regionType.ocean.unknown=Unknown Seas
 model.regionType.river.name=River
 model.regionType.river.unknown=Unknown River
 
+# common.model.scope
+scope.method.isIndian.name=natives
+
 # common.model.Stance
 model.stance.alliance.name=Alliance
 model.stance.ceaseFire.name=Cease Fire
diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index 8fb6b2a22..8858e8cea 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -28,12 +28,14 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.JarURLConnection;
+import java.util.Arrays;
 import java.util.Locale;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 
 import net.sf.freecol.client.ClientOptions;
@@ -939,11 +941,8 @@ public final class FreeCol {
      * @return A list of advantage types.
      */
     private static String getValidAdvantages() {
-        String ret = "";
-        for (Advantages a : Advantages.values()) {
-            ret += "," + Messages.getName(a);
-        }
-        return ret.substring(1);
+        return Arrays.stream(Advantages.values())
+            .map(a -> Messages.getName(a)).collect(Collectors.joining(","));
     }
 
     /**
@@ -993,13 +992,9 @@ public final class FreeCol {
      * @return The valid difficulty levels, comma separated.
      */
     public static String getValidDifficulties() {
-        String s = "";
-        for (String d : DIFFICULTIES) {
-            String key = "model.difficulty." + d;
-            String value = Messages.getName(key);
-            s += "," + value;
-        }
-        return s.substring(1);
+        return Arrays.stream(DIFFICULTIES)
+            .map(d -> Messages.getName("model.difficulty." + d))
+            .collect(Collectors.joining(","));
     }
 
     /**
diff --git a/src/net/sf/freecol/client/gui/panel/ModifierFormat.java b/src/net/sf/freecol/client/gui/panel/ModifierFormat.java
index f9fc12bd0..86c7714aa 100644
--- a/src/net/sf/freecol/client/gui/panel/ModifierFormat.java
+++ b/src/net/sf/freecol/client/gui/panel/ModifierFormat.java
@@ -20,6 +20,8 @@
 package net.sf.freecol.client.gui.panel;
 
 import java.text.DecimalFormat;
+import java.util.Arrays;
+import java.util.stream.Collectors;
 
 import javax.swing.JLabel;
 
@@ -112,34 +114,22 @@ public class ModifierFormat {
     }
 
     public static String getFeatureAsString(Feature feature) {
-        String label = Messages.getName(feature) + ":";
-        if (feature.hasScope()) {
-            for (Scope scope : feature.getScopes()) {
-                String key = null;
-                if (scope.getType() != null) {
-                    key = scope.getType();
-                } else if (scope.getAbilityId() != null) {
-                    key = scope.getAbilityId();
-                } else if (scope.getMethodName() != null) {
-                    key = "modifierFormat.scopeMethod."
-                        + scope.getMethodName();
-                }
-                if (key != null) {
-                    label += (scope.isMatchNegated() ? " !" : " ")
-                        + Messages.getName(key) + ",";
-                }
-            }
-        }
-        return label.substring(0, label.length() - 1);
+        return Messages.getName(feature) + ":"
+            + ((!feature.hasScope()) ? ""
+                : feature.getScopes().stream().map(scope -> {
+                        String k = scope.getKey();
+                        if (k == null) {
+                            k = "";
+                        } else {
+                            k = Messages.getName(k);
+                            if (scope.isMatchNegated()) k = "!" + k;
+                        }
+                        return k;
+                    }).collect(Collectors.joining()));
     }
 
     public static String getModifierAsString(Modifier modifier) {
-        String result = "";
-        for (String string : getModifierStrings(modifier)) {
-            if (string != null) {
-                result += string;
-            }
-        }
-        return result;
+        return Arrays.stream(getModifierStrings(modifier))
+            .filter(s -> s != null).collect(Collectors.joining());
     }
 }
diff --git a/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java b/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java
index ac2f60a44..e7a8b7dc9 100644
--- a/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ResourcesDetailPanel.java
@@ -20,6 +20,7 @@
 package net.sf.freecol.client.gui.panel;
 
 import java.util.ArrayList;
+import java.util.stream.Collectors;
 
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -37,7 +38,7 @@ import net.sf.freecol.common.model.GoodsType;
 import net.sf.freecol.common.model.Modifier;
 import net.sf.freecol.common.model.ResourceType;
 import net.sf.freecol.common.model.Scope;
-
+import net.sf.freecol.common.model.Specification;
 import static net.sf.freecol.common.util.StringUtils.*;
 
 
@@ -89,17 +90,12 @@ public class ResourcesDetailPanel
         for (Modifier modifier : type.getModifiers()) {
             String text = ModifierFormat.getModifierAsString(modifier);
             if (modifier.hasScope()) {
-                ArrayList<String> scopeStrings = new ArrayList<>();
-                for (Scope scope : modifier.getScopes()) {
-                    if (scope.getType() != null) {
-                        FreeColGameObjectType fcgot = getSpecification()
-                            .findType(scope.getType());
-                        scopeStrings.add(Messages.getName(fcgot));
-                    }
-                }
-                if (!scopeStrings.isEmpty()) {
-                    text += " (" + join(", ", scopeStrings) + ")";
-                }
+                final Specification spec = getSpecification();
+                String scopeStrings = modifier.getScopes().stream()
+                    .filter(s -> s.getType() != null)
+                    .map(s -> Messages.getName(spec.findType(s.getType())))
+                    .collect(Collectors.joining(", "));
+                if (!scopeStrings.isEmpty()) text += " (" + scopeStrings + ")";
             }
 
             GoodsType goodsType = getSpecification().getGoodsType(modifier.getId());
diff --git a/src/net/sf/freecol/common/debug/FreeColDebugger.java b/src/net/sf/freecol/common/debug/FreeColDebugger.java
index 513729de5..f01cab982 100644
--- a/src/net/sf/freecol/common/debug/FreeColDebugger.java
+++ b/src/net/sf/freecol/common/debug/FreeColDebugger.java
@@ -24,8 +24,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 
+import java.util.Arrays;
 import java.util.Locale;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.common.model.Player;
@@ -129,11 +131,10 @@ public class FreeColDebugger {
      * @return A string containing the modes as csv.
      */
     public static String getDebugModes() {
-        String ret = "";
-        for (DebugMode mode : DebugMode.values()) {
-            if (isInDebugMode(mode)) ret += "," + mode;
-        }
-        return (ret.isEmpty()) ? ret : ret.substring(1, ret.length());
+        return Arrays.stream(DebugMode.values())
+            .filter(m -> isInDebugMode(m))
+            .map(m -> m.toString())
+            .collect(Collectors.joining(","));
     }
 
     /**
diff --git a/src/net/sf/freecol/common/model/Scope.java b/src/net/sf/freecol/common/model/Scope.java
index bef6440d4..7edbc441d 100644
--- a/src/net/sf/freecol/common/model/Scope.java
+++ b/src/net/sf/freecol/common/model/Scope.java
@@ -76,6 +76,18 @@ public class Scope extends FreeColObject {
     }
 
 
+    /**
+     * Get a key to display this scope with.
+     *
+     * @return A suitable key, or null if none found.
+     */
+    public String getKey() {
+        return (getType() != null) ? getType()
+            : (getAbilityId() != null) ? getAbilityId()
+            : (getMethodName() != null) ? "scope.method." + getMethodName()
+            : null;
+    }
+
     /**
      * Does this scope match null?
      *
diff --git a/src/net/sf/freecol/common/model/Specification.java b/src/net/sf/freecol/common/model/Specification.java
index 1810a6e31..733133473 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -1905,10 +1905,11 @@ public final class Specification {
             logger.log(Level.WARNING, "Failed to load remedial roles.", e);
             return;
         }
-        List<String> roles = new ArrayList<>();
-        for (Role r : getRoles()) roles.add(r.getId());
+
         logger.info("Loading role backward compatibility fragment: "
-            + ROLES_COMPAT_FILE_NAME + " with roles: " + join(" ", roles));
+            + ROLES_COMPAT_FILE_NAME + " with roles: "
+            + getRoles().stream()
+                .map(Role::getId).collect(Collectors.joining()));
     }
     // end @compat 0.10.x
 

From 968dd627fdd2990f86fe1190066a87239e5d3fbf Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 6 Oct 2015 10:09:00 +1030
Subject: [PATCH 300/323] Handle unit MOVE_CHANGE in colony panel.

---
 src/net/sf/freecol/client/gui/panel/ColonyPanel.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 3433496ff..380320dd9 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -1072,6 +1072,8 @@ public final class ColonyPanel extends PortPanel
             updateInPortPanel();
             updatePopulationPanel();
             updateWarehousePanel();// Role change changes equipment goods
+        } else if (Unit.MOVE_CHANGE.equals(property)) {
+            updateOutsideColonyPanel();
         } else {
             // ColonyTiles and Buildings now have their own
             // propertyChangeListeners so {ColonyTile,Building}.UNIT_CHANGE

From bfeec2196ff0075b7e9283f8b2b7f985af367298 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 6 Oct 2015 10:16:37 +1030
Subject: [PATCH 301/323] Improve production label warning message.

---
 src/net/sf/freecol/client/gui/panel/ProductionLabel.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ProductionLabel.java b/src/net/sf/freecol/client/gui/panel/ProductionLabel.java
index f98b22d83..53b4d7e43 100644
--- a/src/net/sf/freecol/client/gui/panel/ProductionLabel.java
+++ b/src/net/sf/freecol/client/gui/panel/ProductionLabel.java
@@ -145,8 +145,9 @@ public final class ProductionLabel extends AbstractGoodsLabel {
             logger.warning("Bad production label (no type)\n"
                 + FreeColDebugger.stackTraceToString());
         } else if (getAmount() == 0 && stockNumber < 0) {
-            logger.warning("Bad production label (bad amount)\n"
-                + FreeColDebugger.stackTraceToString());
+            logger.warning("Bad production label: " + ag
+                + " stock=" + stockNumber
+                + "\n" + FreeColDebugger.stackTraceToString());
         }
 
         this.maximumProduction = maximumProduction;

From 1bb943d98e55220a4ede7bf7a2ef3cc166d7d79b Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 6 Oct 2015 10:48:23 +1030
Subject: [PATCH 302/323] Add Location.getRank() and support.

---
 src/net/sf/freecol/common/model/Building.java |  5 ++--
 .../sf/freecol/common/model/ColonyTile.java   |  1 +
 src/net/sf/freecol/common/model/Europe.java   |  8 ++++++
 .../freecol/common/model/GoodsLocation.java   |  1 +
 src/net/sf/freecol/common/model/HighSeas.java |  8 ++++++
 .../common/model/IndianSettlement.java        |  1 +
 src/net/sf/freecol/common/model/Location.java | 25 +++++++++++++++++++
 src/net/sf/freecol/common/model/Map.java      |  8 ++++++
 .../sf/freecol/common/model/Settlement.java   |  9 +++++++
 src/net/sf/freecol/common/model/Tile.java     |  8 ++++++
 src/net/sf/freecol/common/model/Unit.java     |  8 ++++++
 .../sf/freecol/common/model/UnitLocation.java |  2 +-
 .../sf/freecol/common/model/WorkLocation.java |  8 ++++++
 13 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Building.java b/src/net/sf/freecol/common/model/Building.java
index 89d1ad80a..ccb30f87e 100644
--- a/src/net/sf/freecol/common/model/Building.java
+++ b/src/net/sf/freecol/common/model/Building.java
@@ -381,8 +381,9 @@ public class Building extends WorkLocation
     //   final UnitLocation.getUnitIterator
     //   UnitLocation.getUnitList
     //   UnitLocation.getGoodsContainer
-    //   final WorkLocation getSettlement
-    //   final WorkLocation getColony
+    //   final WorkLocation.getSettlement
+    //   final WorkLocation.getColony
+    //   final WorkLocation.getRank
 
     /**
      * {@inheritDoc}
diff --git a/src/net/sf/freecol/common/model/ColonyTile.java b/src/net/sf/freecol/common/model/ColonyTile.java
index 42fe2eee0..17877ac8f 100644
--- a/src/net/sf/freecol/common/model/ColonyTile.java
+++ b/src/net/sf/freecol/common/model/ColonyTile.java
@@ -285,6 +285,7 @@ public class ColonyTile extends WorkLocation {
     //   UnitLocation.getGoodsContainer
     //   final WorkLocation getSettlement
     //   final WorkLocation getColony
+    //   final int getRank
 
     /**
      * {@inheritDoc}
diff --git a/src/net/sf/freecol/common/model/Europe.java b/src/net/sf/freecol/common/model/Europe.java
index d73087616..6b8366608 100644
--- a/src/net/sf/freecol/common/model/Europe.java
+++ b/src/net/sf/freecol/common/model/Europe.java
@@ -325,6 +325,14 @@ public class Europe extends UnitLocation
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getRank() {
+        return Location.LOCATION_RANK_EUROPE;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/net/sf/freecol/common/model/GoodsLocation.java b/src/net/sf/freecol/common/model/GoodsLocation.java
index 179738503..e3d98a952 100644
--- a/src/net/sf/freecol/common/model/GoodsLocation.java
+++ b/src/net/sf/freecol/common/model/GoodsLocation.java
@@ -196,6 +196,7 @@ public abstract class GoodsLocation extends UnitLocation {
     //    UnitLocation.getUnitCount
     //    UnitLocation.getUnitList
     //    UnitLocation.getSettlement
+    // Does not implement getRank
 
     /**
      * {@inheritDoc}
diff --git a/src/net/sf/freecol/common/model/HighSeas.java b/src/net/sf/freecol/common/model/HighSeas.java
index 2a6ffbb8c..b25e3a745 100644
--- a/src/net/sf/freecol/common/model/HighSeas.java
+++ b/src/net/sf/freecol/common/model/HighSeas.java
@@ -137,6 +137,14 @@ public class HighSeas extends UnitLocation {
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getRank() {
+        return Location.LOCATION_RANK_HIGHSEAS;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/net/sf/freecol/common/model/IndianSettlement.java b/src/net/sf/freecol/common/model/IndianSettlement.java
index f5a689a75..7dacbfac2 100644
--- a/src/net/sf/freecol/common/model/IndianSettlement.java
+++ b/src/net/sf/freecol/common/model/IndianSettlement.java
@@ -1093,6 +1093,7 @@ public class IndianSettlement extends Settlement implements TradeLocation {
     //   UnitLocation.getUnitCount
     //   UnitLocation.getUnitList
     //   Settlement.getSettlement
+    //   final Settlement.getRank
 
     /**
      * {@inheritDoc}
diff --git a/src/net/sf/freecol/common/model/Location.java b/src/net/sf/freecol/common/model/Location.java
index 0ab3bf57e..1018de9ed 100644
--- a/src/net/sf/freecol/common/model/Location.java
+++ b/src/net/sf/freecol/common/model/Location.java
@@ -32,6 +32,13 @@ import net.sf.freecol.common.ObjectWithId;
  */
 public interface Location extends ObjectWithId {
 
+    // "Rank" constants for location ordering.
+    // Tile ranks are distinct and non-negative.
+    // Other locations devolve to {europe,highseas,tile} rank.
+    public static final int LOCATION_RANK_NOWHERE = -3;
+    public static final int LOCATION_RANK_EUROPE = -2;
+    public static final int LOCATION_RANK_HIGHSEAS = -1;
+    
     /**
      * Gets the identifier of this <code>Location</code>.
      *
@@ -163,6 +170,14 @@ public interface Location extends ObjectWithId {
      */
     public Location up();
 
+    /**
+     * Get a integer for this location, for the benefit of location
+     * comparators.
+     *
+     * @return A suitable integer.
+     */
+    public int getRank();
+        
     /**
      * Get a short description of this location.
      *
@@ -180,4 +195,14 @@ public interface Location extends ObjectWithId {
     public static Location upLoc(Location loc) {
         return (loc == null) ? null : loc.up();
     }
+
+    /**
+     * Static front end to getRank.
+     *
+     * @param loc A <code>Location</code> to check.
+     * @return The integer rank of the given location.
+     */
+    public static int getRank(Location loc) {
+        return (loc == null) ? Location.LOCATION_RANK_NOWHERE : loc.getRank();
+    }
 }
diff --git a/src/net/sf/freecol/common/model/Map.java b/src/net/sf/freecol/common/model/Map.java
index 69305df02..2223b20fc 100644
--- a/src/net/sf/freecol/common/model/Map.java
+++ b/src/net/sf/freecol/common/model/Map.java
@@ -2423,6 +2423,14 @@ public class Map extends FreeColGameObject implements Location {
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getRank() {
+        return Location.LOCATION_RANK_NOWHERE;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/net/sf/freecol/common/model/Settlement.java b/src/net/sf/freecol/common/model/Settlement.java
index 04ff9a001..11a497e40 100644
--- a/src/net/sf/freecol/common/model/Settlement.java
+++ b/src/net/sf/freecol/common/model/Settlement.java
@@ -538,6 +538,15 @@ public abstract class Settlement extends GoodsLocation
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int getRank() {
+        return Location.getRank(getTile());
+    }
+
+
     // Interface UnitLocation
     // Inherits
     //   UnitLocation.getSpaceTaken
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 6c61626f1..1ed686c94 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -2231,6 +2231,14 @@ public final class Tile extends UnitLocation implements Named, Ownable {
             : this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getRank() {
+        return getX() + getY() * getMap().getWidth();
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index 385e3488d..e6cadb2de 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -3945,6 +3945,14 @@ public class Unit extends GoodsLocation
             : this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getRank() {
+        return Location.getRank(getLocation());
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/net/sf/freecol/common/model/UnitLocation.java b/src/net/sf/freecol/common/model/UnitLocation.java
index 418420b93..2bf415b4c 100644
--- a/src/net/sf/freecol/common/model/UnitLocation.java
+++ b/src/net/sf/freecol/common/model/UnitLocation.java
@@ -288,6 +288,7 @@ public abstract class UnitLocation extends FreeColGameObject implements Location
     // Interface Location
     // Inheriting
     //   FreeColObject.getId()
+    // Does not implement getRank()
 
     /**
      * {@inheritDoc}
@@ -546,7 +547,6 @@ public abstract class UnitLocation extends FreeColGameObject implements Location
 
     // Serialization
 
-
     /**
      * {@inheritDoc}
      */
diff --git a/src/net/sf/freecol/common/model/WorkLocation.java b/src/net/sf/freecol/common/model/WorkLocation.java
index 126c1c714..ca9aaab3a 100644
--- a/src/net/sf/freecol/common/model/WorkLocation.java
+++ b/src/net/sf/freecol/common/model/WorkLocation.java
@@ -736,7 +736,15 @@ public abstract class WorkLocation extends UnitLocation
         return colony;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int getRank() {
+        return Location.getRank(getTile());
+    }
 
+    
     // Interface UnitLocation
     // Inherits:
     //   UnitLocation.getSpaceTaken

From ac5bb8b98d056febac4e602af9f481a4dced7659 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 6 Oct 2015 10:41:48 +1030
Subject: [PATCH 303/323] Simplify colony comparators.

---
 src/net/sf/freecol/client/ClientOptions.java | 77 +++++---------------
 1 file changed, 18 insertions(+), 59 deletions(-)

diff --git a/src/net/sf/freecol/client/ClientOptions.java b/src/net/sf/freecol/client/ClientOptions.java
index 68b6af848..814efaeb6 100644
--- a/src/net/sf/freecol/client/ClientOptions.java
+++ b/src/net/sf/freecol/client/ClientOptions.java
@@ -42,6 +42,7 @@ import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.Europe;
 import net.sf.freecol.common.model.FreeColGameObject;
 import net.sf.freecol.common.model.Game;
+import net.sf.freecol.common.model.Location;
 import net.sf.freecol.common.model.ModelMessage;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Unit;
@@ -430,67 +431,30 @@ public class ClientOptions extends OptionGroup {
         = "clientOptions.mods.userMods";
 
 
-    /**
-     * Comparators for sorting colonies.
-     */
+    // Comparators for sorting colonies.
+    /** Compare by ascending age. */
     private static final Comparator<Colony> colonyAgeComparator
-        = new Comparator<Colony>() {
-            @Override
-            public int compare(Colony s1, Colony s2) {
-                return s1.getEstablished().getNumber()
-                    - s2.getEstablished().getNumber();
-            }
-        };
+        = Comparator.comparingInt(c -> c.getEstablished().getNumber());
 
+    /** Compare by name. */
     private static final Comparator<Colony> colonyNameComparator
-        = new Comparator<Colony>() {
-            @Override
-            public int compare(Colony s1, Colony s2) {
-                return s1.getName().compareTo(s2.getName());
-            }
-        };
+        = Comparator.comparing(Colony::getName);
 
+    /** Compare by descending size then liberty. */
     private static final Comparator<Colony> colonySizeComparator
-        = new Comparator<Colony>() {
-            @Override
-            public int compare(Colony s1, Colony s2) {
-                // sort size descending, then SoL descending
-                int dsize = s2.getUnitCount() - s1.getUnitCount();
-                if (dsize == 0) {
-                    return s2.getSoL() - s1.getSoL();
-                } else {
-                    return dsize;
-                }
-            }
-        };
+        = Comparator.comparingInt(Colony::getUnitCount)
+            .thenComparingInt(Colony::getSoL)
+            .reversed();
 
+    /** Compare by descending liberty then size. */
     private static final Comparator<Colony> colonySoLComparator
-        = new Comparator<Colony>() {
-            @Override
-            public int compare(Colony s1, Colony s2) {
-                // sort SoL descending, then size descending
-                int dsol = s2.getSoL() - s1.getSoL();
-                if (dsol == 0) {
-                    return s2.getUnitCount() - s1.getUnitCount();
-                } else {
-                    return dsol;
-                }
-            }
-        };
+        = Comparator.comparingInt(Colony::getSoL)
+            .thenComparingInt(Colony::getUnitCount)
+            .reversed();
 
+    /** Compare by position on the map. */
     private static final Comparator<Colony> colonyPositionComparator
-        = new Comparator<Colony>() {
-            @Override
-            public int compare(Colony s1, Colony s2) {
-                // sort north to south, then west to east
-                int dy = s1.getTile().getY() - s2.getTile().getY();
-                if (dy == 0) {
-                    return s1.getTile().getX() - s2.getTile().getX();
-                } else {
-                    return dy;
-                }
-            }
-       };
+        = Comparator.comparingInt(c -> Location.getRank(c));
 
 
     private class MessageSourceComparator implements Comparator<ModelMessage> {
@@ -539,13 +503,8 @@ public class ClientOptions extends OptionGroup {
 
     /** Compare messages by type. */
     private static final Comparator<ModelMessage> messageTypeComparator
-        = new Comparator<ModelMessage>() {
-            @Override
-            public int compare(ModelMessage message1, ModelMessage message2) {
-                return message1.getMessageType().ordinal()
-                    - message2.getMessageType().ordinal();
-            }
-        };
+        = (m1, m2) -> m1.getMessageType().ordinal()
+                    - m2.getMessageType().ordinal();
 
 
     /**

From 1ee7b6d2ade29aee1efaac3e27e68939db6db8e6 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Fri, 2 Oct 2015 09:59:37 +0930
Subject: [PATCH 304/323] isAdjacent should not invoke path finding.

---
 src/net/sf/freecol/common/model/Tile.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 1ed686c94..8c70ab166 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -1170,7 +1170,8 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      *     <code>Tile</code>.
      */
     public boolean isAdjacent(Tile tile) {
-        return (tile == null) ? false : this.getDistanceTo(tile) == 1;
+        return (tile == null) ? false
+            : any(getSurroundingTiles(1, 1), t -> t == tile);
     }
 
     /**

From f1b12e37ac40da7b6edc0d9612f6d6761d3064fa Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Wed, 7 Oct 2015 17:42:27 +0200
Subject: [PATCH 305/323] Log more data to aid in fixing InfoPanel problems

---
 src/net/sf/freecol/client/gui/panel/InfoPanel.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/net/sf/freecol/client/gui/panel/InfoPanel.java b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
index 91a4d62b3..46b804f74 100644
--- a/src/net/sf/freecol/client/gui/panel/InfoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/InfoPanel.java
@@ -266,6 +266,14 @@ public final class InfoPanel extends FreeColPanel {
                     GoodsContainer gc = unit.getGoodsContainer();
                     if (gc != null) gc.addPropertyChangeListener(this);
                 }
+                logger.info("Switching UnitInfoPanel from " +
+                    (this.unit == null ? "null" :
+                        (this.unit.getId() + " " + this.unit.getDescription() +
+                        " " + this.unit.getMovesAsString())) +
+                     " to " +
+                    (unit == null ? "null" :
+                        (unit.getId() + " " + unit.getDescription() +
+                        " " + unit.getMovesAsString())));
                 this.unit = unit;
             }
             update();
@@ -506,6 +514,8 @@ public final class InfoPanel extends FreeColPanel {
             logger.warning("Inconsistent InfoPanel status");
         }
         if (this.mode != newMode) {
+            logger.info("Switching InfoPanel mode from " + mode +
+                        " to " + newMode);
             switch (this.mode = newMode) {
             case END:
                 this.mapEditorPanel.setVisible(false);

From fb225d6278a3f47f6baf983a59373cd282c429a1 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Tue, 6 Oct 2015 15:50:57 +0200
Subject: [PATCH 306/323] Exclude colony-center-tile when checking for forest
 minimum on AI tile-improvements

---
 src/net/sf/freecol/server/ai/AIColony.java | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/net/sf/freecol/server/ai/AIColony.java b/src/net/sf/freecol/server/ai/AIColony.java
index 54e32848c..3a9fbd2e8 100644
--- a/src/net/sf/freecol/server/ai/AIColony.java
+++ b/src/net/sf/freecol/server/ai/AIColony.java
@@ -1386,21 +1386,20 @@ public class AIColony extends AIObject implements PropertyChangeListener {
             } else {
                 if (!plan.update(goodsType)) plan = null;
             }
-            if (plan != null) {
-                // Defend against clearing the last forested tile, but
-                // otherwise add the plan.
-                TileType change = plan.getType().getChange(workTile.getType());
-                if (change != null && !change.isForested()) {
-                    int forest = 0;
-                    for (WorkLocation f : colony.getAvailableWorkLocations()) {
-                        if (f instanceof ColonyTile
-                            && ((ColonyTile)f).getWorkTile().isForested())
-                            forest++;
-                    }
-                    if (forest <= FOREST_MINIMUM) continue;
-                }
-                newPlans.add(plan);
-            }
+            if (plan == null) continue;
+
+            // Defend against clearing the last forested tile.
+            TileType change = plan.getType().getChange(workTile.getType());
+            if (change != null
+                && !change.isForested()
+                && !colonyTile.isColonyCenterTile()
+                && colony.getAvailableWorkLocations().stream()
+                    .filter(ct -> ct instanceof ColonyTile
+                        && !((ColonyTile)ct).isColonyCenterTile()
+                        && ((ColonyTile)ct).getWorkTile().isForested())
+                    .count() <= FOREST_MINIMUM) continue;
+
+            newPlans.add(plan); // Otherwise add the plan.
         }
         tileImprovementPlans.clear();
         tileImprovementPlans.addAll(newPlans);

From dce1fa6322182813d87cf82fe6b5929d31cfc78d Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 6 Oct 2015 10:28:05 +1030
Subject: [PATCH 307/323] Two tile checks do not need to self-test.

---
 src/net/sf/freecol/common/model/Tile.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 8c70ab166..cd3cea7d6 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -1190,7 +1190,7 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      */
     public boolean isLandLocked() {
         return (!isLand()) ? false
-            : all(getSurroundingTiles(0, 1), Tile::isLand);
+            : all(getSurroundingTiles(1, 1), Tile::isLand);
     }
 
     /**
@@ -1203,8 +1203,7 @@ public final class Tile extends UnitLocation implements Named, Ownable {
      * @return True if this <code>Tile</code> is on the shore.
      */
     public boolean isShore() {
-        return any(getSurroundingTiles(0, 1),
-            t -> t.isLand() != this.isLand());
+        return any(getSurroundingTiles(1, 1), t -> t.isLand() != this.isLand());
     }
 
 

From 211f60760383ae1a548a18db6a76d14a24865ac4 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 8 Oct 2015 14:15:53 +0200
Subject: [PATCH 308/323] Move event sounds into subfolder

---
 data/rules/classic/resources.properties       |  22 +++++++++---------
 .../resources/sound/{ => event}/README        |   0
 .../resources/sound/{ => event}/alert.ogg     | Bin
 .../resources/sound/{ => event}/building.ogg  | Bin
 .../resources/sound/{ => event}/colony.ogg    | Bin
 .../resources/sound/{ => event}/fountain.ogg  | Bin
 .../resources/sound/{ => event}/illegal.ogg   | Bin
 .../resources/sound/{ => event}/load.ogg      | Bin
 .../resources/sound/{ => event}/mission.ogg   | Bin
 .../resources/sound/{ => event}/sell.ogg      | Bin
 .../resources/sound/{ => event}/sunk.ogg      | Bin
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename data/rules/classic/resources/sound/{ => event}/README (100%)
 rename data/rules/classic/resources/sound/{ => event}/alert.ogg (100%)
 rename data/rules/classic/resources/sound/{ => event}/building.ogg (100%)
 rename data/rules/classic/resources/sound/{ => event}/colony.ogg (100%)
 rename data/rules/classic/resources/sound/{ => event}/fountain.ogg (100%)
 rename data/rules/classic/resources/sound/{ => event}/illegal.ogg (100%)
 rename data/rules/classic/resources/sound/{ => event}/load.ogg (100%)
 rename data/rules/classic/resources/sound/{ => event}/mission.ogg (100%)
 rename data/rules/classic/resources/sound/{ => event}/sell.ogg (100%)
 rename data/rules/classic/resources/sound/{ => event}/sunk.ogg (100%)

diff --git a/data/rules/classic/resources.properties b/data/rules/classic/resources.properties
index ec06cc53d..2840ce30f 100644
--- a/data/rules/classic/resources.properties
+++ b/data/rules/classic/resources.properties
@@ -17,19 +17,19 @@ sound.attack.naval=resources/sound/attack/naval.ogg
 # TODO: sound.attack.foot
 sound.event.meet.model.nation.aztec=resources/sound/meet/aztec.ogg
 # TODO: sound.event.meet.<otherNativeNations>
-sound.event.buildingComplete=resources/sound/building.ogg
-sound.event.captureColony=resources/sound/colony.ogg
-sound.event.illegalMove=resources/sound/illegal.ogg
-sound.event.alertSound=resources/sound/alert.ogg
+sound.event.buildingComplete=resources/sound/event/building.ogg
+sound.event.illegalMove=resources/sound/event/illegal.ogg
+sound.event.alertSound=resources/sound/event/alert.ogg
+sound.event.fountainOfYouth=resources/sound/event/fountain.ogg
+sound.event.missionEstablished=resources/sound/event/mission.ogg
+sound.event.loadCargo=resources/sound/event/load.ogg
+sound.event.sellCargo=resources/sound/event/sell.ogg
 # TODO: specific sound for cashInTreasureTrain
-sound.event.cashInTreasureTrain=resources/sound/sell.ogg
+sound.event.cashInTreasureTrain=resources/sound/event/sell.ogg
+sound.event.captureColony=resources/sound/event/colony.ogg
 # TODO: sound.event.destroySettlement
-sound.event.destroySettlement=resources/sound/colony.ogg
-sound.event.fountainOfYouth=resources/sound/fountain.ogg
-sound.event.loadCargo=resources/sound/load.ogg
-sound.event.missionEstablished=resources/sound/mission.ogg
-sound.event.sellCargo=resources/sound/sell.ogg
-sound.event.shipSunk=resources/sound/sunk.ogg
+sound.event.destroySettlement=resources/sound/event/colony.ogg
+sound.event.shipSunk=resources/sound/event/sunk.ogg
 
 # Order buttons
 image.miscicon.button.normal.wait=resources/images/ui/order-buttons/normal/wait.png
diff --git a/data/rules/classic/resources/sound/README b/data/rules/classic/resources/sound/event/README
similarity index 100%
rename from data/rules/classic/resources/sound/README
rename to data/rules/classic/resources/sound/event/README
diff --git a/data/rules/classic/resources/sound/alert.ogg b/data/rules/classic/resources/sound/event/alert.ogg
similarity index 100%
rename from data/rules/classic/resources/sound/alert.ogg
rename to data/rules/classic/resources/sound/event/alert.ogg
diff --git a/data/rules/classic/resources/sound/building.ogg b/data/rules/classic/resources/sound/event/building.ogg
similarity index 100%
rename from data/rules/classic/resources/sound/building.ogg
rename to data/rules/classic/resources/sound/event/building.ogg
diff --git a/data/rules/classic/resources/sound/colony.ogg b/data/rules/classic/resources/sound/event/colony.ogg
similarity index 100%
rename from data/rules/classic/resources/sound/colony.ogg
rename to data/rules/classic/resources/sound/event/colony.ogg
diff --git a/data/rules/classic/resources/sound/fountain.ogg b/data/rules/classic/resources/sound/event/fountain.ogg
similarity index 100%
rename from data/rules/classic/resources/sound/fountain.ogg
rename to data/rules/classic/resources/sound/event/fountain.ogg
diff --git a/data/rules/classic/resources/sound/illegal.ogg b/data/rules/classic/resources/sound/event/illegal.ogg
similarity index 100%
rename from data/rules/classic/resources/sound/illegal.ogg
rename to data/rules/classic/resources/sound/event/illegal.ogg
diff --git a/data/rules/classic/resources/sound/load.ogg b/data/rules/classic/resources/sound/event/load.ogg
similarity index 100%
rename from data/rules/classic/resources/sound/load.ogg
rename to data/rules/classic/resources/sound/event/load.ogg
diff --git a/data/rules/classic/resources/sound/mission.ogg b/data/rules/classic/resources/sound/event/mission.ogg
similarity index 100%
rename from data/rules/classic/resources/sound/mission.ogg
rename to data/rules/classic/resources/sound/event/mission.ogg
diff --git a/data/rules/classic/resources/sound/sell.ogg b/data/rules/classic/resources/sound/event/sell.ogg
similarity index 100%
rename from data/rules/classic/resources/sound/sell.ogg
rename to data/rules/classic/resources/sound/event/sell.ogg
diff --git a/data/rules/classic/resources/sound/sunk.ogg b/data/rules/classic/resources/sound/event/sunk.ogg
similarity index 100%
rename from data/rules/classic/resources/sound/sunk.ogg
rename to data/rules/classic/resources/sound/event/sunk.ogg

From cb06df38d9f47a13186c7a78ac215ab1effe7114 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Thu, 8 Oct 2015 14:17:40 +0200
Subject: [PATCH 309/323] Reuse artillery sound for bombardment

---
 data/rules/classic/resources.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/rules/classic/resources.properties b/data/rules/classic/resources.properties
index 2840ce30f..b205ba68a 100644
--- a/data/rules/classic/resources.properties
+++ b/data/rules/classic/resources.properties
@@ -14,6 +14,7 @@ sound.attack.artillery=resources/sound/attack/artillery.ogg
 sound.attack.mounted=resources/sound/attack/dragoon.ogg
 sound.attack.naval=resources/sound/attack/naval.ogg
 # TODO: sound.attack.bombard
+sound.attack.bombard=resources/sound/attack/artillery.ogg
 # TODO: sound.attack.foot
 sound.event.meet.model.nation.aztec=resources/sound/meet/aztec.ogg
 # TODO: sound.event.meet.<otherNativeNations>

From 27beb32a9195aa1d1982915d47103676f33b0efa Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Fri, 9 Oct 2015 20:37:02 +1030
Subject: [PATCH 310/323] Add --server-port option, --server drops port
 argument.

---
 data/strings/FreeColMessages.properties       |  3 ++-
 doc/FreeCol.tex                               |  5 +++--
 src/net/sf/freecol/FreeCol.java               | 19 ++++++++++++-------
 .../client/control/ConnectController.java     |  8 ++++----
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties
index 7c13463d9..8836afa16 100644
--- a/data/strings/FreeColMessages.properties
+++ b/data/strings/FreeColMessages.properties
@@ -251,8 +251,9 @@ cli.no-sound=run FreeCol without sound
 cli.no-splash=skip the splash screen
 cli.private=start a private server (not published to the metaserver)
 cli.seed=provide a SEED for the pseudo-random number generator
+cli.server=start a stand-alone server
 cli.server-name=specify a custom NAME for the server
-cli.server=start a stand-alone server on the specified port
+cli.server-port=specify a custom PORT for the server
 cli.splash=display a splash screen image FILE while loading the game
 cli.tc=load the total conversion with the given NAME
 cli.timeout=number of seconds the server waits for an answer to a question
diff --git a/doc/FreeCol.tex b/doc/FreeCol.tex
index 99b071601..dda5abb10 100644
--- a/doc/FreeCol.tex
+++ b/doc/FreeCol.tex
@@ -366,8 +366,9 @@ options:
   does not yet contain background music, so the only sounds you will
   hear will be special effects.
 \item\verb$--no-splash$ Skip the splash screen.
-\item\verb$--server PORT$ Start a stand-alone server on the specified
-  port.
+\item\verb$--server$ Start a stand-alone server.
+\item\verb$--server-name NAME$ Specify the server name.
+\item\verb$--server-port PORT$ Specify the server port.
 \item\verb$--server-help$ Display a help screen for the more advanced
   server options.
 \item\verb$--splash FILE$ Specify the location of the splash screen file.
diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index 8858e8cea..883b9be9b 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -561,14 +561,17 @@ public final class FreeCol {
                           .create());
         options.addOption(OptionBuilder.withLongOpt("server")
                           .withDescription(Messages.message("cli.server"))
-                          .withArgName(Messages.message("cli.arg.port"))
-                          .hasOptionalArg()
                           .create());
         options.addOption(OptionBuilder.withLongOpt("server-name")
                           .withDescription(Messages.message("cli.server-name"))
                           .withArgName(Messages.message("cli.arg.name"))
                           .hasArg()
                           .create());
+        options.addOption(OptionBuilder.withLongOpt("server-port")
+                          .withDescription(Messages.message("cli.server-port"))
+                          .withArgName(Messages.message("cli.arg.port"))
+                          .hasArg()
+                          .create());
         options.addOption(OptionBuilder.withLongOpt("splash")
                           .withDescription(Messages.message("cli.splash"))
                           .withArgName(Messages.message("cli.arg.file"))
@@ -765,16 +768,18 @@ public final class FreeCol {
             }
 
             if (line.hasOption("server")) {
-                String arg = line.getOptionValue("server");
-                if (!setServerPort(arg)) {
-                    fatal(StringTemplate.template("cli.error.serverPort")
-                        .addName("%string%", arg));
-                }
                 standAloneServer = true;
             }
             if (line.hasOption("server-name")) {
                 serverName = line.getOptionValue("server-name");
             }
+            if (line.hasOption("server-port")) {
+                String arg = line.getOptionValue("server-port");
+                if (!setServerPort(arg)) {
+                    fatal(StringTemplate.template("cli.error.serverPort")
+                        .addName("%string%", arg));
+                }
+            }
 
             if (line.hasOption("seed")) {
                 FreeColSeed.setFreeColSeed(line.getOptionValue("seed"));
diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
index 1762df29b..4ee59d282 100644
--- a/src/net/sf/freecol/client/control/ConnectController.java
+++ b/src/net/sf/freecol/client/control/ConnectController.java
@@ -628,16 +628,16 @@ public final class ConnectController {
             } catch (FileNotFoundException e) {
                 err = StringTemplate.key("server.fileNotFound");
                 logger.log(Level.WARNING, "Can not find file.", e);
-            } catch (FreeColException e) {
-                err = StringTemplate.name(e.getMessage());
-                logger.log(Level.WARNING, "FreeCol error.", e);
             } catch (IOException e) {
                 err = StringTemplate.key("server.initialize");
                 logger.log(Level.WARNING, "Error starting game.", e);
             } catch (XMLStreamException e) {
                 err = FreeCol.badLoad(theFile);
                 logger.log(Level.WARNING, "Stream error.", e);
-            }
+            } catch (Exception e) {
+                err = StringTemplate.name(e.getMessage());
+                logger.log(Level.WARNING, "FreeCol error.", e);
+            }                
             if (err != null) {
                 // If this is a debug run, fail hard.
                 if (freeColClient.isHeadless()

From 5ebcd68c983e2187da4445ab3e53a484c3701a11 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 7 Oct 2015 12:56:35 +1030
Subject: [PATCH 311/323] Move Player.xyComparator to Unit.locComparator.

---
 src/net/sf/freecol/common/model/Player.java | 25 ++---------------
 src/net/sf/freecol/common/model/Unit.java   | 31 ++++++++-------------
 2 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 42c0db1c7..325817b18 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -214,10 +214,9 @@ public class Player extends FreeColGameObject implements Nameable {
          */
         private final void update() {
             units.clear();
-            for (Unit u : owner.getUnits()) {
-                if (predicate.obtains(u)) units.add(u);
-            }
-            Collections.sort(units, xyComparator);
+            units.addAll(owner.getUnits().stream()
+                .filter(u -> predicate.obtains(u))
+                .sorted(Unit.locComparator).collect(Collectors.toList()));
         }
 
         /**
@@ -302,24 +301,6 @@ public class Player extends FreeColGameObject implements Nameable {
     // Constants
     //
 
-    /**
-     * A comparator to compare units by position, top to bottom,
-     * left to right.
-     */
-    private static final Comparator<Unit> xyComparator
-        = new Comparator<Unit>() {
-            @Override
-            public int compare(Unit unit1, Unit unit2) {
-                Tile tile1 = unit1.getTile();
-                Tile tile2 = unit2.getTile();
-                int cmp = ((tile1 == null) ? 0 : tile1.getY())
-                    - ((tile2 == null) ? 0 : tile2.getY());
-                return (cmp != 0 || tile1 == null || tile2 == null) ? cmp
-                    : (tile1.getX() - tile2.getX());
-            }
-        };
-
-
     /** A comparator for ordering players. */
     public static final Comparator<Player> playerComparator
         = new Comparator<Player>() {
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index e6cadb2de..c6c2c20e2 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -68,20 +68,22 @@ public class Unit extends GoodsLocation
      */
     public static final int MANY_TURNS = 10000;
 
-    /** A comparator to order units by skill level. */
-    private static final Comparator<Unit> skillLevelComp
-        = new Comparator<Unit>() {
-            @Override
-            public int compare(Unit u1, Unit u2) {
-                return u1.getSkillLevel() - u2.getSkillLevel();
-            }
-        };
-
-
     public static final String CARGO_CHANGE = "CARGO_CHANGE";
     public static final String MOVE_CHANGE = "MOVE_CHANGE";
     public static final String ROLE_CHANGE = "ROLE_CHANGE";
 
+    /**
+     * A comparator to compare units by position, top to bottom,
+     * left to right.
+     */
+    public static final Comparator<Unit> locComparator
+        = Comparator.comparingInt(u -> Location.getRank(u));
+
+    /** A comparator to compare units by type then role. */
+    public static final Comparator<Unit> typeRoleComparator
+        = Comparator.comparing(Unit::getType)
+            .thenComparing(Comparator.comparing(Unit::getRole));
+    
     /** A state a Unit can have. */
     public static enum UnitState {
         ACTIVE,
@@ -3459,15 +3461,6 @@ public class Unit extends GoodsLocation
         return (unitType.hasSkill()) ? unitType.getSkill() : 0;
     }
 
-    /**
-     * Get a Comparator that compares the skill levels of given units.
-     *
-     * @return skill Comparator
-     */
-    public static Comparator<Unit> getSkillLevelComparator() {
-        return skillLevelComp;
-    }
-
     /**
      * Gets the appropriate trade bonuses due to a missionary unit.
      *

From 061733efaf7c7dc2f69ae2fac263e0aa9ec9faeb Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sat, 10 Oct 2015 18:37:17 +0200
Subject: [PATCH 312/323] Fix out of memory error in unit tests

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 31815c0ac..f39b0d1a7 100644
--- a/build.xml
+++ b/build.xml
@@ -633,7 +633,7 @@
              export CLASSPATH=${CLASSPATH}:test/lib/junit.jar; ant testall
         -->
         <junit printsummary="on" errorProperty="error.junit"
-               failureProperty="error.junit" fork="yes" maxmemory="64M">
+               failureProperty="error.junit" fork="yes" maxmemory="96M">
             <classpath refid="test.run.classpath"/>
             <formatter type="xml" />
 

From 58890d32d7e7bd0d0b980e4908f64e0de0d9299e Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Tue, 6 Oct 2015 12:44:34 +1030
Subject: [PATCH 313/323] Move unit type comparator from ReportPanel to Unit.

---
 src/net/sf/freecol/client/gui/TilePopup.java  | 12 ++++------
 .../gui/panel/ReportClassicColonyPanel.java   | 21 ++++++++---------
 .../freecol/client/gui/panel/ReportPanel.java | 23 -------------------
 .../client/gui/panel/ReportUnitPanel.java     | 16 +++++++------
 src/net/sf/freecol/common/model/Unit.java     |  1 -
 5 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/TilePopup.java b/src/net/sf/freecol/client/gui/TilePopup.java
index 2b0cf4c7b..26ad0da06 100644
--- a/src/net/sf/freecol/client/gui/TilePopup.java
+++ b/src/net/sf/freecol/client/gui/TilePopup.java
@@ -26,6 +26,7 @@ import java.awt.event.ActionEvent;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -200,11 +201,10 @@ public final class TilePopup extends JPopupMenu {
         int maxUnits = UNIT_LINES_IN_FIRST_MENU;
         Container currentMenu = this;
         boolean moreUnits = false;
-        List<Unit> units = tile.getUnitList();
         Unit firstUnit = tile.getFirstUnit();
-        Collections.sort(units, ReportPanel.getUnitTypeComparator());
-        for (final Unit currentUnit : units) {
-
+        for (Unit u : tile.getUnitList().stream()
+                 .sorted(Unit.typeRoleComparator)
+                 .collect(Collectors.toList())) {
             if (lineCount > maxUnits) {
                 JMenu more = Utility.localizedMenu("more");
                 more.setFont(more.getFont().deriveFont(Font.ITALIC));
@@ -215,9 +215,7 @@ public final class TilePopup extends JPopupMenu {
                 lineCount = 0;
                 maxUnits = UNIT_LINES_IN_OTHER_MENUS;
             }
-
-            lineCount += addUnit(currentMenu, currentUnit,
-                !currentUnit.isDamaged(), false);
+            lineCount += addUnit(currentMenu, u, !u.isDamaged(), false);
         }
 
         if (tile.getUnitCount() > 1 && player.owns(firstUnit)) {
diff --git a/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
index a6cbc7e05..a9e04c4e7 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportClassicColonyPanel.java
@@ -25,6 +25,7 @@ import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -103,21 +104,17 @@ public final class ReportClassicColonyPanel extends ReportPanel
             JPanel colonistsPanel
                 = new JPanel(new GridLayout(0, COLONISTS_PER_ROW));
             colonistsPanel.setOpaque(false);
-            List<Unit> unitList = colony.getUnitList();
-            Collections.sort(unitList, getUnitTypeComparator());
-            for (Unit unit : unitList) {
-                UnitLabel unitLabel = new UnitLabel(getFreeColClient(), unit,
-                    true, true);
-                colonistsPanel.add(unitLabel);
+            for (Unit u : colony.getUnitList().stream()
+                     .sorted(Unit.typeRoleComparator).collect(Collectors.toList())) {
+                colonistsPanel.add(new UnitLabel(getFreeColClient(), u,
+                                                 true, true));
             }
             JPanel unitsPanel = new JPanel(new GridLayout(0, UNITS_PER_ROW));
             unitsPanel.setOpaque(false);
-            unitList = colony.getTile().getUnitList();
-            Collections.sort(unitList, getUnitTypeComparator());
-            for (Unit unit : unitList) {
-                UnitLabel unitLabel = new UnitLabel(getFreeColClient(), unit,
-                    true, true);
-                unitsPanel.add(unitLabel);
+            for (Unit u : colony.getTile().getUnitList().stream()
+                     .sorted(Unit.typeRoleComparator).collect(Collectors.toList())) {
+                unitsPanel.add(new UnitLabel(getFreeColClient(), u,
+                                             true, true));
             }
             if (buildableLabel != null
                 && spec.getUnitTypeList().contains(currentType)) {
diff --git a/src/net/sf/freecol/client/gui/panel/ReportPanel.java b/src/net/sf/freecol/client/gui/panel/ReportPanel.java
index c92b996c4..74a5af9ff 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportPanel.java
@@ -51,20 +51,6 @@ public class ReportPanel extends FreeColPanel {
 
     protected static final Logger logger = Logger.getLogger(ReportPanel.class.getName());
 
-    private static final Comparator<Unit> unitTypeComparator
-        = new Comparator<Unit>() {
-            @Override
-            public int compare(Unit unit1, Unit unit2) {
-                int deltaType = unit2.getType().compareTo(unit1.getType());
-                if (deltaType == 0) {
-                    return (unit2.getRole() == null) ? -1
-                        : unit2.getRole().getId().compareTo(unit1.getRole().getId());
-                } else {
-                    return deltaType;
-                }
-            }
-        };
-
     protected final JPanel reportPanel;
 
     protected final JLabel header;
@@ -109,15 +95,6 @@ public class ReportPanel extends FreeColPanel {
         reportPanel.doLayout();
     }
 
-    /**
-     * Returns a unit type comparator.
-     *
-     * @return A unit type comparator.
-     */
-    public static Comparator<Unit> getUnitTypeComparator() {
-        return unitTypeComparator;
-    }
-
     private Border createBorder() {
         return new EmptyBorder(20, 20, 20, 20);
     }
diff --git a/src/net/sf/freecol/client/gui/panel/ReportUnitPanel.java b/src/net/sf/freecol/client/gui/panel/ReportUnitPanel.java
index 541ed74c1..277ab1dc7 100644
--- a/src/net/sf/freecol/client/gui/panel/ReportUnitPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ReportUnitPanel.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -184,17 +185,18 @@ public abstract class ReportUnitPanel extends ReportPanel {
         if (unitList == null || unitList.isEmpty()) {
             reportPanel.add(Utility.localizedLabel("none"), "sg");
         } else {
-            Collections.sort(unitList, ReportPanel.getUnitTypeComparator());
-            for (Unit unit : unitList) {
-                JButton unitButton = getUnitButton(unit);
-                if (unit.isCarrier()) {
+            for (Unit u : unitList.stream()
+                     .sorted(Unit.typeRoleComparator).collect(Collectors.toList())) {
+                JButton unitButton = getUnitButton(u);
+                if (u.isCarrier()) {
                     reportPanel.add(unitButton, "newline, sg");
-                    for (Goods goods : unit.getGoodsList()) {
+                    for (Goods goods : u.getGoodsList()) {
                         GoodsLabel goodsLabel = new GoodsLabel(getGUI(), goods);
                         reportPanel.add(goodsLabel);
                     }
-                    for (Unit unitLoaded : unit.getUnitList()) {
-                        UnitLabel unitLoadedLabel = new UnitLabel(getFreeColClient(), unitLoaded, true);
+                    for (Unit unitLoaded : u.getUnitList()) {
+                        UnitLabel unitLoadedLabel
+                            = new UnitLabel(getFreeColClient(), unitLoaded, true);
                         reportPanel.add(unitLoadedLabel);
                     }
                 } else {
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index c6c2c20e2..686211d6d 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -108,7 +108,6 @@ public class Unit extends GoodsLocation
         }
     }
 
-
     /** The individual name of this unit, not of the unit type. */
     protected String name = null;
 

From ab7ebafddf34930d5229c76b88a9726283a62d76 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 7 Oct 2015 09:52:47 +1030
Subject: [PATCH 314/323] Move military strength comparator to CombatModel.

---
 .../sf/freecol/common/model/CombatModel.java    | 11 +++++++++++
 src/net/sf/freecol/common/model/Unit.java       | 17 -----------------
 .../sf/freecol/server/ai/NativeAIPlayer.java    |  2 +-
 src/net/sf/freecol/server/ai/REFAIPlayer.java   |  4 ++--
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/net/sf/freecol/common/model/CombatModel.java b/src/net/sf/freecol/common/model/CombatModel.java
index b0f2adf65..2791cfcb1 100644
--- a/src/net/sf/freecol/common/model/CombatModel.java
+++ b/src/net/sf/freecol/common/model/CombatModel.java
@@ -19,6 +19,7 @@
 
 package net.sf.freecol.common.model;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
@@ -180,6 +181,16 @@ public abstract class CombatModel {
         return false;
     }
 
+    /**
+     * Get a comparator to order units by relative military strength
+     * with respect to this combat model.
+     *
+     * @return A suitable unit <code>Comparator</code>.
+     */
+    public final Comparator<Unit> getMilitaryStrengthComparator() {
+        return (u1, u2) -> Double.compare(calculateCombatOdds(u1, u2).win,
+                                          calculateCombatOdds(u2, u1).win);
+    }
 
     /**
      * Calculates the chance of the outcomes of a combat.
diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
index 686211d6d..74f0162f6 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -1876,23 +1876,6 @@ public class Unit extends GoodsLocation
         return (best != null) ? best : player.getEurope();
     }
 
-    /**
-     * Get a comparator to order units by military strength.
-     *
-     * @param cm The <code>CombatModel</code> to assess strength with.
-     * @return A suitable <code>Comparator</code>.
-     */
-    public static final Comparator<Unit> getMilitaryStrengthComparator(final CombatModel cm) {
-        return new Comparator<Unit>() {
-                @Override
-                public int compare(Unit u1, Unit u2) {
-                    double cmp = cm.calculateCombatOdds(u1, u2).win
-                        - cm.calculateCombatOdds(u2, u1).win;
-                    return (cmp < 0.5) ? -1 : (cmp > 0.5) ? 1 : 0;
-                }
-            };
-    }
-
 
     // Movement handling
 
diff --git a/src/net/sf/freecol/server/ai/NativeAIPlayer.java b/src/net/sf/freecol/server/ai/NativeAIPlayer.java
index 3248d3c59..259c8e8f7 100644
--- a/src/net/sf/freecol/server/ai/NativeAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/NativeAIPlayer.java
@@ -226,7 +226,7 @@ public class NativeAIPlayer extends AIPlayer {
 
         // Prioritize promoting partially equipped units to full dragoon
         Collections.sort(units,
-            Unit.getMilitaryStrengthComparator(getGame().getCombatModel()));
+            getGame().getCombatModel().getMilitaryStrengthComparator());
 
         boolean moreHorses = true, moreMuskets = true;
         for (Unit u : units) {
diff --git a/src/net/sf/freecol/server/ai/REFAIPlayer.java b/src/net/sf/freecol/server/ai/REFAIPlayer.java
index d20792641..958d05332 100644
--- a/src/net/sf/freecol/server/ai/REFAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/REFAIPlayer.java
@@ -432,8 +432,8 @@ public class REFAIPlayer extends EuropeanAIPlayer {
         }
 
         // Attack naval targets.
-        Comparator<Unit> militaryStrength
-            = Unit.getMilitaryStrengthComparator(getGame().getCombatModel());
+        final Comparator<Unit> militaryStrength
+            = getGame().getCombatModel().getMilitaryStrengthComparator();
         Collections.sort(rebelNavy, militaryStrength);
         Iterator<Unit> ui = rebelNavy.iterator();
         List<Tile> entries = new ArrayList<>();

From 5efb3157b9b7ca39c827121c4897b6b910da56f8 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Mon, 12 Oct 2015 14:44:02 +1030
Subject: [PATCH 315/323] Fix sail direction message, BR#2922.

---
 src/net/sf/freecol/common/model/Player.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Player.java b/src/net/sf/freecol/common/model/Player.java
index 325817b18..103ff20a0 100644
--- a/src/net/sf/freecol/common/model/Player.java
+++ b/src/net/sf/freecol/common/model/Player.java
@@ -2552,12 +2552,13 @@ public class Player extends FreeColGameObject implements Nameable {
      * Add the tutorial message for the start of the game.
      */
     public void addStartGameMessage() {
-        Direction sailDirection = (getNation().startsOnEastCoast())
-            ? Direction.W
-            : Direction.E;
+        Tile tile = getEntryLocation().getTile();
+        String sailTag = (tile == null) ? "unknown"
+            : (tile.getX() < tile.getMap().getWidth() / 2) ? "east"
+            : "west";
         addModelMessage(new ModelMessage(ModelMessage.MessageType.TUTORIAL,
                                          "model.player.startGame", this)
-            .addNamed("%direction%", sailDirection));
+            .add("%direction%", sailTag));
     }
 
     /**

From d18be8507f9f276b5ee0241d8ffd3d50e807b2c1 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 7 Oct 2015 10:00:08 +1030
Subject: [PATCH 316/323] Move sale price comparator into its Market.

---
 src/net/sf/freecol/common/model/Market.java | 11 +++++++++++
 src/net/sf/freecol/common/model/Tile.java   | 19 +------------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Market.java b/src/net/sf/freecol/common/model/Market.java
index 710f88350..1ea207455 100644
--- a/src/net/sf/freecol/common/model/Market.java
+++ b/src/net/sf/freecol/common/model/Market.java
@@ -21,6 +21,7 @@ package net.sf.freecol.common.model;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -415,6 +416,16 @@ public final class Market extends FreeColGameObject implements Ownable {
         if (data != null) data.update();
     }
 
+    /**
+     * Get a sale price comparator for this market.
+     *
+     * @return A suitable <code>Comparator</code>.
+     */
+    public <T extends AbstractGoods> Comparator<T> getSalePriceComparator() {
+        return Comparator.comparingInt((T t)
+            -> getSalePrice(t.getType(), t.getAmount())).reversed();
+    }
+
     /**
      * Adds a transaction listener for notification of any transaction
      *
diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index cd3cea7d6..3fe21d647 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -1741,23 +1741,6 @@ public final class Tile extends UnitLocation implements Named, Ownable {
         return getSortedPotential(unit.getType(), unit.getOwner());
     }
 
-    /**
-     * Get a comparator to order a list of goods by potential sale value
-     * in a market.
-     *
-     * @param market The <code>Market</code> to evaluate against.
-     * @return A comparator.
-     */
-    public Comparator<AbstractGoods> getMarketGoodsComparator(final Market market) {
-        return new Comparator<AbstractGoods>() {
-            @Override
-            public int compare(AbstractGoods o, AbstractGoods p) {
-                return market.getSalePrice(p.getType(), p.getAmount())
-                    - market.getSalePrice(o.getType(), o.getAmount());
-            }
-        };
-    }
-
     /**
      * Sort possible goods types according to potential.
      *
@@ -1782,7 +1765,7 @@ public final class Tile extends UnitLocation implements Named, Ownable {
             Collections.sort(goodsTypeList,
                 (owner == null || owner.getMarket() == null)
                 ? AbstractGoods.abstractGoodsComparator
-                : getMarketGoodsComparator(owner.getMarket()));
+                : owner.getMarket().getSalePriceComparator());
         }
         return goodsTypeList;
     }

From 14e6d39626a17b22c9314b68860dfcf427c30c5c Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 7 Oct 2015 12:36:05 +1030
Subject: [PATCH 317/323] Move edge comparator to Tile.

---
 src/net/sf/freecol/common/model/Tile.java     | 15 +++++++++++++++
 .../server/generator/SimpleMapGenerator.java  | 19 ++-----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
index 3fe21d647..09103a7c1 100644
--- a/src/net/sf/freecol/common/model/Tile.java
+++ b/src/net/sf/freecol/common/model/Tile.java
@@ -52,6 +52,10 @@ public final class Tile extends UnitLocation implements Named, Ownable {
 
     private static final Logger logger = Logger.getLogger(Tile.class.getName());
 
+    /** Comparator to sort tiles by increasing distance from the edge. */
+    public static final Comparator<Tile> edgeDistanceComparator
+        = Comparator.comparingInt(Tile::getEdgeDistance);
+
     /**
      * Information that is internal to the native settlements, and only
      * updated on close contact.
@@ -527,6 +531,17 @@ public final class Tile extends UnitLocation implements Named, Ownable {
         return true;
     }
 
+    /**
+     * Get the minimum distance in tiles from this tile to the map edge.
+     *
+     * @return The distance to the edge.
+     */
+    private int getEdgeDistance() {
+        final Map map = getMap();
+        final int x = getX(), y = getY();
+        return Math.min(Math.min(x, map.getWidth() - x),
+                        Math.min(y, map.getHeight() - y));
+    }
 
     /**
      * Get the style value.
diff --git a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
index 76849e206..7bba66288 100644
--- a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
+++ b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
@@ -96,22 +96,7 @@ public class SimpleMapGenerator implements MapGenerator {
      */
     private static final float MIN_DISTANCE_FROM_POLE = 0.30f;
 
-    /** Comparator to sort tiles by increasing distance from the edge. */
-    private static final Comparator<Tile> tileEdgeComparator
-        = new Comparator<Tile>() {
-            @Override
-            public int compare(Tile tile1, Tile tile2) {
-                final Map map = tile1.getMap();
-                int distance1 = Math.min(Math.min(tile1.getX(),
-                        map.getWidth() - tile1.getX()),
-                    Math.min(tile1.getY(), map.getHeight() - tile1.getY()));
-                int distance2 = Math.min(Math.min(tile2.getX(),
-                        map.getWidth() - tile2.getX()),
-                    Math.min(tile2.getY(), map.getHeight() - tile2.getY()));
-                return distance1 - distance2;
-            }
-        };
-    
+   
     private static class Territory {
         public ServerRegion region;
         public Tile tile;
@@ -490,7 +475,7 @@ public class SimpleMapGenerator implements MapGenerator {
         }
 
         // Sort tiles from the edges of the map inward
-        Collections.sort(settlementTiles, tileEdgeComparator);
+        Collections.sort(settlementTiles, Tile.edgeDistanceComparator);
 
         // Now place other settlements
         while (!settlementTiles.isEmpty() && !territories.isEmpty()) {

From 51cd300a9623183c8b03859d5ab1cded3459c3d5 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Wed, 14 Oct 2015 20:17:53 +1030
Subject: [PATCH 318/323] Improve skill generation log message.

---
 src/net/sf/freecol/server/generator/SimpleMapGenerator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
index 7bba66288..fe5c5e2ce 100644
--- a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
+++ b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
@@ -602,7 +602,7 @@ public class SimpleMapGenerator implements MapGenerator {
                 lb.add("  0 x <none>");
             } else {
                 lb.add("  ", iss.size(),
-                    " x ", iss.get(0).getLearnableSkill());
+                    " x ", iss.get(0).getLearnableSkill().getSuffix());
             }
         }
         lb.add("\nCreated ", settlementsPlaced,
@@ -721,7 +721,7 @@ public class SimpleMapGenerator implements MapGenerator {
                                          capital, skill, null);
         player.addSettlement(settlement);
         lb.add("Generated skill for ", settlement.getName(),
-            ": ", settlement.getLearnableSkill());
+            ": ", settlement.getLearnableSkill().getSuffix(), "\n");
 
         settlement.placeSettlement(true);
         settlement.addRandomGoods(random);

From daeeaef04b9e2f1c7deb5a1cad58678e39feb21d Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Wed, 14 Oct 2015 12:57:24 +0200
Subject: [PATCH 319/323] Localisation updates from https://translatewiki.net.

---
 data/strings/FreeColMessages_af.properties    |    4 +-
 data/strings/FreeColMessages_ang.properties   |    4 +-
 data/strings/FreeColMessages_ar.properties    |   53 +-
 data/strings/FreeColMessages_arz.properties   |    4 +-
 .../FreeColMessages_be-tarask.properties      |    4 +-
 data/strings/FreeColMessages_br.properties    |    4 +-
 data/strings/FreeColMessages_ca.properties    |    4 +-
 data/strings/FreeColMessages_cs_CZ.properties |    4 +-
 data/strings/FreeColMessages_da.properties    |    4 +-
 data/strings/FreeColMessages_de.properties    |    4 +-
 data/strings/FreeColMessages_eo.properties    |    4 +-
 data/strings/FreeColMessages_es_ES.properties |    8 +-
 data/strings/FreeColMessages_fi.properties    |   11 +-
 data/strings/FreeColMessages_fr.properties    | 1648 ++++++++---------
 data/strings/FreeColMessages_gl.properties    |    4 +-
 data/strings/FreeColMessages_he.properties    |    4 +-
 data/strings/FreeColMessages_hu.properties    |    4 +-
 data/strings/FreeColMessages_ia.properties    |  145 +-
 data/strings/FreeColMessages_it_IT.properties |    4 +-
 data/strings/FreeColMessages_ja.properties    |    5 +-
 data/strings/FreeColMessages_ko.properties    |    8 +-
 data/strings/FreeColMessages_lt.properties    |  129 +-
 data/strings/FreeColMessages_mk.properties    |    4 +-
 data/strings/FreeColMessages_ms.properties    |    4 +-
 data/strings/FreeColMessages_nl.properties    |    4 +-
 data/strings/FreeColMessages_nl_BE.properties |    4 +-
 data/strings/FreeColMessages_oc.properties    |    6 +-
 data/strings/FreeColMessages_pl_PL.properties |    4 +-
 data/strings/FreeColMessages_pt_BR.properties |    6 +-
 data/strings/FreeColMessages_pt_PT.properties |    4 +-
 data/strings/FreeColMessages_qqq.properties   |   25 +-
 data/strings/FreeColMessages_ru.properties    |   24 +-
 data/strings/FreeColMessages_sk.properties    |    9 +-
 data/strings/FreeColMessages_sv_SE.properties |  303 +--
 data/strings/FreeColMessages_tl.properties    |    4 +-
 data/strings/FreeColMessages_tr.properties    |    3 +-
 data/strings/FreeColMessages_uk.properties    |    4 +-
 .../FreeColMessages_zh-hant.properties        |    4 +-
 data/strings/FreeColMessages_zh_CN.properties |   12 +-
 39 files changed, 1307 insertions(+), 1180 deletions(-)

diff --git a/data/strings/FreeColMessages_af.properties b/data/strings/FreeColMessages_af.properties
index ae0abf815..9c6f3cf29 100644
--- a/data/strings/FreeColMessages_af.properties
+++ b/data/strings/FreeColMessages_af.properties
@@ -135,8 +135,9 @@ cli.no-java-check=slaan die java weergawebeheer oor
 cli.no-memory-check=slaan die geheuebeheer oor
 cli.no-sound=begin FreeCol sonder klank
 cli.private=begin 'n privaat bediener (nie gepubliseer na die metabediener)
-cli.server-name=gee 'n aangepaste NAAM aan die bediener
+# Fuzzy
 cli.server=begin 'n aleenstaande bediener op die gespesifiseerde poort
+cli.server-name=gee 'n aangepaste NAAM aan die bediener
 cli.splash=vertoon 'n flitsskermbeeld LêER solank die spel laai
 cli.tc=laai die totale omskakeling met die gegewe NAAM
 cli.version=vertoon die weergawe nommer en sluit af
@@ -1548,6 +1549,7 @@ server.fileNotFound=Kon nie die lêer met gegewe naam vind nie.
 server.incompatibleVersions=Die gestoorde spel wat u probeer laai is nie aanpasbaar met hierdie weergawe van FreeCol nie.
 server.invalidPlayerNations=Alle spelers moet 'n unieke nasie kies voor die spel kan begin.
 server.maximumPlayers=Jammer, die maksimum getal spelers is bereik.
+# Fuzzy
 server.noRouteToServer=Die bediener kon nie publiek gemaak word nie. U moet u brandmuur opstelling verander om op die poort gespesifiseer te kan konnekteer.
 server.notAllReady=Nie al die spelers is gereed om die spel te begin nie!
 server.onlyAdminCanLaunch=Jammer, slegs die bediener admin kan die spel begin.
diff --git a/data/strings/FreeColMessages_ang.properties b/data/strings/FreeColMessages_ang.properties
index 345806715..a52787fa8 100644
--- a/data/strings/FreeColMessages_ang.properties
+++ b/data/strings/FreeColMessages_ang.properties
@@ -165,8 +165,9 @@ cli.no-memory-check=oferhebbe þa gemyndes neosunge
 cli.no-sound=drif FreeCol leas sƿeges
 cli.private=beginne anlepigne þegntol (nis forþsend to þæm eallþegntole)
 cli.seed=gield SÆD to þæm leashlietlican rimforþberende
-cli.server-name=ceose tpmearcodne NAMAN for þæm þegntole
+# Fuzzy
 cli.server=beginne anstandendne þegntol on þære gecorenre dura
+cli.server-name=ceose tpmearcodne NAMAN for þæm þegntole
 cli.splash=eoƿie inlædendes bredes bilides YMELAN þa hƿile þe þæt gamen si gehladen
 cli.tc=hlade þa fullan aƿendunge mid þissum NAMAN
 cli.timeout=rim eagbearhtma þa þe se þegntol abitt andsƿære sumre ascunge
@@ -1682,6 +1683,7 @@ server.fileNotFound=Ne cuðe findan þa ymelan þe hæfde þone gifenan naman.
 server.incompatibleVersions=Þæt hordode gamen þæt þe þu eart gesecende to hladenne nis genge on þisre fadunge FreeCol.
 server.invalidPlayerNations=Ealle pleȝendas þurfon cēosan ānlīce þēode fōre þæt ȝamen cann ƿesan underȝunnen.
 server.maximumPlayers=Ƿē sind sāriȝe, for þȳ þæt mǣste rīm pleȝenda hafaþ nū ǣr tōcumen.
+# Fuzzy
 server.noRouteToServer=Se þeȝntōl ne cann ƿeorðan folclīc. Þū miht scoldest hƿeorfan þīnes fȳrbeorȝes ȝesetednessa tō ȝetīðienne þēodscipes on þisre dura þe þū cure.
 server.notAllReady=Nealle pleȝendas sind ȝearƿe tō beȝinnenne þæt ȝamen!
 server.onlyAdminCanLaunch=Ƿē sind sāriȝe, for synderlīce þæs þeȝntōles ȝerēfa cann beȝinnan þæt ȝamen.
diff --git a/data/strings/FreeColMessages_ar.properties b/data/strings/FreeColMessages_ar.properties
index 129e0dd8b..5296a427d 100644
--- a/data/strings/FreeColMessages_ar.properties
+++ b/data/strings/FreeColMessages_ar.properties
@@ -4,6 +4,7 @@
 # Author: Alnokta
 # Author: Claw eg
 # Author: DRIHEM
+# Author: Haytham morsy
 # Author: Imksa
 # Author: Meno25
 # Author: OsamaK
@@ -35,11 +36,9 @@ cancel=إلغاء
 close=أغلق
 color=لون
 connect=توصيل
-# Fuzzy
 current=حالي
 false=خطأ
-# Fuzzy
-fill=النتيجة النهائية
+fill=شغل
 height=ارتفاع
 help=مساعدة
 host=مضيف
@@ -48,7 +47,6 @@ load=تحميل
 many=العديد
 medium=متوسط
 more=المزيد...
-# Fuzzy
 music=موسيقى
 name=الاسم
 no=لا
@@ -66,10 +64,8 @@ rename=أعد التسمية
 reset=إعادة ضبط
 save=احفظ
 select=تحديد
-# Fuzzy
-server=اسم الخادم:
+server=الخادم
 small=صغير
-# Fuzzy
 test=اختبار
 true=صواب
 unload=ألغِ التحميل
@@ -98,7 +94,6 @@ inPort=في المنفذ
 mission=مهمه
 modifiers=معدلات
 nation=أمة
-# Fuzzy
 newWorld=عالم جديد
 notApplicable=غير مطبق
 payArrears=دفع الديون
@@ -148,8 +143,7 @@ cli.debug-run=شغل N في وضع التصحيح، ثم أحفظ وسجل خر
 cli.debug=أصلح فري كول (%modes%)
 cli.default-locale=اضبط المحل الافتراضي (LANGUAGE[_COUNTRY[_VARIANT]])
 cli.font=عين نوع الخط الافتراضي
-# Fuzzy
-cli.freecol-data=اضبط مجلد بيانات فري كول (به مجلد فرعي مسمى 'images')
+cli.freecol-data=اضبط مجلد بيانات فري كول (به مجلد فرعي مسمى 'base')
 cli.help=اعرض شاشة المساعدة هذه
 cli.load-savegame=حمل اللعبة المحفوظة المعطاة FILE
 cli.log-console=سجل إلى الكونصول بالإضافة إلى الملف
@@ -160,14 +154,14 @@ cli.no-java-check=تجاوز التحقق من نسخة الجافا
 cli.no-memory-check=تجاوز التحقق من الذاكرة
 cli.no-sound=شغل فري كول بدون صوت
 cli.private=ابدأ خادما سريا (غير منشور إلى الخادم العام)
-cli.server-name=حدد NAME مخصصا للخادم
+# Fuzzy
 cli.server=ابدأ خادما منفردا في المنفذ المحدد
+cli.server-name=حدد NAME مخصصا للخادم
 cli.splash=اعرض شاشة صورة FILE أثناء تحميل اللعبة
 cli.tc=حمل التحويل الإجمالي بالاسم المعطى
 cli.timeout=عدد الثواني التي ينتظرها الخادم للإجابة على سؤال
 cli.version=اعرض رقم النسخة واخرج
-# Fuzzy
-cli.windowed=شغل فري كول في نمط النافذة بدلا من نمط الشاشة الكاملة
+cli.windowed=شغل فري كول في نمط النافذة مع أبعاد اختيارية
 menuBar.colopedia=كولوبيديا
 menuBar.game=لعبة
 menuBar.orders=ترتيبات
@@ -326,8 +320,7 @@ model.option.startingYear.shortDescription=العام الذي تبدأ به ا
 model.option.seasonYear.name=موسم السنة
 model.option.mandatoryColonyYear.name=سنة مستعمرة إلزامية
 gameOptions.prices.name=خيارات الأسعار
-# Fuzzy
-gameOptions.prices.shortDescription=مدى الاسعار المبدئية لبضائع مختلفة.
+gameOptions.prices.shortDescription=يحتوي على خيارات  لعبة السيطرة علي الاسعار المبدئية .
 model.option.food.minimumPrice.name=الحد الأدنى للسعر المبدئي للطعام
 model.option.food.maximumPrice.name=الحد الأعلى للسعر المبدئي للطعام
 model.option.food.spread.name=فرق سعري شراء و بيع الطعام
@@ -360,8 +353,7 @@ model.option.landMass.shortDescription=خيار لضبط كتلة الأرض ل
 model.option.landGeneratorType.name=نوع أرض كمي (EXPERIMENTAL!)
 model.option.landGeneratorType.shortDescription=خيار لضبط نوع مولد الأرض للاستخدام.
 mapGeneratorOptions.terrainGenerator.name=مولد الأرضية
-# Fuzzy
-mapGeneratorOptions.terrainGenerator.shortDescription=إعدادات لكمية الغابات، الجبال إلخ
+mapGeneratorOptions.terrainGenerator.shortDescription=خيارات لمولد التضاريس
 model.option.riverNumber.name=عدد الأنهار
 model.option.riverNumber.shortDescription=خيار لتحديد عدد الأنهار في الخرائط المولدة.
 model.option.mountainNumber.name=عدد الجبال
@@ -519,27 +511,19 @@ model.ability.carryUnits.shortDescription=هذه الوحدة لديها الق
 model.ability.electFoundingFather.name=انتخب الآباء المؤسسين
 model.ability.electFoundingFather.shortDescription=هذه الأمة لديها القدرة على انتخاب الآباء المؤسسين
 model.ability.foundColony.name=تأسيس مستعمرة
-# Fuzzy
 model.ability.foundColony.shortDescription=هذه الوحدة لديها القدرة على تأسيس مستعمرة جديدة.
-# Fuzzy
 model.ability.hasPort.name=وصول إلى البحر
-# Fuzzy
 model.ability.hasPort.shortDescription=هذا الموقع لديه وصول مباشر أو غير مباشر للبحر
 model.ability.independenceDeclared.name=إعلان الاستقلال
-# Fuzzy
 model.ability.independenceDeclared.shortDescription=هذا البلد أعلن استقلاله
 model.ability.moveToEurope.name=انتقل إلى أوروبا
-# Fuzzy
-model.ability.moveToEurope.shortDescription=هذا التل يسمح للوحدات بالانتقال إلى أوروبا.
+model.ability.moveToEurope.shortDescription=هذا القرميدة تسمح للوحدات بالانتقال إلى أوروبا.
 model.ability.native.name=هندي
 model.ability.native.shortDescription=أمريكي أصلي
 model.ability.navalUnit.name=وحدة بحرية
-# Fuzzy
-model.ability.navalUnit.shortDescription=هذه الوحدة وحدة بحرية.
-# Fuzzy
-model.ability.plunderNatives.name=منحة كنز وطني
+model.ability.navalUnit.shortDescription=هذه الوحدة هي وحدة بحرية.
+model.ability.plunderNatives.name=أهالي النهب
 model.ability.royalExpeditionaryForce.name=القوة الاستكشافية الملكية
-# Fuzzy
 model.ability.royalExpeditionaryForce.shortDescription=هذه الأمة هي قوة استكشافية ملكية
 model.ability.undead.name=غير ميت
 # Fuzzy
@@ -1231,14 +1215,12 @@ model.messageType.warning.name=تحذيرات
 model.monarch.action.displeasure.text=أنت تعلن الاستقلال عن التاج.
 model.nationState.aiOnly.name=AI فقط
 model.nationState.available.name=متوفر
-# Fuzzy
-model.nationState.available.shortDescription=أنت تقهر مستعمرة %nation% ل%colony%.
+model.nationState.available.shortDescription=أنت تستطيع اللعب كهذة القبيلة
 model.nationState.notAvailable.name=غير متوفر
 model.player.forces=قوات %nation%
 model.player.independentMarket=أوروبا
 model.player.startGame=بعض قضاء أشهر عديدة في البحر، وصلت أخيرا إلى شاطئ مجهول. أبحر {{tag:%direction%|west=غربا|east=شرقا|default=في اتجاه الرياح}} من أجل أستكشاف العالم الجديد وانتهازه من أجل العرش.
-# Fuzzy
-model.player.waitingFor=بانتظار: %nation%
+model.player.waitingFor=بانتظار : {{tag:country|%nation%}}
 model.regionType.coast.name=ساحل
 model.regionType.coast.unknown=منطقة ساحلية غير معروفة
 model.regionType.desert.name=صحراء
@@ -1292,8 +1274,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=س
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.building.noStudent=%teacher% في %colony% يحتاج طالبا.
@@ -1316,8 +1297,7 @@ model.colony.warehouseOverfull=مستودعك في %colony% وصل إلى سعت
 model.colony.warehouseSoonFull=مستودعك في %colony% سيتجاوز سعته من %goods% خلال الدور التالي. %amount% وحدة من %goods% ستهدر.
 model.colony.warehouseWaste=مستودعك في %colony% تجاوز سعته ل %goods%. %waste% وحدة تم إهدارها.
 model.colonyTile.resourceExhausted=المورد %resource% تم إجهاده في %colony%
-# Fuzzy
-model.game.spanishSuccession=سعادتك، انتهت حرب الوراثة الإسبانية في أوروبا. وأجبرت %loserNation% على تسليم كل المستعمرات في العالم الجديد ل%nation% تحت معاهدة أوتريخت!
+model.game.spanishSuccession=سعادتك، انتهت حرب الخلافة الإسبانية في أوروبا. في معاهدة أوتريخت {{tag:country|%loserNation%}} واضطر للتنازل عن كل المستعمرات في العالم الجديد إلي {{tag:country|%nation%}}!
 model.player.colonyGoodsParty.harbour=مستعمروك في %colony% ألقوا %amount% وحدة من %goods% إلى الميناء احتجاجا على هذه الضريبة غير العادلة بواسطة التاج!
 model.player.colonyGoodsParty.horses=مستعمروك في %colony% أطلقوا %amount% حصان احتجاج على ضرائبهم غير العادلة بواسطة التاج!
 model.player.colonyGoodsParty.landLocked=مستعمروك في %colony% أحرقوا %amount% وحدة من %goods% في السوق احتجاجا على هذه الضريبة غير العادلة بواسطة التاج!
@@ -1517,6 +1497,7 @@ server.fileNotFound=لم يمكن العثور على الملف بالاسم ا
 server.incompatibleVersions=اللعبة المحفوظة التي تحاول تحميلها غير متوافقة مع هذه النسخة من فري كول.
 server.invalidPlayerNations=كل اللاعبين يحتاجون إلى اختيار أمة فريدة قبل أن تبدأ اللعبة.
 server.maximumPlayers=عذرا، لقد وصل عدد اللاعبين إلى الحد الأقصى.
+# Fuzzy
 server.noRouteToServer=الخادم لا يمكن أن يصبح عاما. يجب عليك تعديل إعدادات حائط النار للسماح بالاتصالات على المنفذ الذي حددته.
 server.notAllReady=ليس كل اللاعبين جاهزين للعب اللعبة!
 server.onlyAdminCanLaunch=عذرا، فقط إداري الخادم يمكنه أن يطلق اللعبة.
diff --git a/data/strings/FreeColMessages_arz.properties b/data/strings/FreeColMessages_arz.properties
index 4cef2ee4b..fe8029ffa 100644
--- a/data/strings/FreeColMessages_arz.properties
+++ b/data/strings/FreeColMessages_arz.properties
@@ -119,8 +119,9 @@ cli.no-java-check=تجاوز التحقق من نسخه الجافا
 cli.no-memory-check=تجاوز التحقق من الذاكرة
 cli.no-sound=شغل فرى كول بدون صوت
 cli.private=ابدأ خادما سريا (غير منشور إلى الخادم العام)
-cli.server-name=حدد NAME مخصصا للخادم
+# Fuzzy
 cli.server=ابدأ خادما منفردا فى المنفذ المحدد
+cli.server-name=حدد NAME مخصصا للخادم
 cli.splash=اعرض شاشه صوره FILE أثناء تحميل اللعبة
 cli.tc=حمل التحويل الإجمالى بالاسم المعطى
 cli.version=اعرض رقم النسخه واخرج
@@ -1428,6 +1429,7 @@ server.fileNotFound=لم يمكن العثور على الملف بالاسم ا
 server.incompatibleVersions=اللعبه المحفوظه التى تحاول تحميلها غير متوافقه مع هذه النسخه من فرى كول.
 server.invalidPlayerNations=كل اللاعبين يحتاجون إلى اختيار أمه فريده قبل أن تبدأ اللعبه.
 server.maximumPlayers=عذرا، لقد وصل عدد اللاعبين إلى الحد الأقصى.
+# Fuzzy
 server.noRouteToServer=الخادم لا يمكن أن يصبح عاما. يجب عليك تعديل إعدادات حائط النار للسماح بالاتصالات على المنفذ الذى حددته.
 server.notAllReady=ليس كل اللاعبين جاهزين للعب اللعبة!
 server.onlyAdminCanLaunch=عذرا، فقط إدارى الخادم يمكنه أن يطلق اللعبه.
diff --git a/data/strings/FreeColMessages_be-tarask.properties b/data/strings/FreeColMessages_be-tarask.properties
index 2527a8e7a..9ca3bea99 100644
--- a/data/strings/FreeColMessages_be-tarask.properties
+++ b/data/strings/FreeColMessages_be-tarask.properties
@@ -160,8 +160,9 @@ cli.no-memory-check=прапусьціць праверку памяці
 cli.no-sound=запусьціць FreeCol бяз гуку
 cli.private=запусьціць прыватны сэрвэр (не публікаваць на мэта-сэрвэры)
 cli.seed=прадстаўляе ПАЧАТКОВЫ ЛІК для генэратара псэўда-выпадковых лікаў
-cli.server-name=пазначыць нестандартную НАЗВУ сэрвэра
+# Fuzzy
 cli.server=запусьціць адзіночны сэрвэр на пазначаным порце
+cli.server-name=пазначыць нестандартную НАЗВУ сэрвэра
 cli.splash=паказваць застаўку з ФАЙЛА пад час загрузкі гульні
 cli.tc=загрузіць набор правілаў з пададзенай НАЗВАЙ
 cli.timeout=тэрмін чаканьня сэрвэрам адказу на пытаньне ў сэкундах
@@ -1756,6 +1757,7 @@ server.fileNotFound=Немагчыма знайсьці файл з пададз
 server.incompatibleVersions=Захаваная гульня, якую Вы спрабуеце загрузіць, несумяшчальная з гэтай вэрсіяй FreeCol.
 server.invalidPlayerNations=Перад пачаткам гульні неабходна, каб кожны гулец выбраў унікальную нацыю.
 server.maximumPlayers=Прабачце, дасягнутая максымальная колькасьць гульцоў.
+# Fuzzy
 server.noRouteToServer=Сэрвэр ня можа быць публічным. Вам неабходна зьмяніць устаноўкі фаерволу, каб дазволіць злучэньне па выбраным порце.
 server.notAllReady=Ня ўсе гульцы гатовыя пачаць гульню!
 server.onlyAdminCanLaunch=Прабачце, толькі адміністратар сэрвэра можа пачаць гульню.
diff --git a/data/strings/FreeColMessages_br.properties b/data/strings/FreeColMessages_br.properties
index e930ec991..4c5900541 100644
--- a/data/strings/FreeColMessages_br.properties
+++ b/data/strings/FreeColMessages_br.properties
@@ -204,8 +204,9 @@ cli.no-memory-check=mont dreist da wiriadur ar vemor
 cli.no-sound=lakaat FreeCol da vont hep son
 cli.private=digeriñ ur servijer prevez (n'eo ket embannet er metaservijer)
 cli.seed=a bourchas un HADENN evit ar ganer niveroù damzargouezhek
-cli.server-name=diferañ un ANV boaz evit ar servijer
+# Fuzzy
 cli.server=digeriñ ur servijer emren war ar porzh diferet
+cli.server-name=diferañ un ANV boaz evit ar servijer
 cli.splash=diskouez RESTR un dapadenn-skramm pa vez ar c'hoariadenn o kargañ
 cli.tc=kargañ holl an amdroidigezh gant an ANV roet
 cli.timeout=niver a eilennoù gortozet gant ar servijer evit respont d'ur goulenn
@@ -2463,6 +2464,7 @@ server.invalidPlayerNations=Pep c'hoarier a rank dibab ur vroad a-raok kregiñ g
 server.maximumPlayers=Ho tigarez, tizhet eo an niver brasañ a c'hoarierien.
 server.missingUserName=N'eus anv implijer ebet er goulenn kevreañ.
 server.missingVersion=N'emañ an doare FreeCol er goulenn kevreañ.
+# Fuzzy
 server.noRouteToServer=N'hall ket ar servijer bezañ hegerzh gant an holl. Kefluniit ho maltouter evit aotren ar c'hevreadennoù ouzh ar porzh spisaet ganeoc'h.
 server.noSuchPlayer=Er bartiad-mañ n'eus c'hoarier ebet anvet : %player%
 server.notAllReady=N'eo ket prest an holl c'hoarierien da gregiñ ganti c'hoazh !
diff --git a/data/strings/FreeColMessages_ca.properties b/data/strings/FreeColMessages_ca.properties
index e79c49461..1ba4bdb82 100644
--- a/data/strings/FreeColMessages_ca.properties
+++ b/data/strings/FreeColMessages_ca.properties
@@ -206,8 +206,9 @@ cli.no-memory-check=salta la comprovació de memòria
 cli.no-sound=executa FreeCol sense so
 cli.private=inicia un servidor privat (no publicat en el metaserver)
 cli.seed=proporciona una LLAVOR per al generador de nombres pseudo-aleatoris
-cli.server-name=especifica un NOM per el servidor
+# Fuzzy
 cli.server=inicia un servidor únic en el port especificat
+cli.server-name=especifica un NOM per el servidor
 cli.splash=mostra una imatge del FITXER a la pantalla mentre es carrega el joc
 cli.tc=carrega la conversió total amb el NOM donat
 cli.timeout=nombre de segons que el servidor espera d'una resposta a una pregunta
@@ -2310,6 +2311,7 @@ server.invalidPlayerNations=Tots el jugadors han d'escollir una nació diferent
 server.maximumPlayers=Ho sento, s'ha assolit el nombre màxim de jugadors.
 server.missingUserName=Manca el nom d'usuari en la sol·licitud d'inici de sessió.
 server.missingVersion=La versió de FreeCol falta en la sol·licitud d'inici de sessió.
+# Fuzzy
 server.noRouteToServer=El servidor no es pot fer públic. Heu de modificar la configuració del vostre tallafocs per permetre connexions al port que heu especificat.
 server.noSuchPlayer=El joc no conté cap jugador anomenat: %player%
 server.notAllReady=No tots els jugadors estan preparats per començar la partida!
diff --git a/data/strings/FreeColMessages_cs_CZ.properties b/data/strings/FreeColMessages_cs_CZ.properties
index 07c89348a..25a14f3b2 100644
--- a/data/strings/FreeColMessages_cs_CZ.properties
+++ b/data/strings/FreeColMessages_cs_CZ.properties
@@ -209,8 +209,9 @@ cli.no-memory-check=přeskočit kontrolu paměti
 cli.no-sound=spustit FreeCol bez zvuku
 cli.private=spustit privátní server (nepublikovaný pro metaserver)
 cli.seed=poskytnout SEED pro pseudo-generátor náhodných čísel
-cli.server-name=určit JMÉNO pro server
+# Fuzzy
 cli.server=spustí samostatný server na určeném portu
+cli.server-name=určit JMÉNO pro server
 cli.splash=při nahrávání hry zobrazí SOUBOR jako úvodní obrázek (splash screen)
 cli.tc=nahraje úplnou konverzi určeného JMÉNA
 cli.timeout=počet sekund, po které sever čeká odpověď na otázku
@@ -2521,6 +2522,7 @@ server.invalidPlayerNations=Všichni hráči si musí před zahájením hry zvol
 server.maximumPlayers=Promiňte, bylo dosaženo maximálního počtu hráčů.
 server.missingUserName=V požadavku na přihlášení chybí uživatelské jméno.
 server.missingVersion=V požadavku na přihlášení chybí verze FreeCol.
+# Fuzzy
 server.noRouteToServer=Server nemůže být nastaven jako veřejný. Měl byste upravit nastavení firewallu tak, aby bylo povoleno připojení na port, který jste zvolil.
 server.noSuchPlayer=Tato hra neobsahuje hráče se jménem: %player%
 server.notAllReady=Všichni hráči ještě nejsou připraveni zahájit hru!
diff --git a/data/strings/FreeColMessages_da.properties b/data/strings/FreeColMessages_da.properties
index 7c436be41..3bd7b973e 100644
--- a/data/strings/FreeColMessages_da.properties
+++ b/data/strings/FreeColMessages_da.properties
@@ -195,8 +195,9 @@ cli.no-memory-check=Undlad hukommelses kontrol
 cli.no-sound=Kør FreeCol uden lyd
 cli.private=Start en privat server (som ikke offentliggøres på meta serveren)
 cli.seed=giver et frø til den pseudo-tilfældige tal generator
-cli.server-name=angiv et brugerdefineret NAVN til serveren
+# Fuzzy
 cli.server=Start en selvstændig server på den angivne port
+cli.server-name=angiv et brugerdefineret NAVN til serveren
 cli.splash=Vis et splash vindue med billed fra FILE mens et spil indlæses
 cli.tc=Indlæs den totale konvertering med det angivne NAVN
 cli.timeout=antal sekunder, som serveren venter et svar på et spørgsmål
@@ -2244,6 +2245,7 @@ server.invalidPlayerNations=Alle spillere er nødt til at vælge en unik nation
 server.maximumPlayers=Beklager, det maksimale antal spillere er nået.
 server.missingUserName=Brugernavnet mangler i loginanmodning.
 server.missingVersion=FreeCol-versionen mangler i loginanmodningen.
+# Fuzzy
 server.noRouteToServer=Serveren kan ikke gøres åben. Du bør ændrer opsætningen på din firewall til at tillade forbindelser på den port du har angivet.
 server.notAllReady=Ikke alle spillere er klar til at begynde!
 server.onlyAdminCanLaunch=Beklager, kun server administratoren kan starte spillet.
diff --git a/data/strings/FreeColMessages_de.properties b/data/strings/FreeColMessages_de.properties
index bf6d8c7f8..3ff36c956 100644
--- a/data/strings/FreeColMessages_de.properties
+++ b/data/strings/FreeColMessages_de.properties
@@ -235,8 +235,9 @@ cli.no-sound=startet FreeCol ohne Tonwiedergabe
 cli.no-splash=Den Splash-Bildschirm überspringen
 cli.private=starte einen privaten Server (nicht öffentlich über den Metaserver)
 cli.seed=bitte eine INITIALZAHL für den Pseudozufallszahlengenerator angeben
-cli.server-name=einen benutzerdefinierten NAMEn für den Server angeben
+# Fuzzy
 cli.server=startet einen eigenständigen Server am spezifizierten Port
+cli.server-name=einen benutzerdefinierten NAMEn für den Server angeben
 cli.splash=Bilddatei FILE anzeigen, während das Spiel geladen wird
 cli.tc=das Spiel laden mit dem gegebenen NAME
 cli.timeout=Anzahl der Sekunden, die der Server auf eine Antwort zur Abfrage wartet
@@ -2463,6 +2464,7 @@ server.invalidPlayerNations=Alle Spieler müssen verschiedene Nationen wählen,
 server.maximumPlayers=Leider ist die maximale Spieleranzahl bereits erreicht.
 server.missingUserName=Der Spielername wurde bei der Anmeldung nicht angegeben.
 server.missingVersion=Die Version von FreeCol wurde bei der Anmeldung nicht angegeben.
+# Fuzzy
 server.noRouteToServer=Der Server kann nicht öffentlich gemacht werden. Sie sollten Ihre Firewall-Einstellungen verändern, um Verbindungen zu dem von Ihnen gewählten Port zuzulassen.
 server.noSuchPlayer=Das Spiel enthält keinen Spieler namens %player%
 server.notAllReady=Nicht alle Spieler sind bereit, das Spiel zu beginnen!
diff --git a/data/strings/FreeColMessages_eo.properties b/data/strings/FreeColMessages_eo.properties
index 32aff2191..1ef43b3a8 100644
--- a/data/strings/FreeColMessages_eo.properties
+++ b/data/strings/FreeColMessages_eo.properties
@@ -189,8 +189,9 @@ cli.no-memory-check=ignori la memoran kontroladon
 cli.no-sound=funkciigi FreeCol sen sono
 cli.private=starti privatan servilon (ne publikita al la metaservilo)
 cli.seed=provizi KERNO-n por la duon-hazarda nombro-generilo
-cli.server-name=specifigi memfaritan NOMOn por la servilo
+# Fuzzy
 cli.server=starti memstaran servilon ĉe la specifita pordo
+cli.server-name=specifigi memfaritan NOMOn por la servilo
 cli.splash=montri salutŝildan bildon DOSIERON kiam ŝarĝante ludon
 cli.tc=ŝarĝi la tutan konverton kun la donata NOMO
 cli.timeout=nombron da sekundoj atendis la servilo por respondo de demando
@@ -2006,6 +2007,7 @@ server.invalidPlayerNations=Ĉiuj ludantoj nepre selektu unikan nacion antaŭ la
 server.maximumPlayers=Bedaŭrinde, la maksimuma nombro de ludantoj estis atingita.
 server.missingUserName=La salutnomo mankas de la ensaluta peto.
 server.missingVersion=La versio de FreeCol mankas de la ensaluta peto.
+# Fuzzy
 server.noRouteToServer=La servilo ne povas esti publikigita.  Vi modifu viajn agordojn de fajroŝirmilo por permesi konektojn en la volata pordo.
 server.notAllReady=Ne ĉiuj ludantoj pretas komenci la ludon!
 server.onlyAdminCanLaunch=Bedaŭrinde, nur la servila administranto povas starti la ludon.
diff --git a/data/strings/FreeColMessages_es_ES.properties b/data/strings/FreeColMessages_es_ES.properties
index 733c6c365..20ef728c3 100644
--- a/data/strings/FreeColMessages_es_ES.properties
+++ b/data/strings/FreeColMessages_es_ES.properties
@@ -228,8 +228,9 @@ cli.no-memory-check=saltar la comprobación de la memoria
 cli.no-sound=ejecutar FreeCol sin sonido
 cli.private=iniciar un servidor privado (no publicado en el metaserver)
 cli.seed=proporcionar una SEMILLA para el generador de números pseudoaleatorio
-cli.server-name=especifica un NOMBRE para el servidor
+# Fuzzy
 cli.server=inicia un único servidor para el puerto especificado
+cli.server-name=especifica un NOMBRE para el servidor
 cli.splash=muestra una imagen de pantalla del ARCHIVO mientras carga el juego
 cli.tc=carga la conversión total con el NOMBRE dado
 cli.timeout=número de segundos que el servidor esperará una respuesta a una pregunta
@@ -535,7 +536,7 @@ model.option.turnsToSail.shortDescription=El número de turnos que se necesita p
 model.option.settlementLimitModifier.name=Modificador del límite del asentamiento
 model.option.settlementLimitModifier.shortDescription=Cantidad añadida a un límite de asentamiento, tales como el número de vagones construibles.
 model.option.fogOfWar.name=Niebla de Guerra
-model.option.fogOfWar.shortDescription=¿Deben estar ocultas las unidades enemigas que están fuera de nuestra linea de visión?
+model.option.fogOfWar.shortDescription=¿Deben estar ocultas las unidades enemigas que están fuera de nuestra línea de visión?
 model.option.explorationPoints.name=Puntos de exploración
 model.option.explorationPoints.shortDescription=¿Se deben otorgar puntos de exploración por cada descubrimiento?
 model.option.amphibiousMoves.name=Movimientos anfibios
@@ -957,7 +958,7 @@ model.option.colonyReport.shortDescription=Un resumen de la actividad en cada co
 clientOptions.messages.colonyReport.classic.name=Clásico
 clientOptions.messages.colonyReport.classic.shortDescription=Un resumen de colonia informativo y con muchas imágenes.
 clientOptions.messages.colonyReport.compact.name=Compacto
-clientOptions.messages.colonyReport.compact.shortDescription=Un resumen de colonia compacto que intenta mostrar lo máximo posible en sólo una linea por colonia.
+clientOptions.messages.colonyReport.compact.shortDescription=Un resumen de colonia compacto que intenta mostrar lo máximo posible en sólo una línea por colonia.
 model.option.labourReport.name=Informe de Trabajo
 model.option.labourReport.shortDescription=Un resumen de la actividad de cada unidad
 clientOptions.messages.labourReport.classic.name=Clásico
@@ -2433,6 +2434,7 @@ server.invalidPlayerNations=Todos los jugadores deben escoger una nación distin
 server.maximumPlayers=Perdone, pero se ha alcanzado el número máximo de jugadores.
 server.missingUserName=Falta el nombre de usuario en la solicitud de inicio de sesión.
 server.missingVersion=Falta la versión de FreeCol en la solicitud de inicio de sesión.
+# Fuzzy
 server.noRouteToServer=El servidor no puede ser hecho público. Deberías modificar la configuración del cortafuegos para permitir conexiones en el puerto que has especificado.
 server.noSuchPlayer=El juego no contiene un jugador llamado: %player%
 server.notAllReady=¡No todos los jugadores están preparados para empezar la partida!
diff --git a/data/strings/FreeColMessages_fi.properties b/data/strings/FreeColMessages_fi.properties
index c52e1eac4..0dee51a5f 100644
--- a/data/strings/FreeColMessages_fi.properties
+++ b/data/strings/FreeColMessages_fi.properties
@@ -8,6 +8,7 @@
 # Author: Kulmalukko
 # Author: Lliehu
 # Author: Macofe
+# Author: Mashoi7
 # Author: McSalama
 # Author: Midorime
 # Author: MrTapsa
@@ -62,7 +63,6 @@ load=Lataa
 many=monta
 medium=keskiverto
 more=lisää...
-# Fuzzy
 music=Musiikki
 name=Nimi
 no=Ei
@@ -78,12 +78,10 @@ remove=Tyhjennä
 rename=Nimeä uudelleen
 reset=Palauta
 save=Tallenna
-# Fuzzy
-server=Palvelinnimi
+server=Palvelin
 skip=Ohita
 small=pieni
 statistics=Tilastot
-# Fuzzy
 test=Kokeile
 true=kyllä
 unload=Pura
@@ -111,7 +109,6 @@ inPort=Satamassa
 mission=Tehtävä
 modifiers=Mukautukset
 nation=Kansallisuus
-# Fuzzy
 newWorld=Uusi maailma
 notApplicable=–
 payArrears=Maksa alueista
@@ -175,8 +172,9 @@ cli.no-memory-check=ohita muistin tarkastus
 cli.no-sound=suorita FreeCol äänettömänä
 cli.private=käynnistä yksityinen palvelin (ei julkaista metapalvelimelle)
 cli.seed=anna SIEMEN pseudosatunnaislukugeneraattorille
-cli.server-name=määritä palvelimelle oma NIMI
+# Fuzzy
 cli.server=käynnistä itsenäinen palvelin määrättyyn porttiin
+cli.server-name=määritä palvelimelle oma NIMI
 cli.splash=näytä pelin latauksen aikana aloitusruutukuvana TIEDOSTO
 cli.version=näytä versionumero ja lopeta
 # Fuzzy
@@ -1590,6 +1588,7 @@ server.fileNotFound=Pyydettyä tiedostoa ei löytynyt.
 server.incompatibleVersions=Tallennus ei ole yhteensopiva tämän FreeColin version kanssa.
 server.invalidPlayerNations=Kaikkien pelaajien pitää valita eri kansallisuus ennen pelin alkua.
 server.maximumPlayers=Peliin ei mahdu enempää pelaajia.
+# Fuzzy
 server.noRouteToServer=Palomuuriasetukset estävät julkisen palvelimen tekemisen. Käytettävä portti on oltava avoin.
 server.noSuchPlayer=Tässä pelissä ei ole pelaajaa nimeltä: %player%
 server.notAllReady=Kaikki pelaajat eivät ole valmiita aloittamaan peliä.
diff --git a/data/strings/FreeColMessages_fr.properties b/data/strings/FreeColMessages_fr.properties
index f7c873cb0..839deae71 100644
--- a/data/strings/FreeColMessages_fr.properties
+++ b/data/strings/FreeColMessages_fr.properties
@@ -41,6 +41,7 @@
 # Author: Urhixidur
 # Author: Verdy p
 # Author: Windes
+# Author: Wladek92
 # Author: Wyz
 # Author: Y-M D
 # Author: Yann.fauche
@@ -58,24 +59,24 @@ model.option.refStrength.name=Force CER
 model.option.refStrength.shortDescription=Augmente la taille du Corps expéditionnaire royal (CER).
 type=Type
 source=Source
-main.userDir.macosx=FreeCol enregistre maintenant les données de préférence dans Library/Preferences/freecol  et celles de l’utilisateur dans Library/Application Support/freecol. Les données trouvées dans les anciens emplacements .freecol ou Library/FreeCol ont été copiées vers le nouvel emplacement, amis non supprimées.
+main.userDir.macosx=FreeCol enregistre maintenant les données de préférence dans Library/Preferences/freecol  et celles de l’utilisateur dans Library/Application Support/freecol. Les données trouvées dans les anciens emplacements .freecol ou Library/FreeCol ont été copiées vers le nouvel emplacement, mais non supprimées.
 main.userDir.unix=FreeCol stocke dorénavant les données utilisateur selon le standard XDG, avec les fichiers de configuration dans ~/.config/freecol, les fichiers de données dans ~/.local/share/freecol, et les fichiers de journalisation dans ~/.cache/freecol. Les données trouvées dans l’ancien emplacement ~/.freecol ont été copiées vers les nouveaux emplacements, mais n’ont pas été supprimées.
 main.userDir.windows=FreeCol stocke dorénavant les données utilisateur sous « freecol » dans votre répertoire de documents. Les données trouvées dans l’ancien répertoire « FreeCol » ont été copiées dans le nouvel emplacement, mais non supprimées.
-chilly=Froid
-cold=Très froid
-dry=Sec
-hot=Très chaud
-temperate=Tempéré
-veryDry=Très sec
+chilly=Fraîche
+cold=Froide
+dry=Sèche
+hot=Torride
+temperate=Tempérée
+veryDry=Très sèche
 veryHigh=Très rapide
-veryLarge=Très grand
+veryLarge=Très grande
 veryLow=Très lent
-verySmall=Très petit
+verySmall=Très petite
 veryWet=Très humide
-warm=Chaud
+warm=Chaude
 wet=Humide
 freecol.desktopEntry.GenericName=Jeu de stratégie
-freecol.desktopEntry.Comment=Un jeu de stratégie au tour par tour basé sur « Colonization » de Sid Meier.
+freecol.desktopEntry.Comment=Un jeu de stratégie au tour par tour basé sur « Sid Meier’s Colonization ».
 accept=Accepter
 all=Tout
 and=et
@@ -92,17 +93,17 @@ height=Hauteur
 help=Aide
 high=Rapide
 host=Serveur
-large=Grand
+large=Grande
 load=Charger
-low=Bas
+low=Lent
 many=beaucoup
-medium=Moyen
+medium=Moyenne
 more=plus...
 music=Musique
 name=Nom
 no=Non
 none=Aucun
-normal=Normal
+normal=Normale
 nothing=Rien
 ok=Valider
 options=Options
@@ -117,7 +118,7 @@ save=Enregistrer
 select=Sélectionner
 server=Nom du serveur :
 skip=Sauter
-small=Petit
+small=Petite
 statistics=Statistiques
 test=Test
 true=Vrai
@@ -130,32 +131,34 @@ abilities=Aptitudes
 activateAllUnits=Activer toutes les unités
 activateUnit=Activer l’unité
 assignTradeRoute=Attribuer une route commerciale
-building=bâtiment
+building=Bâtiment
 capital=Capitale
 cargo=Fret
 cargoOnCarrier=Cargaison transportée
 cashInTreasureTrain=Or dans le convoi de trésor
 clearOrders=Effacer les ordres
 colonists=Colons
+colonyCenter=centre de la colonie
 colopedia=Colonipédie
+countryName={{ucfirst:{{tag:country|%nation%}}}}
 difficulty=Difficulté
 docks=Quais
-dumpCargo=Décharger la cargaison
+dumpCargo=Jeter la cargaison
 finalResult=Résultat final
 fortify=Fortifier
 gold=Or
 goldAmount=%amount% {{plural:%amount%|one=or|other=or|default=or}}
 goods=Marchandises
 goToEurope=Aller en Europe
-goToThisTile=Allez à cette case
+goToThisTile=Aller à cette case
 immigrants=Immigrants
 inPort=Au port
-leaveShip=Abandonner le navire
+leaveShip=Quitter le navire
 mission=Mission
-modifiers=Modificateurs :
+modifiers=Modificateurs
 nation=Nation
 newWorld=Nouveau Monde
-notApplicable=n/a
+notApplicable=s/o
 payArrears=Payer les arriérés
 player=Joueur
 purchase=Acheter
@@ -166,7 +169,7 @@ sailingToEurope=En route vers l’Europe
 sales=Ventes
 sentry=Mettre en veille
 setSail=Naviguer
-settlement=Campement
+settlement=Agglomération
 showProductionModifiers=Afficher les indicateurs de production
 skillTaught=Compétence enseignée
 startGame=Lancer le jeu
@@ -183,10 +186,10 @@ list.up=Monter
 status.loadingGame=Patience : Chargement du jeu
 status.savingGame=Patience : Sauvegarde du jeu
 status.startingGame=Patience : Démarrage du jeu
-cli.arg.advantages=AVANTAGES
-cli.arg.clientOptions=FICHIER D'OPTIONS
+cli.arg.advantages=ATOUTS
+cli.arg.clientOptions=FICHIER D’OPTIONS
 cli.arg.debug=MODES DE DÉBOGAGE
-cli.arg.debugRun=TOURS [, SAVENAME]
+cli.arg.debugRun=TOURS[,SAVENAME]
 cli.arg.difficulty=DIFFICULTÉ
 cli.arg.dimensions=LARGEURxHAUTEUR
 cli.arg.directory=DOSSIER
@@ -199,109 +202,112 @@ cli.arg.name=NOM
 cli.arg.port=PORT
 cli.arg.seed=GRAINE
 cli.arg.timeout=DÉLAI DÉPASSÉ
-cli.error.advantages=Type d’avantages (%advantages%) attendu, trouvé: %arg%
-cli.error.badTC=Erreur à l’ouverture de jeu de règles: %tc%.
-cli.error.clientOptions=Ignorer le fichier d'options client illisible:%string%
-cli.error.debug=Liste de mode de débogage (%modes%) attendu.
+cli.error.advantages=Type d’atout (%advantages%) attendu, trouvé: %arg%
+cli.error.badTC=Erreur à l’ouverture du jeu de règles : %tc%.
+cli.error.clientOptions=Ignorer le fichier d’options client illisible : %string%
+cli.error.debug=Liste de mode de débogage (%modes%) attendue.
 cli.error.difficulties=Niveau de difficulté (%difficulties%) attendu, trouvé : %arg%
 cli.error.europeans=Le nombre de nations européennes doit être au moins de %min%
-cli.error.gui-scale=Pourcentage d’échelle (%scales%) de l’IHM attendu, trouvé : %arg%
+cli.error.gui-scale=Pourcentage d’échelle (%scales%) de l’interface graphique attendu, trouvé : %arg%
 cli.error.home.noRead=Impossible de lire depuis %string%.
 cli.error.home.noWrite=Impossible d’écrire sur %string%.
-cli.error.home.notDir=%string% n’est pas un répertoire.
-cli.error.home.notExists=Le répertoire %string% n’existe pas.
+cli.error.home.notDir=%string% n’est pas un dossier.
+cli.error.home.notExists=Le dossier %string% n’existe pas.
 cli.error.save=Impossible de lire la partie sauvegardée %string%.
 cli.error.serverPort=%string% n’est pas un numéro de port valide.
+cli.error.splash=Fichier d’accueil %name% non trouvé.
 cli.error.timeout=%string% est trop court (moins de %minimum%).
-cli.advantages=définit le type de ADVANTAGES (%advantages%)
-cli.check-savegame.failure=Le contrôle de cohérence de la sauvegarde de la partie a échoué, vérifiez le journal pour les détails.
-cli.check-savegame.success=Contrôle de cohérence de la sauvegarde de la partie terminé, vérifiez le journal pour les détails.
-cli.check-savegame=vérifie la cohérence du FICHIER de partie sauvegardée
+cli.advantages=définir le type d’ATOUTS (%advantages%)
+cli.check-savegame.failure=Le contrôle de cohérence de la sauvegarde de la partie a échoué, consultez le journal pour les détails.
+cli.check-savegame.success=Contrôle de cohérence de la sauvegarde de la partie terminé, consultez le journal pour les détails.
+cli.check-savegame=vérifier la cohérence du fichier de partie sauvegardée
 cli.clientOptions=Fichier XML contenant les options utilisateur du client.
-cli.debug-run=exécuter N tours en mode debug, puis éventuellement sauvegardez et quittez
-cli.debug-start=démarre immédiatement une nouvelle partie solo
-cli.debug=définit les modes de débogage de FreeCol (%modes%)
-cli.default-locale=définit la localisation par défaut (LANGUE[_PAYS[_VARIANTE]])
-cli.difficulty=définit le niveau de DIFFICULTÉ
+cli.debug-run=exécuter N tours en mode débogage, puis éventuellement sauvegarder et quitter
+cli.debug-start=démarrer immédiatement une nouvelle partie solo
+cli.debug=définir les modes de débogage de FreeCol (%modes%)
+cli.default-locale=définir la localisation par défaut (LANGUE[_PAYS[_VARIANTE]])
+cli.difficulty=définir le niveau de DIFFICULTÉ
 cli.european-count=fixer le nombre de nations actives (EUROPÉENS colonisateurs)
 cli.fast=ignorer toutes les boîtes de dialogue de configuration
 cli.font=définir la police par défaut
-cli.freecol-data=définit le DOSSIER des données de FreeCol (ayant un sous-dossier 'base')
+cli.freecol-data=définir le DOSSIER des données de FreeCol (ayant un sous-dossier 'base')
 cli.full-screen=exécuter FreeCol en mode plein écran
-cli.gui-scale=éléments d’échelle IHM, avec ÉCHELLE (%scales%) facultative
-cli.headless=exécuter en mode stupide
-cli.help=affiche cet écran d’aide
-cli.load-savegame=charge le FICHIER d’une partie sauvegardée
-cli.log-console=journalise vers la console en plus du fichier
-cli.log-file=définit le FICHIER de journalisation de FreeCol (FreeCol.log par défaut)
-cli.log-level=définit le niveau de journalisation de Java à NIVEAUJOURNAL
-cli.name=fournit un NOM pour le joueur
-cli.no-intro=passer la vidéo introductive
-cli.no-java-check=saute la vérification de la version de Java
-cli.no-memory-check=saute la vérification de mémoire
-cli.no-sound=exécute FreeCol sans son
-cli.private=démarre un serveur privé (non publié sur le méta-serveur)
-cli.seed=fournit une GRAINE pour le générateur de nombres pseudo-aléatoires
-cli.server-name=définit un NOM personnalisé pour le serveur
-cli.server=démarre un serveur indépendant sur le PORT spécifié
-cli.splash=affiche le FICHIER d’image dans l’écran d’accueil durant le chargement du jeu
-cli.tc=charge la conversion totale avec le NOM donné
+cli.gui-scale=éléments d’échelle d’interface graphique, avec ÉCHELLE (%scales%) facultative
+cli.headless=exécuter sans interface graphique
+cli.help=afficher cet écran d’aide
+cli.load-savegame=charger le FICHIER d’une partie sauvegardée
+cli.log-console=journaliser vers la console en plus du fichier
+cli.log-file=définir le fichier de journalisation de FreeCol (FreeCol.log par défaut)
+cli.log-level=définir le niveau de journalisation de Java à NIVEAUJOURNAL
+cli.name=fournir un NOM pour le joueur
+cli.no-intro=passer la vidéo d’introduction
+cli.no-java-check=passer la vérification de la version de Java
+cli.no-memory-check=passer la vérification de mémoire
+cli.no-sound=exécuter FreeCol sans son
+cli.no-splash=passer la page d’accueil
+cli.private=démarrer un serveur privé (non publié sur le méta-serveur)
+cli.seed=fournir une GRAINE pour le générateur de nombres pseudo-aléatoires
+# Fuzzy
+cli.server=démarrer un serveur indépendant sur le PORT spécifié
+cli.server-name=définir un NOM personnalisé pour le serveur
+cli.splash=afficher le FICHIER d’image comme écran d’accueil durant le chargement du jeu
+cli.tc=charger la conversion totale avec le NOM donné
 cli.timeout=nombre de secondes pendant lequel le serveur attend la réponse à une question
-cli.user-cache-directory=fixer le RÉPERTOIRE de cache utilisateur de FreeCol
-cli.user-config-directory=définit le RÉPERTOIRE de configiration utilisateur de FreeCol
-cli.user-data-directory=définit le RÉPERTOIRE de données utilisateur de FreeCol
-cli.version=affiche le numéro de version et sort
-cli.windowed=exécuter FreeCol en mode fenêtré, avec DIMENSIONS facultatif
+cli.user-cache-directory=fixer le DOSSIER de cache utilisateur de FreeCol
+cli.user-config-directory=définir le DOSSIER de configuration utilisateur de FreeCol
+cli.user-data-directory=définir le DOSSIER de données utilisateur de FreeCol
+cli.version=afficher le numéro de version et quitter
+cli.windowed=exécuter FreeCol en mode fenêtré, avec DIMENSIONS facultatives
 menuBar.colopedia=Colonipédie
 menuBar.game=Jeu
 menuBar.orders=Ordres
-menuBar.report=Rapports
+menuBar.report=Rapport
 menuBar.tools=Outils
 menuBar.view=Voir
-menuBar.statusLine=Points : %score%    |    Or : %gold%    |    Taxes : %tax% %    |    An : %year%
+menuBar.statusLine=Points : %score%    |    Or : %gold%    |    Taxes : %tax% %    | Année : %year%
 menuBar.debug=Déboguer
 menuBar.debug.addBuilding=Ajouter un bâtiment à chaque colonie
 menuBar.debug.addFoundingFather=Ajouter un père fondateur
 menuBar.debug.addGold=Ajouter de l’or
-menuBar.debug.addImmigration=Ajouter l’immigration
+menuBar.debug.addImmigration=Ajouter de l’immigration
 menuBar.debug.addLiberty=Ajouter des points de liberté à chaque colonie
 menuBar.debug.compareMaps.checkComplete=Contrôle effectué. Aucune désynchronisation relevée.
 menuBar.debug.compareMaps.problem=Un problème possible a été découvert. Lisez les informations fournies sur la sortie standard.
 menuBar.debug.compareMaps=Contrôle des désynchronisations de la carte
-menuBar.debug.displayAIMissions=Afichatge de l'IA de las missions
-menuBar.debug.displayAdditionalAIMissionInfo=Afichar mai de IA mission d'informacion
-menuBar.debug.displayErrorMessage=Afficher le message d'erreur
+menuBar.debug.displayAIMissions=Affichage des missions de l’IA
+menuBar.debug.displayAdditionalAIMissionInfo=Afficher plus d’information sur les missions de l’IA
+menuBar.debug.displayErrorMessage=Afficher le message d’erreur
 menuBar.debug.displayEuropeStatus=Panneau Europe
 menuBar.debug.displayMonarchPanel=Panneau Monarque
-menuBar.debug.displayPanels=Afficher panneaux
+menuBar.debug.displayPanels=Afficher les panneaux
 menuBar.debug.displayUnits=Afficher les unités
 menuBar.debug.hideEntireMap=Masquer toute la carte
 menuBar.debug.memoryManager.gc=Lancer le ramasse-miettes
 menuBar.debug.memoryManager=Gestionnaire de mémoire
 menuBar.debug.revealEntireMap=Révéler toute la carte
-menuBar.debug.runMonarch=Définir l'action suivante du monarque
-menuBar.debug.searchTrace=Journal des traces de recherche complète
-menuBar.debug.showColonyValue=Montrer les valeurs de colonie
-menuBar.debug.showCoordinates=Montrer les coordonnées
-menuBar.debug.showResourceKeys=Montrer les ressources clé
+menuBar.debug.runMonarch=Définir l’action suivante du monarque
+menuBar.debug.searchTrace=Journaliser des traces de recherche complètes
+menuBar.debug.showColonyValue=Afficher les valeurs des colonies
+menuBar.debug.showCoordinates=Afficher les coordonnées
+menuBar.debug.showResourceKeys=Afficher les ressources-clés
 menuBar.debug.skipTurns=Passer des tours
-menuBar.debug.stepRandomNumberGenerator=Lancer le générateur de nombre aléatoire
+menuBar.debug.stepRandomNumberGenerator=Lancer le générateur de nombres aléatoires
 menuBar.debug.stopSkippingTurns=Arrêter de passer des tours
-menuBar.debug.useAI=Utiliser AI
+menuBar.debug.useAI=Utiliser l’IA
 aboutAction.name=À propos de FreeCol
 activeAction.name=Activer l’unité
-assignTradeRouteAction.name=Suivre une route commerciale
+assignTradeRouteAction.name=Attribuer une route commerciale
 buildColonyAction.name=Construire/rejoindre une colonie
-centerAction.name=Centre
-changeAction.enterColony.name=Entrez dans la colonie
+centerAction.name=Centrer
+changeAction.enterColony.name=Entrer dans la colonie
 changeAction.name=Unité suivante dans la case
 changeAction.nextUnitOnTile.name=Unité suivante dans la case
-changeAction.selectCarrier.name=Choisissez le transporteur
+changeAction.selectCarrier.name=Choisir le transporteur
 changeWindowedModeAction.name=Mode plein écran
 chatAction.name=Clavardage
-clearForestAction.name=Déforester
-clearOrdersAction.name=Annulez les ordres
-colopediaAction.buildings.name=Constructions
+clearForestAction.name=Défricher
+clearOrdersAction.name=Annuler les ordres
+colopediaAction.buildings.name=Bâtiments
 colopediaAction.concepts.name=Concepts
 colopediaAction.fathers.name=Pères fondateurs
 colopediaAction.goods.name=Marchandises
@@ -310,23 +316,23 @@ colopediaAction.nationTypes.name=Atouts nationaux
 colopediaAction.resources.name=Ressources bonifiées
 colopediaAction.terrain.name=Terrains
 colopediaAction.units.name=Unités
-colopediaAction.name=%object% (Colopedia)
+colopediaAction.name=%object% (Colonipédie)
 continueAction.name=Continuer de jouer
-debugAction.name=(Dés)activer le mode déboggage
+debugAction.name=(Dés)activer le mode débogage
 declareIndependenceAction.name=Déclaration d’indépendance
 determineHighSeasAction.name=Déterminer les zones de haute mer
 difficultyAction.name=Afficher le niveau de difficulté
 disbandUnitAction.name=Dissoudre
 displayBordersAction.name=Afficher les frontières
 displayGridAction.name=Afficher la grille
-displayTileTextAction.empty.name=Afficher aucun texte dans les cases
-displayTileTextAction.names.name=Afficher le nom des cases
+displayTileTextAction.empty.name=N’afficher aucun texte dans les cases
+displayTileTextAction.names.name=Afficher les noms des cases
 displayTileTextAction.owners.name=Afficher les propriétaires des cases
 displayTileTextAction.regions.name=Afficher la région des cases
 endTurnAction.name=Fin du tour
 europeAction.name=Europe
-executeGotoOrdersAction.name=Exécuter les ordres en suspens
-findSettlementAction.name=Chercher un lieu
+executeGotoOrdersAction.name=Exécuter les ordres de mouvement
+findSettlementAction.name=Chercher une agglomération
 fortifyAction.name=Fortifier
 gameOptionsAction.name=Afficher les options du jeu
 gotoAction.name=Aller à
@@ -341,25 +347,25 @@ miniMapToggleBordersAction.secondary.name=Basculer la vue entre politique et éc
 miniMapToggleFogOfWarAction.name=Inverser le brouillard de guerre
 miniMapToggleFogOfWarAction.secondary.name=Inverser le brouillard de guerre (secondaire)
 miniMapZoomInAction.name=Zoomer la mini-carte
-miniMapZoomInAction.secondary.name=Zoom sur la minicarte (secondaire)
+miniMapZoomInAction.secondary.name=Zoom sur la mini-carte (secondaire)
 miniMapZoomOutAction.name=Dézoomer la mini-carte
-miniMapZoomOutAction.secondary.name=Dézoom sur la minicarte (secondaire)
-moveAction.E.name=Déplacer vers l’Est
-moveAction.E.secondary.name=Déplacer vers l’Est (secondaire)
-moveAction.N.name=Déplacer vers le Nord
-moveAction.N.secondary.name=Déplacer vers le Nord (secondaire)
-moveAction.NE.name=Déplacer vers le Nord-Est
-moveAction.NE.secondary.name=Déplacer vers le Nord-Est (secondaire)
-moveAction.NW.name=Déplacer vers le Nord-Ouest
-moveAction.NW.secondary.name=Déplacer vers le Nord-Ouest (secondaire)
-moveAction.S.name=Déplacer vers le Sud
-moveAction.S.secondary.name=Déplacer vers le Sud (secondaire)
-moveAction.SE.name=Déplacer vers le Sud-Est
-moveAction.SE.secondary.name=Déplacer vers le Sud-Est (secondaire)
-moveAction.SW.name=Déplacer vers le Sud-Ouest
-moveAction.SW.secondary.name=Déplacer vers le Sud-Ouest (secondaire)
-moveAction.W.name=Déplacer vers l’Ouest
-moveAction.W.secondary.name=Déplacer vers l’Ouest (secondaire)
+miniMapZoomOutAction.secondary.name=Dézoom sur la mini-carte (secondaire)
+moveAction.E.name=Aller à l’Est
+moveAction.E.secondary.name=Aller à l’Est (secondaire)
+moveAction.N.name=Aller au Nord
+moveAction.N.secondary.name=Aller au Nord (secondaire)
+moveAction.NE.name=Aller au Nord-Est
+moveAction.NE.secondary.name=Aller au Nord-Est (secondaire)
+moveAction.NW.name=Aller au Nord-Ouest
+moveAction.NW.secondary.name=Aller au Nord-Ouest (secondaire)
+moveAction.S.name=Aller au Sud
+moveAction.S.secondary.name=Aller au Sud (secondaire)
+moveAction.SE.name=Aller au Sud-Est
+moveAction.SE.secondary.name=Aller au Sud-Est (secondaire)
+moveAction.SW.name=Aller au Sud-Ouest
+moveAction.SW.secondary.name=Aller au Sud-Ouest (secondaire)
+moveAction.W.name=Aller à l’Ouest
+moveAction.W.secondary.name=Aller à l’Ouest (secondaire)
 newAction.name=Nouveau
 newEmptyMapAction.name=Nouvelle carte vide
 openAction.name=Ouvrir
@@ -367,14 +373,14 @@ plowAction.name=Labourer
 preferencesAction.name=Préférences
 quitAction.name=Quitter
 reconnectAction.name=Reconnexion
-renameAction.name=Changez de nom
-reportCargoAction.name=Transport de marchandises
+renameAction.name=Renommer
+reportCargoAction.name=Rapport des transports
 reportColonyAction.name=Conseiller aux Colonies
 reportCongressAction.name=Congrès continental
 reportEducationAction.name=Rapport d’éducation
 reportExplorationAction.name=Rapport d’exploration
 reportForeignAction.name=Conseiller aux Affaires étrangères
-reportHighScoresAction.name=Plus haut scores
+reportHighScoresAction.name=Plus hauts pointages
 reportHistoryAction.name=Rapport historique
 reportIndianAction.name=Conseiller aux Affaires indiennes
 reportLabourAction.name=Conseiller au Travail
@@ -387,13 +393,13 @@ reportTradeAction.name=Conseiller au Commerce
 reportTurnAction.name=Bilan annuel
 retireAction.name=Se retirer
 roadAction.name=Construire une route
-saveAction.name=Enregistrer
+saveAction.name=Sauvegarder
 saveAndQuitAction.name=Sauvegarder et quitter
 scaleMapAction.name=Dimensionner la carte
-sentryAction.name=Veiller
+sentryAction.name=Mettre en veille
 showMainAction.name=Retour au menu
 skipUnitAction.name=Passer
-tilePopupAction.name=Montrer la case
+tilePopupAction.name=Afficher la case
 toggleViewModeAction.name=Voir unités/terrains
 tradeRouteAction.name=Routes commerciales
 unloadAction.name=Décharger
@@ -413,86 +419,90 @@ model.difficulty.custom.shortDescription=Un niveau de difficulté réglable.
 model.difficulty.immigration.name=Immigration
 model.option.crossesIncrement.name=Incrément de croix
 model.option.crossesIncrement.shortDescription=Nombre de croix supplémentaires requises pour chaque nouvel immigrant.
-model.option.recruitPriceIncrease.name=Augmentation du prix de recrutement
-model.option.recruitPriceIncrease.shortDescription=Augmente le coût de recrutement de nouveaux immigrants.
-model.option.lowerCapIncrease.name=Augmentation du prix minimal
-model.option.lowerCapIncrease.shortDescription=Augmente le prix minimum de recrutement pour chaque nouvel immigrant.
-model.option.priceIncreasePerType.name=Augmentation du prix par type d’unité
-model.option.priceIncreasePerType.shortDescription=Si l’augmentation du prix s’applique ou non à chaque type d’unité.
-model.option.priceIncrease.artillery.name=Augmentation des prix pour l’artillerie
-model.option.priceIncrease.artillery.shortDescription=Hausse du prix de chaque nouvelle pièce d’artillerie.
+model.option.recruitPriceIncrease.name=Augmentation du coût de recrutement
+model.option.recruitPriceIncrease.shortDescription=Augmente le coût de recrutement des nouveaux immigrants.
+model.option.lowerCapIncrease.name=Augmentation du coût minimal
+model.option.lowerCapIncrease.shortDescription=Augmente le coût minimum de recrutement pour chaque nouvel immigrant.
+model.option.priceIncreasePerType.name=Augmentation du coût par type d’unité
+model.option.priceIncreasePerType.shortDescription=Si l’augmentation du coût s’applique ou non à chaque type d’unité.
+model.option.priceIncrease.artillery.name=Augmentation des coûts pour l’artillerie
+model.option.priceIncrease.artillery.shortDescription=Hausse du coût de chaque nouvelle pièce d’artillerie.
 model.option.expertStartingUnits.name=Unités de départ expertes
-model.option.expertStartingUnits.shortDescription=Fait de toutes les unités de départ des experts.
+model.option.expertStartingUnits.shortDescription=Faire de toutes les unités de départ des experts.
 model.option.immigrants.name=Immigrants
-model.option.immigrants.shortDescription=Les premiers immigrants d'Europe.
+model.option.immigrants.shortDescription=Les premiers immigrants d’Europe.
 model.difficulty.natives.name=Indigènes
-model.option.landPriceFactor.name=Facteur du prix des terres
+model.option.landPriceFactor.name=Facteur de coût des terres
 model.option.landPriceFactor.shortDescription=Augmente le coût d’achat des terres indigènes.
 model.option.nativeConvertProbability.name=Probabilité de conversion indigène
-model.option.nativeConvertProbability.shortDescription=Augmente la probabilité que les indigènes d’une colonie détruite se convertissent.
-model.option.burnProbability.name=Probabilité d’incendie des colonies
+model.option.nativeConvertProbability.shortDescription=Augmente la probabilité que les indigènes d’une agglomération détruite se convertissent.
+model.option.burnProbability.name=Probabilité d’incendie des agglomérations
 model.option.burnProbability.shortDescription=Augmente la probabilité que les indigènes brûlent les colonies.
 model.option.nativeDemands.name=Demandes indigènes
 model.option.nativeDemands.shortDescription=Augmente la quantité de demandes indigènes.
 model.option.rumourDifficulty.name=Difficulté de rumeur
-model.option.rumourDifficulty.shortDescription=Plus ce nombre est élevé, moins les rumeurs auront des chances de devenir positives.
+model.option.rumourDifficulty.shortDescription=Plus ce nombre est élevé, moins les rumeurs positives seront fréquentes.
 model.option.shipTradePenalty.name=Pénalité de commerce maritime
 model.option.shipTradePenalty.shortDescription=Pénalité en pourcentage sur les prix offerts par les indigènes aux navires de commerce.
-model.option.destroySettlementScore.name=Score de destruction de colonie
-model.option.destroySettlementScore.shortDescription=Pénalité au score pour la destruction d’un campement indigène
+model.option.destroySettlementScore.name=Pointage de destruction d’agglomération
+model.option.destroySettlementScore.shortDescription=Pénalité au pointage pour la destruction d’une agglomération indigène
 model.option.buildOnNativeLand.name=Construire sur une terre autochtone
-model.option.buildOnNativeLand.shortDescription=Si les colonies peuvent être fondées sur une terre autochtone.
+model.option.buildOnNativeLand.shortDescription=Si les colonies peuvent être fondées sur des terres autochtones.
 model.option.buildOnNativeLand.always.name=Toujours
 model.option.buildOnNativeLand.always.shortDescription=La construction sur une terre autochtone est toujours possible.
 model.option.buildOnNativeLand.first.name=La première
-model.option.buildOnNativeLand.first.shortDescription=Votre première colonie peut être construite sur une terre autochtone.
+model.option.buildOnNativeLand.first.shortDescription=Seule votre première colonie peut être construite sur une terre autochtone.
 model.option.buildOnNativeLand.firstAndUncontacted.name=La première sans contact
-model.option.buildOnNativeLand.firstAndUncontacted.shortDescription=Votre première colonie peut être construite sur une terre autochtone tant que la tribu propriétaire n’a pas été contactée.
+model.option.buildOnNativeLand.firstAndUncontacted.shortDescription=Votre première colonie ne peut être construite sur une terre autochtone que si la tribu propriétaire n’a pas été contactée.
 model.option.buildOnNativeLand.never.name=Jamais
 model.option.buildOnNativeLand.never.shortDescription=Construire sur une terre autochtone n’est pas autorisé.
-model.option.settlementNumber.name=Nombre de lieux habités indigènes
-model.option.settlementNumber.shortDescription=Détermine le nombre de campement indigènes sur les cartes générées
+model.option.settlementNumber.name=Nombre d’agglomérations indigènes
+model.option.settlementNumber.shortDescription=Détermine le nombre d’agglomérations indigènes sur les cartes générées
 model.option.settlementNumber.verySmall.name=Très petit
-model.option.settlementNumber.verySmall.shortDescription=Pas gaire d'establiments indigènas
+model.option.settlementNumber.verySmall.shortDescription=Très peu d’agglomérations indigènes
 model.option.settlementNumber.small.name=Petit
-model.option.settlementNumber.small.shortDescription=Nombre de luòcs abitats indigènas
+model.option.settlementNumber.small.shortDescription=Peu d’agglomérations indigènes
 model.option.settlementNumber.medium.name=Moyen
-model.option.settlementNumber.medium.shortDescription=Nombre mejan d'establiments indigènas
+model.option.settlementNumber.medium.shortDescription=Nombre moyen d’agglomérations indigènes
 model.option.settlementNumber.large.name=Grand
-model.option.settlementNumber.large.shortDescription=Grand nombre d'establiments indigènas
-model.option.settlementNumber.veryLarge.name=Fòrt grand
-model.option.settlementNumber.veryLarge.shortDescription=Establiments indigènas abondants
+model.option.settlementNumber.large.shortDescription=Beaucoup d’agglomérations indigènes
+model.option.settlementNumber.veryLarge.name=Très grand
+model.option.settlementNumber.veryLarge.shortDescription=Les agglomérations indigènes sont abondantes
 model.difficulty.monarch.name=Monarque
 model.option.monarchMeddling.name=Ingérence monarchique
 model.option.monarchMeddling.shortDescription=Augmente l’importance et la sévérité de l’ingérence du monarque.
 model.option.taxAdjustment.name=Ajustement des taxes
 model.option.taxAdjustment.shortDescription=Accroît la sévérité des augmentations d’impôts
 model.option.mercenaryPrice.name=Prix des mercenaires
-model.option.mercenaryPrice.shortDescription=Augmente le prix offert aux mercenaires par le monarque.
+model.option.mercenaryPrice.shortDescription=Augmente le prix des mercenaires offerts par le monarque.
 model.option.maximumTax.name=Taxe maximale
 model.option.maximumTax.shortDescription=La valeur maximale à laquelle le monarque peut augmenter les taxes.
 model.option.monarchSupport.name=Soutien du monarque
 model.option.monarchSupport.shortDescription=Le soutien militaire fourni par le monarque.
-model.option.treasureTransportFee.name=Frais de transport d'un trésor
-model.option.treasureTransportFee.shortDescription=Le pourcentage d'un trésor que le couronne gardera pour la transporter.
-model.option.interventionBells.name=Cloches d'intervention
-model.option.interventionBells.shortDescription=Le nombre de cloches nécessaires pour faire intervenir la Force d'Intervention.
-model.option.interventionTurns.name=Tours d'intervention
-model.option.interventionTurns.shortDescription=Le nombre de tours entre les ajouts à la Force d'Intervention.
-model.option.refSize.name=Taille de la Force expéditionnaire royale
-model.option.refSize.shortDescription=Le nombre et le type d'unités composant le corps expéditionnaire royal.
+model.option.treasureTransportFee.name=Frais de transport d’un trésor
+model.option.treasureTransportFee.shortDescription=Le pourcentage d’un trésor payé à la Couronne pour son transport.
+model.option.interventionBells.name=Cloches d’intervention
+model.option.interventionBells.shortDescription=Le nombre de cloches nécessaires pour faire intervenir la Force d’intervention.
+model.option.interventionTurns.name=Tours d’intervention
+model.option.interventionTurns.shortDescription=Le nombre de tours entre les ajouts à la Force d’intervention.
+model.option.refSize.name=Taille du Corps expéditionnaire royal
+model.option.refSize.shortDescription=Le nombre et le type d’unités composant le Corps expéditionnaire royal.
 model.option.refSize.soldiers.name=Infanterie
-model.option.refSize.soldiers.shortDescription=Le nombre d'unités d'infanterie.
+model.option.refSize.soldiers.shortDescription=Le nombre d’unités d’infanterie.
 model.option.refSize.dragoons.name=Cavalerie
-model.option.refSize.dragoons.shortDescription=Le nombre d'unités de cavalerie.
-model.option.refSize.menOfWar.name=Navires de guerre
-model.option.refSize.menOfWar.shortDescription=Le nombre de navires de guerre.
+model.option.refSize.dragoons.shortDescription=Le nombre d’unités de cavalerie.
+model.option.refSize.menOfWar.name=Vaisseaux de ligne
+model.option.refSize.menOfWar.shortDescription=Le nombre de vaisseaux de ligne.
 model.option.refSize.artillery.name=Artillerie
-model.option.refSize.artillery.shortDescription=Le nombre d'unités d'artillerie.
-model.option.interventionForce.name=Force d'intervention
-model.option.interventionForce.shortDescription=La Force d'Intervention dépêchée à l'appui de votre guerre d'indépendance.
+model.option.refSize.artillery.shortDescription=Le nombre d’unités d’artillerie.
+model.option.interventionForce.name=Force d’intervention
+model.option.interventionForce.shortDescription=La Force d’intervention dépêchée en soutien à votre guerre d’indépendance.
 model.option.mercenaryForce.name=Force mercenaire
-model.option.mercenaryForce.shortDescription=La Force mercenaire propose de soutenir votre Guerre d'Indépendance.
+model.option.mercenaryForce.shortDescription=La Force mercenaire propose de soutenir votre Guerre d’indépendance.
+model.option.warSupportForce.name=Force de soutien de guerre
+model.option.warSupportForce.shortDescription=La Force maximale offerte par le monarque en soutien à vos guerres.
+model.option.warSupportGold.name=Or de soutien de guerre
+model.option.warSupportGold.shortDescription=La quantité maximale d’or offerte par le monarque en soutien à vos guerres.
 model.difficulty.government.name=Gouvernement
 model.option.badGovernmentLimit.name=Limite de mauvais gouvernement
 model.option.badGovernmentLimit.shortDescription=Le nombre maximum de royalistes qui n’entraînent pas de pénalité de production.
@@ -501,10 +511,10 @@ model.option.veryBadGovernmentLimit.shortDescription=Le nombre maximum de royali
 model.option.goodGovernmentLimit.name=Limite de bon gouvernement
 model.option.goodGovernmentLimit.shortDescription=Le pourcentage minimal de rebelles qui provoque un bonus de production.
 model.option.veryGoodGovernmentLimit.name=Limite de très bon gouvernement
-model.option.veryGoodGovernmentLimit.shortDescription=Le pourcentage minimal de rebelles qui provoque un bonus accru de la production.
+model.option.veryGoodGovernmentLimit.shortDescription=Le pourcentage minimal de rebelles qui provoque un bonus accru de production.
 model.difficulty.other.name=Autres
-model.option.startingMoney.name=Argent initial
-model.option.startingMoney.shortDescription=La quantité d’argent dont vous disposez au début du jeu.
+model.option.startingMoney.name=Or initial
+model.option.startingMoney.shortDescription=La quantité d’or dont vous disposez au début du jeu.
 model.option.foundingFatherFactor.name=Facteur de père fondateur
 model.option.foundingFatherFactor.shortDescription=Augmente le coût d’élection d’un nouveau père fondateur.
 model.option.arrearsFactor.name=Facteur d’arriérés
@@ -513,72 +523,72 @@ model.option.unitsThatUseNoBells.name=Colons qui n’utilisent pas de cloche de
 model.option.unitsThatUseNoBells.shortDescription=Le nombre de colons dans une colonie qui n’utilisent aucune cloche de la Liberté.
 model.option.tileProduction.name=Production des cases
 model.option.tileProduction.shortDescription=La production des cases avec production variable.
-model.option.tileProduction.veryLow.name=Fòrt long
+model.option.tileProduction.veryLow.name=Très basse
 model.option.tileProduction.veryLow.shortDescription=Production de case très faible
 model.option.tileProduction.low.name=Basse
 model.option.tileProduction.low.shortDescription=Production de case faible
-model.option.tileProduction.medium.name=Moyen
+model.option.tileProduction.medium.name=Moyenne
 model.option.tileProduction.medium.shortDescription=Production de case moyenne
-model.option.tileProduction.high.name=Haut
-model.option.tileProduction.high.shortDescription=Production de case haute
-model.option.tileProduction.veryHigh.name=Très haut
-model.option.tileProduction.veryHigh.shortDescription=Production de case très haute
+model.option.tileProduction.high.name=Haute
+model.option.tileProduction.high.shortDescription=Production de case élevée
+model.option.tileProduction.veryHigh.name=Très haute
+model.option.tileProduction.veryHigh.shortDescription=Production de case très élevée
 model.option.badRumour.name=Chance de mauvaise rumeur
-model.option.badRumour.decription=Pourcentage de chance qu’une rumeur ait un mauvais résultat.
+model.option.badRumour.decription=Probabilité qu’une rumeur ait un mauvais résultat (en pourcentage).
 model.option.goodRumour.name=Chance de bonne rumeur
-model.option.goodRumour.decription=Pourcentage de chance qu’une rumeur ait un bon résultat.
-model.difficulty.cheat.name=Triche de l'IA
-model.option.liftBoycottCheat.name=Lever d'un boycott
-model.option.liftBoycottCheat.shortDescription=Pourcentage de chances par tour qu'un joueur IA ait un boycott levé sans payer d'arriérés.
-model.option.equipScoutCheat.name=Équiper l'éclaireur
-model.option.equipScoutCheat.shortDescription=Pourcentage de chances par tour qu'une IA équipe gratuitement une unité en Europe en tant qu'éclaireur.
+model.option.goodRumour.decription=Probabilité qu’une rumeur ait un bon résultat (en pourcentage).
+model.difficulty.cheat.name=Triche de l’IA
+model.option.liftBoycottCheat.name=Lever d’un boycott
+model.option.liftBoycottCheat.shortDescription=Pourcentage par tour qu’un joueur IA ait un boycott levé sans payer d’arriérés.
+model.option.equipScoutCheat.name=Équiper l’éclaireur
+model.option.equipScoutCheat.shortDescription=Pourcentage par tour qu’une IA équipe gratuitement une unité en Europe en tant qu’éclaireur.
 model.option.equipPioneerCheat.name=Équiper un pionnier
-model.option.equipPioneerCheat.shortDescription=Pourcentage de chances par tour qu’une IA équipe gratuitement une unité en Europe comme pionnier.
+model.option.equipPioneerCheat.shortDescription=Pourcentage par tour qu’une IA équipe gratuitement une unité en Europe comme pionnier.
 model.option.landUnitCheat.name=Obtenir une unité terrestre
-model.option.landUnitCheat.shortDescription=Pourcentage de chances par tour qu'une IA obtienne gratuitement une unité terrestre offensive en Europe.
+model.option.landUnitCheat.shortDescription=Pourcentage par tour qu’une IA obtienne gratuitement une unité terrestre offensive en Europe.
 model.option.offensiveLandUnitCheat.name=Obtenir une unité terrestre offensive
 model.option.offensiveNavalUnitCheat.name=Obtenir une unité navale offensive
-model.option.offensiveNavalUnitCheat.shortDescription=Pourcentage de chances dégressif (en fonction de la force navale) par tour qu'une IA construise gratuitement une unité navale offensive en Europe.
+model.option.offensiveNavalUnitCheat.shortDescription=Pourcentage dégressif (en fonction de la force navale) par tour qu’une IA construise gratuitement une unité navale offensive en Europe.
 model.option.transportNavalUnitCheat.name=Obtenir une unité navale de transport
-model.option.transportNavalUnitCheat.shortDescription=Pourcentage de chances par tour qu'une IA construise gratuitement une unité navale de transport en Europe (si elle a du travail pour davantage d'unités de transport).
+model.option.transportNavalUnitCheat.shortDescription=Pourcentage par tour qu’une IA construise gratuitement une unité navale de transport en Europe (si elle a du travail pour davantage d’unités de transport).
 gameOptions.name=Options de jeu
-gameOptions.shortDescription=Options de règles de jeu.
+gameOptions.shortDescription=Options de règles de jeu
 gameOptions.map.name=Carte
 gameOptions.map.shortDescription=Options d’affichage sur le panneau de la carte.
-model.option.turnsToSail.name=Virements de bords
-model.option.turnsToSail.shortDescription=Le nombre de changements de bords nécessaires pour naviguer de l’Europe vers le Nouveau Monde.
-model.option.settlementLimitModifier.name=Modificateur de la limite de villages
-model.option.settlementLimitModifier.shortDescription=Quantité ajoutée à la limite d'un village, comme pour le nombre de chariots pouvant être construits.
-model.option.fogOfWar.name=Brouillard de bataille
+model.option.turnsToSail.name=Tours de navigation
+model.option.turnsToSail.shortDescription=Le nombre de tours nécessaires pour naviguer de l’Europe vers le Nouveau Monde.
+model.option.settlementLimitModifier.name=Modificateur de la limite d’agglomération
+model.option.settlementLimitModifier.shortDescription=Quantité ajoutée à la limite d’une agglomération, comme pour le nombre de chariots pouvant être construits.
+model.option.fogOfWar.name=Brouillard de guerre
 model.option.fogOfWar.shortDescription=Les unités ennemies au-delà de notre rayon de vision doivent-elles être masquées ?
 model.option.explorationPoints.name=Points d’exploration
 model.option.explorationPoints.shortDescription=Les points d’exploration doivent-ils être remis pour toutes les découvertes ?
 model.option.amphibiousMoves.name=Déplacements amphibies
-model.option.amphibiousMoves.shortDescription=Permettre le déplacement directement dans les établissements, à partir d'unités navales.
+model.option.amphibiousMoves.shortDescription=Permettre le déplacement à partir d’unités navales directement dans les agglomérations.
 model.option.emptyTraders.name=Unités commerciales vides
-model.option.emptyTraders.shortDescription=Autorise les unités commerciales vides à commercer avec les campements indigènes.
-model.option.settlementActionsContactChief.name=Contact principal
-model.option.settlementActionsContactChief.shortDescription=Toutes les actions avec un village contactent son chef et consument le bonus de reconnaissance.
+model.option.emptyTraders.shortDescription=Autorise les unités commerciales vides à commercer avec les agglomérations indigènes.
+model.option.settlementActionsContactChief.name=Contacter le chef
+model.option.settlementActionsContactChief.shortDescription=Toutes les actions avec une agglomération contactent son chef et consomment le bonus de reconnaissance.
 model.option.enhancedMissionaries.name=Missionnaires améliorés
-model.option.enhancedMissionaries.shortDescription=Les missionnaires améliorent le commerce d'un village et les compétences enseignées, et donnent de la visibilité sur les environs.
+model.option.enhancedMissionaries.shortDescription=Les missionnaires améliorent le commerce d’une agglomération et les compétences enseignées, et donnent de la visibilité sur les environs.
 model.option.missionInfluence.name=Influence de la mission
-model.option.missionInfluence.shortDescription=La force de l’influence d’une mission sur le niveau d’alarme des indigènes dans un campement.
+model.option.missionInfluence.shortDescription=La force de l’influence d’une mission sur le niveau d’alarme des indigènes dans une agglomération.
 model.option.giftProbability.name=Probabilité de cadeau
-model.option.giftProbability.shortDescription=Pourcentage de chances par tour qu'un campement indigène pacifique avec un surplus l'offre en cadeau à un campement européen amical proche.
+model.option.giftProbability.shortDescription=Pourcentage par tour qu’une agglomération indigène pacifique ayant un surplus l’offre en cadeau à une agglomération européenne amicale proche.
 model.option.demandProbability.name=Probabilité de demande
-model.option.demandProbability.shortDescription=Pourcentage de chances par tour qu'un campement indigène hostile demande un tribut à un campement européen adverse proche.
-model.option.continueFoundingFatherRecruitment.name=Continuer à recruter des Pères fondateurs.
-model.option.continueFoundingFatherRecruitment.shortDescription=Continuer à recruter des Pères fondateurs une fois que l'indépendance est accordée.
-model.option.teleportREF.name=Téléporter REF
-model.option.teleportREF.shortDescription=REF apparaît sur le site d'atterrissage pour sa première cible.
+model.option.demandProbability.shortDescription=Pourcentage par tour qu’une agglomération indigène hostile demande un tribut à une agglomération européenne proche.
+model.option.continueFoundingFatherRecruitment.name=Continuer à recruter des Pères fondateurs
+model.option.continueFoundingFatherRecruitment.shortDescription=Continuer à recruter des Pères fondateurs une fois que l’indépendance est accordée.
+model.option.teleportREF.name=Téléporter CEF
+model.option.teleportREF.shortDescription=Le CEF apparaît sur le site d’atterrissage pour sa première cible.
 model.option.startingPositions.name=Positions de départ
 model.option.startingPositions.shortDescription=Détermine les positions de départ des joueurs européens.
 model.option.startingPositions.classic.name=Classique
-model.option.startingPositions.classic.shortDescription=Les nations européennes commencent sur la limite en  haute mer à l’est du Nouveau Monde.
+model.option.startingPositions.classic.shortDescription=Les nations européennes commencent à la limite de haute mer à l’Est du Nouveau Monde.
 model.option.startingPositions.random.name=Aléatoire
-model.option.startingPositions.random.shortDescription=Les nations européennes commencent sur la limite en haute mer n’importe où sur la carte.
+model.option.startingPositions.random.shortDescription=Les nations européennes commencent à la limite de haute mer n’importe où sur la carte.
 model.option.startingPositions.historical.name=Historique
-model.option.startingPositions.historical.shortDescription=Les nations européennes commencent sur les limites en haute mer proches de leur première colonie historique dans le Nouveau Monde.
+model.option.startingPositions.historical.shortDescription=Les nations européennes commencent aux limites de haute mer proches de leur première colonie historique dans le Nouveau Monde.
 model.option.initialImmigration.name=Cible d’immigration initiale
 model.option.initialImmigration.shortDescription=Nombre de croix à produire avant que le premier émigrant européen n’apparaisse.
 model.option.peaceProbability.name=Probabilité de paix
@@ -588,13 +598,13 @@ model.option.europeanUnitImmigrationPenalty.shortDescription=Pénalité par tour
 model.option.playerImmigrationBonus.name=Bonus d’immigration du joueur
 model.option.playerImmigrationBonus.shortDescription=Bonus par tour pour l’ensemble de la production de croix.
 model.option.equipEuropeanRecruits.name=Équiper les recrues européennes
-model.option.equipEuropeanRecruits.shortDescription=Les unités nouvellement entraînées ou recrutées en Europe sont équipées en accord avec leur rôle par défaut.
+model.option.equipEuropeanRecruits.shortDescription=Les unités nouvellement formées ou recrutées en Europe sont équipées en accord avec leur rôle par défaut.
 gameOptions.colony.name=Colonies
 gameOptions.colony.shortDescription=Contient les options relatives au comportement des colonies.
 model.option.bellAccumulationCapped.name=Accumulation de cloches plafonnée
 model.option.bellAccumulationCapped.shortDescription=Les colonies ne peuvent pas accumuler plus de cloches tant que le taux de 100% de rebelles n’est pas atteint
-model.option.captureUnitsUnderRepair.name=Unités capturées en réparation
-model.option.captureUnitsUnderRepair.shortDescription=Les unités capturées sont en réparation quand une colonie est conquise.
+model.option.captureUnitsUnderRepair.name=Capture des unités en réparation
+model.option.captureUnitsUnderRepair.shortDescription=Les unités en réparation sont capturées quand une colonie est conquise.
 model.option.customIgnoreBoycott.name=Les douanes ignorent les boycotts
 model.option.customIgnoreBoycott.shortDescription=Les douanes peuvent vendre les marchandises boycottées.
 model.option.customsOnCoast.name=Bâtiments des douanes sur la côte
@@ -604,98 +614,98 @@ model.option.disembarkInColony.shortDescription=Toutes les unités débarquent q
 model.option.expertsHaveConnections.name=Les experts ont des relations
 model.option.expertsHaveConnections.shortDescription=Les experts peuvent utiliser leurs relations pour fournir un minimum de matières premières aux manufactures, même quand il n’y en a plus !
 model.option.foundColonyDuringRebellion.name=Fonder des colonies pendant la rébellion
-model.option.foundColonyDuringRebellion.shortDescription=Un joueur peut continuer à fonder des colonies lors de la Guerre d’Indépendance.
+model.option.foundColonyDuringRebellion.shortDescription=Un joueur peut continuer à fonder des colonies pendant la Guerre d’indépendance.
 model.option.payForBuilding.name=Payer pour construire
 model.option.payForBuilding.shortDescription=Les constructions peuvent être terminées plus rapidement en payant pour les biens manquants.
 model.option.saveProductionOverflow.name=Conserver les surplus de production
 model.option.saveProductionOverflow.shortDescription=Conserve les surplus de production de marteaux, de cloches et de croix.
 model.option.clearHammersOnConstructionSwitch.name=Effacer les marteaux lors du changement de construction
-model.option.clearHammersOnConstructionSwitch.shortDescription=Mettre à zéro les marteaux accumulés su la construction courante change.
+model.option.clearHammersOnConstructionSwitch.shortDescription=Mettre à zéro les marteaux accumulés si la construction courante change.
 model.option.allowStudentSelection.name=Autoriser la sélection des étudiants
-model.option.allowStudentSelection.shortDescription=Permet d’assigner les étudiants manuellement plutôt qu’automatiquement
+model.option.allowStudentSelection.shortDescription=Permet d’assigner les étudiants manuellement plutôt qu’automatiquement.
 model.option.enableUpkeep.name=Les bâtiments ont besoin d’entretien (EXPÉRIMENTAL)
-model.option.enableUpkeep.shortDescription=Payer pour l'entretien des bâtiments ou subir un malus de production.
+model.option.enableUpkeep.shortDescription=Payer pour l’entretien des bâtiments ou subir un malus de production.
 model.option.onlyNaturalImprovements.name=Améliorations naturelles uniquement
-model.option.onlyNaturalImprovements.shortDescription=Seules les améliorations des cases naturelles contribuent à la production de bien non alimentaires sur la case centrale de la colonie.
+model.option.onlyNaturalImprovements.shortDescription=Seules les améliorations des cases naturelles contribuent à la production de biens non alimentaires sur la case centrale de la colonie.
 model.option.naturalDisasters.name=Catastrophes naturelles
-model.option.naturalDisasters.shortDescription=La probabilité de catastrophes naturelles par tour.
+model.option.naturalDisasters.shortDescription=La probabilité de catastrophe naturelle par tour.
 gameOptions.victoryConditions.name=Victoire
 gameOptions.victoryConditions.shortDescription=Conditions de victoire.
 model.option.victoryDefeatREF.name=Premier joueur à acquérir l’indépendance
-model.option.victoryDefeatREF.shortDescription=Le premier joueur humain qui bat les Corps expéditionnaires royaux remporte la victoire.
+model.option.victoryDefeatREF.shortDescription=Le premier joueur humain qui bat le Corps expéditionnaire royal remporte la victoire.
 model.option.victoryDefeatEuropeans.name=Défaite de tous les autres Européens
 model.option.victoryDefeatEuropeans.shortDescription=Le joueur qui défait tous les autres joueurs européens remporte la victoire.
 model.option.victoryDefeatHumans.name=Défaite de tous les autres joueurs humains
 model.option.victoryDefeatHumans.shortDescription=Le joueur qui défait tous les autres joueurs humains remporte la victoire.
-gameOptions.years.name=Options Année
+gameOptions.years.name=Options de calendrier
 gameOptions.years.shortDescription=Contient les options relatives aux diverses années spéciales.
 model.option.startingYear.name=Année de départ
-model.option.startingYear.shortDescription=L'année à laquelle le jeu débute.
+model.option.startingYear.shortDescription=L’année à laquelle le jeu débute.
 model.option.seasonYear.name=Saison
 model.option.seasonYear.shortDescription=La première année pendant laquelle il y a deux saisons.
 model.option.mandatoryColonyYear.name=Année de colonie obligatoire
-model.option.mandatoryColonyYear.shortDescription=L'année en laquelle posséder une colonie devient obligatoire.
+model.option.mandatoryColonyYear.shortDescription=L’année en laquelle posséder une colonie devient obligatoire.
 model.option.lastYear.name=Dernière année du jeu
 model.option.lastYear.shortDescription=La toute dernière année du jeu.
 model.option.lastColonialYear.name=Dernière année coloniale du jeu
 model.option.lastColonialYear.shortDescription=La dernière année du jeu pour un joueur colonial.
-model.option.independenceTurn.name=L'Indépendance De Tour
-model.option.independenceTurn.shortDescription=Un bonus au score est accordé pour avoir déclaré l’indépendance avant ce tour.
+model.option.independenceTurn.name=Le tour d’Indépendance
+model.option.independenceTurn.shortDescription=Un bonus au pointage est accordé pour avoir déclaré l’Indépendance avant ce tour.
 model.option.ages.name=Âges de recrutement des pères fondateurs
-model.option.ages.shortDescription=Les deux ans au cours de laquelle le père fondateur changements de pondération (séparés par des virgules).
+model.option.ages.shortDescription=Les deux années au cours desquelles la pondération des pères fondateurs change (séparées par des virgules).
 model.option.seasons.name=Saisons
 model.option.seasons.shortDescription=Le nombre de saisons dans une année
 gameOptions.prices.name=Options de prix
 gameOptions.prices.shortDescription=Contient des options générées par le jeu pour contrôler les prix initiaux.
 model.option.food.minimumPrice.name=Prix initial minimal pour la nourriture
 model.option.food.maximumPrice.name=Prix initial maximal pour la nourriture
-model.option.food.spread.name=Différence entre les prix d'achat et de vente pour la nourriture
+model.option.food.spread.name=Différence entre les prix d’achat et de vente pour la nourriture
 model.option.sugar.minimumPrice.name=Prix initial minimal pour le sucre
 model.option.sugar.maximumPrice.name=Prix initial maximal pour le sucre
-model.option.sugar.spread.name=Différence entre les prix d'achat et de vente pour le sucre
+model.option.sugar.spread.name=Différence entre les prix d’achat et de vente pour le sucre
 model.option.tobacco.minimumPrice.name=Prix initial minimal pour le tabac
 model.option.tobacco.maximumPrice.name=Prix initial maximal pour le tabac
-model.option.tobacco.spread.name=Différence entre les prix d'achat et de vente pour le tabac
+model.option.tobacco.spread.name=Différence entre les prix d’achat et de vente pour le tabac
 model.option.cotton.minimumPrice.name=Prix initial minimal pour le coton
 model.option.cotton.maximumPrice.name=Prix initial maximal pour le coton
-model.option.cotton.spread.name=Différence entre les prix d'achat et de vente pour le coton
+model.option.cotton.spread.name=Différence entre les prix d’achat et de vente pour le coton
 model.option.furs.minimumPrice.name=Prix initial minimal pour les fourrures
 model.option.furs.maximumPrice.name=Prix initial maximal pour les fourrures
-model.option.furs.spread.name=Différence entre les prix d'achat et de vente pour les fourrures
+model.option.furs.spread.name=Différence entre les prix d’achat et de vente pour les fourrures
 model.option.lumber.minimumPrice.name=Prix initial minimal pour le bois
 model.option.lumber.maximumPrice.name=Prix initial maximal pour le bois
-model.option.lumber.spread.name=Différence entre les prix d'achat et de vente pour le bois
+model.option.lumber.spread.name=Différence entre les prix d’achat et de vente pour le bois
 model.option.ore.minimumPrice.name=Prix initial minimal pour le minerai
 model.option.ore.maximumPrice.name=Prix initial maximal pour le minerai
-model.option.ore.spread.name=Différence entre les prix d'achat et de vente pour le minerai
-model.option.silver.minimumPrice.name=Prix initial minimal pour l'argent
-model.option.silver.maximumPrice.name=Prix initial maximal pour l'argent
-model.option.silver.spread.name=Différence entre les prix d'achat et de vente pour l'argent
+model.option.ore.spread.name=Différence entre les prix d’achat et de vente pour le minerai
+model.option.silver.minimumPrice.name=Prix initial minimal pour l’argent
+model.option.silver.maximumPrice.name=Prix initial maximal pour l’argent
+model.option.silver.spread.name=Différence entre les prix d’achat et de vente pour l’argent
 model.option.rum.minimumPrice.name=Prix initial minimal pour le rhum
 model.option.rum.maximumPrice.name=Prix initial maximal pour le rhum
-model.option.rum.spread.name=Différence entre les prix d'achat et de vente pour le rhum
+model.option.rum.spread.name=Différence entre les prix d’achat et de vente pour le rhum
 model.option.cigars.minimumPrice.name=Prix initial minimal pour les cigares
 model.option.cigars.maximumPrice.name=Prix initial maximal pour les cigares
-model.option.cigars.spread.name=Différence entre les prix d'achat et de vente pour les cigares
-model.option.cloth.minimumPrice.name=Prix initial minimal pour les vêtements
-model.option.cloth.maximumPrice.name=Prix initial maximal pour les vêtements
-model.option.cloth.spread.name=Différence entre les prix d'achat et de vente pour les vêtements
-model.option.coats.minimumPrice.name=Prix initial minimal pour les manteaux
-model.option.coats.maximumPrice.name=Prix initial maximal pour les manteaux
-model.option.coats.spread.name=Différence entre les prix d'achat et de vente pour les manteaux
+model.option.cigars.spread.name=Différence entre les prix d’achat et de vente pour les cigares
+model.option.cloth.minimumPrice.name=Prix initial minimal pour le tissu
+model.option.cloth.maximumPrice.name=Prix initial maximal pour le tissu
+model.option.cloth.spread.name=Différence entre les prix d’achat et de vente pour le tissu
+model.option.coats.minimumPrice.name=Prix initial minimal pour les pelisses
+model.option.coats.maximumPrice.name=Prix initial maximal pour les pelisses
+model.option.coats.spread.name=Différence entre les prix d’achat et de vente pour les pelisses
 model.option.tools.minimumPrice.name=Prix initial minimal pour les outils
 model.option.tools.maximumPrice.name=Prix initial maximal pour les outils
-model.option.tools.spread.name=Différence entre les prix d'achat et de vente pour les outils
+model.option.tools.spread.name=Différence entre les prix d’achat et de vente pour les outils
 model.option.muskets.minimumPrice.name=Prix initial minimal pour les mousquets
 model.option.muskets.maximumPrice.name=Prix initial maximal pour les mousquets
-model.option.muskets.spread.name=Différence entre les prix d'achat et de vente pour les mousquets
-model.option.tradeGoods.minimumPrice.name=Prix initial minimal pour les biens commerciaux
-model.option.tradeGoods.maximumPrice.name=Prix initial maximal pour les biens commerciaux
-model.option.tradeGoods.spread.name=Différence entre les prix d'achat et de vente pour les biens commerciaux
+model.option.muskets.spread.name=Différence entre les prix d’achat et de vente pour les mousquets
+model.option.tradeGoods.minimumPrice.name=Prix initial minimal pour les marchandises commerciales
+model.option.tradeGoods.maximumPrice.name=Prix initial maximal pour les marchandises commerciales
+model.option.tradeGoods.spread.name=Différence entre les prix d’achat et de vente pour les marchandises commerciales
 model.option.horses.minimumPrice.name=Prix initial minimal pour les chevaux
 model.option.horses.maximumPrice.name=Prix initial maximal pour les chevaux
-model.option.horses.spread.name=Différence entre les prix d'achat et de vente pour les chevaux
-model.option.hammers.price.name=Prix pour les marteaux lors de l'achat de bâtiments et d'unités pouvant être construits
+model.option.horses.spread.name=Différence entre les prix d’achat et de vente pour les chevaux
+model.option.hammers.price.name=Prix pour les marteaux lors de l’achat de bâtiments et d’unités constructibles
 mapGeneratorOptions.name=Options du générateur de carte
 mapGeneratorOptions.shortDescription=Options du générateur de carte.
 mapGeneratorOptions.landGenerator.name=Générateur de continents
@@ -704,97 +714,97 @@ model.option.mapWidth.name=Largeur de la carte
 model.option.mapWidth.shortDescription=Permet de choisir la largeur de la carte générée.
 model.option.mapHeight.name=Hauteur de la carte
 model.option.mapHeight.shortDescription=Permet de choisir la hauteur de la carte générée.
-model.option.landMass.name=Masse des continents
+model.option.landMass.name=Masses continentales
 model.option.landMass.shortDescription=Permet de choisir le pourcentage de terre par rapport à l’océan sur la carte.
-model.option.landGeneratorType.name=Type de surface (EXPÉRIMENTAL !)
-model.option.landGeneratorType.shortDescription=Options pour définir le type de générateur de pays à utiliser.
+model.option.landGeneratorType.name=Type de continents (EXPÉRIMENTAL !)
+model.option.landGeneratorType.shortDescription=Définir le type de générateur de terres à utiliser.
 model.option.landGeneratorType.classic.name=Classique
 model.option.landGeneratorType.classic.shortDescription=Un grand continent et quelques îles.
 model.option.landGeneratorType.continent.name=Continent
-model.option.landGeneratorType.continent.shortDescription=La plupart des terres est sur un unique continent.
+model.option.landGeneratorType.continent.shortDescription=La plupart des terres sont sur un unique continent.
 model.option.landGeneratorType.archipelago.name=Archipel
 model.option.landGeneratorType.archipelago.shortDescription=Plusieurs îles de taille moyenne.
 model.option.landGeneratorType.islands.name=Îles
 model.option.landGeneratorType.islands.shortDescription=De nombreuses petites îles.
 model.option.preferredDistanceToEdge.name=Distance au bord préférée
 model.option.preferredDistanceToEdge.shortDescription=La distance préférée au bord de la carte.
-model.option.maximumDistanceToEdge.name=Distance maximum du bord
+model.option.maximumDistanceToEdge.name=Distance maximale du bord
 model.option.maximumDistanceToEdge.shortDescription=La distance maximale au bord de la carte.
 model.option.distanceToHighSea.name=Distance de la haute mer
 model.option.distanceToHighSea.shortDescription=La distance préférée entre la côte et la haute mer.
 mapGeneratorOptions.terrainGenerator.name=Générateur de terrains
 mapGeneratorOptions.terrainGenerator.shortDescription=Options du générateur de terrain
-model.option.minimumLatitude.name=Latitude minimum
-model.option.minimumLatitude.shortDescription=La latitude la plus au nord. Une valeur négative indique une latitude de l'hémisphère nord.
+model.option.minimumLatitude.name=Latitude minimale
+model.option.minimumLatitude.shortDescription=La latitude la plus au Nord. Une valeur négative indique une latitude de l’hémisphère nord.
 model.option.maximumLatitude.name=Latitude maximale
-model.option.maximumLatitude.shortDescription=La latitude la plus au sud. Une valeur positive indique une latitude de l'hémisphère sud.
-model.option.riverNumber.name=Proportion de rivières
-model.option.riverNumber.shortDescription=Détermine le nombre de rivière dans les terres.
+model.option.maximumLatitude.shortDescription=La latitude la plus au Sud. Une valeur positive indique une latitude de l’hémisphère sud.
+model.option.riverNumber.name=Nombre de rivières
+model.option.riverNumber.shortDescription=Détermine le nombre de rivières dans les terres.
 model.option.riverNumber.verySmall.name=Très petit
 model.option.riverNumber.verySmall.shortDescription=Très peu de rivières
 model.option.riverNumber.small.name=Petit
-model.option.riverNumber.small.shortDescription=Pichon nombre de ribièras
+model.option.riverNumber.small.shortDescription=Peu de rivières
 model.option.riverNumber.medium.name=Moyen
 model.option.riverNumber.medium.shortDescription=Nombre moyen de rivières
 model.option.riverNumber.large.name=Grand
 model.option.riverNumber.large.shortDescription=Grand nombre de rivières
-model.option.riverNumber.veryLarge.name=Fòrt grand
+model.option.riverNumber.veryLarge.name=Très grand
 model.option.riverNumber.veryLarge.shortDescription=Rivières abondantes
-model.option.mountainNumber.name=Proportion de montagnes
-model.option.mountainNumber.shortDescription=Détermine le pourcentage de chaînes montagneuses.
+model.option.mountainNumber.name=Nombre de montagnes
+model.option.mountainNumber.shortDescription=Détermine la quantité de chaînes montagneuses.
 model.option.mountainNumber.verySmall.name=Très petit
 model.option.mountainNumber.verySmall.shortDescription=Très peu de montagnes
 model.option.mountainNumber.small.name=Petit
-model.option.mountainNumber.small.shortDescription=Pichon nombre de montanhas
+model.option.mountainNumber.small.shortDescription=Peu de montagnes
 model.option.mountainNumber.medium.name=Moyen
 model.option.mountainNumber.medium.shortDescription=Nombre moyen de montagnes
 model.option.mountainNumber.large.name=Grand
 model.option.mountainNumber.large.shortDescription=Grand nombre de montagnes
-model.option.mountainNumber.veryLarge.name=Fòrt grand
+model.option.mountainNumber.veryLarge.name=Très grand
 model.option.mountainNumber.veryLarge.shortDescription=Montagnes abondantes
-model.option.rumourNumber.name=Proportion de rumeurs de cité perdue
+model.option.rumourNumber.name=Nombre de rumeurs de cité perdue
 model.option.rumourNumber.shortDescription=Détermine le nombre de rumeurs de cité perdue.
 model.option.rumourNumber.verySmall.name=Très petit
 model.option.rumourNumber.verySmall.shortDescription=Très peu de rumeurs
 model.option.rumourNumber.small.name=Petit
-model.option.rumourNumber.small.shortDescription=Pichon nombre de rumors
+model.option.rumourNumber.small.shortDescription=Peu de rumeurs
 model.option.rumourNumber.medium.name=Moyen
 model.option.rumourNumber.medium.shortDescription=Nombre moyen de rumeurs
 model.option.rumourNumber.large.name=Grand
 model.option.rumourNumber.large.shortDescription=Grand nombre de rumeurs
-model.option.rumourNumber.veryLarge.name=Fòrt grand
+model.option.rumourNumber.veryLarge.name=Très grand
 model.option.rumourNumber.veryLarge.shortDescription=Rumeurs abondantes
 model.option.forestNumber.name=Proportion de forêts
 model.option.forestNumber.shortDescription=Détermine le pourcentage de cases couvertes de forêts.
 model.option.forestNumber.verySmall.name=Très petit
 model.option.forestNumber.verySmall.shortDescription=Très peu de forêts
 model.option.forestNumber.small.name=Petit
-model.option.forestNumber.small.shortDescription=Pichon nombre de bòsques
+model.option.forestNumber.small.shortDescription=Peu de forêts
 model.option.forestNumber.medium.name=Moyen
 model.option.forestNumber.medium.shortDescription=Nombre moyen de forêts
 model.option.forestNumber.large.name=Grand
 model.option.forestNumber.large.shortDescription=Grand nombre de forêts
-model.option.forestNumber.veryLarge.name=Fòrt grand
+model.option.forestNumber.veryLarge.name=Très grand
 model.option.forestNumber.veryLarge.shortDescription=Forêts abondantes
 model.option.bonusNumber.name=Proportion de cases bonifiées
 model.option.bonusNumber.shortDescription=Détermine le pourcentage de cases contenant des bonis.
 model.option.bonusNumber.verySmall.name=Très petit
-model.option.bonusNumber.verySmall.shortDescription=Très peu de bonus
+model.option.bonusNumber.verySmall.shortDescription=Très peu de bonis
 model.option.bonusNumber.small.name=Petit
-model.option.bonusNumber.small.shortDescription=Petit nombre de forêts
+model.option.bonusNumber.small.shortDescription=Peu de bonis
 model.option.bonusNumber.medium.name=Moyen
-model.option.bonusNumber.medium.shortDescription=Nombre moyen de bonus
+model.option.bonusNumber.medium.shortDescription=Nombre moyen de bonis
 model.option.bonusNumber.large.name=Grand
-model.option.bonusNumber.large.shortDescription=Grand nombre de bonus
-model.option.bonusNumber.veryLarge.name=Fòrt grand
-model.option.bonusNumber.veryLarge.shortDescription=Bonus abondants
+model.option.bonusNumber.large.shortDescription=Grand nombre de bonis
+model.option.bonusNumber.veryLarge.name=Très grand
+model.option.bonusNumber.veryLarge.shortDescription=Bonis abondants
 model.option.humidity.name=Humidité
 model.option.humidity.shortDescription=Option pour modifier l’humidité moyenne de la carte
-model.option.humidity.veryDry.name=Très sec
+model.option.humidity.veryDry.name=Très sèche
 model.option.humidity.veryDry.shortDescription=Humidité très basse
-model.option.humidity.dry.name=Sec
+model.option.humidity.dry.name=Sèche
 model.option.humidity.dry.shortDescription=Humidité basse
-model.option.humidity.normal.name=Normal
+model.option.humidity.normal.name=Normale
 model.option.humidity.normal.shortDescription=Humidité normale
 model.option.humidity.wet.name=Humide
 model.option.humidity.wet.shortDescription=Une forte humidité
@@ -802,16 +812,16 @@ model.option.humidity.veryWet.name=Très humide
 model.option.humidity.veryWet.shortDescription=Très forte humidité
 model.option.temperature.name=Température
 model.option.temperature.shortDescription=Option pour modifier la température moyenne de la carte
-model.option.temperature.cold.name=Froid
+model.option.temperature.cold.name=Froide
 model.option.temperature.cold.shortDescription=Température très basse
-model.option.temperature.chilly.name=Freg
-model.option.temperature.chilly.shortDescription=Temperatura bassa
-model.option.temperature.temperate.name=Tempéré
+model.option.temperature.chilly.name=Fraîche
+model.option.temperature.chilly.shortDescription=Température basse
+model.option.temperature.temperate.name=Tempérée
 model.option.temperature.temperate.shortDescription=Température normale
-model.option.temperature.warm.name=Caud
-model.option.temperature.warm.shortDescription=À haute température
-model.option.temperature.hot.name=Fòrt caud
-model.option.temperature.hot.shortDescription=À très haute température
+model.option.temperature.warm.name=Chaude
+model.option.temperature.warm.shortDescription=Température élevée
+model.option.temperature.hot.name=Torride
+model.option.temperature.hot.shortDescription=Température très élevée
 mapGeneratorOptions.import.name=Importer
 mapGeneratorOptions.import.shortDescription=Permet d’importer une carte ou une sauvegarde.
 model.option.importFile.name=Importer le fichier
@@ -822,11 +832,11 @@ model.option.importBonuses.name=Importer les bonis
 model.option.importBonuses.shortDescription=Active l’importation des bonis.
 model.option.importRumours.name=Importer les rumeurs
 model.option.importRumours.shortDescription=Active l’importation des rumeurs de cité perdue.
-model.option.importSettlements.name=Importer les lieux habités
-model.option.importSettlements.shortDescription=Active l’importation des lieux habités indigènes
+model.option.importSettlements.name=Importer les agglomérations
+model.option.importSettlements.shortDescription=Active l’importation des agglomérations indigènes
 clientOptions.name=Préférences
 clientOptions.shortDescription=Options préférées du client
-clientOptions.personal.name=Personnel
+clientOptions.personal.name=Personnelles
 clientOptions.personal.shortDescription=Options spécifiques au joueur.
 model.option.playerName.name=Nom du joueur :
 clientOptions.gui.name=Affichage
@@ -838,8 +848,8 @@ model.option.guiMinNumberToDisplayGoodsCount.name=Afficher les quantités de mar
 model.option.guiMinNumberToDisplayGoodsCount.shortDescription=La quantité de marchandises sera affichée lorsqu’elle atteint ou dépasse ce nombre.
 model.option.guiMaxNumberOfGoodsImages.name=Nombre maximum d’images de marchandises :
 model.option.guiMaxNumberOfGoodsImages.shortDescription=Indique le nombre maximum d’images à afficher pour chaque type de marchandise.
-model.option.guiMinNumberToDisplayGoods.name=Cacher les quantités de marchandises en dépôt inférieures à :
-model.option.guiMinNumberToDisplayGoods.shortDescription=Les marchandises seront affichées dans la colonie si elles atteignent ou dépassent cette quantité.
+model.option.guiMinNumberToDisplayGoods.name=Masquer les quantités de marchandises en dépôt inférieures à :
+model.option.guiMinNumberToDisplayGoods.shortDescription=Les marchandises ne seront affichées dans la colonie que si elles atteignent ou dépassent cette quantité.
 model.option.alwaysCenter.name=Toujours centrer la case sélectionnée
 model.option.alwaysCenter.shortDescription=Toujours recentrer la vue sur une case nouvellement sélectionnée.
 model.option.jumpToActiveUnit.name=Centrer sur l’unité active
@@ -860,16 +870,16 @@ model.option.unitLastMoveDelay.name=Délai du dernier mouvement d’une unité
 model.option.unitLastMoveDelay.shortDescription=S’il faut faire une courte pause lors du dernier mouvement d’une unité ou non.
 model.option.usePixmaps.name=Utiliser des pixmaps pour stocker les images
 model.option.usePixmaps.shortDescription=Essayez de désactiver cela si le mouvement des unités ordinaires est très lent.
-model.option.rememberPanelPositions.name=Se rappeler des positions des fenêtres
-model.option.rememberPanelPositions.shortDescription=Se rappeler de la position des différentes fenêtres.
-model.option.rememberPanelSizes.name=Se souvenir de la taille des fenêtres
-model.option.rememberPanelSizes.shortDescription=Se souvenir de la taille des différentes fenêtres.
+model.option.rememberPanelPositions.name=Se rappeler des positions des panneaux
+model.option.rememberPanelPositions.shortDescription=Se rappeler de la position des différents panneaux.
+model.option.rememberPanelSizes.name=Se souvenir de la taille des panneaux
+model.option.rememberPanelSizes.shortDescription=Se souvenir de la taille des différents panneaux.
 model.option.smoothRendering.name=Lissage
-model.option.smoothRendering.shortDescription=Permet de lisser le rendu de la minicarte lors d’un zoom arrière.
-model.option.disableGrayLayer.name=Désactiver la fin de tour en arrière-plan
-model.option.disableGrayLayer.shortDescription=Option pour désactiver la fin de tour grisée en arrière-plan.
+model.option.smoothRendering.shortDescription=Permet de lisser le rendu de la mini-carte lors d’un zoom arrière.
+model.option.disableGrayLayer.name=Désactiver l’arrière-plan de fin de tour
+model.option.disableGrayLayer.shortDescription=Option pour désactiver l’arrière-plan grisé en fin de tour.
 model.option.miniMapToggleFogOfWar.name=Inverser le brouillard de guerre sur la mini-carte
-model.option.miniMapToggleFogOfWar.shortDescription=Si sélectionné : Dessiner le brouillard de guerre sur la mini-carte.
+model.option.miniMapToggleFogOfWar.shortDescription=Si sélectionné : Utiliser le brouillard de guerre sur la mini-carte.
 model.option.miniMapToggleBorders.name=Inverser les frontières sur la mini-carte
 model.option.miniMapToggleBorders.shortDescription=Si sélectionné : Dessiner les frontières sur la mini-carte
 model.option.mapControls.name=Contrôles de la carte
@@ -879,7 +889,7 @@ clientOptions.gui.mapControls.CornerMapControls.shortDescription=Les contrôles
 clientOptions.gui.mapControls.ClassicMapControls.name=Classique
 clientOptions.gui.mapControls.ClassicMapControls.shortDescription=Les contrôles de la carte occupent le bord droit.
 model.option.color.background.name=Couleur de fond
-model.option.color.background.shortDescription=Cette couleur entoure le brouillard de guerre et la minicarte lorsque celle-ci est affichée entièrement à un niveau de zoom reculé.
+model.option.color.background.shortDescription=Cette couleur entoure le brouillard de guerre et la mini-carte lorsque celle-ci est affichée entièrement à un niveau de zoom reculé.
 clientOptions.minimap.color.background.black=Noir
 clientOptions.minimap.color.background.gray.dark.very=Gris très foncé
 clientOptions.minimap.color.background.gray.dark=Gris foncé
@@ -902,7 +912,7 @@ model.option.displayColonyLabels.shortDescription=Le style des étiquettes de co
 clientOptions.gui.displayColonyLabels.none.name=Aucun
 clientOptions.gui.displayColonyLabels.none.shortDescription=Ne pas étiqueter les colonies
 clientOptions.gui.displayColonyLabels.classic.name=Classique
-clientOptions.gui.displayColonyLabels.classic.shortDescription=Séries d'étiquettes avec un nom et une taille
+clientOptions.gui.displayColonyLabels.classic.shortDescription=Séries d’étiquettes avec un nom et une taille
 clientOptions.gui.displayColonyLabels.modern.name=Moderne
 clientOptions.gui.displayColonyLabels.modern.shortDescription=Légende complexe de la colonie avec le bonus de production et tout bâtiment en construction
 model.option.colonyComparator.name=Trier les colonies par :
@@ -918,7 +928,7 @@ clientOptions.gui.colonyComparator.bySize.shortDescription=Trier du plus grand a
 clientOptions.gui.colonyComparator.bySoL.name=Cloches de la liberté
 clientOptions.gui.colonyComparator.bySoL.shortDescription=Trier par liberté décroissante
 model.option.defaultZoomLevel.name=Niveau de zoom par défaut
-model.option.defaultZoomLevel.shortDescription=Indique quel niveau de zoom par défaut la minicarte utilise.
+model.option.defaultZoomLevel.shortDescription=Indique quel niveau de zoom par défaut la mini-carte utilise.
 model.option.moveAnimationSpeed.name=Vitesse d’animation des déplacements amis
 model.option.moveAnimationSpeed.shortDescription=Change la vitesse d’animation des déplacements d’unités amies.
 clientOptions.gui.moveAnimationSpeed.off=Sans
@@ -956,11 +966,11 @@ model.option.guiShowUnitImproved.shortDescription=Indique s’il faut afficher l
 model.option.guiShowUnitDemoted.name=Messages de dégradations d’unités
 model.option.guiShowUnitDemoted.shortDescription=Indique s’il faut afficher les messages concernant les dégradations d’unités au début de chaque tour.
 model.option.guiShowUnitLost.name=Messages de pertes d’unités
-model.option.guiShowUnitLost.shortDescription=Indique s’il faut afficher les messages concernant les pertes d’unités.
+model.option.guiShowUnitLost.shortDescription=Indique s’il faut afficher les messages concernant les pertes d’unités au début de chaque tour.
 model.option.guiShowBuildingCompleted.name=Messages d’achèvement des constructions
 model.option.guiShowBuildingCompleted.shortDescription=Indique s’il faut afficher les messages concernant les achèvements de constructions au début de chaque tour.
 model.option.guiShowForeignDiplomacy.name=Messages des Affaires étrangères
-model.option.guiShowForeignDiplomacy.shortDescription=Indique s’il faut afficher les messages concernant les nouveaux colons au début de chaque tour.
+model.option.guiShowForeignDiplomacy.shortDescription=Indique s’il faut afficher les messages concernant la diplomatie étrangère au début de chaque tour.
 model.option.guiShowMarketPrices.name=Messages sur les prix du marché
 model.option.guiShowMarketPrices.shortDescription=Indique s’il faut afficher les messages concernant les évolutions de prix du marché au début de chaque tour.
 model.option.guiShowMissingGoods.name=Messages de marchandises manquantes
@@ -971,20 +981,20 @@ model.option.guiShowGifts.name=Cadeaux des indigènes
 model.option.guiShowGifts.shortDescription=Indique s’il faut afficher les messages concernant les cadeaux des indigènes au début de chaque tour.
 model.option.guiShowDemands.name=Demandes indigènes
 model.option.guiShowDemands.shortDescription=Indique s’il faut afficher les messages concernant les demandes des indigènes au début de chaque tour.
-model.option.guiShowGoodsMovement.name=Mouvement de marchandises
+model.option.guiShowGoodsMovement.name=Mouvements de marchandises
 model.option.guiShowGoodsMovement.shortDescription=Indique s’il faut afficher les mouvements de marchandises détaillés.
 model.option.guiShowColonyWarnings.name=Messages d’avertissement des sites de colonies
 model.option.guiShowColonyWarnings.shortDescription=Indique s’il faut afficher les avertissements concernant les sites de colonies.
 model.option.guiShowPreCombat.name=Analyses avant combat
 model.option.guiShowPreCombat.shortDescription=Indique s’il faut afficher les analyses de probabilité avant les combats.
-model.option.guiShowNotBestTile.name=Pas de meilleure case
-model.option.guiShowNotBestTile.shortDescription=Détermine s’il faut avertir ou non lorsque des unités ne travaillent pas sur la meilleure case disponible
-model.option.colonyReport.name=Rapport Colonie
+model.option.guiShowNotBestTile.name=Pas la meilleure case
+model.option.guiShowNotBestTile.shortDescription=Détermine s’il faut avertir ou non lorsque des unités ne travaillent pas sur la meilleure case disponible.
+model.option.colonyReport.name=Rapport des Colonies
 model.option.colonyReport.shortDescription=Un résumé de l’activité dans chaque colonie.
 clientOptions.messages.colonyReport.classic.name=Classique
-clientOptions.messages.colonyReport.classic.shortDescription=Un rapport de colonie avec une image pleine d’informations.
+clientOptions.messages.colonyReport.classic.shortDescription=Un rapport de colonie détaillé avec beaucoup d’images.
 clientOptions.messages.colonyReport.compact.name=Compact
-clientOptions.messages.colonyReport.compact.shortDescription=Un rapport de colonie compact qui tente de montrer autant que possible dans une seule ligne par colonie.
+clientOptions.messages.colonyReport.compact.shortDescription=Un rapport de colonie compact qui montre autant que possible en une seule ligne par colonie.
 model.option.labourReport.name=Rapport de travail
 model.option.labourReport.shortDescription=Un résumé de l’activité de chaque unité
 clientOptions.messages.labourReport.classic.name=Classique
@@ -993,7 +1003,7 @@ clientOptions.messages.labourReport.compact.name=Compact
 clientOptions.messages.labourReport.compact.shortDescription=Une version plus compacte du rapport classique.
 clientOptions.savegames.name=Sauvegardes
 clientOptions.savegames.shortDescription=Sauvegardes de jeu
-model.option.showSavegameSettings.name=Dialogue avec le serveur lors de la lecture d’une sauvegarde :
+model.option.showSavegameSettings.name=Dialogue de lecture de sauvegarde
 model.option.showSavegameSettings.shortDescription=Affiche un dialogue de sélection d’options du serveur lors de la lecture d’une sauvegarde.
 clientOptions.savegames.showSavegameSettings.never.name=Jamais
 clientOptions.savegames.showSavegameSettings.never.shortDescription=Ne jamais afficher la boîte de dialogue des options du serveur
@@ -1002,19 +1012,19 @@ clientOptions.savegames.showSavegameSettings.multiplayer.shortDescription=Affich
 clientOptions.savegames.showSavegameSettings.always.name=Toujours
 clientOptions.savegames.showSavegameSettings.always.shortDescription=Toujours afficher la boîte de dialogue des options du serveur
 model.option.autosavePeriod.name=Sauvegarde tous les X tours :
-model.option.autosavePeriod.shortDescription=Les moments pour sauvegarder le jeu automatiquement. 0 désactive la fonction.
-model.option.autosaveValidity.name=Supprimer les sauvegardes automatique après x jours :
+model.option.autosavePeriod.shortDescription=L’intervalle de sauvegarde automatique du jeu. 0 désactive la fonction.
+model.option.autosaveValidity.name=Supprimer les sauvegardes automatiques après x jours
 model.option.autosaveValidity.shortDescription=Durée en jours de validité du fichier de sauvegarde automatique après création. Mettez-le à 0 pour ignorer cette condition.
-model.option.autosaveDelete.name=Supprimer les fichiers des sauvegardes automatiques :
+model.option.autosaveDelete.name=Supprimer les fichiers des sauvegardes automatiques
 model.option.autosaveDelete.shortDescription=Supprimer les anciens fichiers de sauvegarde automatique au démarrage d’une nouvelle partie.
-model.option.confirmSaveOverwrite.name=Confirmer l’écrasement de l’enregistrement :
+model.option.confirmSaveOverwrite.name=Confirmer l’écrasement de l’enregistrement
 model.option.confirmSaveOverwrite.shortDescription=Option pour confirmer l’écrasement des fichiers existants.
 model.option.autoSavePrefix.name=Préfixe de sauvegarde automatique
 model.option.autoSavePrefix.shortDescription=Le préfixe pour les noms de fichiers auto-sauvegardés.
 model.option.lastTurnName.name=Nom du fichier du dernier tour
 model.option.lastTurnName.shortDescription=Le corps du nom du fichier d’enregistrement du dernier tour.
-model.option.beforeLastTurnName.name=Nom d’avant le dernier tour
-model.option.beforeLastTurnName.shortDescription=Le corps du nom du fichier de sauvegarde du tour avant le dernier
+model.option.beforeLastTurnName.name=Nom du fichier de l’avant-dernier tour
+model.option.beforeLastTurnName.shortDescription=Le corps du nom du fichier de sauvegarde de l’avat-dernier tour.
 clientOptions.warehouse.name=Options de l’entrepôt
 clientOptions.warehouse.shortDescription=Modifier le comportement par défaut de l’entrepôt et de la douane.
 model.option.customStock.name=Réserve des douanes
@@ -1028,11 +1038,11 @@ model.option.stockAccountsForProduction.shortDescription=Les routes commerciales
 clientOptions.audio.name=Audio
 clientOptions.audio.shortDescription=Configuration audio
 clientOptions.audio.audioMixer.automatic=Autodétecter la sortie audio.
-model.option.audioMixer.name=Sortie Audio
+model.option.audioMixer.name=Sortie audio
 model.option.audioMixer.shortDescription=Le périphérique sélectionné pour jouer de la musique
 model.option.audioVolume.name=Volume audio
 model.option.audioVolume.shortDescription=Volume audio
-model.option.audioAlerts.name=Alertes Audio
+model.option.audioAlerts.name=Alertes audio
 model.option.audioAlerts.shortDescription=Activer les alertes audio
 clientOptions.other.name=Autre
 clientOptions.other.shortDescription=Options qui n’entrent pas dans les autres catégories
@@ -1068,32 +1078,32 @@ model.ability.addTaxToBells.name=Ajoute une taxe aux cloches
 model.ability.addTaxToBells.shortDescription=Le taux de taxation agit comme un bonus à la production de cloches
 model.ability.alwaysOfferedPeace.name=Toujours offrir la paix
 model.ability.alwaysOfferedPeace.shortDescrption=Les nations européennes sont toujours préparées à offrir la paix
-model.ability.ambushBonus.name=Bonus d’embûche
-model.ability.ambushBonus.shortDescription=Bonus d’embûche lors de l’attaque d’unités en terrain ouvert.
+model.ability.ambushBonus.name=Bonus d’embuscade
+model.ability.ambushBonus.shortDescription=Bonus d’embuscade lors de l’attaque d’unités en terrain ouvert.
 model.ability.ambushPenalty.name=Pénalité d’embuscade
-model.ability.ambushPenalty.shortDescription=Cette nation subit une pénalité liée aux risques d’embuscades
-model.ability.ambushTerrain.name=Piéger le terrain
+model.ability.ambushPenalty.shortDescription=Cette nation subit une pénalité liée aux risques d’embuscades.
+model.ability.ambushTerrain.name=Terrain d’embuscade
 model.ability.ambushTerrain.shortDescription=Ce terrain est propice aux embuscades
 model.ability.armed.name=Armé
 model.ability.armed.shortDescription=Unités qui sont armées
 model.ability.autoProduction.name=Production automatique
-model.ability.autoProduction.shortDescription=Produire les biens même lorsqu'aucune unité n'est présente.
+model.ability.autoProduction.shortDescription=Produire les biens même lorsqu’aucune unité n’est présente.
 model.ability.automaticEquipment.name=Équipement automatique
-model.ability.automaticEquipment.shortDescription=Les unités peuvent s’équiper automatiquement pour défendre une colonie
+model.ability.automaticEquipment.shortDescription=Les unités peuvent s’équiper automatiquement pour défendre une agglomération
 model.ability.automaticPromotion.name=Promotion automatique
 model.ability.automaticPromotion.shortDescription=Les unités sont promues automatiquement si elles gagnent un combat
-model.ability.avoidExcessProduction.name=Éviter l'excès de production
-model.ability.avoidExcessProduction.shortDescription=Ne jamais produire plus de bien qu'il peut en être stocké.
+model.ability.avoidExcessProduction.name=Éviter l’excès de production
+model.ability.avoidExcessProduction.shortDescription=Ne jamais produire plus de bien qu’il peut en être stocké.
 model.ability.betterForeignAffairsReport.name=Rapports des affaires étrangères améliorés
 model.ability.betterForeignAffairsReport.shortDescription=Le rapport des affaires étrangères inclut des informations supplémentaires
 model.ability.bombard.name=Bombarder
 model.ability.bombard.shortDescription=Unités qui peuvent bombarder
 model.ability.bombardShips.name=Bombarder les navires
-model.ability.bombardShips.shortDescription=Bombarder les navires ennemis sur les tuiles d’eau adjacentes.
+model.ability.bombardShips.shortDescription=Bombarder les navires ennemis sur les cases d’eau adjacentes.
 model.ability.bornInColony.name=Né dans la colonie
 model.ability.bornInColony.shortDescription=Unités nées dans la colonie
-model.ability.bornInIndianSettlement.name=Né dans un campement indigène
-model.ability.bornInIndianSettlement.shortDescription=Unités nées dans un campement indigène
+model.ability.bornInIndianSettlement.name=Né dans une agglomération indigène
+model.ability.bornInIndianSettlement.shortDescription=Unités nées dans une agglomération indigène
 model.ability.build.name=Construire
 model.ability.build.shortDescription=La capacité à construire des unités, des équipements ou des bâtiments, parfois d’un type particulier.
 model.ability.buildCustomHouse.name=Construire une douane
@@ -1125,19 +1135,19 @@ model.ability.consumeAllOrNothing.shortDescription=Un consommateur qui peut cons
 model.ability.customHouseTradesWithForeignCountries.name=Commerce avec l’étranger via la douane
 model.ability.customHouseTradesWithForeignCountries.shortDescription=Vendre aux pays étrangers via la douane
 model.ability.demandTribute.name=Demander un tribut
-model.ability.demandTribute.shortDescription=Cette unité peut demander un tribut à un campement ennemi
-model.ability.demoteOnAllEquipLost.name=Rétrogradation sur perte de l’équipement
+model.ability.demandTribute.shortDescription=Cette unité peut demander un tribut à une agglomération ennemie
+model.ability.demoteOnAllEquipLost.name=Rétrogradation sur perte d’équipement
 model.ability.demoteOnAllEquipLost.shortDescription=Cette unité est rétrogradée si elle perd tout son équipement
 model.ability.denounceHeresy.name=Dénoncer l’hérésie
 model.ability.denounceHeresy.shortDescription=Unités qui peuvent dénoncer l’hérésie d’une mission ennemie
-model.ability.disposeOnAllEquipLost.name=Détruire sur perte de l’équipement
+model.ability.disposeOnAllEquipLost.name=Détruire sur perte d’équipement
 model.ability.disposeOnAllEquipLost.shortDescription=Cette unité est détruite si elle perd tout son équipement
 model.ability.disposeOnCombatLoss.name=Détruire sur défaite
 model.ability.disposeOnCombatLoss.shortDescription=Cette unité est détruite si elle perd un combat
 model.ability.dressMissionary.name=Habiller en missionnaire
 model.ability.dressMissionary.shortDescription=Fait de l’unité un missionnaire (non expert).
 model.ability.electFoundingFather.name=Élection des pères fondateurs
-model.ability.electFoundingFather.shortDescription=Cette nation a la faculté d’élire ses pères fondateurs
+model.ability.electFoundingFather.shortDescription=Cette nation a la faculté d’élire des pères fondateurs
 model.ability.establishMission.name=Établir une mission
 model.ability.establishMission.shortDescription=Capacité à établir une mission
 model.ability.evadeAttack.name=Se dérober à l’attaque
@@ -1145,18 +1155,18 @@ model.ability.evadeAttack.shortDescription=Cette unité a la capacité de se dé
 model.ability.expertMissionary.name=Missionnaire expert
 model.ability.expertMissionary.shortDescription=Cette unité peut agir en tant que missionnaire expert
 model.ability.expertPioneer.name=Capacité de fonctionner comme pionnier expert
-model.ability.expertPioneer.shortDescription=Cette unité peut agir en tant que colon expert
+model.ability.expertPioneer.shortDescription=Cette unité peut agir en tant que pionnier expert
 model.ability.expertScout.name=Capacité de fonctionner comme éclaireur expert
 model.ability.expertScout.shortDescription=Cette unité peut agir en tant qu’éclaireur expert
 model.ability.expertSoldier.name=Capacité de fonctionner comme soldat expert
 model.ability.expertSoldier.shortDescription=Cette unité peut agir en tant que soldat expert
 model.ability.expertsUseConnections.name=Les experts utilisent des connexions
 model.ability.expertsUseConnections.shortDescription=Les unités expertes acquièrent des matières premières, même si aucune n’est disponible
-model.ability.export.name=Exporter des biens
+model.ability.export.name=Exporter des marchandises
 model.ability.export.shortDescription=Peut exporter des marchandises directement vers l’Europe
 model.ability.foundColony.name=Fonder une colonie
 model.ability.foundColony.shortDescription=Cette unité a la capacité de fonder une nouvelle colonie
-model.ability.foundInLostCity.name=Trouvé dans les villes perdues
+model.ability.foundInLostCity.name=Trouvé dans les cités perdues
 model.ability.foundInLostCity.shortDescription=Un type d’unité trouvé dans les cités perdues
 model.ability.foundsColonies.name=Fonde des colonies
 model.ability.foundsColonies.shortDescription=Cette nation a la capacité de fonder de nouvelles colonies.
@@ -1174,7 +1184,7 @@ model.ability.independentNation.name=Nation indépendante
 model.ability.independentNation.shortDescription=Une nation indépendante
 model.ability.mercenaryUnit.name=Unité mercenaire
 model.ability.mercenaryUnit.shortDescription=Cette unité se trouve dans les forces mercenaires
-model.ability.mounted.name=Monté
+model.ability.mounted.name=Montée
 model.ability.mounted.shortDescription=Unités montées
 model.ability.moveToEurope.name=Aller en Europe
 model.ability.moveToEurope.shortDescription=Cette case permet aux unités d’aller en Europe
@@ -1182,7 +1192,7 @@ model.ability.multipleAttacks.name=Attaques multiples
 model.ability.multipleAttacks.shortDescription=Cette unité peut attaquer plusieurs fois
 model.ability.native.name=Indien
 model.ability.native.shortDescription=Amérindien
-model.ability.navalUnit.name=unité navale
+model.ability.navalUnit.name=Unité navale
 model.ability.navalUnit.shortDescription=Cette unité est une unité navale
 model.ability.negotiate.name=Négocier
 model.ability.negotiate.shortDescription=Unités qui peuvent négocier avec le maire d’une colonie
@@ -1193,15 +1203,15 @@ model.ability.pillageUnprotectedColony.shortDescription=Peut piller les colonies
 model.ability.piracy.name=Piraterie
 model.ability.piracy.shortDescription=Cette unité est une unité pirate
 model.ability.plunderNatives.name=Piller les indigènes
-model.ability.plunderNatives.shortDescription=Améliore le montant du pillage lors de la destruction de villages indigènes
+model.ability.plunderNatives.shortDescription=Améliore le montant du pillage lors de la destruction d’agglomérations indigènes
 model.ability.produceInWater.name=Produit dans l’eau
 model.ability.produceInWater.shortDescription=Les unités peuvent utiliser les cases d’eau aussi bien que les cases de terre
-model.ability.refUnit.name=Unité de la REF
-model.ability.refUnit.shortDescription=Cette unité est une unité de la REF
-model.ability.repairUnits.name=Unités de réparation
-model.ability.repairUnits.shortDescription=Peuvent réparer certains types d’unités endommagées
+model.ability.refUnit.name=Unité du CER
+model.ability.refUnit.shortDescription=Cette unité appartient au CER
+model.ability.repairUnits.name=Unité de réparation
+model.ability.repairUnits.shortDescription=Peut réparer certains types d’unités endommagées
 model.ability.royalExpeditionaryForce.name=Corps expéditionnaire royal
-model.ability.royalExpeditionaryForce.shortDescription=Une nation du Corps expéditionnaire royal.
+model.ability.royalExpeditionaryForce.shortDescription=Cette nation peut produire un Corps expéditionnaire royal
 model.ability.rumoursAlwaysPositive.name=Les rumeurs sont toujours positives
 model.ability.rumoursAlwaysPositive.shortDescription=Enquêter sur les rumeurs a toujours un résultat positif
 model.ability.seeAllColonies.name=Voir toutes les colonies
@@ -1209,7 +1219,7 @@ model.ability.seeAllColonies.shortDescription=Peut voir toutes les colonies étr
 model.ability.selectRecruit.name=Sélectionner les recrues
 model.ability.selectRecruit.shortDescription=Capacité à sélectionner les recrues
 model.ability.speakWithChief.name=Parler avec le chef
-model.ability.speakWithChief.shortDescription=Cette unité peut parler avec le chef d’un campement indigène
+model.ability.speakWithChief.shortDescription=Cette unité peut parler avec le chef d’une agglomération indigène
 model.ability.spyOnColony.name=Espionner la colonie
 model.ability.spyOnColony.shortDescription=Cette unité peut espionner les colonies étrangères
 model.ability.supportUnit.name=Unité de soutien
@@ -1218,7 +1228,7 @@ model.ability.teach.name=Enseigner les compétences
 model.ability.teach.shortDescription=Les unités expertes peuvent enseigner aux autres leurs compétences
 model.ability.tradeWithForeignColonies.name=Commercer avec les colonies étrangères
 model.ability.tradeWithForeignColonies.shortDescription=Capacité à commercer avec les colonies étrangères
-model.ability.undead.name=Mort-vivant
+model.ability.undead.name=Morte-vivante
 model.ability.undead.shortDescription=Une unité d’outre-tombe
 model.modifier.bombardBonus.name=Bombardement bonifié
 model.modifier.bombardBonus.shortDescription=Les unités de cette nation bénéficient d’un bombardement bonifié.
@@ -1230,7 +1240,7 @@ model.modifier.buildingPriceBonus.name=Bonus de prix de construction
 model.modifier.cargoPenalty.name=Pénalité de chargement
 model.modifier.cargoPenalty.shortDescription=Pénalité par chargement à l’efficacité de combat
 model.modifier.consumeOnlySurplusProduction.name=Quantité de surplus consommée
-model.modifier.consumeOnlySurplusProduction.shortDescription=Ne consommer qu'une partie du surplus de production, pas les biens stockés.
+model.modifier.consumeOnlySurplusProduction.shortDescription=Ne consomme qu’une partie du surplus de production, sans affecter les biens stockés.
 model.modifier.conversionAlarmRate.name=Alarme de conversion
 model.modifier.conversionSkill.name=Compétence de conversion
 model.modifier.defence.name=Bonus de défense
@@ -1247,21 +1257,21 @@ model.modifier.nativeAlarmModifier.shortDescription=Cette nation suscite moins d
 model.modifier.nativeConvertBonus.name=Conversion des indigènes bonifiée
 model.modifier.nativeConvertBonus.shortDescription=Cette nation convertit davantage d’indigènes.
 model.modifier.offence.name=Bonus d’attaque
-model.modifier.offenceAgainst.name=Infraction contre
-model.modifier.offenceAgainst.shortDescription=Améliore les chances de victoire lors d'attaques.
+model.modifier.offenceAgainst.name=Attaque contre
+model.modifier.offenceAgainst.shortDescription=Améliore les chances de victoire lors d’attaques.
 model.modifier.religiousUnrestBonus.name=Troubles religieux bonifiés
 model.modifier.religiousUnrestBonus.shortDescription=Les troubles religieux au sein de cette nation sont plus importants.
 model.modifier.sailHighSeas.name=Bonus de navigation en haute mer
 model.modifier.tileTypeChangeProduction.name=Rendement du bois
-model.modifier.tileTypeChangeProduction.shortDescription=Augmente la quantité de bois d'œuvre produite lors du défrichement des forêts.
+model.modifier.tileTypeChangeProduction.shortDescription=Augmente la quantité de bois d’œuvre produite lors du défrichement des forêts.
 model.modifier.tradeBonus.name=Commerce bonifié
 model.modifier.tradeBonus.shortDescription=Cette nation a un commerce bonifié.
 model.modifier.tradeVolumePenalty.name=Pénalité de volume de commerce
 model.modifier.tradeVolumePenalty.shortDescription=Diminue le volume de commerce avec les indigènes.
 model.modifier.treasureTransportFee.name=Frais de transport d’un trésor
-model.modifier.warehouseStorage.description=Entrepôt de stockage
-model.modifier.warehouseStorage.name=Stockage en magasin
-model.modifier.warehouseStorage.shortDescription=Stockage du magasin
+model.modifier.warehouseStorage.description=Entreposage
+model.modifier.warehouseStorage.name=Entreposage
+model.modifier.warehouseStorage.shortDescription=Entreposage
 model.source.ambushBonus.name=Bonification d’embuscade
 model.source.amphibiousAttack.name=Attaque amphibie
 model.source.artilleryAgainstRaid.name=Artillerie contre raid
@@ -1270,93 +1280,93 @@ model.source.attackBonus.name=Bonification d’attaque
 model.source.baseDefence.name=Défense de base
 model.source.baseOffence.name=Attaque de base
 model.source.cargoPenalty.name=Pénalité de cargaison
-model.source.colonyGoodsParty.name=Goods Party
+model.source.colonyGoodsParty.name=Protestation anti-taxes
 model.source.fortified.name=Fortifié
 model.source.movementPenalty.name=Pénalité de mouvement
 model.source.shipTradePenalty=Pénalité de commerce maritime
 model.source.solModifier.name=Fils de la Liberté / Conservateurs
 model.building.armory.name=Armurerie
-model.building.armory.description=L’armurerie est utilisée pour produire des mousquets à partir d’outils. Dès que la population atteint 8, l’armurerie peut être améliorée en poudrière et ensuite en arsenal pourvu qu’Adam Smith ait rejoint le congrès continental.\n\nAprès sa construction vous pouvez produire des mousquets et de l’artillerie.
+model.building.armory.description=L’armurerie est utilisée pour produire des mousquets à partir d’outils. Dès que la population atteint 8, l’armurerie peut être améliorée en poudrière et ensuite en arsenal pourvu qu’Adam Smith ait rejoint le Congrès continental.\n\nAprès sa construction vous pouvez produire des mousquets et de l’artillerie.
 model.building.arsenal.name=Arsenal
 model.building.arsenal.description=L’arsenal sert à produire des mousquets à partir d’outils.\n\nAprès sa construction, la production de mousquets nécessite moitié moins d’outils.
 model.building.blacksmithHouse.name=Forge
-model.building.blacksmithHouse.description=La forge, qui peut être améliorée en aciérie, sert à transformer le minerai en outils. Les outils servent à construire ou à améliorer certains bâtiments. Les outils peuvent également être utilisés pour les travaux extérieurs des pionniers ou pour la production de mousquets. Lorsque la colonie a atteint une population de 8, la forge peut être remplacée par une usine sidérurgique pourvu qu’Adam Smith ait rejoint le congrès continental.
+model.building.blacksmithHouse.description=La forge, qui peut être améliorée en aciérie, sert à transformer le minerai en outils. Les outils servent à construire ou à améliorer certains bâtiments. Les outils peuvent également être utilisés pour les travaux extérieurs des pionniers ou pour la production de mousquets. Lorsque la colonie a atteint une population de 8, l’aciérie peut être remplacée par une usine sidérurgique pourvu qu’Adam Smith ait rejoint le Congrès continental.
 model.building.blacksmithShop.name=Aciérie
-model.building.blacksmithShop.description=L’aciérie, qui peut être améliorée en usine sidérurgique, sert à transformer le minerai en outils. Les outils servent à construire ou à améliorer certains bâtiments. Les outils peuvent également être utilisés pour les travaux extérieurs des pionniers ou pour la production de mousquets. Lorsque la colonie a atteint une population de 8, la forge peut être remplacée par une usine sidérurgique pourvu qu’Adam Smith ait rejoint le congrès continental.\n\nUne aciérie améliore la production d’outils.
-model.building.carpenterHouse.name=Menuiserie
-model.building.carpenterHouse.description=La menuiserie peut être améliorée en Scierie lorsque la population atteint 3 colons. Ce bâtiment permet la conversion de bois en marteaux nécessaires pour construire toutes sortes de bâtiments.\n\nAutomatiquement construit lors de la fondation d’une nouvelle colonie.
+model.building.blacksmithShop.description=L’aciérie, qui peut être améliorée en usine sidérurgique, sert à transformer le minerai en outils. Les outils servent à construire ou à améliorer certains bâtiments. Les outils peuvent également être utilisés pour les travaux extérieurs des pionniers ou pour la production de mousquets. Lorsque la colonie a atteint une population de 8, l’aciérie peut être remplacée par une usine sidérurgique pourvu qu’Adam Smith ait rejoint le Congrès continental.\n\nUne aciérie améliore la production d’outils.
+model.building.carpenterHouse.name=Charpenterie
+model.building.carpenterHouse.description=La charpenterie peut être améliorée en scierie lorsque la population atteint 3 colons. Ce bâtiment permet la conversion de bois en marteaux nécessaires pour construire toutes sortes de bâtiments.\n\nAutomatiquement construit lors de la fondation d’une nouvelle colonie.
 model.building.cathedral.name=Cathédrale
 model.building.cathedral.description=Une colonie avec une population de 3 peut construire une église, qui peut être améliorée en cathédrale lorsque la population atteint 8. La liberté religieuse du Nouveau Monde (symbolisée par des croix) cause une émigration croissante depuis l’Europe.\n\nUne cathédrale augmente la production de croix.
 model.building.chapel.name=Chapelle
 model.building.chapel.description=La chapelle est un lieu où les colons pratiquent leur religion. Une chapelle produit une petite quantité de croix mais aucun prêtre ne peut y être affecté. Pour cela il faut d’abord construire une église.
 model.building.church.name=Église
 model.building.church.description=Une colonie avec une population de 3 peut construire une église, qui peut être améliorée en cathédrale lorsque la population atteint 8. La liberté religieuse du Nouveau Monde (symbolisée par des croix) cause une émigration croissante depuis l’Europe.\n\nConstruire une église augmente la production de croix et vous permet de former des missionnaires.
-model.building.cigarFactory.name=Usine de cigares
-model.building.cigarFactory.description=L’usine à cigares, qui ne peut être améliorée, sert à produire des cigares à partir de tabac.\n\nUne usine à cigares augmente la production de cigares.
+model.building.cigarFactory.name=Cigarerie
+model.building.cigarFactory.description=La cigarerie, qui ne peut être améliorée, sert à produire des cigares à partir de tabac.\n\nUne cigarerie augmente la production de cigares.
 model.building.college.name=Collège
 model.building.college.description=Une colonie avec une population de 4 peut construire une école, ce qui permet aux maîtres-artisans d’enseigner leur métier à un colon sans compétences particulières. Dès que la population a atteint 8, l’école peut être améliorée en collège dans lequel d’autres métiers peuvent être enseignés (par deux colons). Une fois que la population atteint 10, le collège peut être remplacé par une université dans laquelle toutes les compétences peuvent être enseignées (par trois colons).\n\nUn collège permet d’enseigner les compétences de niveau 2.
 model.building.country.name=Pâturage
 model.building.country.description=Les pâturages proches de votre colonie permettent aux chevaux de paître librement. Construire des écuries facilitera la reproduction des chevaux.
-model.building.customHouse.name=Poste de douanes
-model.building.customHouse.description=Le poste de douanes, qui peut être construit dès que Peter Stuyvesant a rejoint le congrès continental, permet l’exportation directe de biens vers l’Europe sans l’aide de bateaux. Il permet également de commercer avec des puissances étrangères après la déclaration d’indépendance. De plus, on peut contourner les boycotts.
+model.building.customHouse.name=Douane
+model.building.customHouse.description=La douane, qui peut être construite dès que Peter Stuyvesant a rejoint le Congrès continental, permet l’exportation directe de biens vers l’Europe sans l’aide de bateaux. Elle permet également de commercer avec des puissances étrangères après la déclaration d’indépendance. De plus, on peut contourner les boycotts.
 model.building.depot.name=Dépôt
-model.building.depot.description=Un dépôt conserve toutes sorte de produits. Sa capacité initiale est de 100 unités pour chaque type de produit. Il peut être amélioré en entrepôt ayant une capacité de 200 unités par produit. Construire une extension d’entrepôt augmente la capacité à 300 unités par produit.
-model.building.distillerHouse.name=Maison du bouilleur
-model.building.distillerHouse.description=La maison du bouilleur, qui peut être améliorée en distillerie, sert à produire du rhum à partir du sucre de canne. Une fois qu’Adam Smith a rejoint le congrès et que la colonie a atteint une population de 8, la distillerie peut être remplacée par une usine de spiritueux.
+model.building.depot.description=Un dépôt conserve toutes sorte de marchandises. Sa capacité initiale est de 100 unités pour chaque type de marchandise. Il peut être amélioré en entrepôt ayant une capacité de 200 unités par marchandise. Construire une extension d’entrepôt augmente la capacité à 300 unités par marchandise.
+model.building.distillerHouse.name=Bouilleur
+model.building.distillerHouse.description=Le bouilleur, qui peut être amélioré en distillerie, sert à produire du rhum à partir du sucre de canne. Une fois qu’Adam Smith a rejoint le Congrès continental et que la colonie a atteint une population de 8, la distillerie peut être remplacée par une rhumerie.
 model.building.docks.name=Quais
 model.building.docks.description=Les quais autorisent la pêche sur les cases proches de la colonie. Ils peuvent être améliorés en cales sèches lorsque la population atteint 4.
 model.building.drydock.name=Cale sèche
-model.building.drydock.description=La cale sèche permet la réparation de bateaux. Quand la population atteint 8 elle peut être améliorée en chantier naval.
+model.building.drydock.description=La cale sèche permet la réparation de bateaux et la pêche en haute mer. Quand la population atteint 8 elle peut être améliorée en chantier naval qui permet la construction de navires.
 model.building.fort.name=Fort
 model.building.fort.description=Le fort, qui peut être construit après une palissade, protège les colons des attaques et bombarde les navires ennemis. Le fort peut être remplacé par une forteresse lorsque la population atteint 8.\n\nConstruire un fort bonifie la défense de 150%.
 model.building.fortress.name=Forteresse
-model.building.fortress.description=La forteresse, qui peut être construite après un fort, protège les colons des attaques et bombarde les navires ennemis.\n\nConstruire une forteresse bonifie la défense de 150%.
+model.building.fortress.description=La forteresse, qui peut être construite après un fort, protège les colons des attaques et bombarde les navires ennemis.\n\nConstruire une forteresse bonifie la défense de 200%.
 model.building.furFactory.name=Usine de fourrures
 model.building.furFactory.description=L’usine de fourrures, qui ne peut être améliorée, sert à produire des pelisses à partir de fourrures. Une usine de fourrures augmente la production de pelisses.
 model.building.furTraderHouse.name=Maison du fourreur
-model.building.furTraderHouse.description=La maison du fourreur, qui peut être améliorée en atelier de fourrures, sert à produire des pelisses à partir de fourrures. Une fois que la colonie a atteint une population de 6, elle peut être améliorée en usine de fourrures pourvu qu’Adam Smith ait rejoint le congrès continental.
+model.building.furTraderHouse.description=La maison du fourreur, qui peut être améliorée en atelier de fourrures, sert à produire des pelisses à partir de fourrures. Une fois que la colonie a atteint une population de 6, elle peut être améliorée en usine de fourrures pourvu qu’Adam Smith ait rejoint le Congrès continental.
 model.building.furTradingPost.name=Atelier de fourrures
-model.building.furTradingPost.description=L’atelier de fourrures sert à produire des pelisses à partir de fourrures. Une fois que la colonie a atteint une population de 6, il peut être amélioré en usine de fourrures pourvu qu’Adam Smith ait rejoint le congrès continental. Un atelier de fourrures augmente la production de pelisses.
+model.building.furTradingPost.description=L’atelier de fourrures sert à produire des pelisses à partir de fourrures. Une fois que la colonie a atteint une population de 6, il peut être amélioré en usine de fourrures pourvu qu’Adam Smith ait rejoint le Congrès continental. Un atelier de fourrures augmente la production de pelisses.
 model.building.ironWorks.name=Usine sidérurgique
-model.building.ironWorks.description=L’usine sidérurgique, qui ne peut être améliorée, sert à transformer le minerai en outils. Les outils servent à construire ou à améliorer certains bâtiments. Les outils peuvent également être utilisés pour les travaux extérieurs des pionniers ou pour la production de mousquets. Lorsque la colonie a atteint une population de 8, la forge peut être remplacée par une usine sidérurgique pourvu qu’Adam Smith ait rejoint le congrès continental.\n\nUne usine sidérurgique améliore la production d’outils.
+model.building.ironWorks.description=L’usine sidérurgique, qui ne peut être améliorée, sert à transformer le minerai en outils. Les outils servent à construire ou à améliorer certains bâtiments. Les outils peuvent également être utilisés pour les travaux extérieurs des pionniers ou pour la production de mousquets. Lorsque la colonie a atteint une population de 8, l’aciérie peut être remplacée par une usine sidérurgique pourvu qu’Adam Smith ait rejoint le Congrès continental.\n\nUne usine sidérurgique améliore la production d’outils.
 model.building.lumberMill.name=Scierie
-model.building.lumberMill.description=La scierie, qui ne peut être améliorée, augmente la production de marteaux. Les marteaux sont nécessaires pour construire toutes sortes de bâtiments.
+model.building.lumberMill.description=La scierie, qui ne peut être améliorée, augmente la production de marteaux à partir de bois. Les marteaux sont nécessaires pour construire toutes sortes de bâtiments.
 model.building.magazine.name=Poudrière
-model.building.magazine.description=La poudrière sert à produire des mousquets à partir d’outils. La poudrière peut être améliorée en arsenal pourvu qu’Adam Smith ait rejoint le congrès continental.\n\nAprès sa construction la production de mousquets augmente de 100%.
+model.building.magazine.description=La poudrière sert à produire des mousquets à partir d’outils. La poudrière peut être améliorée en arsenal pourvu qu’Adam Smith ait rejoint le Congrès continental.\n\nAprès sa construction la production de mousquets augmente de 100%.
 model.building.newspaper.name=Journal
 model.building.newspaper.description=Le journal, que l’on peut construire après une imprimerie dès que la population atteint 4, augmente la production de cloches de la Liberté.
 model.building.printingPress.name=Imprimerie
 model.building.printingPress.description=L’imprimerie, qui peut être améliorée en journal dès que la population atteint 4, augmente la production de cloches de la Liberté.
 model.building.rumDistillery.name=Distillerie
-model.building.rumDistillery.description=La distillerie sert à produire du rhum à partir du sucre de canne. Une fois qu’Adam Smith a rejoint le congrès et que la colonie a atteint une population de 8, la distillerie peut être remplacée par une usine de spiritueux.\n\nUne distillerie augmente la production de rhum.
-model.building.rumFactory.name=Usine de spiritueux
-model.building.rumFactory.description=L’usine de spiritueux, qui ne peut être améliorée, sert à produire du rhum à partir du sucre de canne.\n\nUne usine de spiritueux augmente la production de rhum.
+model.building.rumDistillery.description=La distillerie sert à produire du rhum à partir du sucre de canne. Une fois qu’Adam Smith a rejoint le Congrès continental et que la colonie a atteint une population de 8, la distillerie peut être remplacée par une rhumerie.\n\nUne distillerie augmente la production de rhum.
+model.building.rumFactory.name=Rhumerie
+model.building.rumFactory.description=La rhumerie, qui ne peut être améliorée, sert à produire du rhum à partir du sucre de canne.\n\nUne rhumerie augmente la production de rhum.
 model.building.schoolhouse.name=École
-model.building.schoolhouse.description=Une colonie avec une population de 4 peut construire une école, ce qui permet aux maîtres-artisans d’enseigner leur métier à un colon sans compétences particulières. Dès que la population a atteint 8, l’école peut être améliorée en collège dans lequel d’autres métiers peuvent être enseignés (par deux colons). Une fois que la population atteint 10, le collège peut être remplacé par une université dans laquelle toutes les compétences peuvent être enseignées (par trois colons).\n\nUne école permet d’enseigner les compétences de niveau 1.
+model.building.schoolhouse.description=Une colonie avec une population de 4 peut construire une école, ce qui permet aux maîtres-artisans d’enseigner leur métier aux colons sans compétences particulières. Dès que la population a atteint 8, l’école peut être améliorée en collège dans lequel d’autres métiers peuvent être enseignés (par deux colons). Une fois que la population atteint 10, le collège peut être remplacé par une université dans laquelle toutes les compétences peuvent être enseignées (par trois colons).\n\nUne école permet d’enseigner les compétences de niveau 1.
 model.building.shipyard.name=Chantier naval
-model.building.shipyard.description=Le chantier naval permet de pêcher sur les cases adjacentes de la colonie et permet également la réparation et la construction de bateaux.
-model.building.stables.name=Écuries
-model.building.stables.description=Les écuries augmentent la production maximale de chevaux en réduisant la taille des troupeaux.
+model.building.shipyard.description=Le chantier naval permet de pêcher sur les cases de haute mer adjacentes à la colonie et permet également la réparation et la construction de bateaux.
+model.building.stables.name=Écurie
+model.building.stables.description=L’écurie augmente la production maximale de chevaux en réduisant la taille des troupeaux.
 model.building.stockade.name=Palissade
-model.building.stockade.description=La palissade, qui peut être construite dès que la population atteint 3 personnes, protège les colons des attaques. La palissade peut être améliorée en fort, qui donne une meilleure protection contre les bombardements des corsaires et unités navales ennemis sur les cases d’océan adjacentes. Le fort peut être remplacé par une forteresse dès que la population atteint 8 personnes.\n\nConstruire une palissade augmente la défense de 100%.
+model.building.stockade.description=La palissade, qui peut être construite dès que la population atteint 3, protège les colons des attaques. La palissade peut être améliorée en fort, qui donne une meilleure protection contre les bombardements des corsaires et unités navales ennemis depuis les cases d’océan adjacentes. Le fort peut être remplacé par une forteresse dès que la population atteint 8 personnes.\n\nConstruire une palissade augmente la défense de 100%.
 model.building.textileMill.name=Usine textile
 model.building.textileMill.description=L’usine textile améliore la production de tissu à partir de coton.
 model.building.tobacconistHouse.name=Maison du planteur
-model.building.tobacconistHouse.description=La maison du planteur, qui peut être améliorée en atelier de cigares, sert à produire des cigares à partir de tabac. Lorsque la colonie atteint une population de 8, elle peut être améliorée en usine à cigares, pourvu qu’Adam Smith ait rejoint le congrès continental.\n\nAutomatiquement construit lors de la fondation d’une nouvelle colonie.
+model.building.tobacconistHouse.description=La maison du planteur, qui peut être améliorée en atelier de cigares, sert à produire des cigares à partir de tabac. Lorsque la colonie atteint une population de 8, elle peut être améliorée en cigarerie, pourvu qu’Adam Smith ait rejoint le Congrès continental.\n\nAutomatiquement construit lors de la fondation d’une nouvelle colonie.
 model.building.tobacconistShop.name=Atelier de cigares
-model.building.tobacconistShop.description=L’atelier de cigares sert à produire des cigares à partir de tabac. Lorsque la colonie atteint une population de 8, il peut être améliorée en usine à cigares, pourvu qu’Adam Smith ait rejoint le congrès continental.\n\nUn atelier de cigares augmente la production de cigares.
+model.building.tobacconistShop.description=L’atelier de cigares sert à produire des cigares à partir de tabac. Lorsque la colonie atteint une population de 8, il peut être amélioré en cigarerie, pourvu qu’Adam Smith ait rejoint le Congrès continental.\n\nUn atelier de cigares augmente la production de cigares.
 model.building.townHall.name=Hôtel de ville
-model.building.townHall.description=L’Hôtel de ville, qui ne peut pas être amélioré, peut contenir trois colons pour la production de cloches de la Liberté. Son effet peut-être augmenté par la construction d’une imprimerie et d’un journal.
+model.building.townHall.description=L’hôtel de ville, qui ne peut pas être amélioré, peut contenir trois colons pour la production de cloches de la Liberté. Son effet peut être augmenté par la construction d’une imprimerie et d’un journal.
 model.building.university.name=Université
-model.building.university.description=Une colonie avec une population de 4 peut construire une école, ce qui permet aux maîtres-artisans d’enseigner leur métier à un colon sans compétences particulières. Dès que la population a atteint 8, l’école peut être améliorée en collège dans lequel d’autres métiers peuvent être enseignés (par deux colons). Une fois que la population atteint 10, le collège peut être remplacé par une université dans laquelle toutes les compétences peuvent être enseignées (par trois colons).\n\nUne université permet d’enseigner les compétences de niveau 3.
+model.building.university.description=Une colonie avec une population de 4 peut construire une école, ce qui permet aux maîtres-artisans d’enseigner leur métier aux colons sans compétences particulières. Dès que la population a atteint 8, l’école peut être améliorée en collège dans lequel d’autres métiers peuvent être enseignés (par deux colons). Une fois que la population atteint 10, le collège peut être remplacé par une université dans laquelle toutes les compétences peuvent être enseignées (par trois colons).\n\nUne université permet d’enseigner les compétences de niveau 3.
 model.building.warehouse.name=Entrepôt
-model.building.warehouse.description=Un entrepôt peut stocker toutes sortes de produits. Il permet de conserver 200 unités de plus pour chaque sorte de produit et peut être amélioré avec une extension pour en stocker encore 100 de plus.
+model.building.warehouse.description=Un entrepôt peut stocker toutes sortes de marchandises. Il permet de conserver 200 unités de plus pour chaque marchandise et peut être amélioré avec une extension pour en stocker encore 100 de plus.
 model.building.warehouseExpansion.name=Extension d’entrepôt
-model.building.warehouseExpansion.description=Une extension d’entrepôt peut stocker toutes sortes de produits. Elle permet de conserver 300 unités de chaque sorte de produit.
+model.building.warehouseExpansion.description=Une extension d’entrepôt peut stocker toutes sortes de marchandises. Elle permet de conserver 300 unités de chaque marchandise.
 model.building.weaverHouse.name=Maison du tisserand
-model.building.weaverHouse.description=La maison du tisserand, qui peut être améliorée en filature, permet de transformer le coton en tissu. Elle peut être améliorée en filature lorsque la population de la colonie atteint 8 et lorsque Adam Smith a rejoint le congrès continental.
+model.building.weaverHouse.description=La maison du tisserand, qui peut être améliorée en filature, permet de transformer le coton en tissu. Elle peut être améliorée en filature lorsque la population de la colonie atteint 8 et lorsque Adam Smith a rejoint le Congrès continental.
 model.building.weaverShop.name=Filature
-model.building.weaverShop.description=La filature, qui peut être améliorée en usine textile, sert à transformer le coton en tissu. Elle peut être améliorée en usine textile lorsque la population de la colonie atteint au moins 8 et lorsque Adam Smith a rejoint le congrès continental. Elle permet d’améliorer la production de tissu.
+model.building.weaverShop.description=La filature, qui peut être améliorée en usine textile, sert à transformer le coton en tissu. Elle peut être améliorée en usine textile lorsque la population de la colonie atteint au moins 8 et lorsque Adam Smith a rejoint le Congrès continental. Elle permet d’améliorer la production de tissu.
 model.disaster.bankruptcy.name=Faillite
 model.disaster.blizzard.name=Blizzard
 model.disaster.brushfire.name=Feu de brousse
@@ -1370,27 +1380,27 @@ model.disaster.sandstorm.name=Tempête de sable
 model.disaster.stormsurge.name=Tsunami
 model.disaster.tornado.name=Tornade
 model.disaster.effect.damagedUnit.name=Dommages aux unités
-model.disaster.effect.damagedUnit=%unit% a été endommagé.
+model.disaster.effect.damagedUnit=%unit% a été endommagé(e).
 model.disaster.effect.lossOfBuilding.name=Perte de bâtiments
-model.disaster.effect.lossOfBuilding=%building% a été détruit.
+model.disaster.effect.lossOfBuilding=%building% a été détruit(e).
 model.disaster.effect.lossOfBuildingProduction.name=Perte de production de bâtiments
-model.disaster.effect.lossOfBuildingProduction=Des bâtiments ont été endommagés. Les pénalités de production s'appliquent.
+model.disaster.effect.lossOfBuildingProduction=Des bâtiments ont été endommagés. Les pénalités de production s’appliquent.
 model.disaster.effect.lossOfGoods.name=Perte de marchandises
-model.disaster.effect.lossOfGoods=%goods% ont été perdus.
-model.disaster.effect.lossOfMoney.name=Perte d'argent
-model.disaster.effect.lossOfMoney=%amount% d'or ont été perdus.
+model.disaster.effect.lossOfGoods=%goods% ont été perdu(e)s.
+model.disaster.effect.lossOfMoney.name=Perte d’or
+model.disaster.effect.lossOfMoney=%amount% d’or ont été perdus.
 model.disaster.effect.lossOfTileProduction.name=Perte de production de cases
-model.disaster.effect.lossOfTileProduction=Les champs et les forêts ont été endommagés. Les pénalités de production s'appliquent.
-model.disaster.effect.lossOfUnit.name=Perte d'unités
-model.disaster.effect.lossOfUnit=%unit% a été perdu.
+model.disaster.effect.lossOfTileProduction=Les champs et les forêts ont été endommagés. Les pénalités de production s’appliquent.
+model.disaster.effect.lossOfUnit.name=Perte d’unités
+model.disaster.effect.lossOfUnit=%unit% a été perdu(e).
 model.event.boycottsLifted.name=Les boycotts sont levés
-model.event.declareIndependence.name=Déclarer l'indépendance
+model.event.declareIndependence.name=Déclarer l’indépendance
 model.event.freeBuilding.name=Les bâtiments sont fournis gratuitement
 model.event.increaseSonsOfLiberty.name=Augmentation du sentiment de rébellion
 model.event.movementChange.name=Le mouvement est modifié
 model.event.newRecruits.name=Modification des recrues européennes
 model.event.resetBannedMissions.name=Les autochtones accepteront vos missionnaires de nouveau
-model.event.resetNativeAlarm.name=L’alarme chez les indigènes est supprimée
+model.event.resetNativeAlarm.name=L’inquiétude des indigènes est supprimée
 model.event.seeAllColonies.name=Toutes les colonies deviennent visibles
 model.event.spanishSuccession.name=Achèvement de la Guerre de Succession espagnole
 model.foundingFather.adamSmith.description=Active la construction d’usines.
@@ -1399,7 +1409,7 @@ model.foundingFather.jacobFugger.description=Tous les boycotts en cours prennent
 model.foundingFather.jacobFugger.text=Richissime négociant et banquier allemand, Jacob Fugger étendit son entreprise familiale jusqu’à la mer Adriatique. Il prêta même de l’argent aux empereurs Maximilien et Charles V.
 model.foundingFather.jacobFugger.birthAndDeath=1459-1525
 model.foundingFather.peterMinuit.description=Les Indiens ne demandent plus à être payés en échange de leurs terres.
-model.foundingFather.peterMinuit.text=Peter Minuit acheta aux indigènes, pour environ soixante florins hollandais seulement, ce qui devint plus tard l’île de Manhattan
+model.foundingFather.peterMinuit.text=Peter Minuit acheta aux indigènes, pour environ soixante florins hollandais seulement, ce qui devint plus tard l’île de Manhattan.
 model.foundingFather.peterStuyvesant.description=La construction de douanes devient possible.
 model.foundingFather.peterStuyvesant.text=Peter Stuyvesant fut le dernier gouverneur de Nouvelle-Hollande, avant que les anglais ne s’en emparent et rebaptisent la Nouvelle-Amsterdam en Nouvelle-York (New York).
 model.foundingFather.janDeWitt.name=Johan de Witt
@@ -1413,15 +1423,15 @@ model.foundingFather.franciscoDeCoronado.text=Francisco Vásquez de Coronado fut
 model.foundingFather.hernandoDeSoto.description=L’exploration d’éventuelles cités perdues ne donne jamais de résultat négatif, et toutes vos unités peuvent voir plus loin.
 model.foundingFather.hernandoDeSoto.text=Conquistador espagnol, Hernando de Soto fut le premier Européen à découvrir la Floride, ainsi que six autres actuels états du sud-est des États-Unis.
 model.foundingFather.henryHudson.description=Vos trappeurs ramènent deux fois plus de fourrures.
-model.foundingFather.henryHudson.text=Navigateur anglais, Henry Hudson explora une grande partie des côtes du nord-est américain. Son premier objectif était de découvrir une route maritime vers l’Asie en passant par le pôle Nord.
+model.foundingFather.henryHudson.text=Navigateur anglais, Henry Hudson explora une grande partie des côtes du nord-est américain. Son premier objectif était de découvrir une route maritime vers l’Asie en passant par le passage du Nord-Ouest.
 model.foundingFather.laSalle.name=Robert La Salle
 model.foundingFather.laSalle.description=Toutes vos colonies, existantes et futures, acquièrent une palissade dès qu’elles comptent trois habitants.
-model.foundingFather.laSalle.text=René Robert Cavalier de La Salle découvrit l’Ohio et descendit le Mississipi jusqu’au golfe du Mexique, pour conquérir et fonder la Louisiane en l’honneur du Roi de France. Durant ses expéditions, il établit de nombreux forts tels que le fort Frontenac sur le lac Ontario, ou encore le fort Saint-Louis dans l’actuel Texas.
+model.foundingFather.laSalle.text=René-Robert Cavelier de La Salle découvrit l’Ohio et descendit le Mississippi jusqu’au golfe du Mexique, pour conquérir et fonder la Louisiane en l’honneur du Roi de France. Durant ses expéditions, il établit de nombreux forts tels que le fort Frontenac sur le lac Ontario, ou encore le fort Saint-Louis dans l’actuel Texas.
 model.foundingFather.hernanCortes.name=Hernán Cortés
-model.foundingFather.hernanCortes.description=La conquête des camps indigènes se solde toujours par un trésor abondant que les galions du Roi transporteront gracieusement jusqu’en Europe.
-model.foundingFather.hernanCortes.text=Le célèbre conquistador espagnol Hernán Cortés Monroy Pissaro Altamirano vainquit l’empire aztèque et en pilla les richesses et sanctuaires.
+model.foundingFather.hernanCortes.description=La conquête des agglomérations indigènes se solde toujours par un trésor abondant que les galions du Roi transporteront gracieusement jusqu’en Europe.
+model.foundingFather.hernanCortes.text=Le célèbre conquistador espagnol Fernando Cortés de Monroy Pizarro Altamirano vainquit l’empire aztèque et en pilla les richesses et sanctuaires.
 model.foundingFather.georgeWashington.description=Les soldats et dragons qui gagnent un combat montent automatiquement en grade quand c’est possible.
-model.foundingFather.georgeWashington.text=Le Général George Washington dirigea l’Armée continentale pendant la guerre d’indépendance des États-Unis d’Amérique. Sa victoire contre les britanniques et son charisme le menèrent à être nommé premier président de la nouvelle nation.
+model.foundingFather.georgeWashington.text=Le Général George Washington dirigea l’Armée continentale pendant la guerre d’indépendance des États-Unis d’Amérique. Sa victoire contre les Britanniques et son charisme le menèrent à être nommé premier président de la nouvelle nation.
 model.foundingFather.paulRevere.description=Quand une colonie sans défense est attaquée, un colon prend automatiquement les armes (s’il y en a en réserve) et défend sa patrie avec bravoure.
 model.foundingFather.paulRevere.text=Paul Revere était un simple artisan américain quand il partit à cheval prévenir les fermiers de Lexington de l’arrivée des soldats britanniques. Il fut capturé et libéré plus tard alors que les Britanniques devaient battre en retraite le plus rapidement possible après leur défaite.
 model.foundingFather.francisDrake.description=La puissance de feu de tous vos navires corsaires augmente de moitié.
@@ -1433,13 +1443,13 @@ model.foundingFather.thomasJefferson.text=Grand homme d’État, Thomas Jefferso
 model.foundingFather.pocahontas.description=Toutes les tensions avec les indigènes sont apaisées, et ceux-ci s’inquiètent désormais deux fois moins vite.
 model.foundingFather.pocahontas.text=Médiatrice entre les pionniers de Jamestown et les indigènes amérindiens, Pocahontas est notamment connue pour avoir fait porter des vivres aux colons affamés pendant les périodes difficiles. Elle s’est convertie plus tard au christianisme et épousa un colon anglais.
 model.foundingFather.thomasPaine.description=Les cloches de la Liberté résonnent de plus en plus dans vos colonies, proportionnellement au taux d’imposition.
-model.foundingFather.thomasPaine.text=L’écrivain anglais Thomais Paine émigra aux États-Unis et prit parti pour les insurgés. Son pamphlet « le Sens commun » guida la pensée des patriotes de toutes les colonies.
+model.foundingFather.thomasPaine.text=L’écrivain anglais Thomas Paine émigra aux États-Unis et prit parti pour les insurgés. Son pamphlet « le Sens commun » guida la pensée des patriotes de toutes les colonies.
 model.foundingFather.simonBolivar.name=Simón Bolívar
-model.foundingFather.simonBolivar.description=La proportion d’indépendantistes augmente de 20 % dans chacune de vos colonies.
+model.foundingFather.simonBolivar.description=La proportion d’indépendantistes (Fils de la Liberté) augmente de 20 % dans chacune de vos colonies.
 model.foundingFather.simonBolivar.text=Simón José Antonio de la Santísima Trinidad Bolívar y Palacios libéra la Nouvelle-Grenade de l’emprise espagnole. Il libéra également les colonies voisines et devint ainsi le premier président de la Fédération de Grande-Colombie.
 model.foundingFather.benjaminFranklin.description=Les déclarations de guerre royales n’affectent plus vos relations dans le Nouveau Monde. Les colons européens du Nouveau Monde offrent désormais toujours la paix lors de négociations.
 model.foundingFather.benjaminFranklin.text=En contribuant à la rédaction de la Déclaration d’indépendance des États-Unis, Benjamin Franklin était une des voix de la Révolution américaine. Il voyagea beaucoup entre l’Europe et les colonies afin de s’assurer le soutien des Français dans la Guerre d’indépendance.
-model.foundingFather.williamBrewster.description=Les criminels et serviteurs ne viennent plus sur les docks, et vous pouvez choisir quel émigrant se présentera sur les docks.
+model.foundingFather.williamBrewster.description=Les criminels et serviteurs ne viennent plus sur les quais, et vous pouvez choisir quel émigrant se présentera sur les quais.
 model.foundingFather.williamBrewster.text=William Brewster était un père supérieur puritain qui organisa la colonisation de Plymouth en Nouvelle-Angleterre.
 model.foundingFather.williamPenn.description=Le nombre de croix dans vos colonies augmente plus vite de moitié.
 model.foundingFather.williamPenn.text=William Penn fonda et gouverna ce qui devint plus tard la Pennsylvanie, pour pouvoir y pratiquer sa religion en toute liberté. La colonie quaker (protestante) prospéra tant et si bien que Philadelphie devint la première capitale des États-Unis des décennies plus tard.
@@ -1447,8 +1457,8 @@ model.foundingFather.fatherJeanDeBrebeuf.name=Jean de Brébeuf
 model.foundingFather.fatherJeanDeBrebeuf.description=Tous les missionnaires sont des experts.
 model.foundingFather.fatherJeanDeBrebeuf.text=Ce missionnaire jésuite sympathisa avec les Indiens hurons et en convertit un certain nombre au christianisme. Il fut capturé et tué par les Iroquois dans une bataille qu’ils gagnèrent contre les Hurons.
 model.foundingFather.juanDeSepulveda.name=Juan de Sepúlveda
-model.foundingFather.juanDeSepulveda.description=Augmente de 20 % la chance que la population des camps indigènes « se convertisse » et joigne vos colonies.
-model.foundingFather.juanDeSepulveda.text=Juan Ginés de Sepúlveda était un théologien espagnol et fervent défenseur du droit pour l’Espagne à conquérir, coloniser et évangéliser le Nouveau Monde.
+model.foundingFather.juanDeSepulveda.description=Augmente de 20 % la chance que la population des agglomérations indigènes « se convertisse » et joigne vos colonies.
+model.foundingFather.juanDeSepulveda.text=Juan Ginés de Sepúlveda était un théologien espagnol et fervent défenseur du droit de l’Espagne à conquérir, coloniser et évangéliser le Nouveau Monde.
 model.foundingFather.bartolomeDeLasCasas.name=Bartolomé de Las Casas
 model.foundingFather.bartolomeDeLasCasas.description=Tous les Indiens convertis deviennent des colons libres.
 model.foundingFather.bartolomeDeLasCasas.text=Prêtre dominicain qui voyagea à travers les colonies espagnoles, convertissant les Indiens et châtiant les Espagnols pour leurs mauvais traitements envers les indigènes souvent massacrés ou réduits en esclavage.
@@ -1459,83 +1469,83 @@ model.foundingFather.political=Politique
 model.foundingFather.religious=Religieux
 model.goods.bells.name={{plural:%amount%|one=cloche|other=cloches|default=cloches}}
 model.goods.bells.description=Les cloches de la Liberté représentent le désir d’indépendance des colons.
-model.goods.bells.workAs=Travailler comme homme d'état %claim%(%amount% Cloches)
+model.goods.bells.workAs=Travailler comme homme d’État %claim% (%amount% cloches)
 model.goods.bells.workingAs=un homme d’État
 model.goods.cigars.name={{plural:%amount%|one=cigare|other=cigares|default=cigares}}
 model.goods.cigars.description=Les cigares sont fabriqués à partir du tabac. Ce sont des marchandises de luxe, donc leur prix est très élevé.
-model.goods.cigars.workAs=Travailler comme marchand de tabac %claim%(%amount% cigares)
+model.goods.cigars.workAs=Travailler comme marchand de tabac %claim% (%amount% cigares)
 model.goods.cigars.workingAs=un marchand de tabac
 model.goods.cloth.name={{plural:%amount%|one=tissu|other=tissus|default=tissus}}
 model.goods.cloth.description=Le tissu est fabriqué à partir du coton.
-model.goods.cloth.workAs=Travailler comme tisserand %claim%(%amount% vêtements)
+model.goods.cloth.workAs=Travailler comme tisserand %claim% (%amount% tissus)
 model.goods.cloth.workingAs=un tisserand
-model.goods.coats.name={{plural:%amount%|one=manteau|other=manteaux|default=manteaux}}
+model.goods.coats.name={{plural:%amount%|one=pelisse|other=pelisses|default=pelisses}}
 model.goods.coats.description=Les pelisses sont fabriquées à partir des fourrures d’animaux.
-model.goods.coats.workAs=Travailler comme marchand de fourrures %claim%(%amount% Vestes)
+model.goods.coats.workAs=Travailler comme marchand de fourrures %claim% (%amount% pelisses)
 model.goods.coats.workingAs=un fourreur
 model.goods.cotton.name={{plural:%amount%|one=coton|other=coton|default=coton}}
 model.goods.cotton.description=Le coton peut être utilisé pour produire des tissus, qui sont vendus à prix plus élevés.
-model.goods.cotton.workAs=Travailler comme planteur de coton %claim%(%amount% coton)
+model.goods.cotton.workAs=Travailler comme planteur de coton %claim% (%amount% coton)
 model.goods.cotton.workingAs=un planteur de coton
 model.goods.crosses.name={{plural:%amount%|one=croix|other=croix|default=croix}}
 model.goods.crosses.description=Les croix représentent les troubles religieux en Europe et la liberté religieuse du Nouveau Monde.
-model.goods.crosses.workAs=Travailler comme prédicateur %claim%(%amount% Croix)
+model.goods.crosses.workAs=Travailler comme prédicateur %claim% (%amount% Croix)
 model.goods.crosses.workingAs=un prédicateur
-model.goods.fish.name={{plural:%amount%|one=poisson|other=poissons|default=poisson}}
+model.goods.fish.name={{plural:%amount%|one=poisson|other=poissons|default=poissons}}
 model.goods.fish.description=Les poissons sont vidés, salés et transformés en nourriture aussitôt qu’ils sont pêchés.
-model.goods.fish.workAs=Travailler comme pêcheur %claim%(%amount% poisson)
+model.goods.fish.workAs=Travailler comme pêcheur %claim% (%amount% poissons)
 model.goods.fish.workingAs=un pêcheur
 model.goods.food.name={{plural:%amount%|one=nourriture|other=nourriture|default=nourriture}}
 model.goods.food.description=La nourriture est nécessaire pour nourrir vos colons et vos chevaux. Un nouveau colon naît quand une colonie a 200 unités de nourriture ou plus.
-model.goods.food.workAs=Travailler comme fermier %claim%(%amount% nourriture)
+model.goods.food.workAs=Travailler comme fermier %claim% (%amount% nourriture)
 model.goods.food.workingAs=un fermier
-model.goods.furs.name={{plural:%amount%|one=fourrure|other=fourrures|default=fourrure}}
-model.goods.furs.description=Les fourrures d’animaux sont ramenées de la chasse. Elles peuvent être utilisées pour fabriquer des manteaux.
-model.goods.furs.workAs=Travailler comme trappeur %claim%(%amount% fourrures)
+model.goods.furs.name={{plural:%amount%|one=fourrure|other=fourrures|default=fourrures}}
+model.goods.furs.description=Les fourrures d’animaux sont ramenées de la chasse. Elles peuvent être utilisées pour fabriquer des pelisses.
+model.goods.furs.workAs=Travailler comme trappeur %claim% (%amount% fourrures)
 model.goods.furs.workingAs=un trappeur
 model.goods.grain.name={{plural:%amount%|one=céréales|other=céréales|default=céréales}}
 model.goods.grain.description=Les céréales, telles que le blé, le riz et le maïs, sont la source la plus importante de nourriture pour vos colonies.
-model.goods.grain.workAs=Travailler comme cultivateur %claim%(%amount% céréales)
-model.goods.grain.workingAs=un Fermier
+model.goods.grain.workAs=Travailler comme cultivateur %claim% (%amount% céréales)
+model.goods.grain.workingAs=un fermier
 model.goods.hammers.name={{plural:%amount%|one=marteau|other=marteaux|default=marteaux}}
 model.goods.hammers.description=Les marteaux représentent le travail de construction en cours dans vos colonies.
-model.goods.hammers.workAs=Travailler comme charpentier %claim%(%amount% Marteaux)
+model.goods.hammers.workAs=Travailler comme charpentier %claim% (%amount% marteaux)
 model.goods.hammers.workingAs=un charpentier
 model.goods.lumber.name={{plural:%amount%|one=bois de charpente|other=bois de charpente|default=bois de charpente}}
-model.goods.lumber.description=Le bois de charpente est coupé en forêt. Il peut être utilisé pour construire certains bâtiments, ou certaines unités comme les bateaux.
-model.goods.lumber.workAs=Travailler comme bûcheron %claim%(%amount% bois)
+model.goods.lumber.description=Le bois de charpente est coupé en forêt. Il peut être utilisé pour construire certains bâtiments ou certaines unités comme les bateaux.
+model.goods.lumber.workAs=Travailler comme bûcheron %claim% (%amount% bois)
 model.goods.lumber.workingAs=un bûcheron
 model.goods.meat.name={{plural:%amount%|one=viande|other=viande|default=viande}}
 model.goods.meat.description=La viande, telle que le bœuf, le porc et la venaison, est une source importante de protéines.
-model.goods.meat.workAs=Travailler comme chasseur %claim%(%amount% viande)
+model.goods.meat.workAs=Travailler comme chasseur %claim% (%amount% viande)
 model.goods.meat.workingAs=un chasseur
 model.goods.muskets.name={{plural:%amount%|one=mousquet|other=mousquets|default=mousquets}}
 model.goods.muskets.description=Les mousquets sont fabriqués à partir des outils. Ils peuvent être utilisés pour équiper des unités en infanterie ou cavalerie.
-model.goods.muskets.workAs=Travailler comme armurier %claim%(%amount% Mousquets)
+model.goods.muskets.workAs=Travailler comme armurier %claim% (%amount% mousquets)
 model.goods.muskets.workingAs=un armurier
 model.goods.ore.name={{plural:%amount%|one=minerai|other=minerai|default=minerai}}
 model.goods.ore.description=Le minerai peut-être utilisé pour fabriquer des outils, qui ont de nombreuses utilisations.
-model.goods.ore.workAs=Travailler comme mineur %claim%(%amount% minerai)
-model.goods.ore.workingAs=un mineur de minerai
+model.goods.ore.workAs=Travailler comme mineur %claim% (%amount% minerai)
+model.goods.ore.workingAs=un mineur
 model.goods.rum.name={{plural:%amount%|one=rhum|other=rhum|default=rhum}}
 model.goods.rum.description=Le rhum est un spiritueux fabriqué à partir de la canne à sucre. C’est une marchandise de luxe, donc son prix est très élevé.
-model.goods.rum.workAs=Travailler comme fabricant d'alcool %claim%(%amount% rhum)
+model.goods.rum.workAs=Travailler comme distillateur d’alcool %claim% (%amount% rhum)
 model.goods.rum.workingAs=un distillateur
 model.goods.silver.name={{plural:%amount%|one=argent|other=argent|default=argent}}
 model.goods.silver.description=L’argent est un métal précieux qui se vend au prix fort.
-model.goods.silver.workAs=Travailler comme mineur d’argent %claim%(%amount% argent)
+model.goods.silver.workAs=Travailler comme mineur d’argent %claim% (%amount% argent)
 model.goods.silver.workingAs=un mineur d’argent
 model.goods.sugar.name={{plural:%amount%|one=sucre|other=sucre|default=sucre}}
 model.goods.sugar.description=La canne à sucre est cultivée. Elle peut être utilisée pour fabriquer du rhum.
-model.goods.sugar.workAs=Travailler comme planteur de canne %claim%(%amount% sucre)
+model.goods.sugar.workAs=Travailler comme planteur de canne %claim% (%amount% sucre)
 model.goods.sugar.workingAs=un planteur de canne
 model.goods.tobacco.name={{plural:%amount%|one=tabac|other=tabac|default=tabac}}
 model.goods.tobacco.description=Le tabac peut être fumé ou utilisé pour produire des cigares, qui se vendent à prix plus élevés.
-model.goods.tobacco.workAs=Travailler comme planteur de tabac %claim%(%amount% tabac)
+model.goods.tobacco.workAs=Travailler comme planteur de tabac %claim% (%amount% tabac)
 model.goods.tobacco.workingAs=un planteur de tabac
 model.goods.tools.name={{plural:%amount%|one=outil|other=outils|default=outils}}
 model.goods.tools.description=Les outils sont fabriqués à partir du minerai. Ils peuvent être utilisés pour équiper une unité en pionnier, mais aussi pour construire des bâtiments et certaines unités comme les bateaux. Enfin ils peuvent être utilisés pour fabriquer des mousquets.
-model.goods.tools.workAs=Travailler comme forgeron %claim%(%amount% Outils)
+model.goods.tools.workAs=Travailler comme forgeron %claim% (%amount% outils)
 model.goods.tools.workingAs=un forgeron
 model.goods.horses.name={{plural:%amount%|one=cheval|other=chevaux|default=chevaux}}
 model.goods.horses.description=Les chevaux sont utilisés pour créer des éclaireurs et des unités de dragons.
@@ -1559,89 +1569,90 @@ model.improvement.road.description=Route
 model.improvement.road.name=Route
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limite de colonies côtières
-# Fuzzy
-model.limit.independence.coastalColonies.description=Vous devez disposer d’au moins %limit% colonies côtières pour déclarer votre indépendance.
+model.limit.independence.coastalColonies.description=Vous devez disposer d’au moins %limit% {{plural:%limit%|one=colonie côtière|other=colonies côtières}} pour déclarer votre indépendance.
 model.limit.independence.rebels.name=Limite de rebelles
 model.limit.independence.rebels.description=Au moins %limit%% de vos colons doivent soutenir l’indépendance.
-model.limit.independence.year.name=Année Limite
+model.limit.independence.year.name=Année limite
 model.limit.independence.year.description=Vous devez déclarer l’indépendance avant la fin de %limit%.
 model.limit.wagonTrains.name=Limite de chariots
 model.limit.wagonTrains.description=Le nombre de vos chariots ne doit pas dépasser celui de vos colonies.
-model.nation.apache.name=Apaches
-model.nation.apache.ruler=Geronimo
-model.nation.arawak.name=Arawaks
+model.nation.apache.name={{tag:|country=les Apaches|people=Apaches|fem=apache|plur=apaches|femplur=apaches|default=apache}}
+model.nation.apache.ruler=Géronimo
+model.nation.arawak.name={{tag:|country=les Arawaks|people=Arawaks|fem=arawak|plur=arawaks|femplur=arawaks|default=arawak}}
 model.nation.arawak.ruler=Tamanaco
-model.nation.aztec.name=Aztèques
-model.nation.aztec.ruler=Moctezuma II
-model.nation.cherokee.name=Chérokîs
+model.nation.aztec.name={{tag:|country=les Aztèques|people=Aztèques|fem=aztèque|plur=aztèques|femplur=aztèques|default=aztèque}}
+model.nation.aztec.ruler=Moctézuma II
+model.nation.cherokee.name={{tag:|country=les Chérokîs|people=Chérokîs|fem=chérokîe|plur=chérokîs|femplur=chérokîes|default=chérokî}}
 model.nation.cherokee.ruler=Moytoy
-model.nation.inca.name=Incas
+model.nation.inca.name={{tag:|country=les Incas|people=Incas|fem=inca|plur=incas|femplur=incas|default=inca}}
 model.nation.inca.ruler=Atahualpa
-model.nation.iroquois.name=Iroquois
-model.nation.iroquois.ruler=Segoyewatha
-model.nation.sioux.name=Sioux
-model.nation.sioux.ruler=Taoyateduta
-model.nation.tupi.name=Tupis
-model.nation.tupi.ruler=Guaira
-model.nation.unknownEnemy.name=Ennemi
+model.nation.iroquois.name={{tag:|country=les Iroquois|people=Iroquois|fem=iroquoise|plur=iroquois|femplur=iroquoises|default=iroquois}}
+model.nation.iroquois.ruler=Ségoyéwatha
+model.nation.sioux.name={{tag:|country=les Sioux|people=Sioux|fem=sioux|plur=sioux|femplur=sioux|default=sioux}}
+model.nation.sioux.ruler=Taoyaté Duta
+model.nation.tupi.name={{tag:|country=les Tupis|people=Tupis|fem=tupie|plur=tupis|femplur=tupies|default=tupi}}
+model.nation.tupi.ruler=Guaïra
+model.nation.unknownEnemy.name={{tag:|country=l’Ennemi|people=Ennemis|fem=ennemie|plur=ennemis|femplur=ennemies|default=ennemi}}
+model.nation.unknownEnemy.ruler=Inconnu
 model.nation.danish.europe=Copenhague
-model.nation.danish.name={{tag:|country=Danemark|people=Danois|default=danois}}
+model.nation.danish.name={{tag:|country=le Danemark|people=Danois|fem=danoise|plur=danois|femplur=danoises|default=danois}}
 model.nation.danish.newLandName=Nouveau-Danemark
 model.nation.danish.ruler=Frédéric II
 model.nation.danishREF.name=Corps expéditionnaire royal danois
 model.nation.danishREF.ruler=Frédéric III
 model.nation.dutch.europe=Amsterdam
-model.nation.dutch.name={{tag:|country=Pays-Bas|people=Hollandais|default=hollandais}}
+model.nation.dutch.name={{tag:|country=les Pays-Bas|people=Hollandais|fem=hollandaise|plur=hollandais|femplur=hollandaises|default=hollandais}}
 model.nation.dutch.newLandName=Nouvelle-Hollande
 model.nation.dutch.ruler=Guillaume Ier
 model.nation.dutchREF.name=Corps expéditionnaire royal hollandais
 model.nation.dutchREF.ruler=Guillaume II
 model.nation.english.europe=Londres
-model.nation.english.name={{tag:|country=Angleterre|people=Anglais|default=anglais}}
+model.nation.english.name={{tag:|country=l’Angleterre|people=Anglais|fem=anglaise|plur=anglais|femplur=anglaises|default=anglais}}
 model.nation.english.newLandName=Nouvelle-Angleterre
-model.nation.english.ruler=Élizabeth Ier
+model.nation.english.ruler=Élizabeth Iere
 model.nation.englishREF.name=Corps expéditionnaire royal anglais
 model.nation.englishREF.ruler=George III
 model.nation.french.europe=La Rochelle
-model.nation.french.name={{tag:|country=France|people=Français|default=français}}
+model.nation.french.name={{tag:|country=la France|people=Français|fem=française|plur=français|femplur=françaises|default=français}}
 model.nation.french.newLandName=Nouvelle-France
 model.nation.french.ruler=Louis XIV
 model.nation.frenchREF.name=Corps expéditionnaire royal français
 model.nation.frenchREF.ruler=Louis XV
 model.nation.portuguese.europe=Lisbonne
-model.nation.portuguese.name={{tag:|country=Portugal|people=Portugais|default=portugais}}
+model.nation.portuguese.name={{tag:|country=le Portugal|people=Portugais|fem=portugaise|plur=portugais|femplur=portugaises|default=portugais}}
 model.nation.portuguese.newLandName=Terre de la Sainte-Croix
 model.nation.portuguese.ruler=Manuel Ier d'Aviz
 model.nation.portugueseREF.name=Corps expéditionnaire royal portugais
 model.nation.portugueseREF.ruler=Jean IV
 model.nation.russian.europe=Mourmansk
-model.nation.russian.name={{tag:|country=Russie|people=Russes|default=russe}}
+model.nation.russian.name={{tag:|country=la Russie|people=Russes|fem=russe|plur=russes|femplur=russes|default=russe}}
 model.nation.russian.newLandName=Nouvelle-Russie
 model.nation.russian.ruler=Pierre Ier
 model.nation.russianREF.name=Corps expéditionnaire royal russe
 model.nation.russianREF.ruler=Catherine Ier
 model.nation.spanish.europe=Cadix
-model.nation.spanish.name={{tag:|country=Espagne|people=Espagnols|default=espagnol}}
+model.nation.spanish.name={{tag:|country=Espagne|people=Espagnols|fem=espagnole|plur=espagnols|femplur=espagnoles|default=espagnol}}
 model.nation.spanish.newLandName=Nouvelle-Espagne
 model.nation.spanish.ruler=Philippe II
 model.nation.spanishREF.name=Corps expéditionnaire royal espagnol
 model.nation.spanishREF.ruler=Philippe III
 model.nation.swedish.europe=Stockholm
-model.nation.swedish.name={{tag:|country=Suède|people=Suédois|default=suédois}}
+model.nation.swedish.name={{tag:|country=la Suède|people=Suédois|fem=suédoise|plur=suédois|femplur=suédoises|default=suédois}}
 model.nation.swedish.newLandName=Nouvelle-Suède
+model.nation.swedish.ruler=Charles XI
 model.nation.swedishREF.name=Corps expéditionnaire royal suédois
 model.nationType.agriculture.name=Agriculture
 model.nationType.agriculture.shortDescription=Produit plus de nourriture
-model.nationType.apache.name=Apache
+model.nationType.apache.name=Apaches
 model.nationType.apache.description=La nation Apache
-model.nationType.arawak.name=Arawak
+model.nationType.arawak.name=Arawaks
 model.nationType.arawak.description=La nation Arawak
 model.nationType.aztec.name=Aztèques
 model.nationType.aztec.description=La nation Aztèque
 model.nationType.building.name=Construction
 model.nationType.building.shortDescription=Produit davantage de matériaux de construction
-model.nationType.cherokee.name=Cherokees
-model.nationType.cherokee.description=La Nation Cherokee
+model.nationType.cherokee.name=Chérokîs
+model.nationType.cherokee.description=La nation Chérokîe
 model.nationType.conquest.name=Conquête
 model.nationType.conquest.shortDescription=Plus de chances de convertir les indigènes
 model.nationType.cooperation.name=Coopération
@@ -1652,7 +1663,7 @@ model.nationType.furTrapping.name=Piégeage
 model.nationType.furTrapping.shortDescription=Produit plus de fourrure et de pelisses
 model.nationType.immigration.name=Immigration
 model.nationType.immigration.shortDescription=Produit un grand nombre d’immigrants
-model.nationType.inca.name=Inca
+model.nationType.inca.name=Incas
 model.nationType.inca.description=La nation Inca
 model.nationType.iroquois.name=Iroquois
 model.nationType.iroquois.description=La nation Iroquoise
@@ -1665,7 +1676,7 @@ model.nationType.sioux.description=La nation Sioux
 model.nationType.trade.name=Commerce
 model.nationType.trade.shortDescription=Les prix sont plus avantageux
 model.nationType.tupi.name=Tupis
-model.nationType.tupi.description=La nation Tupi
+model.nationType.tupi.description=La nation Tupie
 model.resource.cotton.name=Coton
 model.resource.cotton.description=Le sol de cette prairie est particulièrement adapté à la culture du coton.
 model.resource.fish.name=Poisson
@@ -1677,7 +1688,7 @@ model.resource.game.description=La forêt est le repaire de nombreux animaux sus
 model.resource.grain.name=Céréales
 model.resource.grain.description=Les récoltes poussent exceptionnellement bien dans cette plaine fertile.
 model.resource.lumber.name=Bois
-model.resource.lumber.description=Cette forêt a des bons arbres, bien droits, idéaux pour en faire du bois d’œuvre.
+model.resource.lumber.description=Cette forêt a de bons arbres, bien droits, idéaux pour le bois d’œuvre.
 model.resource.minerals.name=Gisement
 model.resource.minerals.description=Le terrain est riche en minéraux. Les plus patients y trouveront du minerai et même de l’argent.
 model.resource.oasis.name=Oasis
@@ -1713,7 +1724,7 @@ model.role.change.missionary=Engager comme missionnaire
 model.role.change.pioneer=Équiper avec des outils
 model.role.change.scout=Équiper comme un éclaireur
 model.role.change.default.soldier=Armer
-model.role.change.dragoon.default=Enlever tout les équipements
+model.role.change.dragoon.default=Enlever tout l’équipement
 model.role.change.dragoon.soldier=Démonter
 model.role.change.missionary.default=Annuler le statut de missionnaire
 model.role.change.missionary.soldier=Armer
@@ -1727,7 +1738,7 @@ model.settlement.aztec.name=Ville aztèque
 model.settlement.aztec.plural=villes
 model.settlement.camp.capital.name=Campement
 model.settlement.camp.name=Campement
-model.settlement.camp.plural=camps
+model.settlement.camp.plural=campements
 model.settlement.colony.capital.name=Colonie
 model.settlement.colony.name=Colonie
 model.settlement.colony.plural=colonies
@@ -1753,37 +1764,37 @@ model.tile.greatRiver.name=Fleuve
 model.tile.greatRiver.description=Les fleuves sont navigables, à la différence des simples rivières.
 model.tile.highSeas.name=Haute mer
 model.tile.highSeas.description=La haute mer regorge de poisson. Elle permet aussi de rejoindre l’Europe.
-model.tile.hills.name=Colline
+model.tile.hills.name=Collines
 model.tile.hills.description=Les collines s’étendent parfois sur des zones continues mais toujours limitées. Les collines produisent généralement beaucoup de minerai, mais aussi un peu de céréales.
 model.tile.lake.name=Lac
 model.tile.lake.description=Les lacs sont des étendues d’eau à l’intérieur des terres. Les colonies construites sur leurs rives profitent de leurs ressources naturelles, mais peuvent être inaccessibles par navire.
-model.tile.marsh.name=Tourbière
-model.tile.marsh.description=Les tourbières sont des terres très humides qui foisonnent d’herbes, de joncs, de roseaux et de nombreuses autres plantes herbacées poussant même dans des eaux peu profondes. Les tourbières produisent des céréales et du tabac, ainsi que du minerai d’argent. Elles se trouvent sous les hautes latitudes.
+model.tile.marsh.name=Marécage
+model.tile.marsh.description=Les marécages sont des terres très humides qui foisonnent d’herbes, de joncs, de roseaux et de nombreuses autres plantes herbacées poussant même dans des eaux peu profondes. Les marécages produisent des céréales et du tabac, ainsi que du minerai d’argent. Ils se trouvent sous les hautes latitudes.
 model.tile.mixedForest.name=Forêt mixte
 model.tile.mixedForest.description=Les forêts mixtes produisent des céréales, du bois, des fourrures et du coton. Elles se trouvent sous les latitudes tempérées et peuvent être rasées pour laisser place à des plaines.
-model.tile.mountains.name=Montagne
-model.tile.mountains.description=Les montagnes s’étendent souvent sur des zones continues mais toujours limitées. Elles sont plus difficiles à traverser que les collines et ne permettent pas d’y fonder une colonie. Elles fournissent un important bonus défensif mais les fortifications ne l’augmentent pas. Elles font généralement le bonheur des mineurs, même pour le minerai d’argent.
-model.tile.ocean.name=Mer côtière
-model.tile.ocean.description=Les mers côtières sont de grandes étendues d’eau salée, idéales pour la pêche. La densité des bancs de poissons est plus forte près des côtes, et plus spécialement près de l’embouchure des fleuves.
-model.tile.plains.name=Plaine
+model.tile.mountains.name=Montagnes
+model.tile.mountains.description=Les montagnes s’étendent souvent sur des zones continues mais toujours limitées. Elles sont plus difficiles à traverser que les collines et ne permettent pas d’y fonder une colonie. Elles fournissent un important bonus défensif mais les fortifications ne l’augmentent pas. Elles font généralement le bonheur des mineurs de minerai et d’argent.
+model.tile.ocean.name=Océan
+model.tile.ocean.description=Les océans sont de grandes étendues d’eau salée, idéales pour la pêche. La densité des bancs de poissons est plus forte près des côtes, et plus spécialement près de l’embouchure des fleuves.
+model.tile.plains.name=Plaines
 model.tile.plains.description=Les plaines sont de grandes étendues de terres avec peu de relief, très adaptées aux cultures. Elles produisent une grande quantité de céréales, un peu moins de coton et un peu de minerai. Elles se trouvent sous les latitudes tempérées.
 model.tile.prairie.name=Prairie
 model.tile.prairie.description=Les prairies sont idéales pour la culture des céréales et du coton. Elles se trouvent sous les latitudes tempérées.
-model.tile.rainForest.name=Mangrove
-model.tile.rainForest.description=Les mangroves produisent des céréales, du bois, des fourrures et un peu de minerai, de sucre et de tabac. Elles se trouvent sous les latitudes tropicales et peuvent être rasées pour laisser place à des marais.
+model.tile.rainForest.name=Forêt équatoriale
+model.tile.rainForest.description=Les forêts équatoriales produisent des céréales, du bois, des fourrures et un peu de minerai, de sucre et de tabac. Elles se trouvent sous les latitudes tropicales et peuvent être rasées pour laisser place à des marais.
 model.tile.savannah.name=Savane
 model.tile.savannah.description=Les savanes sont des terres souvent à l’orée des forêts. Elles produisent des céréales et de la canne à sucre.
 model.tile.scrubForest.name=Forêt de broussailles
 model.tile.scrubForest.description=Les forêts de broussailles produisent des céréales, du bois, de la fourrure et un peu de coton et de minerai. Elles se trouvent sous les latitudes tempérées et peuvent être rasées pour laisser place à un désert.
 model.tile.swamp.name=Marais
-model.tile.swamp.description=Les marais sont des terres humides ou des eaux boueuses...Elles sont bien plus profondes que les tourbières. Les marais produisent des céréales et aussi un peu de canne à sucre, de tabac et de minerai. Ils se trouvent sous les latitudes tropicales.
+model.tile.swamp.description=Les marais sont des terres humides ou des eaux boueuses...Ils sont bien plus profonds que les marécages. Les marais produisent des céréales et aussi un peu de canne à sucre, de tabac et de minerai. Ils se trouvent sous les latitudes tropicales.
 model.tile.tropicalForest.name=Forêt tropicale
 model.tile.tropicalForest.description=Les forêts tropicales produisent des céréales, du bois, des fourrures et un peu de canne à sucre. Elles peuvent être rasées pour laisser placer à la savane.
 model.tile.tundra.name=Toundra
 model.tile.tundra.description=La toundra est une terre où la pousse des arbres est rendue difficile par les basses températures. Les toundras produisent des céréales et un peu de minerai. Elles se trouvent sous les hautes latitudes.
 model.tile.wetlandForest.name=Forêt humide
-model.tile.wetlandForest.description=Les forêts humides produisent des céréales, du bois, des fourrures et un peu de minerai. Elles se trouvent sous les hautes latitudes et peuvent être rasées pour laisser place à des tourbières.
-model.unit.colonialRegular.name={{plural:%number%|one=Fantassin colonial|other=Fantassins Coloniaux|default=Fantassin colonial}}
+model.tile.wetlandForest.description=Les forêts humides produisent des céréales, du bois, des fourrures et un peu de minerai. Elles se trouvent sous les hautes latitudes et peuvent être rasées pour laisser place à des marécages.
+model.unit.colonialRegular.name={{plural:%number%|one=Fantassin colonial|other=Fantassins coloniaux|default=Fantassin colonial}}
 model.unit.colonialRegular.description=Le fantassin colonial est une unité d’élite, seulement disponible après la déclaration d’indépendance.
 model.unit.elderStatesman.name={{plural:%number%|one=Vieux politicien|other=Vieux politiciens|default=Vieux politicien}}
 model.unit.elderStatesman.description=Le vieux politicien attise le désir d’indépendance des colons (symbolisé par les cloches de la Liberté), qui augmente le taux d’appartenance aux Fils de la Liberté dans vos colonies.
@@ -1795,37 +1806,37 @@ model.unit.expertFurTrapper.name={{plural:%number%|one=Expert trappeur|other=Exp
 model.unit.expertFurTrapper.description=L’expert trappeur est spécialisé dans le piégeage des animaux à fourrure et leur dépeçage.
 model.unit.expertLumberJack.name={{plural:%number%|one=Expert bûcheron|other=Experts bûcherons|default=Expert bûcheron}}
 model.unit.expertLumberJack.description=L’expert bûcheron est spécialisé dans la coupe de bois de charpente.
-model.unit.expertOreMiner.name={{plural:%number%|one=Expert mineur d'or|other=Experts mineurs d'or|default=Expert mineur d'or}}
+model.unit.expertOreMiner.name={{plural:%number%|one=Expert mineur|other=Experts mineurs|default=Expert mineur}}
 model.unit.expertOreMiner.description=L’expert mineur est spécialisé dans l’extraction de minerai.
 model.unit.expertSilverMiner.name={{plural:%number%|one=Expert mineur d'argent|other=Experts mineurs d'argent|default=Expert mineur d'argent}}
 model.unit.expertSilverMiner.description=L’expert mineur d’argent n’a pas son pareil pour flairer un filon de minerai d’argent.
 model.unit.firebrandPreacher.name={{plural:%number%|one=Prédicateur fervent|other=Prédicateurs fervents|default=Prédicateur fervent}}
 model.unit.firebrandPreacher.description=Le prédicateur fanatique augmente les troubles religieux en Europe (symbolisés par des croix), lesquels augmenteront à leur tour le nombre d’émigrants vers le Nouveau Monde.
 model.unit.freeColonist.name={{plural:%number%|one=Colon libre|other=Colons libres|default=Colon libre}}
-model.unit.freeColonist.description=Le colon libre est un blanc-bec sans savoir-faire particulier. Cependant, il peut acquérir un savoir-faire en travaillant dur à proximité d’une colonie, ou en visitant un campement indien. Il peut également être promu soldat vétéran, ou formé à un métier dans une colonie dotée d’une école.
-model.unit.hardyPioneer.name={{plural:%number%|one=Valeureux pionnier|other=Valeureux pionniers|default=Valeureux pionnier}}
+model.unit.freeColonist.description=Le colon libre est un blanc-bec sans savoir-faire particulier. Cependant, il peut acquérir un savoir-faire en travaillant dur à proximité d’une colonie, ou en visitant une agglomération indigène. Il peut également être promu soldat vétéran, ou formé à un métier dans une colonie dotée d’une école.
+model.unit.hardyPioneer.name=Valeureux {{plural:%number%|one=pionnier|other=pionniers|default=pionnier}}
 model.unit.hardyPioneer.description=Le valeureux pionnier excelle dans l’art de la déforestation, du labour et de la construction de route.
 model.unit.indenturedServant.name={{plural:%number%|one=Domestique contractuel|other=Domestiques contractuels|default=Domestique contractuel}}
 model.unit.indenturedServant.description=Le domestique contractuel apprécie de travailler au grand air, mais se morfond dès qu’il s’agit de travailler à l’intérieur. Avec un peu d’éducation, il peut devenir un colon libre.
 model.unit.indianConvert.name={{plural:%number%|one=Indien converti|other=Indiens convertis|default=Indien converti}}
-model.unit.indianConvert.description=L’Indien converti est un Indien d’Amérique qui a rejoint vos colonies. Il est doué pour n’importe quel type de travail, du moment que cela ne se fait pas entre quatre murs. Dès que Bartolome de las Casas rejoint le Congrès continental, tous les Indiens convertis deviennent des colons libres.
+model.unit.indianConvert.description=L’Indien converti est un indigène qui a rejoint vos colonies. Il est doué pour n’importe quel type de travail, du moment que cela ne se fasse pas entre quatre murs. Dès que Bartolome de las Casas rejoint le Congrès continental, tous les Indiens convertis deviennent des colons libres.
 model.unit.jesuitMissionary.name={{plural:%number%|one=Missionnaire jésuite|other=Missionnaires jésuites|default=Missionnaire jésuite}}
-model.unit.jesuitMissionary.description=Le missionnaire jésuite est capable d’établir une mission dans un campement indien. Il est très doué pour convertir les Indiens.
+model.unit.jesuitMissionary.description=Le missionnaire jésuite est capable d’établir une mission dans une agglomération indigène. Il est très doué pour convertir les Indiens.
 model.unit.masterBlacksmith.name={{plural:%number%|one=Maître forgeron|other=Maîtres forgerons|default=Maître forgeron}}
 model.unit.masterBlacksmith.description=Le maître forgeron est spécialisé dans la fabrication d’outils.
-model.unit.masterCarpenter.name={{plural:%number%|one=Maître menuisier|other=Maîtres menuisiers|default=Maître menuisier}}
-model.unit.masterCarpenter.description=Le maître menuisier est spécialisé dans la construction de bâtiments et de certaines unités comme les bateaux.
-model.unit.masterCottonPlanter.name={{plural:%number%|one=Maître planteur de coton|other=Maîtres planteurs de coton|default=Maître planteur de coton}}
+model.unit.masterCarpenter.name={{plural:%number%|one=Maître charpentier|other=Maîtres charpentiers|default=Maître charpentier}}
+model.unit.masterCarpenter.description=Le maître charpentier est spécialisé dans la construction de bâtiments et de certaines unités comme les bateaux.
+model.unit.masterCottonPlanter.name={{plural:%number%|one=Maître planteur|other=Maîtres planteurs|default=Maître planteur}} de coton
 model.unit.masterCottonPlanter.description=Le maître planteur de coton est spécialisé dans la culture du coton.
 model.unit.masterDistiller.name={{plural:%number%|one=Maître distillateur|other=Maîtres distillateurs|default=Maître distillateur}}
 model.unit.masterDistiller.description=Le maître distillateur est spécialisé dans la fabrication de rhum.
-model.unit.masterFurTrader.name={{plural:%number%|Maître fourreur|other=Maîtres fourreur|default=Maître fourreur}}
-model.unit.masterFurTrader.description=Le maître fourrreur est spécialisé dans la fabrication de pelisses.
+model.unit.masterFurTrader.name={{plural:%number%|Maître fourreur|other=Maîtres fourreurs|default=Maître fourreur}}
+model.unit.masterFurTrader.description=Le maître fourreur est spécialisé dans la fabrication de pelisses.
 model.unit.masterGunsmith.name={{plural:%number%|one=Maître armurier|other=Maîtres armuriers|default=Maître armurier}}
 model.unit.masterGunsmith.description=Le maître armurier est spécialisé dans la fabrication de mousquets.
-model.unit.masterSugarPlanter.name={{plural:%number%|one=Maître planteur de canne|other=Maîtres planteurs de canne|default=Maître planteur de canne}}
+model.unit.masterSugarPlanter.name={{plural:%number%|one=Maître planteur|other=Maîtres planteurs|default=Maître planteur}} de canne
 model.unit.masterSugarPlanter.description=Le maître planteur de canne à sucre...Devinez quoi !
-model.unit.masterTobaccoPlanter.name={{plural:%number%|one=Maître planteur de tabac|other=Maîtres planteurs de tabac|default=Maître planteur de tabac}}
+model.unit.masterTobaccoPlanter.name={{plural:%number%|one=Maître planteur|other=Maîtres planteurs|default=Maître planteur}} de tabac
 model.unit.masterTobaccoPlanter.description=Le maître planteur de tabac est spécialisé dans la culture des feuilles de tabac.
 model.unit.masterTobacconist.name={{plural:%number%|one=Maître cigarier|other=Maîtres cigariers|default=Maître cigarier}}
 model.unit.masterTobacconist.description=Le maître cigarier est spécialisé dans la fabrication de cigares.
@@ -1834,7 +1845,7 @@ model.unit.masterWeaver.description=Le maître tisserand est spécialisé dans l
 model.unit.pettyCriminal.name={{plural:%number%|one=Petit criminel|other=Petits criminels|default=Petit criminel}}
 model.unit.pettyCriminal.description=Le petit criminel peut travailler au grand air, mais est particulièrement mauvais à l’intérieur des colonies. Il peut devenir un domestique contractuel avec un peu d’éducation ou d’expérience.
 model.unit.seasonedScout.name={{plural:%number%|one=Éclaireur aguerri|other=Éclaireurs aguerris|default=Éclaireur aguerri}}
-model.unit.seasonedScout.description=L’éclaireur aguerri est le meilleur quand il s’agit d’explorer le Nouveau Monde, en particulier les campements indiens et les rumeurs de cité perdue.
+model.unit.seasonedScout.description=L’éclaireur aguerri est le meilleur quand il s’agit d’explorer le Nouveau Monde, en particulier les agglomérations indigènes et les rumeurs de cité perdue.
 model.unit.veteranSoldier.name={{plural:%number%|one=Soldat vétéran|other=Soldats vétérans|default=Soldat vétéran}}
 model.unit.veteranSoldier.description=Le soldat vétéran est une unité armée expérimentée. N’importe quel colon libre peut être promu soldat vétéran après avoir gagné une bataille.
 model.unit.caravel.name={{plural:%number%|one=Caravelle|other=Caravelles|default=Caravelle}}
@@ -1843,23 +1854,23 @@ model.unit.frigate.name={{plural:%number%|one=Frégate|other=Frégates|default=F
 model.unit.frigate.description=La frégate est un petit navire de guerre.
 model.unit.galleon.name={{plural:%number%|one=Galion|other=Galions|default=Galion}}
 model.unit.galleon.description=Le galion est un gros navire marchand. C’est le seul bateau pouvant transporter des trésors vers l’Europe.
-model.unit.manOWar.name={{plural:%number%|one=Vaisseau de ligne|other=Vaisseaux de ligne|default=Vaisseau de ligne}}
-model.unit.manOWar.description=Le navire de ligne est un gros navire de guerre de la Couronne. Vous en verrez quand le Corps expéditionnaire royal arrivera après la déclaration d’indépendance.
+model.unit.manOWar.name={{plural:%number%|one=Vaisseau|other=Vaisseaux|default=Vaisseau}} de ligne
+model.unit.manOWar.description=Le vaisseau de ligne est un gros navire de guerre de la Couronne. Vous en verrez quand le Corps expéditionnaire royal arrivera après la déclaration d’indépendance.
 model.unit.merchantman.name={{plural:%number%|one=Navire marchand|other=Navires marchands|default=Navire marchand}}
 model.unit.merchantman.description=Le navire marchand est un bateau de taille moyenne.
 model.unit.privateer.name={{plural:%number%|one=Corsaire|other=Corsaires|default=Corsaire}}
 model.unit.privateer.description=Le corsaire est un petit navire de guerre qui ne porte pas le pavillon du pays dont il vient. C’est la seule unité capable d’attaquer d’autres unités sans déclaration de guerre.
-model.unit.artillery.name={{plural:%number%|one=Une pièce d'artillerie|other=Autres pièces d'artillerie|default=Artillerie}}
-model.unit.artillery.description=L’artillerie est excellente pour attaquer et défendre des colonies. Par contre, elle est très vulnérable à l’extérieur.
+model.unit.artillery.name={{plural:%number%|one=pièce d'artillerie|other=pièces d'artillerie|default=artillerie}}
+model.unit.artillery.description=L’artillerie est excellente pour attaquer et défendre des colonies. Par contre, elle est très vulnérable à découvert.
 model.unit.damagedArtillery.name={{plural:%number%|one=Artillerie endommagée|other=Artilleries endommagées|default=Artillerie endommagée}}
 model.unit.damagedArtillery.description=L’artillerie endommagée est comme l’artillerie normale, en plus faible seulement. Si elle est endommagée une deuxième fois, elle sera mise définitivement hors d’usage.
-model.unit.treasureTrain.name={{plural:%number%|one=Train du trésor|other=Trains du trésor|default=Train du trésor}}
-model.unit.treasureTrain.description=On trouve généralement des trésors dans les ruines des cités perdues ou en pillant un campement indien. Ils ne vous sont d’aucune utilité, mais peuvent être revendus à bon prix en Europe. Ils ne peuvent y être transportés à travers l’océan que par galion. Si vous n’en avez pas, la Couronne se fera un plaisir de vous offrir ce transport, moyennant un pourcentage « raisonnable » des bénéfices de leur vente.
+model.unit.treasureTrain.name={{plural:%number%|one=Train|other=Trains|default=Train}} du trésor
+model.unit.treasureTrain.description=On trouve généralement des trésors dans les ruines des cités perdues ou en pillant une agglomération indigène. Ils ne vous sont d’aucune utilité, mais peuvent être revendus à bon prix en Europe. Ils ne peuvent y être transportés à travers l’océan que par galion. Si vous n’en avez pas, la Couronne se fera un plaisir de vous offrir ce transport, moyennant un pourcentage « raisonnable » des bénéfices de leur vente.
 model.unit.wagonTrain.name={{plural:%number%|one=Chariot|other=Chariots|default=Chariot}}
 model.unit.wagonTrain.description=Le chariot est capable de transporter jusqu’à 200 unités de marchandises à travers les terres. Vous pouvez l’utiliser pour commercer avec d’autres joueurs, ou pour déplacer vos marchandises entre vos propres colonies.
 model.unit.kingsRegular.name={{plural:%number%|one=Fantassin royal|other=Fantassins royaux|default=Fantassin royal}}
 model.unit.kingsRegular.description=Le fantassin royal est une unité d’élite de la Couronne. Vous en verrez quand le Corps expéditionnaire royal arrivera après la déclaration d’inpépendance.
-model.unit.brave.name={{plural:%number%|one=Guerrier|other=Guerriers|default=Guerrier}}
+model.unit.brave.name={{plural:%number%|one=Brave|other=Braves|default=Brave}}
 model.unit.brave.description=Le brave est une unité indienne, capable de transporter quelques marchandises. Il peut être armé et monté à cheval. Les braves visitent souvent vos colonies afin de vous offrir des cadeaux ou faire des demandes.
 model.unit.flyingDutchman.name=Le Hollandais volant
 model.unit.flyingDutchman.description=Le Hollandais volant est un bateau fantôme.
@@ -1867,18 +1878,18 @@ model.unit.revenger.name=Le Capitaine
 model.unit.revenger.description=Le Capitaine a vendu son âme au Diable.
 model.unit.undead.name=Mort-vivant
 model.unit.undead.description=Des morts-vivants composent l’équipage du Hollandais volant.
-model.unit.brave.armedBrave={{plural:%number%|one=Brave armmé|other=Braves armés|default=Braves armés}}
+model.unit.brave.armedBrave={{plural:%number%|one=Brave armé|other=Braves armés|default=Brave armé}}
 model.unit.brave.mountedBrave={{plural:%number%|one=Brave monté|other=Braves montés|default=Brave monté}}
-model.unit.brave.nativeDragoon={{plural:%number%|one=Dragon indigère|other=Dragons indigènes|default=Dragons indigènes}}
+model.unit.brave.nativeDragoon={{plural:%number%|one=Dragon indigène|other=Dragons indigènes|default=Dragon indigène}}
 model.unit.colonialRegular.dragoon=Cavalerie coloniale
 model.unit.colonialRegular.soldier=Infanterie coloniale
-model.unit.hardyPioneer.pioneer={{plural:%number%|one=Valeureux pionnier|other=Valeureux pionniers|default=Valeureux pionniers}}
-model.unit.jesuitMissionary.missionary={{plural:%number%|one=Missionnaire jésuite|other=Missionnaires jésuites|default=Missionnaires jésuites}}
+model.unit.hardyPioneer.pioneer={{plural:%number%|one=Valeureux pionnier|other=Valeureux pionniers|default=Valeureux pionnier}}
+model.unit.jesuitMissionary.missionary={{plural:%number%|one=Missionnaire jésuite|other=Missionnaires jésuites|default=Missionnaire jésuite}}
 model.unit.kingsRegular.cavalry=Cavalerie
 model.unit.kingsRegular.infantry=Infanterie
-model.unit.seasonedScout.scout={{plural:%number%|one=Éclaireur aguerri|other=Éclaireurs aguerris|default=Éclaireurs aguerris}}
+model.unit.seasonedScout.scout={{plural:%number%|one=Éclaireur aguerri|other=Éclaireurs aguerris|default=Éclaireur aguerri}}
 model.unit.veteranSoldier.dragoon={{plural:%number%|one=Dragon vétéran|other=Dragons vétérans|default=Dragons vétérans}}
-model.unit.veteranSoldier.soldier={{plural:%number%|one=Soldat vétéran|other=Soldats vétérans|default=Soldats vétérans}}
+model.unit.veteranSoldier.soldier={{plural:%number%|one=Soldat vétéran|other=Soldats vétérans|default=Soldat vétéran}}
 model.unit.colonialRegular.workingAs=Soldat
 model.unit.elderStatesman.workingAs=Politicien
 model.unit.expertFarmer.workingAs=Fermier
@@ -1891,7 +1902,7 @@ model.unit.firebrandPreacher.workingAs=Prédicateur
 model.unit.hardyPioneer.workingAs=Pionnier
 model.unit.jesuitMissionary.workingAs=Missionnaire
 model.unit.masterBlacksmith.workingAs=Forgeron
-model.unit.masterCarpenter.workingAs=Menuisier
+model.unit.masterCarpenter.workingAs=Charpentier
 model.unit.masterCottonPlanter.workingAs=Planteur de coton
 model.unit.masterDistiller.workingAs=Distillateur
 model.unit.masterFurTrader.workingAs=Fourreur
@@ -1909,36 +1920,30 @@ model.abstractGoods.label=%amount% {{plural:%amount%|%goods%}}
 model.abstractUnit.label={{plural:%number%|one=one|other=%number%}} %unit%
 model.building.locationLabel=à %location%
 model.colony.badGovernment=Le Gouvernement de %colony% est inefficace. Des pénalités sont appliquées à la production.
-model.colony.goodGovernment=L’efficacité du gouvernement s’est améliorée! Le sentiment rebelle dans %colony% est égal ou dépasse désormais %number% pour cent.
+model.colony.goodGovernment=L’efficacité du gouvernement s’est améliorée ! Le sentiment rebelle dans %colony% est égal ou dépasse désormais %number% pour cent.
 model.colony.governmentImproved1=Le Gouvernement de %colony% s’est amélioré mais reste inefficace. Des pénalités continuent à s’appliquer à la production.
 model.colony.governmentImproved2=Le Gouvernement de %colony% s’est amélioré. Les pénalités ne s’appliquent plus à la production.
-# Fuzzy
-model.colony.insufficientProduction=%outputAmount% %outputType% de plus auraient pu être produit par la %colony%, si seulement nous avions eu %inputAmount% %inputType% de plus.
-model.colony.lostGoodGovernment=L’efficacité du gouvernement a décru! Le sentiment rebelle dans %colony% n'est désormais plus égal ou supérieur à  %number% pour cent. La colonie n'a désormais plus de bonus de production..
-model.colony.lostVeryGoodGovernment=L’efficacité du gouvernement a décru! Le sentiment rebelle dans %colony% n’est désormais plus égal ou supérieur à %number% pour cent. Certains bonus de production ont été perdus.
+model.colony.insufficientProduction=%outputAmount% %outputType% de plus auraient pu être produit(e)s dans %colony%, si seulement nous avions eu un supplément de %consumptionDeficit%.
+model.colony.lostGoodGovernment=L’efficacité du gouvernement a décru ! Le sentiment rebelle dans %colony% n’est désormais plus égal ou supérieur à  %number% pour cent. La colonie n’a désormais plus de bonus de production.
+model.colony.lostVeryGoodGovernment=L’efficacité du gouvernement a décru ! Le sentiment rebelle dans %colony% n’est désormais plus égal ou supérieur à %number% pour cent. Certains bonus de production ont été perdus.
 model.colony.minimumColonySize=%object% empêche de réduire la population encore plus.
-model.colony.stance.alliance=Les %nation% sont heureux de voir un allié fiable tel que vous.
-model.colony.stance.ceaseFire=Les %nation% vous jettent des regards mauvais, et sont clairement en train de préparer leur défense.
-model.colony.stance.peace=Les %nation% vous accueillent courtoisement et demandent si vous venez en paix.
-model.colony.stance.uncontacted=Les %nation% vous regardent avec méfiance, car vos habits et votre langue ne leur sont pas familiers.
-model.colony.stance.war=Les %nation% tirent sur vous à toute occasion.
+model.colony.stance.alliance=Les {{tag:people|%nation%}} sont heureux de voir un allié fiable tel que vous.
+model.colony.stance.ceaseFire=Les {{tag:people|%nation%}} vous jettent des regards mauvais, et sont clairement en train de préparer leur défense.
+model.colony.stance.peace=Les {{tag:people|%nation%}} vous accueillent courtoisement et demandent si vous venez en paix.
+model.colony.stance.uncontacted=Les {{tag:people|%nation%}} vous regardent avec méfiance, car vos habits et votre langue ne leur sont pas familiers.
+model.colony.stance.war=Les {{tag:people|%nation%}} tirent sur vous à toute occasion.
 model.colony.unbuildable=%colony% ne peut pas construire %object% actuellement. %object% a été retiré de la file d’attente de construction.
 model.colony.veryBadGovernment=Le Gouvernement de %colony% est très inefficace. De fortes pénalités sont appliquées à la production.
-model.colony.veryGoodGovernment=L’efficacité du gouvernement s’est améliorée! Le sentiment rebelle dans %colony% est égal ou dépasse maintenant %number% pour cent..
-model.colonyTile.claim=(%direction% de la demande)
-model.diplomaticTrade.receive.contact=Salutations fraternelles de la part de la glorieuse nation %nation%.
-# Fuzzy
-model.diplomaticTrade.receive.diplomatic=Négocions avec les %nation%.
-model.diplomaticTrade.receive.trade=Prenons en considération l’offre commerciale des %nation%.
-# Fuzzy
-model.diplomaticTrade.receive.tribute=Les %nation% nous demandent un tribut !
-model.diplomaticTrade.send.contact=Nous avons rencontré des membres de la nation %nation%.
-# Fuzzy
-model.diplomaticTrade.send.diplomatic=Considérons notre situation diplomatique avec les %nation%.
-# Fuzzy
-model.diplomaticTrade.send.trade=Proposons un commerce avec les %nation% à %settlement%.
-# Fuzzy
-model.diplomaticTrade.send.tribute=Nous demandons un tribut des %nation% à %settlement%.
+model.colony.veryGoodGovernment=L’efficacité du gouvernement s’est améliorée ! Le sentiment rebelle dans %colony% est égal ou dépasse maintenant %number% pour cent.
+model.colonyTile.claim=(revendique %direction%)
+model.diplomaticTrade.receive.contact=Salutations fraternelles de la part de la glorieuse nation {{tag:fem|%nation%}}.
+model.diplomaticTrade.receive.diplomatic=Négocions avec {{tag:country|%nation%}}.
+model.diplomaticTrade.receive.trade=Prenons en considération l’offre commerciale des {{tag:people|%nation%}}.
+model.diplomaticTrade.receive.tribute={{ucfirst:{{tag:country|%nation%}}}} nous demande un tribut !
+model.diplomaticTrade.send.contact=Nous avons rencontré des membres de la nation {{tag:fem|%nation%}}.
+model.diplomaticTrade.send.diplomatic=Considérons notre situation diplomatique avec {{tag:country|%nation%}}.
+model.diplomaticTrade.send.trade=Proposons un commerce avec {{tag:country|%nation%}} à %settlement%.
+model.diplomaticTrade.send.tribute=Nous demandons un tribut de {{tag:country|%nation%}} à %settlement%.
 model.direction.N.name=nord
 model.direction.NE.name=nord-est
 model.direction.E.name=est
@@ -1948,81 +1953,68 @@ model.direction.SW.name=sud-ouest
 model.direction.W.name=ouest
 model.direction.NW.name=nord-ouest
 model.historyEventType.abandonColony.description=Vous abandonnez la colonie de %colony%.
-# Fuzzy
-model.historyEventType.ceaseFire.description=Un cessez-le-feu a été signé avec %nation%.
-# Fuzzy
-model.historyEventType.cityOfGold.description=La %nation% découvre %city%, l’une des sept cités d’or, et un trésor de %treasure% d’or.
-# Fuzzy
-model.historyEventType.colonyConquered.description=Votre colonie %colony% est conquise par les %nation%.
-# Fuzzy
-model.historyEventType.colonyDestroyed.description=Votre colonie %colony% est détruite par les %nation%.
-model.historyEventType.conquerColony.description=Vous avez conquis la colonie %colony% des %nation%.
+model.historyEventType.ceaseFire.description=Un cessez-le-feu a été signé avec {{tag:country|%nation%}}.
+model.historyEventType.cityOfGold.description={{ucfirst:{{tag:country|%nation%}}}} découvre %city%, l’une des sept cités d’or, et un trésor de %treasure% pièces d’or.
+model.historyEventType.colonyConquered.description=Votre colonie %colony% est conquise par {{tag:country|%nation%}}.
+model.historyEventType.colonyDestroyed.description=Votre colonie %colony% est détruite par {{tag:country|%nation%}}.
+model.historyEventType.conquerColony.description=Vous avez conquis la colonie %colony% des {{tag:people|%nation%}}.
 model.historyEventType.declareIndependence.description=Vous déclarez l’indépendance vis-à-vis de la Couronne.
-# Fuzzy
-model.historyEventType.declareWar.description=La guerre a été déclarée avec %nation%.
-# Fuzzy
-model.historyEventType.destroyNation.description=Le %nation% a détruit les %nativeNation%.
-# Fuzzy
-model.historyEventType.destroySettlement.description=Vous détruisez le campement %settlement% de %nation%.
+model.historyEventType.declareWar.description=La guerre a été déclarée avec {{tag:country|%nation%}}.
+model.historyEventType.destroyNation.description={{ucfirst:{{tag:country|%nation%}}}} détruit les {{tag:people|%nativeNation%}}.
+model.historyEventType.destroySettlement.description=Vous détruisez l’agglomération %settlement% des {{tag:people|%nation%}}.
 model.historyEventType.discoverNewWorld.description=Vous découvrez le Nouveau Monde.
-# Fuzzy
-model.historyEventType.discoverRegion.description=La %nation% découvre %region%.
-# Fuzzy
-model.historyEventType.formAlliance.description=Un accord d'alliance a été signé avec %nation%.
+model.historyEventType.discoverRegion.description={{ucfirst:{{tag:country|%nation%}}}} découvre %region%.
+model.historyEventType.formAlliance.description=Un accord d’alliance a été signé avec {{tag:country|%nation%}}.
 model.historyEventType.foundColony.description=Vous établissez la colonie de %colony%.
-model.historyEventType.foundingFather.description=%father% rejoint le Congrès Continental.
+model.historyEventType.foundingFather.description=%father% rejoint le Congrès continental.
 model.historyEventType.independence.description=Vous avez atteint l’indépendance de la Couronne.
-# Fuzzy
-model.historyEventType.makePeace.description=Un accord de paix a été signé avec %nation%.
-# Fuzzy
-model.historyEventType.meetNation.description=Vous rencontrez les %nation%.
-# Fuzzy
-model.historyEventType.nationDestroyed.description=La %nation% n'est plus présente dans le Nouveau Monde.
-# Fuzzy
-model.historyEventType.spanishSuccession.description=Les %loserNation% cédent l’ensemble de leurs colonies dans le Nouveau Monde aux %nation%.
+model.historyEventType.makePeace.description=Un accord de paix a été signé avec {{tag:country|%nation%}}.
+model.historyEventType.meetNation.description=Vous rencontrez {{tag:country|%nation%}}.
+model.historyEventType.nationDestroyed.description={{ucfirst:{{tag:country|%nation%}}}} n’est plus présente dans le Nouveau Monde.
+model.historyEventType.spanishSuccession.description={{ucfirst:{{tag:country|%loserNation%}}}} cède l’ensemble de ses colonies dans le Nouveau Monde à {{tag:country|%nation%}}.
 model.indianSettlement.mostHatedNone=Aucun
 model.indianSettlement.mostHatedUnknown=Inconnu
 model.indianSettlement.nameUnknown=Inconnu
 model.indianSettlement.skillNone=Aucun
 model.indianSettlement.skillUnknown=Inconnu
-model.indianSettlement.tension.angry=Les braves de la nation %nation% sont occupés à s'entraîner sur des cibles. Les femmes et les enfants se cachent dans leurs tentes.
-model.indianSettlement.tension.content=Les membres de la nation %nation% sont occupés à travailler. Leurs enfants jouent avec insouciance à cache-cache.
-model.indianSettlement.tension.displeased=Les membres de la nation %nation% sont occupés à leur travail. Leurs enfants sont invisibles, et leurs anciens sont renfrognés.
-model.indianSettlement.tension.happy=Les membres de la nation %nation% dansent joyeusement autour de leur feu de camp en chantant la chanson de leurs ancêtres.
-model.indianSettlement.tension.hateful=Les braves de la nation %nation% agitent leurs armes. Ils ont orné leur ceinture des scalps de leurs ennemis, et leurs poteaux de torture montrent des signes d'utilisation intense.
+model.indianSettlement.tension.angry=Les braves {{tag:plur|%nation%}} sont occupés à s’entraîner sur des cibles. Les femmes et les enfants se cachent dans leurs tentes.
+model.indianSettlement.tension.content=Les {{tag:people|%nation%}} sont occupés à travailler. Leurs enfants jouent avec insouciance à cache-cache.
+model.indianSettlement.tension.displeased=Les {{tag:people|%nation%}} sont occupés à leur travail. Leurs enfants sont invisibles, et leurs anciens sont renfrognés.
+model.indianSettlement.tension.happy=Les {{tag:people|%nation%}} dansent joyeusement autour de leur feu de camp en chantant les chansons de leurs ancêtres.
+model.indianSettlement.tension.hateful=Les braves {{tag:plur|%nation%}} agitent leurs armes. Ils ont orné leur ceinture des scalps de leurs ennemis, et leurs poteaux de torture montrent des signes d’utilisation intense.
 model.indianSettlement.tension.unknown=Inconnu
 model.indianSettlement.tension.wary=Méfiant
 model.indianSettlement.wantedGoodsNone=Aucun
 model.indianSettlement.wantedGoodsUnknown=Inconnu
 model.lostCityRumour.name=Rumeur de cité perdue
-model.lostCityRumour.burialGround.description=Ce tumulus est celui de nos ancêtres %nation%. Vous avez commis un sacrilège. À présent vous devez mourir.
-model.lostCityRumour.cibola.description=Vous avez découvert %city%, l’une des sept cités d’or perdues, et un butin valant %money% ! Déplacez le train de trésors vers l’une de vos colonies pour encaisser l’argent, ou envoyez-le en Europe dans un galion.
-model.lostCityRumour.colonist.description=Vous rencontrez un survivant d’une expédition précédente. Il jure allégeance à la Couronne contre un peu de nourriture.
+model.lostCityRumour.burialGround.description=Ce tumulus est celui de nos ancêtres {{tag:plur|%nation%}}. Vous avez commis un sacrilège. À présent vous devez mourir.
+model.lostCityRumour.cibola.description=Vous avez découvert %city%, l’une des sept cités d’or perdues, et un butin valant %money% ! Déplacez le trésor vers l’une de vos colonies pour l’encaisser, ou envoyez-le en Europe dans un galion.
+model.lostCityRumour.colonist.description=Vous rencontrez les survivants d’une colonie perdue. Ils jurent allégeance à la Couronne contre un peu de nourriture.
 model.lostCityRumour.expeditionVanishes.description=Votre expédition disparaît sans laisser de traces.
 model.lostCityRumour.fountainOfYouth.description=Vous avez découvert une fontaine de jouvence. Les rumeurs vont bon train en Europe. Les immigrants s’entassent sur les quais pour venir trouver la jeunesse éternelle dans le Nouveau Monde !
 model.lostCityRumour.fountainOfYouth.noEurope.description=Vous avez découvert une fontaine de jouvence.
 model.lostCityRumour.learn.description=Votre %unit% a acquis de l’expérience et est maintenant un(e) %type% !
-model.lostCityRumour.mounds.description=À l'intérieur, vous trouvez des trésors incroyables valant %money% d’or !
+model.lostCityRumour.mounds.description=À l’intérieur, vous trouvez des trésors incroyables valant %money% pièces d’or !
 model.lostCityRumour.nothing.0.description=La rumeur de « cité perdue » s’avère n’être qu’une rumeur !
-model.lostCityRumour.nothing.mayans.description=Vous découvrez d'anciennes inscriptions prophétisant la fin du monde! Des rumeurs se propagent et les colons crédules perdent leur temps en soutenant que la catastrophe est imminente ou prévue dans %years% ans.
+model.lostCityRumour.nothing.mayans.description=Vous découvrez d’anciennes inscriptions prophétisant la fin du monde ! Des rumeurs se propagent et les colons crédules perdent leur temps en soutenant que la catastrophe est imminente ou prévue dans %years% ans.
 model.lostCityRumour.nothing.mounds.description=Les monticules sont froids et vides.
-model.lostCityRumour.ruins.description=Vous avez découvert les ruines d’une civilisation perdue. Elle renferme de l’or et des trésors valant %money% !
-model.lostCityRumour.tribalChief.description=Le chef d’une petite tribu vous offre pour %money% or de babioles.
+model.lostCityRumour.ruins.description=Vous avez découvert les ruines d’une civilisation perdue. Elles renferment de l’or et des trésors valant %money% !
+model.lostCityRumour.tribalChief.description=Le chef d’une petite tribu vous offre pour %money% pièces d’or de babioles.
 model.lostCityRumour.tribalChief.mounds.description=À l’intérieur, vous trouvez des bibelots valant %money%.
-model.market.priceDecrease=A %market%, le prix de %goods% est tombé à %sell%/%buy%.
-model.market.priceIncrease=A %market%, les prix de %goods% sont montés à %sell%/%buy%.
-model.messageType.buildingCompleted.name=Constructions terminées
-model.messageType.combatResult.name=Résultat des combats
+model.market.priceDecrease=À %market%, le prix de %goods% est tombé à %sell%/%buy%.
+model.market.priceIncrease=À %market%, le prix de %goods% est monté à %sell%/%buy%.
+model.messageType.buildingCompleted.name=Bâtiments terminés
+model.messageType.combatResult.name=Résultats des combats
 model.messageType.default.name=Messages
 model.messageType.demands.name=Demandes indigènes
 model.messageType.foreignDiplomacy.name=Affaires étrangères
 model.messageType.giftGoods.name=Cadeaux indiens
-model.messageType.goodsMovement.name=Mouvement de marchandises
+model.messageType.goodsMovement.name=Mouvements de marchandises
 model.messageType.governmentEfficiency.name=Efficacité du gouvernement
 model.messageType.lostCityRumour.name=Rumeurs de cité perdue
 model.messageType.marketPrices.name=Prix du marché
 model.messageType.missingGoods.name=Marchandises manquantes
-model.messageType.sonsOfLiberty.name=Fils de Liberté
+model.messageType.sonsOfLiberty.name=Fils de la Liberté
 model.messageType.tutorial.name=Didactitiel
 model.messageType.unitAdded.name=Nouveaux colons
 model.messageType.unitDemoted.name=Dégradations d’unités
@@ -2030,55 +2022,52 @@ model.messageType.unitImproved.name=Promotions d’unités
 model.messageType.unitLost.name=Pertes d’unités
 model.messageType.warehouseCapacity.name=Capacité des entrepôts
 model.messageType.warning.name=Alertes
-model.monarch.action.addToRef.text=La Couronne a ajouté %number% {{plural:%number%|%unit%}} à la force expéditionnaire royale. Les chefs coloniaux expriment leur inquiétude.
+model.monarch.action.addToRef.text=La Couronne a ajouté %number% {{plural:%number%|%unit%}} au Corps expéditionnaire royal. Les chefs coloniaux expriment leur inquiétude.
 model.monarch.action.addToRef.no=Fait
-# Fuzzy
-model.monarch.action.declarePeace.text=Nous avons gracieusement accepté un traité de paix avec les %nation%.
+model.monarch.action.declarePeace.text=Nous avons gracieusement accepté un traité de paix avec {{tag:country|%nation%}}.
 model.monarch.action.declarePeace.no=Fait
-# Fuzzy
-model.monarch.action.declareWar.text=L'insolence des forces de %nation% nous oblige à leur déclarer la guerre!
-# Fuzzy
-model.monarch.action.declareWarSupported.text=L’insolence des %nation% Nous force à leur déclarer la guerre ! Pour accélérer cela, nos troupes loyales (%force%) attendent vos ordres, et une somme supplémentaire de %gold% a été ajoutée à votre trésor.
+model.monarch.action.declareWar.text=L’insolence des forces de {{tag:country|%nation%}} Nous oblige à leur déclarer la guerre !
+model.monarch.action.declareWarSupported.text=L’insolence de {{tag:country|%nation%}} Nous force à leur déclarer la guerre ! Pour accélérer cela, Nos troupes loyales (%force%) attendent vos ordres, et une somme supplémentaire de %gold% a été ajoutée à votre trésor.
 model.monarch.action.declareWar.no=Fait
 model.monarch.action.displeasure.text=Vous osez accepter Nos généreuses conditions et tentez d’éviter leur paiement ? Une telle duplicité récoltera l’amère récompense de Notre déplaisir.
 model.monarch.action.displeasure.no=Fait
-model.monarch.action.forceTax.text=Nous méprisons votre tentative d'échapper à Notre fiscalité. Le taux d'impôt est maintenant %amount%%.
+model.monarch.action.forceTax.text=Nous méprisons votre tentative d’échapper à Notre fiscalité. Le taux d’impôt est maintenant %amount%%.
 model.monarch.action.forceTax.no=Fait
-model.monarch.action.hessianMercenaries.text=Moi, %leader%, ait remarqué votre situation militaire et vous offre gracieusement le services de nos loyales troupes (%mercenaries%) pour la somme de %gold%.
+model.monarch.action.hessianMercenaries.text=Moi, %leader%, ai remarqué votre situation militaire et vous offre gracieusement les services de Nos loyales troupes (%mercenaries%) pour la somme de %gold%.
 model.monarch.action.hessianMercenaries.no=Hélas, nous ne pouvons pas nous les permettre.
 model.monarch.action.hessianMercenaries.yes=Nous acceptons
 model.monarch.action.hessianMercenaries.header=Correspondance étrangère
-model.monarch.action.lowerTax.text=Après un examen attentif, nous avons gracieusement décidé de diminuer votre taux d'imposition de %difference%%. Le taux est maintenant de %newTax%%.
+model.monarch.action.lowerTax.text=Après un examen attentif, Nous avons gracieusement décidé de diminuer votre taux d’imposition de %difference%%. Le taux est maintenant de %newTax%%.
 model.monarch.action.lowerTax.no=Fait
-model.monarch.action.lowerTaxOther.text=Afin de célébrer {{tag:%number%|0=notre récent mariage|1=notre récent mariage avec notre seconde femme|2=la naissance d'un prince héritier|3=la naissance d'un fils royal|4=la naissance d'une fille royale}}, nous avons gracieusement décidé de diminuer votre taux d'imposition de %difference%%. Le taux est maintenant de %newTax%%.
+model.monarch.action.lowerTaxOther.text=Afin de célébrer {{tag:%number%|0=Notre récent mariage|1=Notre récent mariage avec Notre seconde femme|2=la naissance d’un prince héritier|3=la naissance d’un fils royal|4=la naissance d’une fille royale}}, Nous avons gracieusement décidé de diminuer votre taux d’imposition de %difference%%. Le taux est maintenant de %newTax%%.
 model.monarch.action.lowerTaxOther.no=Longue vie au Roi !
-model.monarch.action.lowerTaxWar.text=Afin de célébrer notre récente victoire contre les traîtres de {{tag:people|%nation%}}, nous avons gracieusement décidé de baisser votre taux d'imposition de %difference%%. Le taux est maintenant de %newTax%%.
+model.monarch.action.lowerTaxWar.text=Afin de célébrer Notre récente victoire contre les traîtres {{tag:people|%nation%}}, Nous avons gracieusement décidé de baisser votre taux d'imposition de %difference%%. Le taux est maintenant de %newTax%%.
 model.monarch.action.lowerTaxWar.no=Hourrah !
-model.monarch.action.monarchMercenaries.text=Afin de vous soutenir dans vos guerres coloniales, nous avons décidé de vous accorder quelques mercenaires (%mercenaries%) pour un prix de %gold%.
+model.monarch.action.monarchMercenaries.text=Afin de vous soutenir dans vos guerres coloniales, Nous avons décidé de vous accorder quelques mercenaires (%mercenaries%) au prix de %gold%.
 model.monarch.action.monarchMercenaries.no=Hélas, nous ne pouvons pas nous les permettre.
 model.monarch.action.monarchMercenaries.yes=Nous acceptons
-model.monarch.action.raiseTaxAct.text=Les différentes actions de défi effectuées par des colons déloyaux de %newWorld% ne nous laissent pas d'autre choix que d'imposer un nouveau décret sur {{tag:%number%|0=la navigation|1=le thé|2=la laine|3=les chapeaux|4=la mélasse|5=les timbres}}, augmentant votre taxe à %amount%%. Si vous le refusez, nous nous ferons un plaisir de boycotter vos %goods%!
+model.monarch.action.raiseTaxAct.text=Les différents gestes de défi posés par des colons déloyaux de %newWorld% ne Nous laissent pas d'autre choix que d'imposer un nouveau décret sur {{tag:%number%|0=la navigation|1=le thé|2=la laine|3=les chapeaux|4=la mélasse|5=les timbres}}, augmentant votre taxe à %amount%%. Si vous le refusez, Nous Nous ferons un plaisir de boycotter vos %goods% !
 model.monarch.action.raiseTaxAct.no=La Liberté ou la Mort !
 model.monarch.action.raiseTaxAct.yes=Nous acceptons
-model.monarch.action.raiseTaxWar.text=Nous sommes au regret de vous informer que les récents reculs dans notre guerre contre {{tag:country|%nation%}} ne nous laissent pas d'autre choix que d'augmenter votre taxe à %amount%%. Si vous le refusez, nous serons forcés de boycotter vos %goods%!
-model.monarch.action.raiseTaxWar.no=Aucune taxation sans représentation!
+model.monarch.action.raiseTaxWar.text=Nous sommes au regret de vous informer que les récents reculs dans Notre guerre contre {{tag:country|%nation%}} ne Nous laissent pas d’autre choix que d’augmenter votre taxe à %amount%%. Si vous le refusez, Nous serons forcés de boycotter vos %goods% !
+model.monarch.action.raiseTaxWar.no=Aucune taxation sans représentation !
 model.monarch.action.raiseTaxWar.yes=Nous acceptons
-model.monarch.action.supportLand.text=Afin de vous soutenir dans vos guerres coloniales, la couronne a décidé de vous fournir des troupes de vétérans(%addition%).
+model.monarch.action.supportLand.text=Afin de vous soutenir dans vos guerres coloniales, la Couronne a décidé de vous fournir des troupes de vétérans (%addition%).
 model.monarch.action.supportLand.no=Fait
-model.monarch.action.supportSea.text=Afin de protéger les routes maritimes des déprédations des flibustiers, boucaniers et pirates, la Couronne a décidé de vous accorder un support naval (%addition%).
+model.monarch.action.supportSea.text=Afin de protéger les routes maritimes des déprédations des corsaires, boucaniers et pirates, la Couronne a décidé de vous accorder un support naval (%addition%).
 model.monarch.action.supportSea.no=Fait
 model.monarch.action.waiveTax.text=Dans Notre grande mansuétude, Nous avons décidé de renoncer généreusement à cette augmentation des taxes.
 model.monarch.action.waiveTax.no=Fait
-model.nation.turkish.name={{tag:|country=L'Empire Ottoman|people=Ottoman|default=Ottoman}}
-model.nation.german.name={{tag:|country=Le Saint Empire Romain|people=Allemand|default=Allemand}}
-model.nation.prussian.name={{tag:|country=Prusse|people=Prussien|default=Prussien}}
-model.nation.austrian.name={{tag:|country=Autriche|people=Autrichiens|default=autrichien}}
+model.nation.turkish.name={{tag:|country=l’Empire Ottoman|people=Ottomans|fem=ottomane|plur=ottomans|femplur=ottomanes|default=ottoman}}
+model.nation.german.name={{tag:|country=le Saint Empire Romain|people=Allemands|fem=allemande|plur=allemands|femplur=allemandes|default=allemand}}
+model.nation.prussian.name={{tag:|country=la Prusse|people=Prussiens|fem=prussienne|plur=prussiens|femplur=prussiennes|default=prussien}}
+model.nation.austrian.name={{tag:|country=l’Autriche|people=Autrichiens|fem=autrichienne|plur=autrichiens|femplur=autrichiennes|default=autrichien}}
 model.advantages.none.name=Aucun
-model.advantages.none.shortDescription=Aucun avantage pour toutes les nations du jeu. Ceci est surtout prévu pour les parties multi-joueurs.
+model.advantages.none.shortDescription=Aucune nation du jeu n’a d’atout. Ceci est surtout prévu pour les parties multi-joueurs.
 model.advantages.fixed.name=Fixés
-model.advantages.fixed.shortDescription=Toutes les nations utilisent leurs avantages par défaut. Ceci est utilisé pour émuler le jeu d’origine.
+model.advantages.fixed.shortDescription=Toutes les nations utilisent leurs atouts par défaut. Ceci est utilisé pour émuler le jeu d’origine.
 model.advantages.selectable.name=Sélectionnable
-model.advantages.selectable.shortDescription=Les avantages nationaux sont sélectionnables et n’ont pas à être uniques.
+model.advantages.selectable.shortDescription=Les atouts nationaux sont sélectionnables et n’ont pas à être uniques.
 model.nationState.aiOnly.name=IA seulement
 model.nationState.aiOnly.shortDescription=Cette nation n’est disponible que pour les joueurs de l’IA
 model.nationState.available.name=disponible
@@ -2088,17 +2077,16 @@ model.nationState.notAvailable.shortDescription=Cette nation n’est pas disponi
 model.noClaimReason.europeans.description=Ce terrain est revendiqué par une autre nation européenne.
 model.noClaimReason.natives.description=Ce terrain est revendiqué par une tribu indigène.
 model.noClaimReason.occupied.description=Ce territoire est occupé par un ennemi dangereux.
-model.noClaimReason.rumour.description=Il y a quelque chose d'étrange ici, nous devons l'examiner avant d'y travailler.
-model.noClaimReason.settlement.description=Nous ne pouvons pas utiliser un terrain avec un village dessus.
-model.noClaimReason.terrain.description=Ce terrain n'est pas approprié pour une colonie.
-model.noClaimReason.water.description=Nous ne réclamons pas les eaux.
+model.noClaimReason.rumour.description=Il y a quelque chose d’étrange ici, nous devons l’examiner avant d’y travailler.
+model.noClaimReason.settlement.description=Nous ne pouvons pas utiliser un terrain habité.
+model.noClaimReason.terrain.description=Ce terrain n’est pas approprié pour une colonie.
+model.noClaimReason.water.description=Nous ne revendiquons pas les eaux.
 model.noClaimReason.worked.description=Un autre village utilise déjà ce territoire.
 model.player.colonialIndependence=Seuls les joueurs coloniaux peuvent déclarer leur indépendance.
-model.player.forces=Forces de %nation%
+model.player.forces=Forces {{tag:femplur|%nation%}}
 model.player.independentMarket=Europe
-model.player.startGame=Après des mois passés à voguer sur l’océan, vous arrivez enfin au large des côtes d’un continent inconnu. Faites voile vers {{tag:%direction%|west=l'ouest|east=l'est|default=sous le vent}} pour découvrir le Nouveau Monde et le revendiquer au nom de la Couronne.
-# Fuzzy
-model.player.waitingFor=Les %nation% terminent leur tour.
+model.player.startGame=Après des mois passés à voguer sur l’océan, vous arrivez enfin au large des côtes d’un continent inconnu. Faites voile vers {{tag:%direction%|west=l’ouest|east=l’est|default=sous le vent}} pour découvrir le Nouveau Monde et le revendiquer au nom de la Couronne.
+model.player.waitingFor=Attente de : {{tag:country|%nation%}}.
 model.regionType.coast.name=Côte
 model.regionType.coast.unknown=Région côtière inconnue
 model.regionType.desert.name=Désert
@@ -2119,7 +2107,7 @@ model.stance.peace.name=Paix
 model.stance.uncontacted.name=Non contacté
 model.stance.war.name=Guerre
 model.tension.happy.name=Heureux
-model.tension.content.name=Contenu
+model.tension.content.name=Content
 model.tension.displeased.name=Contrarié
 model.tension.angry.name=En colère
 model.tension.hateful.name=Haineux
@@ -2127,10 +2115,10 @@ model.tile.nameLocation=%name% (%location%)
 model.tile.nearLocation=%direction% de %location%
 model.tile.simpleLabel=Case (%x%, %y%)
 warning.europeanLand=Une partie des terres de cette nouvelle colonie est déjà détenue par des Européens.
-warning.landLocked=Votre nouvelle colonie sera dans les terres.
-warning.nativeLand=Une partie des terres de cette nouvelle colonie est déjà réclamée par les indigènes.
-warning.noBuildingMaterials=Votre nouvelle colonie produira très peu de %goods%.
-warning.noFood=Votre nouvelle colonie produira très peu de nourriture.
+warning.landLocked=Votre nouvelle colonie serait sans accès à la mer.
+warning.nativeLand=Une partie des terres de cette nouvelle colonie est déjà revendiquée par les indigènes.
+warning.noBuildingMaterials=Votre nouvelle colonie produirait très peu de %goods%.
+warning.noFood=Votre nouvelle colonie produirait très peu de nourriture.
 warning.ownLand=Une partie des terres de cette nouvelle colonie est déjà détenue par vous.
 model.tradeItem.colony.name=Colonie
 model.tradeItem.colony.description=la colonie de %colony%
@@ -2138,20 +2126,19 @@ model.tradeItem.gold.name=Or
 model.tradeItem.gold.description=la somme de %amount% or
 model.tradeItem.goods.name=Marchandises
 model.tradeItem.incite.name=Déclarer la guerre à
-# Fuzzy
-model.tradeItem.incite.description=guerre contre les %nation%
+model.tradeItem.incite.description=guerre contre {{tag:country|%nation%}}
 model.tradeItem.stance.name=Relations
 model.tradeItem.unit.name=Unité
 model.tradeRoute.allEmpty=Tous les arrêts sont vides.
 model.tradeRoute.alwaysPresent=%goodsType% est chargé à tous les arrêts.
-model.tradeRoute.duplicateName=Cette route commerciale a le même nom qu’une de vos routes commerciales existante : %name%. Veuillez choisir un nom unique.
+model.tradeRoute.duplicateName=Cette route commerciale a le même nom qu’une de vos routes commerciales existantes : %name%. Veuillez choisir un nom unique.
 model.tradeRoute.notEnoughStops=Une route commerciale nécessite au moins 2 arrêts !
 model.tradeRoute.nullOwner=Cette route commerciale n’a pas de propriétaire !
 model.tradeRoute.invalidStop=L’arrêt %name% n’est pas valide.
 model.season.autumn.name=Automne
 model.season.spring.name=Printemps
 model.unit.attackTileOdds=Attaquer ! (%chance%% de chance de succès)
-model.unit.goingTo={{tag:%type%|person=Marcher|ship=Naviguer|other=En route}} vers %location%
+model.unit.goingTo={{tag:%type%|person=En marche|ship=Faisant voile|other=En route}} vers %location%
 model.unit.occupation.goingSomewhere=G
 model.unit.occupation.inTradeRoute=T
 model.unit.occupation.underRepair=R
@@ -2163,21 +2150,20 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.alreadyPresent.description=Déjà présent à cet endroit.
 model.noAddReason.anotherColony.description=Cet endroit est utilisé par une autre de vos colonies.
-model.noAddReason.capacityExceeded.description=Il n'y a plus assez de place à cet endroit.
+model.noAddReason.capacityExceeded.description=Il n’y a plus assez de place à cet endroit.
 model.noAddReason.claimRequired.description=Cet emplacement appartient à une autre nation, mais peut être revendiqué.
 model.noAddReason.colonyCenter.description=Rien ne peut être ajouté au centre de la colonie.
 model.noAddReason.maximumSkill.description=La compétence de l’unité dépasse la compétence maximale supportée par cet emplacement.
 model.noAddReason.minimumSkill.description=L’unité n’a pas la compétence minimale requise pour travailler à cet endroit.
-model.noAddReason.missingAbility.description=Cet endroit ne peut être exploité tant que vous n'avez pas construit des quais.
+model.noAddReason.missingAbility.description=Cet endroit ne peut être exploité tant que vous n’avez pas construit de quais.
 model.noAddReason.missingSkill.description=Une compétence particulière est nécessaire pour travailler à cet endroit.
-model.noAddReason.occupiedByEnemy.description=Cet emplacement est occupé une une unité d'une autre nation.
-model.noAddReason.ownedByEnemy.description=Cet endroit est la propriété d'une autre nation.
+model.noAddReason.occupiedByEnemy.description=Cet emplacement est occupé par une unité d’une autre nation.
+model.noAddReason.ownedByEnemy.description=Cet endroit est la propriété d’une autre nation.
 model.noAddReason.wrongType.description=Type incorrect à cet endroit.
 model.building.noStudent=Notre %teacher% de %colony% attend un étudiant.
 model.building.notEnoughInput=Il n’y a plus de %inputGoods% disponible pour le(a) %building% à %colony%.
@@ -2188,13 +2174,14 @@ model.colony.buildingReady=%colony% a terminé son chantier (%building%).
 model.colony.cannotBuild=Vous ne construisez rien à %colony%.
 model.colony.colonistStarved=Un colon est mort de faim à %colony% !
 model.colony.colonyStarved=Le dernier colon de %colony% est mort de faim, laissant la colonie abandonnée.
-model.colony.customs.sale=La Chambre des douanes à %colony% a vendu : %data%.
+model.colony.customs.sale=La douane à %colony% a vendu : %data%.
 model.colony.customs.saleData=%amount% %goods% pour %gold%
-model.colony.famineFeared=La famine menace à %colony%. %number% tours seulement avant de manquer de nourriture.
-model.colony.newColonist=Un colon est né à %colony%. Toutes nos félicitations aux parents.
+model.colony.famineFeared=La famine menace %colony%. %number% tours seulement avant de manquer de nourriture.
+model.colony.starving=%colony% meurt de faim.
+model.colony.newColonist=Un colon est né à %colony%.
 model.colony.newConvert=Un nouveau converti %nation% est arrivé à %colony%.
-model.colony.notBuildingAnything=Rien n'est en cours de construction dans %colony%.
-model.colony.soLDecrease=Le sentiment rebelle en %colony% est tombée à %newSoL% % !
+model.colony.notBuildingAnything=Rien n’est en cours de construction dans %colony%.
+model.colony.soLDecrease=Le sentiment rebelle en %colony% est tombé à %newSoL% % !
 model.colony.soLIncrease=L’appartenance aux Fils de la Liberté à %colony% a atteint %newSoL% %
 model.colony.unitReady=%colony% a fini de construire %unit%.
 model.colony.warehouseEmpty=Il y a moins de %level% unités de %goods% dans votre entrepôt de %colony%.
@@ -2204,79 +2191,72 @@ model.colony.warehouseSoonFull=Votre entrepôt de %colony% va excéder sa capaci
 model.colony.warehouseWaste=Votre entrepôt de %colony% a dépassé sa capacité en %goods%. %waste% unités ont été détruites.
 model.colony.workersEvicted=À %colony%, vos colonisateurs ne peuvent plus travailler sur %location% à cause de la présence de %enemyUnit%.
 model.colonyTile.resourceExhausted=Ressource %resource% épuisée à %colony%
-# Fuzzy
-model.game.spanishSuccession=Votre Excellence, la guerre de succession d’Espagne s’est terminée en Europe. Par le traité d’Utrecht, les %loserNation% ont été obligés de céder toutes leurs colonies dans le Nouveau Monde aux %nation% !
+model.game.spanishSuccession=Votre Excellence, la guerre de succession d’Espagne s’est terminée en Europe. Par le traité d’Utrecht, les {{tag:people|%loserNation%}} ont été obligés de céder toutes leurs colonies dans le Nouveau Monde à {{tag:country|%nation%}} !
 model.indianSettlement.mission.denounced=Votre missionnaire à %settlement% a été dénoncé et exécuté !
-model.indianSettlement.mission.destroyed=Votre missionnaire à %settlement% est mort dans la destruction de ce campement.
-model.player.alarmIncrease.tension.angry=Le chef %nation% à %settlement% prévient que les braves appellent ouvertement à la guerre avec les %enemy%, pour nous débarrasser de vos colons envahissants et de vos guerriers arrogants sur nos terres.
-model.player.alarmIncrease.tension.content=Le chef %nation% à %settlement% salut ses amis de %enemy%. Nous sommes heureux de voir croître la coopération entre nous, mais nous sommes préoccupés par les empiètements de vos colons sur nos terres.
+model.indianSettlement.mission.destroyed=Votre missionnaire à %settlement% est mort dans la destruction de cette agglomération.
+model.player.alarmIncrease.tension.angry=Le chef %nation% à %settlement% prévient que les braves appellent ouvertement à la guerre avec les {{tag:people|%enemy%}}, pour se débarrasser de vos colons envahissants et de vos guerriers arrogants sur nos terres.
+model.player.alarmIncrease.tension.content=Le chef %nation% à %settlement% salue ses amis {{tag:plur|%enemy%}}. Nous sommes heureux de voir croître la coopération entre nous, mais nous sommes préoccupés par les empiètements de vos colons sur nos terres.
 model.player.autoRecruit=Les troubles religieux en %europe% poussent %unit% à émigrer.
 model.player.colonyGoodsParty.harbour=Les colons de %colony% ont jeté %amount% unités de %goods% dans le port, en signe de protestation contre les taxes imposées par la Couronne.
 model.player.colonyGoodsParty.horses=Vos colons à %colony% ont libéré %amount% chevaux en protestation contre les impôts injustes imposés par la Couronne !
 model.player.colonyGoodsParty.landLocked=Les colons de %colony% ont brûlé %amount% unités de %goods% sur la place du marché, en signe de protestation contre les taxes imposées par la Couronne.
-# Fuzzy
-model.player.dead.european=Votre Excellence, les %nation% ont déclaré un retrait inconditionnel des affaires du Nouveau Monde !
-model.player.dead.native=Votre Excellence, les %nation% ont été détruits.
-model.player.disaster.bankruptcy.start=Vous n'avez pas payé pour l'entretien de tous les bâtiments. De gros malus de production s'appliquent.
-model.player.disaster.bankruptcy.stop=Une fois de plus, vous êtes en mesure de payer pour l'entretien de tous les bâtiments. Les malus de production ont été supprimés.
+model.player.dead.european=Votre Excellence, {{tag:country|%nation%}} a déclaré un retrait inconditionnel des affaires du Nouveau Monde !
+model.player.dead.native=Votre Excellence, les {{tag:people|%nation%}} ont été détruits.
+model.player.disaster.bankruptcy.start=Vous n’avez pas payé pour l’entretien de tous les bâtiments. De gros malus de production s’appliquent.
+model.player.disaster.bankruptcy.stop=Vous êtes à nouveau en mesure de payer pour l’entretien de tous les bâtiments. Les malus de production ont été supprimés.
 model.player.disaster.effect.colonyDestroyed=%colony% a été complètement détruite.
 model.player.disaster.strikes=Votre colonie %colony% a été frappée par un %disaster%.
 model.player.emigrate=En %europe%, %unit% a décidé d’émigrer.
 model.player.foundingFatherJoinedCongress=%foundingFather% a rejoint le Congrès !\n\n%description%
-model.player.ignoredMercenaries=La couronne a retiré son offre gratuite passée de soutien mercenaire, en l’absence de réponse.
+model.player.ignoredMercenaries=La couronne a retiré son offre antérieure de soutien mercenaire, en l’absence de réponse.
 model.player.ignoredTax=La couronne a augmenté le taux de taxation à %amount%%, comme annoncé précédemment.
-model.player.interventionForceArrives=La Force d'intervention promise arrive!
+model.player.interventionForceArrives=La Force d’intervention promise arrive !
 model.player.soLDecrease=L’appartenance aux Fils de Liberté dans vos colonies a chuté à %newSoL% %.
 model.player.soLIncrease=L’appartenance aux Fils de Liberté dans vos colonies a atteint %newSoL% %.
-# Fuzzy
-model.player.stance.alliance.declared=Votre Excellence, %nation% est alliée avec nous !
-model.player.stance.alliance.others=Votre Excellence, %attacker% est alliée avec %defender%.
-# Fuzzy
-model.player.stance.ceaseFire.declared=Votre Excellence, les %nation% ont convenu d’un cessez-le-feu avec nous!
-model.player.stance.ceaseFire.others=Votre Excellence, les %attacker% ont convenu d’un cessez-le-feu avec les %defender%.
-# Fuzzy
-model.player.stance.peace.declared=Votre Excellence, les %nation% sont en paix avec nous !
-model.player.stance.peace.others=Votre Excellence, les %attacker% sont en paix avec les %defender%.
-# Fuzzy
-model.player.stance.war.declared=Mauvaise nouvelle, Excellence, les %nation% nous ont déclaré la guerre !
-model.player.stance.war.others=Excellence, les %attacker% ont déclaré la guerre aux %defender%.
+model.player.stance.alliance.declared=Votre Excellence, la nation {{tag:fem|%nation%}} est alliée avec nous !
+model.player.stance.alliance.others=Votre Excellence, {{tag:country|%attacker%}} est alliée avec {{tag:country|%defender%}}.
+model.player.stance.ceaseFire.declared=Votre Excellence, {{tag:country|%nation%}} a convenu d’un cessez-le-feu avec nous !
+model.player.stance.ceaseFire.others=Votre Excellence, les {{tag:people|%attacker%}} ont convenu d’un cessez-le-feu avec les {{tag:people|%defender%}}.
+model.player.stance.peace.declared=Votre Excellence, {{tag:country|%nation%}} est en paix avec nous !
+model.player.stance.peace.others=Votre Excellence, les {{tag:people|%attacker%}} sont en paix avec les {{tag:people|%defender%}}.
+model.player.stance.war.declared=Mauvaise nouvelle, Excellence, {{tag:country|%nation%}} nous a déclaré la guerre !
+model.player.stance.war.others=Excellence, les {{tag:people|%attacker%}} ont déclaré la guerre aux {{tag:people|%defender%}}.
 combat.automaticDefence=Votre %unit% à %colony% a pris les armes pour défendre la colonie !
-combat.buildingDamaged=%building% de %colony% a été détruit par %enemyNation% %enemyUnit% !
-combat.burnMissions=Toutes les missions de %nation% dans %enemyNation% ont été brûlées !
-combat.colonyBurning=La colonie de %colony% a été rasée par un(e) %unit% des %nation%, %amount% pièces d’or saisies !
-combat.colonyCaptured=Vous avez pris %colony%. %amount% pièces d’or saisies.
-combat.colonyCapturedBy=Le %player% a capturé %colony%. %amount% pièces d’or saisies !
-combat.enemyColonyBurning=La colonie %colony% de %nation% a été brûlée par %attackerNation% !
-combat.enemyShipDamaged=%unit% a endommagé un(e) %enemyUnit% des %enemyNation%, qui doit retourner en réparation.
-combat.enemyShipDamagedByBombardment=%colony% ouvre le feu sur un(e) %unit% des %nation%, qui est endommagé(e) et doit retourner en réparation.
-combat.enemyShipEvaded=Un(e) %enemyUnit% des %enemyNation% a échappé à une attaque de votre %unit%.
-combat.enemyShipSunk=Votre %unit% a coulé un(e) %enemyUnit% des %enemyNation% !
-combat.equipmentCaptured=Prenez garde, les braves %nation% ont acquis des %equipment% !
-combat.goodsStolen=Un(e) %enemyUnit% des %enemyNation% vole %amount% %goods% à %colony% !
-# Fuzzy
-combat.indianPlunder=Un(e) %enemyUnit% des %enemyNation% a pillé %amount% de %colony%.
-combat.indianRaid=Nos espions nous rapportent que la %nation% a fait un raid sur la colonie %colonyNation% de %colony%.
-combat.indianSurprise=La %nation% a fait un raid surprise sur %colony%, jetant l'alarme parmi nos colons. Le chef de %nation% nie toute implication.
-combat.indianTreasure=Vous saisissez %amount% dans le campement %settlement%.
-combat.nativeCapitalBurned=Vous avez brûlé %name%, la capitale de %nation%. La %nation% se soumet !
-combat.newConvertFromAttack=Un(e) %unit% apeuré(e) des %nation% vous rejoint !
-combat.shipDamaged=Votre %unit%  a été endommagé(e) par un(e) %enemyUnit% des %enemyNation% et doit retourner en réparation (lieu : %repairLocation%). Tous les biens et les unités à bord ont été perdus.
+combat.buildingDamaged=%building% de %colony% a été détruit par %enemyUnit% {{tag:fem|%enemyNation%}} !
+combat.burnMissions=Toutes les missions {{tag:femplur|%nation%}} dans {{tag:country|%enemyNation%}} ont été brûlées !
+combat.colonyBurning=La colonie de %colony% a été rasée par un(e) %unit% des {{tag:people|%nation%}}, %amount% pièces d’or pillées !
+combat.colonyCaptured=Vous avez pris %colony%. %amount% pièces d’or pillées.
+combat.colonyCapturedBy=Le %player% a capturé %colony%. %amount% pièces d’or pillées !
+combat.enemyColonyBurning=La colonie %colony% de %nation% a été brûlée par {{tag:country|%attackerNation%}} !
+combat.enemyShipDamaged=%unit% a endommagé un(e) %enemyUnit% des {{tag:people|%enemyNation%}}, qui doit retourner en réparation.
+combat.enemyShipDamagedByBombardment=%colony% ouvre le feu sur un(e) %unit% des {{tag:people|%nation%}}, qui est endommagé(e) et doit retourner en réparation.
+combat.enemyShipEvaded=Un(e) %enemyUnit% des {{tag:people|%enemyNation%}} a échappé à une attaque de votre %unit%.
+combat.enemyShipSunk=Votre %unit% a coulé un(e) %enemyUnit% des {{tag:people|%enemyNation%}} !
+combat.equipmentCaptured=Prenez garde, les braves {{tag:plur|%nation%}} ont acquis des %equipment% !
+combat.goodsStolen=Un(e) %enemyUnit% des {{tag:people|%enemyNation%}} vole %amount% %goods% à %colony% !
+combat.indianPlunder=%enemyUnit% des {{tag:people|%enemyNation%}} a pillé %amount% pièces d’or de %colony%.
+combat.indianRaid=Nos espions nous rapportent que {{tag:country|%nation%}} a fait un raid sur la colonie {{tag:fem|%colonyNation%}} de %colony%.
+combat.indianSurprise={{ucfirst:{{tag:country|%nation%}}}} a fait un raid surprise sur %colony%, jetant l’alarme parmi nos colons. Le chef des {{tag:people|%nation%}} nie toute implication.
+combat.indianTreasure=Vous pillez %amount% de %settlement%.
+combat.nativeCapitalBurned=Vous avez brûlé %name%, la capitale de {{tag:country|%nation%}}. La nation se soumet !
+combat.newConvertFromAttack=Un(e) %unit% apeuré(e) des {{tag:people|%nation%}} vous rejoint !
+combat.shipDamaged=Votre %unit%  a été endommagé(e) par un(e) %enemyUnit% des {{tag:people|%enemyNation%}} et doit retourner en réparation (lieu : %repairLocation%). Tous les biens et les unités à bord ont été perdus.
 combat.shipDamagedByBombardment=%colony% ouvre le feu sur %unit% ! %unit% est endommagé(e) et doit retourner à %repairLocation% pour réparation. Tous les biens et les unités à bord ont été perdus !
-combat.shipEvaded=Le/La %unit% a déjoué une attaque d’un(e) %enemyUnit% des %enemyNation%.
-combat.shipEvadedBombardment=%colony% ouvre le feu sur un(e) %unit% des %nation%, mais celle-ci réussit à s’enfuir.
-combat.shipSunk=Votre %unit% a été coulé(e) par un(e) %enemyUnit% des %enemyNation% !
-combat.shipSunkByBombardment=%colony% ouvre le feu sur un(e) %unit% de %nation%, et le/la coule !
+combat.shipEvaded=Le/La %unit% a déjoué une attaque d’un(e) %enemyUnit% des {{tag:people|%enemyNation%}}.
+combat.shipEvadedBombardment=%colony% ouvre le feu sur un(e) %unit% des {{tag:people|%nation%}}, mais celle-ci réussit à s’enfuir.
+combat.shipSunk=Votre %unit% a été coulé(e) par un(e) %enemyUnit% des {{tag:people|%enemyNation%}} !
+combat.shipSunkByBombardment=%colony% ouvre le feu sur un(e) %unit% de {{tag:country|%nation%}}, et le/la coule !
 combat.tradeRouteSuspended=Suspension de la route commerciale %route% par suite de la perte de %stop%.
-combat.unitCaptured.veteranSoldier=%location% : Un soldat %nation% a été capturé par un(e) %enemyUnit% des %enemyNation%  et a perdu son statut de vétéran !
-combat.unitCaptured=%location% : Un(e) %unit% des %nation% a été capturé(e) par un(e) %enemyUnit% %enemyNation%.
-combat.unitDemoted.artillery=%location% : l’artillerie des %nation% a été endommagée par les %enemyUnit% des %enemyNation% ! D’autres dommages détruiraient les %unit%.
-combat.unitDemoted=%location% : Après avoir perdu une bataille contre l’unité %enemyUnit% %enemyNation%, l’unité %oldName% des %nation% a été rétrogradée en %unit%.
-combat.unitDemotedToUnarmed=%location% : Après avoir perdu une bataille contre l’unité %enemyUnit% %enemyNation%, l’unité %oldName% des %nation% a été rétrogradée en %unit%.
-combat.unitLoseAutoEquip=%location%: les %unit% des %nation% se sont défendus vaillamment, mais ont perdu au profit des attaquants %enemyUnit% des %enemyNation% les armes fournies par %settlement%.
-combat.unitPromoted=%oldName% %nation% a été promu %unit%.
-combat.unitSlaughtered.damagedArtillery=%location% : L’artillerie des %nation% a été détruite par un(e) %enemyUnit% des %enemyNation% !
-combat.unitSlaughtered=%location% : Un(e) %unit% des %nation% a été massacrée par un(e) %enemyUnit% %enemyNation% !
-combat.unitWinColony=%location% : les %unit% %nation% ont battu les %enemyUnit% %enemyNation% à %settlement%, mais n’ont pas pu capturer la colonie.
+combat.unitCaptured.veteranSoldier=%location% : Un soldat %nation% a été capturé par un(e) %enemyUnit% des {{tag:people|%enemyNation%}} et a perdu son statut de vétéran !
+combat.unitCaptured=%location% : Un(e) %unit% des {{tag:people|%nation%}} a été capturé(e) par un(e) %enemyUnit% {{tag:fem|%enemyNation%}}.
+combat.unitDemoted.artillery=%location% : l’artillerie des {{tag:people|%nation%}} a été endommagée par les %enemyUnit% des {{tag:people|%enemyNation%}} ! D’autres dommages détruiraient l’%unit%.
+combat.unitDemoted=%location% : Après avoir perdu une bataille contre l’unité %enemyUnit% {{tag:fem|%enemyNation%}}, l’unité %oldName% des {{tag:people|%nation%}} a été rétrogradée en %unit%.
+combat.unitDemotedToUnarmed=%location% : Après avoir perdu une bataille contre l’unité %enemyUnit% {{tag:fem|%enemyNation%}}, l’unité %oldName% des {{tag:people|%nation%}} a été rétrogradée en %unit%.
+combat.unitLoseAutoEquip=%location%: les %unit% des {{tag:people|%nation%}} se sont défendu(e)s vaillamment, mais ont perdu au profit des attaquants %enemyUnit% des {{tag:people|%enemyNation%}} les armes fournies par %settlement%.
+combat.unitPromoted=%oldName% %nation% a été promu(e) %unit%.
+combat.unitSlaughtered.damagedArtillery=%location% : L’artillerie des {{tag:people|%nation%}} a été détruite par un(e) %enemyUnit% des {{tag:people|%enemyNation%}} !
+combat.unitSlaughtered=%location% : Un(e) %unit% des {{tag:people|%nation%}} a été massacré(e) par un(e) %enemyUnit% %enemyNation% !
+combat.unitWinColony=%location% : les %unit% {{tag:plur|%nation%}} ont battu les %enemyUnit% %enemyNation% à %settlement%, mais n’ont pas pu capturer la colonie.
 model.region.north.name=Nord
 model.region.northEast.name=Nord-Est
 model.region.east.name=Est
@@ -2295,11 +2275,11 @@ model.region.atlantic.name=Océan Atlantique
 model.region.northAtlantic.name=Océan Atlantique Nord
 model.region.southAtlantic.name=Océan Atlantique Sud
 model.unit.arriveInEurope=Notre vaisseau est arrivé à %europe%, Excellence.
-model.unit.attrition=Votre %unit% à %location% s’est volatilisée dans les immensités sauvages!
+model.unit.attrition=Votre %unit% à %location% s’est volatilisée dans les immensités sauvages !
 model.unit.experience=À %colony%, %oldName% est devenu %unit% par expérience.
-model.unit.nativeSettlementContact=Vous avez rencontré des éclaireurs %nation% de %settlement%.
+model.unit.nativeSettlementContact=Vous avez rencontré des éclaireurs {{tag:plur|%nation%}} de %settlement%.
 model.unit.noMoreTools=%location% : Votre pionnier a utilisé tous ses outils et est redevenu %unit%.
-model.unit.slowed=Un(e) %enemyUnit% des %enemyNation% ralentit le déplacement de notre %unit%.
+model.unit.slowed=Un(e) %enemyUnit% des {{tag:people|%enemyNation%}} ralentit le déplacement de notre %unit%.
 model.unit.unitRepaired=Votre %unit% a été réparé(e) dans votre %repairLocation%.
 model.unit.hardyPioneer.noMoreTools=%location% : Votre pionnier a usé tous ses outils.
 error.couldNotLoad=Une erreur est survenue durant le chargement de la partie depuis le fichier %name% !
@@ -2309,49 +2289,42 @@ main.javaVersion=La version %minVersion% de Java ou mieux est recommandée pour
 main.memory=Vous devez assigner plus de %memory% octets de mémoire à la JVM.\n  Redémarrez FreeCol avec:  java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol ne peut pas trouver de répertoires appropriés pour enregistrer les données utilisateur. Exécution en cours, mais attendez-vous à des problèmes.
 client.baseData=Impossible de trouver le répertoire des données de base %dir%.\n  Les fichiers de données ne peuvent pas être trouvés par FreeCol.\n  Veuillez vous assurer qu’ils existent.\n  Si FreeCol cherche dans le mauvais répertoire, lancez alors le jeu avec un paramètre en ligne de commande:\n  --freecol-data <répertoire-données>
-# Fuzzy
-client.choicePlayer=Veuillez choisir un joueur :
+client.choicePlayer=Veuillez choisir une nation :
 client.classic=Échec au chargement de la cartographie des données depuis le jeu de règles 'classic'.
 client.debugConnect=Vous ne pouvez pas vous connecter à une partie existante en mode débogage.
 client.ending=La partie est terminée.
-client.headlessDebug=Le mode sans tête nécessite un lancement en débogage.
-client.headlessRequires=Le mode sans tête nécessite une partie sauvegardée ou une spécification.
+client.headlessDebug=Le mode sans graphisme nécessite un lancement en débogage.
+client.headlessRequires=Le mode sans graphisme nécessite une partie sauvegardée ou une spécification.
 client.laf=Impossible d’installer la présentation de FreeCol.
 client.noPlayers=Il n’y a pas de joueur disponible dans cette partie.
 metaServer.couldNotConnect=Désolé. Impossible de se connecter au méta-serveur. Réessayez ultérieurement.
 metaServer.communicationError=Erreur durant la communication avec le méta-serveur. Réessayez ultérieurement.
 abandonEducation.action.studying=étudiant
-abandonEducation.action.teaching=enseignement
-# Fuzzy
-abandonEducation.no=Non, continuer la formation
-abandonEducation.text=Si votre  %unit% quitte %colony%, il abandonnera %action% dans le %building%; êtes-vous sûr qu'il doive le laisser?
-# Fuzzy
-abandonEducation.yes=Oui, quitter la colonie
-abandonTeaching.text=Si votre %unit% quitte le %building%, elle cessera d’enseigner; êtes-vous sûr de la faire partir?
+abandonEducation.action.teaching=enseignant
+abandonEducation.no=Continuer la formation
+abandonEducation.text=Si votre  %unit% quitte %colony%, il abandonnera %action% dans le %building% ; êtes-vous sûr qu’il doive partir ?
+abandonEducation.yes=Abandonner la formation
+abandonTeaching.text=Si votre %unit% quitte le %building%, elle cessera d’enseigner ; êtes-vous sûr qu’il doive partir?
 armedUnitSettlement.attack=Attaquer
 armedUnitSettlement.tribute=Demander un tribut
 boycottedGoods.dumpGoods=Jeter la cargaison
 boycottedGoods.text=Le(a) %goods% est sous le coup d’un boycottage royal et ne peut être vendu à %europe%. Préférez-vous payer les arriérés (%amount% d’or), ou bien voulez-vous jeter la cargaison dans le port ?
 buy.moreGold=Négocier le prix à la baisse
 buy.takeOffer=Accepter l’offre
-buy.text=Le %nation% propose de vous vendre %goods% pour %gold% :
-clearTradeRoute.text=Votre %unit% est assigné à la route d’échanges %route%. Configurer sa destination le fera sortir de cette route. Voulez-vous vraiment faire cela ?
+buy.text={{ucfirst:{{tag:country|%nation%}}}} propose de vous vendre %goods% pour %gold% :
+clearTradeRoute.text=Votre %unit% est assigné(e) à la route d’échanges %route%. Configurer sa destination le/la fera sortir de cette route. Voulez-vous vraiment faire cela ?
 client.fullScreen=Le mode plein écran n’est pas supporté pour ce périphérique graphique.\nRetour au mode fenêtré.
-# Fuzzy
-confirmHostile.alliance=Vous ne pouvez attaquer une nation alliée ! Voulez-vous briser votre alliance avec les %nation% et déclarer la guerre ?
-# Fuzzy
-confirmHostile.ceaseFire=Vous avez signé un cessez-le-feu avec les %nation%. Voulez-vous vraiment les attaquer ?
-# Fuzzy
-confirmHostile.peace=Vous êtes en paix avec %nation%. Voulez-vous réellement déclarer la guerre ?
+confirmHostile.alliance=Vous ne pouvez pas attaquer une nation alliée ! Voulez-vous rompre votre alliance avec {{tag:country|%nation%}} et déclarer la guerre ?
+confirmHostile.ceaseFire=Vous avez signé un cessez-le-feu avec {{tag:country|%nation%}}. Voulez-vous vraiment les attaquer ?
+confirmHostile.peace=Vous êtes en paix avec {{tag:country|%nation%}}. Voulez-vous réellement déclarer la guerre ?
 confirmHostile.yes=Oui, lâchons les chiens de guerre !
-# Fuzzy
-confirmTribute.broke=Nos espions rapportent que les %nation% sont complètement à sec. Ne perdons pas notre temps avec des demandes de tribut.
-confirmTribute.european=Les %nation% %danger%, et %finance%. Quel montant de tribut devons-nous exiger d’eux ?
-confirmTribute.happy=Les %nation% à %settlement% sont bons amis avec nous, il serait dommage de porter atteinte à notre entente.
+confirmTribute.broke=Nos espions rapportent que {{tag:country|%nation%}} est complètement à sec. Ne perdons pas notre temps avec des demandes de tribut.
+confirmTribute.european=Les {{tag:people|%nation%}} %danger%, et %finance%. Quel montant de tribut devons-nous exiger d’eux ?
+confirmTribute.happy=Les {{tag:people|%nation%}} à %settlement% sont bons amis avec nous, il serait dommage de porter atteinte à notre entente.
 confirmTribute.no=Nous ferions peut-être mieux de ne pas
-confirmTribute.normal=Il est difficile d’en être sûr, mais les %nation% à %settlement% peuvent avoir quelque chose de valeur. Devons-nous leur demander un tribut ?
-confirmTribute.unwise=Les %nation% sont forts et nombreux ; il serait sûrement imprudent de les provoquer !
-confirmTribute.warLikely=Attention, une demande de tribut pourrait rallumer la guerre avec les %nation%.
+confirmTribute.normal=Il est difficile d’en être sûr, mais les {{tag:people|%nation%}} à %settlement% peuvent avoir quelque chose de valeur. Devons-nous leur demander un tribut ?
+confirmTribute.unwise=Les {{tag:people|%nation%}} sont forts et nombreux ; il serait sûrement imprudent de les provoquer !
+confirmTribute.warLikely=Attention, une demande de tribut pourrait rallumer la guerre avec les {{tag:people|%nation%}}.
 confirmTribute.yes=Procéder à la demande de tribut
 danger.high=sont bien mieux armés que nous
 danger.low=ne sont pas une menace pour nous
@@ -2364,8 +2337,7 @@ indianLand.cancel=Abandonner le pays
 indianLand.pay=Offrir %amount% or pour la terre
 indianLand.take=Prendre ce qui est à vous de droit
 indianLand.text=Cette terre est détenue par les %player%. Voulez vous :
-# Fuzzy
-indianLand.unknown=Des inconnus vivent sur ces terres. Voulez-vous :
+indianLand.unknown=Des personnes isolées vivent sur ces terres. Voulez-vous :
 info.autodetectLanguageSelected=Vous avez choisi l’autodétection de la langue. Vous devez redémarrer le jeu pour que ce changement prenne effet.
 info.enterSomeText=Entrez un texte S.V.P.
 info.newLanguageSelected=Vous avez choisi la langue : %language%. Vous devez redémarrer le jeu pour que ce changement prenne effet.
@@ -2380,7 +2352,7 @@ scoutColony.negotiate=Négocier avec le maire.
 scoutColony.spy=Espion dans la colonie
 scoutColony.text=Que voulez-vous faire de votre %unit% à %colony% ?
 scoutSettlement.attack=Attaquer
-scoutSettlement.greetings=Bienvenue, voyageur. Nous sommes les %nation% de %settlement%, une puissante tribu avec %number% %settlementType%.
+scoutSettlement.greetings=Bienvenue, voyageur. Nous sommes les {{tag:people|%nation%}} de %settlement%, une puissante tribu avec %number% %settlementType%.
 scoutSettlement.skill=Notre village est reconnu pour son savoir-faire : %skill%.
 scoutSettlement.speak=Demander à parler au chef
 scoutSettlement.trade.1=Nous aimerions échanger %goods1% avec vous.
@@ -2390,7 +2362,7 @@ scoutSettlement.tribute=Demander un tribut
 sell.gift=Donner les %goods% en cadeau
 sell.moreGold=Demander plus d’argent
 sell.takeOffer=Accepter l’offre
-sell.text=La %nation% voudrait acheter vos %goods% pour %gold% :
+sell.text={{ucfirst:{{tag:country|%nation%}}}} voudrait acheter vos %goods% pour %gold% :
 stopCurrentGame.no=Annuler
 stopCurrentGame.text=Une partie est en cours.
 stopCurrentGame.yes=Arrêter la partie
@@ -2410,10 +2382,8 @@ defeated.text=Vous avez été écrasé ! Voulez-vous :
 defeated.yes=Rester et regarder
 defeatedSinglePlayer.text=Vous avez été vaincu!\n\nVoici l’heure propice aux sorcelleries nocturnes, où les tombes bâillent, et où l’enfer lui-même souffle la contagion sur le monde. Maintenant, je pourrais boire du sang tout chaud, et faire une de ces actions amères que le jour tremblerait de regarder.
 defeatedSinglePlayer.yes=Entrer dans le monde de la Vengeance
-# Fuzzy
-diplomacy.offerAccepted=Le %nation% a accepté votre offre généreuse.
-# Fuzzy
-diplomacy.offerRejected=Le %nation% a refusé votre offre mesquine.
+diplomacy.offerAccepted={{ucfirst:{{tag:country|%nation%}}}} a accepté votre offre généreuse.
+diplomacy.offerRejected={{ucfirst:{{tag:country|%nation%}}}} a refusé votre offre généreuse.
 disbandUnit.text=Êtes-vous certain de vouloir dissoudre cette unité ?
 disbandUnit.yes=supprimer
 disembark.text=Salutations, marin, voulez-vous débarquer ?
@@ -2432,12 +2402,12 @@ highseas.no=Non, demeurons encore dans ces eaux.
 highseas.text=Nous avons atteint la haute mer, Votre Excellence. Il nous faudra %number% {{plural:%number%|one=tour|other=tours}} pour atteindre l'Europe. Devons-nous mettre les voiles ?
 highseas.yes=Oui, droit devant.
 indianDemand.food.no=Hélas, nos greniers sont vides.
-indianDemand.food.text=Les %nation% traversent des temps difficiles. Nous implorons les habitants de %colony% de partager avec nous leurs provisions. S’il vous plaît, nous aimerions avoir %amount% de nourriture.
+indianDemand.food.text=Les {{tag:people|%nation%}} traversent des temps difficiles. Nous implorons les habitants de %colony% de partager avec nous leurs provisions. S’il vous plaît, nous aimerions avoir %amount% de nourriture.
 indianDemand.food.yes=Nous partagerons avec plaisir.
 indianDemand.gold.no=Hors d’ici, voleurs !
-indianDemand.gold.text=Les colons de %colony% ont commis d’innombrables atrocités contre les %nation%. Nous demandons %amount% or en réparation.
+indianDemand.gold.text=Les colons de %colony% ont commis d’innombrables atrocités contre les {{tag:people|%nation%}}. Nous demandons %amount% pièces d’or en réparation.
 indianDemand.other.no=Hors d’ici, voleurs !
-indianDemand.other.text=Les colons de %colony% ont commis d’innombrables atrocités contre les %nation%. Nous demandons %amount% %goods% en réparation.
+indianDemand.other.text=Les colons de %colony% ont commis d’innombrables atrocités contre les {{tag:people|%nation%}}. Nous demandons %amount% %goods% en réparation.
 info.cantLearnSkill=Nous n’allons pas demander à votre %unit% de devenir un %skill%
 info.moveToDestinationFailed=Le %unit% à %location% est incapable de trouver un chemin vers %destination%!
 info.noMoreSkill=La compétence a déjà été donnée aux Européens. Nous n’avons rien de plus à enseigner.
@@ -2452,17 +2422,15 @@ missionarySettlement.cancel=Vivons tous en paix !
 missionarySettlement.inciteConfirm=Voulez-vous que nous attaquions %player% en échange de %amount% or ?
 missionarySettlement.inciteGoldFail=Pour inciter à une attaque sur %player% vous devez payer %amount% d’or.
 missionarySettlement.inciteQuestion=Quelle force européenne voudriez-vous que nous attaquions ?
-move.noAccessBeached=Un navire échoué des %nation% bloque notre chemin.
-move.noAccessContact=Nous devons d’abord entrer en contact avec les %nation%, Votre Excellence.
-move.noAccessGoods=La %nation% ne commercera pas avec un %unit% vide.
-move.noAccessMissionBan=Les %nation% refusent tout contact avec vos missionnaires.
-move.noAccessSettlement=Les %nation% ne permettent pas à nos %unit% d’entrer dans leur colonie.
+move.noAccessBeached=Un navire échoué des {{tag:people|%nation%}} bloque notre chemin.
+move.noAccessContact=Nous devons d’abord entrer en contact avec les {{tag:people|%nation%}}, Votre Excellence.
+move.noAccessGoods={{ucfirst:{{tag:country|%nation%}}}} ne commercera pas avec un(e) %unit% vide.
+move.noAccessMissionBan=Les {{tag:people|%nation%}} refusent tout contact avec vos missionnaires.
+move.noAccessSettlement=Les {{tag:people|%nation%}} ne permettent pas à nos %unit% d’entrer dans leur agglomération.
 move.noAccessSkill=Nos %unit% ne peuvent rien apprendre des indigènes.
-# Fuzzy
-move.noAccessTrade=Nous n’avons pas l’autorité pour commercer avec d’autres nations européennes comme les %nation%.
-# Fuzzy
-move.noAccessWar=Nous ne pouvons pas commercer avec les %nation% lorsque nous sommes en guerre.
-move.noAccessWater=Nos %unit% doivent accoster avant d’entrer dans la colonie.
+move.noAccessTrade=Nous n’avons pas l’autorisation de commercer avec d’autres nations européennes telles que {{tag:country|%nation%}}.
+move.noAccessWar=Nous ne pouvons pas commercer avec la nation {{tag:fem|%nation%}} lorsque nous sommes en guerre.
+move.noAccessWater=Nos %unit% doivent accoster avant d’entrer dans l’agglomération.
 move.noAttackWater=Notre %unit% doit atterrir avant d'attaquer.
 move.noTile=Notre %unit% n'est pas sur la carte!
 nameRegion.text=Vous avez découvert un(e) %type% que vous revendiquez au nom de la couronne ! Comme il est habituel, vous pouvez lui donner un nom :
@@ -2476,7 +2444,7 @@ renameUnit.text=Donnez un nom à votre unité :
 scoutSettlement.expertScout=Nous avons beaucoup apprécié les bons rapports de votre éclaireur, et nous vous fournirons donc de l'aide pour vos futures explorations.\nVotre éclaireur est devenu un %unit%.
 scoutSettlement.speakBeads=Bienvenue, voyageur. Prenez ces inestimables cadeaux (environ %amount% or) et ramenez-les à votre chef en signe de paix.
 scoutSettlement.speakDie=Vous avez bafoué un rituel sacré de la tribu ! Vous servirez de cible à notre entraînement.
-scoutSettlement.speakNothing=Nous sommes toujours heureux d’accueillir des voyageurs %nation%.
+scoutSettlement.speakNothing=Nous sommes toujours heureux d’accueillir des voyageurs {{tag:plur|%nation%}}.
 scoutSettlement.speakTales=Nous avons plaisir à rencontrer des voyageurs lointains. Venez vous asseoir près du feu, nous vous parlerons des contrées alentour.
 sellProposition.text=Voulez-vous vendre quelques biens ?
 trade.noTrade=Commerce refusé à %settlement%.
@@ -2484,7 +2452,7 @@ trade.noTradeGoods=Désolé, nous n’avons pas besoin de davantage de %goods%!
 trade.noTradeHaggle=Nous sommes lassés de vos marchandages incessants.
 trade.noTradeHostile=Nous vous détestons, vous et vos biens. Allez-vous-en!
 trade.nothingToSell=Désolé, nous n’avons rien à vendre pour le moment !
-tradeProposition.welcome=Commercer avec les %nation% à %settlement%
+tradeProposition.welcome=Commercer avec les {{tag:people|%nation%}} à %settlement%
 tradeRoute.atStop=À %location% :
 tradeRoute.loadStop=%amount% %goods% chargés.
 tradeRoute.loadStopBlocked=%goods% inattendus trouvés à bord.
@@ -2517,6 +2485,7 @@ server.invalidPlayerNations=Chaque joueur doit choisir une nation avant de comme
 server.maximumPlayers=Désolé, le nombre maximum de joueurs est atteint.
 server.missingUserName=Le nom d'utilisateur est absent de la demande de connexion.
 server.missingVersion=La version de FreeCol est absence de la demande de connexion.
+# Fuzzy
 server.noRouteToServer=Le serveur ne peut pas être rendu publiquement accessible. Vous devez configurer de votre pare-feu de façon à autoriser les connexions entrantes sur le numéro de port que vous avez spécifié.
 server.noSuchPlayer=La partie ne contient pas de joueur appelé : %player%
 server.notAllReady=Tous les joueurs ne sont pas prêts.
@@ -2526,31 +2495,29 @@ server.timeOut=Temps d’attente dépassé lors de la connexion avec le serveur.
 server.userNameInUse=Le nom d'utilisateur spécifié est déjà utilisé.
 server.userNameNotPresent=Le nom d'utilisateur spécifié n'est pas dans ce jeu.
 server.wrongFreeColVersion=Les versions client et serveur de FreeCol ne concordent pas.
-# Fuzzy
-buildColony.others=Les %nation% ont fondé la nouvelle colonie de %colony% dans %region%.
-cashInTreasureTrain.colonial=Un trésor d’un montant de %amount% or a été envoyé en Europe. %cashInAmount% pièces d’or vous ont été versées.
-cashInTreasureTrain.independent=Un trésor de %amount% a été ajouté au trésor national.
-cashInTreasureTrain.otherColonial=Un trésor de %amount% a été débarqué en Europe. Le monarque de %nation% est apparemment heureux.
-cashInTreasureTrain.otherIndependent=Un trésor de %amount% a été ajouté au trésor de %nation%.
-declareIndependence.announce=Les colonies de %oldNation% ont déclaré leur indépendance de %ruler% et sont maintenant connues sous le nom de %newNation%.
-declareIndependence.continentalArmyMuster=À l'appui de votre déclaration d’indépendance, %number% {{plural:%number%|%oldUnit%}}s à %colony% {{plural:%number%|one=a été promue|other=ont été promues}} à {{plural:%number%|%unit%}}s!
-declareIndependence.interventionForce={{tag:country|%nation%}} s'engage solennellement à envoyer une Force d'Intervention pour appuyer votre combat légitime pour l'indépendance, pour vu que vous génériez  %number% {{PLURAL:%number%|one=cloche|other=cloches}} de la liberté afin de prouver votre détermination.
-declareIndependence.nativeSupport=Les %nation% déclarer leur mépris envers %ruler% et la Force Royale Expéditionnaire, et promettent de les attaquer à la moindre occasion.
-# Fuzzy
-declareIndependence.nativeHostile=Nos espions signalent que la Force Royale Expéditionnaire a établi des relations amicales avec les %nation%. Méfiez-vous qu’ils pourraient préparer une attaque !
+buildColony.others={{ucfirst:{{tag:country|%nation%}}}} a fondé la nouvelle colonie de %colony% dans %region%.
+cashInTreasureTrain.colonial=Un trésor d’un montant de %amount% pièces d’or a été envoyé en Europe. %cashInAmount% pièces d’or vous ont été versées.
+cashInTreasureTrain.independent=Un trésor de %amount% pièces d’or a été ajouté au trésor national.
+cashInTreasureTrain.otherColonial=Un trésor de %amount% pièces d’or a été débarqué en Europe. Le monarque de {{tag:country|%nation%}} est apparemment heureux.
+cashInTreasureTrain.otherIndependent=Un trésor de %amount% pièces d’or a été ajouté au trésor de {{tag:country|%nation%}}.
+declareIndependence.announce=Les colonies {{tag:femplur|%oldNation%}} ont déclaré leur indépendance de %ruler% et sont maintenant connues sous le nom de %newNation%.
+declareIndependence.continentalArmyMuster=À l’appui de votre déclaration d’indépendance, %number% {{plural:%number%|%oldUnit%}}s à %colony% {{plural:%number%|one=a été promue|other=ont été promues}} à {{plural:%number%|%unit%}}s!
+declareIndependence.interventionForce={{ucfirst:{{tag:country|%nation%}}}} s’engage solennellement à envoyer une Force d’intervention pour appuyer votre combat légitime pour l’indépendance, pourvu que vous génériez %number% {{PLURAL:%number%|one=cloche|other=cloches}} de la liberté afin de prouver votre détermination.
+declareIndependence.nativeSupport=Les {{tag:people|%nation%}} ont déclaré leur mépris envers %ruler% et le Corps expéditionnaire royal, et promettent de l’attaquer à la moindre occasion.
+declareIndependence.nativeHostile=Nos espions signalent que le Corps expéditionnaire royal a établi des relations amicales avec la nation {{tag:fem|%nation%}}. Méfiez-vous, ils pourraient préparer une attaque !
 declareIndependence.resolution=Aujourd’hui, le Congrès a approuvé la plus importante Résolution qui n'ait jamais été prise en Amérique.\n\nJe suis bien conscient que cela va Nous demander beaucoup de Labeur, de Sang et d’Or pour pouvoir maintenir cette Déclaration et pour soutenir et défendre ces États. Déjà je peux discerner au travers de toute cette Obscurité les superbes Rayons de la Lumière et de la Gloire. Je peux prédire que la Fin vaudra bien mieux que tous les Moyens. Et que la Postérité triomphera des Tractations de nos Jours, qui nous pousseraient à nous ruer ou à fuir, ce dont je crois que Dieu saura absolument nous préserver.\n\nLe Corps expéditionnaire royal tombera bientôt sur nous. Préparez nos défenses avec soin pendant que nous réunissons des volontaires pour une nouvelle Armée Continentale.
 declareIndependence.unitsSeized=En réaction à votre déclaration d’indépendance, la Couronne a saisi les unités suivantes en Europe et en mer : %units%
 deliverGift.goods=Les %player% offrent %amount% %type% en cadeau à %settlement%.
-giveIndependence.announce=Vous avez vaincu les %ref% et finalement gagné votre indépendance ! Vos douanes peuvent dès maintenant vendre aux Européens sans devoir payer de taxes ou souffrir d’ingérence royale.
-giveIndependence.otherAnnounce=Les %nation% ont battu les %ref% et gagné leur indépendance !
+giveIndependence.announce=Vous avez vaincu le %ref% et finalement gagné votre indépendance ! Vos douanes peuvent dès maintenant vendre aux Européens sans devoir payer de taxes ou souffrir d’ingérence royale.
+giveIndependence.otherAnnounce=Les {{tag:people|%nation%}} ont battu le %ref% et gagné leur indépendance !
 giveIndependence.unitsAcquired=Les Corps expéditionnaires royaux suivants se sont rendus à vos forces victorieuses : %units%
-indianSettlement.mission.enemyDenounce=Un missionnaire %enemy% a accusé notre missionnaire à %settlement% d’hérésie, mais les %nation% ont rejeté la revendication.
-indianSettlement.mission.noDenounce=Les %nation% rejettent les affirmations d’hérésie, et exécutent votre missionnaire en tant que faux prophète.
-indianSettlement.mission.tension.angry=Missionnaire capturé, les %nation% refusent votre nouvelle religion.
-indianSettlement.mission.tension.content=Mission fondée, les %nation% abordent votre nouvelle religion avec curiosité.
-indianSettlement.mission.tension.displeased=Mission fondée, les %nation% sont offensés.
-indianSettlement.mission.tension.happy=Mission fondée, les %nation% aborde votre nouvelle religion avec joie.
-indianSettlement.mission.tension.hateful=Missionnaire sacrifié, les %nation% rient de votre nouvelle religion.
+indianSettlement.mission.enemyDenounce=Un missionnaire %enemy% a accusé notre missionnaire à %settlement% d’hérésie, mais les {{tag:people|%nation%}} ont rejeté la revendication.
+indianSettlement.mission.noDenounce=Les {{tag:people|%nation%}} rejettent les affirmations d’hérésie, et exécutent votre missionnaire en tant que faux prophète.
+indianSettlement.mission.tension.angry=Missionnaire capturé, les {{tag:people|%nation%}} refusent votre nouvelle religion.
+indianSettlement.mission.tension.content=Mission fondée, les {{tag:people|%nation%}} abordent votre nouvelle religion avec curiosité.
+indianSettlement.mission.tension.displeased=Mission fondée, les {{tag:people|%nation%}} sont offensés.
+indianSettlement.mission.tension.happy=Mission fondée, les {{tag:people|%nation%}} abordent votre nouvelle religion avec joie.
+indianSettlement.mission.tension.hateful=Missionnaire sacrifié, les {{tag:people|%nation%}} rient de votre nouvelle religion.
 scoutSettlement.tributeAgree=Nous acceptons de payer %amount% or afin de préserver la paix, mais n’essayez pas de le refaire une seconde fois !
 scoutSettlement.tributeDisagree=Nous ne répondrons pas à votre demande. Maintenant quittez nos terres.
 colopedia.birthAndDeath=Naissance et décès
@@ -2572,7 +2539,7 @@ colopedia.buildings.teaches=Enseigne
 colopedia.buildings.workplaces=Places de travail
 colopedia.buildings.requiredPopulation=%number% {{plural:%number%|one=colon|other=colons|default=colon}}
 colopedia.concepts.education.name=Éducation
-colopedia.concepts.education.description=<html><p>La manière la plus efficace pour éduquer vos colons est de construire une <a href="http:///id/model.building.schoolhouse">école</a> et d’assigner une unité experte comme enseignant. L’enseignant transformera alors un <a href="http:///id/model.unit.freeColonist">colon libre</a> en un expert du même type. Les enseignants peuvent aussi améliorer les <a href="http:///id/model.unit.pettyCriminal">petits délinquants</a> en <a href="http:///id/model.unit.indenturedServant">serfs</a>, et les serfs en colons libres.</p><p>Certaines compétences peuvent aussi être apprises des indigènes, en envoyant un colon libre ou un serf vivre dans un campement indigène pendant un tour. Et certaines compétences peuvent aussi être apprises par l’expérience, en mettant un colon libre au travail sur une case de la colonie. Les colons libres travaillant dans les champs et les forêts autour de vos colonies accumulent jusqu’à 200 points d’expérience, ce qui leur donne quatre pourcent de chances d’être améliorés.</p></html>
+colopedia.concepts.education.description=<html><p>La manière la plus efficace pour éduquer vos colons est de construire une <a href="http:///id/model.building.schoolhouse">école</a> et d’assigner une unité experte comme enseignant. L’enseignant transformera alors un <a href="http:///id/model.unit.freeColonist">colon libre</a> en un expert du même type. Les enseignants peuvent aussi améliorer les <a href="http:///id/model.unit.pettyCriminal">petits délinquants</a> en <a href="http:///id/model.unit.indenturedServant">serfs</a>, et les serfs en colons libres.</p><p>Certaines compétences peuvent aussi être apprises des indigènes, en envoyant un colon libre ou un serf vivre dans une agglomération indigène pendant un tour. Et certaines compétences peuvent aussi être apprises par l’expérience, en mettant un colon libre au travail sur une case de la colonie. Les colons libres travaillant dans les champs et les forêts autour de vos colonies accumulent jusqu’à 200 points d’expérience, ce qui leur donne quatre pourcent de chances d’être améliorés.</p></html>
 colopedia.concepts.efficiency.name=Efficacité
 colopedia.concepts.efficiency.description=<html><p>L'efficacité de vos colonies dépend de leur soutien à l'idée d'indépendance. Si 50 % des colons soutiennent la cause des rebelles, la colonie reçoit un bonus de production de + 1. Dès que 100 % des colons deviennent des rebelles, la prime à la production passe à + 2.</p><p>En revanche, si le nombre des royalistes dépasse la <i>limite de mauvais gouvernement</i>, la colonie encourt une peine de production de -1. Si le nombre des royalistes dépasse la <i>limite de très mauvais gouvernement</i>, la pénalité de production passe à -2. Ces deux limites dépendent du niveau de difficulté et peuvent être vérifiées dans le <a href="http:///action/difficultyAction">rapport sur le niveau de difficulté</a>.</p><p>Afin d'augmenter l'efficacité d'une colonie, vous devez réduire sa population ou produire davantage de <a href="http:///id/model.goods.bells">cloches de la liberté</a>.</p></html>
 colopedia.concepts.fortification.name=Fortification
@@ -2609,10 +2576,10 @@ colopedia.nationType.aggression=Agressivité
 colopedia.nationType.settlementNumber.average=Moyen
 colopedia.nationType.settlementNumber.high=Important
 colopedia.nationType.settlementNumber.low=Faible
-colopedia.nationType.settlementNumber=Nombre de lieux habités :
+colopedia.nationType.settlementNumber=Nombre d’agglomérations :
 colopedia.nationType.regions=Régions habitées :
 colopedia.nationType.skills=Compétences enseignées :
-colopedia.nationType.typeOfSettlements=Type de lieux habités :
+colopedia.nationType.typeOfSettlements=Type d’agglomération :
 colopedia.nationType.units=Unités de départ :
 colopedia.terrain.colonistProduction=Production de colons
 colopedia.terrain.colonyCenterTile=Case centrale de colonie
@@ -2635,8 +2602,7 @@ colopedia.unit.offensivePower=Potentiel offensif :
 colopedia.unit.price=Prix en Europe :
 colopedia.unit.productionBonus={{plural:%number%|one=Modificateur|other=Modificateurs}} de production :
 colopedia.unit.requirements=Exigences :
-# Fuzzy
-colopedia.unit.school=Établissement de formation :
+colopedia.unit.school=Peut former en :
 colopedia.unit.skill=Compétence :
 report.labour.allColonists=Tous les colons
 report.labour.amateursWorking=amateurs
@@ -2661,41 +2627,60 @@ report.labour.unitTotal.tooltip=%unit% ou devenant %unit%
 report.labour.workingAs=Emploi
 report.labour.workingAsOther=autre
 report.colony.arriving.description=%colony%: nouveau %unit% {{plural:%turns%|one=au prochain tour|other=dans %turns% tours}}
+report.colony.arriving.summary.description=Le nombre moyen de tours avant qu’un nouveau colon arrive dans les colonies de ce continent
 report.colony.birth.description=Nombre de tours avant qu'un nouveau colon arrive ou soit affamé
 report.colony.explore.description=Nombre de carreaux à Découvrir autour de la colonie
 report.colony.explore.header=E
 report.colony.exploring.description=%colony% aurait intérêt à explorer {{plural:%amount%|one=une case|other=%amount% cases}}
+report.colony.exploring.summary.description=Nombre total de cases de colonie qui bénéficieront de l’exploration pour ce continent.
 report.colony.grow.description=Nombre d'unités que la colonie peut développer sans nuire à sa production
 report.colony.grow.header=+
 report.colony.growing.description=%colony% peut croître de {{plural:%amount%|one=une unité|other=%amount% unités}} sans nuire à sa production
+report.colony.growing.summary.description=Le nombre total de colons qui peuvent rejoindre les colonies de ce continent sans nuire à la production
 report.colony.improve.description=Unités qui pourraient améliorer la production.
 report.colony.improve.header=Améliorer
-# Fuzzy
-report.colony.improving.description=%colony%: Pour produire %amount% de plus de %goods%, remplacez %oldUnit% par %unit%
+report.colony.improving.description=%colony% à %location% : Pour produire %amount% de plus de %goods%, remplacez %oldUnit% par %unit%
+report.colony.improving.summary.description=Unités (type et nombre) qui peuvent être bénéfiques aux colonies de ce continent
 report.colony.making.blocking.description=%colony%: %amount% %goods% nécessaires pour %buildable% {{plural:%turns%|one=au prochain tour|other=dans %turns% tours}}
 report.colony.making.constructing.description=%colony%: %buildable% terminé {{plural:%turns%|one=au prochain tour|other=dans %turns% tours}}
 report.colony.making.description=Ce que cette colonie fait
 report.colony.making.educating.description=%colony%: %teacher% diplômé {{plural:%turns%|one=au prochain tour|other=dans %turns% tours}}
+report.colony.making.educationVacancy.description=%colony% : {{plural:%number%|one=une place d’étudiant est vacante|other=%number% places d’étudiant sont vacantes}}
+report.colony.making.educating.summary.description=Unités (type et nombre) des écoles de ce continent en instance de diplômation
 report.colony.making.header=Fabrication
 report.colony.making.noconstruction.description=%colony%: Pas de construction en cours
 report.colony.making.noteach.description=%colony%: %teacher% n'a pas d'étudiant
+report.colony.making.summary.description=Le déficit de %goods% par tour est dû aux exigences de construction non satisfaites sur ce continent
 report.colony.name.description=La liste des colonies
 report.colony.name.header=Colonie
-# Fuzzy
-report.colony.production.description=%colony%: production nette de %goods% = %amount%
-# Fuzzy
-report.colony.production.export.description=%colony%: la production nette de %goods% est de %amount% (exporté au-dessus de %export%)
+report.colony.name.summary.description=La région de ce continent contenant le plus de ces colonies
+report.colony.production.description=%colony% : %amount% de %goods% sont produits
+report.colony.production.export.description=%colony% : %amount% de %goods% sont produits (exporté au-dessus de %export%)
 report.colony.production.header=Production net de %goods%
-# Fuzzy
-report.colony.production.high.description=%colony%: production nette de %goods% = %amount%, totale {{plural:%turns%|one=le prochain tour|other=dans %turns% tours}}
-# Fuzzy
-report.colony.production.low.description=%colony%: production nette de %goods% = %amount%, disparue {{plural:%turns%|one=le prochain tour|other=dans %turns% tours}}
-# Fuzzy
-report.colony.production.waste.description=%colony%: production nette de %goods% = %amount%, l'entrepôt va déborder, %waste% sera perdu
+report.colony.production.high.description=%colony% : %amount% de %goods% sont produits, sera plein {{plural:%turns%|one=le prochain tour|other=dans %turns% tours}}
+report.colony.production.low.description=%colony% : %amount% de %goods% consommés, sera vide {{plural:%turns%|one=le prochain tour|other=dans %turns% tours}}
+report.colony.production.maxConsumption.description=%colony% : %amount% de %goods% sont consommés (peut en consommer %more% de plus)
+report.colony.production.maxProduction.description=%colony% : %amount% de %goods% sont produits (%more% de plus pourraient l’être)
+report.colony.production.summary.description=La quantité de marchandises produite ou consommée
+report.colony.production.waste.description=%colony% : %amount% de %goods% sont produits, l’entrepôt va déborder, %waste% seront perdus
+report.colony.tile.clearForest.description=%colony% aurait intérêt à nettoyer {{plural:%amount%|one=une case|other=%amount% cases}}
+report.colony.tile.clearForest.specific.description=%colony% aurait intérêt à nettoyer %location%
+report.colony.tile.clearForest.header=C
+report.colony.tile.clearForest.header.description=Nombre de cases de colonie qu’il serait intéressant de nettoyer.
+report.colony.tile.clearForest.summary.description=Nombre total de cases de colonie qui auraient intérêt à être nettoyées sur ce continent.
+report.colony.tile.plow.description=%colony% aurait intérêt à labourer {{plural:%amount%|one=une case|other=%amount% cases}}
+report.colony.tile.plow.specific.description=%colony% aurait intérêt à labourer %location%
+report.colony.tile.plow.header=P
+report.colony.tile.plow.header.description=Nombre de cases de colonie qui auraient intérêt à être labourées.
+report.colony.tile.plow.summary.description=Nombre total de cases de colonie qui auraient intérêt à être labourées sur ce continent.
+report.colony.tile.road.description=%colony% aurait intérêt à construire {{plural:%amount%|one=une route|other=%amount% routes}}
+report.colony.tile.road.specific.description=%colony% aurait intérêt à construire une route à %location%
+report.colony.tile.road.header=R
+report.colony.tile.road.header.description=Nombre de cases de colonie qui auraient intérêt à construire une route.
+report.colony.tile.road.summary.description=Nombre total de cases de colonie qui auraient intérêt à construire une route sur ce continent.
 report.colony.shrinking.description=%colony% doit être réduite de {{plural:%amount%|one=une unité|other=%amount% unités}} pour améliorer sa production
 report.colony.starving.description=%colony%: famine {{plural:%turns%|one=au prochain tour|other=dans %turns% tours}}
-# Fuzzy
-report.colony.wanting.description=%colony%: Pour produire %amount% de plus de %goods%, ajoutez %unit%
+report.colony.wanting.description=%colony% à %location% : Pour produire %amount% de plus de %goods%, ajoutez %unit%
 report.continentalCongress.available=Disponible
 report.continentalCongress.elected=Élu : %turn%
 report.continentalCongress.none=(aucun)
@@ -2717,50 +2702,52 @@ report.foreignAffair.sonsOfLiberty=Fils de la Liberté
 report.foreignAffair.stance=Relations
 report.highScores.colonies=Nombre de colonies :
 report.highScores.difficulty=Difficulté :
-report.highScores.governor=Gouverneur %name% de %nation%
+report.highScores.governor=Gouverneur %name% de {{tag:country|%nation%}}
 report.highScores.independence=Indépendance déclarée :
 report.highScores.nation=Nation :
-report.highScores.nationType=Avantage national :
-report.highScores.president=Président %name% de %nation%
+report.highScores.nationType=Atout national :
+report.highScores.president=Président %name% de {{tag:country|%nation%}}
 report.highScores.retired=Abandon :
 report.highScores.score=Pointage :
 report.highScores.turn=Année :
 report.highScores.units=Nombre d’unités :
 report.indian.chieftain=Nom du chef :
 report.indian.mostHated=Le plus détesté
-report.indian.noKnownSettlements=Aucun lieu connu.
-report.indian.numberOfSettlements=Lieux connus :
+report.indian.noKnownSettlements=Aucune agglomération connue.
+report.indian.numberOfSettlements=Agglomérations connues :
 report.indian.tension=Tension
 report.indian.tradeInterests=Intérêts commerciaux
 report.indian.tribeTension=Tension Tribale :
-report.indian.typeOfSettlements=Type de lieu :
+report.indian.typeOfSettlements=Type d’agglomération :
 report.labour.details.name=Détails du rapport de travail
 report.production.selectGoods=Sélectionner les biens
 report.production.update=Mettre à jour
 report.requirements.badAssignment=%colony% a un %expert% qui travaille actuellement comme %expertWork%, alors qu’un %nonExpert% travaille comme %nonExpertWork%. La production serait plus importante si les colons échangeaient leurs emplois.
 report.requirements.canTrainExperts={{plural:2|%unit%}} peuvent être formées à
-# Fuzzy
-report.requirements.exploreTile=%type% vers %direction% de %colony% serait intéressant pour l'exploration.
+report.requirements.exploreTile=%location% serait intéressant à explorer.
 report.requirements.met=Toutes les conditions sont réunies.
 report.requirements.missingGoods=%colony% fabrique des %goods%, mais elle a besoin de plus de %input%.
 report.requirements.misusedExperts=Il y a des {{plural:2|%unit%}} qui ne travaillent pas comme %work% à
 report.requirements.noExpert=%colony% fabrique des %goods%, mais elle n’a pas de %unit%.
+report.requirements.tile.clearForest=%location% aurait intérêt à être nettoyé.
+report.requirements.tile.plow=%location% aurait intérêt à être labouré.
+report.requirements.tile.road=%location% aurait intérêt à construire une route.
 report.requirements.severalExperts=Plusieurs {{plural:2|%unit%}} sont présentes à
 report.requirements.surplus=Un surplus de %goods% est produit à
 report.trade.afterTaxes=Solde après taxes
 report.trade.beforeTaxes=Solde avant taxes
 report.trade.cargoUnits=Unités en transit
-# Fuzzy
-report.trade.hasCustomHouse=* Cette colonie a une douane ; ces marchandises sont exportées.
+report.trade.export=Exporter %goods% au-delà de %amount%
+report.trade.hasCustomHouse=* Cette colonie a une douane et peut exporter des marchandises.
 report.trade.totalDelta=Total de la production
 report.trade.totalUnits=Total des unités
 report.trade.unitsSold=Nb acheté/vendu
 report.turn.filter=Ne pas afficher ce type de message (%type%)
 report.turn.ignore=Ignorer ce message (Colonie : %colony% ; marchandises : %goods%)
-# Fuzzy
-report.turn.playerNation=%nation% de %player%
+report.turn.playerNation={{ucfirst:{{tag:country|%nation%}}}} de %player%
 aboutPanel.copyright=Copyright © 2002-2015  L’équipe FreeCol
 aboutPanel.legalDisclaimer=FreeCol est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier au titre des clauses de la Licence Publique Générale GNU, telle qu’elle est publiée par la Free Software Foundation dans sa version 2, ou dans une version ultérieure.
+aboutPanel.manual=Téléchargement du Manuel de FreeCol
 aboutPanel.officialSite=Site officiel :
 aboutPanel.sfProject=Projet SourceForge :
 aboutPanel.version=Version :
@@ -2783,8 +2770,7 @@ colonyPanel.buildQueue=Créer la playlist
 colonyPanel.colonyUnits=Unités de la colonie
 colonyPanel.inPort=Au port
 colonyPanel.outsideColony=Hors de la colonie
-# Fuzzy
-colonyPanel.producing=Production en cours :
+colonyPanel.producing=production en cours :
 colonyPanel.reducePopulation=Si vous réduisez la population à une valeur inférieure à %number%, %colony% ne pourra plus construire de %buildable%.
 colonyPanel.setGoods=Ensemble de biens
 colonyPanel.traceWork=Trace de travail
@@ -2799,10 +2785,8 @@ confirmDeclarationDialog.areYouSure.no=Peut-être plus tard
 confirmDeclarationDialog.areYouSure.text=Permettez-nous de nous affranchir de la tyrannie injuste de %monarch% et déclarer l’indépendance de nos colonies de la couronne !
 confirmDeclarationDialog.areYouSure.yes=Vivre libre ou mourir !
 confirmDeclarationDialog.createFlag=et nos ennemis trembleront à la vue de notre bannière rebelle.
-# Fuzzy
-confirmDeclarationDialog.defaultCountry=États-Unis de %nation%
-# Fuzzy
-confirmDeclarationDialog.defaultNation=%nation% libre
+confirmDeclarationDialog.defaultCountry=États-Unis {{tag:plur|%nation%}}
+confirmDeclarationDialog.defaultNation={{ucfirst:{{tag:country|%nation%}}}} libre
 confirmDeclarationDialog.enterCountry=Désormais, notre pays doit être connu comme
 confirmDeclarationDialog.enterNation=et chaque citoyen de notre glorieuse nation doit être fier d’être connu comme
 flag.background.FESSES=Coupé
@@ -2853,21 +2837,19 @@ negotiationDialog.add=Ajouter
 negotiationDialog.cancel=Annuler
 negotiationDialog.clear=Nettoyer
 negotiationDialog.contact.tutorial=Vous rencontrez d’autres Européens. Ils seront en compétition avec vous pour les terres et les richesses, et peuvent même partir en guerre contre vous. Mais une fois que Jan de Witt a rejoint le Congrès continental, vous pourrez commercer avec eux.
-# Fuzzy
-negotiationDialog.demand=Le %nation% exige de %otherNation%
+negotiationDialog.demand={{ucfirst:{{tag:country|%nation%}}}} exige de {{tag:country|%otherNation%}}
 negotiationDialog.exchange=en échange de
 negotiationDialog.goldAvailable=(%amount% or disponible)
-# Fuzzy
-negotiationDialog.offer=Le %nation% offre à %otherNation%
+negotiationDialog.offer={{ucfirst:{{tag:country|%nation%}}}} offre à {{tag:country|%otherNation%}}
 negotiationDialog.send=Envoyer
 negotiationDialog.title.contact=Rencontre des autres européens
 negotiationDialog.title.diplomatic=Négociation diplomatique
 negotiationDialog.title.trade=Négociation commerciale
 negotiationDialog.title.tribute=Demande de tribut
-editSettlementDialog.removeSettlement=Supprimer le lieu habité
-editSettlementDialog.removeSettlement.text=Voulez-vous supprimer ce lieu habité ?
-emigrationDialog.chooseImmigrant=Choisissez l'unité que vous voulez voir émigrer d’Europe.
-endTurnDialog.areYouSure={{plural:%number%|one=L'unité suivante attend|other=Les unités suivantes attentent}} toujours les ordres, ou {{plural:%number%|one=a été commandée|other=ont été commandées}} à attendre. Êtes-vous sûr de vouloir terminer le tour maintenant ?
+editSettlementDialog.removeSettlement=Supprimer l’agglomération
+editSettlementDialog.removeSettlement.text=Voulez-vous supprimer cette agglomération ?
+emigrationDialog.chooseImmigrant=Choisissez l’unité que vous voulez voir émigrer d’Europe.
+endTurnDialog.areYouSure={{plural:%number%|one=L’unité suivante attend|other=Les unités suivantes attendent}} toujours les ordres, ou {{plural:%number%|one=a|other=ont}} reçu l’ordre d’attendre. Êtes-vous sûr de vouloir terminer le tour maintenant ?
 endTurnDialog.name=Fin du tour
 errorPanel.showLogFile=Afficher le fichier journal
 europePanel.leaveColonists=Faire voile sur %newWorld% en laissant les colons sur le quai ?
@@ -2876,15 +2858,16 @@ europePanel.transaction.price=Prix :\t%gold%
 europePanel.transaction.purchase=Acheter %amount% %goods% @%gold%
 europePanel.transaction.sale=Vendre %amount% %goods% @%gold%
 europePanel.transaction.tax=-%tax% % :\t%gold%
-findSettlementPanel.displayAll=Trouver tous les campements
-findSettlementPanel.displayOnlyEuropean=Trouver uniquement les campements européens
-findSettlementPanel.displayOnlyNatives=Trouver uniquement les campements indigènes
-findSettlementPanel.name=Trouver un campement
-# Fuzzy
-firstContactDialog.meeting.natives=Rencontre avec les indigènes...
-firstContactDialog.meeting.natives.tutorial=Vous avez rencontré des indigènes. Envoyez vos éclaireurs à leurs campements afin d’en savoir plus sur eux, et vos domestiques contractuels et vos colons libres pour apprendre de leur part. Envoyez vos navires et vos convois de charriot à leurs campements si vous voulez commercer avec eux.
-firstContactDialog.welcomeOffer.text=Les %nation% vous accueillent. Nous sommes une glorieuse nation de %camps% %settlementType%. Pour célébrer notre amitié, nous vous offrons généreusement en cadeau la terre que vous occupez actuellement. Acceptez-vous notre traité et de demeurer avec nous en paix fraternelle ?
-firstContactDialog.welcomeSimple.text=Les %nation% vous accueillent. Nous sommes une glorieuse nation de %camps% %settlementType%. Acceptez-vous notre traité et de demeurer avec nous en paix fraternelle ?
+findSettlementPanel.displayAll=Trouver toutes les agglomérations
+findSettlementPanel.displayOnlyEuropean=Trouver uniquement les agglomérations européennes
+findSettlementPanel.displayOnlyNatives=Trouver uniquement les agglomérations indigènes
+findSettlementPanel.name=Trouver une agglomération
+firstContactDialog.meeting.natives=Rencontre avec les indigènes
+firstContactDialog.meeting.natives.tutorial=Vous avez rencontré des indigènes. Envoyez vos éclaireurs à leurs agglomérations afin d’en savoir plus sur eux, et vos domestiques contractuels et vos colons libres pour apprendre de leur part. Envoyez vos navires et vos convois de chariots à leurs campements si vous voulez commercer avec eux.
+firstContactDialog.meeting.aztec=La nation aztèque
+firstContactDialog.meeting.inca=L’empire inca
+firstContactDialog.welcomeOffer.text=Les {{tag:people|%nation%}} vous accueillent. Nous sommes une glorieuse nation de %camps% %settlementType%. Pour célébrer notre amitié, nous vous offrons généreusement en cadeau la terre que vous occupez actuellement. Acceptez-vous notre traité et de demeurer avec nous en paix fraternelle ?
+firstContactDialog.welcomeSimple.text=Les {{tag:people|%nation%}} vous accueillent. Nous sommes une glorieuse nation de %camps% %settlementType%. Acceptez-vous notre traité et de demeurer avec nous en paix fraternelle ?
 abandonColony.no=Annuler
 abandonColony.text=Devons-nous vraiment abandonner cette colonie ?
 abandonColony.yes=Abandonner
@@ -2898,12 +2881,12 @@ stopServer.no=Annuler
 stopServer.text=Un serveur fonctionne déjà sur le port indiqué.
 stopServer.yes=Arrêter le serveur
 freeColProgressBar.turnsToComplete=(Tours : %number%)
-indianSettlementPanel.indianCapital=Capitale des %nation%
-indianSettlementPanel=Campement %nation%
-indianSettlementPanel.learnableSkill=La compétence suivante peut être apprise dans ce lieu :
-indianSettlementPanel.highlyWanted=Ce lieu est très intéressé par le commerce de :
-indianSettlementPanel.otherWanted=Les autres marchandises pouvant êtres vendues dans ce lieu sont :
-indianSettlementPanel.mostHated=La nation la plus haïe de cette implantation:
+indianSettlementPanel.indianCapital=Capitale des {{tag:people|%nation%}}
+indianSettlementPanel=Agglomération {{tag:fem|%nation%}}
+indianSettlementPanel.learnableSkill=La compétence suivante peut être apprise dans cette agglomération :
+indianSettlementPanel.highlyWanted=Cette agglomération est très intéressée par le commerce de :
+indianSettlementPanel.otherWanted=Les autres marchandises pouvant êtres vendues dans cette agglomération sont :
+indianSettlementPanel.mostHated=La nation la plus haïe de cette agglomération :
 infoPanel.defenseBonus=%bonus%% de défense
 infoPanel.endTurn=Presser [Entrée] pour finir le tour.
 infoPanel.movementCost=%cost% mouvement
@@ -2925,12 +2908,13 @@ freecol.map.Australia=Australie
 freecol.map.Caribbean_basin=Bassin des Caraïbes
 mapSizeDialog.mapSize=Sélectionner la taille de la carte
 modifierFormat.unknown=???
+modifierFormat.scopeMethod.isIndian.name=indigènes
 monarchDialog.default=Un message de la Couronne
 newPanel.editDifficulty=Modifier la difficulté
 newPanel.getServerList=Récupérer la liste des serveurs
 newPanel.joinMultiPlayerGame=Rejoindre une partie multijoueur
 newPanel.newGamePanel=Paramétrer une nouvelle partie
-newPanel.nationalAdvantages=Avantages nationaux
+newPanel.nationalAdvantages=Atouts nationaux
 newPanel.publicServer=Serveur public
 newPanel.showDifficulty=Afficher la difficulté
 newPanel.singlePlayerGame=Jeu solitaire
@@ -2975,7 +2959,7 @@ serverListPanel.gameState.1=En fonction
 serverListPanel.gameState.2=Terminé
 serverListPanel.players=Joueurs
 startGamePanel.iAmReady=Prêt
-info.noEuropeans=La condition de la victoire de vaincre tous les autres Européens est déjà remplie. Activer une autre nation européenne ou ajouter des conditions de victoire supplémentaires.
+info.noEuropeans=La condition de victoire de vaincre tous les autres Européens est déjà remplie. Activez une autre nation européenne ou ajoutez des conditions de victoire supplémentaires.
 memoryManager.freeMemory=Libre
 memoryManager.maxMemory=Max
 memoryManager.totalMemory=Total
@@ -2984,7 +2968,7 @@ tilePanel.label=%label% (%x%, %y%)
 tilePanel.movementCost=Coût de mouvement :
 tilePanel.owner=Propriétaire :
 tilePanel.region=Région :
-tilePanel.settlement=Campement :
+tilePanel.settlement=Agglomération :
 tradeRouteInputPanel.addStop=Ajouter un nouvel arrêt
 tradeRouteInputPanel.allColonies=Toutes les colonies
 tradeRouteInputPanel.destinationLabel=Destination
@@ -3013,7 +2997,7 @@ warehouseDialog.lowLevel.shortDescription=M’alerter quand les réserves baisse
 warehouseDialog.name=Entrepôt
 workProductionPanel.zeroThreshold=Aucune production négative
 nameCache.base.colony=Colonie
-nameCache.base.settlement=Campement
+nameCache.base.settlement=Agglomération
 nameCache.base.ship=Navire
 nameCache.base.tradeRoute=Nouvelle route commerciale
 nameCache.lostCityRumour.cityName.0=Aira
@@ -3029,7 +3013,7 @@ nameCache.mercenaries.2=Charles-Alexandre, margrave de Brandebourg-Ansbach
 nameCache.mercenaries.3=Charles I, duc de Brunswick-Wolfenbüttel
 nameCache.season.default=Saison %number%
 nameCache.season.0=Printemps
-nameCache.season.1=L'automne
+nameCache.season.1=Automne
 model.nation.english.region.land.1=Virginie
 model.nation.english.region.land.3=Pennsylvanie
 model.nation.english.region.land.4=Terre-Neuve
@@ -3044,6 +3028,8 @@ model.nation.danish.region.land.1=Indes occidentales danoises
 model.nation.danish.region.land.2=Groenland
 model.nation.portuguese.region.land.2=Brésil
 model.nation.swedish.settlementName.1=Finlande
+model.nation.apache.settlementName.0=Mescaléro
+model.nation.sioux.settlementName.0=Tétonwan
 model.nation.tupi.settlementName.46=Tijuca
 model.nation.tupi.settlementName.47=Tukan
 model.nation.tupi.settlementName.48=Tupinambá
@@ -3066,7 +3052,7 @@ prompt.selectOwner=Sélectionner le propriétaire
 prompt.selectRole=Sélectionner le rôle
 prompt.selectTurnsToSkip=Sélectionner les tours à sauter
 prompt.selectUnitType=Sélectionner le type d’unité
-prompt.stepRNG=Étape de Générateur aléatoire de nombre (%value%)
+prompt.stepRNG=Pas du générateur de nombres aléatoires (%value%)
 prompt.selectGold=Sélectionner le montant d’or
 installer.FreeCol.description=L’application FreeCol et les fichiers de données.
 installer.FreeColLanguage.autodetect=Détecter automatiquement au lancement du jeu
@@ -3084,7 +3070,7 @@ installer.SoundEffects.description=Les effets sonores du jeu.
 installer.SoundEffects=Effets sonores
 installer.SourceCode.description=Le code source utilisé pour cette distribution. Ces fichiers sont destinés aux développeurs et n’ajoutent aucune nouvelle fonctionnalité au jeu.
 installer.SourceCode=Code source
-installer.UserFiles.freecol=Le dossier de l’application FreeCol (seulement les installations pour un seul utilisateur)
+installer.UserFiles.freecol=Le dossier de l’application FreeCol (pour une installation mono-utilisateur)
 installer.UserFiles.home=Le dossier de base de l’utilisateur
 installer.UserFiles.other=Définissez un dossier personnalisé
 installer.UserFiles=Choisissez l’emplacement des paramètres personnalisés et des parties sauvegardées :
diff --git a/data/strings/FreeColMessages_gl.properties b/data/strings/FreeColMessages_gl.properties
index c3b08cfb8..96244c06f 100644
--- a/data/strings/FreeColMessages_gl.properties
+++ b/data/strings/FreeColMessages_gl.properties
@@ -197,8 +197,9 @@ cli.no-memory-check=saltar a comprobación da memoria
 cli.no-sound=executar o FreeCol sen son
 cli.private=iniciar un servidor privado (non publicado no servidor meta)
 cli.seed=proporcionar un GRAN para o xerador de números pseudo-aleatorios
-cli.server-name=especificar un NOME personalizado para o servidor
+# Fuzzy
 cli.server=iniciar un servidor autónomo no porto especificado
+cli.server-name=especificar un NOME personalizado para o servidor
 cli.splash=mostrar unha imaxe de pantalla do FICHEIRO mentres se carga o xogo
 cli.tc=cargar a conversión total co NOME dado
 cli.timeout=número de segundos que o servidor agarda por unha resposta á pregunta
@@ -2172,6 +2173,7 @@ server.invalidPlayerNations=Todos os xogadores deben elixir unha nación distint
 server.maximumPlayers=Sentímolo, alcanzouse o número máximo de xogadores.
 server.missingUserName=Falta o nome de usuario na solicitude de inicio de sesión.
 server.missingVersion=Falta a versión do FreeCol na solicitude de inicio de sesión.
+# Fuzzy
 server.noRouteToServer=Non se pode facer público o servidor. Deberías modificar a configuración do teu firewall para permitir conexións no porto que especifiques.
 server.notAllReady=Non todos os xogadores están preparados para comezar o xogo!
 server.onlyAdminCanLaunch=Sentímolo, só o administrador do servidor pode publicar o xogo.
diff --git a/data/strings/FreeColMessages_he.properties b/data/strings/FreeColMessages_he.properties
index 16da5b425..28b1c4395 100644
--- a/data/strings/FreeColMessages_he.properties
+++ b/data/strings/FreeColMessages_he.properties
@@ -156,8 +156,9 @@ cli.no-java-check=דלג על בדיקת גרסת ה-Java שברשותך
 cli.no-memory-check=דלג על בדיקת הזיכרון
 cli.no-sound=הרץ את FreeCol ללא קול
 cli.private=התחל שרת פרטי (שאינו מופיע ברשימת השרתים)
-cli.server-name=ציין שם מותאם אישית עבור השרת
+# Fuzzy
 cli.server=התחל שרת עצמאי על הפורט שנבחר
+cli.server-name=ציין שם מותאם אישית עבור השרת
 # Fuzzy
 cli.windowed=הרץ את FreeCol בחלון במקום במסך מלא
 menuBar.colopedia=ישובופדיה
@@ -1173,6 +1174,7 @@ server.fileNotFound=לא ניתן למצוא את הקובץ בשם הנתון.
 server.incompatibleVersions=המשחק השמור אותו אתם מנסים לטעון אינו תואם לגירסה זו של FreeCol.
 server.invalidPlayerNations=על כל השחקנים לבחור אומה ייחודית על מנת שהמשחק יוכל להתחיל.
 server.maximumPlayers=סליחה, יש כבר מספר מקסימלי של שחקנים.
+# Fuzzy
 server.noRouteToServer=השרת אינו יכול להיהפך לציבורי. אתה צריך לשנות את הגדרות חומת האש שלך כדי לאפשר חיבור בפורט המבוקש.
 server.notAllReady=לא כל השחקנים מוכנים להתחיל את המשחק!
 server.onlyAdminCanLaunch=אני מתנצל, רק מנהל השרת יכול להפעיל את המשחק.
diff --git a/data/strings/FreeColMessages_hu.properties b/data/strings/FreeColMessages_hu.properties
index 092d8e530..78d66c2f6 100644
--- a/data/strings/FreeColMessages_hu.properties
+++ b/data/strings/FreeColMessages_hu.properties
@@ -180,8 +180,9 @@ cli.no-memory-check=a memória ellenőrzés átugrása
 cli.no-sound=a FreeCol futtatása hangok nélkül
 cli.private=magánkiszolgáló indítása (a metakiszolgálón nem lesz közzétéve)
 cli.seed=Egy alapszám (SEED) megadása a ál-véletlenszám generátornak.
-cli.server-name=NAME név megadása a kiszolgálónak
+# Fuzzy
 cli.server=önálló kiszolgáló indítása a megadott porton
+cli.server-name=NAME név megadása a kiszolgálónak
 cli.splash=a játék betöltése közben kép megjelenítése a FILE állományból
 cli.tc=a NAME nevű szabályszett (total conversion) betöltése
 cli.timeout=hány másodpercet vár a kiszolgáló egy válaszra
@@ -1903,6 +1904,7 @@ server.incompatibleVersions=Sajnos a betöltendő állás nem kompatibilis a Fre
 server.invalidPlayerNations=Minden játékosnak egyedi nemzetiséget kell választania!
 server.maximumPlayers=Bocsáss meg de több játékos nem adható a játékhoz.
 server.missingUserName=A felhasználói név hiányzik a bejelentkezési kérelemből.
+# Fuzzy
 server.noRouteToServer=A kiszolgálót nem lehet nyilvánossá tenni. Állítsd be a tűzfalat, hogy átengedje a csatlakozásokat a megjelölt porthoz.
 server.notAllReady=Még nem mindenki készült föl a játékra!
 server.onlyAdminCanLaunch=Bocsáss meg, de csak a kiszolgáló felügyelője indíthatja a játékot.
diff --git a/data/strings/FreeColMessages_ia.properties b/data/strings/FreeColMessages_ia.properties
index 5c2899598..33ea9fb2c 100644
--- a/data/strings/FreeColMessages_ia.properties
+++ b/data/strings/FreeColMessages_ia.properties
@@ -63,21 +63,23 @@ nothing=Nihil
 ok=OK
 options=Optiones
 port=Porta
+private=private
 quit=Quitar
 reject=Rejectar
 remove=Remover
 rename=Renominar
 reset=Reinitialisar
 save=Salveguardar
-# Fuzzy
-server=Nomine del servitor:
+select=Seliger
+server=Servitor
+skip=Saltar
 small=Parve
 statistics=Statisticas
-# Fuzzy
 test=Test
 true=Ver
 unknown=Incognite
 unload=Discargar
+value=Valor
 width=Latitude
 yes=Si
 abilities=Capacitates
@@ -91,21 +93,23 @@ cargoOnCarrier=Cargo in transporto
 cashInTreasureTrain=Moneta in un traino de tresor
 clearOrders=Cancellar ordines
 colonists=Colonos
+colonyCenter=centro del colonia
 difficulty=Difficultate
 docks=Docks
 dumpCargo=Discargar cargo
+finalResult=Resultato final
 fortify=Fortificar
 gold=Auro
 goldAmount=%amount% {{plural:%amount%|one=auro|other=auro|default=auro}}
 goods=Benes
 goToEurope=Ir a Europa
 goToThisTile=Ir a iste tegula
+immigrants=Immigrantes
 inPort=In porto
 leaveShip=Quitar nave
 mission=Mission
 modifiers=Modificatores
 nation=Nation
-# Fuzzy
 newWorld=Nove Mundo
 notApplicable=N/A
 payArrears=Pagar arretrato
@@ -118,6 +122,7 @@ sailingToEurope=Face vela verso Europa
 sales=Vendita
 sentry=Sentinella
 setSail=Prender le vela
+settlement=Stabilimento
 showProductionModifiers=Monstrar modificatores de production
 skillTaught=Competentia inseniate
 startGame=Comenciar partita
@@ -143,6 +148,7 @@ cli.arg.dimensions=LATITUDExALTITUDE
 cli.arg.directory=DIRECTORIO
 cli.arg.europeans=EUROPEOS
 cli.arg.file=FILE
+cli.arg.gui-scale=SCALA
 cli.arg.locale=REGION
 cli.arg.loglevel=NIVELLO
 cli.arg.name=NOMINE
@@ -155,6 +161,7 @@ cli.error.clientOptions=Es ignorate le file de optiones de cliente illegibile: %
 cli.error.debug=Lista de modo de debug (%modes%) expectate.
 cli.error.difficulties=Nivello de difficultate (%difficulties%) expectate, trovate: %arg%
 cli.error.europeans=Le numero de nationes europee debe esser al minus %min%
+cli.error.gui-scale=Percentage de scala GUI (%scales%) expectate, ma trovate: %arg%
 cli.error.home.noRead=Non pote leger de %string%.
 cli.error.home.noWrite=Non pote scriber a %string%.
 cli.error.home.notDir=%string% non es un directorio.
@@ -176,6 +183,8 @@ cli.european-count=definir le numero de nationes active (EUROPEOS colonial)
 cli.fast=saltar tote le dialogos de configuration
 cli.font=predefinir le typo de litteras
 cli.freecol-data=defini le DIRECTORIO de datos de FreeCol (ha un subdirectorio nominate 'base')
+cli.full-screen=executar FreeCol in modo plen schermo
+cli.gui-scale=scalar elementos GUI, con SCALA optional (%scales%)
 cli.help=presenta iste texto de adjuta
 cli.load-savegame=carga un partita salveguardate del FILE
 cli.log-console=scribe registro in consola e in file
@@ -188,8 +197,9 @@ cli.no-memory-check=salta le verification del memoria
 cli.no-sound=executa FreeCol sin sono
 cli.private=initia un servitor private (non publicate in le meta-servitor)
 cli.seed=forni un SEMINE pro le generator de numeros pseudo-aleatori
-cli.server-name=specifica un NOMINE personalisate pro le servitor
+# Fuzzy
 cli.server=initia un servitor autonome super le porto specificate
+cli.server-name=specifica un NOMINE personalisate pro le servitor
 cli.splash=monstra le imagine FILE durante le cargamento del partita
 cli.tc=carga le conversion total con le NOMINE specificate
 cli.timeout=numero de secundas durante que le servitor attende un responsa a un question
@@ -197,8 +207,7 @@ cli.user-cache-directory=definir le DIRECTORY de cache de usator de FreeCol
 cli.user-config-directory=definir le DIRECTORY de configuration de usator de FreeCol
 cli.user-data-directory=definir le DIRECTORY de datos de usator de FreeCol
 cli.version=monstra le numero de version e exi
-# Fuzzy
-cli.windowed=executa FreeCol in un fenestra in loco del schermo complete
+cli.windowed=executa FreeCol in un fenestra, con DIMENSIONES facultative
 menuBar.colopedia=Colopedia
 menuBar.game=Joco
 menuBar.orders=Ordines
@@ -242,7 +251,6 @@ changeAction.enterColony.name=Entrar in colonia
 changeAction.name=Unitate sequente in tegula
 changeAction.nextUnitOnTile.name=Unitate sequente in tegula
 changeAction.selectCarrier.name=Selige transportator
-# Fuzzy
 changeWindowedModeAction.name=Modo de schermo complete
 chatAction.name=Conversar
 clearForestAction.name=Deforestar
@@ -317,8 +325,7 @@ renameAction.name=Renominar
 reportCargoAction.name=Reporto de cargo
 reportColonyAction.name=Consiliero colonial
 reportCongressAction.name=Congresso continental
-# Fuzzy
-reportEducationAction.name=Education
+reportEducationAction.name=Reporto de education
 reportExplorationAction.name=Reporto de exploration
 reportForeignAction.name=Consiliero de relationes exterior
 reportHighScoresAction.name=Scores le plus alte
@@ -868,37 +875,28 @@ model.option.unloadOverflowResponse.name=Discargar le surplus
 model.option.unloadOverflowResponse.shortDescription=Que facer si un deposito es supercargate quando un transportator discarga.
 clientOptions.mods.name=Modificationes
 clientOptions.mods.shortDescription=Optiones pro permitter le modification del joco.
-# Fuzzy
-model.ability.addTaxToBells.name=Adder taxa al production de campanas
-# Fuzzy
-model.ability.alwaysOfferedPeace.name=Europeos sempre offere pace
+model.ability.addTaxToBells.name=Adder taxa sur campanas
+model.ability.alwaysOfferedPeace.name=Sempre offerer pace
 model.ability.ambushBonus.name=Bonus de imboscada
 model.ability.ambushBonus.shortDescription=Bonus de imboscada quando attaccar unitates in terreno aperte.
 model.ability.ambushPenalty.name=Penalitate de imboscada
 model.ability.ambushPenalty.shortDescription=Iste nation suffre un penalitate de imboscada
 model.ability.autoProduction.name=Production automatic
 model.ability.autoProduction.shortDescription=Producer benes mesmo si nulle unitates es presente.
-# Fuzzy
-model.ability.automaticEquipment.name=Unitates se equipa mesme
+model.ability.automaticEquipment.name=Autoequipamento
 model.ability.automaticPromotion.name=Promotion automatic
 model.ability.avoidExcessProduction.name=Evitar excesso de production
 model.ability.avoidExcessProduction.shortDescription=Nunquam producer benes in excesso del capacitate de immagazinage.
 model.ability.betterForeignAffairsReport.name=Reportos de affaires estranier meliorate
-# Fuzzy
-model.ability.bombard.name=Pote bombardar
+model.ability.bombard.name=Bombardar
 model.ability.bombardShips.name=Bombardar naves
 model.ability.bombardShips.shortDescription=Bombardar naves inimic super tegulas aquatic adjacente.
-# Fuzzy
-model.ability.bornInColony.name=Nascite in colonias
-# Fuzzy
-model.ability.bornInIndianSettlement.name=Nascite in stabilimentos indigena
+model.ability.bornInColony.name=Nascite in colonia
+model.ability.bornInIndianSettlement.name=Nascite in stabilimento indigena
 model.ability.build.name=Construction
-# Fuzzy
-model.ability.build.shortDescription=Le capacitate de construer unitates, equipamento o edificios.
-# Fuzzy
-model.ability.buildCustomHouse.name=Capacitate de construer doanas
-# Fuzzy
-model.ability.buildFactory.name=Capacitate de construer fabricas
+model.ability.build.shortDescription=Le capacitate de construer unitates, equipamento o edificios, a vices de un typo particular
+model.ability.buildCustomHouse.name=Construer doanas
+model.ability.buildFactory.name=Construer fabricas
 model.ability.canBeCaptured.name=Pote esser capturate
 model.ability.canBeEquipped.name=Pote esser equipate
 model.ability.canRecruitUnit.name=Recrutar unitates
@@ -912,92 +910,62 @@ model.ability.carryGoods.shortDescription=Iste unitate ha le capacitate de trans
 model.ability.carryTreasure.name=Pote transportar tresor
 model.ability.carryUnits.name=Transportar unitates
 model.ability.carryUnits.shortDescription=Iste unitate ha le capacitate de transportar altere unitates.
-# Fuzzy
-model.ability.customHouseTradesWithForeignCountries.name=Vender a paises estranier via le doana
-# Fuzzy
-model.ability.demoteOnAllEquipLost.name=Degradate post disfacta
-# Fuzzy
-model.ability.disposeOnAllEquipLost.name=Non pote esser capturate
-# Fuzzy
-model.ability.disposeOnCombatLoss.name=Non pote esser capturate
+model.ability.customHouseTradesWithForeignCountries.name=Commercio estranier via le doana
+model.ability.demoteOnAllEquipLost.name=Degradar post perdita de equipamento
+model.ability.disposeOnAllEquipLost.name=Destruer post perdita de equipamento
+model.ability.disposeOnCombatLoss.name=Destruer post disfacta in combatto
 model.ability.dressMissionary.name=Investir missionario
 model.ability.dressMissionary.shortDescription=Facer un unitate missionario (non experte).
 model.ability.electFoundingFather.name=Eliger patres fundator
 model.ability.electFoundingFather.shortDescription=Iste nation ha le possibilitate de eliger su patres fundator
 model.ability.evadeAttack.name=Evitar attacco
 model.ability.evadeAttack.shortDescription=Iste unitate ha le capacitate de evitar attaccos.
-# Fuzzy
-model.ability.expertMissionary.name=Capacitate de functionar qua missionario experte
+model.ability.expertMissionary.name=Missionario experte
 model.ability.expertPioneer.name=Capacitate de functionar qua pionero experte
 model.ability.expertScout.name=Capacitate de functionar qua explorator experte
 model.ability.expertSoldier.name=Capacitate de functionar qua soldato experte
 model.ability.expertsUseConnections.name=Expertos usa connexiones
-# Fuzzy
-model.ability.expertsUseConnections.shortDescription=Unitates experte acquire materiales crude mesmo si nulle es disponibile.
+model.ability.expertsUseConnections.shortDescription=Unitates experte acquire materiales crude mesmo si nulle es disponibile
 model.ability.export.name=Exportar benes
-# Fuzzy
-model.ability.export.shortDescription=Pote exportar benes directemente a Europa.
+model.ability.export.shortDescription=Pote exportar benes directemente a Europa
 model.ability.foundColony.name=Fundar colonia
-# Fuzzy
-model.ability.foundColony.shortDescription=Iste unitate ha le capacitate de fundar un nove colonia.
+model.ability.foundColony.shortDescription=Iste unitate ha le capacitate de fundar un nove colonia
 model.ability.foundInLostCity.name=Trovate in citates perdite
 model.ability.foundsColonies.name=Fundar colonias
 model.ability.foundsColonies.shortDescription=Iste nation ha le capacitate de fundar nove colonias.
-# Fuzzy
 model.ability.hasPort.name=Accesso al mar
-# Fuzzy
 model.ability.hasPort.shortDescription=Iste loco ha accesso directe o indirecte al mar
 model.ability.ignoreEuropeanWars.name=Ignorar guerras europee
 model.ability.independenceDeclared.name=Declaration de independentia
-# Fuzzy
 model.ability.independenceDeclared.shortDescription=Iste pais ha declarate su independentia
-# Fuzzy
-model.ability.mercenaryUnit.name=Es un unitate mercenari
+model.ability.mercenaryUnit.name=Unitate mercenari
 model.ability.moveToEurope.name=Viagiar a Europa
-# Fuzzy
-model.ability.moveToEurope.shortDescription=Iste tegula permitte que unitates viagia a Europa.
-# Fuzzy
-model.ability.multipleAttacks.name=Ha multiple attaccos
+model.ability.moveToEurope.shortDescription=Iste tegula permitte que unitates se displacia a Europa
+model.ability.multipleAttacks.name=Multiple attaccos
 model.ability.native.name=Indigena
 model.ability.native.shortDescription=Americano native
 model.ability.navalUnit.name=Unitate naval
 model.ability.navalUnit.shortDescription=Iste unitate es un unitate naval.
-# Fuzzy
-model.ability.person.name=Es un persona
-# Fuzzy
-model.ability.pillageUnprotectedColony.name=Pote piliar colonias non defendite
-# Fuzzy
-model.ability.piracy.name=Es un unitate pirata
-# Fuzzy
-model.ability.plunderNatives.name=Bonus de tresor indigena
-# Fuzzy
-model.ability.plunderNatives.shortDescription=Augmenta le quantitate de butino resultante del destruction de stabilimentos indigena.
-# Fuzzy
-model.ability.produceInWater.name=Producer super tegulas aquatic
-# Fuzzy
-model.ability.produceInWater.shortDescription=Unitates pote usar tegulas aquatic assi como tegulas terrestre.
-# Fuzzy
-model.ability.refUnit.name=Es un unitate del FER
+model.ability.person.name=Persona
+model.ability.pillageUnprotectedColony.name=Piliage
+model.ability.piracy.name=Pirateria
+model.ability.plunderNatives.name=Piliar indigenas
+model.ability.plunderNatives.shortDescription=Augmenta le quantitate de butino resultante del destruction de stabilimentos indigena
+model.ability.produceInWater.name=Producer in aqua
+model.ability.produceInWater.shortDescription=Unitates pote usar tegulas aquatic assi como tegulas terrestre
+model.ability.refUnit.name=Unitate del FER
 model.ability.repairUnits.name=Reparar unitates
-# Fuzzy
-model.ability.repairUnits.shortDescription=Pote reparar certe typos de unitates damnificate.
+model.ability.repairUnits.shortDescription=Pote reparar certe typos de unitates damnificate
 model.ability.royalExpeditionaryForce.name=Fortia expeditionari regal
-# Fuzzy
-model.ability.royalExpeditionaryForce.shortDescription=Iste nation es un Fortia expeditionari regal
+model.ability.royalExpeditionaryForce.shortDescription=Un nation del Fortia Expeditionari Regal
 model.ability.rumoursAlwaysPositive.name=Rumores es sempre positive
-# Fuzzy
-model.ability.selectRecruit.name=Capacitate de seliger recrutas
-# Fuzzy
-model.ability.supportUnit.name=Es un unitate de supporto
+model.ability.selectRecruit.name=Seliger recruta
+model.ability.supportUnit.name=Unitate de supporto
 model.ability.teach.name=Inseniar habilitates
-# Fuzzy
-model.ability.teach.shortDescription=Unitates experte pote inseniar lor habilitates a alteres.
-# Fuzzy
-model.ability.tradeWithForeignColonies.name=Capacitate de commerciar con colonias estranier
-# Fuzzy
-model.ability.undead.name=Modo de vindicantia
-# Fuzzy
-model.ability.undead.shortDescription=In le modo jocator singule, un jocator qui ha perdite pote entrar un modo de vindicantia pro attaccar su inimicos.
+model.ability.teach.shortDescription=Unitates experte pote inseniar lor habilitates a alteres
+model.ability.tradeWithForeignColonies.name=Commerciar con colonias estranier
+model.ability.undead.name=Morto-vivente
+model.ability.undead.shortDescription=Un unitate de ultra-tumba
 model.modifier.bombardBonus.name=Bonus de bombardamento
 model.modifier.bombardBonus.shortDescription=Le unitates de iste nation se profita de un bonus de bombardamento
 model.modifier.breedingDivisor.name=Dimension de greges
@@ -1324,8 +1292,7 @@ model.improvement.road.description=Cammino/Strata/Via
 model.improvement.road.name=Cammino
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=Limite de colonia litoral
-# Fuzzy
-model.limit.independence.coastalColonies.description=Tu debe disponer de al minus %limit% colonias litoral pro poter declarar le independentia.
+model.limit.independence.coastalColonies.description=Tu debe disponer de al minus %limit% {{plural:%limit%|one=colonia|other=colonias}} litoral pro poter declarar le independentia.
 model.limit.independence.rebels.name=Limite de rebellos
 model.limit.independence.rebels.description=Al minus %limit%% de tu colonos debe supportar le independentia.
 model.limit.independence.year.name=Anno limite
@@ -1489,8 +1456,7 @@ model.tile.marsh.description=Turbiera es un typo de terra humide, con graminacea
 model.tile.mixedForest.name=Foreste mixte
 model.tile.mixedForest.description=Le forestes mixte, le quales se trova in le latitudes temperate, produce Cereal, Ligno, Pellicia e alcun Coton. Si un foreste mixte es abattite, illo deveni un plana.
 model.tile.mountains.name=Montanias
-# Fuzzy
-model.tile.mountains.description=Le montanias se extende supra le terreno circumferente in un area limitate. Le montanias es generalmente plus scarpate que le collinas. Illos es difficile de transversar e colonias non pote esser fundate hic. Nonobstante, le exploitation minerari se prova utile pro le extraction de mineral e argento.
+model.tile.mountains.description=Le montanias se extende supra le terreno circumferente in un area limitate. Le montanias es generalmente plus scarpate que le collinas. Illos es difficile de transversar e colonias non pote esser fundate hic. Illos forni un grande bonus defensive ma le fortification non lo augmenta. Le exploitation minerari se prova utile pro le extraction de mineral e argento.
 model.tile.ocean.name=Oceano
 model.tile.ocean.description=Le oceanos es vaste extensiones de aqua salate, bon pro le pisca. Le quantitate de pisces es augmentate per le presentia de terra e specialmente per imbuccaturas de fluvios.
 model.tile.plains.name=Planas
@@ -2229,6 +2195,7 @@ server.invalidPlayerNations=Tote le jocatores debe seliger un nation unic ante q
 server.maximumPlayers=Pardono, le numero maxime de jocatores ha essite attingite.
 server.missingUserName=Le nomine de usator manca in le requesta de apertura de session.
 server.missingVersion=Le version de FreeCol manca in le requesta de apertura de session.
+# Fuzzy
 server.noRouteToServer=Le servitor non pote esser rendite public. Tu debe modificar le configuration de tu firewall pro permitter le connexiones al porto specificate.
 server.notAllReady=Non tote le jocatores es preste a comenciar le partita!
 server.onlyAdminCanLaunch=Pardono, solmente le administrator del servitor pote lancear le partita.
diff --git a/data/strings/FreeColMessages_it_IT.properties b/data/strings/FreeColMessages_it_IT.properties
index d20ac080b..6aca2a269 100644
--- a/data/strings/FreeColMessages_it_IT.properties
+++ b/data/strings/FreeColMessages_it_IT.properties
@@ -209,8 +209,9 @@ cli.no-memory-check=ignora il controllo della memoria
 cli.no-sound=esegue FreeCol senza suono
 cli.private=avvia un server privato (non pubblicato sul metaserver)
 cli.seed=fornire un SEME per il generatore di numeri pseudo-casuale
-cli.server-name=specifica un NOME personalizzato per il server
+# Fuzzy
 cli.server=avvia un server indipendente sulla porta specificata
+cli.server-name=specifica un NOME personalizzato per il server
 cli.splash=mostra l'immagine FILE come splash screen mentre parte il gioco
 cli.tc=carica la 'conversione totale' identificata da NOME
 cli.timeout=numero di secondi che il server aspetta per una risposta ad una richiesta
@@ -2154,6 +2155,7 @@ server.invalidPlayerNations=Tutti i giocatori devono scegliere una nazione diffe
 server.maximumPlayers=Spiacente, è stato raggiunto il numero massimo di giocatori.
 server.missingUserName=Il nome utente non è presente nella richiesta di accesso.
 server.missingVersion=La versione FreeCol manca nella richiesta di accesso.
+# Fuzzy
 server.noRouteToServer=Il server non può essere reso pubblico. Dovresti modificare le impostazioni del tuo firewall per consentire connessioni alla porta che hai specificato.
 server.notAllReady=Non tutti i giocatori sono pronti per iniziare la partita!
 server.onlyAdminCanLaunch=Spiacente, solo l'amministratore del server può lanciare la partita.
diff --git a/data/strings/FreeColMessages_ja.properties b/data/strings/FreeColMessages_ja.properties
index db34d83b3..8218960fd 100644
--- a/data/strings/FreeColMessages_ja.properties
+++ b/data/strings/FreeColMessages_ja.properties
@@ -189,8 +189,9 @@ cli.no-memory-check=メモリーのチェックをスキップ
 cli.no-sound=音なしでFreeColをプレイ
 cli.private=プライベートサーバーを起動 (metaserverには公開されない)
 cli.seed=擬似乱数を生成するための乱数種を与える
-cli.server-name=サーバーに独自名 NAME を指定
+# Fuzzy
 cli.server=指定したポートでスタンドアローンサーバーを起動
+cli.server-name=サーバーに独自名 NAME を指定
 cli.splash=ゲームの起動時に FILE 画像をスプラッシュスクリーンとして表示
 cli.tc=指定した NAME ですべての変換を読み込む
 cli.version=バージョンを表示して終了
@@ -1880,6 +1881,7 @@ server.incompatibleVersions=読み込もうとしたセーブデータはこの
 server.initialize=サーバーの初期化中にエラーが発生しました
 server.invalidPlayerNations=ゲームを開始する前に、すべてのプレーヤーが独自の国を選択する必要があります。
 server.maximumPlayers=申し訳ありませんが、プレイヤー数の上限に達しています。
+# Fuzzy
 server.noRouteToServer=サーバーを公開できません。ファイアウォールの設定を変更して、指定したポートの接続を許可する必要があります。
 server.notAllReady=まだ準備を終えていないプレイヤーがいます！
 server.onlyAdminCanLaunch=申し訳ありませんが、サーバー管理者だけがゲームを起動することができます。
@@ -2111,6 +2113,7 @@ europePanel.transaction.price=価格:\t%gold%
 europePanel.transaction.purchase=%goods% %amount%を一つ%gold%で購入
 europePanel.transaction.sale=%goods% %amount%を一つあたり%gold%で売却
 findSettlementPanel.name=入植地の検索
+firstContactDialog.meeting.natives=先住民と会議
 firstContactDialog.meeting.aztec=アステカ族
 firstContactDialog.meeting.inca=インカ帝国
 firstContactDialog.welcomeOffer.text=%nation%にようこそ。我々は%camps%%settlementType%の栄光なる民族だ。我々の友情を祝福して、土地の支配権を寛大にお渡ししよう。条約を受け入れ、兄弟のように平和にならないか？
diff --git a/data/strings/FreeColMessages_ko.properties b/data/strings/FreeColMessages_ko.properties
index eedd49db9..a20105c4d 100644
--- a/data/strings/FreeColMessages_ko.properties
+++ b/data/strings/FreeColMessages_ko.properties
@@ -4,6 +4,7 @@
 # Author: Clockoon
 # Author: Cwt96
 # Author: Gusdud25
+# Author: Hwangjy9
 # Author: Hym411
 # Author: Ilovesabbath
 # Author: Jskang
@@ -223,7 +224,6 @@ centerAction.name=중앙
 changeAction.enterColony.name=식민지 들어가기
 changeAction.nextUnitOnTile.name=타일 내 다음 유닛
 changeAction.selectCarrier.name=운송수단 선택
-# Fuzzy
 changeWindowedModeAction.name=전체 화면
 chatAction.name=대화
 clearOrdersAction.name=명령 취소
@@ -460,6 +460,7 @@ clientOptions.minimap.color.background.gray.light.very=아주 밝은 회색
 clientOptions.gui.displayTileText.names.name=제목 이름
 clientOptions.gui.displayTileText.regions.name=타일 영역
 model.option.displayColonyLabels.shortDescription=식민지 명패 양식.
+clientOptions.gui.colonyComparator.byName.name=이름
 clientOptions.gui.colonyComparator.byAge.shortDescription=만든 순서대로 정렬
 clientOptions.gui.colonyComparator.byPosition.name=위치
 clientOptions.gui.colonyComparator.byPosition.shortDescription=지리적 위치별로 정렬
@@ -931,10 +932,12 @@ model.direction.SW.name=남서
 model.direction.W.name=서
 model.direction.NW.name=북서
 model.indianSettlement.mostHatedNone=없음
+model.indianSettlement.mostHatedUnknown=알 수 없음
 model.indianSettlement.nameUnknown=알 수 없음
 model.indianSettlement.skillUnknown=알 수 없음
 model.indianSettlement.tension.unknown=알 수 없음
 model.indianSettlement.tension.wary=경계
+model.indianSettlement.wantedGoodsUnknown=알 수 없음
 model.lostCityRumour.name=잃어버린 도시의 소문
 model.lostCityRumour.nothing.0.description=잃어버린 도시의 소문은 다음으로 증명되었습니다: 소문과 달리 없음!
 model.lostCityRumour.nothing.mounds.description=고분은 서늘하게 비어 있습니다.
@@ -1111,6 +1114,7 @@ scoutSettlement.speakTales=우리는 저 멀리서 온 여행객들을 환영하
 sellProposition.text=어떤 상품을 판매하길 원하십니까?
 server.fileNotFound=제공된 이름을 가진 파일을 찾을 수 없습니다.
 server.incompatibleVersions=불러오기를 시도한 저장된 게임은 FreeCol의 현재 버전과 호환되지 않습니다.
+# Fuzzy
 server.noRouteToServer=공개 서버를 시작할 수 없습니다. 방화벽 설정을 수정하여 지정한 포트로의 접속을 허가해야 합니다.
 server.reject=서버는 그렇게 할 수 없습니다.
 declareIndependence.resolution=오늘 의회는 아메리카에서 한 번도 하지 못했던 가장 중요한 결의안을 통과시켰습니다.\n\n저는 이 선언을 지키고 이 연방을 지원하며 지키기 위해 우리가 흘려할 피와 땀 그리고 소중한 것들에 대해 잘 알고 있습니다. 그러나 그 모든 어둠 속에서 저는 아름다운 빛과 영광이 비춰지는 것을 볼 수 있습니다. 저는 그 끝이 그 어떤 것보다도 더 가치 있음을 알고 있습니다. 저는 신 앞에서 그렇게 되지 않을 것이라 믿으며 비록 우리가 이런 결과를 후회할 지라도 우리의 후손들은 마지막에는 반드시 승리할 것입니다.\n\n왕실 원정군이 곧 쳐들어 올 것입니다. 우리는 신대륙군을 자발적 지원자를 모집하며 우리 방어를 신중하게 대비합시다.
@@ -1122,6 +1126,7 @@ colopedia.buildings.notes=노트
 colopedia.buildings.specialist=전문가
 colopedia.buildings.workplaces=작업장
 colopedia.buildings.requiredPopulation={{plural:%number%|one=이주민|other=이주민|default=이주민}} %number%명
+colopedia.goods.description=설명:
 colopedia.nationType.aggressionLevel.average=평균
 colopedia.nationType.aggressionLevel.high=높은
 colopedia.nationType.aggressionLevel.low=낮음
@@ -1290,6 +1295,7 @@ tilePanel.label=%label% (%x%, %y%)
 tilePanel.owner=소유자:
 tilePanel.region=지역:
 tilePanel.settlement=개척지:
+tradeRouteInputPanel.nameLabel=이름
 trainPanel.clickOn=다음 사람들중 훈련시킬 사람을 하나 클릭하십시오.
 victory.continue=진행 계속
 victory.text=승리하셨습니다!
diff --git a/data/strings/FreeColMessages_lt.properties b/data/strings/FreeColMessages_lt.properties
index e2cea3c4d..612c06faf 100644
--- a/data/strings/FreeColMessages_lt.properties
+++ b/data/strings/FreeColMessages_lt.properties
@@ -16,13 +16,17 @@ model.option.recruitable.slot2.name=Trečiasis imigrantas
 model.option.recruitable.slot2.shortDescription=Trečiojo imigranto padalinio tipas.
 model.option.refStrength.name=Karaliaus jėgų (KEP) stiprumas.
 model.option.refStrength.shortDescription=Padidina Karaliaus Ekspedicinių Pajėgų (KEP) dydį.
+type=Tipas
+source=Šaltinis
 chilly=Vėsus
 cold=Šaltas
 dry=Sausas
 hot=Karštas
 temperate=Vidutinis
 veryDry=Labai sausas
+veryHigh=Labai aukštai
 veryLarge=Labai didelis
+veryLow=Labai žemai
 verySmall=Labai mažas
 veryWet=Labai drėgnas
 warm=Šiltas
@@ -34,23 +38,23 @@ all=Visi
 and=ir
 browse=Naršyti
 cancel=Atšaukti
+client=Klientas
 close=Uždaryti
 color=Spalva
 connect=Prisijungti
-# Fuzzy
 current=Dabartinis
 false=Netiesa
-# Fuzzy
-fill=Vieneto rezultatas
+fill=Užpildyti
 height=Aukštis
 help=Pagalba
+high=Aukštas
 host=Serveris
 large=Didelis
 load=Krauti
+low=Žemas
 many=daug
 medium=Vidutinis
 more=daugiau...
-# Fuzzy
 music=Muzika
 name=Vardas
 no=Ne
@@ -60,24 +64,29 @@ nothing=Nieko
 ok=Gerai
 options=Nustatymai
 port=Prievadas
+private=privatus
 quit=Išeiti
 reject=Atmesti
 remove=Pašalinti
 rename=Pervadinti
 reset=Atstatyti
 save=Išsaugoti
-# Fuzzy
-server=Serverio vardas:
+select=Pasirinkti
+server=Serveris
+skip=Praleisti
 small=Mažas
-# Fuzzy
-test=Testavimas
+statistics=Statistika
+test=Testas
 true=Tiesa
+unknown=Nežinomas
 unload=Iškrauti
+value=Reikšmė
 width=Plotis
 yes=Taip
 abilities=Gebėjimai
 activateAllUnits=Aktyvinti visus padalinius
 activateUnit=Aktyvinti padalinį
+assignTradeRoute=Priskirti prekybos kelią
 building=Pastatas
 capital=Sostinė
 cargo=Krovinys
@@ -85,22 +94,26 @@ cargoOnCarrier=Krovinių nešiklyje
 cashInTreasureTrain=Aukso lobio gurguolėje
 clearOrders=Atšaukti įsakymus
 colonists=Kolonistai
+colonyCenter=kolonijos centras
+colopedia=Kolopedija
+countryName={{tag:country|%nation%}}
 difficulty=Sunkumas
 docks=Prieplauka
 dumpCargo=Išmesti krovinį
+finalResult=Finalinis rezultatas
 fortify=Įsitvirtinti
 gold=Auksas
 goldAmount=%amount% aukso
 goods=Prekės
 goToEurope=Grįžti į Europą
 goToThisTile=Eiti čia
+immigrants=Imigrantai
 inPort=Uoste
 leaveShip=Išriti iš laivo
 mission=Misija
 modifiers=Modifikavimai
 nation=Tauta
-# Fuzzy
-newWorld=Naujas Pasaulis
+newWorld=Naujasis pasaulis
 notApplicable=Nėra
 payArrears=Išmokėti įsiskolinimą
 player=Žaidėjas
@@ -112,6 +125,7 @@ sailingToEurope=Plaukia į Europą
 sales=Pardavimai
 sentry=Sergėti
 setSail=Išsiųsti į Ameriką
+settlement=Gyvenvietė
 showProductionModifiers=Rodyti gamybos modifikatorius
 skillTaught=Įgūdį mokė:
 startGame=Pradėti žaidimą
@@ -134,7 +148,9 @@ cli.arg.debugRun=Nusidažys [, SAVENAME]
 cli.arg.difficulty=SUNKUMAS
 cli.arg.dimensions=PLOTISxAUKŠTIS
 cli.arg.directory=KATALOGAS
+cli.arg.europeans=EUROPIEČIAI
 cli.arg.file=FAILAS
+cli.arg.gui-scale=MASTAS
 cli.arg.locale=LOKALĖ
 cli.arg.loglevel=ŽURNLYGIS
 cli.arg.name=PAVADINIMAS
@@ -168,8 +184,9 @@ cli.no-memory-check=netikrinti atminties
 cli.no-sound=paleisti FreeCol be garso
 cli.private=startuoti privatų serverį (neskelbta metaserveryje)
 cli.seed=teikti sėklos pseudo atsitiktinių skaičių generatorius
-cli.server-name=nurodyti pasirinktinį serverio PAVADINIMĄ
+# Fuzzy
 cli.server=startuoti savarankišką serverį nurodytu prievadu
+cli.server-name=nurodyti pasirinktinį serverio PAVADINIMĄ
 cli.splash=rodyti ekrano užsklanda vaizdo failą kraunamas žaidimas
 cli.tc=apkrova viso konversijos su tokiu pavadinimu
 cli.version=parodyti versijos numerį ir baigti darbą
@@ -183,6 +200,7 @@ menuBar.tools=Įrankiai
 menuBar.view=Žiūrėti
 menuBar.statusLine=Taškai: %score%    |    Auksas: %gold%    |    Mokesčiai: %tax%%    |    Metai: %year%
 menuBar.debug=Derinti
+menuBar.debug.addBuilding=Pridėti pastatą kiekvienai kolonijai
 menuBar.debug.addFoundingFather=Pridėti Tevą Steigėją
 menuBar.debug.addGold=Pridėti auksą
 menuBar.debug.addImmigration=Pridėti imigracija
@@ -190,8 +208,10 @@ menuBar.debug.addLiberty=Pridėti laisvės kiekvienai kolonijai
 menuBar.debug.compareMaps.checkComplete=Patikrinimas baigtas. Desinchronizacijos nerasta.
 menuBar.debug.compareMaps.problem=Rasta galima problema. Prašome perskaityti informaciją įrašyta į standartinį išvestį.
 menuBar.debug.compareMaps=Patikrinti žemėlapį desinchronizacijai
+menuBar.debug.displayAIMissions=Rodyti AI misijas
 menuBar.debug.displayErrorMessage=Rodyti klaidos pranešimą
 menuBar.debug.displayEuropeStatus=Rodyti Europos būseną
+menuBar.debug.displayPanels=Rodyti paneles
 menuBar.debug.hideEntireMap=Paslėpti visą žemėlapį
 menuBar.debug.memoryManager.gc=Pradėti nebenaudojamos atminties tvarkymą
 menuBar.debug.memoryManager=Atminties tvarkytuvė
@@ -348,6 +368,7 @@ model.option.nativeDemands.name=Indėnų pretenzijos
 model.option.nativeDemands.shortDescription=Padidina indėnų pretenzijų kiekį.
 model.option.rumourDifficulty.name=Gandų sunkumas
 model.option.rumourDifficulty.shortDescription=Kuo didesnis šis skaičius, tuo mažiau tikėtina kad gandai pasitvirtins.
+model.option.destroySettlementScore.name=Sunaikinti gyvenvietės rezultatą
 model.option.buildOnNativeLand.name=Įsikūrimas indėnų žemėje
 model.option.buildOnNativeLand.shortDescription=Ar kolonijas gali būti įkurtos indėnų žemėje.
 model.option.buildOnNativeLand.always.name=Visada
@@ -360,6 +381,15 @@ model.option.buildOnNativeLand.never.name=Niekada
 model.option.buildOnNativeLand.never.shortDescription=Įsikūrimas indėnų žemėje yra neleistinas.
 model.option.settlementNumber.name=Indėnų gyvenviečių procentas
 model.option.settlementNumber.shortDescription=Funkcija nustatyti kuriamo žemėlapio Indėnų gyvenviečių skaičių.
+model.option.settlementNumber.verySmall.name=Labai mažas
+model.option.settlementNumber.verySmall.shortDescription=Labai mažai vietinių gyvenviečių
+model.option.settlementNumber.small.name=Mažas
+model.option.settlementNumber.small.shortDescription=Mažas vietinių gyvenviečių skaičius
+model.option.settlementNumber.medium.name=Vidutinis
+model.option.settlementNumber.medium.shortDescription=Vidutinis vietinių gyvenviečių skaičius
+model.option.settlementNumber.large.name=Didelis
+model.option.settlementNumber.large.shortDescription=Didelis vietinių gyvenviečių skaičius
+model.option.settlementNumber.veryLarge.name=Labai didelis
 model.difficulty.monarch.name=Monarchas
 model.option.monarchMeddling.name=Monarcho kišimasis
 model.option.monarchMeddling.shortDescription=Padidina monarcho isikišimo kiekį ir intensyvumą.
@@ -398,6 +428,16 @@ model.option.unitsThatUseNoBells.name=Kolonistai kurie nenaudoja varpų
 model.option.unitsThatUseNoBells.shortDescription=Kolonistų skaičius kolonijoje, kurie nesunaudoja varpų.
 model.option.tileProduction.name=Langelio produkcija
 model.option.tileProduction.shortDescription=Produkcija langelių su kintama produkcija.
+model.option.tileProduction.veryLow.name=Labai žemas
+model.option.tileProduction.veryLow.shortDescription=Labai maža plytelių gamyba
+model.option.tileProduction.low.name=Žemas
+model.option.tileProduction.low.shortDescription=Maža plytelių gamyba
+model.option.tileProduction.medium.name=Vidutinis
+model.option.tileProduction.medium.shortDescription=Vidutinė plytelių gamyba
+model.option.tileProduction.high.name=Aukštas
+model.option.tileProduction.high.shortDescription=Didelė plytelių gamyba
+model.option.tileProduction.veryHigh.name=Labai aukštas
+model.option.tileProduction.veryHigh.shortDescription=Labai aukšta plytelių gamyba
 model.option.equipScoutCheat.name=Apginkluoti skautą
 gameOptions.name=Žaidimo parametrai
 gameOptions.shortDescription=Žaidimo parametrai
@@ -412,6 +452,14 @@ model.option.explorationPoints.shortDescription=Ar priskirti tyrinėjimo taškus
 model.option.amphibiousMoves.name=Amfibijas juda
 model.option.amphibiousMoves.shortDescription=Leisti perkelti tiesiai į gyvenvietes nuo karo vienetų.
 model.option.enhancedMissionaries.name=Patobulinti misionieriai
+model.option.giftProbability.name=Dovanos tikimybė
+model.option.demandProbability.name=Paklausos tikimybė
+model.option.startingPositions.name=Pradinės pozicijos
+model.option.startingPositions.classic.name=Klasikinis
+model.option.startingPositions.random.name=Atsitiktinis
+model.option.startingPositions.historical.name=Istorinis
+model.option.peaceProbability.name=Taikos tikimybė
+model.option.playerImmigrationBonus.name=Žaidėjo imigracijos bonusas
 gameOptions.colony.name=Kolonijų parametrai
 gameOptions.colony.shortDescription=Yra parametrų, susijusių su kolonijų funkcionavimu.
 model.option.customIgnoreBoycott.name=Muitinė ignoruoja boikotus
@@ -422,6 +470,7 @@ model.option.saveProductionOverflow.name=Išsaugoti gamybos perteklius
 model.option.saveProductionOverflow.shortDescription=Išsaugoti plaktukų, varpų ir kryžių perteklius.
 model.option.allowStudentSelection.name=Leisti atrankti studentus
 model.option.allowStudentSelection.shortDescription=Leidžia vartotojo, o ne automatinį studentų atrinkimą.
+model.option.onlyNaturalImprovements.name=Tik natūralūs pagerinimai
 model.option.naturalDisasters.name=Stichinės nelaimės
 gameOptions.victoryConditions.name=Pergales sąlygos
 gameOptions.victoryConditions.shortDescription=Parametrai pagal kurios sprendžiama, kaip žaidime gali būti laimėta.
@@ -433,12 +482,22 @@ model.option.victoryDefeatHumans.name=Visi kiti žmnės žaidėjai yra nugalėti
 model.option.victoryDefeatHumans.shortDescription=Bet kuris žaidėjas, kuris nugali visus kitus žmonius žaidėjus laimi žaidimą.
 gameOptions.years.name=Metų pasirinktys
 model.option.startingYear.name=Pradžios metai
+model.option.startingYear.shortDescription=Metai, kuriais prasideda žaidimas.
 model.option.seasonYear.name=Sezono metai
 model.option.lastYear.name=Praeiti žaidimo metai
-# Fuzzy
-gameOptions.prices.name=Pradinės kainos
+model.option.independenceTurn.name=Nepriklausomybės ėjimas
+model.option.seasons.name=Metų laikai
+gameOptions.prices.name=Kainos nustatymai
 model.option.food.minimumPrice.name=Minimali pradinė kaina maistui
 model.option.food.maximumPrice.name=Didžiausias pradinė maisto kaina
+model.option.tobacco.minimumPrice.name=Minimali pradinė tabako kaina
+model.option.tobacco.maximumPrice.name=Maksimali pradinė tabako kaina
+model.option.tobacco.spread.name=Skirtumas tarp tabako pirkimo ir pardavimo kainos
+model.option.cotton.minimumPrice.name=Minimali medvilnės kaina
+model.option.cotton.maximumPrice.name=Maksimali medvilnės kaina
+model.option.cotton.spread.name=Skirtumas tarp medvilnės pardavimo ir pirkimo kainos
+model.option.furs.minimumPrice.name=Minimali pradinė kailių kaina
+model.option.furs.maximumPrice.name=Maksimali pradinė kailių kaina
 mapGeneratorOptions.name=Žemėlapio generatoriaus funkcijos
 mapGeneratorOptions.shortDescription=Funkcijos, skirtos žemėlapio generatoriui.
 mapGeneratorOptions.landGenerator.name=Reljefo generatorius
@@ -451,6 +510,14 @@ model.option.landMass.name=Žemės masė
 model.option.landMass.shortDescription=Funkcijos nustatyti kuriamo žemėlapio žemės masę.
 model.option.landGeneratorType.name=Žemės masės tipas (EKSPERIMENTINIS!)
 model.option.landGeneratorType.shortDescription=Funkcija, pagal kurias nustatoma kokį žemėlapio generatorių naudoti.
+model.option.landGeneratorType.classic.name=Klasikinis
+model.option.landGeneratorType.classic.shortDescription=Didelis žemynas ir šiek tiek salų.
+model.option.landGeneratorType.continent.name=Žemynas
+model.option.landGeneratorType.continent.shortDescription=Dauguma žemės yra vienas žemynas.
+model.option.landGeneratorType.archipelago.name=Archipelagas
+model.option.landGeneratorType.archipelago.shortDescription=Keletas vidutinio dydžio salų.
+model.option.landGeneratorType.islands.name=Salos
+model.option.landGeneratorType.islands.shortDescription=Daug mažų salų.
 model.option.preferredDistanceToEdge.name=Pageidaujamas atstumas iki krašto
 model.option.preferredDistanceToEdge.shortDescription=Pageidaujamas atstumas iki žemėlapio krašto.
 model.option.maximumDistanceToEdge.name=Didžiausias atstumas iki krašto
@@ -465,10 +532,33 @@ model.option.maximumLatitude.name=Maksimali platuma
 model.option.maximumLatitude.shortDescription=Piečiausia platuma
 model.option.riverNumber.name=Upių procentas
 model.option.riverNumber.shortDescription=Funkcija nustatyti kuriamo žemėlapio upių skaičių.
+model.option.riverNumber.verySmall.name=Labai mažas
+model.option.riverNumber.verySmall.shortDescription=Labai mažai upių
+model.option.riverNumber.small.name=Mažas
+model.option.riverNumber.small.shortDescription=Mažas upių skaičius
+model.option.riverNumber.medium.name=Vidutinis
+model.option.riverNumber.medium.shortDescription=Vidutinis upių skačius
+model.option.riverNumber.large.name=Didelis
+model.option.riverNumber.large.shortDescription=Didelis upių skačius
+model.option.riverNumber.veryLarge.name=Labai didelis
 model.option.mountainNumber.name=Kalnų procentas
 model.option.mountainNumber.shortDescription=Funkcija nustatyti kuriamo žemėlapio kalnų skaičių.
+model.option.mountainNumber.verySmall.name=Labai mažas
+model.option.mountainNumber.verySmall.shortDescription=Labai mažai kalnų
+model.option.mountainNumber.small.name=Mažas
+model.option.mountainNumber.small.shortDescription=Mažas kalnų skaičius
+model.option.mountainNumber.medium.name=Vidutinis
+model.option.mountainNumber.medium.shortDescription=Vidutinis kalnų skaičius
+model.option.mountainNumber.large.name=Didelis
+model.option.mountainNumber.large.shortDescription=Didelis kalnų skaičius
+model.option.mountainNumber.veryLarge.name=Labai didelis
 model.option.rumourNumber.name=Prarasto Miesto gandų procenas
 model.option.rumourNumber.shortDescription=Funkcija nustatyti kuriamo žemėlapio Prarasto Miesto gandų skaičių.
+model.option.rumourNumber.verySmall.name=Labai mažas
+model.option.rumourNumber.small.name=Mažas
+model.option.rumourNumber.medium.name=Vidutinis
+model.option.rumourNumber.large.name=Didelis
+model.option.rumourNumber.veryLarge.name=Labai didelis
 model.option.forestNumber.name=Miškų procentas
 model.option.forestNumber.shortDescription=Funkcija nustatyti kuriamo žemėlapio miškų skaičių.
 model.option.bonusNumber.name=Bonusinių langelių procentas
@@ -1359,8 +1449,7 @@ model.historyEventType.declareIndependence.description=Jūs sunaikinote tautos %
 # Fuzzy
 model.historyEventType.destroyNation.description=%nation% sunaikino %nativeNation%.
 model.historyEventType.discoverNewWorld.description=Jūs atrandate Naująjį Pasaulį.
-# Fuzzy
-model.historyEventType.discoverRegion.description=%nation% atrasti %region% .
+model.historyEventType.discoverRegion.description={{tag:country|%nation%}} atranda %region%.
 model.historyEventType.foundColony.description=Jūs įkurėte koloniją %colony%.
 model.historyEventType.foundingFather.description=%father% prisijungia Kontinentinio kongreso.
 model.historyEventType.independence.description=Jūs pasiekėt nepriklausomybę nuo Karūnos.
@@ -1435,8 +1524,7 @@ model.nationState.notAvailable.name=nėra prieinamas
 model.player.forces=%nation% pajėgos
 model.player.independentMarket=Europa
 model.player.startGame=Po kelių mėnesių jūroje, jūs pagaliau atvykote prie nežinomo žemyno pakrantės. Plaukit {{tag:%direction%|west=westward|east=eastward|default=į vėją}} siekiant atrasti Naują Pasaulį ir paskelbti jį Karūnos nuosavybę.
-# Fuzzy
-model.player.waitingFor=Laukiama: %nation%
+model.player.waitingFor=Laukiama: {{tag:country|%nation%}}
 model.regionType.coast.name=Pakrantė
 model.regionType.coast.unknown=Nežinoma pakrantė
 model.regionType.desert.name=Dykuma
@@ -1489,8 +1577,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.colonyCenter.description=Niekas negali būti pridedėta kolonijos centre.
@@ -1762,6 +1849,7 @@ server.incompatibleVersions=Įrašytas žaidimas, kurį bandote įkelti, yra ne
 server.initialize=Klaida inicijuojant serverį
 server.invalidPlayerNations=Visi žaidėjai turėtu pasirinkti unikalią tautą kad žaidimas prasidėtu.
 server.maximumPlayers=Atsiprašome, maksimalus dalyvių skaičius buvo pasiektas.
+# Fuzzy
 server.noRouteToServer=Serveris negali būti skelbiama viešai. Jums reikia pakeisti savo ugniasienės nustatymus, kad būtų galima jungtis į uosto, kurį nurodėte.
 server.notAllReady=Ne visi žaidėjai yra pasiruošę pradėti žaidimą!
 server.onlyAdminCanLaunch=Atsiprašome, tik serverio administratorius gali pradėti žaidimą.
@@ -1885,6 +1973,7 @@ report.colony.improve.header=Pagerinti
 report.colony.name.description=Kolonijų sąrašas
 report.colony.name.header=Kolonija
 report.colony.tile.plow.header=P
+report.colony.tile.road.header=R
 # Fuzzy
 report.continentalCongress.elected=Išrinkti:
 report.continentalCongress.none=(jokių)
@@ -2006,6 +2095,7 @@ europePanel.transaction.price=Kaina:\t%gold%
 europePanel.transaction.purchase=Pirkti %amount% %goods% už %gold%
 europePanel.transaction.sale=Parduoti %amount% %goods% už %gold%
 firstContactDialog.meeting.natives=Vietinių susitikimas
+firstContactDialog.meeting.aztec=Actekų tauta
 firstContactDialog.meeting.inca=Inkų imperija
 firstContactDialog.welcomeOffer.text=%nation% pasveikinti Jus. Mes šlovingą tautos %camps% %settlementType% . Norėdami švęsti mūsų draugystė, mes dosniai siūlome jums kraštą, kurį dabar užima kaip dovana. Ar jūs priimate mūsų sutartis ir guli su mumis taikos kaip broliai?
 firstContactDialog.welcomeSimple.text=%nation% pasveikinti Jus. Mes šlovingą tautos %camps% %settlementType% . Ar jūs priimate mūsų sutartis ir guli su mumis taikos kaip broliai?
@@ -2045,6 +2135,7 @@ freecol.map.America_large=Amerikos (didelis)
 freecol.map.Australia=Australija
 freecol.map.Caribbean_basin=Karibų baseinas
 mapSizeDialog.mapSize=Pasirinkite žemėlapio dydį
+modifierFormat.scopeMethod.isIndian.name=vietiniai
 newPanel.getServerList=Gauti serverių sąrašą
 newPanel.joinMultiPlayerGame=Jungtis prie kelių žaidėjų žaidimo
 newPanel.nationalAdvantages=Tautos privalumai
diff --git a/data/strings/FreeColMessages_mk.properties b/data/strings/FreeColMessages_mk.properties
index beee26f48..314767b0a 100644
--- a/data/strings/FreeColMessages_mk.properties
+++ b/data/strings/FreeColMessages_mk.properties
@@ -201,8 +201,9 @@ cli.no-sound=пушти го FreeCol без звук
 cli.no-splash=изостави ја најавата
 cli.private=започнете доверлив опслужувач (не се објавува на метаопслужувачот)
 cli.seed=овозможи SEED за создавачот на псевдослучајни броеви
-cli.server-name=назначете НАЗИВ на опслужувачот
+# Fuzzy
 cli.server=започни самостоен опслужувач на назначената порта
+cli.server-name=назначете НАЗИВ на опслужувачот
 cli.splash=прикажи ПОДАТОТЕКА од слика при вчитување на играта
 cli.tc=вчитај правилник на игра со назначеното ИМЕ
 cli.timeout=колку секунди опслужувачот чека одговор на прашањето
@@ -2572,6 +2573,7 @@ server.invalidPlayerNations=Пред да почне играта, сите иг
 server.maximumPlayers=Жалиме, веќе е достигнат максималниот број на играчи.
 server.missingUserName=Во барањето за најава нема наведено корисничко име.
 server.missingVersion=Во барањето за најава нема наведено верзија на FreeCol.
+# Fuzzy
 server.noRouteToServer=Опслужувачот не може да се направи да биде јавен. Треба да ги измените нагодувања за заштита (firewall) и со тоа да дозволите поврзувања со назначената порта.
 server.noSuchPlayer=Во играта нема играч наречен: %player%
 server.notAllReady=Не сите играчи се спремни да ја почнат играта!
diff --git a/data/strings/FreeColMessages_ms.properties b/data/strings/FreeColMessages_ms.properties
index 43555dd89..fe90f6c7c 100644
--- a/data/strings/FreeColMessages_ms.properties
+++ b/data/strings/FreeColMessages_ms.properties
@@ -191,8 +191,9 @@ cli.no-memory-check=langkau penyemakan ingatan
 cli.no-sound=jalankan FreeCol tanpa bunyi
 cli.private=mulakan pelayan persendirian (tidak diterbitkan ke dalam metapelayan)
 cli.seed=berikan BENIH untuk penjana nombor rawak palsu
-cli.server-name=nyatakan NAMA tersuai untuk pelayan ini
+# Fuzzy
 cli.server=mulakan pelayan kendiri pada port yang ditetapkan
+cli.server-name=nyatakan NAMA tersuai untuk pelayan ini
 cli.splash=paparkan FAIL imej skrin splash ketika memuatkan permainan
 cli.tc=muatkan set peraturan dengan NAMA yang diberikan
 cli.timeout=bilangan saat untuk pelayan menunggu jawapan kepada soalan
@@ -2278,6 +2279,7 @@ server.invalidPlayerNations=Semua pemain perlu memilih bangsa yang unik sebelum
 server.maximumPlayers=Maaf, bilangan pemain maksimum sudah dicapai.
 server.missingUserName=Nama pengguna tertinggal pada pemohonan log masuk.
 server.missingVersion=Versi FreeCol tertinggal pada pemohonan log masuk.
+# Fuzzy
 server.noRouteToServer=Pelayan ini tidak boleh dijadikan umum. Anda mesti mengubah suai tetapan tembok api (firewall) anda untuk membenarkan sambungan kepada port yang anda tetapkan.
 server.notAllReady=Tidak semua pemain sedia bermain!
 server.onlyAdminCanLaunch=Maaf, hanya pentadbir pelayan yang boleh melancarkan permainan.
diff --git a/data/strings/FreeColMessages_nl.properties b/data/strings/FreeColMessages_nl.properties
index 31c027b94..ffc2e379e 100644
--- a/data/strings/FreeColMessages_nl.properties
+++ b/data/strings/FreeColMessages_nl.properties
@@ -210,8 +210,9 @@ cli.no-memory-check=de geheugencontrole overslaan
 cli.no-sound=FreeCol uitvoeren zonder geluid
 cli.private=een beperkt toegankelijke server starten (niet gepubliceerd op de metaserver)
 cli.seed=geef een ZAAD op voor de pseudo willekeurige nummergenerator
-cli.server-name=een aangepaste naam voor de server instellen
+# Fuzzy
 cli.server=een stand-aloneserver starten op de opgegeven poort
+cli.server-name=een aangepaste naam voor de server instellen
 cli.splash=geef het bestand BESTAND weer tijdens het laden van het spel
 cli.tc=het spel laden met de opgegeven NAAM
 cli.timeout=aantal seconden dat de server wacht op een antwoord op een vraag
@@ -2410,6 +2411,7 @@ server.invalidPlayerNations=Alle spelers moeten een unieke natie kiezen voordat
 server.maximumPlayers=Helaas, het maximum aantal spelers is al bereikt.
 server.missingUserName=De gebruikersnaam ontbreekt in het aanmeldverzoek.
 server.missingVersion=De FreeCol-versie ontbreekt in het aanmeldverzoek.
+# Fuzzy
 server.noRouteToServer=Deze server kan niet publiek gemaakt worden. U moet uw firewall aanpassen om verbindingen op de opgegeven poort toe te staan.
 server.notAllReady=Niet alle medespelers zijn klaar om te beginnen!
 server.onlyAdminCanLaunch=Helaas, alleen de beheerder van de server kan het spel starten.
diff --git a/data/strings/FreeColMessages_nl_BE.properties b/data/strings/FreeColMessages_nl_BE.properties
index d7af86364..868299053 100644
--- a/data/strings/FreeColMessages_nl_BE.properties
+++ b/data/strings/FreeColMessages_nl_BE.properties
@@ -174,8 +174,9 @@ cli.no-memory-check=de geheugencontrole overslaan
 cli.no-sound=FreeCol starten zonder geluid
 cli.private=een private server starten (niet gepubliceerd via de metaserver)
 cli.seed=Geef een SEED op voor de pseudo-random nummergenerator
-cli.server-name=geef een aangepaste NAAM voor de server
+# Fuzzy
 cli.server=een alleenstaande server starten op de opgegeven poort
+cli.server-name=geef een aangepaste NAAM voor de server
 cli.splash=het Splash scherm weer BESTAND weer tonen bij het laden van het spel
 cli.tc=de totale conversie met de gegeven NAAM laden
 cli.version=toon het versienummer en sluit af
@@ -1685,6 +1686,7 @@ server.fileNotFound=Kan het bestand met de opgegeven naam niet terugvinden.
 server.incompatibleVersions=Het bewaarde spel is niet compatibel met deze versie van FreeCol.
 server.invalidPlayerNations=Alle spelers moeten een unieke natie kiezen voor het spel kan starten.
 server.maximumPlayers=Sorry, het maximum aantal spelers is al bereikt.
+# Fuzzy
 server.noRouteToServer=De server kan niet publiek gesteld worden. Pas je firewall instellingen aan om verbindingen op de ingestelde poort toe te laten.
 server.notAllReady=Alle spelers zijn niet klaar om te spelen!
 server.onlyAdminCanLaunch=Sorry, enkel de server beheerder kan het spel starten.
diff --git a/data/strings/FreeColMessages_oc.properties b/data/strings/FreeColMessages_oc.properties
index b97359caa..9bee4a7af 100644
--- a/data/strings/FreeColMessages_oc.properties
+++ b/data/strings/FreeColMessages_oc.properties
@@ -197,8 +197,9 @@ cli.no-memory-check=sautar la verificacion de memòria
 cli.no-sound=Executar FreeCol sens son
 cli.private=aviar un servidor privat (pas publicat sul servidor meta)
 cli.seed=provesís una GRANA pel generator de nombres pseudo-aleatòris
-cli.server-name=definir un NOM personalizat pel servidor
+# Fuzzy
 cli.server=Aviar un servidor sul pòrt especificat
+cli.server-name=definir un NOM personalizat pel servidor
 cli.splash=afichar un ecran d'aviament amb l'imatge FICHIÈR en fons
 cli.tc=cargar la conversion totala amb lo NOM balhat
 cli.timeout=nombre de segondas pendent lo qual lo servidor espèra la responsa a una question
@@ -987,7 +988,7 @@ model.ability.selectRecruit.name=Seleccionar las recrutas
 model.ability.supportUnit.name=Unitat de sosten
 model.ability.teach.name=Ensenhar las competéncias
 model.ability.teach.shortDescription=Las unitats expèrtas pòdon ensenhar a las autras lors competéncias
-model.ability.tradeWithForeignColonies.name=Capacitat amb las colonias estrangièras
+model.ability.tradeWithForeignColonies.name=Comerçar amb las colonias estrangièras
 model.ability.undead.name=Mòrt-vivent
 model.ability.undead.shortDescription=Una unitat d’otra-tomba
 model.modifier.bombardBonus.name=Bonus de bombardament
@@ -2233,6 +2234,7 @@ server.invalidPlayerNations=Cada jogaire deu causir una nacion abans de comença
 server.maximumPlayers=O planhèm, lo nombre maximum de jogaires es atench.
 server.missingUserName=Lo nom d'utilizaire es absent de la demanda de connexion.
 server.missingVersion=La version de FreeCol es absenta de la demanda de connexion.
+# Fuzzy
 server.noRouteToServer=Lo servidor pòt pas èsser rendut publicament accessible. Vos cal configurar vòstre parafuòc d'un biais qu'autorize las connexions entrantas sul numèro de pòrt qu'avètz especificat.
 server.notAllReady=Totes los jogaires son pas prèstes !
 server.onlyAdminCanLaunch=O planhèm, sol l'administrator del servidor pòt amodar lo jòc.
diff --git a/data/strings/FreeColMessages_pl_PL.properties b/data/strings/FreeColMessages_pl_PL.properties
index 2fa89cb65..e502697af 100644
--- a/data/strings/FreeColMessages_pl_PL.properties
+++ b/data/strings/FreeColMessages_pl_PL.properties
@@ -213,8 +213,9 @@ cli.no-memory-check=pomiń test pamięci
 cli.no-sound=uruchom FreeCol bez dźwięku
 cli.private=uruchom serwer prywatny (nie będzie ujawniany na meta-serwerze)
 cli.seed=podaj ZIARNO dla generatora liczb pseudolosowych
-cli.server-name=określ wybraną NAZWĘ dla serwera
+# Fuzzy
 cli.server=uruchom samodzielny serwer na określonym porcie
+cli.server-name=określ wybraną NAZWĘ dla serwera
 cli.splash=wyświetl obraz PLIK na ekranie powitalnym podczas ładowania gry
 cli.tc=załaduj całkowitą konwersję o podanej NAZWIE
 cli.timeout=liczba sekund przez jaką serwer oczekuje na odpowiedź
@@ -2237,6 +2238,7 @@ server.invalidPlayerNations=Przed rozpoczęciem gry każdy gracz musi wybrać in
 server.maximumPlayers=W rozgrywce bierze już udział maksymalna liczba graczy.
 server.missingUserName=W żądaniu logowania brakuje nazwy użytkownika.
 server.missingVersion=W żądaniu logowania brakuje wersji FreeCol.
+# Fuzzy
 server.noRouteToServer=Serwer nie może stać się publicznym. Powinieneś wcześniej zmienić ustawienia firewall, tak by umożliwić podłączanie do portu, który wybrałeś.
 server.notAllReady=Nie wszyscy gracze są gotowi do rozpoczęcia gry!
 server.onlyAdminCanLaunch=Tylko admin serwera może rozpocząć nową grę.
diff --git a/data/strings/FreeColMessages_pt_BR.properties b/data/strings/FreeColMessages_pt_BR.properties
index 7f8beb34a..87facaa9d 100644
--- a/data/strings/FreeColMessages_pt_BR.properties
+++ b/data/strings/FreeColMessages_pt_BR.properties
@@ -227,8 +227,9 @@ cli.no-memory-check=pula a checagem de memória
 cli.no-sound=executa o FreeCol sem som
 cli.private=inicia um servidor privado (não publicado no metaservidor)
 cli.seed=fornece uma SEMENTE para o gerador de números pseudo-aleatórios
-cli.server-name=especifica um NOME personalizado para o servidor
+# Fuzzy
 cli.server=inicia um servidor stand-alone na porta especificada
+cli.server-name=especifica um NOME personalizado para o servidor
 cli.splash=exibe um ARQUIVO de imagem como tela inical enquanto carrega o jogo
 cli.tc=carrega a "conversão total" com o NOME dado
 cli.timeout=número de segundos que o servidor espera por uma resposta à pergunta
@@ -477,6 +478,8 @@ model.option.interventionForce.name=Força de intervenção
 model.option.interventionForce.shortDescription=A Força de Intervenção enviada para apoiar a sua Guerra de Independência.
 model.option.mercenaryForce.name=Força de mercenários
 model.option.mercenaryForce.shortDescription=A Força Mercenária se ofereceu para apoiar a sua Guerra de Independência.
+model.option.warSupportForce.name=Força de Apoio guerra
+model.option.warSupportForce.shortDescription=A Força máxima oferecida pelo monarca para apoiar as suas guerras.
 model.difficulty.government.name=Governo
 model.option.badGovernmentLimit.name=Limite de governo ineficiente
 model.option.badGovernmentLimit.shortDescription=O número máximo de monarquistas para começar a penalidade na produção
@@ -2432,6 +2435,7 @@ server.invalidPlayerNations=Cada jogador deve escolher uma nação diferente ant
 server.maximumPlayers=Desculpe, o número máximo de jogadores já foi atingido.
 server.missingUserName=O nome de usuário está ausente na solicitação de login.
 server.missingVersion=A versão do FreeCol está ausente na solicitação de login.
+# Fuzzy
 server.noRouteToServer=O servidor não pode ser público. Você deve modificar suas configurações de firewall para permitir conexões na porta em uso.
 server.noSuchPlayer=O jogo não contém um jogador chamado: %player%
 server.notAllReady=Nem todos os jogadores estão prontos para começar o jogo!
diff --git a/data/strings/FreeColMessages_pt_PT.properties b/data/strings/FreeColMessages_pt_PT.properties
index 5d6837b22..faf87462c 100644
--- a/data/strings/FreeColMessages_pt_PT.properties
+++ b/data/strings/FreeColMessages_pt_PT.properties
@@ -199,8 +199,9 @@ cli.no-memory-check=salta a verificação de memória
 cli.no-sound=executa o FreeCol sem som
 cli.private=inicia um servidor privado (não será publicitado no meta-servidor)
 cli.seed=fornece uma SEMENTE para o gerador de números pseudo-aleatórios
-cli.server-name=especifica um NOME para o servidor
+# Fuzzy
 cli.server=inicia um servidor autónomo no porto especificado
+cli.server-name=especifica um NOME para o servidor
 cli.splash=mostra uma imagem indicada por FICHEIRO enquanto o jogo carrega
 cli.tc=carrega a conversão total com o NOME indicado
 cli.timeout=número de segundos que o servidor espera por uma resposta à pergunta
@@ -2021,6 +2022,7 @@ server.invalidPlayerNations=Cada jogador deve escolher uma nação diferente par
 server.maximumPlayers=Desculpe, o número máximo de jogadores já foi atingido.
 server.missingUserName=Falta o nome de utilizador no pedido de inicio de sessão.
 server.missingVersion=Falta a versão do FreeCol no pedido de inicio de sessão.
+# Fuzzy
 server.noRouteToServer=O servidor não pode ser público. Deve modificar as configurações da sua firewall para permitir ligações no porto indicado.
 server.notAllReady=Nem todos os jogadores estão prontos para começar o jogo!
 server.onlyAdminCanLaunch=Desculpe, só o administrador do servidor pode iniciar o jogo.
diff --git a/data/strings/FreeColMessages_qqq.properties b/data/strings/FreeColMessages_qqq.properties
index 6287d569b..5f30a2abb 100644
--- a/data/strings/FreeColMessages_qqq.properties
+++ b/data/strings/FreeColMessages_qqq.properties
@@ -27,6 +27,7 @@
 # Author: Siebrand
 # Author: Sp5uhe
 # Author: Umherirrender
+# Author: Urhixidur
 # Author: Utar
 # Author: Verdy p
 # Author: Vesenina26
@@ -40,7 +41,9 @@ dry=Value for:\n* {{Msg-freecol|Model.option.humidity.name}}
 hot={{Identical|Hot}}\n\nValue for:\n* {{Msg-freecol|Model.option.temperature.name}}
 temperate=Value for:\n* {{Msg-freecol|Model.option.temperature.name}}\n{{Identical|Temperate}}
 veryDry=Value for:\n* {{Msg-freecol|Model.option.humidity.name}}
+veryHigh=Value for:\n\nModel.option.?
 veryLarge=Can refer to "amount of X, where X can be villages, rivers and such" in addition to map size.
+veryLow=Value for:\n\nModel.option.?
 verySmall=Can refer to "amount of X, where X can be villages, rivers and such" in addition to map size.
 veryWet=Value for:\n* {{Msg-freecol|Model.option.humidity.name}}
 warm=Value for:\n* {{Msg-freecol|Model.option.temperature.name}}
@@ -58,15 +61,15 @@ color={{Identical|Color}}
 connect={{Identical|Connect}}
 current={{Identical|Current}}\nThe message is used in the audio options dialog (select Preferences -> Audio) and refers to the currently selected audio output device.
 false={{Identical|False}}
-fill={{Identical|Load}}
+fill={{Identical|Fill}}
 height={{Identical|Height}}
 help={{Identical|Help}}
-high={{Identical|High}}
+high={{Identical|High}}\nValue for:\n\nModel.option.?
 host={{Identical|Host}}
 large={{Identical|Large}}\nCan refer to "amount of X, where X can be villages, rivers and such" in addition to map size.
 load={{Identical|Load}}
-low={{Identical|Low}}
-many=murte\n{{Identical|Many}}
+low={{Identical|Low}}\nValue for:\n\nModel.option.?
+many={{Identical|Many}}
 medium=Can refer to "amount of X, where X can be villages, rivers and such" in addition to map size.\n{{Identical|Medium}}
 more={{Identical|More}}
 music={{Identical|Music}}
@@ -125,14 +128,22 @@ list.down={{Identical|Down}}
 list.edit={{Identical|Edit}}
 list.remove={{Identical|Remove}}
 list.up={{Identical|Up}}
+cli.arg.advantages=Is this a keyword and thus untranslatable?
+cli.arg.clientOptions=Is this a keyword and thus untranslatable?
+cli.arg.debug=Is this a keyword and thus untranslatable?
+cli.arg.debugRun=Is this a keyword and thus untranslatable?
+cli.arg.difficulty=Is this a keyword and thus untranslatable?
 cli.arg.dimensions={{FreeCol-CLI}}
 cli.arg.directory=See also {{msg-freecol|cli.freecol-data}}, {{msg-freecol|cli.home-directory}}.\n{{FreeCol-CLI}}
+cli.arg.europeans=Is this a keyword and thus untranslatable?
 cli.arg.file=See also {{msg-freecol|cli.check-savegame}} {{msg-freecol|cli.load-savegame}}, {{msg-freecol|cli.splash}}.\n{{FreeCol-CLI}}\n{{Identical|File}}
-cli.arg.gui-scale={{Identical|Scale}}
+cli.arg.gui-scale={{Identical|Scale}}\nIs this a keyword and thus untranslatable?
 cli.arg.locale={{FreeCol-CLI}}\n{{Identical|Locale}}
 cli.arg.loglevel=See also {{msg-freecol|cli.log-level}}.\n{{FreeCol-CLI}}
 cli.arg.name=See also {{msg-freecol|cli.server-name}}, {{msg-freecol|cli.tc}}.\n{{FreeCol-CLI}}\n{{Identical|Name}}
 cli.arg.port={{FreeCol-CLI}}\n{{Identical|Port}}
+cli.arg.seed=Is this a keyword and thus untranslatable?
+cli.arg.timeout=Is this a keyword and thus untranslatable?
 cli.check-savegame={{FreeCol-CLI}}
 cli.debug={{FreeCol-CLI}}
 cli.default-locale={{FreeCol-CLI}}
@@ -147,8 +158,8 @@ cli.no-java-check={{FreeCol-CLI}}
 cli.no-memory-check={{FreeCol-CLI}}
 cli.no-sound={{FreeCol-CLI}}
 cli.private={{FreeCol-CLI}}
-cli.server-name=<tt>NAME</tt> should be the same as {{msg-freecol|cli.arg.name}}.\n{{FreeCol-CLI}}
 cli.server={{FreeCol-CLI}}
+cli.server-name=<tt>NAME</tt> should be the same as {{msg-freecol|cli.arg.name}}.\n{{FreeCol-CLI}}
 cli.splash=<tt>FILE</tt> should be the same as {{msg-freecol|cli.arg.file}}.\n{{FreeCol-CLI}}
 cli.tc=<tt>NAME</tt> should be the same as {{msg-freecol|cli.arg.name}}.\n{{FreeCol-CLI}}\n\nFrom FreeCol developer: "total conversion" is the (somewhat unfortunate) name we use for a "rule set", or a "game". At the moment, we have the default rules, as well as the "classic" and "testing" rules. The latter two would be considered a "total conversion".
 cli.version={{FreeCol-CLI}}
@@ -453,6 +464,7 @@ model.unit.veteranSoldier.workingAs={{Identical|Soldier}}
 model.abstractGoods.label={{optional}}
 model.colony.insufficientProduction=Consumption deficit is a comma separated list of goods labels (e.g. "2 furs")
 model.direction.N.name=Unused at this time.
+model.direction.W.name={{Identical|West}}
 model.historyEventType.meetNation.description=Used in "History report". Format is: YYYY (message)
 model.indianSettlement.mostHatedNone={{Identical|None}}
 model.indianSettlement.mostHatedUnknown={{Identical|Unknown}}
@@ -521,6 +533,7 @@ disbandUnit.yes={{Identical|Disband}}
 tradeRoute.prefix=A concatenated message for a unit on a trade route, where the data portion can include multiple sub-messages with tradeRoute prefix.
 server.badNation=Used as error message
 server.reject=General message for errors that "can not happen" and which may indicate a client behaving badly
+giveIndependence.otherAnnounce=Is the REF (Royal Expeditionary Force) singular or plural?
 colopedia.effects={{Identical|Effect}}
 colopedia.buildings.autoBuilt=[[File:Freecol-colopedia-depot.png|thumb]]
 colopedia.buildings.cost=[[File:Freecol-colopedia-depot.png|thumb]]
diff --git a/data/strings/FreeColMessages_ru.properties b/data/strings/FreeColMessages_ru.properties
index 5d34a808c..a6bcfeade 100644
--- a/data/strings/FreeColMessages_ru.properties
+++ b/data/strings/FreeColMessages_ru.properties
@@ -133,7 +133,9 @@ cargoOnCarrier=Груз на судне
 cashInTreasureTrain=Золота в обозе с сокровищами
 clearOrders=Очистить приказы
 colonists=Колонисты
+colonyCenter=центр колонии
 colopedia=Колопедия
+countryName={{tag:country|%nation%}}
 difficulty=Сложность
 docks=Пристань
 dumpCargo=Сбросить груз
@@ -236,8 +238,9 @@ cli.no-sound=запустить FreeCol без звука
 cli.no-splash=пропустить заставку
 cli.private=запустить частный сервер (без публикации на metaserver)
 cli.seed=начальное число для генератора псевдослучайных чисел
-cli.server-name=указать ИМЯ сервера
+# Fuzzy
 cli.server=запустить самостоятельный сервер по указанному порту
+cli.server-name=указать ИМЯ сервера
 cli.splash=отображать заставку из ФАЙЛА во время загрузки игры
 cli.tc=загрузить набор правил с заданным ИМЕНЕМ
 cli.timeout=Время ожидания сервера для ответа на вопрос (секунды)
@@ -1986,14 +1989,10 @@ model.direction.SW.name=юго-запад
 model.direction.W.name=запад
 model.direction.NW.name=северо-запад
 model.historyEventType.abandonColony.description=Вы оставили колонию %colony%.
-# Fuzzy
-model.historyEventType.ceaseFire.description=Прекратить боевые действия против %nation%.
-# Fuzzy
-model.historyEventType.cityOfGold.description=%nation% обнаружили %city%, один из Семи Золотых Городов. Добыча составила %treasure% золота.
-# Fuzzy
-model.historyEventType.colonyConquered.description=Ваша колония %colony% захвачена {{tag:with|%nation%}}.
-# Fuzzy
-model.historyEventType.colonyDestroyed.description=Ваша колония %colony% уничтожена {{tag:with|%nation%}}.
+model.historyEventType.ceaseFire.description=Прекратить боевые действия против {{tag:country|%nation%}}.
+model.historyEventType.cityOfGold.description={{tag:country|%nation%}} обнаружили %city%, один из Семи Золотых Городов. Добыча составила %treasure% золота.
+model.historyEventType.colonyConquered.description={{tag:with|%nation%}} захватили вашу колонию %colony%.
+model.historyEventType.colonyDestroyed.description={{tag:country|%nation%}} уничтожили вашу колонию %colony%.
 # Fuzzy
 model.historyEventType.conquerColony.description=Вы приняли наши щедрые условия сделки и еще уклоняетесь от оплаты? Такая двойственность сильно расстраивает нас.
 # Fuzzy
@@ -2337,10 +2336,8 @@ model.unit.noMoreTools=%location%: Ваш первопроходец испол
 model.unit.slowed=%enemyNation% %enemyUnit% замедлил скорость передвижения нашего %unit%.
 model.unit.unitRepaired=В %repairLocation% починили %unit%.
 model.unit.hardyPioneer.noMoreTools=%location%: Ваш выносливый первопроходец израсходовал все свои инструменты.
-# Fuzzy
-error.couldNotLoad=Произошла ошибка при запуске игры!
-# Fuzzy
-error.couldNotSave=Произошла ошибка при сохранении игры!
+error.couldNotLoad=Произошла ошибка при загрузке игры из файла %name%!
+error.couldNotSave=Произошла ошибка при сохранении игры в файл %name%!
 main.defaultPlayerName=Имя игрока
 main.javaVersion=Для запуска FreeCol рекомендуется Java версии %minVersion% или лучше\n(%version% обнаружена, используйте --no-java-check чтобы пропустить эту проверку).
 main.memory=Необходимо назначить более %memory% байт памяти для JVM.\n  Перезапустите FreeCol с: java-Xmx%minMemory%М-jar FreeCol.jar
@@ -2549,6 +2546,7 @@ server.invalidPlayerNations=Перед началом игры каждый иг
 server.maximumPlayers=Извините, достигнуто максимальное количество игроков.
 server.missingUserName=В запросе на вход отсутствует имя пользователя.
 server.missingVersion=Версия FreeCol не соответствует запросу входа.
+# Fuzzy
 server.noRouteToServer=Этот сервер не может быть публичным. Вам следует изменить настройки сетевого экрана (firewall) для установления соединения по выбранному порту.
 server.noSuchPlayer=В игре нет игрока под именем: %player%
 server.notAllReady=Не все игроки готовы начать игру!
diff --git a/data/strings/FreeColMessages_sk.properties b/data/strings/FreeColMessages_sk.properties
index 0629f9b83..76c773cbd 100644
--- a/data/strings/FreeColMessages_sk.properties
+++ b/data/strings/FreeColMessages_sk.properties
@@ -202,8 +202,9 @@ cli.no-sound=spustiť FreeCol bez zvuku
 cli.no-splash=preskočiť úvodnú obrayovku
 cli.private=spustiť súkromný server (nepublikovaný na metaserver)
 cli.seed=zadať SEED pre pseudo generátor náhodných čísiel
-cli.server-name=zadať vlastný NÁZOV servera
+# Fuzzy
 cli.server=spustiť samostatný server na zadanom porte
+cli.server-name=zadať vlastný NÁZOV servera
 cli.splash=zobraziť úvodný obrázok FILE pri načítavaní hry
 cli.tc=načítať celkový prevod so zadaným MENOM
 cli.timeout=počet sekúnd, ktoré server čaká na odpoveď na otázku
@@ -2197,6 +2198,7 @@ client.ending=Hra sa končí.
 client.headlessDebug=Bezhlavý režim vyžaduje spustenie ladenia.
 client.headlessRequires=Bezhlavý režim vyžaduje uloženú hru alebo špecifikáciu.
 client.laf=Nemožno nainštalovať FreeCol pozeraj-a-cíť.
+client.noPlayers=V tejto hre nie sú dostupný žiadnz hráči.
 metaServer.couldNotConnect=Ospravedlňujeme sa, nedá sa pripojiť na meta-server. Skúste znovu neskôr prosím.
 metaServer.communicationError=Pri komunikácii s meta-serverom sa vyskytla chyba. Prosím skúste znovu neskôr.
 abandonEducation.action.studying=štúdium
@@ -2383,6 +2385,7 @@ server.invalidPlayerNations=Pred začiatkom hry si všetci hráči musia vybrať
 server.maximumPlayers=Je nám ľúto. Bol dosiahnutý maximálny počet hráčov.
 server.missingUserName=Prihláseniu chýba užívateľské meno.
 server.missingVersion=Prihláseniu chýba verzia hry FreeCol.
+# Fuzzy
 server.noRouteToServer=Server sa nedá zverejniť. Mali by ste upraviť Vaše nastavenie brány firewall.
 server.noSuchPlayer=Hra neobsahuje hrávča menom: %player%
 server.notAllReady=Nie všetci hráči sú pripravení na začiatok hry!
@@ -2545,7 +2548,11 @@ report.colony.production.export.description=%colony%: Vyrába sa %amount% ks tov
 report.colony.production.header=Čistá výroba tovaru %goods%
 report.colony.production.high.description=%colony%: Vyrába sa %amount% ks tovaru %goods%, zaplnenie {{plural:%turns%|one=ďalším ťahom|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
 report.colony.production.low.description=%colony%: Spotrebúva sa %amount% ks tovaru %goods%, spotrebuje sa {{plural:%turns%|one=v ďaľšom ťahu|two=za dva ťahy|three=za tri ťahy|four=za štyri ťahy|other=za %turns% ťahov}}
+report.colony.production.summary.description=Množstvo tovarov, ktoré sú vytvorené alebo spotrebované
 report.colony.production.waste.description=%colony%: Vyrába sa %amount% ks tovaru %goods% , sklad bude preplnený, %waste% ks bude vyhodených
+report.colony.tile.clearForest.header.description=Počet políčok kolónie, ktoré by profitovali z výrubu.
+report.colony.tile.clearForest.summary.description=Celkový počet políčok kolónie na tomto kontinente, ktoré by profitovali z výrubu.
+report.colony.tile.plow.description=kolónii %colony% by prospelo poorať {{plural:%amount%|one=jedno políčko|two=dve políčka|three=tri políčka|four=štyri políčka|other=%amount% políčok}}
 report.colony.tile.road.header=R
 report.colony.tile.road.header.description=Počet políčok kolónie, ktoré by profitovali z postavenej cesty.
 report.colony.tile.road.summary.description=Celkový počet políčok kolónie na tomto kontinente, ktoré by profitovali z postavenej cesty.
diff --git a/data/strings/FreeColMessages_sv_SE.properties b/data/strings/FreeColMessages_sv_SE.properties
index 9078ba36b..975901ee8 100644
--- a/data/strings/FreeColMessages_sv_SE.properties
+++ b/data/strings/FreeColMessages_sv_SE.properties
@@ -1,6 +1,7 @@
 # Messages for Swedish (svenska)
 # Exported from translatewiki.net
 # Author: Boivie
+# Author: BroderTuck
 # Author: Cohan
 # Author: Harald Khan
 # Author: Jenniesarina
@@ -52,6 +53,7 @@ all=Alla
 and=och
 browse=Bläddra
 cancel=Avbryt
+client=Klient
 close=Stäng
 color=Färg
 connect=Anslut
@@ -112,6 +114,7 @@ colopedia=Colopedia
 difficulty=Svårighetsgrad
 docks=Kajer
 dumpCargo=Dumpa lasten
+finalResult=Slutresultat
 fortify=Befäst
 gold=Guld
 goldAmount=%amount% guld
@@ -188,6 +191,7 @@ cli.default-locale=ange förvald locale (SPRÅK[_LAND[_VARIANT]])
 cli.difficulty=ställ in SVÅRIGHETSNIVÅN
 cli.font=Ange förvalstypsnitt
 cli.freecol-data=ange i vilken KATALOG FreeCol lagrar data (har en underkatalog som heter 'base')
+cli.full-screen=kör FreeCol i helskärmsläge
 cli.help=visa denna hjälpskärm
 cli.load-savegame=läs in angiven FIL med sparat spel
 cli.log-console=skriv logg i konsol utöver i fil
@@ -200,14 +204,14 @@ cli.no-memory-check=hoppa över minneskontroll
 cli.no-sound=kör FreeCol utan ljud
 cli.private=starta en privat server (som ej publiceras på metaservern)
 cli.seed=tillhandahåller ett FRÖ till den pseudo-slumpmässiga nummergeneratorn
-cli.server-name=ange ett anpassat NAMN för servern
+# Fuzzy
 cli.server=starta en självständig server på angiven port
+cli.server-name=ange ett anpassat NAMN för servern
 cli.splash=visa en uppstartsskärm med bildFIL när spelet läses in
 cli.tc=läs in den totala omvandlingen med angivet NAMN
 cli.timeout=antalet sekunder som servern väntar på ett svar på en fråga
 cli.version=visa versionnummer och avsluta
-# Fuzzy
-cli.windowed=kör FreeCol i fönsterläge istället för i helskärmsläge
+cli.windowed=kör FreeCol i fönsterläge, med valfria MÅTT
 menuBar.colopedia=Colopedia
 menuBar.game=Spel
 menuBar.orders=Order
@@ -224,6 +228,8 @@ menuBar.debug.addLiberty=Lägg till frihet till varje koloni
 menuBar.debug.compareMaps.checkComplete=Kontrollen genomförd. Kartan i sync.
 menuBar.debug.compareMaps.problem=Möjligt problem upptäckt. Vänligen läs informationen som skrivits till standard output.
 menuBar.debug.compareMaps=Kontrollera kartans synkronisering
+menuBar.debug.displayAIMissions=Visa AI-uppdrag
+menuBar.debug.displayAdditionalAIMissionInfo=Visa ytterligare information om AI-uppdrag
 menuBar.debug.displayErrorMessage=Visa felmeddelande
 menuBar.debug.displayEuropeStatus=Visa Europa-status
 menuBar.debug.displayMonarchPanel=Visa monarkpanel
@@ -320,8 +326,7 @@ renameAction.name=Döp om
 reportCargoAction.name=Fraktgodsrapport
 reportColonyAction.name=Kolonirådgivare
 reportCongressAction.name=Kontinentala regeringen
-# Fuzzy
-reportEducationAction.name=Utbildning
+reportEducationAction.name=Utbildningsrapport
 reportExplorationAction.name=Utforskningsrapport
 reportForeignAction.name=Utrikesrådgivare
 reportHighScoresAction.name=Högsta poäng
@@ -488,6 +493,8 @@ model.option.initialImmigration.name=Inledande immigrationsmål
 model.option.initialImmigration.shortDescription=Antal kross som produceras innan de första europeiska utvandrarna dyker upp.
 model.option.peaceProbability.name=Sannolikhet för fred
 model.option.peaceProbability.shortDescription=Chans i procent per runda att freden fortsätter med en arg AI.
+model.option.equipEuropeanRecruits.name=Utrusta europeiska rekryter
+model.option.equipEuropeanRecruits.shortDescription=Nyutbildade eller rekryterade enheter i Europa är utrustade enligt deras standardroll.
 gameOptions.colony.name=Kolonialternativ
 gameOptions.colony.shortDescription=Innehåller alternativ som berör hur en koloni fungerar.
 model.option.customIgnoreBoycott.name=Tullhus ignorerar bojkott
@@ -496,9 +503,11 @@ model.option.expertsHaveConnections.name=Specialister har kontakter
 model.option.expertsHaveConnections.shortDescription=Specialister kan utnyttja sitt kontaktnät för att tillhandahålla minimala mängder av resurser för produktion i fabriker.
 model.option.saveProductionOverflow.name=Spara produktionsöverflöd
 model.option.saveProductionOverflow.shortDescription=Spara överflöd av hammare, klockor och kors.
+model.option.clearHammersOnConstructionSwitch.name=Nollställ hammare vid byggnationsbyte
+model.option.clearHammersOnConstructionSwitch.shortDescription=Nollställ antalet hammare om byggnationen ändras.
 model.option.allowStudentSelection.name=Tillåt val av student
 model.option.allowStudentSelection.shortDescription=Tillåter att studenter utses manuellt snarare än automatiskt
-model.option.enableUpkeep.name=Byggnader kräver underhåll
+model.option.enableUpkeep.name=Byggnader kräver underhåll (EXPERIMENTELLT)
 model.option.enableUpkeep.shortDescription=Betala för underhåll av byggnader eller produktionen blir lidande.
 model.option.naturalDisasters.name=Naturkatastrofer
 model.option.naturalDisasters.shortDescription=Sannolikheten för naturkatastrofer per omgång.
@@ -523,8 +532,7 @@ model.option.lastYear.shortDescription=Det sista året i spelet.
 model.option.lastColonialYear.name=Sista koloniala spelåret
 model.option.lastColonialYear.shortDescription=Sista spelåret för en kolonial spelare.
 gameOptions.prices.name=Prisalternativ
-# Fuzzy
-gameOptions.prices.shortDescription=Initala prisomfånget för olika varor.
+gameOptions.prices.shortDescription=Innehåller spelgenererade inställningar som styr startpriset för olika varor.
 model.option.food.minimumPrice.name=Ursprungliga minimipriser för livsmedel
 model.option.food.maximumPrice.name=Högsta startpris för livsmedel
 model.option.food.spread.name=Skillnaden mellan köp- och säljpris för livsmedel.
@@ -587,6 +595,7 @@ model.option.landMass.shortDescription=Alternativ för att ange andelen landmass
 model.option.landGeneratorType.name=Landmasstyp (EXPERIMENTELL!)
 model.option.landGeneratorType.shortDescription=Alternativ för att välja typ av landgenerator som ska användas.
 model.option.landGeneratorType.classic.name=Klassisk
+model.option.landGeneratorType.classic.shortDescription=En stor kontinent och några öar.
 model.option.landGeneratorType.continent.name=Kontinent
 model.option.landGeneratorType.continent.shortDescription=De mesta av landytan består av en enda kontinent.
 model.option.landGeneratorType.archipelago.name=Skärgård
@@ -607,6 +616,8 @@ model.option.maximumLatitude.name=Högsta latitud
 model.option.maximumLatitude.shortDescription=Den sydligaste latituden. Ett positivt värde anger sydlig breddgrad.
 model.option.riverNumber.name=Antal floder
 model.option.riverNumber.shortDescription=Alternativ för att ange antal floder på genererade kartor.
+model.option.riverNumber.verySmall.name=Mycket liten
+model.option.riverNumber.verySmall.shortDescription=Mycket få floder
 model.option.mountainNumber.name=Antal berg
 model.option.mountainNumber.shortDescription=Alternativ för att ange antal berg på genererade kartor.
 model.option.rumourNumber.name=Antal rykten om Förlorade Städer
@@ -634,6 +645,7 @@ model.option.importSettlements.shortDescription=Möjliggör import av inhemska b
 clientOptions.name=Inställningar
 clientOptions.shortDescription=Prioriterade klientalternativ
 clientOptions.personal.name=Personliga
+clientOptions.personal.shortDescription=Spelarspecifika alternativ.
 model.option.playerName.name=Spelarens namn:
 clientOptions.gui.name=Visning
 clientOptions.gui.shortDescription=Innehåller inställningar för att justera spelets utseende.
@@ -781,13 +793,17 @@ clientOptions.savegames.shortDescription=Sparade spel
 model.option.showSavegameSettings.name=Dialog för sparade spel:
 model.option.showSavegameSettings.shortDescription=Visa en dialog för att ställa in serveralternativ när man läser in ett sparat spel.
 clientOptions.savegames.showSavegameSettings.never.name=Aldrig
+clientOptions.savegames.showSavegameSettings.never.shortDescription=Visa aldrig dialog för att ställa in serveralternativ
 clientOptions.savegames.showSavegameSettings.multiplayer.name=Multiplayer
+clientOptions.savegames.showSavegameSettings.multiplayer.shortDescription=Visa endast dialog för att ställa in serveralternativ i flerspelarläge
 clientOptions.savegames.showSavegameSettings.always.name=Alltid
-model.option.autosavePeriod.name=Automatspara var x drag:
+clientOptions.savegames.showSavegameSettings.always.shortDescription=Visa alltid dialog för att ställa in serveralternativ
+model.option.autosavePeriod.name=Automatspara var x drag
 model.option.autosavePeriod.shortDescription=Den frekvens med vilken spelet automatiskt sparas, där 0 stänger av den automatiska sparningen.
-model.option.autosaveValidity.name=Radera automatiskt sparade filer efter x dagar:
-model.option.autosaveDelete.name=Ta bort automatiskt sparade spel:
-model.option.autosaveDelete.shortDescription=Ta bort automatiskt sparade spel när ett nytt spel påbörjas.
+model.option.autosaveValidity.name=Radera automatiskt sparade filer efter x dagar
+model.option.autosaveValidity.shortDescription=Tid i dagar som automatiskt sparad fil är giltig efter skapelsen. Sätt till 0 för att inte sätta någon gräns.
+model.option.autosaveDelete.name=Ta bort automatiskt sparade spel
+model.option.autosaveDelete.shortDescription=Ta bort gamla automatiskt sparade spel när ett nytt spel påbörjas.
 clientOptions.warehouse.name=Varulagerinställningar
 clientOptions.warehouse.shortDescription=Ändra standardinställningen för varulager och tullhus.
 model.option.customStock.name=Standardlagerhållning i tullhus
@@ -815,16 +831,28 @@ model.option.showEndTurnDialog.name=Dialog vid sista omgången
 model.option.indianDemandResponse.name=Svar på krav från indianer
 # Fuzzy
 model.option.indianDemandResponse.shortDescription=När de infödda frågar efter eller begär varor, så acceptera alltid, avvisa alltid eller begär instruktioner.
+clientOptions.other.indianDemandResponse.ask.name=Fråga
+clientOptions.other.indianDemandResponse.ask.shortDescription=Fråga vad du vill göra
 clientOptions.other.indianDemandResponse.accept.name=Acceptera
+clientOptions.other.indianDemandResponse.accept.shortDescription=Acceptera alla krav från infödingar
+clientOptions.other.indianDemandResponse.reject.name=Avslå
+clientOptions.other.indianDemandResponse.reject.shortDescription=Avvisa alla krav från infödingar
 model.option.unloadOverflowResponse.name=Lasta av överflöd
-model.option.unloadOverflowResponse.shortDescription=Vad som skall göras när ett förråd blir överfyllda vid urlastning.
+model.option.unloadOverflowResponse.shortDescription=Vad som skall göras när ett förråd blir överfyllt vid urlastning.
 clientOptions.other.unloadOverflowResponse.ask.name=Fråga
+clientOptions.other.unloadOverflowResponse.ask.shortDescription=Fråga vad du vill göra
 clientOptions.other.unloadOverflowResponse.never.name=Aldrig
+clientOptions.other.unloadOverflowResponse.never.shortDescription=Lasta aldrig av varor som skulle svämma över ett lager
+clientOptions.other.unloadOverflowResponse.always.name=Alltid
+clientOptions.other.unloadOverflowResponse.always.shortDescription=Lasta alltid av varor även om det svämmar över ett lager
 clientOptions.mods.name=Ändringar
 clientOptions.mods.shortDescription=Alternativ för att aktivera spelmodifikationer.
-# Fuzzy
-model.ability.alwaysOfferedPeace.name=Européerna erbjuder alltid fred
+model.ability.addTaxToBells.name=Lägg till skatt till klockor
+model.ability.addTaxToBells.shortDescription=Skattesatsen fungerar som en bonus till klockproduktion
+model.ability.alwaysOfferedPeace.name=Alltid erbjuden fred
+model.ability.alwaysOfferedPeace.shortDescrption=Européiska nationer är alltid beredda att erbjuda fred
 model.ability.ambushBonus.name=Bakhållsbonus
+model.ability.ambushBonus.shortDescription=Bakhållsbonus när enheter attackeras i det fria.
 model.ability.ambushPenalty.name=Bakhållsavdrag
 model.ability.ambushPenalty.shortDescription=Denna nation får avdrag för bakhåll
 model.ability.autoProduction.name=Automatisk produktion
@@ -840,23 +868,27 @@ model.ability.bornInColony.name=Född i kolonierna
 # Fuzzy
 model.ability.bornInIndianSettlement.name=Född i inhemska bosättningar
 model.ability.build.name=Bygg
-# Fuzzy
-model.ability.build.shortDescription=Möjligheten att bygga enheter, utrustning eller byggnader.
-# Fuzzy
-model.ability.buildCustomHouse.name=Förmåga att bygga tullhus
-# Fuzzy
-model.ability.buildFactory.name=Förmåga att bygga fabriker
+model.ability.build.shortDescription=Möjligheten att bygga enheter, utrustning eller byggnader, ibland av en viss typ
+model.ability.buildCustomHouse.name=Bygga tullhus
+model.ability.buildCustomHouse.shortDescription=Förmåga att bygga tullhus
+model.ability.buildFactory.name=Bygga fabriker
+model.ability.buildFactory.shortDescription=Förmåga att bygga fabriker
 model.ability.canBeCaptured.name=Kan fångas
+model.ability.canBeCaptured.shortDescription=Enheter som kan fångas
 model.ability.canBeEquipped.name=Kan utrustas
+model.ability.canBeEquipped.shortDescription=Enheter som kan utrustas
 model.ability.canRecruitUnit.name=Rekrytera enheter
 model.ability.canRecruitUnit.shortDescription=Denna nation har förmågan att rekrytera enheter.
 model.ability.captureEquipment.name=Kan ta över utrustning
+model.ability.captureEquipment.shortDescription=Förmågan att fånga utrustning
 model.ability.captureGoods.name=Erövra varor
 model.ability.captureGoods.shortDescription=Denna trupp kan erövra varor.
 model.ability.captureUnits.name=Kan fånga enheter
+model.ability.captureUnits.shortDescription=Förmågan att fånga enheter i strid
 model.ability.carryGoods.name=Frakta varor
 model.ability.carryGoods.shortDescription=Denna trupp kan frakta varor.
 model.ability.carryTreasure.name=Kan bära skatter
+model.ability.carryTreasure.shortDescription=Den här enheten kan bära skatter
 model.ability.carryUnits.name=Frakta trupper
 model.ability.carryUnits.shortDescription=Denna trupp kan frakta andra trupper.
 # Fuzzy
@@ -865,24 +897,26 @@ model.ability.demoteOnAllEquipLost.name=Degraderas efter nederlag
 model.ability.disposeOnAllEquipLost.name=Kan inte fångas
 # Fuzzy
 model.ability.disposeOnCombatLoss.name=Kan inte fångas
+model.ability.disposeOnCombatLoss.shortDescription=Denna enhet förstörs om den förlorar en strid
 model.ability.electFoundingFather.name=Välj statsbildare
 model.ability.electFoundingFather.shortDescription=Denna nation kan välja statsbildare
 model.ability.evadeAttack.name=Undvik angrepp
 model.ability.evadeAttack.shortDescription=Denna enhet har möjligheten att undvika angrepp.
 model.ability.export.name=Exportera varor
-# Fuzzy
-model.ability.export.shortDescription=Kan exportera varor direkt till Europa.
+model.ability.export.shortDescription=Kan exportera varor direkt till Europa
 model.ability.foundColony.name=Grunda koloni
-# Fuzzy
-model.ability.foundColony.shortDescription=Denna trupp kan grunda en ny koloni.
+model.ability.foundColony.shortDescription=Denna trupp kan grunda en ny koloni
 model.ability.foundInLostCity.name=Hittad i förlorade städer
 model.ability.foundsColonies.name=Grundar kolonier
 model.ability.foundsColonies.shortDescription=Denna nation har förmågan att grunda nya kolonier.
-# Fuzzy
 model.ability.hasPort.name=Tillgång till havet
-# Fuzzy
 model.ability.hasPort.shortDescription=Denna plats står i direkt eller indirekt förbindelse med havet
 model.ability.ignoreEuropeanWars.name=Ignorera europeiska krig
+model.ability.ignoreEuropeanWars.shortDescription=Krigsförklaringar i Europa påverkar inte längre denna nation
+model.ability.improveTerain.name=Förbättra terräng
+model.ability.improveTerain.shortDescription=Den här enheten kan förbättra terräng
+model.ability.inciteNatives.name=Hetsa infödda
+model.ability.inciteNatives.shortDescription=Denna enhet kan hetsa infödda nationer mot en fiendenation
 model.ability.independenceDeclared.name=Oavhängighetsförklaring
 # Fuzzy
 model.ability.independenceDeclared.shortDescription=Denna stat har utropat sin oavhängighet
@@ -897,12 +931,12 @@ model.ability.native.name=Indian
 model.ability.native.shortDescription=Indian
 model.ability.navalUnit.name=Sjötrupp
 model.ability.navalUnit.shortDescription=Denna enhet är en marin enhet.
-# Fuzzy
-model.ability.person.name=Är en person
-# Fuzzy
-model.ability.pillageUnprotectedColony.name=Kan plundra kolonier som är utan försvar
-# Fuzzy
-model.ability.piracy.name=Är en piratenhet
+model.ability.person.name=Person
+model.ability.person.shortDescription=Denna enhet är en person
+model.ability.pillageUnprotectedColony.name=Plundring
+model.ability.pillageUnprotectedColony.shortDescription=Kan plundra kolonier som är utan försvar
+model.ability.piracy.name=Sjöröveri
+model.ability.piracy.shortDescription=Detta är en piratenhet
 # Fuzzy
 model.ability.plunderNatives.name=Bonus för indianskatter
 # Fuzzy
@@ -911,15 +945,23 @@ model.ability.repairUnits.name=Reparations enheter
 # Fuzzy
 model.ability.repairUnits.shortDescription=Kan reparera vissa typer av skadade enheter.
 model.ability.royalExpeditionaryForce.name=Kungliga expeditionskåren
-# Fuzzy
-model.ability.royalExpeditionaryForce.shortDescription=Denna nation är en kunglig expeditionskår
-# Fuzzy
-model.ability.selectRecruit.name=Möjlighet att välja rekryter
-# Fuzzy
-model.ability.supportUnit.name=Är en stödenhet
+model.ability.royalExpeditionaryForce.shortDescription=Denna nation har en kunglig expeditionskår
+model.ability.rumoursAlwaysPositive.name=Rykten alltid positiva
+model.ability.rumoursAlwaysPositive.shortDescription=Att undersöka rykten har alltid ett positivt resultat
+model.ability.seeAllColonies.name=Se alla kolonier
+model.ability.seeAllColonies.shortDescription=Kan se alla utländska kolonier
+model.ability.selectRecruit.name=Välj rekryter
+model.ability.selectRecruit.shortDescription=Möjlighet att välja rekryter
+model.ability.speakWithChief.name=Tala med hövding
+model.ability.speakWithChief.shortDescription=Denna enhet kan tala med hövdingen i en indianby
+model.ability.spyOnColony.name=Spionera på kolonin
+model.ability.spyOnColony.shortDescription=Denna enhet kan spionera på utländska kolonier
+model.ability.supportUnit.name=Stödenhet
+model.ability.supportUnit.shortDescription=Denna enhet finns i stödtrupper
 model.ability.teach.name=Lär ut färdigheter
-# Fuzzy
-model.ability.teach.shortDescription=Expertenheter kan undervisa andra sina färdigheter.
+model.ability.teach.shortDescription=Expertenheter kan lära ut sina färdigheter
+model.ability.tradeWithForeignColonies.name=Handel med utländska kolonier
+model.ability.tradeWithForeignColonies.shortDescription=Möjlighet att handla med utländska kolonier
 # Fuzzy
 model.ability.undead.name=Hämndläge
 # Fuzzy
@@ -941,10 +983,13 @@ model.modifier.nativeAlarmModifier.name=Indianorosfördel
 model.modifier.nativeAlarmModifier.shortDescription=Denna nation skapar mindre oro bland indianerna
 model.modifier.nativeConvertBonus.name=Bonus för indiankonvertiter
 model.modifier.nativeConvertBonus.shortDescription=Denna nation konverterar fler indianer
+model.modifier.offence.name=Attackbonus
 model.modifier.offenceAgainst.name=Brott mot
 model.modifier.offenceAgainst.shortDescription=Förbättrar chansen till seger när du attackerar.
 model.modifier.religiousUnrestBonus.name=Fördel vad gäller missnöje i trosuppfattningsfrågor
 model.modifier.religiousUnrestBonus.shortDescription=Denna nation orsakar mer missnöje i trosuppfattningsfrågor
+model.modifier.tileTypeChangeProduction.name=Timmeravkastning
+model.modifier.tileTypeChangeProduction.shortDescription=Ökar mängden virke som produceras när skog avverkas.
 model.modifier.tradeBonus.name=Handelsfördel
 model.modifier.tradeBonus.shortDescription=Denna nation drar fördelar av handel
 model.modifier.warehouseStorage.description=Varulager
@@ -1023,8 +1068,7 @@ model.building.schoolhouse.description=En koloni med en befolkning på minst 4 k
 model.building.shipyard.name=Skeppsvarv
 model.building.shipyard.description=Skeppsvarvet gör så att kolonisterna kan producera fisk på havsrutor i närheten av kolonin, reparera skepp  och också så att de kan bygga nya skepp. \n\nOm du bygger ett skeppsvarv kan kolonin bygga nya skepp.
 model.building.stables.name=Stallar
-# Fuzzy
-model.building.stables.description=Förbättrar kapaciteten för hästavel
+model.building.stables.description=Stallet förbättrar kapaciteten för hästavel genom att minska flockarnas storlek.
 model.building.stockade.name=Pålverk
 model.building.stockade.description=Pålverket, vilket kan byggas senare när kolonins befolkning uppnått 3, skyddar kolonisterna från anfall. Pålverket kan uppgraderas till en skans, vilken ger bättre skydd och kan bombardera kaparfartyg och fienders sjötrupper på närliggade havsrutor. Skansen kan ersättas av en fästning senare när befolkningen uppnått 8. \n\nOm du bygger ett pålverk ökar det försvaret med 100%.
 model.building.textileMill.name=Textilfabrik
@@ -1090,8 +1134,7 @@ model.foundingFather.peterStuyvesant.description=Möjliggör byggandet av tullhu
 model.foundingFather.peterStuyvesant.text=Utsågs till generalguvernör för Nya Holland som, efter den brittiska invasion han var oförmögen att hindra, blev New York.
 model.foundingFather.peterStuyvesant.birthAndDeath=1592-1672
 model.foundingFather.janDeWitt.name=Jan de Witt
-# Fuzzy
-model.foundingFather.janDeWitt.description=Möjliggör handel med främmande kolonier.
+model.foundingFather.janDeWitt.description=Möjliggör handel med främmande kolonier, och mer information om rivaliserande kolonier visas.
 model.foundingFather.janDeWitt.text=De Witt var en stor holländsk statsman. Han representerade handelsmännen och uppmuntrade industri och handel. Han underhandlade och slöt flera viktiga avtal som ledde till slutet av kriget mellan Holland och England.
 model.foundingFather.janDeWitt.birthAndDeath=1625-1672
 model.foundingFather.ferdinandMagellan.name=Ferdinand Magellan
@@ -1281,8 +1324,7 @@ model.improvement.road.description=Väg
 model.improvement.road.name=Väg
 model.improvement.road.occupationString=V
 model.limit.independence.coastalColonies.name=Gränsen för den kustnära kolonin
-# Fuzzy
-model.limit.independence.coastalColonies.description=Du behöver minst %limit% kustnära kolonierna för att förklara självständighet.
+model.limit.independence.coastalColonies.description=Du behöver minst %limit% kustnära {{plural:%limit%|one=koloni|other=kolonier}} för att kunna förklara självständighet.
 model.limit.independence.rebels.name=Rebellgräns
 model.limit.independence.rebels.description=Minst %limit%% av dina kolonister måste stödja sjävständighet.
 model.limit.independence.year.name=Årsgräns
@@ -1430,6 +1472,13 @@ model.role.scout.name=Spejare
 model.role.scout.noequipment=inga hästar
 model.role.soldier.name=Soldat
 model.role.soldier.noequipment=inga musköter
+model.role.change.dragoon=Utrusta som dragon
+model.role.change.pioneer=Utrusta med verktyg
+model.role.change.scout=Utrusta som scout
+model.role.change.default.soldier=Beväpna
+model.role.change.dragoon.default=Ta bort all utrustning
+model.role.change.pioneer.default=Ta bort verktyg
+model.role.change.pioneer.soldier=Beväpna
 model.settlement.aztec.capital.name=Aztekstad
 model.settlement.aztec.name=Aztekstad
 model.settlement.aztec.plural=städer
@@ -1470,8 +1519,7 @@ model.tile.marsh.description=Kärr är en sort våtmark med gräs, vass säv och
 model.tile.mixedForest.name=Blandskog
 model.tile.mixedForest.description=Blandskog som återfinns på tempererade latituder kan producera spannmål, timmer, pälsar och lite bomull. Om skogen huggs ner blir de till slätt.
 model.tile.mountains.name=Berg
-# Fuzzy
-model.tile.mountains.description=Berg sträcker sig över den omgivande terrängen inom ett begränsat område. Berg är vanligen brantare än kullar. De är svåra att färdas genom och kolonier kan inte grundas i dem. Men de är användbara för gruvdrift och både järnmalm och silver kan brytas i dem.
+model.tile.mountains.description=Berg sträcker sig över den omgivande terrängen inom ett begränsat område. Berg är vanligen brantare än kullar. De är svåra att färdas genom och kolonier kan inte grundas i dem. De erbjuder en hög försvarsbonus, men denna kan inte förstärkas ytterligare genom fortifikation. De är användbara för gruvdrift och både järnmalm och silver kan brytas i dem.
 model.tile.ocean.name=Hav
 model.tile.ocean.description=Hav är stora saltvattenytor med gott fiske. Mängden fisk ökar med närheten till land och i synnerhet flodmynningar.
 model.tile.plains.name=Slätt
@@ -1533,7 +1581,7 @@ model.unit.masterFurTrader.description=En pälshandlare gör pälskappor av päl
 model.unit.masterGunsmith.name={{plural:%number%|one=Mästervapensmed|other=Mästervapensmedar|default=Mästervapensmed}}
 model.unit.masterGunsmith.description=En vapensmed framställer musköter av redskap.
 model.unit.masterSugarPlanter.name={{plural:%number%|one=Professionell sockerodlare|other=Professionella sockerodlare|default=Professionell sockerodlare}}
-model.unit.masterSugarPlanter.description=Sockerodlaren odllar sockerrör.
+model.unit.masterSugarPlanter.description=Sockerodlaren odlar sockerrör.
 model.unit.masterTobaccoPlanter.name={{plural:%number%|one=Mästartobaksodlare|other=Mästartobaksodlare|default=Mästartobaksodlare}}
 model.unit.masterTobaccoPlanter.description=Tobaksodlaren odlar tobak.
 model.unit.masterTobacconist.name={{plural:%number%|one=Mästartobakshandlare|other=Mästartobakshandlare|default=Mästartobakshandlare}}
@@ -1562,8 +1610,7 @@ model.unit.artillery.name={{plural:%number%|one=Artilleripjäs|other=Artilleripj
 model.unit.artillery.description=Artilleri är bra på att anfalla och försvara kolonier, men är mycket sårbart på öppen mark.
 model.unit.damagedArtillery.name={{plural:%number%|one=Skadat artilleri|other=Skadade artillerier|default=Skadat artilleri}}
 model.unit.damagedArtillery.description=Skadat artilleri är som artilleri på alla sätt men svagare.
-# Fuzzy
-model.unit.treasureTrain.name=Värdetransport
+model.unit.treasureTrain.name={{plural:%number%|one=Värdetransport|other=Värdetransporter|default=Värdetransport}}
 model.unit.treasureTrain.description=En värdetransports enda syfte är att transportera guld som hittats i ruinerna av en förlorad stad eller plundrats från en indianbosättning. Om du flyttar den in i en av dina kolonier så kommer Kronan att erbjuda sig att transportera den till Europa för en "rimlig kostnad". Om du har en galeon så kan du transportera den till Europa själv.
 model.unit.wagonTrain.name={{plural:%number%|one=Konvoj|other=Konvojer|default=Konvoj}}
 model.unit.wagonTrain.description=Konvojen kan frakta upp till 200 enheter varor över land. Du kan använda den för att handla med andra spelare eller för att flytta varor mellan dina egna kolonier.
@@ -1580,16 +1627,14 @@ model.unit.undead.description=De vandöda är den flygande holländarens besätt
 # Fuzzy
 model.unit.colonialRegular.dragoon=Kolonialt kavalleri
 model.unit.colonialRegular.soldier=Kontinentalarmé
-# Fuzzy
-model.unit.hardyPioneer.pioneer=Hårdför pionjär
-# Fuzzy
-model.unit.jesuitMissionary.missionary=Jesuitmissionär
+model.unit.hardyPioneer.pioneer={{plural:%number%|one=Hårdför pionjär|other=Hårdföra pionjärer|default=Hårdför pionjär}}
+model.unit.jesuitMissionary.missionary={{plural:%number%|one=Jesuitmissionär|other=Jesuitmissionärer|default=Jesuitmissionär}}
 model.unit.kingsRegular.cavalry=Kavalleri
 model.unit.kingsRegular.infantry=Infanteri
 model.unit.seasonedScout.scout={{plural:%number%|one=Erfaren spejare|other=Erfarna spejare|default=Erfaren spejare}}
-# Fuzzy
-model.unit.veteranSoldier.dragoon=Veterandragon
+model.unit.veteranSoldier.dragoon={{plural:%number%|one=Veterandragon|other=Veterandragoner|default=Veterandragoner}}
 model.unit.veteranSoldier.soldier={{plural:%number%|one=Veteransoldat|other=Veteransoldater|default=Veteransoldat}}
+model.unit.colonialRegular.workingAs=Soldat
 model.unit.elderStatesman.workingAs=Statsman
 model.unit.expertFarmer.workingAs=Bonde
 model.unit.expertFisherman.workingAs=Fiskare
@@ -1619,8 +1664,7 @@ model.building.locationLabel=I %location%
 model.colony.badGovernment=Ledarskapet i %colony% är odugligt. Produktionen i kolonin är reducerad.
 model.colony.governmentImproved1=Ledarskapet i %colony% har förbättrats men har fortfarande brister. Produktionen i kolonin är fortfarande reducerad.
 model.colony.governmentImproved2=Ledarskapet i %colony% är inte längre odugligt. Produktionen i kolonin är inte längre reducerad.
-# Fuzzy
-model.colony.insufficientProduction=%outputAmount% mer %outputType% kan produceras i %colony%, om vi bara hade %inputAmount% mer överskott av %inputType%.
+model.colony.insufficientProduction=%outputAmount% mer %outputType% skulle kunna produceras i %colony%, om vi bara hade %consumptionDeficit% mer.
 model.colony.minimumColonySize=Tack vare %object% så kan inte befolkningen minskas mer
 model.colony.stance.alliance=%nation% är glada att se en pålitlig allierad som dig.
 model.colony.stance.ceaseFire=%nation% blänger på dig, och förbereder uppenbarligen sitt försvar.
@@ -1631,18 +1675,13 @@ model.colony.unbuildable=%colony% kan inte bygga %object% just nu. %object% har
 model.colony.veryBadGovernment=Ledarskapet i %colony% är odugligt. Produktionen i kolonin är starkt reducerad.
 model.colonyTile.claim=(kräv %direction%)
 model.diplomaticTrade.receive.contact=Broderliga hälsningar från den ärorika %nation% nationen.
-# Fuzzy
-model.diplomaticTrade.receive.diplomatic=Låt oss förhandla med %nation%.
+model.diplomaticTrade.receive.diplomatic=Låt oss förhandla med {{tag:country|%nation%}}.
 model.diplomaticTrade.receive.trade=Låt oss överväga %nation% handelserbjudande.
-# Fuzzy
-model.diplomaticTrade.receive.tribute=%nation% kräver en tribut av oss!
+model.diplomaticTrade.receive.tribute={{tag:country|%nation%}} kräver en tribut av oss!
 model.diplomaticTrade.send.contact=Vi har stött på medlemmar i den %nation% nationen.
-# Fuzzy
-model.diplomaticTrade.send.diplomatic=Låt oss överväga vår diplomatiska situation med %nation%.
-# Fuzzy
-model.diplomaticTrade.send.trade=Låt oss föreslå en handel med %nation% på  %settlement%.
-# Fuzzy
-model.diplomaticTrade.send.tribute=Vi kräver tribut av %nation% vid %settlement%.
+model.diplomaticTrade.send.diplomatic=Låt oss överväga vår diplomatiska situation med {{tag:country|%nation%}}.
+model.diplomaticTrade.send.trade=Låt oss föreslå en handel med {{tag:country|%nation%}} på  %settlement%.
+model.diplomaticTrade.send.tribute=Vi kräver tribut av {{tag:country|%nation%}} vid %settlement%.
 model.direction.N.name=norr
 model.direction.NE.name=nordöst
 model.direction.E.name=öst
@@ -1652,32 +1691,25 @@ model.direction.SW.name=sydväst
 model.direction.W.name=väst
 model.direction.NW.name=nordväst
 model.historyEventType.abandonColony.description=Du ger upp kolonin %colony%.
-# Fuzzy
-model.historyEventType.cityOfGold.description=%nation% upptäcker %city%, en utav de sju "Städerna av guld", och en skatt bestående av %treasure% guld.
-# Fuzzy
-model.historyEventType.colonyConquered.description=Din koloni %colony% har erövrats av %nation%.
-# Fuzzy
-model.historyEventType.colonyDestroyed.description=Din koloni %colony% är förstörd av %nation%.
-# Fuzzy
-model.historyEventType.declareIndependence.description=Du förstör %nation%s bosättning %settlement%.
-# Fuzzy
-model.historyEventType.destroyNation.description=%nation% förstör %nativeNation%.
+model.historyEventType.ceaseFire.description=Fredsavtal med {{tag:country|%nation%}}.
+model.historyEventType.cityOfGold.description={{tag:country|%nation%}} upptäcker %city%, en utav de sju "Städerna av guld", och en skatt bestående av %treasure% guld.
+model.historyEventType.colonyConquered.description=Din koloni %colony% har erövrats av {{tag:country|%nation%}}.
+model.historyEventType.colonyDestroyed.description=Din koloni %colony% är förstörd av {{tag:country|%nation%}}.
+model.historyEventType.conquerColony.description=Du erövrar {{tag:country|%nation%}}s koloni %colony%.
+model.historyEventType.declareIndependence.description=Du utropar oavhängighet från kronan.
+model.historyEventType.declareWar.description=Krig har förklarats med {{tag:country|%nation%}}.
+model.historyEventType.destroyNation.description={{tag:country|%nation%}} förstör %nativeNation%.
+model.historyEventType.destroySettlement.description=Du förstör %nation%s bosättning %settlement%.
 model.historyEventType.discoverNewWorld.description=Du utforskar den nya världen.
-# Fuzzy
-model.historyEventType.discoverRegion.description=%nation% upptäcker %region%.
-# Fuzzy
-model.historyEventType.formAlliance.description=Alliansen framförhandlad med %nation%.
+model.historyEventType.discoverRegion.description={{tag:country|%nation%}} upptäcker %region%.
+model.historyEventType.formAlliance.description=Alliansen framförhandlad med {{tag:country|%nation%}}.
 model.historyEventType.foundColony.description=Du grundar kolonin %colony%.
 model.historyEventType.foundingFather.description=%father% går med i den kontinentala kongressen.
 model.historyEventType.independence.description=Du uppnår oavhängighet från kronan.
-# Fuzzy
-model.historyEventType.makePeace.description=Fredsavtal med %nation%.
-# Fuzzy
-model.historyEventType.meetNation.description=Du möter %nation%.
-# Fuzzy
-model.historyEventType.nationDestroyed.description=!%nation% finns inte längre i Nya världen.
-# Fuzzy
-model.historyEventType.spanishSuccession.description=%loserNation% avstår alla sina kolonier i den nya världen till %nation%.
+model.historyEventType.makePeace.description=Fredsavtal med {{tag:country|%nation%}}.
+model.historyEventType.meetNation.description=Du möter nationen %nation%.
+model.historyEventType.nationDestroyed.description=Den %nation% nationen finns inte längre i Nya världen.
+model.historyEventType.spanishSuccession.description={{tag:country|%loserNation%}} avstår alla sina kolonier i den nya världen till {{tag:country|%nation%}}.
 model.indianSettlement.mostHatedNone=Inga
 model.indianSettlement.mostHatedUnknown=Okänd
 model.indianSettlement.nameUnknown=Okänd
@@ -1745,8 +1777,7 @@ model.advantages.selectable.name=Valbar
 model.advantages.selectable.shortDescription=Nationella fördelar är valbara och behöver inte vara unika.
 model.nationState.aiOnly.name=Endast AI
 model.nationState.available.name=tillgänglig
-# Fuzzy
-model.nationState.available.shortDescription=Du erövrar %nation%s koloni %colony%.
+model.nationState.available.shortDescription=Du kan spela som denna nation
 model.nationState.notAvailable.name=ej tillgänglig
 model.noClaimReason.europeans.description=Detta markområde har tagits i anspråk av en annan Europeisk nation.
 model.noClaimReason.natives.description=Detta markområde har tagits i anspråk av en infödingsstam.
@@ -1758,9 +1789,8 @@ model.noClaimReason.water.description=Vi gör inte anspråk på vattnen.
 model.noClaimReason.worked.description=En annan bosättning använder redan detta landområde.
 model.player.forces=%nation%s styrkor
 model.player.independentMarket=Europa
-model.player.startGame=Efter flera månader till sjöss anländer du slutligen till kusten av en okänd kontinent. Segla {{tag:%direction%|west=westward|east=eastward|default=into the wind}} för att upptäcka den Nya Världen och hävda Kronans överhöghet över den.
-# Fuzzy
-model.player.waitingFor=Väntar på: %nation%
+model.player.startGame=Efter flera månader till sjöss anländer du slutligen till kusten av en okänd kontinent. Segla {{tag:%direction%|west=västerut|east=österut|default=dit vindarna bär}} för att upptäcka den Nya Världen och hävda Kronans överhöghet över den.
+model.player.waitingFor=Väntar på: {{tag:country|%nation%}}
 model.regionType.coast.name=Kust
 model.regionType.coast.unknown=Okänd kustregion
 model.regionType.desert.name=Öken
@@ -1799,8 +1829,7 @@ model.tradeItem.gold.name=Guld
 model.tradeItem.gold.description=totalt %amount% guld
 model.tradeItem.goods.name=Varor
 model.tradeItem.incite.name=Förklara krig mot
-# Fuzzy
-model.tradeItem.incite.description=krig mot %nation%
+model.tradeItem.incite.description=krig mot {{tag:country|%nation%}}
 model.tradeItem.stance.name=Hållning
 model.tradeItem.unit.name=Trupp
 model.tradeRoute.invalidStop=Stop %name% är ogiltigt.
@@ -1820,8 +1849,7 @@ model.unit.unitState.fortified=F
 model.unit.unitState.fortifying=F
 model.unit.unitState.inColony=B
 model.unit.unitState.sentry=S
-# Fuzzy
-model.unit.unitState.skipped=W
+model.unit.unitState.skipped=X
 model.unit.unitState.toAmerica=G
 model.unit.unitState.toEurope=G
 model.noAddReason.alreadyPresent.description=Finns redan på denna plats.
@@ -1894,8 +1922,7 @@ combat.enemyShipEvaded=%enemyNation%s %enemyUnit% har klarat sig undan en attack
 combat.enemyShipSunk=%unit% har sänkt %enemyNation%s %enemyUnit%!
 combat.equipmentCaptured=Tag er i akt, %nation%s krigare har skaffat sig %equipment%!
 combat.goodsStolen=%enemyNation%s %enemyUnit% stjäl %amount% %goods% i %colony%!
-# Fuzzy
-combat.indianPlunder=%colony% plundras på %amount% av %enemyNation%s %enemyUnit%.
+combat.indianPlunder=%enemyNation%s %enemyUnit% plundras på %amount% guld från %colony%.
 combat.indianTreasure=Du plundrar %settlement% på %amount% guld.
 combat.nativeCapitalBurned=Du har bränt %nation%s huvudstad %name% till marken, och %nation% kapitulerar inför din makt!
 combat.newConvertFromAttack=En skrämd %unit% från %nation% ansluter sig till dig!
@@ -1948,16 +1975,14 @@ main.defaultPlayerName=Spelarnamn
 main.javaVersion=Java version %minVersion% eller nyare rekommenderas för att köra FreeCol (%version% detected, använd --no-java-check för att hoppa över denna kontroll).
 main.memory=Du måste tilldela mer än %memory% byte minne till JVM. Starta om FreeCol med: java -Xmx%minMemory%M -jar FreeCol.jar
 main.userDir.fail=FreeCol kan inte hitta lämpliga kataloger att spara användardata i. Fortsätter, men räkna med problem.
-# Fuzzy
-client.choicePlayer=Välj en spelare:
+client.choicePlayer=Välj en nation:
+client.debugConnect=Du kan inte ansluta till ett existerande spel i felsökningsläge.
 metaServer.couldNotConnect=Kunde tyvärr inte ansluta till meta-servern. Försök senare.
 metaServer.communicationError=Fel uppstod vid kommunikation med meta-servern. Försök senare.
 abandonEducation.action.studying=studerar
 abandonEducation.action.teaching=undervisar
-# Fuzzy
-abandonEducation.no=Nej, fortsätt utbildningen
-# Fuzzy
-abandonEducation.yes=Ja, lämna kolonin
+abandonEducation.no=Fortsätt utbildningen
+abandonEducation.yes=Överge utbildning
 armedUnitSettlement.attack=Attackera
 armedUnitSettlement.tribute=Kräv tribut
 boycottedGoods.dumpGoods=Dumpa varor
@@ -1966,12 +1991,10 @@ buy.moreGold=Begär lägre pris
 buy.takeOffer=Antag erbjudandet
 buy.text=%nation% skulle vilja sälja %goods% till dig för %gold% guld:
 clearTradeRoute.text=Din %unit% är tilldelad handelsrutt %route%. Att ange en destination kommer att ta den från handelsrutten. Är du säker att du vill göra detta?
-# Fuzzy
-confirmHostile.alliance=Du kan inte anfalla en allierad nation! Vill du verkligen bryta din allians med %nation% och förklara krig?
+confirmHostile.alliance=Du kan inte anfalla en allierad nation! Vill du verkligen bryta din allians med {{tag:country|%nation%}} och förklara krig?
 # Fuzzy
 confirmHostile.ceaseFire=Du har undertecknat en vapenvila med %nation%. Vill du verkligen anfalla?
-# Fuzzy
-confirmHostile.peace=Du har fred med %nation%. Vill du verkligen förklara krig mot dem?
+confirmHostile.peace=Du har fred med {{tag:country|%nation%}}. Vill du verkligen förklara krig mot dem?
 danger.high=mycket bättre beväpnade än oss
 danger.low=är inget hot mot oss
 danger.normal=kan visa sig vara ett hot
@@ -2030,10 +2053,8 @@ defeated.text=Du har blivit besegrad! Skulle du vilja:
 defeated.yes=Stanna kvar och se hur det går
 defeatedSinglePlayer.text=Du har blivit besegrad!\n\nDet är nu den mörka nattens tid, när kyrkogårdar gäspar och själva helvetet andas ut sin smitta över denna jord, nu skulle jag kunna dricka hett blod! och göra sådana bittra dåd som skulle få dagen att skaka om den såg dem.
 defeatedSinglePlayer.yes=Aktivera hämndläge
-# Fuzzy
-diplomacy.offerAccepted=%nation% har godtagit ditt generösa erbjudande.
-# Fuzzy
-diplomacy.offerRejected=%nation% har avslagit ditt generösa erbjudande.
+diplomacy.offerAccepted={{tag:country|%nation%}} har godtagit ditt generösa erbjudande.
+diplomacy.offerRejected={{tag:country|%nation%}} har avslagit ditt generösa erbjudande.
 disbandUnit.text=Är du säker på att du vill demobilisera denna trupp?
 disbandUnit.yes=Demobilisera
 disembark.text=Var hälsad sjöman, vill du lämna skeppet?
@@ -2075,10 +2096,8 @@ move.noAccessContact=Ers Excellens, vi måste först upprätta kontakt med %nati
 move.noAccessGoods=%nation% kommer inte att byteshandla med en tom %unit%.
 move.noAccessSettlement=%nation% låter inte våra trupper av typ %unit% komma in i deras bosättning.
 move.noAccessSkill=Vår trupp av typen %unit% kan inte lära sig något av urinvånarna.
-# Fuzzy
-move.noAccessTrade=Vi har inte befogenhet att handla med andra europeiska nationer som%nation%.
-# Fuzzy
-move.noAccessWar=Vi kan inte handla med%nation% medan vi är i krig med dem.
+move.noAccessTrade=Vi har inte befogenhet att handla med andra europeiska nationer som {{tag:country|%nation%}}.
+move.noAccessWar=Vi kan inte handla med {{tag:country|%nation%}} medan vi är i krig med dem.
 move.noAccessWater=Vår trupp av typen %unit% måste landstiga innan den kan gå in i bosättningen.
 move.noAttackWater=Vår %unit% måste landa innan den kan attackera.
 move.noTile=Vår %unit% finns inte på kartan!
@@ -2095,8 +2114,7 @@ scoutSettlement.speakDie=Du har brutit stammens heliga tabu! Vi skall binda dig
 scoutSettlement.speakNothing=Vi är alltid glada att kunna välkomna resenärer från %nation%.
 scoutSettlement.speakTales=Vi är glada att kunna välkomna långväga resenärer. Kom, sitt med oss runt elden och låt oss berätta för dig om dessa trakter.
 sellProposition.text=Vill du sälja lite varor?
-# Fuzzy
-trade.noTrade=Handel avböjs.
+trade.noTrade=Handel avböjd vid %settlement%.
 trade.noTradeGoods=Tyvärr, vi har inget behov av mer %goods%
 trade.noTradeHaggle=Vi börjar bli trötta på ditt ständiga köpslående.
 trade.noTradeHostile=Vi föraktar dig och dina varor. Försvinn!
@@ -2117,17 +2135,18 @@ tradeRoute.unloadStopImport=Lossade %amount% %goods% och kasserade %more%.
 tradeRoute.unloadStopNoExport=Lossade inget %goods% med %more% mer sparat ombord.
 tradeRoute.wait=Har inget arbete att göra, väntar.
 traderoute.warehouseCapacity=Om du sätter i land din %unit% i %colony% så skulle varulagrets kapacitet överskridas. %amount% %goods% skulle gå förlorade. Vill du lasta ur varorna i alla fall?
-# Fuzzy
-twoTurnsPerYear=Från och med år %year% kommer det att vara två varv per år, i stället för ett!!
+twoTurnsPerYear=Från och med år %year% kommer det att vara %amount% varv per år, i stället för ett!
 server.badColor=Ogiltig färg
 server.badNation=Ogiltig nation
 server.badNationType=Ogiltig typ av nation
 server.couldNotConnect=Kunde inte skapa anslutning till servern.
+server.couldNotLogin=Kan inte logga in på servern.
 server.errorStartingGame=Ett fel uppstod när spelet skulle startas.
 server.fileNotFound=Kunde inte hitta filen med angivet filnamn.
 server.incompatibleVersions=Det sparade spel som du försöker läsa in är inkompatibelt med denna version av FreeCol.
 server.invalidPlayerNations=Varje spelare måste välja en unik nation innan spelet kan starta.
 server.maximumPlayers=Beklagar, maximalt antal spelare har redan anslutit sig till spelet.
+# Fuzzy
 server.noRouteToServer=Servern kan inte öppnas för allmänheten. Du behöver justera dina brandväggsinställningar så att anslutningar tillåts på den port du angav.
 server.notAllReady=Alla spelare är inte klara att börja spela än!
 server.onlyAdminCanLaunch=Beklagar, enbart serverns administratör kan starta spelet.
@@ -2148,6 +2167,11 @@ giveIndependence.otherAnnounce=%nation% har besegrat %ref% och blivit självstä
 giveIndependence.unitsAcquired=Följande Kungliga Expeditionskårsenheter har överlämnats till dina segrande styrkor: %units%
 indianSettlement.mission.enemyDenounce=en %enemy% missionär anklagade vår missionär i %settlement% för kätteri, men %nation% avslog yrkandet.
 indianSettlement.mission.noDenounce=%nation% avvisar alla anklagelser om kätteri, och avrättar din missonär som en falsk profet.
+indianSettlement.mission.tension.angry=Missionären fångades, %nation% förkastar din nya religion.
+indianSettlement.mission.tension.content=Mission grundades, %nation% närmar sig din nya religion med nyfikenhet.
+indianSettlement.mission.tension.displeased=Mission grundades, %nation% är upprörda.
+indianSettlement.mission.tension.happy=Mission grundades, %nation% närmar sig din nya religion med glädje.
+indianSettlement.mission.tension.hateful=Missionären offrades, %nation% skrattar åt din nya religion.
 scoutSettlement.tributeAgree=Vi går med på att betala %amount% guld för att bevara freden, men försök inte med detta en gång till!
 scoutSettlement.tributeDisagree=Vi går inte med på era krav. Ge er av från våra marker!
 colopedia.birthAndDeath=Födelse och död
@@ -2304,8 +2328,7 @@ report.requirements.surplus=Ett överskott av %goods% framställs i
 report.trade.afterTaxes=Inkomst efter skatt
 report.trade.beforeTaxes=Inkomst före skatt
 report.trade.cargoUnits=Enheter i last
-# Fuzzy
-report.trade.hasCustomHouse=* Denna koloni har ett tullhus; dessa varor exporteras.
+report.trade.hasCustomHouse=* Denna koloni har ett tullhus; dessa varor kan exporteras.
 report.trade.totalDelta=Sammanlagd produktion
 report.trade.totalUnits=Totalt antal enheter
 report.trade.unitsSold=Antal köpta eller sålda enheter
@@ -2313,8 +2336,7 @@ report.turn.filter=Visa inte denna typ av meddelanden (%type%)
 report.turn.ignore=Ignorera detta meddelande (Koloni: %colony%, Vara: %goods%)
 # Fuzzy
 report.turn.playerNation=%nation% för %player%
-# Fuzzy
-aboutPanel.copyright=Copyright © 2002-2014 FreeCol-teamet
+aboutPanel.copyright=Copyright © 2002-2015 FreeCol-teamet
 aboutPanel.legalDisclaimer=FreeCol är fri mjukvara: du kan vidaredistribuera den och/eller modifiera den under vad som specifieras i GNU General Public License som denna publicerats av Free Software Foundation, antingen version 2 av licensen eller någon senare version.
 aboutPanel.officialSite=Officiell hemsida:
 aboutPanel.sfProject=SourceForge-projekt:
@@ -2322,8 +2344,7 @@ aboutPanel.version=Version:
 buildingToolTip.breeding=Du behöver minst %number% {{plural:%number%|%goods%}} att föda upp %goods%.
 buildQueuePanel.buildings=Byggnader
 buildQueuePanel.buildQueue=Byggkö
-# Fuzzy
-buildQueuePanel.buyBuilding=Köp byggnad
+buildQueuePanel.buyBuilding=Köp %buildable%
 buildQueuePanel.compactView=Kompakt visning
 buildQueuePanel.currentlyBuilding=Bygger: %buildable%
 buildQueuePanel.populationTooSmall=Befolkning %number%
@@ -2331,14 +2352,13 @@ buildQueuePanel.requires=Kräver: %string%
 buildQueuePanel.showAll=Visa allt
 buildQueuePanel.units=Trupper
 captureGoodsDialog.title=Plundringslast
-cargoPanel.cargoAndSpace=Fraktgods ombord på %name% (%space% {{plural:%space%|one=rymmer|other=rymmer|default=rymmer}} vänster)
+cargoPanel.cargoAndSpace=Fraktgods ombord på %name% (%space% {{plural:%space%|one=plats|other=platser|default=platser}} kvar)
 chatPanel.message=Meddelande
 chooseFoundingFatherDialog.title=Nominera grundare
 colonyPanel.colonyUnits=Kolonienheter
 colonyPanel.inPort=I hamn
 colonyPanel.outsideColony=Utanför kolonin
-# Fuzzy
-colonyPanel.producing=Producerar:
+colonyPanel.producing=producerar:
 colonyPanel.reducePopulation=Om du minskar befolkningen under %number%, kan inte %colony% längre bygga %buildable%.
 colonyPanel.unitChange=Vid ankomst till din koloni blev din %oldType% en %newType%.
 colonyPanel.warehouse=Lager
@@ -2378,11 +2398,9 @@ negotiationDialog.add=Lägg till
 negotiationDialog.cancel=Avbryt
 negotiationDialog.clear=Rensa
 negotiationDialog.contact.tutorial=Du träffar på andra européer. De konkurrerar med dig om land och rikedomar, och kan mycket väl dra ut i krig mot dig. Men efter att Jan de Witt har anslutit sig till kolonialstyret så kan du handla med dem.
-# Fuzzy
-negotiationDialog.demand=%nation% kräver av %otherNation%
+negotiationDialog.demand={{tag:country|%nation%}} kräver av {{tag:country|%otherNation%}}
 negotiationDialog.exchange=i utbyte mot
-# Fuzzy
-negotiationDialog.offer=%nation% erbjuder %otherNation%
+negotiationDialog.offer={{tag:country|%nation%}} erbjuder {{tag:country|%otherNation%}}
 negotiationDialog.send=Skicka
 negotiationDialog.title.contact=Träffar andra européer
 negotiationDialog.title.diplomatic=Diplomatiska förhandlingar
@@ -2404,9 +2422,9 @@ findSettlementPanel.displayAll=Hitta alla bosättningar
 findSettlementPanel.displayOnlyEuropean=Hitta endast Europeiska bosättningar
 findSettlementPanel.displayOnlyNatives=Hitta endast inhemska bosättningar
 findSettlementPanel.name=Hitta bosättning
-# Fuzzy
-firstContactDialog.meeting.natives=Träffar infödingarna...
+firstContactDialog.meeting.natives=Träffar infödingarna
 firstContactDialog.meeting.natives.tutorial=Du träffar på indianer. Sänd dina spejare till deras bosättningar för att lära dig mer om dem, och dina kontraktarbetare och nybyggare för att lära sig mer av dem. Sänd dina skepp och konvojer till deras bosättningar om du önskar handla med dem.
+firstContactDialog.meeting.aztec=Azteknationen
 firstContactDialog.meeting.inca=Inkariket
 firstContactDialog.welcomeOffer.text=%nation% välkomnar dig. Vi är en strålande nation på %camps% %settlementType%. För att fira vår vänskap erbjuder vi generöst det land du nu bor på som en gåva. Vill du acceptera vårt fördrag och leva i fred med oss som bröder?
 firstContactDialog.welcomeSimple.text=%nation% välkomar dig. Vi är en strålande nation på %camps% %settlementType%. Vill du leva i fred med oss som bröder?
@@ -2429,7 +2447,9 @@ indianSettlementPanel.learnableSkill=Följande specialkunskaper lärs ut i denna
 indianSettlementPanel.highlyWanted=Denna bosättning vill mycket gärna köpa:
 indianSettlementPanel.otherWanted=Andra varor som kan säljas vid denna bosättning är:
 indianSettlementPanel.mostHated=Den mest hatade nationen i denna bosättning:
+infoPanel.defenseBonus=Försvar %bonus%%
 infoPanel.endTurn=Tryck på Enter för att avsluta draget.
+infoPanel.movementCost=Förflyttning %cost%
 infoPanel.moves=Steg:
 loadingSavegameDialog.port=Port:
 loadingSavegameDialog.privateMultiplayer=Privat flerspelarspel
@@ -2517,8 +2537,7 @@ warehouseDialog.exportLevel.shortDescription=Exportera inte något under denna n
 warehouseDialog.highLevel.shortDescription=Ge mig en varning när antalet i lager överskrider denna procentandel av kapaciteten
 warehouseDialog.lowLevel.shortDescription=Ge mig en varning när antalet i lager sjunker under denna procentandel av kapaciteten
 warehouseDialog.name=Varulager
-# Fuzzy
-workProductionPanel.zeroThreshold=Ingen
+workProductionPanel.zeroThreshold=Ingen negativ produktion
 nameCache.base.colony=Koloni
 nameCache.base.settlement=Bosättning
 nameCache.base.ship=Fartyg
diff --git a/data/strings/FreeColMessages_tl.properties b/data/strings/FreeColMessages_tl.properties
index cdb14814a..bc3c575e8 100644
--- a/data/strings/FreeColMessages_tl.properties
+++ b/data/strings/FreeColMessages_tl.properties
@@ -160,8 +160,9 @@ cli.no-memory-check=laktawan ang pagsusuri ng alaala
 cli.no-sound=patakbuhing walang tunog ang FreeCol
 cli.private=pagsimulain ang isang pansariling serbidor (hindi nakalathala sa tagapaghain ng meta)
 cli.seed=magbigay ng isang SEED para sa di-tunay na alin mang pagpiling tagalikha ng bilang
-cli.server-name=tumukoy ng isang pinasadyang PANGALAN para sa serbidor
+# Fuzzy
 cli.server=pagsimulain ang isang nakatatayo ng mag-isang serbidor sa ibabaw ng tinukoy na daungan
+cli.server-name=tumukoy ng isang pinasadyang PANGALAN para sa serbidor
 cli.splash=ipakita ang ang isang talaksang may sumasaboy na larawan sa panooran habang ikinakarga ang laro
 cli.tc=ikarga ang kabuoan ng pagpapalit na may ibinigay na PANGALAN
 cli.timeout=bilang ng mga segundo na maghihintay ang tagapaghain ng sagot para sa isang tanong
@@ -2049,6 +2050,7 @@ server.invalidPlayerNations=Kinakailangang pumili muna ng isang bukod-tanging ba
 server.maximumPlayers=Paumanhin, naabot na ang pinakamataas na bilang ng mga manlalaro.
 server.missingUserName=Ang pangalan ng tagagamit ay nawawala mula sa hiling ng paglagda.
 server.missingVersion=Nawawala ang bersiyon ng FreeCol mula sa hiling na paglagda.
+# Fuzzy
 server.noRouteToServer=Hindi maaaring ipakita sa madla/publiko ang serbidor.  Dapat mong baguhin ang mga pagtatakda mong pang-"pader na pamigil ng pagkalat ng apoy" (''firewall'') upang pahintulutan ang mga ugnayan/konseksyon sa daungang tinukoy mo.
 server.notAllReady=Hindi pa nakahandang magsimula ng laro ang lahat ng mga manlalaro!
 server.onlyAdminCanLaunch=Paumanhin, tanging ang tagapangasiwa lamang ng serbidor ang makapaglulunsad ng laro.
diff --git a/data/strings/FreeColMessages_tr.properties b/data/strings/FreeColMessages_tr.properties
index 8720d5ec4..16b158c8e 100644
--- a/data/strings/FreeColMessages_tr.properties
+++ b/data/strings/FreeColMessages_tr.properties
@@ -201,8 +201,9 @@ cli.no-java-check=java sürüm kontrolünü atla
 cli.no-memory-check=hafıza kontrolünü atla
 cli.no-sound=FreeCol'u sessiz çalıştır
 cli.private=özel sunucu başlat (metasunucuda yayınlanmaz)
-cli.server-name=sunucu için özel bir İSİM belirle
+# Fuzzy
 cli.server=belirlenen portta bağımsız sunucu başlat
+cli.server-name=sunucu için özel bir İSİM belirle
 cli.splash=oyunu yüklerken giriş ekranı resim DOSYASI göster
 cli.tc=İSİM ile belirlenen toplu dönüşümü yükle
 cli.timeout=sunucunun bir soruya yanıt için saniye olarak beklediği süre
diff --git a/data/strings/FreeColMessages_uk.properties b/data/strings/FreeColMessages_uk.properties
index ba6c53a97..1a0a746a0 100644
--- a/data/strings/FreeColMessages_uk.properties
+++ b/data/strings/FreeColMessages_uk.properties
@@ -213,8 +213,9 @@ cli.no-memory-check=Пропустити перевірку пам'яті
 cli.no-sound=запустити FreeCol без звуку
 cli.private=запустити приватний сервер (без публікації на metaserver)
 cli.seed=надайте ВИСІВ для генератора псевдовипадкових чисел
-cli.server-name=вказати НАЗВУ сервера
+# Fuzzy
 cli.server=запустити самостійний сервер по вказаному порту
+cli.server-name=вказати НАЗВУ сервера
 cli.splash=відображати заставку з ФАЙЛУ під час завантаження гри
 cli.tc=завантажити набір правил із заданою НАЗВОЮ
 cli.timeout=час очікування сервера для відповіді на запит (секунди)
@@ -2397,6 +2398,7 @@ server.invalidPlayerNations=Кожен гравець повинен обрат
 server.maximumPlayers=Пробачте, але уже досягнуто максимальне число гравців.
 server.missingUserName=У запиті на вхід втрачено ім'я користувача.
 server.missingVersion=У запиті на вхід втрачено версію FreeCol.
+# Fuzzy
 server.noRouteToServer=Сервер не може бути публічним. Ви повинні змінити налаштування брандмауера, щоб дозволити з'єднання на порт, зазначений Вами.
 server.notAllReady=Не всі гравці готові почати гру!
 server.onlyAdminCanLaunch=Вибачте, тільки адміністратор сервера може почати гру.
diff --git a/data/strings/FreeColMessages_zh-hant.properties b/data/strings/FreeColMessages_zh-hant.properties
index c2a18d6a5..5db33166c 100644
--- a/data/strings/FreeColMessages_zh-hant.properties
+++ b/data/strings/FreeColMessages_zh-hant.properties
@@ -205,8 +205,9 @@ cli.no-memory-check=跳過記憶體檢查
 cli.no-sound=靜音執行 FreeCol
 cli.private=啟動私人伺服器 (不對 metaserver 公開）
 cli.seed=為偽亂數產生器提供種子
-cli.server-name=自訂伺服器名稱
+# Fuzzy
 cli.server=在指定的埠上啟動獨立伺服器
+cli.server-name=自訂伺服器名稱
 cli.splash=載入遊戲時顯示初始螢幕影像檔
 cli.tc=載入具有給定名稱的總轉換
 cli.timeout=伺服器等待問題的答案的秒數
@@ -1801,6 +1802,7 @@ server.invalidPlayerNations=遊戲開始前所有玩家都要選出各自的國
 server.maximumPlayers=抱歉，玩家人數已滿。
 server.missingUserName=登入要求的使用者名稱缺失。
 server.missingVersion=登入請求的 FreeCol 版本號缺失。
+# Fuzzy
 server.noRouteToServer=伺服器無法設定為公開。你應該修改防火牆設定，允許指定的埠口被連接。
 server.noSuchPlayer=遊戲並沒有這個玩家： %player%。
 server.notAllReady=還有玩家沒準好！
diff --git a/data/strings/FreeColMessages_zh_CN.properties b/data/strings/FreeColMessages_zh_CN.properties
index 5063e7f67..267a2ea11 100644
--- a/data/strings/FreeColMessages_zh_CN.properties
+++ b/data/strings/FreeColMessages_zh_CN.properties
@@ -222,8 +222,9 @@ cli.no-memory-check=跳过内存检查
 cli.no-sound=无声运行FreeCol
 cli.private=开启私有服务器(不对metaserver公开)
 cli.seed=为伪随机数字生成器提供种子
-cli.server-name=自定义服务器名
+# Fuzzy
 cli.server=在指定端口上开启独立服务器
+cli.server-name=自定义服务器名
 cli.splash=当读取存档时显示闪烁图片屏幕
 cli.tc=读取给定名称的全部变化
 cli.timeout=服务器应答的延迟
@@ -1517,8 +1518,7 @@ model.improvement.road.description=道路
 model.improvement.road.name=道路
 model.improvement.road.occupationString=R
 model.limit.independence.coastalColonies.name=沿海的殖民城市限制
-# Fuzzy
-model.limit.independence.coastalColonies.description=你至少要拥有%limit%座海边城市来宣布独立。
+model.limit.independence.coastalColonies.description=为了宣布独立，您需要至少 %limit% 座沿海{{plural:%limit%|one=殖民地|other=殖民地}}。
 model.limit.independence.rebels.name=革命党限制
 model.limit.independence.rebels.description=你的移民中至少要有 %limit%%支持独立。
 model.limit.independence.year.name=年份期限
@@ -2442,6 +2442,7 @@ server.invalidPlayerNations=游戏开始前所有玩家都必须选择一个唯
 server.maximumPlayers=对不起，玩家人数已满。
 server.missingUserName=登录请求缺少用户的用户名。
 server.missingVersion=登录请求缺少的FreeCol版本号。
+# Fuzzy
 server.noRouteToServer=服务器无法被设置为公开。你应该修改防火墙设置以允许指定的端口允许被连接。
 server.noSuchPlayer=游戏不包含叫这个名字的玩家：%player%
 server.notAllReady=不是所有的玩家都准备好了!
@@ -2611,12 +2612,13 @@ report.colony.production.header=%goods%净产量
 # Fuzzy
 report.colony.production.high.description=%colony%： 净额 %goods% 生产 =  %amount% 、 充分 {{复数： %turns% 或 = 下一 turn|other = 在 %turns% 转}}
 report.colony.production.low.description=%colony%：已消耗%amount%个%goods%，{{plural:%turns%|one=下一回合|other=%turns%回合后}}将消耗殆尽
-# Fuzzy
-report.colony.production.waste.description=%colony%：%goods% 净产量 = %amount%，仓库将溢出，%waste% 将被浪费
+report.colony.production.waste.description=%colony%：%amount% %goods% 正在生产，仓库将溢出，%waste% 将被浪费
 report.colony.tile.clearForest.description=%colony%会从结算{{plural:%amount%|one=一格|other=%amount%格}}中获利
+report.colony.tile.clearForest.specific.description=%colony%会从清理%location%中获利
 report.colony.tile.clearForest.header=C
 report.colony.tile.plow.description=%colony% 会从耕种{{plural:%amount%|one=一格|other=%amount% 格}}中获利
 report.colony.tile.plow.header=P
+report.colony.tile.road.description=%colony%会从建造{{plural:%amount%|one=一条路|other=%amount%条路}}中获利
 report.colony.tile.road.header=R
 report.colony.shrinking.description=%colony%必须由收缩 {{复数： %amount% 或 = 一 unit|other = %amount% 单位}} 以改善生产
 report.colony.starving.description=%colony%: 饥荒{{plural:%turns%|one=下回合|other=在%turns%回合内}}

From 010064f1038e9bf8a799463d17f9c9bd9cee60b8 Mon Sep 17 00:00:00 2001
From: Michael Pope <mpope@computer.org>
Date: Wed, 7 Oct 2015 09:25:00 +1030
Subject: [PATCH 320/323] Basic comparator simplifications.

---
 .../client/gui/panel/ConceptDetailPanel.java  |  9 +---
 .../client/gui/panel/NewUnitPanel.java        | 13 ++----
 .../client/gui/panel/TradeRoutePanel.java     |  7 +--
 src/net/sf/freecol/common/model/Consumer.java |  9 ++--
 src/net/sf/freecol/common/model/Role.java     | 38 +---------------
 .../freecol/common/util/CollectionUtils.java  | 41 +++++------------
 .../sf/freecol/server/ai/ValuedAIObject.java  |  9 +---
 .../sf/freecol/server/control/ChangeSet.java  | 11 ++---
 .../server/generator/SimpleMapGenerator.java  |  2 +-
 .../net/sf/freecol/common/model/RoleTest.java | 44 +++++++++----------
 .../sf/freecol/common/utils/UtilsTest.java    | 27 ++++++++++++
 11 files changed, 77 insertions(+), 133 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java b/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java
index 8fe45b7f3..db500e80d 100644
--- a/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ConceptDetailPanel.java
@@ -61,13 +61,8 @@ public class ConceptDetailPanel extends FreeColPanel
     };
 
     private static final Comparator<DefaultMutableTreeNode> nodeComparator
-        = new Comparator<DefaultMutableTreeNode>() {
-        @Override
-        public int compare(DefaultMutableTreeNode node1, DefaultMutableTreeNode node2) {
-            return ((ColopediaTreeItem) node1.getUserObject()).getText()
-            .compareTo(((ColopediaTreeItem) node2.getUserObject()).getText());
-        }
-    };
+        = Comparator.comparing(tn ->
+            ((ColopediaTreeItem)tn.getUserObject()).getText());
 
     private ColopediaPanel colopediaPanel;
 
diff --git a/src/net/sf/freecol/client/gui/panel/NewUnitPanel.java b/src/net/sf/freecol/client/gui/panel/NewUnitPanel.java
index 9433e10c8..0cb4b23ab 100644
--- a/src/net/sf/freecol/client/gui/panel/NewUnitPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/NewUnitPanel.java
@@ -54,7 +54,7 @@ public class NewUnitPanel extends FreeColPanel {
     /** The unit types corresponding to the buttons. */
     private final List<UnitType> units = new ArrayList<>();
 
-    /** A comparator for unit prices. */
+    /** A comparator by ascending unit price. */
     private final Comparator<UnitType> priceComparator;
 
     /** Is there at least one available unit? */
@@ -73,16 +73,11 @@ public class NewUnitPanel extends FreeColPanel {
                         String label, List<UnitType> units) {
         super(freeColClient, layout);
 
-        final Europe europe = getMyPlayer().getEurope();
-
         this.question = new JLabel(label);
         this.units.addAll(units);
-        this.priceComparator = new Comparator<UnitType>() {
-            @Override
-            public int compare(final UnitType u1, final UnitType u2) {
-                return europe.getUnitPrice(u1) - europe.getUnitPrice(u2);
-            }
-        };
+        final Europe europe = getMyPlayer().getEurope();
+        this.priceComparator = Comparator.comparingInt((UnitType ut) ->
+            europe.getUnitPrice(ut));
 
         okButton.setText(Messages.message("close"));
 
diff --git a/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java b/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
index cab627914..ace6c5c0b 100644
--- a/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
+++ b/src/net/sf/freecol/client/gui/panel/TradeRoutePanel.java
@@ -62,12 +62,7 @@ public final class TradeRoutePanel extends FreeColPanel {
 
     /** Compare trade routes by name. */
     private static final Comparator<TradeRoute> tradeRouteComparator
-        = new Comparator<TradeRoute>() {
-            @Override
-            public int compare(TradeRoute r1, TradeRoute r2) {
-                return r1.getName().compareTo(r2.getName());
-            }
-        };
+        = Comparator.comparing(TradeRoute::getName);
 
     /** The unit to assign/deassign trade routes for. */
     private final Unit unit;
diff --git a/src/net/sf/freecol/common/model/Consumer.java b/src/net/sf/freecol/common/model/Consumer.java
index fa7ff5513..982cacb4a 100644
--- a/src/net/sf/freecol/common/model/Consumer.java
+++ b/src/net/sf/freecol/common/model/Consumer.java
@@ -32,12 +32,9 @@ import java.util.Set;
  */
 public interface Consumer {
 
-    public static final Comparator<Consumer> COMPARATOR = new Comparator<Consumer>() {
-        @Override
-        public int compare(Consumer c1, Consumer c2) {
-            return c2.getPriority() - c1.getPriority();
-        }
-    };
+    /** Compare consumers by descending priority. */
+    public static final Comparator<Consumer> COMPARATOR
+        = Comparator.comparingInt(Consumer::getPriority).reversed();
 
     /**
      * Default consumption priority for the Colony when producing new
diff --git a/src/net/sf/freecol/common/model/Role.java b/src/net/sf/freecol/common/model/Role.java
index 4f4ec66da..5be1b0b5d 100644
--- a/src/net/sf/freecol/common/model/Role.java
+++ b/src/net/sf/freecol/common/model/Role.java
@@ -64,42 +64,8 @@ public class Role extends BuildableType {
      * effectiveness.
      */
     public static final Comparator<Role> militaryComparator
-        = new Comparator<Role>() {
-            @Override
-            public int compare(Role role1, Role role2) {
-                double amount1 = role1.getOffence() + role1.getDefence();
-                double amount2 = role2.getOffence() + role2.getDefence();
-                return (amount1 < amount2) ? 1
-                    : (amount1 > amount2) ? -1
-                    : 0;
-            }
-        };
-
-    /** A comparator to sort roles by descending defensive power. */
-    public static final Comparator<Role> defensiveComparator
-        = new Comparator<Role>() {
-            @Override
-            public int compare(Role role1, Role role2) {
-                double defence1 = role1.getDefence();
-                double defence2 = role2.getDefence();
-                return (defence1 > defence2) ? 1
-                    : (defence1 < defence2) ? -1
-                    : 0;
-            }
-        };
-
-    /** A comparator to sort roles by descending offensive power. */
-    public static final Comparator<Role> offensiveComparator
-        = new Comparator<Role>() {
-            @Override
-            public int compare(Role role1, Role role2) {
-                double offence1 = role1.getOffence();
-                double offence2 = role2.getOffence();
-                return (offence1 > offence2) ? 1
-                    : (offence1 < offence2) ? -1
-                    : 0;
-            }
-        };
+        = Comparator.comparingDouble((Role r) ->
+            r.getOffence() + r.getDefence()).reversed();
 
     /**
      * The Role to downgrade to after losing a battle. Defaults to
diff --git a/src/net/sf/freecol/common/util/CollectionUtils.java b/src/net/sf/freecol/common/util/CollectionUtils.java
index fb7b34706..547eba0b1 100644
--- a/src/net/sf/freecol/common/util/CollectionUtils.java
+++ b/src/net/sf/freecol/common/util/CollectionUtils.java
@@ -51,39 +51,18 @@ public class CollectionUtils {
         = (d1, d2) -> d1 + d2;
 
     /** Useful comparators for mapEntriesBy* */
-    public static final Comparator<Integer> descendingIntegerComparator
-        = new Comparator<Integer>() {
-            public int compare(Integer i1, Integer i2) {
-                return i2 - i1;
-            }
-        };
     public static final Comparator<Integer> ascendingIntegerComparator
-        = new Comparator<Integer>() {
-            public int compare(Integer i1, Integer i2) {
-                return i1 - i2;
-            }
-        };
-    public static final Comparator<Double> descendingDoubleComparator
-        = new Comparator<Double>() {
-            public int compare(Double d1, Double d2) {
-                return (d2 > d1) ? 1 : (d2 < d1) ? -1 : 0;
-            }
-        };
+        = Comparator.comparingInt(i -> i);
+    public static final Comparator<Integer> descendingIntegerComparator
+        = ascendingIntegerComparator.reversed();
     public static final Comparator<Double> ascendingDoubleComparator
-        = new Comparator<Double>() {
-            public int compare(Double d1, Double d2) {
-                return (d1 > d2) ? 1 : (d1 < d2) ? -1 : 0;
-            }
-        };
-
-    /** Comparator to order lists by decreasing length. */
-    public static final Comparator<List<?>> listLengthComparator
-        = new Comparator<List<?>>() {
-            @Override
-            public int compare(List<?> l1, List<?> l2) {
-                return l2.size() - l1.size();
-            }
-        };
+        = Comparator.comparingDouble(d -> d);
+    public static final Comparator<Double> descendingDoubleComparator
+        = ascendingDoubleComparator.reversed();
+    public static final Comparator<List<?>> ascendingListLengthComparator
+        = Comparator.comparingInt(l -> l.size());
+    public static final Comparator<List<?>> descendingListLengthComparator
+        = ascendingListLengthComparator.reversed();
 
     /**
      * Make an unmodifiable set with specified members.
diff --git a/src/net/sf/freecol/server/ai/ValuedAIObject.java b/src/net/sf/freecol/server/ai/ValuedAIObject.java
index 444a40135..ca40e63ac 100644
--- a/src/net/sf/freecol/server/ai/ValuedAIObject.java
+++ b/src/net/sf/freecol/server/ai/ValuedAIObject.java
@@ -36,14 +36,9 @@ import org.w3c.dom.Element;
  */
 public abstract class ValuedAIObject extends AIObject {
 
-    /** A comparator for the AI object value. */
+    /** A comparator by descending AI object value. */
     public static final Comparator<ValuedAIObject> valuedComparator
-        = new Comparator<ValuedAIObject>() {
-            @Override
-            public int compare(ValuedAIObject v1, ValuedAIObject v2) {
-                return v2.getValue() - v1.getValue();
-            }
-        };
+        = Comparator.comparingInt(ValuedAIObject::getValue).reversed();
 
     /** The value of this AIObject. */
     private int value;
diff --git a/src/net/sf/freecol/server/control/ChangeSet.java b/src/net/sf/freecol/server/control/ChangeSet.java
index 83ff6baaa..83e5e2cb1 100644
--- a/src/net/sf/freecol/server/control/ChangeSet.java
+++ b/src/net/sf/freecol/server/control/ChangeSet.java
@@ -59,6 +59,10 @@ import org.w3c.dom.NamedNodeMap;
  */
 public class ChangeSet {
 
+    /** Compare changes by ascending priority. */
+    private static final Comparator<Change> changeComparator
+        = Comparator.comparingInt(Change::getPriority);
+
     // Convenient way to specify the relative priorities of the fixed
     // change types in one place.
     public static enum ChangePriority {
@@ -86,13 +90,6 @@ public class ChangeSet {
 
     private final ArrayList<Change> changes;
 
-    private static final Comparator<Change> changeComparator
-        = new Comparator<Change>() {
-            @Override
-            public int compare(final Change c1, final Change c2) {
-                return c1.getPriority() - c2.getPriority();
-            }
-        };
 
     /**
      * Class to control the visibility of a change.
diff --git a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
index fe5c5e2ce..6a1815c43 100644
--- a/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
+++ b/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
@@ -557,7 +557,7 @@ public class SimpleMapGenerator implements MapGenerator {
         // For each missing skill...
         while (!expertsNeeded.isEmpty()) {
             UnitType neededSkill = expertsNeeded.remove(0);
-            Collections.sort(isList, listLengthComparator);
+            Collections.sort(isList, descendingListLengthComparator);
             List<IndianSettlement> extras = isList.remove(0);
             UnitType extraSkill = extras.get(0).getLearnableSkill();
             List<RandomChoice<IndianSettlement>> choices = new ArrayList<>();
diff --git a/test/src/net/sf/freecol/common/model/RoleTest.java b/test/src/net/sf/freecol/common/model/RoleTest.java
index 0a201380f..fcadc0ca0 100644
--- a/test/src/net/sf/freecol/common/model/RoleTest.java
+++ b/test/src/net/sf/freecol/common/model/RoleTest.java
@@ -47,7 +47,7 @@ public class RoleTest extends FreeColTestCase {
         = spec().getRole("model.role.dragoon");
     private static final Role pioneer
         = spec().getRole("model.role.pioneer");
-    private static final Role missionary
+    private static final Role mission
         = spec().getRole("model.role.missionary");
     private static final Role infantry
         = spec().getRole("model.role.infantry");
@@ -68,48 +68,46 @@ public class RoleTest extends FreeColTestCase {
         = spec().getUnitType("model.unit.kingsRegular");
 
 
-    public void testComparators() {
+    public void testRoleComparator() {
         List<Role> roles = new ArrayList<>();
         roles.add(soldier);
         roles.add(dragoon);
-        roles.add(missionary);
+        roles.add(mission);
         Collections.sort(roles);
         assertEquals(dragoon, roles.get(0));
         assertEquals(soldier, roles.get(1));
-        assertEquals(missionary, roles.get(2));
+        assertEquals(mission, roles.get(2));
 
-        assertEquals(0, Role.defensiveComparator.compare(soldier, soldier));
-        assertEquals(0, Role.defensiveComparator.compare(dragoon, dragoon));
-        assertEquals(0, Role.defensiveComparator.compare(missionary, missionary));
-
-        assertEquals(1, Role.defensiveComparator.compare(dragoon, soldier));
-        assertEquals(-1, Role.defensiveComparator.compare(soldier, dragoon));
-
-        assertEquals(-1,  Role.defensiveComparator.compare(missionary, soldier));
-        assertEquals(-1,  Role.defensiveComparator.compare(missionary, dragoon));
+        assertEquals(0,  Role.militaryComparator.compare(soldier, soldier));
+        assertEquals(0,  Role.militaryComparator.compare(dragoon, dragoon));
+        assertEquals(0,  Role.militaryComparator.compare(mission, mission));
+        assertEquals(-1, Role.militaryComparator.compare(dragoon, soldier));
+        assertEquals(1,  Role.militaryComparator.compare(soldier, dragoon));
+        assertEquals(1,  Role.militaryComparator.compare(mission, soldier));
+        assertEquals(-1, Role.militaryComparator.compare(dragoon, mission));
     }
 
     public void testCompatibleRoles() {
         assertFalse(soldier.isCompatibleWith(none));
         assertFalse(soldier.isCompatibleWith(pioneer));
-        assertFalse(soldier.isCompatibleWith(missionary));
+        assertFalse(soldier.isCompatibleWith(mission));
         assertTrue(soldier.isCompatibleWith(soldier));
         assertFalse(soldier.isCompatibleWith(scout));
         assertTrue(soldier.isCompatibleWith(dragoon));
 
-        assertFalse(missionary.isCompatibleWith(none));
-        assertFalse(missionary.isCompatibleWith(pioneer));
-        assertTrue(missionary.isCompatibleWith(missionary));
-        assertFalse(missionary.isCompatibleWith(soldier));
-        assertFalse(missionary.isCompatibleWith(scout));
-        assertFalse(missionary.isCompatibleWith(dragoon));
+        assertFalse(mission.isCompatibleWith(none));
+        assertFalse(mission.isCompatibleWith(pioneer));
+        assertTrue(mission.isCompatibleWith(mission));
+        assertFalse(mission.isCompatibleWith(soldier));
+        assertFalse(mission.isCompatibleWith(scout));
+        assertFalse(mission.isCompatibleWith(dragoon));
     }
 
     public void testGoodsDifference() {
         assertTrue(Role.getGoodsDifference(null, 1, none, 1).isEmpty());
         assertTrue(Role.getGoodsDifference(none, 1, none, 1).isEmpty());
-        assertTrue(Role.getGoodsDifference(none, 1, missionary, 1).isEmpty());
-        assertTrue(Role.getGoodsDifference(missionary, 1, none, 1).isEmpty());
+        assertTrue(Role.getGoodsDifference(none, 1, mission, 1).isEmpty());
+        assertTrue(Role.getGoodsDifference(mission, 1, none, 1).isEmpty());
 
         List<AbstractGoods> goods
             = Role.getGoodsDifference(none, 1, soldier, 1);
@@ -120,7 +118,7 @@ public class RoleTest extends FreeColTestCase {
         checkGoods("soldier->dragoon", goods,
             new AbstractGoods(horses, 50));
 
-        goods = Role.getGoodsDifference(missionary, 1, dragoon, 1);
+        goods = Role.getGoodsDifference(mission, 1, dragoon, 1);
         checkGoods("missionary->dragoon", goods,
             new AbstractGoods(horses, 50),
             new AbstractGoods(muskets, 50));
diff --git a/test/src/net/sf/freecol/common/utils/UtilsTest.java b/test/src/net/sf/freecol/common/utils/UtilsTest.java
index 6ed54ef36..b1eca69fc 100644
--- a/test/src/net/sf/freecol/common/utils/UtilsTest.java
+++ b/test/src/net/sf/freecol/common/utils/UtilsTest.java
@@ -20,6 +20,7 @@
 package net.sf.freecol.common.utils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import net.sf.freecol.common.util.CollectionUtils;
@@ -54,4 +55,30 @@ public class UtilsTest extends FreeColTestCase {
         assertEquals(p.get(4), makeList(3,1,2));
         assertEquals(p.get(5), makeList(3,2,1));
     }
+
+    public void testComparator() {
+        // This is more to prove that I know what I am doing with some
+        // trivial comparators than to actually test the code:-), MTP.
+        List<Double> d = new ArrayList<>();
+        d.add(1.0);
+        d.add(2.0);
+        d.add(3.0);
+        Collections.sort(d, CollectionUtils.descendingDoubleComparator);
+        assertEquals(d.get(0), 3.0);
+        Collections.sort(d, CollectionUtils.ascendingDoubleComparator);
+        assertEquals(d.get(0), 1.0);
+        
+        List<List<Object>> o = new ArrayList<>();
+        List<Object> o1 = new ArrayList<Object>();
+        List<Object> o2 = new ArrayList<Object>();
+        List<Object> o3 = new ArrayList<Object>();
+        o.add(o1);
+        o.add(o2);
+        o.add(o3);
+        o1.add(1);
+        o2.add(1);o2.add(2);
+        o3.add(1);o3.add(2);o3.add(3);
+        Collections.sort(o, CollectionUtils.descendingListLengthComparator);
+        assertEquals(o.get(0), o3);
+    }
 }

From 1f4370067e2a8ab995d90745441c862b4d7acb6e Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 15 Oct 2015 20:01:02 +1030
Subject: [PATCH 321/323] Javadoc fixes.

---
 src/net/sf/freecol/client/ClientOptions.java | 5 ++---
 src/net/sf/freecol/client/gui/MapViewer.java | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/net/sf/freecol/client/ClientOptions.java b/src/net/sf/freecol/client/ClientOptions.java
index 814efaeb6..3b7e677aa 100644
--- a/src/net/sf/freecol/client/ClientOptions.java
+++ b/src/net/sf/freecol/client/ClientOptions.java
@@ -132,7 +132,7 @@ public class ClientOptions extends OptionGroup {
 
     /**
      * Selected tiles always gets centered if this option is enabled (even if
-     * the tile is {@link net.sf.freecol.client.gui.GUI#onScreen(Tile)}).
+     * the tile is on screen.
      *
      * @see net.sf.freecol.client.gui.GUI
      */
@@ -141,8 +141,7 @@ public class ClientOptions extends OptionGroup {
 
     /**
      * If this option is enabled, the display will recenter in order
-     * to display the active unit if it is not
-     * {@link net.sf.freecol.client.gui.GUI#onScreen(Tile)}).
+     * to display the active unit if it is not on screen.
      *
      * @see net.sf.freecol.client.gui.GUI
      */
diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 82fd0907d..b5dedd737 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -918,7 +918,6 @@ public final class MapViewer {
      * Gets the selected tile.
      *
      * @return The <code>Tile</code> selected.
-     * @see #setSelectedTile(Tile, boolean)
      */
     Tile getSelectedTile() {
         return selectedTile;
@@ -1064,12 +1063,8 @@ public final class MapViewer {
     /**
      * Sets the active unit.
      *
-     * Invokes {@link #setSelectedTile(Tile, boolean)} if the selected
-     * tile is another tile than where the <code>activeUnit</code> is located.
-     *
      * @param activeUnit The new active <code>Unit</code>.
      * @return True if the focus was set.
-     * @see #setSelectedTile(Tile, boolean)
      */
     boolean setActiveUnit(Unit activeUnit) {
         // Don't select a unit with zero moves left. -sjm

From 4db5bdd3562a752017698b70557246404e1d543e Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Sat, 17 Oct 2015 07:42:33 +1030
Subject: [PATCH 322/323] Include developer manual in release.sh upload.

---
 bin/release.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/release.sh b/bin/release.sh
index fb601f736..41943845b 100755
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -27,12 +27,14 @@ exit
 EOF
 cd ..
 
-if ant manual javadoc ; then
+if ant manual devmanual javadoc ; then
     cd doc
     {
         echo "cd /home/project-web/freecol/htdocs"
         echo "put FreeCol.pdf docs/"
         echo "put FreeCol.html docs/"
+        echo "put developer.pdf docs/"
+        echo "put developer.html docs/"
         echo "put images/* docs/images"
         find javadoc/ -printf "put %p %p\n"
     } | sftp $USERNAME,freecol@web.sf.net

From 2410226fe6240387dc1ac39e36fd196243d369e0 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Thu, 15 Oct 2015 20:08:02 +1030
Subject: [PATCH 323/323] FreeCol 0.11.6.

---
 doc/version.sty                               |   2 +-
 src/net/sf/freecol/FreeCol.java               |   2 +-
 www.freecol.org/download.html                 |  48 ++---
 www.freecol.org/index.html                    |   7 +-
 .../news/freecol-0.11.5-released.html         |   6 -
 .../news/freecol-0.11.6-released.html         | 169 ++++++++++++++++++
 www.freecol.org/news/index.html               |  45 ++++-
 www.freecol.org/news/releases.html            |  47 ++++-
 www.freecol.org/sitemap.html                  |   1 +
 www.freecol.org/status.html                   |   2 +-
 10 files changed, 282 insertions(+), 47 deletions(-)
 create mode 100644 www.freecol.org/news/freecol-0.11.6-released.html

diff --git a/doc/version.sty b/doc/version.sty
index 930d5707d..5a1052903 100644
--- a/doc/version.sty
+++ b/doc/version.sty
@@ -1,4 +1,4 @@
 %-*-LaTeX-*-
 % Trivial file to contain the version number definition, used by both
 % FreeCol.tex and developer.tex.
-\newcommand{\fcversion}{0.11.5}
+\newcommand{\fcversion}{0.11.6}
diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
index 883b9be9b..d05ae3d52 100644
--- a/src/net/sf/freecol/FreeCol.java
+++ b/src/net/sf/freecol/FreeCol.java
@@ -77,7 +77,7 @@ public final class FreeCol {
     private static final Logger logger = Logger.getLogger(FreeCol.class.getName());
 
     /** The FreeCol release version number. */
-    private static final String FREECOL_VERSION = "0.11.5";
+    private static final String FREECOL_VERSION = "0.11.6";
 
     /** The difficulty levels. */
     public static final String[] DIFFICULTIES = {
diff --git a/www.freecol.org/download.html b/www.freecol.org/download.html
index 640aa0bad..879a0d175 100644
--- a/www.freecol.org/download.html
+++ b/www.freecol.org/download.html
@@ -73,13 +73,13 @@
                                     <tbody>
                                     <tr class="cBody">
                                         <td class="cBody">
-                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">
+                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-installer.jar?download">
                                                 <img src="images/java_jar.png" border="0" alt="JAVA INSTALLER" width="32" height="32" />
                                             </a>
                                         </td>
                                         <td class="cBody">
-                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">
-                                                freecol-0.11.5-installer.jar
+                                            <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-installer.jar?download">
+                                                freecol-0.11.6-installer.jar
                                             </a>
                                         </td>
                                         <td class="cBody">
@@ -93,52 +93,52 @@
                                 <tbody>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.exe?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-installer.exe?download">
                                             <img src="images/xplogo.png" border="0" alt="WINDOWS INSTALLER" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.exe?download">
-                                            freecol-0.11.5-installer.exe
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-installer.exe?download">
+                                            freecol-0.11.6-installer.exe
                                         </a>
                                     </td>
                                     <td class="cBody">Windows Installer</td>
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-mac.tar.bz2?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-mac.tar.bz2?download">
                                             <img src="images/mac-bz2.png" border="0" alt="MACOSX" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-mac.tar.bz2?download">
-                                            freecol-0.11.5-mac.tar.bz2
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-mac.tar.bz2?download">
+                                            freecol-0.11.6-mac.tar.bz2
                                         </a>
                                     </td>
                                     <td class="cBody">Package for MacOSX</td>
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-installer.jar?download">
                                             <img src="images/java_jar.png" border="0" alt="JAVA INSTALLER" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">
-                                            freecol-0.11.5-installer.jar
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-installer.jar?download">
+                                            freecol-0.11.6-installer.jar
                                         </a>
                                     </td>
                                     <td class="cBody">Platform independent installer</td>
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/free%20col-0.11.5.zip?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/free%20col-0.11.6.zip?download">
                                             <img src="images/zip.png" border="0" alt=".ZIP" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5.zip?download">
-                                            freecol-0.11.5.zip
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6.zip?download">
+                                            freecol-0.11.6.zip
                                         </a>
                                     </td>
                                     <td class="cBody">Precompiled .zip</td>
@@ -151,12 +151,12 @@
                                 <tbody>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer-with-sources.jar?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-installer-with-sources.jar?download">
                                             <img src="images/java_jar.png" border="0" alt="JAVA INSTALLER WITH SOURCES" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody" width="200">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer-with-sources.jar?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-installer-with-sources.jar?download">
                                             freecol-...-with-sources.jar
                                         </a>
                                     </td>
@@ -164,13 +164,13 @@
                                 </tr>
                                 <tr class="cBody">
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-src.zip?download">
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-src.zip?download">
                                             <img src="images/zip.png" border="0" alt="SOURCE .ZIP" width="32" height="32" />
                                         </a>
                                     </td>
                                     <td class="cBody">
-                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-src.zip?download">
-                                            freecol-0.11.5-src.zip
+                                        <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-src.zip?download">
+                                            freecol-0.11.6-src.zip
                                         </a>
                                     </td>
                                     <td class="cBody">Precompiled .zip with source code included</td>
@@ -188,14 +188,14 @@
                             <h4>Instructions:</h4>
                             <p align="justify">
                                 Windows users should download
-                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.exe?download">freecol-0.11.5-installer.exe</a>.
+                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-installer.exe?download">freecol-0.11.6-installer.exe</a>.
                                 You can run the file directly or save it to disk. If you choose the latter then just double-click the file once it&#39;s downloaded.
                                 <br /><br />
                                 Mac OS X users should download
-                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-mac.tar.bz2?download">freecol-0.11.5-mac.tar.bz2</a>.
+                                <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-mac.tar.bz2?download">freecol-0.11.6-mac.tar.bz2</a>.
                                 Just double click the downloaded file and copy the resulting &#39;FreeCol&#39; to some place (e.g. your Application folder). FreeCol has some problems running on Mac OS X, so you should save your game frequently. <br /><br />
-                                Users that know how to start a java program can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-installer.jar?download">freecol-0.11.5-installer.jar</a>. Start the installation program by running the command: &quot;java -jar freecol-0.11.5-installer.jar&quot;. This installer is recommended for Linux users. <br /><br />
-                                If you don&#39;t need a desktop icon and you know how to start a java program then you can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5.zip?download">freecol-0.11.5.zip</a>. The same applies for <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.5-src.zip?download">freecol-0.11.5-src.zip</a>, but the source files are included as well in these two packages. In that case you might want to take a look at the README file to get information on how to compile and run FreeCol.
+                                Users that know how to start a java program can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-installer.jar?download">freecol-0.11.6-installer.jar</a>. Start the installation program by running the command: &quot;java -jar freecol-0.11.6-installer.jar&quot;. This installer is recommended for Linux users. <br /><br />
+                                If you don&#39;t need a desktop icon and you know how to start a java program then you can download <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6.zip?download">freecol-0.11.6.zip</a>. The same applies for <a href="http://prdownloads.sourceforge.net/freecol/freecol-0.11.6-src.zip?download">freecol-0.11.6-src.zip</a>, but the source files are included as well in these two packages. In that case you might want to take a look at the README file to get information on how to compile and run FreeCol.
                             </p>
                             <h4>Help, Feedback &amp; Bugs:</h4>
                             <p align="justify">Help requests and feedback can be sent via e-mail to
diff --git a/www.freecol.org/index.html b/www.freecol.org/index.html
index 0be563f45..2c8d0d703 100644
--- a/www.freecol.org/index.html
+++ b/www.freecol.org/index.html
@@ -77,7 +77,7 @@
                                                             <a href="download.html"><img src="images/download2.png" border="0" alt="" /></a>
                                                         </td>
                                                         <td>
-                                                            <strong><em><a href="download.html">Download FreeCol 0.11.5</a></em></strong>
+                                                            <strong><em><a href="download.html">Download FreeCol 0.11.6</a></em></strong>
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -94,6 +94,11 @@
                                 <td valign="top">
                                     <div class="blog_more">
                                         <ul>
+                                            <li>
+                                                <a class="blogsection" href="news/freecol-0.11.6-released.html">
+                                                    FreeCol 0.11.6 released
+                                                </a>
+                                            </li>
                                             <li>
                                                 <a class="blogsection" href="news/freecol-0.11.5-released.html">
                                                     FreeCol 0.11.5 released
diff --git a/www.freecol.org/news/freecol-0.11.5-released.html b/www.freecol.org/news/freecol-0.11.5-released.html
index a0b4d0a91..f6e23de48 100644
--- a/www.freecol.org/news/freecol-0.11.5-released.html
+++ b/www.freecol.org/news/freecol-0.11.5-released.html
@@ -126,12 +126,6 @@
                                 <br /><br />The FreeCol Team
                             </div>
                             <div align="left">&nbsp;</div>
-                            <!-- Here is the download button.
-                                 Move it to the new release! -->
-                            <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                                <a href="../download.html">Download FreeCol 0.11.5</a>
-                            </em></strong></td></tr></tbody></table>
-                            <!-- End of download button -->
                         </td>
                     </tr>
                 </table>
diff --git a/www.freecol.org/news/freecol-0.11.6-released.html b/www.freecol.org/news/freecol-0.11.6-released.html
new file mode 100644
index 000000000..183b2ec7c
--- /dev/null
+++ b/www.freecol.org/news/freecol-0.11.6-released.html
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <link rel="alternate" type="application/rss+xml" title="FreeCol News" href="../component/option,com_rss/feed,RSS1.0/no_html,1/" />
+    <title>FreeCol - FreeCol 0.11.6 released</title>
+    <meta name="title" content="FreeCol 0.11.6 released" />
+    <meta name="author" content="Caleb Williams" />
+    <meta name="description" content="FreeCol - a turn based strategy game" />
+    <meta name="keywords" content="FreeCol, Colonization, Free Colonization Game, Colonization, Sid Meier's Colonization, Colonization 2, Microprose" />
+    <meta name="robots" content="index, follow" />
+
+    <link rel="shortcut icon" href="../images/favicon.ico" />
+    <link href="../templates/freecol/css/template_css.css" rel="stylesheet" type="text/css" />
+    <link href="../templates/freecol/css/css_color_green.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div id="pagewidth-800" >
+    <div id="header" >
+        <div id="top-top">
+            <div id="topmenu">
+            </div>
+        </div>
+        <div class="clr"></div>
+        <div id="top-bottom">
+            <a href="index.html"><img src="../templates/freecol/images/logo.png" border="0" width="600" height="89" alt="logo" /></a>
+        </div>
+    </div>
+    <div id="outer-800" >
+        <div id="pathway">
+          <span class="pathway"><a href="../index.html" class="pathway">Home</a>
+            <img src="../images/M_images/arrow.png" alt="arrow" />
+            <a href="../news/" class="pathway">News</a>
+            <img src="../images/M_images/arrow.png" alt="arrow" />
+            FreeCol 0.11.6 released
+          </span>
+          <span class="pathway-right">
+            <a href="../sitemap.html"><img src="../templates/freecol/images/sitemap.png" border="0" width="14" height="16" alt="SITEMAP" /></a>
+          </span>
+        </div>
+        <div id="leftcol">
+            <a name="menu"></a>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Main Menu</h3>
+                            <table width="100%" border="0" cellpadding="0" cellspacing="0">
+                                <tr align="left"><td><a href="../index.html" class="mainlevel" >Home</a></td></tr>
+                                <tr align="left"><td><a href="../news/" class="mainlevel" id="active_menu">News</a>
+
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/releases.html" class="sublevel" >Releases</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/development.html" class="sublevel" >Development</a></div>
+                                    <div style="padding-left: 4px"><img src="../templates/freecol/images/indent1.png" alt="" /><a href="../news/other.html" class="sublevel" >Other</a></div>
+                                </td></tr>
+                                <tr align="left"><td><a href="../about.html" class="mainlevel" >About FreeCol</a></td></tr>
+                                <tr align="left"><td><a href="../documentation/" class="mainlevel" >Documentation</a></td></tr>
+                                <tr align="left"><td><a href="../screenshots.html" class="mainlevel" >Screenshots</a></td></tr>
+                                <tr align="left"><td><a href="../download.html" class="mainlevel" >Download</a></td></tr>
+                                <tr align="left"><td><a href="../community.html" class="mainlevel" >Community</a></td></tr>
+                            </table>					</div>
+                    </div>
+                </div>
+            </div>
+            <div class="module">
+                <div>
+                    <div>
+                        <div>
+                            <h3>Syndicate</h3><div class="syndicate">
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS0.91/no_html,1/">
+                                    <img src="../images/M_images/rss091.gif"  alt="RSS 0.91" name="RSS091" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS1.0/no_html,1/">
+                                    <img src="../images/M_images/rss10.gif"  alt="RSS 1.0" name="RSS10" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,RSS2.0/no_html,1/">
+                                    <img src="../images/M_images/rss20.gif"  alt="RSS 2.0" name="RSS20" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,ATOM0.3/no_html,1/">
+                                    <img src="../images/M_images/atom03.gif"  alt="ATOM 0.3" name="ATOM03" align="middle" border="0" /></a>
+                            </div>
+                            <div align="center">
+                                <a href="../component/option,com_rss/feed,OPML/no_html,1/">
+                                    <img src="../images/M_images/opml.png"  alt="OPML" name="OPML" align="middle" border="0" /></a>
+                            </div>
+                        </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div id="maincol-wide-800" >
+            <div class="clr"></div>
+            <div class="content"><a name="content"></a>
+
+                <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
+                    FreeCol 0.11.6 released
+                </td></tr></table>
+                <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
+                    Saturday, 17 October 2015
+                </td></tr>
+                    <tr>
+                        <td valign="top" colspan="2">
+                            <div align="left">FreeCol 0.11.6</div>
+                            <div align="left">&nbsp;</div>
+                            <div align="left" style="margin-bottom: 1em;">
+                                FreeCol 0.11.6 has been released.
+                                All 0.10.x and 0.11.x games should continue
+                                to work with 0.11.6, with the exception of
+                                games generated with 0.11.4 which are badly
+                                broken. For more details on the changes
+                                since 0.11.5, see the
+                                <a href="https://sourceforge.net/p/freecol/wiki/0.11.6%20Release%20Notes/"
+                                   title="release notes">release notes</a>.
+                            </div>
+                            <div align="left">
+                                We hope this time you get to enjoy the new
+                                FreeCol release. Onward to 1.0.
+                                <br /><br />The FreeCol Team
+                            </div>
+                            <div align="left">&nbsp;</div>
+                            <!-- Here is the download button.
+                                 Move it to the new release! -->
+                            <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
+                                <a href="../download.html">Download FreeCol 0.11.6</a>
+                            </em></strong></td></tr></tbody></table>
+                            <!-- End of download button -->
+                        </td>
+                    </tr>
+                </table>
+
+                <span class="article_seperator">&nbsp;</span>
+
+                <table align="center" style="margin-top: 25px;">
+                    <tr>
+                        <th class="pagenav_prev">
+                            <a href="#"><!-- &lt; Previous --></a>
+                        </th>
+                        <th class="pagenav_next">
+                            <a href="../news/freecol-0.11.4-released.html">
+                                Next &gt;</a>
+                        </th>
+                    </tr>
+                </table>
+                <div class="back_button">
+                    <a href='javascript:history.go(-1)'>
+                        [ Back ]</a>
+                </div>
+            </div>
+        </div>
+        <div class="clr"></div>
+    </div>
+    <div id="sflogo">
+        <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=43225&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a>
+    </div>
+    <div id="footer-800" >
+        <div align="center" class="footer-copyright">
+            &copy; 2002-2015 FreeCol - <a href="../contact.html">Contact Us</a>
+        </div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/www.freecol.org/news/index.html b/www.freecol.org/news/index.html
index a47165996..042a8f7c8 100644
--- a/www.freecol.org/news/index.html
+++ b/www.freecol.org/news/index.html
@@ -99,6 +99,45 @@
               <tr>
                 <td valign="top">
 
+                  <!-- 0.11.6 -->
+                  <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
+                        FreeCol 0.11.6 released
+                  </td></tr></table>
+                  <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
+                        Saturday, 17 October 2015
+                  </td></tr>
+                    <tr>
+                      <td valign="top" colspan="2">
+                        <div align="left">FreeCol 0.11.6</div>
+                        <div align="left">&nbsp;</div>
+                        <div align="left" style="margin-bottom: 1em;">
+                          FreeCol 0.11.6 has been released.
+                          All 0.10.x and 0.11.x games should continue
+                          to work with 0.11.6, with the exception of
+                          games generated with 0.11.4 which are badly
+                          broken. For more details on the changes
+                          since 0.11.5, see the                       
+                          <a href="https://sourceforge.net/p/freecol/wiki/0.11.6%20Release%20Notes/"
+                             title="release notes">release notes</a>.
+                        </div>
+                        <div align="left">
+                          We hope this time you get to enjoy the new
+                          FreeCol release. Onward to 1.0.
+                          <br /><br />The FreeCol Team
+                        </div>
+                        <div align="left">&nbsp;</div>
+                        <!-- Here is the download button.
+                             Move it to the new release! -->
+                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
+                                    <a href="../download.html">Download FreeCol 0.11.5</a>
+                        </em></strong></td></tr></tbody></table>
+                        <!-- End of download button -->
+                      </td>
+                    </tr>
+                  </table>
+
+                  <span class="article_seperator">&nbsp;</span>
+
                   <!-- 0.11.5 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
                         FreeCol 0.11.5 released
@@ -127,12 +166,6 @@
                           <br /><br />The FreeCol Team
                         </div>
                         <div align="left">&nbsp;</div>
-                        <!-- Here is the download button.
-                             Move it to the new release! -->
-                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                                    <a href="../download.html">Download FreeCol 0.11.5</a>
-                        </em></strong></td></tr></tbody></table>
-                        <!-- End of download button -->
                       </td>
                     </tr>
                   </table>
diff --git a/www.freecol.org/news/releases.html b/www.freecol.org/news/releases.html
index c2f42e65b..0f06f61b6 100644
--- a/www.freecol.org/news/releases.html
+++ b/www.freecol.org/news/releases.html
@@ -99,6 +99,45 @@
               <tr>
                 <td valign="top">
 
+                  <!-- 0.11.6 -->
+                  <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
+                        FreeCol 0.11.6 released
+                  </td></tr></table>
+                  <table class="contentpaneopen"><tr><td valign="top" colspan="2" class="createdate">
+                        Saturday, 17 October 2015
+                  </td></tr>
+                    <tr>
+                      <td valign="top" colspan="2">
+                        <div align="left">FreeCol 0.11.6</div>
+                        <div align="left">&nbsp;</div>
+                        <div align="left" style="margin-bottom: 1em;">
+                          FreeCol 0.11.6 has been released.
+                          All 0.10.x and 0.11.x games should continue
+                          to work with 0.11.6, with the exception of
+                          games generated with 0.11.4 which are badly
+                          broken. For more details on the changes
+                          since 0.11.5, see the                       
+                          <a href="https://sourceforge.net/p/freecol/wiki/0.11.6%20Release%20Notes/"
+                             title="release notes">release notes</a>.
+                        </div>
+                        <div align="left">
+                          We hope this time you get to enjoy the new
+                          FreeCol release. Onward to 1.0.
+                          <br /><br />The FreeCol Team
+                        </div>
+                        <div align="left">&nbsp;</div>
+                        <!-- Here is the download button.
+                             Move it to the new release! -->
+                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
+                                    <a href="../download.html">Download FreeCol 0.11.5</a>
+                        </em></strong></td></tr></tbody></table>
+                        <!-- End of download button -->
+                      </td>
+                    </tr>
+                  </table>
+
+                  <span class="article_seperator">&nbsp;</span>
+
                   <!-- 0.11.5 -->
                   <table class="contentpaneopen"><tr><td class="contentheading" width="100%">
                         FreeCol 0.11.5 released
@@ -128,13 +167,7 @@
                           <br /><br />The FreeCol Team
                         </div>
                         <div align="left">&nbsp;</div>
-                        <!-- Here is the download button.
-                             Move it to the new release! -->
-                        <table border="0"><tbody><tr><td><a href="../download.html"><img src="../images/download2.png" border="0" alt="" /></a></td><td><strong><em>
-                                    <a href="../download.html">Download FreeCol 0.11.5</a>
-                        </em></strong></td></tr></tbody></table>
-                        <!-- End of download button -->
-                      </td></tr></table>
+                  </td></tr></table>
 
                   <span class="article_seperator">&nbsp;</span>
 
diff --git a/www.freecol.org/sitemap.html b/www.freecol.org/sitemap.html
index 399267b1e..008ce8ad0 100644
--- a/www.freecol.org/sitemap.html
+++ b/www.freecol.org/sitemap.html
@@ -63,6 +63,7 @@
                             <li><a href="index.html" title="Home">Home</a></li>
                             <li><a href="news/" title="News">News</a>
                                 <ul class="level_1">
+                                    <li><a href="news/freecol-0.11.6-released.html" title="FreeCol 0.11.6 released">FreeCol 0.11.6 released</a></li>
                                     <li><a href="news/freecol-0.11.5-released.html" title="FreeCol 0.11.5 released">FreeCol 0.11.5 released</a></li>
                                     <li><a href="news/freecol-0.11.4-released.html" title="FreeCol 0.11.4 released">FreeCol 0.11.4 released and withdrawn</a></li>
                                     <li><a href="news/freecol-0.11.3-released.html" title="FreeCol 0.11.3 released">FreeCol 0.11.3 released</a></li>
diff --git a/www.freecol.org/status.html b/www.freecol.org/status.html
index 6bd593a1f..463b711e1 100644
--- a/www.freecol.org/status.html
+++ b/www.freecol.org/status.html
@@ -74,7 +74,7 @@
                 <table class="contentpaneopen">
                     <tr>
                         <td valign="top" colspan="2">
-                            <p>The the current version of FreeCol is 0.11.5.</p>
+                            <p>The the current version of FreeCol is 0.11.6.</p>
                             <p>FreeCol is continuously developed. For more on the latest Freecol development progress, please visit the <a href="https://sourceforge.net/projects/freecol/" title="FreeCol on SourceForge">SourceForge Project page</a>.</p>
                         </td>
                     </tr>