FreeCol

Revision: 6030
          http://freecol.svn.sourceforge.net/freecol/?rev=6030&view=rev
Author:   siebrand
Date:     2009-12-05 20:21:59 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
Localisation updates from translatewiki.net (2009-12-05)

Modified Paths:
--------------
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_af.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ar.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_arz.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_bg.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_br.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_bs.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ca.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_cs_CZ.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_da.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_de.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_el.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_eo.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_es_ES.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_fi.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_fr.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_gl.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_hsb.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_hu.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_it_IT.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ja.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_mk.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nb_NO.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nds.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nl.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nl_BE.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nn.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_oc.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pl_PL.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pms.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pt_BR.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pt_PT.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ru.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_sq.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_sv_SE.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_tl.properties
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_uk.properties

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_af.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_af.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_af.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -127,7 +127,10 @@
 colonyPanel.bonusLabel=Bonus: %number%
 colonyPanel.minimumColonySize=%object% verhoed dat bevolking verder kan verminder.
 colonyPanel.currentlyBuilding=Bou: %buildable%
+colonyPanel.buildQueue=Boulys
+colonyPanel.clickToBuild=Kliek op die bouperseel om 'n gebou of eenheid te selekteer vir bou.
 colonyPanel.compactView=Kompakte weergawe
+colonyPanel.showAll=Wys alles
 nothing=Niks
 turns=beurte
 turnsToComplete.short=(Beurte: %number%)
@@ -172,11 +175,9 @@
 negotiationDialog.nothing=niks
 negotiationDialog.offerAccepted=U vrygewige aanbod is deur %nation% aanvaar.
 negotiationDialog.offerRejected=U vrygewige aanbod is deur %nation% verwerp.
-# Fuzzy
-transaction.purchase=Koop %amount% %goods% teen 'n prys van %gold%
+transaction.purchase=Koop %amount% %goods% @%gold%
 transaction.price=Prys:\t%gold%
-# Fuzzy
-transaction.sale=Verkoop %amount% %goods% teen 'n prys van %gold%
+transaction.sale=Verkoop %amount% %goods% @%gold%
 transaction.tax=-%tax%%:\t%gold%
 transaction.net=Netto:\t%gold%
 wary=Agterdogtig
@@ -189,6 +190,7 @@
 noSuchFile=Die spesifieke lêer bestaan nie of is nie 'n gewone lêer nie.
 gotoThisTile=Gaan na hierdie Teël
 attackTileOdds=Val aan! (%chance%% kans op sukses)
+dumpCargo=Gooi vrag weg
 tile=Teël (%x%, %y%)
 filter.savedGames=FreeCol Gestoorde Spele (*.fsg)
 filter.gameOptions=Freecol Spel Opsies (*.fgo)
@@ -222,11 +224,13 @@
 menuBar.game.returnToMain=Terug na hoofkieslys
 menuBar.game.quit=Opgee...
 menuBar.game.retire=Met pensioen gaan…
+menuBar.game.highScores=Hoogste punte...
 menuBar.view=Bekyk
 menuBar.view.mapControls=Kaart beheer
 menuBar.view.displayTileEmpty=Vertoon geen teks in teëls nie
 menuBar.view.displayTileNames=Wys tëel name
 menuBar.view.displayTileOwners=Wys tëel eienaars
+menuBar.view.displayTileRegions=Vertoon teëlareas
 menuBar.view.displayGrid=Wys rooster
 menuBar.view.displayBorders=Vertoon Grense
 menuBar.view.europe=Europa…
@@ -252,6 +256,7 @@
 menuBar.orders.assignTradeRoute=Ken Handelsroetes toe
 menuBar.colopedia=Colopedia
 menuBar.colopedia.terrain=Terrein-tipes
+menuBar.colopedia.resource=Bonus grondstowwe
 menuBar.colopedia.unit=Eenhede
 menuBar.colopedia.goods=Goedere
 menuBar.colopedia.skill=Bekwaamdhede
@@ -264,7 +269,13 @@
 menuBar.debug=Ontfout
 menuBar.debug.showCoordinates=Wys koördinate
 menuBar.debug.showColonyValue=Wys kolonie waardes
+menuBar.debug.addImmigration=Voeg immigrasie by
+menuBar.debug.stepRandomNumberGenerator=Lukrake getal generator waarde: %value%
 menuBar.debug.revealEntireMap=Wys volledige kaart
+menuBar.debug.compareMaps=Toets vir nie-sinchrone kaart
+menuBar.debug.compareMaps.checkComplete=Toets voltooi. Die kaart is sinchroon.
+menuBar.debug.compareMaps.problem=Moontlike probleem opgespoor. Lees asseblief die standaard afvoer.
+menuBar.debug.loadResource=Laai grondstofbundel
 menuBar.debug.memoryManager=Geheuebestuurder
 menuBar.debug.memoryManager.free=Beskikbaar
 menuBar.debug.memoryManager.total=Totaal
@@ -287,7 +298,12 @@
 menuBar.report.history=Geskiedenisverslag
 menuBar.report.production=Produksieverslag
 menuBar.statusLine=Punte: %score%     |    Goud: %gold%    |  Belasting: %tax% |    Jaar: %year%
+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.
+infoPanel.endTurnPanel.text=Druk 'enter' om beurt te beëindig.
 infoPanel.endTurnPanel.endTurnButton=Beëindig beurt
+menuBar.tools.determineHighSeas.distToLandFromHighSeas=Teëls van land
+menuBar.tools.determineHighSeas.maxDistanceToEdge=Maksimale afstand tot rand
 stopCurrentGame.text='n Spel loop alreeds.
 stopCurrentGame.yes=Beëindig spel
 stopCurrentGame.no=Kanselleer
@@ -298,41 +314,81 @@
 reconnect.text=Die bediener versoek 'n herverbinding.
 reconnect.yes=Herkonnekteer
 reconnect.no=Opgee
+couldNotSaveGame='n Fout het voorgekom tydens spelstoor!
+couldNotLoadGame='n Fout het voorgekom tydens spellaai!
+fileNotFound=Kon nie die lêer met gegewe naam vind nie.
+unspecifiedIOException='n Ongespesifiseerde fout het voorgekom tydens lees/skryf.
+incompatibleVersions=Die gestoorde spel wat u probeer laai is nie aanpasbaar met hierdie weergawe van FreeCol nie.
+openGame.unimplemented=Die oop funksie is nog nie geïmplimenteer nie.
 playersNotReady=Alle spelers is nie gereed om spel te begin nie.
 server.buildColony.badName=Onaanvaarbare kolonienaam.
 server.buildColony.badUnit=Hierdie eenheid kan nie 'n kolonie bou nie.
+server.communicate=Die bediener kon nie met die ander speler kommunikeer nie.
 server.reject=Die bediener kan dit nie uitvoer nie.
+server.trade.noGoods=U kan nie goedere ruil wat nie teenwoordig is nie.
 cli.arg.dimensions=BREEDTExHOOGTE
 cli.arg.directory=VOUER
 cli.arg.file=LêER
 cli.arg.locale=LOCALE
+cli.arg.loglevel=BOEKSTAAFVLAK
 cli.arg.name=NAAM
 cli.arg.port=POORT
+cli.check-savegame=Kontroleer die gegewe lêernaam vir konsekwentheid
 cli.debug=ontfout Freecol
+cli.default-locale=stel die standaard lokaliteit (LANGUAGE[_COUNTRY[_VARIANT]])
 cli.error.port=%string% is nie 'n geldig poortnommer nie.
+cli.error.home.notExists=Tuisgids %string% bestaan nie.
 cli.error.home.noRead=Kan nie van %string%
 cli.error.home.noWrite=Kan nie skryf na %string%
+cli.freecol-data=stel FreeCol se data GIDS (het 'n subgids genaamd 'images')
+cli.experimentalAI=gebruik eksperimentele in plaas van standaard AI
 cli.help=vertoon hierdie hulpskerm
+cli.home-directory=stel die FreeCol tuis GIDS (stadaard is gebruiker tuisgids)
+cli.load-savegame=laai die gegewe spelstoor LêER
+cli.log-console=boekstaaf na konsole sowel as na lêer
+cli.log-file=stel die FreeCol boekstaaf lêer (standaard na FreeCol.log)
+cli.log-level=stel die java boekstaafvlak na BOEKSTAAFVLAK
 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
+cli.server=begin 'n aleenstaande bediener op die gespesifiseerde poort
+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
+cli.windowed=loop FreeCol in gevensterde modus in plaas van volskerm modus
 gameOptions.name=Spelopsies
 gameOptions.shortDescription=Spelopsies
 gameOptions.starting.name=Beginwaardes
+gameOptions.starting.shortDescription=Bevat die opsies vir die beginwaardes van die spel.
 gameOptions.starting.startingMoney.name=Begin hoeveelheid goud
 gameOptions.starting.startingMoney.shortDescription=Die hoeveelheid goud wat elke speler gaan kry.
 gameOptions.map.name=Kaart
 gameOptions.map.shortDescription=Opsies vir die kaart bord.
 gameOptions.map.fogOfWar.name=Oorlog-Mis
+gameOptions.map.fogOfWar.shortDescription=Moet vyandige eenhede buite ons direkte sig verskuil word?
 gameOptions.map.explorationPoints.name=Verkenningspunte
 gameOptions.map.explorationPoints.shortDescription=Moet daar vir alle ontdekkings verkenningspunte toegeken word?
 gameOptions.colony.name=Kolonie Opsies
+gameOptions.colony.shortDescription=Bevat opsies van belang tot die gedrag van kolonies
 gameOptions.colony.hammerPrice.name=Prys van 'n hamer:
+gameOptions.colony.hammerPrice.shortDescription=Die koste van 'n enkele hammer wanneer 'n gebou in 'n kolonie gekoop word.
+gameOptions.colony.customIgnoreBoycott.name=Doanehuis ignoreer verbod
+gameOptions.colony.customIgnoreBoycott.shortDescription=Die doanehuis kan goedere verkoop onder verbod.
+gameOptions.colony.expertsHaveConnections.name=Spesialiste het konneksies
+gameOptions.colony.expertsHaveConnections.shortDescription=Spesialiste kan hulle konneksies gebruik om minimale hoeveelhede grondstowwe te voorsien vir produksie in fabrieke.
 gameOptions.colony.saveProductionOverflow.name=Stoor produksieoorskot
+gameOptions.colony.saveProductionOverflow.shortDescription=Stoor oorvloei van hammers, klokke en kruise.
+gameOptions.colony.educateLeastSkilledUnitFirst.name=Onderrig laagsgeskoolde eenheid eerste
+gameOptions.colony.educateLeastSkilledUnitFirst.shortDescription=Onderrig laagsgeskoolde eenheid eerste, en moenie hand-toekenning van studente toelaat nie
 gameOptions.victoryConditions.name=Oorwinningsopsies
+gameOptions.victoryConditions.shortDescription=Instellings om te besluit hoe die spel gewen kan word.
 gameOptions.victoryConditions.victoryDefeatREF.name=Eerste speler om onafhanklikheid te verklaar
+gameOptions.victoryConditions.victoryDefeatEuropeans.name=Alle ander Europese spelers is oorwin
+gameOptions.victoryConditions.victoryDefeatEuropeans.shortDescription=Enige speler wat alle ander Europese spelers oorwin, wen die spel.
 gameOptions.victoryConditions.victoryDefeatHumans.name=Alle ander menslike spelers is verslaan
+gameOptions.victoryConditions.victoryDefeatHumans.shortDescription=Enige speler wat alle ander menslike spelers oorwin, wen die spel.
 gameOptions.difficultySettings.name=Moeilikheidsgraad
 gameOptions.difficultySettings.shortDescription=Die moeilikheidsgraad van die spel.
 gameOptions.difficultySettings.difficulty.name=Moeilikheidsgraad
@@ -437,20 +493,28 @@
 clientOptions.savegames.autosave.fileprefix=Outomaties stoor
 clientOptions.savegames.autosavePeriod.name=Aantal beurte tussen outomatiese stoor:
 clientOptions.savegames.autosaveGenerations.name=Aantal outomaties gestoorde lêers om te bewaar:
+clientOptions.warehouse.name=Pakhuis Instellings
 clientOptions.warehouse.lowLevel.name=Lae vlak waarskuwing
 clientOptions.other.name=Ander
 clientOptions.other.labourReport.name=Arbeidsverslag
 clientOptions.labourReport.classic=Klassiek
 clientOptions.labourReport.compact=Kompak
 clientOptions.indianDemandResponse.ask=Vra altyd
+clientOptions.other.unloadOverflowResponse.name=Laai oorvloei af
 clientOptions.unloadOverflowResponse.ask=Vra altyd
+clientOptions.unloadOverflowResponse.never=Laai nooit af
+clientOptions.unloadOverflowResponse.always=Laai altyd af
 mapGeneratorOptions.landGenerator.mapSize.name=Kaart grootte
 mapGeneratorOptions.landGenerator.landMass.name=Landmassa
 mapGeneratorOptions.terrainGenerator.riverNumber.name=Aantal riviere
 mapGeneratorOptions.terrainGenerator.mountainNumber.name=Aantal berge
 mapGeneratorOptions.terrainGenerator.settlementNumber.name=Aantal inheemse nedersettings
+mapGeneratorOptions.terrainGenerator.humidity.name=Humiditeit
+mapGeneratorOptions.terrainGenerator.temperature.name=Temperatuur
 mapGeneratorOptions.import.name=Importeer
 mapGeneratorOptions.import.importFile.name=Importeer lêer
+mapGeneratorOptions.landGenerator.name=Landgenerator
+mapGeneratorOptions.terrainGenerator.name=Terreingenerator
 settlementType.city=Stad
 settlementType.camp=Kamp
 settlementType.village=Dorp
@@ -514,7 +578,8 @@
 highseas.text=Ons het die diepsee bereik, U hoogheid. Sal ons na Europa seil?
 highseas.yes=Ja, hou hom windwaards.
 highseas.no=Nee, laat ons in hier naby bly.
-disembark.text=Gegroet seilvaarder, is U seker U wil af klim?
+disembark.text=Gegroet seevaarder, is U seker U wil af klim?
+disembark.cancel=Nee
 embark.cancel=Geen
 aMessageFromTheCrown='n Boodskap van die Kroon
 cashInTreasureTrain.yes=Aanvaar
@@ -551,6 +616,9 @@
 victory.continue=Hou aan speel
 selectDestination.text=Kies bestemming
 selectDestination.cancel=Bly waar U is
+selectDestination.sortByOwner=Sorteer volgens eienaar
+selectDestination.sortByName=Sorteer volgens naam
+selectDestination.sortByDistance=Sorteer volgens afstand
 chooseThisFoundingFather=Kies hierdie volksvader
 notEnoughGold=U het nie genoeg goud om daardie item te koop nie!
 inappropriateOrder=Daardie opdrag kon nie gegee word nie!
@@ -563,7 +631,6 @@
 indianSettlement.learnableSkill=Die volgende vaardigheid kan geleer word by hierdie nedersetting:
 indianSettlement.highlyWanted=Hierdie nedersetting wil baie graag ruil:
 indianSettlement.otherWanted=Ander goedere wat geruil kan word by hierdie nedersetting is:
-# Fuzzy
 indianSettlement.noMoreSkill=Die vaardigheid is alreeds aan ander Europiëers geleer, ons het niks meer om te leer nie!
 indianSettlement.skillUnknown=Onbekent
 indianSettlement.skillNone=Geen
@@ -608,6 +675,7 @@
 unit.state.9=Zoem in
 unit.state.10=Zoem uit
 unit.state.11=tel
+unit.state.12=getal
 executeGotoOrders=Voer Gaan na Opdrag uit
 activateUnit=Aktiveer eenheid
 fortifyUnit=Verskans
@@ -629,6 +697,7 @@
 train=Lei op
 goingToAmerica=Seil na Amerika
 goingToEurope=Seil na Europa
+sail=Vaar Uit
 inPort=In hawe
 docks=Dokke
 cargo=Vrag
@@ -644,10 +713,18 @@
 goldTitle=Goud
 tax=Belasting
 gold=goud
+model.ability.carryGoods.name=Dra goedere
+model.ability.carryUnits.name=Dra eenhede
+model.ability.foundColony.name=Stig kolonie
 model.ability.navalUnit.name=See-eenheid
+model.ability.electFoundingFather.name=Verkies staatshoofde
 model.ability.native.name=Indiaan
 model.ability.native.shortDescription=Amerikaanse inboorling
 model.ability.moveToEurope.name=Reis na Europa
+model.modifier.tradeBonus.name=Handelsbonus
+model.modifier.movementBonus.name=Bewegingsbonus
+model.modifier.defence.name=Verdedigingsbonus
+model.modifier.defence.shortDescription=Verdedigingsbonus
 model.modifier.warehouseStorage.name=Pakhuis stoorplek
 model.modifier.warehouseStorage.shortDescription=Pakhuis stoorplek
 model.modifier.minimumColonySize.name=Minimum kolonie-grootte
@@ -673,6 +750,10 @@
 model.stance.cease_fire=Skietstilstand
 model.stance.alliance=Alliansie
 model.market.independent=Europa
+model.monarch.infantry=Beroepsoldaat
+model.monarch.infantries=Beroepsoldate
+model.monarch.dragoon=Dragonder
+model.monarch.dragoons=Dragonders
 model.monarch.artillery=stuk artillerie
 model.monarch.artilleries=stukke artillerie
 model.monarch.acceptTax=Ons aanvaar
@@ -761,11 +842,18 @@
 model.unit.hardyPioneer.name=Geharde Pionier
 model.unit.veteranSoldier.name=Veteraan Soldaat
 model.unit.veteranSoldier.soldier=Oorlogsveteraan
+model.unit.veteranSoldier.dragoon=Veteraan Dragonder
 model.unit.jesuitMissionary.name=Jesuïtiese Sendeling
 model.unit.indenturedServant.name=Vrygekoopte Dienskneg
 model.unit.pettyCriminal.name=Kleinskaal Krimineel
 model.unit.brave.name=Kryger
 model.unit.brave.soldier=Gewapende kryger
+model.unit.colonialRegular.name=Koloniale beroepsoldaat
+model.unit.colonialRegular.soldier=Koloniale beroepsoldaat
+model.unit.colonialRegular.dragoon=Koloniale Kavelerie
+model.unit.kingsRegular.name=Koningsberoepsoldaat
+model.unit.kingsRegular.soldier=Koningsberoepsoldaat
+model.unit.kingsRegular.dragoon=Koningskavelarie
 model.unit.frigate.name=Fregat
 model.unit.privateer.name=Kaper
 model.unit.artillery.name=Artillerie
@@ -821,11 +909,13 @@
 model.goods.coats.name=Jasse
 model.goods.tradeGoods.name=Ruilware
 model.goods.tools.name=Gereedskap
+model.goods.muskets.name=Muskette
 model.goods.fish.name=Vis
 model.goods.bells.name=Klokke
 model.goods.crosses.name=Kruise
 model.goods.hammers.name=Hammers
 model.goods.unknown=Onbekend
+model.goods.boycotted=geboikot
 model.improvement.River.name=Rivier
 model.improvement.River.description=Rivier
 model.improvement.Road.name=Pad
@@ -889,29 +979,50 @@
 model.nationType.default.name=Geen
 model.nationType.default.shortDescription=Geen nasionale voordele
 model.nationType.trade.name=Handel
+model.nationType.cooperation.name=Samewerking
+model.nationType.immigration.name=Immigrasie
 model.nationType.conquest.name=Verowering
 model.nationType.naval.name=Kusnasie
 model.nationType.building.name=Gebou
+model.nationType.agriculture.name=Landbou
 model.nationType.apache.name=Apache
+model.nationType.apache.description=Die Apache nasie
+model.nationType.arawak.name=Arawakke
+model.nationType.arawak.description=Die Arowak nasie
+model.nationType.aztec.name=Asteke
+model.nationType.aztec.description=Die Asteek nasie
+model.nationType.cherokee.name=Cherokee
+model.nationType.cherokee.description=Die Cherokee nasie
 model.nationType.inca.name=Inka
 model.nationType.inca.description=Die Inka nasie
+model.nationType.iroquois.name=Irokese
+model.nationType.iroquois.description=Die Irokee nasie
+model.nationType.sioux.name=Sioux
+model.nationType.sioux.description=Die Sioux nasie
+model.nationType.tupi.name=Tupi
+model.nationType.tupi.description=Die Tupi nasie
 lostCityRumour.ExpeditionVanishes=U ekspedisie het in die niet verdwyn!
 model.buildableType.nothing.name=Niks
 model.building.TownHall.name=Stadsaal
 model.building.LumberMill.name=Saagmeule
 model.building.IronWorks.name=Metaalsmeltery
+model.building.CigarFactory.name=Sigaarfabriek
+model.building.RumFactory.name=Rumfabriek
 model.building.Schoolhouse.name=Skool
 model.building.College.name=Kollege
 model.building.University.name=Universiteit
+model.building.Armory.name=Wapenskut
 model.building.Magazine.name=Wapenfabriek
 model.building.Arsenal.name=Arsenaal
 model.building.Chapel.name=Kapel
 model.building.Church.name=Kerk
 model.building.Cathedral.name=Katedraal
+model.building.Stockade.name=Palasade
 model.building.Fort.name=Fort
 model.building.Fortress.name=Vesting
 model.building.Depot.name=Depot
 model.building.Warehouse.name=Pakhuis
+model.building.WarehouseExpansion.name=Pakhuis uitbreiding
 model.building.Country.name=Grasland
 model.building.Stables.name=Stalle
 model.building.Docks.name=Dokke
@@ -919,6 +1030,7 @@
 model.building.Shipyard.name=Skeepswerf
 model.building.PrintingPress.name=Drukkery
 model.building.Newspaper.name=Koerant
+model.building.CustomHouse.name=Doannehuis
 model.foundingFather.adamSmith.name=Adam Smith
 model.foundingFather.adamSmith.birthAndDeath=1723-1790
 model.foundingFather.jacobFugger.name=Jacob Fugger II
@@ -969,6 +1081,7 @@
 model.foundingFather.bartolomeDeLasCasas.name=Bartolome de las Casas
 model.foundingFather.trade=Handel
 model.foundingFather.exploration=Verkenning
+model.foundingFather.military=Leër
 model.foundingFather.political=Politiek
 model.foundingFather.religious=Religieus
 model.equipment.indian.horses.name=Perde
@@ -979,10 +1092,14 @@
 model.equipment.horses.add=Bestyg
 model.equipment.horses.remove=Afstap
 model.equipment.horses.none=geen perde
+model.equipment.indian.muskets.name=Muskette
 model.equipment.indian.muskets.add=Bewapen
 model.equipment.indian.muskets.remove=Ontwapen
+model.equipment.indian.muskets.none=geen muskette
+model.equipment.muskets.name=Muskette
 model.equipment.muskets.add=Bewapen
 model.equipment.muskets.remove=Ontwapen
+model.equipment.muskets.none=geen muskette
 model.equipment.tools.name=Gereedskap
 model.equipment.tools.add=Met gereedskap uitrus
 model.equipment.tools.remove=Gereedskap wegneem
@@ -998,6 +1115,7 @@
 colopedia.buildings.notes=Notas
 colopedia.buildings.workplaces=Werkplekke
 colopedia.terrain.terrainImage=Terrein beeld
+colopedia.terrain.defenseBonus=Verdedigingsbonus
 colopedia.terrain.resource=Moontlike grondstof
 colopedia.terrain.production=Produksie
 colopedia.terrain.description=Omskrywing:
@@ -1036,6 +1154,7 @@
 report.indian.location=Ligging van die nedersetting
 report.indian.tension=Spanning
 report.labour=Arbeidsrapport
+report.labour.allColonists=Alle Koloniste
 report.labour.summary=Opsomming
 report.labour.teacher=dosent
 report.labour.sutdent=student
@@ -1058,6 +1177,7 @@
 report.numberOfColonies=Aantal kolonies
 report.numberOfUnits=Aantal eenhede
 report.militaryStrength=Militêre mag
+report.navalStrength=Vlootsterkte
 report.requirements.met=Aan alle voorwaardes is voldoen.
 report.exploration.nameOfRegion=Naam van die gebied
 report.exploration.typeOfRegion=Tipe gebied
@@ -1084,9 +1204,13 @@
 model.source.attackBonus.name=Aanvalsbonus
 model.source.finalResult.name=Eindresultaat
 model.source.inColony.name=In kolonie
+model.source.Stockade.name=Palasade
+model.source.Fort.name=Fort
 model.source.inSettlement.name=In nedersetting
 model.source.inCapital.name=In hoofstad
 shipName.0.0=Bekende skip
+model.region.arctic=Arktiese
+model.region.antarctic=Antarktiese
 model.region.pacific=Stille Oseaan
 model.region.atlantic=Atlantiese Oseaan
 model.region.northAtlantic=Noord-Atlantiese Oseaan
@@ -1113,3 +1237,7 @@
 model.region.southWest.name=Suid-wes
 model.region.west.name=Wes
 model.region.northWest.name=Noord-wes
+installer.SourceCode=Bronkode
+installer.Music=Musiek
+installer.SoundEffects=Klankeffekte
+installer.MovieClips=Filmsnitte

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ar.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ar.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ar.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -700,6 +700,7 @@
 highseas.text=لقد وصلنا إلى أعالي البحار، فخامتك. هل نبحر إلى أوروبا؟
 highseas.yes=نعم، بثبات كما تسير.
 highseas.no=لا، دعنا نبق في هذه المياه.
+# Fuzzy
 disembark.text=تحية يا بحار، هل أنت متأكد أنك تريد الرحيل؟
 embark.text=من فضلك اختر السفينة التي تريد الرحيل عليها:
 embark.cancel=لا شيء

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_arz.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_arz.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_arz.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -3,59 +3,64 @@
 # Author: Meno25
 
 HeaderFont=ShadowedBlack.ttf
-mainmenu=القائمة الرئيسية
+mainmenu=القائمه الرئيسية
 ok=موافق
-cancel=إلغاء
-reset=إعادة ضبط
+cancel=ألغِ
+reset=إعاده ضبط
 load=تحميل
 save=حفظ
 display=عرض
 yes=نعم
 no=لا
-close=إغلاق
+close=أغلق
 options=الخيارات
 and=و
-unload=تنزيل
+unload=ألغِ التحميل
 fill=حمل
-rename=إعادة تسمية
+rename=أعد التسمية
 details=التفاصيل
 abilities=قدرات
 modifiers=معدلات
 true=صواب
 false=خطأ
 more=المزيد...
-none=لا شىء
-colonyNotFound=غير قادر على إيجاد المستعمرة %colony%!
+none=لا شيء
+notApplicable.short=غير مطبق
+colonyNotFound=غير قادر على إيجاد المستعمره %colony%!
 list.add=أضف
 list.remove=أزل
 list.up=أعلى
 list.down=أسفل
 file.browse=تصفح
-option.remove=إزالة
+option.remove=أزل
 width=عرض
 height=ارتفاع
 integerAboveZero=من فضلك استخدم رقما صحيحا أكبر من الصفر.
-newLanguageSelected=ضبط اللغة إلى %language%. ستحتاج إلى إعادة تشغيل اللعبة لكى تصبح التغييرات فعالة.
-autodetectLanguageSelected=لقد اخترت الآن أن يتم كشف اللغة تلقائيا. هذا سيتم المرة القادمة التى تعيد فيها تشغيل اللعبة.
-singlePlayerGame=لعبة لاعب وحيد
-joinMultiPlayerGame=انضم للعبة متعددة اللاعبين
-startMultiplayerGame=ابدأ لعبة متعددة اللاعبين
+newLanguageSelected=ضبط اللغه إلى %language%. ستحتاج إلى إعاده تشغيل اللعبه لكى تصبح التغييرات فعاله.
+autodetectLanguageSelected=لقد اخترت الآن أن يتم كشف اللغه تلقائيا. هذا سيتم المره القادمه التى تعيد فيها تشغيل اللعبه.
+singlePlayerGame=لعبه لاعب وحيد
+joinMultiPlayerGame=انضم للعبه متعدده اللاعبين
+startMultiplayerGame=ابدأ لعبه متعدده اللاعبين
 name=اسم
 host=مضيف
 port=منفذ
 players=لاعبون
-playerNation=%nation% الخاصة ب%player%
-gameState=حالة اللعبة
+playerNation=%nation% الخاصه ب%player%
+gameState=حاله اللعبة
 startServerOnPort=ابدأ الخادم على المنفذ
 publicServer=خادم عام
 defaultPlayerName=اسم اللاعب
-getServerList=عرض قائمة الخادم
+getServerList=عرض قائمه الخادم
 connect=توصيل
 additionalNations=اسمح بأمم إضافية
 selectAdvantages=اختر الميزات الوطنية
 useAdvantages=استخدم الميزات الوطنية
 singlePlayerNo=لاعبون أوروبيون
 multiPlayerNo=لاعبون أوروبيون
+availability=التوفر
+nationState.AVAILABLE=متوفر
+nationState.AI_ONLY=AI فقط
+nationState.NOT_AVAILABLE=غير متوفر
 small=صغير
 medium=متوسط
 large=كبير
@@ -90,6 +95,14 @@
 gameOptions=خيارات اللعبة
 mapGeneratorOptions=إعدادات الخريطة
 iAmReady=أنا جاهز
+playerOptions.selectPlayers=اختر اللاعبين
+playerOptions.europeanPlayers=لاعبون أوروبيون
+playerOptions.nativePlayers=لاعبون وطنيون
+playerOptions.NONE=لا شيء
+playerOptions.FIXED=مثبتة
+playerOptions.SELECTABLE=قابله للاختيار
+playerOptions.selectColors=اختر الألوان
+playerOptions.nationalAdvantages=ميزات وطنية
 player=لاعب
 nation=أمة
 color=لون
@@ -97,12 +110,12 @@
 moves=ينقل:
 sonsOfLiberty=أبناء الحرية
 tory=توري
-surroundingArea=المنطقة المحيطة
+surroundingArea=المنطقه المحيطة
 building=مبنى
 buildings=مباني
 goods=بضائع
 goldAmount=%amount% ذهب
-cargoOnCarrier=الشحنة على الناقلة
+cargoOnCarrier=الشحنه على الناقلة
 cargoOnCarrierLong=الشحنة على %name% (%space% يسار)
 outsideColony=خارج المستعمرة
 colonyPanel.buyBuilding=اشتر البناية
@@ -633,6 +646,7 @@
 highseas.text=لقد وصلنا إلى أعالى البحار، فخامتك. هل نبحر إلى أوروبا؟
 highseas.yes=نعم، بثبات كما تسير.
 highseas.no=لا، دعنا نبق فى هذه المياه.
+# Fuzzy
 disembark.text=تحية يا بحار، هل أنت متأكد أنك تريد الرحيل؟
 embark.text=من فضلك اختر السفينة التى تريد الرحيل عليها:
 embark.cancel=لا شيء

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_bg.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_bg.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_bg.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -538,6 +538,7 @@
 highseas.text=Достигнахме открито море, Ваше превъзходителство.  Да продължим ли към Европа?
 highseas.yes=Да, и попътен вятър!
 highseas.no=Не, ще плаваме в тези води.
+# Fuzzy
 disembark.text=Привет моряко, ще слезете ли на сушата?
 embark.text=Моля, изберете кораба, на който ще се качат:
 embark.cancel=никой

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_br.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_br.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_br.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -712,6 +712,7 @@
 highseas.text=En donvor emaomp, ho Meurdez. Ha skeiñ a reomp penn war-du Europa ?
 highseas.yes=Ya 'vat, deomp dezhi.
 highseas.no=Ket, chomomp en doureier-mañ.
+# Fuzzy
 disembark.text=Gourc'hemennoù merdeer, ha dilestrañ a fell deoc'h da vat ?
 embark.text=Dibabit al lestr a fell deoc'h mont warnañ :
 embark.cancel=Hini ebet

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_bs.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_bs.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_bs.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -347,6 +347,7 @@
 cli.experimentalAI=koristi probnu umjesto standardne UI
 cli.help=prikazuje ovu stranicu pomoći
 cli.load-savegame=učitaj navedenu spremljenu igru FILE
+cli.log-console=zapisivanje u konzolu pored datoteke
 cli.no-java-check=preskoči provjeru java verzije
 cli.no-memory-check=preskoči provjeru memorije
 cli.no-sound=pokreni FreeCol bez zvuka
@@ -696,6 +697,7 @@
 highseas.text=Došli smo do otvorenog mora, Vaša ekscelencijo. Da uzmemo kurs prema Evropi?
 highseas.yes=Da, samo polahko idi.
 highseas.no=Ne, ostanimo u ovim vodama.
+disembark.cancel=Ništa
 embark.cancel=Nema
 aMessageFromTheCrown=Poruka od Krune
 cashInTreasureTrain.order=Gotovina u kočiji s blagom
@@ -778,6 +780,7 @@
 scoutSettlement.speak=Traži razgovor s poglavicom
 scoutSettlement.attack=Napad
 scoutSettlement.expertScout=Naš izviđač je postao %unit%.
+scoutColony.text=Šta bi ste željeli uraditi sa %unit% u %colony%?
 scoutColony.negotiate=Pregovaraj s gradonačelnikom
 scoutColony.spy=Špijuniraj Koloniju
 scoutColony.attack=Napad

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ca.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ca.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ca.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -716,6 +716,7 @@
 highseas.text=Hem arribat a l'alta mar, la seva Exceŀlència. Hem de dirigir-nos a Europa?
 highseas.yes=Sí, tal qual va la nau.
 highseas.no=No, restem en aquestes aigües.
+# Fuzzy
 disembark.text=Salutacions navegant, esteu segur de voler desembarcar?
 embark.text=Si us plau, escolliu el vaixell en el que embarcar:
 embark.cancel=Cap

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_cs_CZ.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_cs_CZ.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_cs_CZ.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -712,6 +712,7 @@
 highseas.text=Dosáhli jsme volné moře, Vaše Excelence. Máme plout do Evropy?
 highseas.yes=Ano, vzhůru na cestu.
 highseas.no=Ne, zůstaňme v těchto vodách.
+# Fuzzy
 disembark.text=Zdravím námořníku, jsi si jist, že se chceš vylodit?
 embark.text=Prosím, zvol loď k nalodění:
 embark.cancel=Žádnou

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_da.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_da.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_da.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -713,7 +713,8 @@
 highseas.text=Vi er nået til det åbne hav, deres højhed. Skal vi sejle til Europa?
 highseas.yes=Ja, forsæt fremad.
 highseas.no=Nej, lad os blive i dette farvand.
-disembark.text=Vær hilset sejler, er du sikker på at du vil gå fra borde?
+disembark.text=Vær hilset sejler, vil du gå fra borde?
+disembark.cancel=Ingen
 embark.text=Vælg venligst skib du vil gå ombord i:
 embark.cancel=Intet
 aMessageFromTheCrown=Meddelelse fra kongehuset

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_de.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_de.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_de.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -760,14 +760,16 @@
 payForBuilding.text=Wollt Ihr wirklich %replace% Gold bezahlen, um das Gebäude fertig zu stellen?
 payForBuilding.yes=Ja, stellt es sofort fertig!
 payForBuilding.no=Nein, das ist zu viel.
+indianSettlement.nameUnknown=Unbekannt
 indianSettlement.learnableSkill=In dieser Siedlung können unsere Kolonisten die folgende Fähigkeit erwerben:
 indianSettlement.highlyWanted=Die Einwohner dieser Siedlung sind sehr interessiert an:
 indianSettlement.otherWanted=Andere Waren, die wir in dieser Siedlung verkaufen können:
-# Fuzzy
 indianSettlement.noMoreSkill=Wir haben unser Wissen schon anderen Europäern beigebracht, wir haben nichts mehr zu lehren!
 indianSettlement.cantLearnSkill=Wir werden Euren %unit% nicht zum %skill% ausbilden.
 indianSettlement.skillUnknown=unbekannt
 indianSettlement.skillNone=nichts
+indianSettlement.tensionUnknown=Unbekannt
+indianSettlement.wantedGoodsUnknown=Unbekannt
 indianSettlement.alarm.happy=Die Angehörigen des Volks der %nation% tanzen fröhlich um ihr Lagerfeuer und singen die Lieder ihrer Vorfahren.
 indianSettlement.alarm.content=Die Angehörigen des Volks der %nation% sind zur Zeit mit Arbeit beschäftigt. Ihre Kinder spielen fröhlich Verstecken.
 indianSettlement.alarm.displeased=Die Angehörigen des Volks der %nation% sind zur Zeit mit Arbeit beschäftigt. Ihre Kinder sind nirgendwo zu sehen, und ihre Ältesten runzeln die Stirn.
@@ -1419,6 +1421,7 @@
 model.nation.spanish.ruler=Philip II.
 model.nation.spanishREF.name=Königliches spanisches Expeditionskorps
 model.nation.spanishREF.ruler=Philip III.
+model.nation.swedish.europe=Stockholm
 model.nation.swedish.name=Schweden
 model.nation.swedish.newLandName=Neu-Schweden
 model.nation.swedishREF.name=Königliches schwedisches Expeditionskorps

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_el.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_el.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_el.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -132,6 +132,7 @@
 colonyPanel.buildQueue=Σειρά Κτισίματος
 colonyPanel.clickToBuild=Πατήστε στη μεριά κτιρίων για να επιλέξτε ένα κτίριο ή μια μονάδα για να χτίσετε.
 colonyPanel.compactView=Συμπαγής άποψη
+colonyPanel.showAll=Προβολή όλων
 nothing=Τίποτα
 turns=Γύροι
 turnsToComplete.short=(Γύροι: %number%)
@@ -929,8 +930,7 @@
 model.history.DISCOVER_NEW_WORLD=Ανακάλυψες το Νέο Κόσμο.
 model.history.DISCOVER_REGION=Ανακαλύπτεις το %region%.
 model.history.MEET_NATION=Συναντάς το %nation%.
-# Fuzzy
-model.history.CITY_OF_GOLD=Ανακαλύπτεις μια χαμένη πόλη χρυσού, και έναν θησαυρό %treasure%χρυσού
+model.history.CITY_OF_GOLD=Ανακαλύπτεις μια %city%, μια από τις Επτά Πόλεις του Χρυσού, και έναν θησαυρό χρυσού %treasure%.
 model.history.FOUND_COLONY=Κατοχυρώνεις την αποικία του %colony%.
 model.history.ABANDON_COLONY=Εγκαταλείπεις την αποικία του %colony%.
 model.history.CONQUER_COLONY=Κυριεύεις την %nation% αποικία του %colony%.

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_eo.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_eo.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_eo.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -713,6 +713,7 @@
 highseas.text=Ni atingas la altajn marojn, Moŝto. Ĉu ni nun vojaĝas al Eŭropo?
 highseas.yes=Jes, kontinuu al la destino.
 highseas.no=Ne, ni volas resti en ĉi tiu maro.
+# Fuzzy
 disembark.text=Saluton maristo, ĉu vi certas ke vi volas elŝipiĝi?
 embark.text=Bonvolu elekti la ŝipon kiun vi volas forsendi:
 embark.cancel=Neniu

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_es_ES.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_es_ES.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_es_ES.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -714,6 +714,7 @@
 highseas.text=Hemos alcanzado alta mar, Su Excelencia.  ¿Quiere que naveguemos hacia Europa?
 highseas.yes=Sí, que siga tal y como va.
 highseas.no=No, permanezcamos en estas aguas.
+# Fuzzy
 disembark.text=Saludos marinero, ¿estás seguro de querer desembarcar?
 embark.text=Por favor, elija el barco en el que embarcar:
 embark.cancel=Ninguno

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_fi.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_fi.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_fi.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -630,6 +630,7 @@
 highseas.text=Olemme saapuneet avomerelle. Purjehdimmeko Eurooppaan?
 highseas.yes=Kyllä
 highseas.no=Pysykää näillä vesillä
+# Fuzzy
 disembark.text=Tervehdys purjehtija. Haluatko nousta maihin?
 embark.text=Laiva johon haluat nousta
 embark.cancel=Ei mikään

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_fr.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_fr.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_fr.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -723,7 +723,8 @@
 highseas.text=Nous avons atteint la haute mer, Excellence, devons nous cingler vers l'Europe ?
 highseas.yes=Oui, droit devant.
 highseas.no=Non, demeurons encore dans ces eaux.
-disembark.text=Salutations, marin ! Êtes vous certain de vouloir débarquer ?
+disembark.text=Salutations, marin, voulez-vous débarquer ?
+disembark.cancel=Aucun
 embark.text=Choisissez le navire sur lequel vous voulez embarquer :
 embark.cancel=Aucun
 aMessageFromTheCrown=Un message de la Couronne

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_gl.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_gl.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_gl.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -712,7 +712,8 @@
 highseas.text=Chegamos a alta mar, súa Excelencia.  Debemos navegar cara a Europa?
 highseas.yes=Si, levantade áncoras.
 highseas.no=Non, permaneceremos nestas augas.
-disembark.text=Saúdos mariñeiro, estás seguro de querer desembarcar?
+disembark.text=Saúdos mariñeiro, queres desembarcar?
+disembark.cancel=Ningún
 embark.text=Por favor, escolle o navío no que che gustaría embarcar:
 embark.cancel=Ningún
 aMessageFromTheCrown=Unha mensaxe da Coroa

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_hsb.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_hsb.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_hsb.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -620,6 +620,7 @@
 unit.state.10=Pomjeńšić
 unit.state.12=ličba
 activateUnit=Jednotku aktiwizować
+fortifyUnit=Wobhrodźić
 disarm=Wotbrónić
 arm=Wobrónić
 mount=Na konja zlězć

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_hu.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_hu.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_hu.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -131,6 +131,7 @@
 colonyPanel.buildQueue=Építési lista
 colonyPanel.clickToBuild=Kattints az építési területre az építendő épület vagy egység kiválasztásához!
 colonyPanel.compactView=Kompakt nézet
+colonyPanel.showAll=Összes megjelenítése
 nothing=Semmi
 turns=kör
 turnsToComplete.short=(Körök: %number%)
@@ -444,6 +445,7 @@
 clientOptions.gui.displayBorders.shortDescription=A határok mutatása vagy elrejtése.
 clientOptions.gui.displayGrid.name=Rácsháló megjelenítése
 clientOptions.gui.displayGrid.shortDescription=A rácsháló megjelenítése vagy elrejtése.
+clientOptions.gui.unitLastMoveDelay.name=Egység utolsó mozgásának késleltetése
 clientOptions.gui.displayAnimations.name=Animációk megjelenítése
 clientOptions.gui.displayAnimations.shortDescription=Az animációk megjelenítése vagy elrejtése.
 clientOptions.gui.moveAnimationSpeed.name=Baráti egységek mozgatása
@@ -711,7 +713,8 @@
 highseas.text=Alázattal jelentem hogy nyílt vizekre értünk. Indulhatunk Európa felé?
 highseas.yes=Igen, irány Európa!
 highseas.no=Nem, maradjunk itt.
-disembark.text=Üdv tengerész! Bizonyosan partra kivánsz szállni?
+disembark.text=Üdv tengerész! Szeretnél partra szállni?
+disembark.cancel=Nincs
 embark.text=Válaszd ki a hajót amelyikre fel akarsz szállni:
 embark.cancel=Egyik sem
 aMessageFromTheCrown=Üzenet Õfelségétõl
@@ -779,8 +782,7 @@
 indianSettlement.learnableSkill=A következõ mesterséget tanulhatod ezen a településen:
 indianSettlement.highlyWanted=Ezen a településen nagy a kereslet erre:
 indianSettlement.otherWanted=Kereslet van még ezekre is:
-# Fuzzy
-indianSettlement.noMoreSkill=A mesterséget már megtanítottuk más európaiaknak. Sajnos nem tudunk többet tanítani!
+indianSettlement.noMoreSkill=A mesterséget már megtanítottuk az európaiaknak, sajnos nem tudunk többet tanítani!
 indianSettlement.cantLearnSkill=A %unit% nem méltó rá, hogy megtanulja a %skill% mesterségét.
 indianSettlement.skillUnknown=Ismeretlen
 indianSettlement.skillNone=Nincs

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_it_IT.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_it_IT.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_it_IT.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -134,6 +134,7 @@
 colonyPanel.buildQueue=Coda di Costruzione
 colonyPanel.clickToBuild=Clicca sul sito di costruzione per selezionare un edificio o un'unità da creare.
 colonyPanel.compactView=Vista compatta
+colonyPanel.showAll=Mostra tutto
 nothing=Niente
 turns=Turni
 turnsToComplete.short=(Turni: %number%)
@@ -179,11 +180,9 @@
 negotiationDialog.nothing=niente
 negotiationDialog.offerAccepted=Il contingente %nation% ha accettato la tua generosa offerta.
 negotiationDialog.offerRejected=Il contingente %nation% ha rifiutato la tua generosa offerta.
-# Fuzzy
-transaction.purchase=Acquisto di %amount% unità di %goods% al prezzo unitario di %gold% pezzi d'oro.
+transaction.purchase=Acquista %amount% unità di %goods% @%gold%
 transaction.price=Totale:\t%gold% pezzi d'oro
-# Fuzzy
-transaction.sale=Vendita di %amount% unità di %goods% al prezzo unitario di %gold% pezzi d'oro.
+transaction.sale=Vendi di %amount% unità di %goods% @%gold%
 transaction.tax=-%tax%%:\t%gold% pezzi d'oro
 transaction.net=Al netto:\t%gold% pezzi d'oro
 wary=Timorosi
@@ -429,6 +428,8 @@
 clientOptions.gui.languageOption.name=Lingua
 clientOptions.gui.languageOption.shortDescription=Imposta la lingua del gioco
 clientOptions.gui.languageOption.autoDetectLanguage=Riconoscimento automatico della lingua
+clientOptions.gui.guiMinNumberToDisplayGoods.name=Nascondi i beni in deposito se inferiori a:
+clientOptions.gui.guiMinNumberToDisplayGoods.shortDescription=I beni verranno mostrati nella colonia solo se in quantità uguale o superiore a questo numero
 clientOptions.gui.guiMinNumberToDisplayGoodsCount.name=Mostra le quantità di beni a partire da:
 clientOptions.gui.guiMinNumberToDisplayGoodsCount.shortDescription=Le quantità di beni saranno indicate in cifre a partire da questo numero.
 clientOptions.gui.mapScrollOnDrag.name=Scorri la mappa durante il trascinamento delle unità
@@ -447,6 +448,8 @@
 clientOptions.gui.displayBorders.shortDescription=Mostrare o no i bordi?
 clientOptions.gui.displayGrid.name=Mostra griglia
 clientOptions.gui.displayGrid.shortDescription=Visualizzare o no la griglia per impostazione predefinita?
+clientOptions.gui.unitLastMoveDelay.name=Ritardo Ultima Mossa Unità
+clientOptions.gui.unitLastMoveDelay.shortDescription=Se attiva, determina una piccola pausa in corrispondenza dell'ultima mossa di un'unità.
 clientOptions.gui.displayAnimations.name=Mostra Animazioni
 clientOptions.gui.displayAnimations.shortDescription=Mostrare o no le animazioni?
 clientOptions.gui.moveAnimationSpeed.name=Velocità Animazione (Giocatore)
@@ -714,7 +717,8 @@
 highseas.text=Siamo in alto mare, Sua Eccellenza. Fare vela per l'Europa?
 highseas.yes=Sì, per questa rotta.
 highseas.no=No, restiamo in queste acque.
-disembark.text=Salve, marinaio! Sei sicuro di voler sbarcare?
+disembark.text=Salve navigatore, desideri sbarcare?
+disembark.cancel=No
 embark.text=Scegli la nave su cui imbarcarti:
 embark.cancel=Nessuna
 aMessageFromTheCrown=Messaggio dalla Corona
@@ -763,6 +767,10 @@
 selectDestination.text=Scegli la destinazione
 selectDestination.cancel=Rimani dove sei
 selectDestination.failed=Impossibile trovare un percorso per %destination%!
+selectDestination.onlyMyColonies=Mostra solo le mie colonie
+selectDestination.sortByOwner=Ordina per proprietario
+selectDestination.sortByName=Ordina per nome
+selectDestination.sortByDistance=Ordina per distanza
 chooseThisFoundingFather=Scegli questo Padre Fondatore
 notEnoughGold=Non abbiamo abbastanza oro!
 inappropriateOrder=Quest'ordine non può essere impartito!
@@ -778,8 +786,7 @@
 indianSettlement.learnableSkill=In questo insediamento puoi apprendere le seguenti abilità:
 indianSettlement.highlyWanted=Questo insediamento è molto interessato al commercio di:
 indianSettlement.otherWanted=Altri beni che si possono scambiare in questo insediamento sono:
-# Fuzzy
-indianSettlement.noMoreSkill=Quest'abilità è già stata insegnata ad altri Europei, non abbiamo nient'altro da insegnare!
+indianSettlement.noMoreSkill=Quest'abilità è già stata insegnata agli Europei, non abbiamo nient'altro da insegnare!
 indianSettlement.cantLearnSkill=Non insegneremo a %unit% il mestiere di %skill%.
 indianSettlement.skillUnknown=Sconosciuto
 indianSettlement.skillNone=Nessuno
@@ -795,6 +802,7 @@
 indianSettlement.mission.displeased=La missione è stata fondata, ma il popolo %nation% si ritiene offeso.
 indianSettlement.mission.angry=Missionario catturato, il popolo %nation% rifiuta la nuova religione.
 indianSettlement.mission.hateful=Missionario sacrificato, il popolo %nation% schernisce la nuova religione.
+indianSettlement.mission.noDenounce=Il popolo %nation% respinge le accuse di eresia, e giustizia il tuo missionario come falso profeta.
 indianSettlement.capitalBurned=Hai distrutto %name%, la capitale del popolo %nation%. Il popolo %nation% si arrende alla tua potenza!
 learnSkill.text=Ti piacerebbe vivere tra i Nativi e diventare un %skill%?
 learnSkill.yes=Sì, mi piacerebbe
@@ -811,7 +819,6 @@
 scoutSettlement.speakBeads=Benvenuto, viaggiatore. Porta queste pietre preziose (valgono %amount% unità d'oro) al tuo capo, come offerta di pace.
 scoutSettlement.speakNothing=Siamo sempre lieti di dare il benvenuto ai viaggiatori.
 scoutSettlement.speakDie=Hai infranto i sacri tabù della tribù! Ti legheremo e ti useremo come bersaglio per allenarci.
-# Fuzzy
 scoutSettlement.tributeAgree=Accettiamo di pagare %amount% unità d'oro per mantenere la pace, ma non provate a chiedercelo una seconda volta!
 scoutSettlement.tributeDisagree=Non ci pieghiamo alle vostre richieste. E ora, lasciate la nostra terra!
 scoutSettlement.expertScout=Il tuo esploratore è diventato un %unit%.
@@ -1003,8 +1010,7 @@
 model.unit.cashInTreasureTrain.colonial=Un tesoro di %amount% pezzi d'oro è giunto in Europa. Sono stati incassati %cashInAmount% pezzi d'oro.
 model.unit.cashInTreasureTrain.independent=Un tesoro di %amount% è stato aggiunto al patrimonio nazionale.
 model.unit.gift=%player% offre in dono %amount% %type% a %colony%.
-# Fuzzy
-model.unit.noMoreTools=Il nostro Pioniere ha esaurito tutti i suoi attrezzi ed è ridiventato %unit%.
+model.unit.noMoreTools=%location%: Il nostro Pioniere ha esaurito tutti i suoi attrezzi ed è ridiventato %unit%.
 model.unit.buildingDamaged=%building% di %colony% distrutta da %enemyUnit% %enemyNation%!
 model.unit.goodsStolen=%enemyUnit% %enemyNation% ruba %amount% unità di %goods% alla colonia di %colony%!
 model.unit.indianPlunder=%enemyUnit% %enemyNation% rapina %amount% pezzi d'oro dalla colonia di %colony%!
@@ -1200,8 +1206,7 @@
 model.unit.seasonedScout.scout=Esploratore Esperto
 model.unit.hardyPioneer.name=Pioniere Esperto
 model.unit.hardyPioneer.pioneer=Pioniere Esperto
-# Fuzzy
-model.unit.hardyPioneer.noMoreTools=Il tuo Pioniere Esperto ha esaurito tutti i suoi Attrezzi
+model.unit.hardyPioneer.noMoreTools=%location%: Il tuo Pioniere Esperto ha esaurito tutti i suoi Attrezzi
 model.unit.veteranSoldier.name=Soldato Veterano
 model.unit.veteranSoldier.soldier=Soldato Veterano
 model.unit.veteranSoldier.captured=%location%: Un Soldato %nation% è stato catturato da %enemyUnit% %enemyNation% e ha perso il suo grado di Veterano!
@@ -1500,8 +1505,7 @@
 model.history.DISCOVER_NEW_WORLD=Hai scoperto il Nuovo Mondo.
 model.history.DISCOVER_REGION=Hai scoperto %region%.
 model.history.MEET_NATION=Hai incontrato il popolo %nation%.
-# Fuzzy
-model.history.CITY_OF_GOLD=Hai scoperto una città perduta, e un tesoro di %treasure% unità d'oro.
+model.history.CITY_OF_GOLD=Hai scoperto %city%, una delle Sette Città dell'Oro, e un tesoro di %treasure% unità d'oro.
 model.history.FOUND_COLONY=Hai fondato la colonia di %colony%.
 model.history.ABANDON_COLONY=Hai abbandonato la colonia di %colony%.
 model.history.CONQUER_COLONY=Hai conquistato la colonia di %colony% (%nation%).
@@ -1527,11 +1531,16 @@
 model.diplomacy.alliance.declared=Sua Eccellenza, il Governo %nation% è nostro alleato!
 model.diplomacy.alliance.others=Sua Eccellenza, il Governo %attacker% è alleato del Governo %defender%.
 model.diplomacy.spanishSuccession=Sua Eccellenza, in Europa la Guerra di Successione Spagnola è terminata. Nel trattato di Utrecht, lo stato %loserNation% è costretto a cedere tutte le sue colonie nel Nuovo Mondo al contingente %nation%!
+model.diplomacy.dead.european=Sua Eccellenza, il governo %nation% ha dichiarato un ritiro incondizionato dal Nuovo Mondo!
+model.diplomacy.dead.native=Sua Eccellenza, il popolo %nation% è stato sterminato.
 lostCityRumour.BurialGround=Abbiamo profanato la sacra necropoli del popolo %nation%! Morirai per questo!
 lostCityRumour.ExpeditionVanishes=La nostra spedizione si è persa senza lasciare traccia!
 lostCityRumour.Nothing=Le leggende circa la Città Perduta si sono rivelate essere soltanto questo: nient'altro che leggende!
+lostCityRumour.Learn=Il nostro %unit% ha acquisito esperienza e ora è un %type%!
 lostCityRumour.TribalChief=Il capo di una piccola tribù ci regala bigiotteria del valore di %money% pezzi d'oro!
 lostCityRumour.Colonist=Abbiamo incontrato i sopravvissuti di una colonia abbandonata. In cambio di cibo, essi giurano fedeltà alla Corona!
+lostCityRumour.Ruins=Hai scoperto le rovine di una civiltà perduta. All'interno ci sono oro e manufatti per un valore di %money%!
+lostCityRumour.Cibola=Hai scoperto %city%, una delle Sette Città dell'Oro, e saccheggiato un tesoro pari a %money%! Muovi il Carro con Tesoro in una delle tue colonie per incassarlo, oppure portalo in Europa su un Galeone.
 lostCityRumour.FountainOfYouth=Abbiamo scoperto la Fonte della Giovinezza. I Coloni Europei ora affollano i nostri porti!
 lostCityRumour.FountainOfYouthWithoutEurope=Abbiamo scoperto la Fonte della Giovinezza.
 model.buildableType.nothing.name=Niente

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ja.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ja.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ja.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -451,6 +451,7 @@
 traderouteDialog.nameLabel=名前
 traderouteDialog.saveRoute=このルートを保存
 traderouteDialog.cancel=中止
+# Fuzzy
 disembark.text=やぁ、船乗りの方々。本当に陸揚げするかい？
 embark.cancel=なし
 cashInTreasureTrain.yes=受け入れる

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_mk.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_mk.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_mk.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -241,7 +241,7 @@
 menuBar.view.toggle=Превклучување на поглед
 menuBar.view.changeWindowedModeAction=На цел екран
 menuBar.view.zoomIn=Приближи
-menuBar.view.zoomOut=Оддачечи
+menuBar.view.zoomOut=Оддалечи
 menuBar.view.tradeRoutes=Трговски патишта...
 menuBar.view.findSettlement=Пронајди населба
 findSettlementDialog.name=Пронајди населба
@@ -263,7 +263,7 @@
 menuBar.colopedia.resource=Бонус ресурси
 menuBar.colopedia.unit=Единици
 menuBar.colopedia.goods=Стока
-menuBar.colopedia.skill=Вештини
+menuBar.colopedia.skill=Занаети
 menuBar.colopedia.building=Згради
 menuBar.colopedia.father=Основоположници
 menuBar.colopedia.nation=Нации
@@ -712,7 +712,8 @@
 highseas.text=Стасавме на отворено море, Ваше Превосходство. Да запловиме за Европа?
 highseas.yes=Да, држи така.
 highseas.no=Не, ајде да останеме во овие води.
-disembark.text=Здраво морепловецу, дали си сигурен дека сакаш да се симнеш на копно?
+disembark.text=Здраво морепловецу, дали сакаш да се симнеш на копно?
+disembark.cancel=Ниеден
 embark.text=Одберете брод на кој сакате да се качите:
 embark.cancel=Никој
 aMessageFromTheCrown=Порака од Круната
@@ -777,11 +778,11 @@
 payForBuilding.yes=Да
 payForBuilding.no=Не
 indianSettlement.nameUnknown=Непознато
-indianSettlement.learnableSkill=Следнава вештина може да се научи во оваа населба:
+indianSettlement.learnableSkill=Следниов занает може да се научи во оваа населба:
 indianSettlement.highlyWanted=Оваа населба е многу заинтересирана за тргување со:
 indianSettlement.otherWanted=Друга стока со која може да се тргува во ова населба:
-indianSettlement.noMoreSkill=Веќе ги научивме Европејците на таа вештина, и немаме што повеќе да ве учиме.
-indianSettlement.cantLearnSkill=Нема да обучиме %unit% со вештините на %skill%.
+indianSettlement.noMoreSkill=Веќе ги научивме Европејците на тој занает, и немаме што повеќе да ве учиме.
+indianSettlement.cantLearnSkill=Нема да обучиме %unit% за да стане %skill%.
 indianSettlement.skillUnknown=Непознато
 indianSettlement.skillNone=Нема
 indianSettlement.tensionUnknown=Непознато
@@ -1000,7 +1001,7 @@
 model.unit.unitDemotedToUnarmed=%location%: %nation% %oldName% беше снижен на %unit% по поразот во битката против %enemyNation% %enemyUnit%.
 model.unit.unitDestroyed=%location%: %unit% на %nation%те беше уништен од %enemyUnit% на %enemyNation%те!
 model.unit.unitCaptured=%location%: %unit% на %nation%те беше заробен од %enemyUnit% на %enemyNation%те!
-model.unit.newConvertFromAttack=Исплашен %unit% од %nation%те ви се приклучува вам!
+model.unit.newConvertFromAttack=Исплашен %unit% на %nation%те ви се приклучува вам!
 model.unit.cashInTreasureTrain.colonial=Во Европа пристигна богатство од %amount% злато. Со ова заработивте %cashInAmount% злато.
 model.unit.cashInTreasureTrain.independent=Во државната каса беше придодадено богатство од %amount%.
 model.unit.gift=%player% праќа подарок од %amount% %type% на %colony%.
@@ -1245,7 +1246,7 @@
 model.unit.unarmed.name=Невооружен
 model.unit.armed.name=Вооружен
 model.unit.mounted.name=Коњички
-model.unit.nationUnit=%unit% од %nation%те
+model.unit.nationUnit=%unit% на %nation%те
 model.unit.workingAs=Работи како
 model.unit.expertFarmer.workingAs=Земјоделец
 model.unit.expertFisherman.workingAs=Рибар
@@ -1269,7 +1270,7 @@
 model.unit.hardyPioneer.workingAs=Пионер
 model.unit.veteranSoldier.workingAs=Војник
 model.unit.jesuitMissionary.workingAs=Мисионер
-model.unit.freeColonist.description=Слободниот колонист е доселеник без определени вештини. Меѓутоа слободните колонисти можат да станат стручни единици ако работат во вашата колонија, или ако посетат некоја индијанска населба.
+model.unit.freeColonist.description=Слободниот колонист е доселеник без определен занает. Меѓутоа слободните колонисти можат да станат стручни единици ако работат во вашата колонија, или ако посетат некоја индијанска населба.
 model.unit.expertFarmer.description=Искусниот земјоделец е стручен произведувач на храна.
 model.unit.expertFisherman.description=Искусниот рибар е стручен во ловење риба, која автоматски се претвора во храна.
 model.unit.expertFurTrapper.description=Искусниот ловец на крзно изработува крзна.
@@ -1704,7 +1705,7 @@
 colopedia.unit.school=Потребно училиште за обука:
 colopedia.unit.capacity=Капацитет:
 colopedia.unit.movement=Движење:
-colopedia.unit.productionBonus=Подификатор(и) на производството:
+colopedia.unit.productionBonus=Модификатор(и) на производството:
 colopedia.unit.requirements=Барања:
 colopedia.goods.isFarmed=Се одгледува:
 colopedia.goods.improvedBy=Се подобрува со:
@@ -1726,7 +1727,7 @@
 colopedia.nationType.numberOfSettlements.high=Голем
 colopedia.nationType.typeOfSettlements=Тип на населби:
 colopedia.nationType.regions=Населени области:
-colopedia.nationType.skills=Обучувани вештини:
+colopedia.nationType.skills=Занаети:
 report.continentalCongress.title=Основоположници
 report.continentalCongress.none=(нема)
 report.continentalCongress.recruiting=Регрутирање
@@ -1738,7 +1739,7 @@
 report.indian.typeOfSettlements=Тип на населби:
 report.indian.numberOfSettlements=Познати населби:
 report.indian.location=Местоположба на населбата
-report.indian.skillTaught=Обучувана вештина:
+report.indian.skillTaught=Научен занает:
 report.indian.tension=Тензии
 report.indian.tradeInterests=Трговски интереси
 report.labour=Извештај за трудот

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nb_NO.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nb_NO.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nb_NO.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -595,6 +595,7 @@
 highseas.text=Vi har nådd åpent hav, deres nåde. Skal vi sette kurs mot Europa?
 highseas.yes=Ja, fortsett på innslått kurs.
 highseas.no=Nei, la oss bli igjen i disse vannene.
+# Fuzzy
 disembark.text=Vær hilset, sjømann. Er du sikker på at du ønsker å forlate skipet?
 embark.text=Velg hvilket skip du vil bemanne:
 embark.cancel=Ingen

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nds.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nds.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nds.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -489,6 +489,7 @@
 highseas.text=Wi sünd op hoge See, Exzellenz. Schöölt wi Seils na Europa setten?
 highseas.yes=Jo, liek as de Wind geiht.
 highseas.no=Nee, wi wüllt in disse Waters blieven.
+# Fuzzy
 disembark.text=Moin Fohrensmann, wist du würklich vun Boord gahn?
 embark.text=Wähl dat Schipp, bi dat du an Boord gahn wist:
 embark.cancel=Keen

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nl.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nl.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nl.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -133,6 +133,7 @@
 colonyPanel.clickToBuild=Klik op de bouwplaats om een te bouwen gebouw of te produceren eenheid te selecteren.
 colonyPanel.compactView=Compacte weergave
 colonyPanel.showAll=Alles weergeven
+colonyPanel.unbuildable=%colony% kan geen %object% bouwen op dit moment. %object% is verwijderd uit de lijst met de bouwen objecten.
 nothing=Niets
 turns=beurten
 turnsToComplete.short=(Beurten: %number%)
@@ -157,6 +158,7 @@
 trainDialog.clickOn=Klik op een persoon om deze te trainen.
 trainDialog.done=Afgerond
 quitDialog.areYouSure.text=Weet u zeker dat u wilt stoppen?
+quitDialog.save.text=Wilt u het spel opslaan voordat u het programma afsluit?
 retireDialog.areYouSure.text=Weet u zeker dat u met pensioen wilt gaan?
 map.americas=Kaart van Amerika
 map.generate=Een willekeurige kaart genereren
@@ -715,7 +717,8 @@
 highseas.text=We hebben de grote oceaan bereikt, Uwe Hoogheid. Zullen we naar Europa varen?
 highseas.yes=Ja, recht zo die gaat.
 highseas.no=Nee, laten we hier blijven.
-disembark.text=Gegroet schipper, weet u zeker dat u van boord wilt?
+disembark.text=Gegroet zeeman. Wilt u van boord?
+disembark.cancel=Nee
 embark.text=Selecteer het schip waarop u wilt aanmonsteren:
 embark.cancel=Geen
 aMessageFromTheCrown=Een bericht van het koningshuis.

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nl_BE.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nl_BE.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nl_BE.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -712,6 +712,7 @@
 highseas.text=We hebben de diepzee bereikt, Excellentie. Zullen we naar Europa zeilen?
 highseas.yes=Ja, vaar rustig door.
 highseas.no=Neen, laat ons in deze wateren blijven.
+# Fuzzy
 disembark.text=Gegroet zeeman, ben je zeker dat je aan wal wil gaan?
 embark.text=Kies het schip waarop je wil stappen:
 embark.cancel=Geen

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nn.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nn.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_nn.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -598,6 +598,7 @@
 highseas.text=Me har nådd ope hav, Dykkar Høgvyrde. Skal me setja kurs for Europa?
 highseas.yes=Ja, hald fram med kursen.
 highseas.no=Nei, lat oss vera i desse farvatna.
+# Fuzzy
 disembark.text=Ver helsa sjømann, er du sikker på at du ønskjer å forlata skipet?
 embark.text=Vel kva skip du vil gå om bord på:
 embark.cancel=Ingen

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_oc.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_oc.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_oc.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -710,6 +710,7 @@
 highseas.text=Avèm atench la mar nauta, Excelléncia, nos cal singlar cap a Euròpa ?
 highseas.yes=Òc, drech dabant.
 highseas.no=Non, demoram encara dins aquestas aigas.
+# Fuzzy
 disembark.text=Salutacions, marinièr ! Sètz segur que volètz desbarcar ?
 embark.text=Causissètz lo vaissèl sulqual volètz embarcar:
 embark.cancel=Pas cap

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pl_PL.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pl_PL.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pl_PL.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -103,7 +103,7 @@
 playerOptions.europeanPlayers=Europejscy gracze
 playerOptions.nativePlayers=Gracze Tubylczy
 playerOptions.NONE=Brak
-playerOptions.FIXED=Naprawione
+playerOptions.FIXED=Przypisane
 playerOptions.SELECTABLE=Wybierz
 playerOptions.selectColors=Wybór Kolorów
 playerOptions.nationalAdvantages=Atuty Narodowe
@@ -177,11 +177,9 @@
 negotiationDialog.nothing=nic
 negotiationDialog.offerAccepted=%nation% zakceptowali twoją wspaniałomyślną propozycję.
 negotiationDialog.offerRejected=%nation% odrzucili twoją wspaniałomyślną ofertę.
-# Fuzzy
-transaction.purchase=Kup %amount% %goods% w cenie %gold%
+transaction.purchase=Kup %goods%w ilości %amount% za %gold%
 transaction.price=Cena:\t%gold%
-# Fuzzy
-transaction.sale=Sprzedaj %amount% %goods% za %gold%
+transaction.sale=sprzedaj %amount% %goods%  za %gold%
 transaction.tax=-%tax%%:\t%gold%
 transaction.net=Zysk netto:\t%gold%
 wary=Nieufny
@@ -340,6 +338,9 @@
 cli.check-savegame=sprawdź zapis gry pod względem spójności
 cli.debug=debuguj FreeCol
 cli.error.port=%string% to niedozwolony numer portu.
+cli.error.home.notExists=Katalog docelowy %string% nie istnieje.
+cli.error.home.noRead=Nie można odczytać %string%.
+cli.error.home.noWrite=Nie można zapisać na %string%.
 cli.experimentalAI=Użyj eksperymentalnego trybu AI zamiast standardowego
 cli.help=wyświetl ten ekran pomocy
 cli.no-java-check=pomiń test wersji javy
@@ -428,6 +429,8 @@
 clientOptions.gui.displayBorders.shortDescription=Włącz/Wyłącz domyślne wyświetlanie granic.
 clientOptions.gui.displayGrid.name=Wyświetl siatkę
 clientOptions.gui.displayGrid.shortDescription=Wyświetlanie siatki na mapie.
+clientOptions.gui.unitLastMoveDelay.name=Opóźnienie po ostatnim ruchu.
+clientOptions.gui.unitLastMoveDelay.shortDescription=Włącza lub wyłącza krótką pałzę po ostatnim ruchu jednostki.
 clientOptions.gui.displayAnimations.name=Wyświetl animacje
 clientOptions.gui.displayAnimations.shortDescription=Włącza/ wyłącza wyświetlanie animacji.
 clientOptions.gui.moveAnimationSpeed.name=Animacja jednostek przyjacielskich
@@ -763,8 +766,7 @@
 indianSettlement.learnableSkill=W tej wiosce można nauczyć się następujących zawodów:
 indianSettlement.highlyWanted=Ta wioska jest bardzo zainteresowana kupnem:
 indianSettlement.otherWanted=Ta wioska jest bardzo zainteresowana kupnem:
-# Fuzzy
-indianSettlement.noMoreSkill=Już przekazaliśmy ludziom z Europy naszą wiedzę. Niczego więcej już was nie nauczymy!
+indianSettlement.noMoreSkill=Już przekazaliśmy Europejczykom naszą wiedzę. Niczego więcej już was nie nauczymy!
 indianSettlement.cantLearnSkill=Nie nauczymy %unit% umiejętności %skill%.
 indianSettlement.skillUnknown=Nieznane
 indianSettlement.skillNone=Żadne
@@ -780,6 +782,7 @@
 indianSettlement.mission.displeased=Założono misję, ale %nation% poczuli się urażeni.
 indianSettlement.mission.angry=Misjonarz został uwięziony, a %nation% odmówili przyjęcia twojej nowej wiary.
 indianSettlement.mission.hateful=Misjonarz został złożony w ofierze, %nation% śmieją się z twojej nowej religii.
+indianSettlement.mission.noDenounce=Misja z kraju %nation% odparła zarzuty o herezji i sprawiła, że to twój misjonarz został obwołany fałszywym prorokiem i stracony.
 indianSettlement.capitalBurned=Spaliłeś %name%, stolicę plemienia %nation%. %nation% kapitulują składając hołd twojej potędze!
 learnSkill.text=Czy chcesz zamieszkać w wiosce i zostać %skill%?
 learnSkill.yes=Tak, z wielką chęcią
@@ -796,7 +799,6 @@
 scoutSettlement.speakBeads=Witajcie wędrowcy. Prosimy weźcie te cenne ozdoby (warte %amount% sztuk złota) i zawieźcie je waszym wodzom jako dar pokoju.
 scoutSettlement.speakNothing=Zawsze jesteście tu mile widziani.
 scoutSettlement.speakDie=Złamaliście święte zwyczaje plemienia! Zginiecie, służąc za cel dla naszych wojowników.
-# Fuzzy
 scoutSettlement.tributeAgree=Zgadzamy się zapłacić %amount% sztuk złota w zamian za pokój, ale nie zrobimy tego po raz drugi!
 scoutSettlement.tributeDisagree=Nie spełnimy waszego żądania, a teraz opuście nasze ziemie!
 scoutSettlement.expertScout=Twój zwiadowca awansował. Teraz to %unit%.
@@ -988,8 +990,7 @@
 model.unit.cashInTreasureTrain.colonial=Skrzynie z %amount% sztuk złota dotarły do Europy. Do twojego skarbca wpłynęło %cashInAmount% sztuk złota.
 model.unit.cashInTreasureTrain.independent=%amount% złota z łupów oddano do skarbu państwa.
 model.unit.gift=%player% przesłał dar %amount% %type% do %colony%.
-# Fuzzy
-model.unit.noMoreTools=Twój pionier wykorzystał wszystkie swe narzędzia i stał się %unit%.
+model.unit.noMoreTools=%location%: Twój pionier wykorzystał wszystkie swe narzędzia. Teraz to już tylko %unit%.
 model.unit.buildingDamaged=%building% w %colony% został zniszczony przez %enemyUnit% (%enemyNation%)!
 model.unit.goodsStolen=%amount% %goods% z %colony% zostało skradzione przez %enemyUnit% (%enemyNation%)!
 model.unit.indianPlunder=%amount% z %colony% zostało zrabowane przez %enemyUnit% (%enemyNation%).
@@ -1185,8 +1186,7 @@
 model.unit.seasonedScout.scout=Doświadczony zwiadowca
 model.unit.hardyPioneer.name=Doświadczony pionier
 model.unit.hardyPioneer.pioneer=Doświadczony pionier
-# Fuzzy
-model.unit.hardyPioneer.noMoreTools=Twój doświadczony pionier wykorzystał wszystkie swoje narzędzia.
+model.unit.hardyPioneer.noMoreTools=%location%: Twój doświadczony pionier wykorzystał wszystkie swoje narzędzia.
 model.unit.veteranSoldier.name=Żołnierz weteran
 model.unit.veteranSoldier.soldier=Weteran
 model.unit.veteranSoldier.captured=%location%: %enemyUnit% (%enemyNation%) wziął w niewolę żołnierza (%nation%), który tym samym stracił status weterana!
@@ -1512,11 +1512,16 @@
 model.diplomacy.alliance.declared=Ekscelencjo, zawarliśmy sojusz z %nation%!!!
 model.diplomacy.alliance.others=Ekscelencjo, dwaj nasi przeciwnicy (%attacker% i %defender%) zawarli sojusz!!!
 model.diplomacy.spanishSuccession=Excelencjo, wojna o hiszpańską sukcesję w Europie zakończyła się. Zawarto pokój utrechcki, na mocy którego %loserNation% skapitulowali, %nation% przejmują we władanie ich wszystkie kolonie!
+model.diplomacy.dead.european=Ekscelencjo, państwo %nation% ogłosiło, że bezwarunkowo wycofuje się z Nowego Świata!
+model.diplomacy.dead.native=%nation% zostali unicestwieni Ekcelencjo.
 lostCityRumour.BurialGround=Sprofanowałeś święte groby przodków %nation%! Za to jest tylko jedna kara. Zginiesz!
 lostCityRumour.ExpeditionVanishes=Twoja ekspedycja zaginęła bez wieści!
 lostCityRumour.Nothing=Plotki o zaginionym mieście okazały się być tylko pogłoskami. Nic tu nie ma!
+lostCityRumour.Learn=Twój %unit% dzięki zdobytemu doświadczeniu awansował. Teraz to %type%!
 lostCityRumour.TribalChief=Wódz niewielkiego plemienia pokazał ci błyskotki warte %money% sztuk złota!
 lostCityRumour.Colonist=Napotkałeś grupę kolonistów ze zniszczonej osady. W zamian za żywność przysięgli wierność Koronie!
+lostCityRumour.Ruins=Odkryłeś ruiny zaginionej cywilizacji, a w nich złote artefakty o wartości %money%!
+lostCityRumour.Cibola=Odkryłeś miasto %city%, jedno z Siedmiu Tajemniczych Złotych Miast i zrabowałeś %money%! Wprowadź skarb do swojej kolonii lub zabierz go Galeonem do Europy.
 lostCityRumour.FountainOfYouth=Odkryłeś Źródło Wiecznej Młodości. Do doków w Europie napłynęła fala kolonistów!
 lostCityRumour.FountainOfYouthWithoutEurope=Odkryłeś Źródło Wiecznej Młodości.
 model.buildableType.nothing.name=Nic
@@ -1584,8 +1589,7 @@
 model.building.University.description=Kolonia, w której mieszka min 4 osadników, może wybudować szkołę. Umożliwia ona mistrzom rzemiosł przekazywać swą wiedzę zwykłym kolonistom. Gdy populacja osiągnie poziom 8 mieszkańców, szkoła może zostać rozbudowana i zastąpiona przez uczelnię, w której jednocześnie może wykładać dwóch kolonistów. Uczelnia z kolei może zostać zastąpiona uniwersytetem, gdy osada będzie liczyć 10 kolonistów. Może w nim pracować trzech wykładowców.\n\nUniwersytet pozwala nauczać umiejętności na poziomie 3.
 model.building.Armory.description=Zbrojownia do produkcji muszkietów i artylerii potrzebuje narzędzi. Gdy populacja wzrośnie do 8, można wybudować magazyn, a następnie arsenał, o ile w Kongresie Kontynentalnym zasiada Adam Smith.\n\nUmożliwia produkcję muszkietów i jednostek artylerii.
 model.building.Magazine.description=Magazyn jest potrzebny do produkcji muszkietów z narzędzi. Może zostać rozbudowany do arsenału, o ile poparcie w Kongresie Kontynentalnym zapewnia Adam Smith.\n\nMagazyn zwiększa produkcję muszkietów o 100%.
-# Fuzzy
-model.building.Arsenal.description=Arsenał produkuje muszkiety z narzędzi i nie może zostać już rozbudowany.\n\nProdukcja muszkietów wymaga tylko połowy dotychczasowej liczby narzędzi.
+model.building.Arsenal.description=Arsenał podwaja produkcję muszkietów z narzędzi.
 model.building.Chapel.description=Kaplica służy twoim kolonistom za miejsce kultu religijnego. Sama produkuje małą liczbę krzyży, a nie można przypisać do niej proboszcza. Trzeba ją najpierw rozbudować do kościoła.
 model.building.Church.description=Kolonia, której populacja wynosi przynajmniej 3, może wybudować kościół, który z kolei można rozbudować do katedry, gdy populacja osiągnie 8 mieszkańców. Wolność religijna w Nowym Świecie (symbolizowana przez krzyże) ma ogromny wpływ na zwiększenie emigracji z Europy.\n\nUmożliwia wysyłanie misjonarzy oraz zwiększa produkcję krzyży.
 model.building.Cathedral.description=Osada, której populacja liczy co najmniej 3 mieszkańców może zbudować kościół, który z kolei może zostać rozbudowany do katedry, gdy populacja osiągnie 8. Wolność religijna w Nowym Świecie (symbolizowana przez krzyże) zwiększa imigrację z Europy.\n\nKatedra zwiększa produkcję krzyży.

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pms.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pms.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pms.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -466,6 +466,7 @@
 highseas.text=I soma rivà lontan da riva, Soa Ecelensa. Veul-lo ch'i faso vela për l'Euròpa?
 highseas.yes=É, e pì ampressa ch'as peul.
 highseas.no=Nò, nò. Stoma pura ambelessì.
+# Fuzzy
 disembark.text=Compliment marinar, é-lo sigur ch'a veul ësbarché?
 embark.text=Për piasì, ch'a sërna ansima a che nav ch'a veul ambarchesse:
 embark.cancel=Gnun

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pt_BR.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pt_BR.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pt_BR.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -697,6 +697,7 @@
 highseas.text=Atingimos o mar aberto, Vossa Excelência. Devemos navegar para a Europa?
 highseas.yes=Sim, que os bons ventos nos levem.
 highseas.no=Não, permaneceremos aqui.
+# Fuzzy
 disembark.text=Saudações marujo, tem certeza que quer desembarcar?
 embark.text=Por favor, escolha o navio a embarcar:
 embark.cancel=Nenhum

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pt_PT.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pt_PT.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_pt_PT.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -719,7 +719,8 @@
 highseas.text=Atingimos o mar alto, Vossa Excelência. Devemos navegar para a Europa?
 highseas.yes=Sim, mantém-no a direito.
 highseas.no=Não, vamos permanecer nestas águas.
-disembark.text=Saudações, marinheiro. Tem a certeza de que quer desembarcar?
+disembark.text=Saudações marinheiro, deseja desembarcar?
+disembark.cancel=Nenhum
 embark.text=Por favor, escolha o navio em que gostaria de embarcar:
 embark.cancel=Nenhum
 aMessageFromTheCrown=Uma mensagem da Coroa

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ru.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ru.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_ru.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -721,7 +721,8 @@
 highseas.text=Мы достигли открытого моря, Ваше Превосходительство. Взять курс на Европу?
 highseas.yes=Да, так держать.
 highseas.no=Нет, давайте останемся в этих водах.
-disembark.text=Приветствую, мореплаватель! Вы уверены, что желаете высадиться?
+disembark.text=Приветствую, мореплаватель! Желаете ли вы высадиться на берег?
+disembark.cancel=Нет
 embark.text=Пожалуйста, выберите корабль, который вы хотите грузить:
 embark.cancel=Никакой
 aMessageFromTheCrown=Послание от Короны

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_sq.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_sq.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_sq.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -477,6 +477,7 @@
 highseas.text=Kemi arritur në det të hapur, Ekselenca Juaj. A dëshironi të lundrojmë për Evropë?
 highseas.yes=Po, rrugë të mbarë.
 highseas.no=Jo, le të qëndrojmë në këto ujëra.
+# Fuzzy
 disembark.text=Tungjatjeta marinar, a jeni i sigurt që dëshironi të zbarkoni?
 embark.text=Ju lutemi, zgjidhni anijen ku deshironi të hypni:
 embark.cancel=Asnjë

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_sv_SE.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_sv_SE.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_sv_SE.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -712,6 +712,7 @@
 highseas.text=Ers nåd, vi har nått öppet hav. Skall vi sätta kurs mot Europa?
 highseas.yes=Ja, fortsätt på inslagen kurs.
 highseas.no=Nej, låt oss stanna kvar i dessa vatten.
+# Fuzzy
 disembark.text=Var hälsad sjöman, är du säker på att du vill lämna skeppet?
 embark.text=Välj vilket skepp du vill skicka iland resenärer från:
 embark.cancel=Inget

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_tl.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_tl.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_tl.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -672,6 +672,7 @@
 highseas.text=Narating na natin ang pang-itaas na mga karagatan, Aming Kamahalan.  Maglalayag na ba tayo patungo sa Europa?
 highseas.yes=Oo, tuluy-tuloy lamang sa tinatahak ng barko.
 highseas.no=Hindi, manatali lamang tayo sa mga katubigang ito.
+# Fuzzy
 disembark.text=Maligayang bati mga mandaragat, nakatitiyak ba kayong nais ninyong bumaba mula sa barko?
 embark.text=Pakipili ang barkong nais mong sakyan:
 embark.cancel=Wala

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_uk.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_uk.properties	2009-12-05 15:18:08 UTC (rev 6029)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages_uk.properties	2009-12-05 20:21:59 UTC (rev 6030)
@@ -611,6 +611,7 @@
 highseas.text=Ми досягли відкритого моря, Ваша Світлість.  Чи повинні ми відпливли в Європу?
 highseas.yes=Так, я більше ніж упевнений.
 highseas.no=Ні, давайте залишимося у цих водах.
+# Fuzzy
 disembark.text=Вітаю моряче, чи ти справді хочеш висадитися на берег?
 embark.text=Будь-ласка, виберіть судно, на яке ви хотіли б завантажитись:
 embark.cancel=Нічого


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6029
          http://freecol.svn.sourceforge.net/freecol/?rev=6029&view=rev
Author:   burschik
Date:     2009-12-05 15:18:08 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
Use single style context instead of creating a new one every time.

Modified Paths:
--------------
    freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/FreeColPanel.java

Modified: freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/FreeColPanel.java
===================================================================
--- freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/FreeColPanel.java	2009-12-05 15:12:41 UTC (rev 6028)
+++ freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/FreeColPanel.java	2009-12-05 15:18:08 UTC (rev 6029)
@@ -55,10 +55,10 @@
 import javax.swing.KeyStroke;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
+import javax.swing.text.DefaultStyledDocument;
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
-import javax.swing.text.StyledDocument;
 import javax.swing.SwingUtilities;
 
 import net.sf.freecol.client.FreeColClient;
@@ -135,7 +135,9 @@
 
     protected JButton okButton = new JButton(Messages.message("ok"));
 
+    protected static StyleContext styleContext = null;
 
+
     /**
      * Constructor.
      */
@@ -245,29 +247,42 @@
     }
 
     public static JTextPane getDefaultTextPane() {
-        JTextPane textPane = new JTextPane();
+        return getDefaultTextPane(null);
+    }
+
+    public static JTextPane getDefaultTextPane(String text) {
+        if (styleContext == null) {
+            styleContext = createStyleContext();
+        }
+        JTextPane textPane = new JTextPane(new DefaultStyledDocument(styleContext));
         textPane.setOpaque(false);
         textPane.setEditable(false);
+        textPane.setLogicalStyle(styleContext.getStyle("regular"));
 
-        StyledDocument doc = textPane.getStyledDocument();
-        //Initialize some styles.
-        Style def = StyleContext.getDefaultStyleContext().getStyle(StyleContext.DEFAULT_STYLE);
-        
-        Style regular = doc.addStyle("regular", def);
-        StyleConstants.setFontFamily(def, "Dialog");
-        StyleConstants.setBold(def, true);
-        StyleConstants.setFontSize(def, 12);
+        textPane.setText(text);
+        return textPane;
+    }
 
-        Style buttonStyle = doc.addStyle("button", regular);
+
+    private static StyleContext createStyleContext() {
+        StyleContext defaultContext = new StyleContext();
+        Style defaultStyle = defaultContext.getDefaultStyleContext()
+            .getStyle(StyleContext.DEFAULT_STYLE);
+
+        Style regular = defaultContext.addStyle("regular", defaultStyle);
+        StyleConstants.setFontFamily(regular, "Dialog");
+        StyleConstants.setBold(regular, true);
+        StyleConstants.setFontSize(regular, 12);
+
+        Style buttonStyle = defaultContext.addStyle("button", regular);
         StyleConstants.setForeground(buttonStyle, LINK_COLOR);
 
-        Style right = doc.addStyle("right", regular);
+        Style right = defaultContext.addStyle("right", regular);
         StyleConstants.setAlignment(right, StyleConstants.ALIGN_RIGHT);
 
-        return textPane;
+        return defaultContext;
     }
 
-
     /**
      * Returns a text area with standard settings suitable for use in FreeCol
      * dialogs.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6028
          http://freecol.svn.sourceforge.net/freecol/?rev=6028&view=rev
Author:   burschik
Date:     2009-12-05 15:12:41 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
Improve layout of text area in confirm dialog.

Modified Paths:
--------------
    freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/FreeColDialog.java

Modified: freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/FreeColDialog.java
===================================================================
--- freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/FreeColDialog.java	2009-12-05 13:14:30 UTC (rev 6027)
+++ freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/FreeColDialog.java	2009-12-05 15:12:41 UTC (rev 6028)
@@ -282,7 +282,7 @@
                 okButton.requestFocus();
             }
         };
-        confirmDialog.setLayout(new MigLayout("wrap 2", "", ""));
+        confirmDialog.setLayout(new MigLayout("wrap 2", "[][fill]", ""));
 
         okButton.addActionListener(new ActionListener() {
                 public void actionPerformed( ActionEvent event ) {
@@ -300,10 +300,10 @@
         for (int i = 0; i < texts.length; i++) {
             if (icons != null && icons[i] != null) {
                 confirmDialog.add(new JLabel(icons[i]));
+                confirmDialog.add(getDefaultTextArea(texts[i]));
             } else {
-                confirmDialog.add(new JLabel());
+                confirmDialog.add(getDefaultTextArea(texts[i]), "skip");
             }
-            confirmDialog.add(getDefaultTextArea(texts[i]));
         }
 
         confirmDialog.add(okButton, "newline 20, span, split 2, tag ok");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6027
          http://freecol.svn.sourceforge.net/freecol/?rev=6027&view=rev
Author:   burschik
Date:     2009-12-05 13:14:30 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
Add documentation on release process.

Added Paths:
-----------
    freecol/branches/0.9.x/doc/release.txt

Added: freecol/branches/0.9.x/doc/release.txt
===================================================================
--- freecol/branches/0.9.x/doc/release.txt	                        (rev 0)
+++ freecol/branches/0.9.x/doc/release.txt	2009-12-05 13:14:30 UTC (rev 6027)
@@ -0,0 +1,96 @@
+How to build a FreeCol release
+
+
+* Make sure that all relevant changes have been committed to the
+  branch you are about to release. In particular, remember to merge
+  translations from trunk if the release is not made from trunk.
+
+* Create a copy of the branch you want to release in the tags
+  folder. Subversion does not distinguish between tags and
+  branches. Example:
+
+  svn copy -m "Creating tag for release 0.9.0-alpha2." \
+  https://freecol.svn.sourceforge.net/svnroot/freecol/freecol/branches/0.9.x \
+  https://freecol.svn.sourceforge.net/svnroot/freecol/freecol/tags/0.9.0-alpha2
+
+* Check out the newly created branch and do all further work in that
+  new branch.
+
+* Change the FREECOL_VERSION constant to match the release version in
+  FreeCol.java and commit the change. Start a clean compile, run all
+  tests and verify the specification(s). You can do that by calling
+  "ant prepare-commit".
+
+* Call "ant dist" in order to build all packages. It might be
+  necessary to increase the memory available for ant, for example by
+  setting the environment variable ANT_OPTS="-Xms256m -Xmx256m".
+
+* Install one of the generated packages and verify that you can play
+  normally for at least five turns. Other good tests include loading a
+  saved game and running the game in debug mode for a hundred turns or
+  so. It might also be a good idea to compile the game from one of the
+  source packages.
+
+* Upload the packages to sftp://frs.sourceforge.net/ and ensure that
+  all packages get uploaded. You can use a script similar to this:
+
+  #!/bin/sh
+
+  FREECOL_VERSION=0.9.0-alpha2
+  PREFIX=freecol-$FREECOL_VERSION
+  USERNAME=myUserName
+
+  sftp $USERNAME,freecol@... <<FILE
+  cd /home/frs/project/f/fr/freecol/freecol
+  mkdir $PREFIX
+  cd $PREFIX
+  put $PREFIX-installer.exe
+  put $PREFIX-installer.jar
+  put $PREFIX-installer-with-sources.jar
+  put $PREFIX-mac.tar.bz2
+  put $PREFIX-src.tar.gz
+  put $PREFIX-src.zip
+  put $PREFIX.tar.gz
+  put $PREFIX.zip
+  exit
+  FILE
+
+* Compile the feature list for the news announcement (use the tracker
+  and/or run the previous version for comparison).
+
+* Update the release number in the "Version"-mambot.
+  (http://www.freecol.org/administrator > Mambots > Site Mambots >
+  Version)
+
+* Publish/unpublish "Download Unstable Version" (this page should only
+  be displayed if the unstable version is the latest release).
+
+* Add a news item to our website.
+
+* Remove the download button from the previous release news item.
+
+* Post release messages on our mailing lists: developers, translators
+  and users.
+
+
+The following items can be omitted for unstable releases:
+
+* Trackers: Rename the group "Added (Trunk)"/"Added (x.y,z-branch)" to
+  Added (FreeCol x.y.z). Rename the group "Fixed (x.y,z-branch)"/
+  "Fixed (Trunk)" to Fixed (FreeCol x.y.z). Create new groups with the
+  names you just renamed from. Change the links on "Tracker > Admin >
+  Bugs/Feature... > Preferences". Add redirects for "bugtracker/x.y.z"
+  and "featuretracker/x.y.z". Create a new group for "In 0.y.x".
+
+* Update JavaDoc and User Documentation on freecol.org
+
+
+The following items should be omitted for unstable releases:
+
+* Update the links to "Added (0.x.y-branch)" and "Fixed
+  (0.x.y-branch)" on the roadmap (and release status etc).
+
+* Post a news item on SF.net
+
+* Create news items at Linuxgames.com, linux-gamers.com and
+  happypenguin.org


Property changes on: freecol/branches/0.9.x/doc/release.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.