mirror of https://github.com/FreeCol/freecol.git
Merge branch 'master' into ticket/ir222
This commit is contained in:
commit
2eb830f02e
15
build.xml
15
build.xml
|
@ -282,7 +282,7 @@
|
|||
</target>
|
||||
|
||||
<target name="prepareBaseFiles" depends="initDist,desktop-entry">
|
||||
<antcall target="clean"/>
|
||||
<antcall target="cleanMain"/>
|
||||
<antcall target="package"/>
|
||||
<mkdir dir="${freecol.release.dir}/base/${freecol.name}"/>
|
||||
<copy todir="${freecol.release.dir}/base/${freecol.name}">
|
||||
|
@ -302,7 +302,7 @@
|
|||
</target>
|
||||
|
||||
<target name="prepareSourceFiles" depends="initDist">
|
||||
<antcall target="clean"/>
|
||||
<antcall target="cleanMain"/>
|
||||
<mkdir dir="${freecol.release.dir}/source/${freecol.name}"/>
|
||||
<copy todir="${freecol.release.dir}/source/${freecol.name}">
|
||||
<fileset dir="${basedir}"
|
||||
|
@ -546,8 +546,7 @@
|
|||
</tar>
|
||||
</target>
|
||||
|
||||
<!-- Cleans the directories by removing auto-generated files. -->
|
||||
<target name="clean" depends="init"
|
||||
<target name="cleanBuild" depends="init"
|
||||
description="Cleans the directories by removing auto-generated files.">
|
||||
<delete quiet="true" includeEmptyDirs="true">
|
||||
<fileset dir="${freecol.build.dir}" includes="net/**" />
|
||||
|
@ -558,6 +557,10 @@
|
|||
<fileset dir="${freecol.doc.dir}"
|
||||
excludes="*.tex *.sty images/* specification.*" />
|
||||
</delete>
|
||||
</target>
|
||||
|
||||
<target name="cleanMain" depends="init"
|
||||
description="Clean the main (non-build) tree by removing auto-generated files.">
|
||||
<delete quiet="true" file="${freecol.jar.file}"/>
|
||||
<delete quiet="true" file="${freecol.metaserver.jar.file}"/>
|
||||
<delete quiet="true" file="TESTS-TestSuites.xml"/>
|
||||
|
@ -566,6 +569,10 @@
|
|||
<delete quiet="true" file="${basedir}/test/data/specification.xml"/>
|
||||
</target>
|
||||
|
||||
<target name="clean" depends="cleanBuild,cleanMain"
|
||||
description="General cleanup.">
|
||||
</target>
|
||||
|
||||
<target name="distclean" depends="init,clean"
|
||||
description="Cleans the directories and removes the distribution directory.">
|
||||
<delete quiet="true" includeEmptyDirs="true" followsymlinks="false"
|
||||
|
|
|
@ -1789,11 +1789,11 @@
|
|||
to="model.unit.undead" probability="100"/>
|
||||
</unit-change-type>
|
||||
</unit-change-types>
|
||||
|
||||
|
||||
<unit-types>
|
||||
<!-- ATTENTION: skill-taught can NOT be inherited because it
|
||||
defaults to the unit type itself! -->
|
||||
<unit-type id="colonist" abstract="true"
|
||||
<unit-type id="colonist" abstract="true"
|
||||
offence="0" defence="1" movement="3" line-of-sight="1"
|
||||
priority="1000">
|
||||
<ability id="model.ability.person"
|
||||
|
@ -1995,7 +1995,7 @@
|
|||
<modifier id="model.goods.hammers" index="30" type="additive" value="-2"/>
|
||||
<modifier id="model.goods.tools" index="30" type="additive" value="-2"/>
|
||||
</unit-type>
|
||||
<unit-type id="model.unit.indianConvert"
|
||||
<unit-type id="model.unit.indianConvert"
|
||||
skill="0" offence="0" defence="1" movement="3" line-of-sight="1"
|
||||
maximum-attrition="8" score-value="3">
|
||||
<consumes id="model.goods.food" value="2"/>
|
||||
|
@ -2982,7 +2982,7 @@
|
|||
</european-nation-type>
|
||||
<!-- really special nation type for option use *only*, needed so
|
||||
that the missionary role is available to units in unit list
|
||||
options -->
|
||||
options -->
|
||||
<european-nation-type id="model.nationType.optionOnly"
|
||||
extends="model.nationType.default">
|
||||
<ability id="model.ability.dressMissionary" value="true"/>
|
||||
|
@ -4576,6 +4576,13 @@
|
|||
settlement. -->
|
||||
<percentageOption id="model.option.demandProbability"
|
||||
defaultValue="10" />
|
||||
<!-- Percentage impact on Native Alarm trades will have -->
|
||||
<percentageOption id="model.option.alarmBonusBuy"
|
||||
defaultValue="20"/>
|
||||
<percentageOption id="model.option.alarmBonusSell"
|
||||
defaultValue="20"/>
|
||||
<percentageOption id="model.option.alarmBonusGift"
|
||||
defaultValue="40"/>
|
||||
<!-- Maximum number of goods a native settlement will offer
|
||||
for sale. -->
|
||||
<integerOption id="model.option.settlementNumberOfGoodsToSell"
|
||||
|
|
|
@ -690,6 +690,12 @@ model.option.giftProbability.name=Gift Probability
|
|||
model.option.giftProbability.shortDescription=Per turn percentage chance that a peaceful native settlement with a surplus will offer it as a gift to a nearby friendly European settlement.
|
||||
model.option.demandProbability.name=Demand Probability
|
||||
model.option.demandProbability.shortDescription=Per turn percentage chance that an angry native settlement will demand tribute from a nearby annoying European settlement.
|
||||
model.option.alarmBonusBuy.name=Native Alarm Bonus for Buying
|
||||
model.option.alarmBonusBuy.shortDescription=Percent bonus on native alarm when buying goods from a native settlement.
|
||||
model.option.alarmBonusSell.name=Native Alarm Bonus for Selling
|
||||
model.option.alarmBonusSell.shortDescription=Percent bonus on native alarm when selling goods to a native settlement.
|
||||
model.option.alarmBonusGift.name=Native Alarm Bonus for Gifts
|
||||
model.option.alarmBonusGift.shortDescription=Percent bonus on native alarm when delivering gifts to a native settlement.
|
||||
model.option.settlementNumberOfGoodsToSell.name=Native Goods Sales
|
||||
model.option.settlementNumberOfGoodsToSell.shortDescription=The number of goods types usually offered for sale by a native settlement.
|
||||
model.option.continueFoundingFatherRecruitment.name=Continue recruiting Founding Fathers
|
||||
|
@ -2384,7 +2390,7 @@ model.monarch.action.addToRef.no=Done
|
|||
model.monarch.action.declarePeace.text=We have graciously agreed to a peace treaty with {{tag:country|%nation%}}.
|
||||
model.monarch.action.declarePeace.no=Done
|
||||
model.monarch.action.declareWar.text=The insolence of {{tag:country|%nation%}} forces Us to declare war on them!
|
||||
model.monarch.action.declareWarSupported.text=The insolence of the {{tag:country|%nation%}} forces Us to declare war on them! To expedite this matter, our loyal troops (%force%) await your orders, and a further sum of %gold% has been added to your treasury.
|
||||
model.monarch.action.declareWarSupported.text=The insolence of the {{tag:country|%nation%}} forces Us to declare war on them! To expedite this matter, our loyal troops (%force%) await your orders, and a further sum of %gold% has been added to your treasury.
|
||||
model.monarch.action.declareWar.no=Done
|
||||
model.monarch.action.displeasure.text=You dare to accept Our generous terms and yet evade payment? Such duplicity will reap the bitter reward of Our displeasure.
|
||||
model.monarch.action.displeasure.no=Done
|
||||
|
@ -3686,7 +3692,7 @@ nameCache.season.1=Autumn
|
|||
# The .freecol settlement names are in rough chronological order where
|
||||
# possible. In game, settlement names are offered in order. Settlement
|
||||
# names may not be duplicated.
|
||||
#
|
||||
#
|
||||
# Previously we tended to use only names for substantial settlements,
|
||||
# but there have been compliants about exhausting the settlement list
|
||||
# too easily. Therefore we now accept even tiny settlements that failed
|
||||
|
@ -4167,7 +4173,7 @@ model.nation.english.settlementName.freecol.60=New Haven
|
|||
model.nation.english.settlementName.freecol.61=Rowley
|
||||
model.nation.english.settlementName.freecol.62=Exeter
|
||||
model.nation.english.settlementName.freecol.63=Wilmington
|
||||
model.nation.english.settlementName.freecol.64=Aquidneck Island
|
||||
model.nation.english.settlementName.freecol.64=Aquidneck Island
|
||||
# 1639
|
||||
model.nation.english.settlementName.freecol.65=Milford
|
||||
model.nation.english.settlementName.freecol.66=Gardiner's Island
|
||||
|
@ -5739,13 +5745,13 @@ model.nation.danish.settlementName.27=Brattahlíð
|
|||
model.nation.danish.settlementName.28=Grønnedal
|
||||
model.nation.danish.settlementName.29=Nordprøven
|
||||
model.nation.danish.settlementName.30=Øen
|
||||
model.nation.danish.settlementName.31=Nysted
|
||||
model.nation.danish.settlementName.31=Nysted
|
||||
model.nation.danish.settlementName.32=Solvang
|
||||
model.nation.danish.settlementName.33=Viborg
|
||||
model.nation.danish.settlementName.33=Viborg
|
||||
model.nation.danish.settlementName.34=Prøven
|
||||
model.nation.danish.settlementName.35=Danevang
|
||||
model.nation.danish.settlementName.36=Gammel Sukkertoppen
|
||||
model.nation.danish.settlementName.37=Dannebrog
|
||||
model.nation.danish.settlementName.37=Dannebrog
|
||||
model.nation.danish.settlementName.38=Nye-Sukkertoppen
|
||||
model.nation.danish.settlementName.39=Havighivik
|
||||
model.nation.danish.settlementName.40=Thule
|
||||
|
@ -5760,21 +5766,21 @@ model.nation.danish.settlementName.48=Igaliko
|
|||
model.nation.danish.settlementName.49=Kap Dan
|
||||
model.nation.danish.settlementName.50=Claushavn
|
||||
model.nation.danish.settlementName.51=Lievely
|
||||
model.nation.danish.settlementName.52=Dagmar
|
||||
model.nation.danish.settlementName.52=Dagmar
|
||||
model.nation.danish.settlementName.53=Nennortalik
|
||||
model.nation.danish.settlementName.54=Hiurapaluk
|
||||
model.nation.danish.settlementName.55=Savissivik
|
||||
model.nation.danish.settlementName.56=Iginniarfik
|
||||
model.nation.danish.settlementName.57=Dania
|
||||
model.nation.danish.settlementName.57=Dania
|
||||
model.nation.danish.settlementName.58=Narsarmijit
|
||||
model.nation.danish.settlementName.59=Manti
|
||||
model.nation.danish.settlementName.59=Manti
|
||||
model.nation.danish.settlementName.60=Sondrestrom
|
||||
model.nation.danish.settlementName.61=Kimballton
|
||||
model.nation.danish.settlementName.61=Kimballton
|
||||
model.nation.danish.settlementName.62=Ephraim
|
||||
model.nation.danish.settlementName.63=Attu
|
||||
model.nation.danish.settlementName.64=Kapisillit
|
||||
model.nation.danish.settlementName.65=Upernavik Kujalleq
|
||||
model.nation.danish.settlementName.66=Daneville
|
||||
model.nation.danish.settlementName.66=Daneville
|
||||
model.nation.danish.settlementName.67=Søndre Upernavik
|
||||
model.nation.danish.settlementName.68=Naajaat
|
||||
model.nation.danish.settlementName.69=Kulusuk
|
||||
|
@ -5782,7 +5788,7 @@ model.nation.danish.settlementName.70=Ikerasaarsuk
|
|||
model.nation.danish.settlementName.71=Scoresbysund
|
||||
model.nation.danish.settlementName.72=Sarfannguit
|
||||
model.nation.danish.settlementName.73=Innaarsuit
|
||||
model.nation.danish.settlementName.74=Askov
|
||||
model.nation.danish.settlementName.74=Askov
|
||||
model.nation.danish.settlementName.75=Saarloq
|
||||
model.nation.danish.settlementName.76=Qassiarsuk
|
||||
model.nation.danish.settlementName.77=Nuuk
|
||||
|
@ -5896,147 +5902,147 @@ model.nation.danish.ship.36=Vrin
|
|||
model.nation.danish.ship.37=thenn Röde Hane
|
||||
model.nation.danish.ship.38=thenn Röde Löffue
|
||||
# more from marcin
|
||||
model.nation.danish.ship.39=Hercules
|
||||
model.nation.danish.ship.40=Hector
|
||||
model.nation.danish.ship.41=Hjort
|
||||
model.nation.danish.ship.42=Byens Loffue
|
||||
model.nation.danish.ship.43=Morian
|
||||
model.nation.danish.ship.44=David
|
||||
model.nation.danish.ship.45=Skotske Pink
|
||||
model.nation.danish.ship.46=Jegermesther
|
||||
model.nation.danish.ship.47=Merkurius
|
||||
model.nation.danish.ship.48=Samson
|
||||
model.nation.danish.ship.49=Hannibal
|
||||
model.nation.danish.ship.50=Fortuna
|
||||
model.nation.danish.ship.51=Prindse-Bark
|
||||
model.nation.danish.ship.52=Samson
|
||||
model.nation.danish.ship.53=Josaphat
|
||||
model.nation.danish.ship.54=Josua
|
||||
model.nation.danish.ship.55=Drage
|
||||
model.nation.danish.ship.56=Trefoldighed
|
||||
model.nation.danish.ship.57=Tre Løver
|
||||
model.nation.danish.ship.58=Spes
|
||||
model.nation.danish.ship.59=Patienta
|
||||
model.nation.danish.ship.60=St Sophia
|
||||
model.nation.danish.ship.61=Oldenborg
|
||||
model.nation.danish.ship.62=Hannibal
|
||||
model.nation.danish.ship.63=Viktoria
|
||||
model.nation.danish.ship.64=Frederik
|
||||
model.nation.danish.ship.65=Sofia Amalia
|
||||
model.nation.danish.ship.66=Prinds Kristian
|
||||
model.nation.danish.ship.67=Norske Løve
|
||||
model.nation.danish.ship.68=Tre Kroner
|
||||
model.nation.danish.ship.69=Sorte Rytter
|
||||
model.nation.danish.ship.70=Trefoldighed
|
||||
model.nation.danish.ship.71=Lindorm
|
||||
model.nation.danish.ship.72=København
|
||||
model.nation.danish.ship.73=Tre Løver
|
||||
model.nation.danish.ship.74=Nelleblad
|
||||
model.nation.danish.ship.75=Norske Løve
|
||||
model.nation.danish.ship.76=Tre Kroner
|
||||
model.nation.danish.ship.77=Oldenborg
|
||||
model.nation.danish.ship.78=Slesvig
|
||||
model.nation.danish.ship.79=Prins Jørgen
|
||||
model.nation.danish.ship.80=Delmenhorst
|
||||
model.nation.danish.ship.81=Gyldenløve
|
||||
model.nation.danish.ship.82=Prinds Georg
|
||||
model.nation.danish.ship.83=Charlotta Amalia
|
||||
model.nation.danish.ship.84=Christianus V
|
||||
model.nation.danish.ship.85=Anna Sofia
|
||||
model.nation.danish.ship.86=Churprinds
|
||||
model.nation.danish.ship.87=Nelleblad?
|
||||
model.nation.danish.ship.88=Christiania
|
||||
model.nation.danish.ship.89=Fredericus III
|
||||
model.nation.danish.ship.90=Enighed
|
||||
model.nation.danish.ship.91=Neptunus
|
||||
model.nation.danish.ship.92=Norske Løve
|
||||
model.nation.danish.ship.93=Flyvende Hjort
|
||||
model.nation.danish.ship.94=Elephant
|
||||
model.nation.danish.ship.95=Prinds Frederik
|
||||
model.nation.danish.ship.96=Tre Kroner
|
||||
model.nation.danish.ship.97=Christianus IV
|
||||
model.nation.danish.ship.98=Tomler
|
||||
model.nation.danish.ship.99=Sværdfisk
|
||||
model.nation.danish.ship.100=Slesvig
|
||||
model.nation.danish.ship.101=Dannebroge
|
||||
model.nation.danish.ship.102=Tre Løver
|
||||
model.nation.danish.ship.103=Prinds Christian
|
||||
model.nation.danish.ship.104=Sophia Hedevig
|
||||
model.nation.danish.ship.105=Dronning Louisa
|
||||
model.nation.danish.ship.106=Prinds Carl
|
||||
model.nation.danish.ship.107=Prinds Wilhelm
|
||||
model.nation.danish.ship.108=Oldenborg
|
||||
model.nation.danish.ship.109=Fredericus IV
|
||||
model.nation.danish.ship.110=Justitia
|
||||
model.nation.danish.ship.111=Haffru
|
||||
model.nation.danish.ship.112=Beskjermer
|
||||
model.nation.danish.ship.113=Ebenetzer
|
||||
model.nation.danish.ship.114=Ditmarsken
|
||||
model.nation.danish.ship.115=Laaland
|
||||
model.nation.danish.ship.39=Hercules
|
||||
model.nation.danish.ship.40=Hector
|
||||
model.nation.danish.ship.41=Hjort
|
||||
model.nation.danish.ship.42=Byens Loffue
|
||||
model.nation.danish.ship.43=Morian
|
||||
model.nation.danish.ship.44=David
|
||||
model.nation.danish.ship.45=Skotske Pink
|
||||
model.nation.danish.ship.46=Jegermesther
|
||||
model.nation.danish.ship.47=Merkurius
|
||||
model.nation.danish.ship.48=Samson
|
||||
model.nation.danish.ship.49=Hannibal
|
||||
model.nation.danish.ship.50=Fortuna
|
||||
model.nation.danish.ship.51=Prindse-Bark
|
||||
model.nation.danish.ship.52=Samson
|
||||
model.nation.danish.ship.53=Josaphat
|
||||
model.nation.danish.ship.54=Josua
|
||||
model.nation.danish.ship.55=Drage
|
||||
model.nation.danish.ship.56=Trefoldighed
|
||||
model.nation.danish.ship.57=Tre Løver
|
||||
model.nation.danish.ship.58=Spes
|
||||
model.nation.danish.ship.59=Patienta
|
||||
model.nation.danish.ship.60=St Sophia
|
||||
model.nation.danish.ship.61=Oldenborg
|
||||
model.nation.danish.ship.62=Hannibal
|
||||
model.nation.danish.ship.63=Viktoria
|
||||
model.nation.danish.ship.64=Frederik
|
||||
model.nation.danish.ship.65=Sofia Amalia
|
||||
model.nation.danish.ship.66=Prinds Kristian
|
||||
model.nation.danish.ship.67=Norske Løve
|
||||
model.nation.danish.ship.68=Tre Kroner
|
||||
model.nation.danish.ship.69=Sorte Rytter
|
||||
model.nation.danish.ship.70=Trefoldighed
|
||||
model.nation.danish.ship.71=Lindorm
|
||||
model.nation.danish.ship.72=København
|
||||
model.nation.danish.ship.73=Tre Løver
|
||||
model.nation.danish.ship.74=Nelleblad
|
||||
model.nation.danish.ship.75=Norske Løve
|
||||
model.nation.danish.ship.76=Tre Kroner
|
||||
model.nation.danish.ship.77=Oldenborg
|
||||
model.nation.danish.ship.78=Slesvig
|
||||
model.nation.danish.ship.79=Prins Jørgen
|
||||
model.nation.danish.ship.80=Delmenhorst
|
||||
model.nation.danish.ship.81=Gyldenløve
|
||||
model.nation.danish.ship.82=Prinds Georg
|
||||
model.nation.danish.ship.83=Charlotta Amalia
|
||||
model.nation.danish.ship.84=Christianus V
|
||||
model.nation.danish.ship.85=Anna Sofia
|
||||
model.nation.danish.ship.86=Churprinds
|
||||
model.nation.danish.ship.87=Nelleblad?
|
||||
model.nation.danish.ship.88=Christiania
|
||||
model.nation.danish.ship.89=Fredericus III
|
||||
model.nation.danish.ship.90=Enighed
|
||||
model.nation.danish.ship.91=Neptunus
|
||||
model.nation.danish.ship.92=Norske Løve
|
||||
model.nation.danish.ship.93=Flyvende Hjort
|
||||
model.nation.danish.ship.94=Elephant
|
||||
model.nation.danish.ship.95=Prinds Frederik
|
||||
model.nation.danish.ship.96=Tre Kroner
|
||||
model.nation.danish.ship.97=Christianus IV
|
||||
model.nation.danish.ship.98=Tomler
|
||||
model.nation.danish.ship.99=Sværdfisk
|
||||
model.nation.danish.ship.100=Slesvig
|
||||
model.nation.danish.ship.101=Dannebroge
|
||||
model.nation.danish.ship.102=Tre Løver
|
||||
model.nation.danish.ship.103=Prinds Christian
|
||||
model.nation.danish.ship.104=Sophia Hedevig
|
||||
model.nation.danish.ship.105=Dronning Louisa
|
||||
model.nation.danish.ship.106=Prinds Carl
|
||||
model.nation.danish.ship.107=Prinds Wilhelm
|
||||
model.nation.danish.ship.108=Oldenborg
|
||||
model.nation.danish.ship.109=Fredericus IV
|
||||
model.nation.danish.ship.110=Justitia
|
||||
model.nation.danish.ship.111=Haffru
|
||||
model.nation.danish.ship.112=Beskjermer
|
||||
model.nation.danish.ship.113=Ebenetzer
|
||||
model.nation.danish.ship.114=Ditmarsken
|
||||
model.nation.danish.ship.115=Laaland
|
||||
model.nation.danish.ship.116=Dronning Anna Sophia
|
||||
model.nation.danish.ship.117=Tre Løver
|
||||
model.nation.danish.ship.117=Tre Løver
|
||||
model.nation.danish.ship.118=Prinsesse Charlotte Amalia
|
||||
model.nation.danish.ship.119=Prinsesse Louise
|
||||
model.nation.danish.ship.119=Prinsesse Louise
|
||||
model.nation.danish.ship.120=Markgrevinde Sophia Christina
|
||||
model.nation.danish.ship.121=Christianus VI
|
||||
model.nation.danish.ship.122=(Nye) Delmenhorst
|
||||
model.nation.danish.ship.123=Jylland
|
||||
model.nation.danish.ship.124=Wenden
|
||||
model.nation.danish.ship.125=Kjøbenhavn
|
||||
model.nation.danish.ship.126=Fyen
|
||||
model.nation.danish.ship.127=Island
|
||||
model.nation.danish.ship.128=Stormar
|
||||
model.nation.danish.ship.121=Christianus VI
|
||||
model.nation.danish.ship.122=(Nye) Delmenhorst
|
||||
model.nation.danish.ship.123=Jylland
|
||||
model.nation.danish.ship.124=Wenden
|
||||
model.nation.danish.ship.125=Kjøbenhavn
|
||||
model.nation.danish.ship.126=Fyen
|
||||
model.nation.danish.ship.127=Island
|
||||
model.nation.danish.ship.128=Stormar
|
||||
model.nation.danish.ship.129=Dronning Juliane Marie
|
||||
model.nation.danish.ship.130=Fredericus V
|
||||
model.nation.danish.ship.131=Sejer
|
||||
model.nation.danish.ship.132=Grønland
|
||||
model.nation.danish.ship.133=Kronprintz
|
||||
model.nation.danish.ship.134=Dannemark
|
||||
model.nation.danish.ship.135=Ebenetzer
|
||||
model.nation.danish.ship.136=St Croix
|
||||
model.nation.danish.ship.137=Mars
|
||||
model.nation.danish.ship.138=Jylland
|
||||
model.nation.danish.ship.139=Norske Løve
|
||||
model.nation.danish.ship.140=Slesvig
|
||||
model.nation.danish.ship.141=Christian VII
|
||||
model.nation.danish.ship.142=Øresund
|
||||
model.nation.danish.ship.130=Fredericus V
|
||||
model.nation.danish.ship.131=Sejer
|
||||
model.nation.danish.ship.132=Grønland
|
||||
model.nation.danish.ship.133=Kronprintz
|
||||
model.nation.danish.ship.134=Dannemark
|
||||
model.nation.danish.ship.135=Ebenetzer
|
||||
model.nation.danish.ship.136=St Croix
|
||||
model.nation.danish.ship.137=Mars
|
||||
model.nation.danish.ship.138=Jylland
|
||||
model.nation.danish.ship.139=Norske Løve
|
||||
model.nation.danish.ship.140=Slesvig
|
||||
model.nation.danish.ship.141=Christian VII
|
||||
model.nation.danish.ship.142=Øresund
|
||||
model.nation.danish.ship.143=Prindsesse Vilhelmine Caroline
|
||||
model.nation.danish.ship.144=Elefanten
|
||||
model.nation.danish.ship.145=Holsteen
|
||||
model.nation.danish.ship.146=Dannebroge
|
||||
model.nation.danish.ship.147=Wagrien
|
||||
model.nation.danish.ship.144=Elefanten
|
||||
model.nation.danish.ship.145=Holsteen
|
||||
model.nation.danish.ship.146=Dannebroge
|
||||
model.nation.danish.ship.147=Wagrien
|
||||
model.nation.danish.ship.148=Prindsesse Sophia Frederica
|
||||
model.nation.danish.ship.149=Justitia
|
||||
model.nation.danish.ship.150=Oldenburg
|
||||
model.nation.danish.ship.151=Ditmarsken
|
||||
model.nation.danish.ship.152=Arveprinds Frederich
|
||||
model.nation.danish.ship.149=Justitia
|
||||
model.nation.danish.ship.150=Oldenburg
|
||||
model.nation.danish.ship.151=Ditmarsken
|
||||
model.nation.danish.ship.152=Arveprinds Frederich
|
||||
model.nation.danish.ship.153=Princess Louisa Augusta
|
||||
model.nation.danish.ship.154=Kronprins Frederich
|
||||
model.nation.danish.ship.155=Mars
|
||||
model.nation.danish.ship.156=Nordstiernen
|
||||
model.nation.danish.ship.157=Indfødsretten
|
||||
model.nation.danish.ship.158=Fyen
|
||||
model.nation.danish.ship.159=Sjælland
|
||||
model.nation.danish.ship.160=Odin
|
||||
model.nation.danish.ship.161=Neptunus
|
||||
model.nation.danish.ship.162=Tre Kroner
|
||||
model.nation.danish.ship.163=Kronprindsesse Maria
|
||||
model.nation.danish.ship.164=Skjold
|
||||
model.nation.danish.ship.165=Dannemark
|
||||
model.nation.danish.ship.166=Sejeren
|
||||
model.nation.danish.ship.167=Waldemar
|
||||
model.nation.danish.ship.168=Norge
|
||||
model.nation.danish.ship.169=Christian VII
|
||||
model.nation.danish.ship.154=Kronprins Frederich
|
||||
model.nation.danish.ship.155=Mars
|
||||
model.nation.danish.ship.156=Nordstiernen
|
||||
model.nation.danish.ship.157=Indfødsretten
|
||||
model.nation.danish.ship.158=Fyen
|
||||
model.nation.danish.ship.159=Sjælland
|
||||
model.nation.danish.ship.160=Odin
|
||||
model.nation.danish.ship.161=Neptunus
|
||||
model.nation.danish.ship.162=Tre Kroner
|
||||
model.nation.danish.ship.163=Kronprindsesse Maria
|
||||
model.nation.danish.ship.164=Skjold
|
||||
model.nation.danish.ship.165=Dannemark
|
||||
model.nation.danish.ship.166=Sejeren
|
||||
model.nation.danish.ship.167=Waldemar
|
||||
model.nation.danish.ship.168=Norge
|
||||
model.nation.danish.ship.169=Christian VII
|
||||
model.nation.danish.ship.170=Prinds Christian Frederik
|
||||
model.nation.danish.ship.171=Prindsesse Caroline
|
||||
model.nation.danish.ship.172=Phoenix
|
||||
model.nation.danish.ship.173=Danmark
|
||||
model.nation.danish.ship.174=Dronning Marie
|
||||
model.nation.danish.ship.175=Waldemar
|
||||
model.nation.danish.ship.176=Frederik VI
|
||||
model.nation.danish.ship.177=Skjold
|
||||
model.nation.danish.ship.178=Christian VIII
|
||||
model.nation.danish.ship.179=Dannebrog
|
||||
model.nation.danish.ship.171=Prindsesse Caroline
|
||||
model.nation.danish.ship.172=Phoenix
|
||||
model.nation.danish.ship.173=Danmark
|
||||
model.nation.danish.ship.174=Dronning Marie
|
||||
model.nation.danish.ship.175=Waldemar
|
||||
model.nation.danish.ship.176=Frederik VI
|
||||
model.nation.danish.ship.177=Skjold
|
||||
model.nation.danish.ship.178=Christian VIII
|
||||
model.nation.danish.ship.179=Dannebrog
|
||||
|
||||
|
||||
# Portuguese colony names
|
||||
|
@ -6543,29 +6549,29 @@ model.nation.russian.ship.48=Zakharii
|
|||
# more from marcin
|
||||
model.nation.russian.ship.49=Oryol
|
||||
model.nation.russian.ship.50=Aist
|
||||
model.nation.russian.ship.51=Aleksandr Nevskii
|
||||
model.nation.russian.ship.51=Aleksandr Nevskii
|
||||
model.nation.russian.ship.52=Apostol Pavel
|
||||
model.nation.russian.ship.53=Apostol Piotr
|
||||
model.nation.russian.ship.54=Arfa
|
||||
model.nation.russian.ship.55=Arkhangel Gavriil
|
||||
model.nation.russian.ship.56=Arkhangel Rafail
|
||||
model.nation.russian.ship.57=Arkhangel Uriil
|
||||
model.nation.russian.ship.55=Arkhangel Gavriil
|
||||
model.nation.russian.ship.56=Arkhangel Rafail
|
||||
model.nation.russian.ship.57=Arkhangel Uriil
|
||||
model.nation.russian.ship.58=Astrakhan
|
||||
model.nation.russian.ship.59=Aziya
|
||||
model.nation.russian.ship.60=Bababan
|
||||
model.nation.russian.ship.61=Bezboyazn
|
||||
model.nation.russian.ship.62=Blagopoluchiye
|
||||
model.nation.russian.ship.63=Blagoye Nachalo
|
||||
model.nation.russian.ship.64=Boris i Gleb
|
||||
model.nation.russian.ship.64=Boris i Gleb
|
||||
model.nation.russian.ship.65=Bozhiye Predvideniye
|
||||
model.nation.russian.ship.66=Cherepaha
|
||||
model.nation.russian.ship.67=Ches‘ma
|
||||
model.nation.russian.ship.68=David Selunskii
|
||||
model.nation.russian.ship.68=David Selunskii
|
||||
model.nation.russian.ship.69=Delfin
|
||||
model.nation.russian.ship.70=Derbent
|
||||
model.nation.russian.ship.71=Deris‘
|
||||
model.nation.russian.ship.72=Derpt
|
||||
model.nation.russian.ship.73=Dmitrii Donskoi
|
||||
model.nation.russian.ship.73=Dmitrii Donskoi
|
||||
model.nation.russian.ship.74=Dumkrakht
|
||||
model.nation.russian.ship.75=Evropa
|
||||
model.nation.russian.ship.76=Flag
|
||||
|
@ -6574,17 +6580,17 @@ model.nation.russian.ship.78=Fridemaker
|
|||
model.nation.russian.ship.79=Friedrichstadt
|
||||
model.nation.russian.ship.80=Gangut
|
||||
model.nation.russian.ship.81=Gerkules
|
||||
model.nation.russian.ship.82=Gorod Arkhangel‘sk
|
||||
model.nation.russian.ship.83=Graf Orlov
|
||||
model.nation.russian.ship.82=Gorod Arkhangel‘sk
|
||||
model.nation.russian.ship.83=Graf Orlov
|
||||
model.nation.russian.ship.84=Granaat-apol
|
||||
model.nation.russian.ship.85=Imperatritsa Anna
|
||||
model.nation.russian.ship.85=Imperatritsa Anna
|
||||
model.nation.russian.ship.86=Ingermanland
|
||||
model.nation.russian.ship.87=Ingermanlandiya
|
||||
model.nation.russian.ship.88=Ioann Zlatoust pervyi
|
||||
model.nation.russian.ship.88=Ioann Zlatoust pervyi
|
||||
model.nation.russian.ship.89=Isaak-Viktoriya
|
||||
model.nation.russian.ship.90=Ivan-gorod
|
||||
model.nation.russian.ship.91=Kamen
|
||||
model.nation.russian.ship.92=Kir Ioann
|
||||
model.nation.russian.ship.92=Kir Ioann
|
||||
model.nation.russian.ship.93=Kolokol
|
||||
model.nation.russian.ship.94=Krepost
|
||||
model.nation.russian.ship.95=Kronshlot
|
||||
|
@ -6596,21 +6602,21 @@ model.nation.russian.ship.100=Liliya
|
|||
model.nation.russian.ship.101=Mars
|
||||
model.nation.russian.ship.102=Merkurii
|
||||
model.nation.russian.ship.103=Miach
|
||||
model.nation.russian.ship.104=Mikhail Arkhangel
|
||||
model.nation.russian.ship.104=Mikhail Arkhangel
|
||||
model.nation.russian.ship.105=Mironosits
|
||||
model.nation.russian.ship.106=Moskva
|
||||
model.nation.russian.ship.107=Narva
|
||||
model.nation.russian.ship.108=Ne Tron‘ Menia
|
||||
model.nation.russian.ship.108=Ne Tron‘ Menia
|
||||
model.nation.russian.ship.109=Neptunus
|
||||
model.nation.russian.ship.110=Nord-Adler
|
||||
model.nation.russian.ship.111=Olifant
|
||||
model.nation.russian.ship.112=Osnovaniye Blagopoluchiya
|
||||
model.nation.russian.ship.112=Osnovaniye Blagopoluchiya
|
||||
model.nation.russian.ship.113=Otvorennuye Vrata
|
||||
model.nation.russian.ship.114=Pamiat‘ Evstafiya
|
||||
model.nation.russian.ship.114=Pamiat‘ Evstafiya
|
||||
model.nation.russian.ship.115=Panteleimon-Viktoriya
|
||||
model.nation.russian.ship.116=Pernov
|
||||
model.nation.russian.ship.117=Peterburg
|
||||
model.nation.russian.ship.118=Piotr I
|
||||
model.nation.russian.ship.118=Piotr I
|
||||
model.nation.russian.ship.119=Pobeda
|
||||
model.nation.russian.ship.120=Poltava
|
||||
model.nation.russian.ship.121=Preslava
|
||||
|
@ -6625,7 +6631,7 @@ model.nation.russian.ship.129=Sankt-Mikhail
|
|||
model.nation.russian.ship.130=Saratov
|
||||
model.nation.russian.ship.131=Schastiye
|
||||
model.nation.russian.ship.132=Selafail
|
||||
model.nation.russian.ship.133=Severnyi Oryol
|
||||
model.nation.russian.ship.133=Severnyi Oryol
|
||||
model.nation.russian.ship.134=Shlissel‘burg
|
||||
model.nation.russian.ship.135=Shpaga
|
||||
model.nation.russian.ship.136=Shtandart
|
||||
|
@ -6642,27 +6648,27 @@ model.nation.russian.ship.146=Staryi Oriol
|
|||
model.nation.russian.ship.147=Strus
|
||||
model.nation.russian.ship.148=Stul
|
||||
model.nation.russian.ship.149=Sulitsa
|
||||
model.nation.russian.ship.150=Sviataya Ekaterina
|
||||
model.nation.russian.ship.151=Sviataya Natal'ya
|
||||
model.nation.russian.ship.152=Sviataya Velokomuchenitsa Varvara
|
||||
model.nation.russian.ship.153=Sviatoi Aleksandr Nevskiy
|
||||
model.nation.russian.ship.154=Sviatoi Andrei
|
||||
model.nation.russian.ship.155=Sviatoi Andrei Pervozvannyi
|
||||
model.nation.russian.ship.156=Sviatoi Dmitrii Rostovskii
|
||||
model.nation.russian.ship.157=Sviatoi Evstafii Plakida
|
||||
model.nation.russian.ship.158=Sviatoi Georgii Pobedonosets
|
||||
model.nation.russian.ship.159=Sviatoi Iakov
|
||||
model.nation.russian.ship.160=Sviatoi Ianuarii
|
||||
model.nation.russian.ship.150=Sviataya Ekaterina
|
||||
model.nation.russian.ship.151=Sviataya Natal'ya
|
||||
model.nation.russian.ship.152=Sviataya Velokomuchenitsa Varvara
|
||||
model.nation.russian.ship.153=Sviatoi Aleksandr Nevskiy
|
||||
model.nation.russian.ship.154=Sviatoi Andrei
|
||||
model.nation.russian.ship.155=Sviatoi Andrei Pervozvannyi
|
||||
model.nation.russian.ship.156=Sviatoi Dmitrii Rostovskii
|
||||
model.nation.russian.ship.157=Sviatoi Evstafii Plakida
|
||||
model.nation.russian.ship.158=Sviatoi Georgii Pobedonosets
|
||||
model.nation.russian.ship.159=Sviatoi Iakov
|
||||
model.nation.russian.ship.160=Sviatoi Ianuarii
|
||||
model.nation.russian.ship.161=Sviatoi Kliment Papa Rimskii
|
||||
model.nation.russian.ship.162=Sviatoi Nikolai
|
||||
model.nation.russian.ship.163=Sviatoi Pavel
|
||||
model.nation.russian.ship.164=Sviatoi Piotr
|
||||
model.nation.russian.ship.165=Sviatoi Sergii
|
||||
model.nation.russian.ship.162=Sviatoi Nikolai
|
||||
model.nation.russian.ship.163=Sviatoi Pavel
|
||||
model.nation.russian.ship.164=Sviatoi Piotr
|
||||
model.nation.russian.ship.165=Sviatoi Sergii
|
||||
model.nation.russian.ship.166=Sviatoslav
|
||||
model.nation.russian.ship.167=Svyatoi Kniaz‘ Vladimir
|
||||
model.nation.russian.ship.167=Svyatoi Kniaz‘ Vladimir
|
||||
model.nation.russian.ship.168=Tri Riumki
|
||||
model.nation.russian.ship.169=Triokh Ierarkhov
|
||||
model.nation.russian.ship.170=Triokh Sviatitelei
|
||||
model.nation.russian.ship.169=Triokh Ierarkhov
|
||||
model.nation.russian.ship.170=Triokh Sviatitelei
|
||||
model.nation.russian.ship.171=Triumf
|
||||
model.nation.russian.ship.172=Tsvet Voiny
|
||||
model.nation.russian.ship.173=Tver‘
|
||||
|
@ -6679,7 +6685,7 @@ model.nation.russian.ship.183=Vyborg
|
|||
model.nation.russian.ship.184=Yagudiil
|
||||
model.nation.russian.ship.185=Yedinorog
|
||||
model.nation.russian.ship.186=Yiozh
|
||||
model.nation.russian.ship.187=Zakharii i Elisavet
|
||||
model.nation.russian.ship.187=Zakharii i Elisavet
|
||||
model.nation.russian.ship.188=Zhuravl stereguschiy
|
||||
model.nation.russian.ship.189=Zvezda
|
||||
|
||||
|
@ -6873,15 +6879,15 @@ model.nation.swedish.ship.7=Bleking
|
|||
model.nation.swedish.ship.8=Bramare
|
||||
#1705
|
||||
model.nation.swedish.ship.9=Bremen
|
||||
model.nation.swedish.ship.10=Bruna Lejon
|
||||
model.nation.swedish.ship.10=Bruna Lejon
|
||||
#Peter Minuit, Delaware
|
||||
model.nation.swedish.ship.11=Calmare Nyckel
|
||||
#1819
|
||||
model.nation.swedish.ship.12=Carl XIII
|
||||
model.nation.swedish.ship.12=Carl XIII
|
||||
#1678
|
||||
model.nation.swedish.ship.13=Carolus IX
|
||||
model.nation.swedish.ship.14=Carolus IX
|
||||
model.nation.swedish.ship.15=Carolus XI
|
||||
model.nation.swedish.ship.13=Carolus IX
|
||||
model.nation.swedish.ship.14=Carolus IX
|
||||
model.nation.swedish.ship.15=Carolus XI
|
||||
#1648
|
||||
model.nation.swedish.ship.16=Cesar
|
||||
#Nya Sverige
|
||||
|
@ -6892,11 +6898,11 @@ model.nation.swedish.ship.19=Drake
|
|||
#1785
|
||||
model.nation.swedish.ship.20=Dristigheten
|
||||
#1774
|
||||
model.nation.swedish.ship.21=Dronning Sofia Magdalena
|
||||
model.nation.swedish.ship.21=Dronning Sofia Magdalena
|
||||
#1680
|
||||
model.nation.swedish.ship.22=Drottning Hedvig Eleanora
|
||||
model.nation.swedish.ship.22=Drottning Hedvig Eleanora
|
||||
#1680
|
||||
model.nation.swedish.ship.23=Drottning Ulrika Eleanora
|
||||
model.nation.swedish.ship.23=Drottning Ulrika Eleanora
|
||||
#1731
|
||||
model.nation.swedish.ship.24=Drottningholm
|
||||
#1784
|
||||
|
@ -6921,78 +6927,78 @@ model.nation.swedish.ship.35=Fama
|
|||
model.nation.swedish.ship.36=Fenix
|
||||
#1735
|
||||
model.nation.swedish.ship.37=Finland
|
||||
model.nation.swedish.ship.38=Finska Memnon
|
||||
model.nation.swedish.ship.39=Finska Svan
|
||||
model.nation.swedish.ship.40=Förgylta Dufva
|
||||
model.nation.swedish.ship.38=Finska Memnon
|
||||
model.nation.swedish.ship.39=Finska Svan
|
||||
model.nation.swedish.ship.40=Förgylta Dufva
|
||||
#1825
|
||||
model.nation.swedish.ship.41=Försiktigheten
|
||||
#1730
|
||||
model.nation.swedish.ship.42=Fred
|
||||
#1698
|
||||
model.nation.swedish.ship.43=Frederika Amalia
|
||||
model.nation.swedish.ship.44=Fredrik Rex
|
||||
model.nation.swedish.ship.43=Frederika Amalia
|
||||
model.nation.swedish.ship.44=Fredrik Rex
|
||||
model.nation.swedish.ship.45=Freedenburg
|
||||
#1731
|
||||
model.nation.swedish.ship.46=Frihet
|
||||
#1634
|
||||
model.nation.swedish.ship.47=Göta Ark
|
||||
model.nation.swedish.ship.47=Göta Ark
|
||||
#1658
|
||||
model.nation.swedish.ship.48=Göteborg
|
||||
#1702
|
||||
model.nation.swedish.ship.49=Götha Lejon
|
||||
model.nation.swedish.ship.49=Götha Lejon
|
||||
#1682
|
||||
model.nation.swedish.ship.50=Gotland
|
||||
#1748
|
||||
model.nation.swedish.ship.51=Greve Sparre
|
||||
model.nation.swedish.ship.51=Greve Sparre
|
||||
model.nation.swedish.ship.52=Grippen
|
||||
#1832
|
||||
model.nation.swedish.ship.53=Gustav den Store
|
||||
model.nation.swedish.ship.53=Gustav den Store
|
||||
model.nation.swedish.ship.54=Gyllene Hajen
|
||||
#1682
|
||||
model.nation.swedish.ship.55=Halland
|
||||
model.nation.swedish.ship.56=Halmstad
|
||||
model.nation.swedish.ship.57=Hector
|
||||
#1781
|
||||
model.nation.swedish.ship.58=Hedvig Elisabet Charlotta
|
||||
model.nation.swedish.ship.58=Hedvig Elisabet Charlotta
|
||||
#1651
|
||||
model.nation.swedish.ship.59=Herkules
|
||||
#1779
|
||||
model.nation.swedish.ship.60=Hertig Ferdinand
|
||||
model.nation.swedish.ship.60=Hertig Ferdinand
|
||||
#1731
|
||||
model.nation.swedish.ship.61=Hessen Cassel
|
||||
model.nation.swedish.ship.61=Hessen Cassel
|
||||
#1675
|
||||
model.nation.swedish.ship.62=Hieronymus
|
||||
model.nation.swedish.ship.63=Hjort
|
||||
model.nation.swedish.ship.64=Hoffi
|
||||
model.nation.swedish.ship.65=Hollands Galej
|
||||
model.nation.swedish.ship.66=Jonas von Emden
|
||||
model.nation.swedish.ship.65=Hollands Galej
|
||||
model.nation.swedish.ship.66=Jonas von Emden
|
||||
#1633
|
||||
model.nation.swedish.ship.67=Jupiter
|
||||
#1677
|
||||
model.nation.swedish.ship.68=Kalmar
|
||||
model.nation.swedish.ship.69=Kalmar Bark
|
||||
model.nation.swedish.ship.69=Kalmar Bark
|
||||
#1824
|
||||
model.nation.swedish.ship.70=Karl XIV Johan
|
||||
model.nation.swedish.ship.70=Karl XIV Johan
|
||||
model.nation.swedish.ship.71=Karlskrona
|
||||
model.nation.swedish.ship.72=Kattan
|
||||
#1775
|
||||
model.nation.swedish.ship.73=Konung Adolph Fredrik
|
||||
model.nation.swedish.ship.73=Konung Adolph Fredrik
|
||||
#1732
|
||||
model.nation.swedish.ship.74=Konung Fredrik
|
||||
model.nation.swedish.ship.74=Konung Fredrik
|
||||
#1777
|
||||
model.nation.swedish.ship.75=Konung Gustaf III
|
||||
model.nation.swedish.ship.75=Konung Gustaf III
|
||||
#1799
|
||||
model.nation.swedish.ship.76=Konung Gustaf IV
|
||||
model.nation.swedish.ship.76=Konung Gustaf IV
|
||||
#1683
|
||||
model.nation.swedish.ship.77=Konung Karl
|
||||
model.nation.swedish.ship.77=Konung Karl
|
||||
#1633
|
||||
model.nation.swedish.ship.78=Kristina
|
||||
#1633
|
||||
model.nation.swedish.ship.79=Krona Ark
|
||||
model.nation.swedish.ship.79=Krona Ark
|
||||
#1668
|
||||
model.nation.swedish.ship.80=Kronan
|
||||
#1782
|
||||
model.nation.swedish.ship.81=Kronprins Gustaf Adolph
|
||||
model.nation.swedish.ship.81=Kronprins Gustaf Adolph
|
||||
#1711
|
||||
model.nation.swedish.ship.82=Kronskepp
|
||||
#1677
|
||||
|
@ -7000,10 +7006,10 @@ model.nation.swedish.ship.83=Lax
|
|||
#1682
|
||||
model.nation.swedish.ship.84=Lifland
|
||||
model.nation.swedish.ship.85=Lilia
|
||||
model.nation.swedish.ship.86=Lilla Hjort
|
||||
model.nation.swedish.ship.87=Lilla Svan
|
||||
model.nation.swedish.ship.86=Lilla Hjort
|
||||
model.nation.swedish.ship.87=Lilla Svan
|
||||
#1789
|
||||
model.nation.swedish.ship.88=Louisa Ulrika
|
||||
model.nation.swedish.ship.88=Louisa Ulrika
|
||||
#1655
|
||||
model.nation.swedish.ship.89=Mane
|
||||
#1785
|
||||
|
@ -7040,30 +7046,30 @@ model.nation.swedish.ship.106=Patentia
|
|||
model.nation.swedish.ship.107=Pelikan
|
||||
#1692
|
||||
model.nation.swedish.ship.108=Pommern
|
||||
model.nation.swedish.ship.109=Princessa Hedvig
|
||||
model.nation.swedish.ship.109=Princessa Hedvig
|
||||
#1682
|
||||
model.nation.swedish.ship.110=Prins Carl
|
||||
model.nation.swedish.ship.110=Prins Carl
|
||||
#1704
|
||||
model.nation.swedish.ship.111=Prins Carl Fredrik
|
||||
model.nation.swedish.ship.111=Prins Carl Fredrik
|
||||
#1774
|
||||
model.nation.swedish.ship.112=Prins Fredrik Adolph
|
||||
model.nation.swedish.ship.112=Prins Fredrik Adolph
|
||||
#1758
|
||||
model.nation.swedish.ship.113=Prins Gustaf
|
||||
model.nation.swedish.ship.113=Prins Gustaf
|
||||
#1694
|
||||
model.nation.swedish.ship.114=Prins Karl
|
||||
model.nation.swedish.ship.114=Prins Karl
|
||||
#1830
|
||||
model.nation.swedish.ship.115=Prins Oscar
|
||||
model.nation.swedish.ship.116=Prins Wilhelm
|
||||
model.nation.swedish.ship.115=Prins Oscar
|
||||
model.nation.swedish.ship.116=Prins Wilhelm
|
||||
model.nation.swedish.ship.117=Prinsessa Fredrika von Hessen
|
||||
#1694
|
||||
model.nation.swedish.ship.118=Prinsessa Hedvig Sophia
|
||||
model.nation.swedish.ship.118=Prinsessa Hedvig Sophia
|
||||
#1694
|
||||
model.nation.swedish.ship.119=Prinsessa Ulrika
|
||||
model.nation.swedish.ship.119=Prinsessa Ulrika
|
||||
#1764
|
||||
model.nation.swedish.ship.120=Prinsessin Sophia Albertina
|
||||
model.nation.swedish.ship.121=Prints Gustav
|
||||
model.nation.swedish.ship.120=Prinsessin Sophia Albertina
|
||||
model.nation.swedish.ship.121=Prints Gustav
|
||||
#1692
|
||||
model.nation.swedish.ship.122=Prinzessin Ulrika Eleanora
|
||||
model.nation.swedish.ship.122=Prinzessin Ulrika Eleanora
|
||||
#1783
|
||||
model.nation.swedish.ship.123=Rättvisan
|
||||
#1727
|
||||
|
@ -7071,11 +7077,11 @@ model.nation.swedish.ship.124=Reilt
|
|||
#1708
|
||||
model.nation.swedish.ship.125=Riga
|
||||
#1570
|
||||
model.nation.swedish.ship.126=Röda Drake
|
||||
model.nation.swedish.ship.127=Röda Hund
|
||||
model.nation.swedish.ship.128=Roda Lejon
|
||||
model.nation.swedish.ship.126=Röda Drake
|
||||
model.nation.swedish.ship.127=Röda Hund
|
||||
model.nation.swedish.ship.128=Roda Lejon
|
||||
#1649
|
||||
model.nation.swedish.ship.129=Sankt Anna
|
||||
model.nation.swedish.ship.129=Sankt Anna
|
||||
#1662
|
||||
model.nation.swedish.ship.130=Saturnus
|
||||
#1636
|
||||
|
@ -7083,7 +7089,7 @@ model.nation.swedish.ship.131=Scepter
|
|||
#1697
|
||||
model.nation.swedish.ship.132=Skåne
|
||||
#1564
|
||||
model.nation.swedish.ship.133=Skotska Pincka
|
||||
model.nation.swedish.ship.133=Skotska Pincka
|
||||
#1694
|
||||
model.nation.swedish.ship.134=Småland
|
||||
#1693
|
||||
|
@ -7091,13 +7097,13 @@ model.nation.swedish.ship.135=Södermanland
|
|||
#1667
|
||||
model.nation.swedish.ship.136=Sol
|
||||
#1725
|
||||
model.nation.swedish.ship.137=Sophia Charlotta
|
||||
model.nation.swedish.ship.137=Sophia Charlotta
|
||||
#1666
|
||||
model.nation.swedish.ship.138=Spes
|
||||
model.nation.swedish.ship.139=Sprengeporten
|
||||
model.nation.swedish.ship.140=St Christopher
|
||||
model.nation.swedish.ship.140=St Christopher
|
||||
#1560
|
||||
model.nation.swedish.ship.141=St Erik
|
||||
model.nation.swedish.ship.141=St Erik
|
||||
#1695
|
||||
model.nation.swedish.ship.142=Stettin
|
||||
model.nation.swedish.ship.143=Stockholm
|
||||
|
@ -7105,22 +7111,22 @@ model.nation.swedish.ship.144=Suanen
|
|||
#1662
|
||||
model.nation.swedish.ship.145=Svärdet
|
||||
#1559
|
||||
model.nation.swedish.ship.146=Svenska Hektor
|
||||
model.nation.swedish.ship.147=Svenska Lejon
|
||||
model.nation.swedish.ship.148=Svenska Morian
|
||||
model.nation.swedish.ship.146=Svenska Hektor
|
||||
model.nation.swedish.ship.147=Svenska Lejon
|
||||
model.nation.swedish.ship.148=Svenska Morian
|
||||
#1734
|
||||
model.nation.swedish.ship.149=Sverige
|
||||
#1785
|
||||
model.nation.swedish.ship.150=Tapperheten
|
||||
model.nation.swedish.ship.151=Tranheje
|
||||
#1706
|
||||
model.nation.swedish.ship.152=Tre Kroner
|
||||
model.nation.swedish.ship.152=Tre Kroner
|
||||
#1642
|
||||
model.nation.swedish.ship.153=Tre Lejon
|
||||
model.nation.swedish.ship.153=Tre Lejon
|
||||
#1598
|
||||
model.nation.swedish.ship.154=Trekronor
|
||||
#1719
|
||||
model.nation.swedish.ship.155=Ulrika Eleonora
|
||||
model.nation.swedish.ship.155=Ulrika Eleonora
|
||||
#1642
|
||||
model.nation.swedish.ship.156=Ulven
|
||||
model.nation.swedish.ship.157=Upland
|
||||
|
@ -7152,7 +7158,7 @@ model.nation.swedish.ship.170=Wladislaff
|
|||
#1664
|
||||
model.nation.swedish.ship.171=Wrangel
|
||||
#1675
|
||||
model.nation.swedish.ship.172=Wrangels Pallats
|
||||
model.nation.swedish.ship.172=Wrangels Pallats
|
||||
#1697
|
||||
model.nation.swedish.ship.173=Wrede
|
||||
|
||||
|
|
|
@ -2050,6 +2050,7 @@ model.messageType.unitAdded.name=Unanennoù ouzhpennet
|
|||
model.messageType.unitDemoted.name=Disrenkañ unanennoù
|
||||
model.messageType.unitImproved.name=Gwellaat unanennoù
|
||||
model.messageType.unitLost.name=Unanennoù kollet
|
||||
model.messageType.unitRepaired.name=Kempenn un unvez
|
||||
model.messageType.warehouseCapacity.name=Barregezh ar sanailh
|
||||
model.messageType.warning.name=Kemennoù diwall
|
||||
model.monarch.action.addToRef.text=Ouzhpennet eo bet gant ar Gurunenn {{plural:%number%|%unit%}} d'ar Bagad Brezel Roueel. Ankeniet eo renerien an trevadennoù.
|
||||
|
|
|
@ -1975,18 +1975,13 @@ model.colony.veryBadGovernment=Vláda kolonie %colony% je velmi neefektivní. Pr
|
|||
model.colony.veryGoodGovernment=Efektivita vlády se zvýšila! V %colony% se nyní sympatie k rebelům rovnají nebo překračují %number% procent.
|
||||
model.colonyTile.claim=(požadavek %direction%)
|
||||
model.diplomaticTrade.receive.contact=Bratrské pozdravy od slavného národa %nation%.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.receive.diplomatic=Pojďme vyjednávat s {{tag:country|%nation%}}.
|
||||
model.diplomaticTrade.receive.diplomatic=Pojďme vyjednávat s %nation%.
|
||||
model.diplomaticTrade.receive.trade=Nechte nás zvážit %nation% obchodní nabídku.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.receive.tribute={{tag:country|%nation%}} po nás požadují tribut!
|
||||
model.diplomaticTrade.receive.tribute=%nation% po nás požadují tribut!
|
||||
model.diplomaticTrade.send.contact=Setkali jsme se s členy %nation% národa.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.diplomatic=Zvažme naši diplomatickou situaci s {{tag:country|%nation%}}.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.trade=Dovolte nám navrhnout obchod s {{tag:country|%nation%}} v %settlement%.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.tribute=Požadujeme tribut od {{tag:country|%nation%}} v %settlement%.
|
||||
model.diplomaticTrade.send.diplomatic=Zvažme naši diplomatickou situaci s %nation%.
|
||||
model.diplomaticTrade.send.trade=Dovolte nám navrhnout obchod s %nation% v %settlement%.
|
||||
model.diplomaticTrade.send.tribute=Požadujeme tribut od %nation% v %settlement%.
|
||||
model.direction.N.name=sever
|
||||
model.direction.NE.name=severovýchod
|
||||
model.direction.E.name=východ
|
||||
|
@ -2919,12 +2914,10 @@ negotiationDialog.add=Přidat
|
|||
negotiationDialog.cancel=Storno
|
||||
negotiationDialog.clear=Vyčistit
|
||||
negotiationDialog.contact.tutorial=Potkali jste přátelské Evropany. Budou s vámi soupeřit o zemi a bohatství a mohou proti vám vést válku. Až se ke kongresu připojí Jan de Witt, budete s nimi moci také obchodovat.
|
||||
# Fuzzy
|
||||
negotiationDialog.demand={{tag:country|%nation%}} požaduje od země {{tag:country|%otherNation%}}
|
||||
negotiationDialog.demand=%nation% požaduje od země %otherNation%
|
||||
negotiationDialog.exchange=výměnou za
|
||||
negotiationDialog.goldAvailable=(%amount% zlata k dispozici)
|
||||
# Fuzzy
|
||||
negotiationDialog.offer={{tag:country|%nation%}} nabízí zemi {{tag:country|%otherNation%}}
|
||||
negotiationDialog.offer=%nation% nabízí zemi %otherNation%
|
||||
negotiationDialog.send=Poslat
|
||||
negotiationDialog.title.contact=Setkání s přátelskými Evropany
|
||||
negotiationDialog.title.diplomatic=Diplomatická vyjednávání
|
||||
|
|
|
@ -1975,18 +1975,13 @@ model.colony.veryBadGovernment=Forvaltningen af %colony% er meget ineffektiv! H
|
|||
model.colony.veryGoodGovernment=Forvaltningseffektiviteten er blevet forbedret! Oprørsstemningen i %colony% er den samme, eller højere end, %number% procent.
|
||||
model.colonyTile.claim=(kræv %direction%)
|
||||
model.diplomaticTrade.receive.contact=Broderlige hilsner fra den gloværdige %nation%-nation.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.receive.diplomatic=Lad os forhandle med {{tag:country|%nation%}}.
|
||||
model.diplomaticTrade.receive.diplomatic=Lad os forhandle med %nation%.
|
||||
model.diplomaticTrade.receive.trade=Lad os overveje %nation%s handelstilbud.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.receive.tribute={{tag:country|%nation%}} kræver tribut af os!
|
||||
model.diplomaticTrade.receive.tribute=%nation% kræver tribut af os!
|
||||
model.diplomaticTrade.send.contact=Vi har mødt medlemmer af nationen %nation%.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.diplomatic=Lad os overveje vores diplomatiske situation i forhold til {{tag:country|%nation%}}.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.trade=Lad os foreslå en handel med den {{tag:country|%nation%}} på %settlement%.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.tribute=Vi kræver tribut af {{tag:country|%nation%}} på %settlement%.
|
||||
model.diplomaticTrade.send.diplomatic=Lad os overveje vores diplomatiske situation i forhold til %nation%.
|
||||
model.diplomaticTrade.send.trade=Lad os foreslå en handel med %nation% ved %settlement%.
|
||||
model.diplomaticTrade.send.tribute=Vi kræver tribut af %nation% ved %settlement%.
|
||||
model.direction.N.name=nord
|
||||
model.direction.NE.name=nord-øst
|
||||
model.direction.E.name=øst
|
||||
|
@ -2064,6 +2059,7 @@ model.messageType.unitAdded.name=Enheder tilføjet
|
|||
model.messageType.unitDemoted.name=Enhedsdegraderinger
|
||||
model.messageType.unitImproved.name=Enhedsforbedringer
|
||||
model.messageType.unitLost.name=Enheder tabt
|
||||
model.messageType.unitRepaired.name=Enhedsreparationer
|
||||
model.messageType.warehouseCapacity.name=Lagerkapacitet
|
||||
model.messageType.warning.name=Advarsler
|
||||
model.monarch.action.addToRef.text=Kronen har tilføjet %number% {{plural:%number%|%unit%}} til den Kongelige Ekspeditionsstyrke. Koloniledere udtrykker bekymring.
|
||||
|
@ -2920,12 +2916,10 @@ negotiationDialog.add=Tilføj
|
|||
negotiationDialog.cancel=Afbryd
|
||||
negotiationDialog.clear=Ryd
|
||||
negotiationDialog.contact.tutorial=Du møder andre europæere. De vil konkurrere med dig om jord og rigdom og måske indlede krig mod dig. Men efter Jan de Witt har tilsluttet sig den kontinentale kongress, kan du handle med dem.
|
||||
# Fuzzy
|
||||
negotiationDialog.demand={{tag:country|%nation%}} kræver af {{tag:country|%otherNation%}}
|
||||
negotiationDialog.demand=%nation% kræver af %otherNation%
|
||||
negotiationDialog.exchange=i bytte for
|
||||
negotiationDialog.goldAvailable=(%amount% guldstykker tilgængelig)
|
||||
# Fuzzy
|
||||
negotiationDialog.offer={{tag:country|%nation%}} tilbyder {{tag:country|%otherNation%}}
|
||||
negotiationDialog.offer=%nation% tilbyder %otherNation%
|
||||
negotiationDialog.send=Send
|
||||
negotiationDialog.title.contact=Møde andre europæere
|
||||
negotiationDialog.title.diplomatic=Diplomatisk forhandling
|
||||
|
|
|
@ -2035,6 +2035,7 @@ model.messageType.unitAdded.name=Hinzugefügte Einheiten
|
|||
model.messageType.unitDemoted.name=Degradierungen
|
||||
model.messageType.unitImproved.name=Beförderungen
|
||||
model.messageType.unitLost.name=Verlorene Einheiten
|
||||
model.messageType.unitRepaired.name=Einheitsreparaturen
|
||||
model.messageType.warehouseCapacity.name=Lagerkapazität
|
||||
model.messageType.warning.name=Warnungen
|
||||
model.monarch.action.addToRef.text=Die Krone hat dem königlichen Expeditionskorps %number% {{plural:%number%|%unit%}} hinzugefügt. Die Anführer der Kolonien äußern sich besorgt.
|
||||
|
|
|
@ -2155,7 +2155,7 @@ model.noAddReason.anotherColony.description=Este lugar está siendo usado por ot
|
|||
model.noAddReason.capacityExceeded.description=No hay suficiente espacio en este lugar.
|
||||
model.noAddReason.claimRequired.description=Este lugar es propiedad de otra nación, pero podía ser reclamada.
|
||||
model.noAddReason.colonyCenter.description=No se puede añadir nada en el centro de la colonia.
|
||||
model.noAddReason.maximumSkill.description=La habilidad de la unidad excede la máxima habilidad soportada por este lugar.
|
||||
model.noAddReason.maximumSkill.description=La habilidad de la unidad excede la máxima habilidad admitida por este lugar.
|
||||
model.noAddReason.minimumSkill.description=La unidad no tiene la habilidad mínima necesaria para trabajar en este lugar.
|
||||
model.noAddReason.missingAbility.description=No se puede trabajar en este lugar hasta que se construya el muelle.
|
||||
model.noAddReason.missingSkill.description=Se requiere una habilidad especial para trabajar en este lugar.
|
||||
|
|
|
@ -2059,6 +2059,7 @@ model.messageType.unitAdded.name=Nouveaux colons
|
|||
model.messageType.unitDemoted.name=Dégradations d’unités
|
||||
model.messageType.unitImproved.name=Promotions d’unités
|
||||
model.messageType.unitLost.name=Pertes d’unités
|
||||
model.messageType.unitRepaired.name=Réparations d’unité
|
||||
model.messageType.warehouseCapacity.name=Capacité des entrepôts
|
||||
model.messageType.warning.name=Alertes
|
||||
model.monarch.action.addToRef.text=La Couronne a ajouté %number% {{plural:%number%|%unit%}} au Corps expéditionnaire royal. Les chefs coloniaux expriment leur inquiétude.
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
# Author: Dj
|
||||
# Author: Faller.gyula
|
||||
# Author: Glanthor Reviol
|
||||
# Author: Hszp
|
||||
# Author: Leiric
|
||||
# Author: Macofe
|
||||
# Author: R-Joe
|
||||
|
@ -120,6 +121,7 @@ recruit=Toborzás
|
|||
rules=Szabályok
|
||||
sailingToAmerica=Amerikába tart
|
||||
sailingToEurope=Európába jön
|
||||
sales=Adásvétel
|
||||
sentry=Őrség
|
||||
setSail=Vitorlát bonts!
|
||||
settlement=Település
|
||||
|
@ -211,7 +213,7 @@ menuBar.orders=Parancsok
|
|||
menuBar.report=Jelentések
|
||||
menuBar.tools=Eszközök
|
||||
menuBar.view=Nézet
|
||||
menuBar.statusLine=Pontok: %score% | Arany: %gold% | Adó: %tax%% | Dátum: %year%
|
||||
menuBar.statusLine=Pontszám: %score% | Arany: %gold% | Adó: %tax%% | Dátum: %year%
|
||||
menuBar.debug=Bug javítás
|
||||
menuBar.debug.addBuilding=Add building to each colony
|
||||
menuBar.debug.addFoundingFather=Add Founding Father
|
||||
|
@ -284,6 +286,8 @@ loadAction.name=Berakodás
|
|||
mapControlsAction.name=Terkép navigáció
|
||||
mapEditorAction.name=Térképszerkesztő
|
||||
mapGeneratorOptionsAction.name=Térképgenerátor beállítások mutatása
|
||||
miniMapToggleBordersAction.name=Váltás politikai és gazdasági térképnézet között
|
||||
miniMapToggleFogOfWarAction.name=Harci köd
|
||||
miniMapZoomInAction.name=Kistérkép nagyítása
|
||||
miniMapZoomOutAction.name=Kistérkép kicsinyítése
|
||||
moveAction.E.name=Menj Keletnek
|
||||
|
@ -318,16 +322,16 @@ reportExplorationAction.name=Felfedezési jelentés
|
|||
reportForeignAction.name=Külügyi tanácsos
|
||||
reportHighScoresAction.name=Ranglista
|
||||
reportHistoryAction.name=Történelmi beszámoló
|
||||
reportIndianAction.name=Őslakosügyi tanácsos
|
||||
reportIndianAction.name=Indiánügyi tanácsos
|
||||
reportLabourAction.name=Munkaügyi tanácsos
|
||||
reportMilitaryAction.name=Hadügyi tanácsos
|
||||
reportNavalAction.name=Hajózási tanácsos
|
||||
reportProductionAction.name=Termelési jelentés
|
||||
reportReligionAction.name=Vallásügyi tanácsos
|
||||
reportRequirementsAction.name=Követelmények
|
||||
reportRequirementsAction.name=Igények
|
||||
reportTradeAction.name=Kereskedelmi tanácsos
|
||||
reportTurnAction.name=Körönkénti jelentés
|
||||
retireAction.name=Vissszavonulás
|
||||
retireAction.name=Visszavonulás
|
||||
roadAction.name=Útépítés
|
||||
saveAction.name=Mentés
|
||||
saveAndQuitAction.name=Mentés és kilépés
|
||||
|
@ -452,13 +456,15 @@ model.option.tileProduction.medium.name=Közepes
|
|||
model.option.tileProduction.high.name=Magas
|
||||
model.option.tileProduction.veryHigh.name=Nagyon magas
|
||||
model.difficulty.cheat.name=MI-Csalás
|
||||
model.option.equipScoutCheat.name=Felszerelés felderítőnek
|
||||
model.option.equipPioneerCheat.name=Felszerelés pionírnak
|
||||
gameOptions.name=Játékszabályok
|
||||
gameOptions.shortDescription=A játékszabályok beállításai.
|
||||
gameOptions.map.name=Térkép
|
||||
gameOptions.map.shortDescription=A térkép beállításai.
|
||||
model.option.turnsToSail.name=Áthajózási körök
|
||||
model.option.turnsToSail.shortDescription=Az Európából az Újvilágba való áthajózáshoz szükséges körök száma.
|
||||
model.option.fogOfWar.name=A háború leple (FoW)
|
||||
model.option.fogOfWar.name=Harci köd
|
||||
model.option.fogOfWar.shortDescription=A látókörünkön kivül eső ellenséges egységek el legyenek rejtve?
|
||||
model.option.explorationPoints.name=Felfedezési pontok
|
||||
model.option.explorationPoints.shortDescription=Járjon pont a felfedezések után?
|
||||
|
@ -710,10 +716,12 @@ model.option.rememberPanelPositions.name=Panel pozíciók megjegyzése
|
|||
model.option.rememberPanelPositions.shortDescription=Megjegyzi a különböző panelek helyét a képernyőn.
|
||||
model.option.smoothRendering.name=Finom renderelés
|
||||
model.option.smoothRendering.shortDescription=A kistérkép simítása ha le van kicsinyítve.
|
||||
model.option.miniMapToggleFogOfWar.name=Harci köd a kistérképen
|
||||
model.option.miniMapToggleFogOfWar.shortDescription=Jelzi a harci ködöt a kistérképen, ha be van kapcsolva.
|
||||
model.option.mapControls.name=Térkép navigáció
|
||||
model.option.mapControls.shortDescription=Milyen térképnavigáció jelenjen meg.
|
||||
model.option.color.background.name=Háttérszín
|
||||
model.option.color.background.shortDescription=Mikor a kistérkép teljesen le van kicsinyítve, ez a szín keretezi a térképet és a háború leplét (FoW).
|
||||
model.option.color.background.shortDescription=Mikor a kistérkép teljesen le van kicsinyítve, ez a szín keretezi a térképet és harci ködöt.
|
||||
clientOptions.minimap.color.background.black=Fekete
|
||||
clientOptions.minimap.color.background.gray.dark.very=Nagyon sötét szürke
|
||||
clientOptions.minimap.color.background.gray.dark=Sötétszürke
|
||||
|
@ -725,6 +733,7 @@ model.option.displayTileText.name=Mezőszövegek
|
|||
model.option.displayTileText.shortDescription=Mely adatok jelenjenek meg a mezőkön.
|
||||
model.option.displayColonyLabels.name=Gyarmat címkék
|
||||
model.option.displayColonyLabels.shortDescription=A gyarmatok címkéjének stílusa.
|
||||
clientOptions.gui.displayColonyLabels.none.name=Nincs
|
||||
model.option.colonyComparator.name=Gyarmatok csoportosítása...
|
||||
model.option.colonyComparator.shortDescription=Meghatározza a gyarmatok csoportosításának szempontját.
|
||||
clientOptions.gui.colonyComparator.byName.name=Név
|
||||
|
@ -839,13 +848,16 @@ clientOptions.mods.shortDescription=Játékmódosítások ehetőségének beáll
|
|||
clientOptions.etc.name=Stb
|
||||
model.ability.ambushPenalty.name=Rajtaütés büntetés
|
||||
model.ability.ambushPenalty.shortDescription=Ezt a nemzetet levonások sújtják rajtaütésekkor.
|
||||
model.ability.armed.name=Felfegyverzett
|
||||
model.ability.armed.shortDescription=Felfegyverzett egységek
|
||||
model.ability.automaticEquipment.shortDescription=Az egységek maguktól fegyvert ragadnak a település védelmére
|
||||
model.ability.bombard.name=Bombázás
|
||||
model.ability.bombard.shortDescription=Bombázásra képes egységek
|
||||
model.ability.bombardShips.name=Hajók bombázása
|
||||
model.ability.bombardShips.shortDescription=Ellenséges hajók bombázása a szomszédos mezőkön.
|
||||
model.ability.bornInColony.name=Gyarmaton született
|
||||
model.ability.bornInColony.shortDescription=Gyarmaton született egységek
|
||||
model.ability.bornInIndianSettlement.name=Őslakos településen született
|
||||
model.ability.bornInIndianSettlement.name=Bennszülött településen született
|
||||
model.ability.bornInIndianSettlement.shortDescription=Őslakos településen született egységek
|
||||
model.ability.build.name=Építés
|
||||
model.ability.build.shortDescription=Az egységek, eszközök vagy épületek építésének képessége
|
||||
|
@ -863,6 +875,8 @@ model.ability.carryGoods.shortDescription=Ez az egység képes árut szállítan
|
|||
model.ability.carryUnits.name=Egységek szállítása
|
||||
model.ability.carryUnits.shortDescription=Ez az egység képes más egységek szállítására.
|
||||
model.ability.coastalOnly.name=Csak tengerparti
|
||||
model.ability.demandTribute.name=Sarc követelése
|
||||
model.ability.demandTribute.shortDescription=Ez az egység sarcot követelhet ellenséges településektől
|
||||
model.ability.electFoundingFather.name=Alapító atyák választása
|
||||
model.ability.electFoundingFather.shortDescription=Ez a nemzet jogosult Alapító Atyák választására.
|
||||
model.ability.evadeAttack.name=Támadás elkerülése
|
||||
|
@ -874,7 +888,7 @@ model.ability.foundsColonies.shortDescription=Ez a nemzet képes új gyarmatokat
|
|||
model.ability.hasPort.name=Hozzáférés a Tengerhez
|
||||
model.ability.hasPort.shortDescription=Ennek a helynek közvetlen vagy közvetett hozzáférése van a tengerhez.
|
||||
model.ability.ignoreEuropeanWars.name=Európai háborúk figyelmen kívül hagyása
|
||||
model.ability.inciteNatives.name=Őslakosok ösztönzése
|
||||
model.ability.inciteNatives.name=Őslakosok uszítása
|
||||
model.ability.independenceDeclared.name=Függetlenségi Nyilatkozat
|
||||
model.ability.independenceDeclared.shortDescription=Ez az ország kinyilvánította függetlenségét
|
||||
model.ability.independentNation.name=Független nemzet
|
||||
|
@ -882,7 +896,7 @@ model.ability.independentNation.shortDescription=Egy független nemzet
|
|||
model.ability.mercenaryUnit.name=Zsoldos egység
|
||||
model.ability.moveToEurope.name=Út Európába
|
||||
model.ability.moveToEurope.shortDescription=Ez a csempe lehetővé teszi az egységek mozgását Európa felé
|
||||
model.ability.native.name=Őslakos
|
||||
model.ability.native.name=Indián
|
||||
model.ability.native.shortDescription=Bennszülőtt amerikai
|
||||
model.ability.navalUnit.name=Tengeri egység
|
||||
model.ability.navalUnit.shortDescription=Ez egy haditengerészeti egység.
|
||||
|
@ -892,8 +906,8 @@ model.ability.pillageUnprotectedColony.name=Fosztogatás
|
|||
model.ability.pillageUnprotectedColony.shortDescription=Ki tud fosztani védtelen gyarmatokat
|
||||
model.ability.piracy.name=Kalózkodás
|
||||
model.ability.piracy.shortDescription=Ez egy kalóz egység
|
||||
model.ability.plunderNatives.name=Őslakosok kifosztása
|
||||
model.ability.plunderNatives.shortDescription=Fokozza az őslakos települések elpusztításából kapott zsákmány mennyiségét
|
||||
model.ability.plunderNatives.name=Bennszülöttek kifosztása
|
||||
model.ability.plunderNatives.shortDescription=Fokozza a bennszülött települések elpusztításából kapott zsákmány mennyiségét
|
||||
model.ability.produceInWater.shortDescription=Ez az egység képes ugyanúgy használni a vízi mezőket, mint a szárazföldi mezőket
|
||||
model.ability.repairUnits.name=Egységek megjavítása
|
||||
model.ability.repairUnits.shortDescription=Képes bizonyos típusú sérült egységek megjavítására
|
||||
|
@ -1196,6 +1210,7 @@ model.goods.furs.name=Prém
|
|||
model.goods.furs.description=A prémekből a szűcsök készítenek meleg kabátokat.
|
||||
model.goods.furs.workAs=Dolgozz prémvadászként %claim%(%amount% Prém)
|
||||
model.goods.furs.workingAs=egy Prémvadász
|
||||
model.goods.grain.name={{plural:%amount%|one=Gabona|other=Gabona|default=Gabona}}
|
||||
model.goods.grain.workAs=Dolgozz földművesként %claim%(%amount% Gabona)
|
||||
model.goods.grain.workingAs=egy Földműves
|
||||
# Fuzzy
|
||||
|
@ -1281,7 +1296,7 @@ model.nation.arawak.name=arawak
|
|||
model.nation.arawak.ruler=Tamanaco
|
||||
model.nation.aztec.name=azték
|
||||
model.nation.aztec.ruler=II. Montezuma
|
||||
model.nation.cherokee.name=cherokee
|
||||
model.nation.cherokee.name=cseroki
|
||||
model.nation.cherokee.ruler=Moytoy
|
||||
model.nation.inca.name=inka
|
||||
model.nation.inca.ruler=Atahualpa
|
||||
|
@ -1350,8 +1365,8 @@ model.nationType.aztec.name=Azték
|
|||
model.nationType.aztec.description=Az Azték nemzet
|
||||
model.nationType.building.name=Építkezés
|
||||
model.nationType.building.shortDescription=Több építőanyagot termel.
|
||||
model.nationType.cherokee.name=Cherokee
|
||||
model.nationType.cherokee.description=A Cherokee törzs
|
||||
model.nationType.cherokee.name=Cseroki
|
||||
model.nationType.cherokee.description=A cseroki nép
|
||||
model.nationType.conquest.name=Hódítás
|
||||
model.nationType.conquest.shortDescription=Sikeresebben térít indiánokat.
|
||||
model.nationType.cooperation.name=Együttműködés
|
||||
|
@ -1365,7 +1380,7 @@ model.nationType.immigration.shortDescription=Nagyobb számban vándorolnak ki.
|
|||
model.nationType.inca.name=Inka
|
||||
model.nationType.inca.description=Az Inka Birodalom
|
||||
model.nationType.iroquois.name=Irokéz
|
||||
model.nationType.iroquois.description=Az Irokéz törzs
|
||||
model.nationType.iroquois.description=Az irokéz nép
|
||||
model.nationType.naval.name=Hajózás
|
||||
model.nationType.naval.shortDescription=A hajók gyorsabban mozognak.
|
||||
model.nationType.ref.name=Királyi Expedíciós Erők
|
||||
|
@ -1400,6 +1415,19 @@ model.resource.sugar.name=Cukornád
|
|||
model.resource.sugar.description=A szavanna földje kivételesen jó adottságokkal rendelkezik cukornád termesztés szempontjából.
|
||||
model.resource.tobacco.name=Dohány
|
||||
model.resource.tobacco.description=A gyepű talaja kiválóan alkalmas dohány termesztésére.
|
||||
model.role.armedBrave.name=Felfegyverzett indián harcos
|
||||
model.role.missionary.name=Hittérítő
|
||||
model.role.pioneer.name=Pionír
|
||||
model.role.change.dragoon=Felfegyverzés dragonyosnak
|
||||
model.role.change.missionary=Kinevezés hittérítőnek
|
||||
model.role.change.pioneer=Felszerelés szerszámokkal
|
||||
model.role.change.scout=Felszerelés felderítőnek
|
||||
model.role.change.default.soldier=Felfegyverzés
|
||||
model.role.change.missionary.default=Hittérítő státusz megszüntetése
|
||||
model.role.change.missionary.soldier=Felfegyverzés
|
||||
model.role.change.pioneer.soldier=Felfegyverzés
|
||||
model.role.change.scout.soldier=Felfegyverzés lovak nélkül
|
||||
model.role.change.soldier.default=Lefegyverzés
|
||||
model.settlement.aztec.capital.name=Azték város
|
||||
model.settlement.aztec.name=Azték város
|
||||
model.settlement.aztec.plural=város
|
||||
|
@ -1511,8 +1539,7 @@ model.unit.indenturedServant.description=A lekötelezett szolgák kivándorlásu
|
|||
# Fuzzy
|
||||
model.unit.indianConvert.name=Megtért indián
|
||||
model.unit.indianConvert.description=A megtért indiánok olyan kikeresztelkedett őslakosok, akik elhagyták törzsüket és régi hitüket, hogy csatlakozhassanak hozzánk. Sokrétű tudásuk kiváló munkássá teszik őket, de az ipari feladatokhoz nem értenek. Miután Bartolome de las Casas csatlakozik a Kontinentális Kongresszushoz, a megtért indiánokból szabad telepes válik.
|
||||
# Fuzzy
|
||||
model.unit.jesuitMissionary.name=Jezsuita hittérítő
|
||||
model.unit.jesuitMissionary.name={{plural:%number%|one=Jezsuita hittérítő|other=Jezsuita hittérítők|default=Jezsuita hittérítő}}
|
||||
model.unit.jesuitMissionary.description=A Jezsuita hittérítők képesek missziók építésére és különös érzékük van a 'vadak' megtérítésében.
|
||||
# Fuzzy
|
||||
model.unit.masterBlacksmith.name=Kovácsmester
|
||||
|
@ -1599,8 +1626,7 @@ model.unit.colonialRegular.dragoon=Gyarmati lovasság
|
|||
model.unit.colonialRegular.soldier=Gyarmati gyalogság
|
||||
# Fuzzy
|
||||
model.unit.hardyPioneer.pioneer=Edzett pionír
|
||||
# Fuzzy
|
||||
model.unit.jesuitMissionary.missionary=Jezsuita hittérítő
|
||||
model.unit.jesuitMissionary.missionary={{plural:%number%|one=Jezsuita hittérítő|other=Jezsuita hittérítők|default=Jezsuita hittérítő}}
|
||||
model.unit.kingsRegular.cavalry=Lovasság
|
||||
model.unit.kingsRegular.infantry=Gyalogság
|
||||
# Fuzzy
|
||||
|
@ -1653,16 +1679,18 @@ model.colony.stance.war=A(z) %nation% nemzet lőni fog rád, ha lehetősége ad
|
|||
model.colony.unbuildable=%colony% jelenleg nem építhet %object%-t. A(z) %object% kikerült az építési sorból.
|
||||
model.colony.veryBadGovernment=A %colony%i önkormányzat működésképtelen, ezért erős termelési levonások sújtják a települést.
|
||||
model.colony.veryGoodGovernment=A kormányzati hatékonyság javult! Lázadó hangulat %colony% területén most eléri vagy meghaladja a(z) %number% százalékot.
|
||||
model.colonyTile.claim=(új terület: %direction%)
|
||||
model.diplomaticTrade.receive.contact=Testvéri üdvözlet a dicsőséges %nation% nemzettől.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.receive.diplomatic=Engedj tárgyalni a(z) {{tag:country|%nation%}} nemzettel.
|
||||
model.diplomaticTrade.receive.trade=Engedd, hogy elfogadjuk a(z) %nation% kereskedelmi ajánlatot.
|
||||
model.diplomaticTrade.receive.tribute=A(z) %nation% nemzet tisztel minket!
|
||||
model.diplomaticTrade.receive.tribute=A(z) %nation% nemzet sarcot követel tőlünk!
|
||||
model.diplomaticTrade.send.contact=Találkoztunk a(z) %nation% nemzet tagjaival.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.diplomatic=Engedd, hogy tartsuk a diplomatikus helyzetünket a(z) {{tag:country|%nation%}} nemzettel.
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.trade=Engedd, hogy kereskedelmi javaslatot tegyünk a(z) %nation% nemzetnek %settlement% városában.
|
||||
model.diplomaticTrade.send.tribute=A %nation% néptől sarcot követelünk %settlement% településen.
|
||||
model.direction.N.name=észak
|
||||
model.direction.NE.name=északkelet
|
||||
model.direction.E.name=kelet
|
||||
|
@ -1682,12 +1710,12 @@ model.historyEventType.declareWar.description=Háború a(z) {{tag:country|%natio
|
|||
model.historyEventType.destroyNation.description=A(z) {{tag:country|%nation%}} nemzet elpusztította a(z) %nativeNation% népet.
|
||||
model.historyEventType.destroySettlement.description=Elpusztítottad %settlement% %nation% települést.
|
||||
model.historyEventType.discoverNewWorld.description=Az Új Világ felfedezése.
|
||||
model.historyEventType.discoverRegion.description=A(z) {{tag:country|%nation%}} nemzet felfedezte %region% régiót.
|
||||
model.historyEventType.discoverRegion.description={{tag:country|%nation%}} felfedezte %region% régiót.
|
||||
model.historyEventType.formAlliance.description=Szövetség megtárgyalva a(z) {{tag:country|%nation%}} nemzettel.
|
||||
model.historyEventType.foundColony.description=A(z) %colony% gyarmat megalapítása.
|
||||
model.historyEventType.foundingFather.description=%father% csatlakozott a Kontinentális Kongresszushoz.
|
||||
model.historyEventType.independence.description=Elnyerted függetlenségedet a Koronától.
|
||||
model.historyEventType.makePeace.description=Béke elfogadva a(z) {{tag:country|%nation%}} nemzettel.
|
||||
model.historyEventType.makePeace.description=Béke elfogadva: {{tag:country|%nation%}}.
|
||||
model.historyEventType.meetNation.description=Találkoztál a(z) %nation% néppel.
|
||||
model.historyEventType.nationDestroyed.description=A(z) %nation% nemzet többé nincs jelen az Újvilágban.
|
||||
model.historyEventType.spanishSuccession.description=A {{tag:country|%loserNation%}} nép átengedi minden gyarmatát az Újvilágban a {{tag:country|%nation%}} nemzetnek.
|
||||
|
@ -1698,6 +1726,7 @@ model.indianSettlement.skillNone=Semmi
|
|||
model.indianSettlement.skillUnknown=Ismeretlen
|
||||
model.indianSettlement.tension.unknown=Ismeretlen
|
||||
model.indianSettlement.tension.wary=Óvatos
|
||||
model.indianSettlement.wantedGoodsNone=Semmi
|
||||
model.indianSettlement.wantedGoodsUnknown=Ismeretlen
|
||||
model.lostCityRumour.burialGround.description=Meggyaláztad a %nation% ősök sírjait! Ezért elpusztulsz!
|
||||
model.lostCityRumour.cibola.description=Rábukkantál %city% városára, az Arany Hét Városának egyikére, ahonnan %money% értékben kincseket zsákmányoltál! Vidd ezt a kincset egyik kolóniádba, vagy egy Galleon fedélzetén egyensen az Óvilágba.
|
||||
|
@ -1800,18 +1829,18 @@ model.regionType.ocean.name=Óceán
|
|||
model.regionType.ocean.unknown=Ismeretlen vizek
|
||||
model.regionType.river.name=Folyó
|
||||
model.regionType.river.unknown=Ismeretlen folyó
|
||||
scope.method.isIndian.name=őslakosok
|
||||
scope.method.isIndian.name=bennszülöttek
|
||||
model.stance.alliance.name=Szövetség
|
||||
model.stance.ceaseFire.name=Fegyverszünet
|
||||
model.stance.peace.name=Béke
|
||||
model.stance.war.name=Háború
|
||||
model.tension.happy.name=Boldog
|
||||
model.tension.content.name=Tartalom
|
||||
model.tension.content.name=Elégedett
|
||||
model.tension.displeased.name=Elégedetlen
|
||||
model.tension.angry.name=Mérges
|
||||
model.tension.hateful.name=Gyűlölködő
|
||||
model.tile.nameLocation=%name% (%location%)
|
||||
model.tile.nearLocation=%direction%-ra %location%-tól
|
||||
model.tile.nearLocation=%location% településtől %direction%i irányban
|
||||
model.tile.simpleLabel=Mező (%x%, %y%)
|
||||
warning.europeanLand=Új kolóniád földjének egy részét más óvilágiak birtokolják.
|
||||
warning.landLocked=Új kolóniádnak nem lesz partszakasza.
|
||||
|
@ -1966,6 +1995,7 @@ abandonEducation.no=Nem, folytassa a képzést!
|
|||
abandonEducation.text=Ha a %unit% elhagyja %colony% kolóniáját, felhagy a %action% a(z) %building%ban. Biztos vagy benne, hogy mennie kell?
|
||||
# Fuzzy
|
||||
abandonEducation.yes=Igen, hagyja el a kolóniát!
|
||||
armedUnitSettlement.tribute=Sarc követelése
|
||||
boycottedGoods.dumpGoods=A tengerbe vele!
|
||||
boycottedGoods.text=Mivel a %goods% kereskedelmét bojkottálta a Korona, ezért nem adható el a(z) %europe%i piacon. Megfizeted a hátralékod (%amount% aranyat) vagy inkább a tengerbe vetteted az árut, ezzel megsemmisítve azt?
|
||||
buy.moreGold=Alacsonyabb árat kérek
|
||||
|
@ -1987,6 +2017,7 @@ indianLand.pay=Felajánlok %amount% aranyat a földért
|
|||
# Fuzzy
|
||||
indianLand.take=Elvesszük, ami minket illet.
|
||||
indianLand.text=Ez a föld a %player% tulajdona. Mit szeretnél tenni:
|
||||
indianLand.unknown=Ismeretlen népek élnek ezen a vidéken. Mit szeretnél tenni:
|
||||
info.autodetectLanguageSelected=Átállítva automatikus nyelvfelismerésre. A felismeréshez újra kell indítani a játékot.
|
||||
info.enterSomeText=Írj be valami szöveget.
|
||||
info.newLanguageSelected=Átállítva %language% nyelvre. A változások érvénybe lépéséhez újra kell indítani a játékot.
|
||||
|
@ -2008,7 +2039,7 @@ scoutSettlement.speak=Beszélj a törzsfőnökkel
|
|||
scoutSettlement.trade.1=Szeretnénk %goods1% szállítmányokat venni tőletek.
|
||||
scoutSettlement.trade.2=Szeretnénk %goods1% szállítmányokat venni tőletek. Szintén jól fizetünk a %goods2% szállítmányokért.
|
||||
scoutSettlement.trade.3=Szeretnénk %goods1% szállítmányokat venni tőletek. Szintén jól fizetünk a %goods2% és %goods3% szállítmányokért.
|
||||
scoutSettlement.tribute=Követelj adományokat
|
||||
scoutSettlement.tribute=Sarc követelése
|
||||
sell.gift=Felajánlom a(z) %goods%-t ajándékként
|
||||
sell.moreGold=Többet kérek érte
|
||||
sell.takeOffer=Elfogadom
|
||||
|
@ -2101,9 +2132,11 @@ scoutSettlement.speakNothing=Mindig örvendezünk messze %nation% földről érk
|
|||
# Fuzzy
|
||||
scoutSettlement.speakTales=Mindig örvendezünk messze földről érkező utazóknak. Ülj ide velünk a tűz mellé és mi elmeséljük törzsünk ösrégi legendáit.
|
||||
sellProposition.text=El akarsz adni valamit?
|
||||
trade.bought=%goodsType% vásárlása a(z) %nation% nép %settlement% településén
|
||||
# Fuzzy
|
||||
trade.noTrade=Elegünk van az alkudozásból!
|
||||
trade.nothingToSell=Sajnálom, nincs semmi eladni való árunk!
|
||||
trade.sold=%goodsType% eladása a(z) %nation% nép %settlement% településén
|
||||
trade.welcome=Kereskedés a(z) %nation% %settlement% településsel.
|
||||
traderoute.warehouseCapacity=A %unit% kirakodásával %colony% kolóniában meghaladná a raktár befogadóképességét. %amount% %goods% pocsékba menne. Szeretnéd ennek ellenére kirakodni az árut?
|
||||
# Fuzzy
|
||||
|
@ -2136,13 +2169,14 @@ giveIndependence.announce=Végre legyőztük a(z) %ref% seregeit és elnyertük
|
|||
giveIndependence.otherAnnounce=A(z) %nation% legyőzte a(z) %ref% seregeit és elnyerte függetlenségét!
|
||||
giveIndependence.unitsAcquired=Az alábbi Királyi Expediciós Erők letették fegyvereiket és megadták magukat ezen egységeidnek: %units%
|
||||
indianSettlement.mission.noDenounce=A(z) %nation% nemzet elutasítja vádjaid az eretnekségről és misszionáriusodat hamis prófétaként megégetik.
|
||||
indianSettlement.mission.tension.hateful=A hittérítőt feláldozták, a %nation% nép kineveti az új vallást.
|
||||
scoutSettlement.tributeAgree=Ez esetben beleegyezünk %amount% mennyiségű arany kifizetésébe a béke érdekében, de legközelebb nem leszel ilyen szerencsés!
|
||||
scoutSettlement.tributeDisagree=Nem hajlunk meg a követeléseid előtt, hordd el magad a földünkről!
|
||||
colopedia.birthAndDeath=Születés és Halál
|
||||
colopedia.description=Leírás
|
||||
colopedia.effects=Hatások
|
||||
colopedia.europeanNationTypes=Európai nemzettípusok
|
||||
colopedia.nativeNationTypes=Őslakos nemzettípusok
|
||||
colopedia.nativeNationTypes=Bennszülött nemzettípusok
|
||||
colopedia.type=Típus
|
||||
colopedia.buildings.autoBuilt=Automatikusan felépül az újonnan alapult kolóniával.
|
||||
colopedia.buildings.cost=Ár
|
||||
|
@ -2177,6 +2211,7 @@ colopedia.nationType.regions=Lakott régió:
|
|||
colopedia.nationType.skills=Tanulható mesterség:
|
||||
colopedia.nationType.typeOfSettlements=Települései típusa:
|
||||
colopedia.nationType.units=Induló egységei:
|
||||
colopedia.terrain.colonyCenterTile=Gyarmatközpont mező
|
||||
# Fuzzy
|
||||
colopedia.terrain.defenseBonus=Védelmi bónusz
|
||||
colopedia.terrain.description=Leírás
|
||||
|
@ -2220,6 +2255,13 @@ report.labour.teacher=tanár
|
|||
report.labour.unitTotal.tooltip=%unit% vagy ezt a mesterséget tanulja.
|
||||
report.labour.workingAs=dolgozik mint
|
||||
report.labour.workingAsOther=más
|
||||
report.colony.exploring.description=Jó lenne felderíteni még {{plural:%amount%|one=egy|other=%amount%}} mezőt %colony% közelében
|
||||
report.colony.name.header=Gyarmat
|
||||
report.colony.tile.clearForest.description=Jó lenne letisztítani {{plural:%amount%|one=egy|other=%amount%}} mezőt %colony% közelében
|
||||
report.colony.tile.plow.description=Jó lenne felszántani {{plural:%amount%|one=egy|other=%amount%}} mezőt %colony% közelében
|
||||
report.colony.tile.plow.specific.description=%colony% hasznára lenne a %location% terület felszántása
|
||||
report.colony.tile.road.description=Jó lenne {{plural:%amount%|one=egy|other=%amount%}} útszakaszt építeni %colony% közelébe
|
||||
report.colony.tile.road.specific.description=%colony% hasznára lenne egy útszakasz a %location% területen
|
||||
report.continentalCongress.none=(semmi)
|
||||
report.continentalCongress.recruiting=Toborzás
|
||||
report.education.students=Potenciális diákok
|
||||
|
@ -2248,21 +2290,27 @@ report.highScores.score=Pontszám:
|
|||
report.highScores.turn=Év:
|
||||
report.highScores.units=Egységek száma:
|
||||
report.indian.chieftain=A törzsfőnök neve:
|
||||
report.indian.mostHated=Leggyűlöltebb
|
||||
report.indian.noKnownSettlements=Nincs ismert település.
|
||||
report.indian.numberOfSettlements=Ismert településeik:
|
||||
report.indian.tension=Feszültség
|
||||
report.indian.tradeInterests=Kereskedelmi érdekek
|
||||
report.indian.tribeTension=Törzsi feszültség:
|
||||
report.indian.typeOfSettlements=Településeik típusa:
|
||||
report.production.selectGoods=Válassz árut
|
||||
report.production.update=Frissítés
|
||||
report.requirements.badAssignment=%colony% koloniában egy %expert% %expertWork%ként dolgozik, míg egy %nonExpert% %nonExpertWork%ként. A termelés hatékonyabb lehetne, ha helyet cserélnének.
|
||||
# Fuzzy
|
||||
report.requirements.canTrainExperts=Az alábbi kolóniákban képezhető %unit%:
|
||||
report.requirements.exploreTile=%location% területet érdemes lenne felderíteni.
|
||||
report.requirements.met=Minden feltétel teljesül.
|
||||
report.requirements.missingGoods=%colony% %goods% termelésére kapott utasítást, de további %input% hiányában csak kevesebbet termel.
|
||||
# Fuzzy
|
||||
report.requirements.misusedExperts=Az alábbi kolóniákban nem dolgozik %unit% %work%ként
|
||||
report.requirements.noExpert=%colony% %goods% termelésére kapott utasítást, de nincs hozzá %unit%.
|
||||
report.requirements.tile.clearForest=%location% területet érdemes lenne kiirtani.
|
||||
report.requirements.tile.plow=%location% hasznára lenne a terület felszántása.
|
||||
report.requirements.tile.road=%location% területen érdemes lenne egy útszakaszt építeni.
|
||||
# Fuzzy
|
||||
report.requirements.severalExperts=Az alábbi kolóniákban állomásozik több %unit%:
|
||||
report.requirements.surplus=Az alábbi kolóniák termelnek %goods% felesleget:
|
||||
|
@ -2286,6 +2334,7 @@ buildQueuePanel.buildings=Épületek
|
|||
buildQueuePanel.buildQueue=Építési lista
|
||||
# Fuzzy
|
||||
buildQueuePanel.buyBuilding=Épület megvétele
|
||||
buildQueuePanel.coastalOnly=Partmenti gyarmat
|
||||
buildQueuePanel.compactView=Kompakt nézet
|
||||
buildQueuePanel.currentlyBuilding=Most épül: %buildable%
|
||||
buildQueuePanel.populationTooSmall=Népesség: %number%
|
||||
|
@ -2295,12 +2344,14 @@ buildQueuePanel.units=Egységek
|
|||
cargoPanel.cargoAndSpace=A %name% rakománya (%space% {{plural:%space%|one=hely|other=hely|default=hely}} maradt)
|
||||
chatPanel.message=Üzenet
|
||||
chooseFoundingFatherDialog.title=Alapító Atya választása
|
||||
colonyPanel.buildQueue=Építési lista
|
||||
colonyPanel.colonyUnits=Egységek a kolóniában
|
||||
colonyPanel.inPort=A kikötőben
|
||||
colonyPanel.outsideColony=Településen kívül
|
||||
colonyPanel.producing=előállítás alatt:
|
||||
colonyPanel.reducePopulation=Ha %number% alá csökkented a lakosságot, %colony% már nem építhet %buildable%-t.
|
||||
colonyPanel.unitChange=A kolóniádba lépve a(z) %oldType% %newType% lett.
|
||||
colonyPanel.warehouse=Raktár
|
||||
colonyPanel.bonusLabel=Módosító: %number%%extra%
|
||||
# Fuzzy
|
||||
colonyPanel.populationLabel=Népesség: %number%
|
||||
|
@ -2318,6 +2369,8 @@ confirmDeclarationDialog.defaultNation=Szabad %nation%
|
|||
confirmDeclarationDialog.enterCountry=Legyen mától fogva államunk neve
|
||||
# Fuzzy
|
||||
confirmDeclarationDialog.enterNation=és dicső nemzetségünk minden lakója nevezze magát büszkén
|
||||
flag.decoration.NONE=Nincs
|
||||
flag.unionPosition.NONE=Nincs
|
||||
constructionPanel.clickToBuild=Kattints az építési területre az építendő épület vagy egység kiválasztásához!
|
||||
constructionPanel.turnsToComplete=(Hátralévő körök: %number%)
|
||||
negotiationDialog.accept=Elfogad
|
||||
|
@ -2329,6 +2382,7 @@ negotiationDialog.exchange=cserébe
|
|||
# Fuzzy
|
||||
negotiationDialog.offer=%nation% felajánl
|
||||
negotiationDialog.send=Elküld
|
||||
negotiationDialog.title.tribute=Sarckövetelés
|
||||
editSettlementDialog.removeSettlement=Település eltávolítása
|
||||
editSettlementDialog.removeSettlement.text=Biztosan eltávolítod ezt a települést?
|
||||
emigrationDialog.chooseImmigrant=Válaszd ki, hogy ki hagyja el az Óvilágot!
|
||||
|
@ -2358,10 +2412,11 @@ stopServer.text=Ezen a porton már fut egy kiszolgáló.
|
|||
stopServer.yes=Kiszolgáló leállítása
|
||||
freeColProgressBar.turnsToComplete=(Körök: %number%)
|
||||
indianSettlementPanel.indianCapital=%nation% főváros
|
||||
indianSettlementPanel.indianSettlement=%nation% település
|
||||
indianSettlementPanel.learnableSkill=A következő mesterséget tanulhatod ezen a településen:
|
||||
indianSettlementPanel.highlyWanted=Ezen a településen nagy a kereslet erre:
|
||||
indianSettlementPanel.otherWanted=Kereslet van még ezekre is:
|
||||
indianSettlementPanel.mostHated=A legutálatosabb nemzet ezen a településen:
|
||||
indianSettlementPanel.mostHated=A leggyűlöltebb nép ezen a településen:
|
||||
infoPanel.endTurn=A kör befejezéséhez nyomd meg\naz 'Enter' billentyűt!
|
||||
infoPanel.moves=Lépés:
|
||||
loadingSavegameDialog.port=Port:
|
||||
|
@ -2377,6 +2432,7 @@ freecol.map.America_large=Amerika (nagy)
|
|||
freecol.map.Australia=Ausztrália
|
||||
freecol.map.Caribbean_basin=Karib-tengeri medence
|
||||
mapSizeDialog.mapSize=Térképméret választása
|
||||
nativeDemandDialog.name=A bennszülöttek sarcot követelnek %colony% településen
|
||||
newPanel.editDifficulty=Nehézség szerkesztése
|
||||
newPanel.getServerList=Kiszolgálólista kérése
|
||||
newPanel.joinMultiPlayerGame=Többjátékos mód - csatlakozás
|
||||
|
@ -2393,6 +2449,7 @@ playersTable.advantage=Erősség
|
|||
playersTable.availability=Elérhetőség
|
||||
quickActionMenu.apprentice=Tanonc ennél: %unit%
|
||||
quickActionMenu.assignToTeacher=Tanítóhoz rendel
|
||||
quickActionMenu.changeWork=Munkabeosztás
|
||||
quickActionMenu.clearSpeciality=Mesterség elhagyása
|
||||
quickActionMenu.experience=%job% munkában szerzett tapasztalat:
|
||||
quickActionMenu.leaveTown=Város elhagyása
|
||||
|
@ -2443,7 +2500,7 @@ warehouseDialog.lowLevel.shortDescription=Figyelmeztess, ha a készlet a férőh
|
|||
warehouseDialog.name=Raktár
|
||||
# Fuzzy
|
||||
workProductionPanel.zeroThreshold=Nincs
|
||||
nameCache.base.colony=Kolónia
|
||||
nameCache.base.colony=Gyarmat
|
||||
nameCache.base.settlement=Település
|
||||
nameCache.base.ship=Hajó
|
||||
nameCache.base.tradeRoute=Új kereskedelmi útvonal
|
||||
|
@ -2452,6 +2509,7 @@ nameCache.season.1=Ősz
|
|||
model.nation.dutch.region.river.1=Catskill
|
||||
model.nation.dutch.region.mountain.1=Wilhelminagebergte
|
||||
model.nation.english.region.land.4=Új Fundland
|
||||
error.notAIColony=%colony% nem gépvezérelt település
|
||||
installer.FreeCol.description=A FreeCol program- és adatfájljai.
|
||||
installer.FreeColLanguage.autodetect=Automatikus észlelés a játék indításakor
|
||||
installer.FreeColLanguage.description=Később megváltoztathatod ezt a beállítást a játék Beállítások menüjében.
|
||||
|
|
|
@ -106,6 +106,7 @@ capital=Capitale
|
|||
cargo=Carico
|
||||
cargoOnCarrier=Carico trasportato
|
||||
cashInTreasureTrain=Incassa il tesoro
|
||||
claimableRadius=Area rivendicabile
|
||||
clearOrders=Cancella gli ordini
|
||||
colonists=Coloni
|
||||
colonyCenter=centro coloniale
|
||||
|
@ -114,6 +115,7 @@ countryName={{tag:country|%nation%}}
|
|||
difficulty=Difficoltà
|
||||
docks=Molo
|
||||
dumpCargo=Disperdi carico
|
||||
extraClaimableRadius=Area rivendicabile supplementare
|
||||
finalResult=Risultato finale
|
||||
fortify=Fortifica
|
||||
gold=Oro
|
||||
|
@ -170,6 +172,7 @@ cli.arg.file=FILE
|
|||
cli.arg.gui-scale=SCALA
|
||||
cli.arg.locale=LOCALIZZAZIONE
|
||||
cli.arg.loglevel=LOGLEVEL
|
||||
cli.arg.metaServer=OSPITE:PORTO
|
||||
cli.arg.name=NOME
|
||||
cli.arg.port=PORTA
|
||||
cli.arg.seed=SEME
|
||||
|
@ -205,11 +208,13 @@ cli.load-savegame=carica il savegame specificato da FILE
|
|||
cli.log-console=registra gli eventi sulla console oltre che su file
|
||||
cli.log-file=imposta il file di log di FreeCol (default FreeCol.log)
|
||||
cli.log-level=imposta il livello del registro di java a LOGLEVEL
|
||||
cli.meta-server=Imposta l'INDIRIZZO e la PORTA per il meta-server
|
||||
cli.name=dai un NOME al giocatore
|
||||
cli.no-intro=Salta l'intro video
|
||||
cli.no-java-check=ignora il controllo della versione di java
|
||||
cli.no-memory-check=ignora il controllo della memoria
|
||||
cli.no-sound=esegue FreeCol senza suono
|
||||
cli.no-splash=salta la schermata di caricamento
|
||||
cli.private=avvia un server privato (non pubblicato sul metaserver)
|
||||
cli.seed=fornire un SEME per il generatore di numeri pseudo-casuale
|
||||
cli.server=avvia un server indipendente
|
||||
|
@ -218,6 +223,7 @@ cli.server-port=specifica una PORTA personalizzata per il server
|
|||
cli.splash=mostra l'immagine FILE come splash screen mentre parte il gioco
|
||||
cli.tc=carica la 'conversione totale' identificata da NOME
|
||||
cli.timeout=numero di secondi che il server aspetta per una risposta ad una richiesta
|
||||
cli.user-cache-directory=imposta la DIRECTORY utente dalla cache di FreeCol
|
||||
cli.user-config-directory=imposta la DIRECTORY di configurazione utente FreeCol
|
||||
cli.user-data-directory=imposta la DIRECTORY dei dati utente FreeCol
|
||||
cli.version=mostra la versione del programma ed esce
|
||||
|
@ -250,6 +256,7 @@ menuBar.debug.memoryManager.gc=Esegui il Garbage Collector
|
|||
menuBar.debug.memoryManager=Gestore Memoria
|
||||
menuBar.debug.revealEntireMap=Rivela l'intera mappa
|
||||
menuBar.debug.runMonarch=Imposta la prossima azione del Monarca
|
||||
menuBar.debug.searchTrace=Registro tracce di ricerca completa
|
||||
menuBar.debug.showColonyValue=Mostra valori colonia
|
||||
menuBar.debug.showCoordinates=Mostra coordinate
|
||||
menuBar.debug.showResourceKeys=Mostra i tasti risorsa
|
||||
|
@ -496,7 +503,9 @@ model.option.tileProduction.high.name=Alto
|
|||
model.option.tileProduction.high.shortDescription=Alta produzione di piastrelle
|
||||
model.option.tileProduction.veryHigh.name=Molto alta
|
||||
model.option.tileProduction.veryHigh.shortDescription=Altissima produzione di piastrelle
|
||||
model.option.badRumour.name=Possibilità di Pettegolezzo Negativo
|
||||
model.option.badRumour.decription=Percentuale di possibilità di un Pettegolezzo di ottenere un risultato negativo
|
||||
model.option.goodRumour.name=Possibilità di Pettegolezzo Positivo
|
||||
model.option.goodRumour.decription=Percentuale di possibilità di un Pettegolezzo di ottenere un risultato positivo.
|
||||
model.difficulty.cheat.name=Imbroglia IA
|
||||
model.option.liftBoycottCheat.name=Sollevare boicottaggio
|
||||
|
@ -508,6 +517,7 @@ model.option.equipPioneerCheat.shortDescription=Percentuale di possibilità per
|
|||
model.option.landUnitCheat.name=Ottenere unità di terra
|
||||
model.option.landUnitCheat.shortDescription=Percentuale di possibilità per ogni turno di Intelligenza Artificiale di ottenere gratuitamente un'unità di terra utile in Europa.
|
||||
model.option.offensiveLandUnitCheat.name=Ottieni Unità di Terra Offensiva
|
||||
model.option.offensiveLandUnitCheat.shortDescription=Percentuale di probabilità di un AI di ottenere per ogni turno un'unità offensiva di terra gratuita in Europa
|
||||
model.option.offensiveNavalUnitCheat.name=Ottenere unità navale offensiva
|
||||
model.option.offensiveNavalUnitCheat.shortDescription=Percentuale di possibilità in scala (verso il basso dalla forza navale) per ogni turno di Intelligenza Artificiale di costruire gratuitamente un'unità navale offensiva in Europa.
|
||||
model.option.transportNavalUnitCheat.name=Ottenere unità navale di trasporto
|
||||
|
@ -538,6 +548,8 @@ model.option.giftProbability.name=Probabilità di un regalo
|
|||
model.option.giftProbability.shortDescription=Percentuale di probabilità per turno che un pacifico insediamento di nativi con un surplus lo offra come dono ad un vicino insediamento europeo amichevole.
|
||||
model.option.demandProbability.name=Probabilità di domanda
|
||||
model.option.demandProbability.shortDescription=Percentuale di probabilità per turno che un insediamento di nativi ostili chieda un tributo ad un vicino insediamento europeo che li disturba.
|
||||
model.option.settlementNumberOfGoodsToSell.name=Vendite di Beni dei Nativi
|
||||
model.option.settlementNumberOfGoodsToSell.shortDescription=Il numero di tipi di beni offerti solitamente per la vendita da un insediamento nativo.
|
||||
model.option.continueFoundingFatherRecruitment.name=Continua a reclutare i Padri Fondatori
|
||||
model.option.continueFoundingFatherRecruitment.shortDescription=Continua a reclutare i Padri Fondatori dopo che l'indipendenza è stata raggiunta.
|
||||
model.option.teleportREF.name=RIF Teleport
|
||||
|
@ -545,8 +557,11 @@ model.option.teleportREF.shortDescription=Appare RIF sul sito di attracco per il
|
|||
model.option.startingPositions.name=Posizioni iniziali
|
||||
model.option.startingPositions.shortDescription=Determina la posizione di partenza dei giocatori Europei.
|
||||
model.option.startingPositions.classic.name=Classico
|
||||
model.option.startingPositions.classic.shortDescription=Le nazioni Europee iniziano ai confini del mare aperto ad est del Nuovo Mondo
|
||||
model.option.startingPositions.random.name=Casuale
|
||||
model.option.startingPositions.random.shortDescription=Le nazioni Europee iniziano ai confini del mare aperto ovunque nella mappa.
|
||||
model.option.startingPositions.historical.name=Storico
|
||||
model.option.startingPositions.historical.shortDescription=Le nazioni Europee iniziano ai confini del mare aperto vicino alla loro prima colonia storica nel Nuovo Mondo
|
||||
model.option.initialImmigration.name=Obiettivo iniziale di immigrazione
|
||||
model.option.initialImmigration.shortDescription=Numero di croci da produrre prima che i primi migranti europei appaiano.
|
||||
model.option.peaceProbability.name=Probabilità di pace
|
||||
|
|
|
@ -79,6 +79,7 @@ medium=Médio
|
|||
more=mais...
|
||||
music=Música
|
||||
name=Nome
|
||||
number=Número
|
||||
no=Não
|
||||
none=Nenhum
|
||||
normal=Normal
|
||||
|
@ -115,6 +116,7 @@ capital=Capital
|
|||
cargo=Carga
|
||||
cargoOnCarrier=Carga a Bordo
|
||||
cashInTreasureTrain=Dinheiro no vagão de tesouro
|
||||
claimableRadius=Raio requerível
|
||||
clearOrders=Apagar ordens
|
||||
colonists=Colonos
|
||||
colonyCenter=centro da colonia
|
||||
|
@ -128,7 +130,7 @@ fortify=Forticar
|
|||
gold=Moedas de Ouro
|
||||
goldAmount=%amount% {{plural:%amount%|one=moeda de ouro|other=moedas de ouro|default=moedas de ouro}}
|
||||
goods=Produtos
|
||||
goToEurope=Ir para Europa
|
||||
goToEurope=Ir à Europa
|
||||
goToThisTile=Ir para este terreno
|
||||
immigrants=Imigrantes
|
||||
inPort=No porto
|
||||
|
|
|
@ -1925,18 +1925,13 @@ model.colony.veryBadGovernment=%colony% 的政府效率非常糟糕,出現嚴
|
|||
model.colony.veryGoodGovernment=政府效率改善!%colony% 的獨立黨現在已經等於或超過 %number%%!
|
||||
model.colonyTile.claim=(要求 %direction%)
|
||||
model.diplomaticTrade.receive.contact=從光榮的 %nation% 致上兄弟般的問候。
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.receive.diplomatic=讓我們與 {{tag:country|%nation%}} 談判。
|
||||
model.diplomaticTrade.receive.diplomatic=讓我們與%nation%談判。
|
||||
model.diplomaticTrade.receive.trade=讓我們考慮一下 %nation% 的貿易優惠。
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.receive.tribute={{tag:country|%nation%}} 正要我們致敬!
|
||||
model.diplomaticTrade.receive.tribute=%nation%正要我們致敬!
|
||||
model.diplomaticTrade.send.contact=我們遇到 %nation% 的一員。
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.diplomatic=讓我們考慮一下我們與 {{tag:country|%nation%}} 的外交處境。
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.trade=讓我們提議在 %settlement% 與 {{tag:country|%nation%}} 貿易。
|
||||
# Fuzzy
|
||||
model.diplomaticTrade.send.tribute=我們要求 {{tag:country|%nation%}} 進貢到 %settlement% 。
|
||||
model.diplomaticTrade.send.diplomatic=讓我們考慮一下我們與%nation%的外交處境。
|
||||
model.diplomaticTrade.send.trade=讓我們提議在%settlement%與%nation%貿易。
|
||||
model.diplomaticTrade.send.tribute=我們要求%nation%進貢到%settlement%。
|
||||
model.direction.N.name=北
|
||||
model.direction.NE.name=東北
|
||||
model.direction.E.name=東
|
||||
|
@ -2014,6 +2009,7 @@ model.messageType.unitAdded.name=增加單位
|
|||
model.messageType.unitDemoted.name=降級單位
|
||||
model.messageType.unitImproved.name=升級單位
|
||||
model.messageType.unitLost.name=失去單位
|
||||
model.messageType.unitRepaired.name=單位修補
|
||||
model.messageType.warehouseCapacity.name=倉庫容量
|
||||
model.messageType.warning.name=警告
|
||||
model.monarch.action.addToRef.text=國王給皇家遠征軍增派了 %number% 個 {{plural:%number%|%unit%}}。殖民地首領們表示憂慮。
|
||||
|
@ -2869,12 +2865,10 @@ negotiationDialog.add=新增
|
|||
negotiationDialog.cancel=取消
|
||||
negotiationDialog.clear=清除
|
||||
negotiationDialog.contact.tutorial=你遇見了歐洲人。他們會與你爭奪土地和財富,還有可能對你發動戰爭。但在約翰·德維特加入大陸會議後,你可以與他們交易。
|
||||
# Fuzzy
|
||||
negotiationDialog.demand={{tag:country|%nation%}} 要求 {{tag:country|%otherNation%}}
|
||||
negotiationDialog.demand=%nation%要求%otherNation%
|
||||
negotiationDialog.exchange=以換取
|
||||
negotiationDialog.goldAvailable=(%amount% 黃金可用)
|
||||
# Fuzzy
|
||||
negotiationDialog.offer={{tag:country|%nation%}} 提供 {{tag:country|%otherNation%}}
|
||||
negotiationDialog.offer=%nation%提供%otherNation%
|
||||
negotiationDialog.send=傳送
|
||||
negotiationDialog.title.contact=與歐洲人會見
|
||||
negotiationDialog.title.diplomatic=外交談判
|
||||
|
|
|
@ -2047,6 +2047,7 @@ model.messageType.unitAdded.name=增加单位
|
|||
model.messageType.unitDemoted.name=降级单位
|
||||
model.messageType.unitImproved.name=升级单位
|
||||
model.messageType.unitLost.name=失去单位
|
||||
model.messageType.unitRepaired.name=单位修理
|
||||
model.messageType.warehouseCapacity.name=仓库容量
|
||||
model.messageType.warning.name=警告
|
||||
model.monarch.action.addToRef.text=王国向皇家远征军增加了%number% {{plural:%number%|%unit%}}。殖民地首领们表现出了担忧。
|
||||
|
|
|
@ -189,13 +189,16 @@ public class LostCityRumour extends TileItem {
|
|||
// Base bad and good chances are difficulty options.
|
||||
int percentBad = spec.getInteger(GameOptions.BAD_RUMOUR);
|
||||
int percentGood = spec.getInteger(GameOptions.GOOD_RUMOUR);
|
||||
int percentNeutral = 0;
|
||||
int probabilityBad = 100;
|
||||
boolean isExpertScout = unit != null && unit.hasAbility(Ability.EXPERT_SCOUT);
|
||||
|
||||
// Expert scouts have a beneficial modifier that works on both
|
||||
// percentages
|
||||
if (unit != null) {
|
||||
float mod = unit.applyModifiers(1.0f, getGame().getTurn(),
|
||||
Modifier.EXPLORE_LOST_CITY_RUMOUR);
|
||||
percentBad = Math.round(percentBad * mod);
|
||||
percentBad = Math.round(percentBad / mod);
|
||||
percentGood = Math.round(percentGood * mod);
|
||||
}
|
||||
|
||||
|
@ -204,11 +207,11 @@ public class LostCityRumour extends TileItem {
|
|||
&& unit.getOwner().hasAbility(Ability.RUMOURS_ALWAYS_POSITIVE)) {
|
||||
percentBad = 0;
|
||||
percentGood = 100;
|
||||
} else {
|
||||
// Neutral is what is left.
|
||||
percentNeutral = Math.max(0, 100 - percentBad - percentGood);
|
||||
}
|
||||
|
||||
// Neutral is what is left.
|
||||
int percentNeutral = Math.max(0, 100 - percentBad - percentGood);
|
||||
|
||||
// Add all possible events to a RandomChoice List
|
||||
List<RandomChoice<RumourType>> c = new ArrayList<>();
|
||||
|
||||
|
@ -243,11 +246,12 @@ public class LostCityRumour extends TileItem {
|
|||
// If the tile is native-owned, allow burial grounds rumour.
|
||||
c.add(new RandomChoice<>(RumourType.BURIAL_GROUND,
|
||||
25 * percentBad));
|
||||
probabilityBad = probabilityBad - 25;
|
||||
}
|
||||
|
||||
if (!isExpertScout) {
|
||||
c.add(new RandomChoice<>(RumourType.EXPEDITION_VANISHES,
|
||||
75 * percentBad));
|
||||
} else {
|
||||
c.add(new RandomChoice<>(RumourType.EXPEDITION_VANISHES,
|
||||
100 * percentBad));
|
||||
probabilityBad * percentBad));
|
||||
}
|
||||
|
||||
// The NEUTRAL
|
||||
|
|
|
@ -86,7 +86,7 @@ public final class Specification {
|
|||
/** Unit change types backward compatibility fragment. */
|
||||
public static final String UNIT_CHANGE_TYPES_COMPAT_FILE_NAME
|
||||
= "unit-change-types-compat.xml";
|
||||
|
||||
|
||||
/** The default role. */
|
||||
public static final String DEFAULT_ROLE_ID = "model.role.default";
|
||||
|
||||
|
@ -491,7 +491,7 @@ public final class Specification {
|
|||
}
|
||||
return realGroup;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Clean up the specification.
|
||||
*
|
||||
|
@ -766,7 +766,7 @@ public final class Specification {
|
|||
clean("merged game options (" + who + ")");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Merge in a new set of map options.
|
||||
*
|
||||
|
@ -1407,7 +1407,7 @@ public final class Specification {
|
|||
return getUnitChange(UnitChangeType.EDUCATION, typeStudent, learn).turns;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// -- Units --
|
||||
|
||||
public List<UnitType> getUnitTypeList() {
|
||||
|
@ -1426,7 +1426,7 @@ public final class Specification {
|
|||
return (player == null) ? getDefaultUnitType()
|
||||
: getDefaultUnitType(player.getNationType());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the most vanilla unit type for a type of nation.
|
||||
*
|
||||
|
@ -1452,7 +1452,7 @@ public final class Specification {
|
|||
&& !ut.hasAbility(Ability.REF_UNIT);
|
||||
return find(defaultUnitTypes, p, getDefaultUnitType());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the most vanilla unit type.
|
||||
*
|
||||
|
@ -1461,7 +1461,7 @@ public final class Specification {
|
|||
public UnitType getDefaultUnitType() {
|
||||
return getUnitType("model.unit.freeColonist"); // Drop this soon
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the list of buildable unit types.
|
||||
*
|
||||
|
@ -1643,7 +1643,7 @@ public final class Specification {
|
|||
public Nation getUnknownEnemyNation() {
|
||||
return getNation(Nation.UNKNOWN_NATION_ID);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Clear all European advantages. Implements the Advantages==NONE setting.
|
||||
*/
|
||||
|
@ -1834,7 +1834,7 @@ public final class Specification {
|
|||
if (group != null) group.add(difficulty);
|
||||
allOptionGroups.put(difficulty.getId(), difficulty);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Applies the difficulty level identified by the given String to
|
||||
* the current specification.
|
||||
|
@ -1926,7 +1926,7 @@ public final class Specification {
|
|||
: (n < ages[1]) ? 0
|
||||
: (n < ages[2]) ? 1
|
||||
: 2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// General type retrieval
|
||||
|
@ -2074,7 +2074,7 @@ public final class Specification {
|
|||
for (AbstractOption ao : allG) {
|
||||
allOptionGroups.remove(ao.getId());
|
||||
logger.warning("Dropping orphan option group: " + ao);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -2094,7 +2094,7 @@ public final class Specification {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// @compat 0.11.0
|
||||
/**
|
||||
* Handle the reworking of roles that landed in 0.11.0.
|
||||
|
@ -2132,7 +2132,7 @@ public final class Specification {
|
|||
if (compareVersion("0.116") > 0) return;
|
||||
|
||||
unitChangeTypeList.clear();
|
||||
File uctf = FreeColDirectories.getCompatibilityFile(UNIT_CHANGE_TYPES_COMPAT_FILE_NAME);
|
||||
File uctf = FreeColDirectories.getCompatibilityFile(UNIT_CHANGE_TYPES_COMPAT_FILE_NAME);
|
||||
try (
|
||||
FileInputStream fis = new FileInputStream(uctf);
|
||||
) {
|
||||
|
@ -2159,9 +2159,9 @@ public final class Specification {
|
|||
//
|
||||
// We need to keep these fixes for now as they are still
|
||||
// needed for games validly upgraded by 0.11.x series FreeCol.
|
||||
|
||||
|
||||
// 0.10.x had no unknown enemy nation, just an unknown enemy
|
||||
// player, and the type was poorly established.
|
||||
// player, and the type was poorly established.
|
||||
Nation ue = getUnknownEnemyNation();
|
||||
ue.setType(getNationType("model.nationType.default"));
|
||||
if (!nations.contains(ue)) nations.add(ue);
|
||||
|
@ -2243,7 +2243,7 @@ public final class Specification {
|
|||
goodsType.setMilitary();
|
||||
goodsType = getGoodsType("model.goods.muskets");
|
||||
goodsType.setMilitary();
|
||||
// end @compat 0.10.x/0.11.x
|
||||
// end @compat 0.10.x/0.11.x
|
||||
|
||||
// @compat 0.11.0
|
||||
// Bolivar changed from being an event, then to a liberty modifier,
|
||||
|
@ -2348,7 +2348,7 @@ public final class Specification {
|
|||
mow.removeRequiredAbility(maidId);
|
||||
mow.addRequiredAbility(Ability.INDEPENDENT_NATION, true);
|
||||
}
|
||||
|
||||
|
||||
// Added canBeSurrendered ability to all the REF units.
|
||||
// REF Units are the units that can be *added* to the REF.
|
||||
// The REF can capture other units, but they can all automatically
|
||||
|
@ -2595,7 +2595,7 @@ public final class Specification {
|
|||
1500);
|
||||
// end @compat 0.11.3
|
||||
|
||||
|
||||
|
||||
// Ensure 2 levels of groups, and one level of leaves
|
||||
for (OptionGroup level : getDifficultyLevels()) {
|
||||
for (Option o : level.getOptions()) {
|
||||
|
@ -2712,7 +2712,7 @@ public final class Specification {
|
|||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
private UnitListOption checkDifficultyUnitListOption(String id, String gr,
|
||||
LogBuilder lb) {
|
||||
UnitListOption ulo = null;
|
||||
|
@ -2807,6 +2807,12 @@ public final class Specification {
|
|||
// @compat 0.11.6
|
||||
ret |= checkIntegerOption(GameOptions.SETTLEMENT_NUMBER_OF_GOODS_TO_SELL,
|
||||
GameOptions.GAMEOPTIONS_MAP, 3);
|
||||
ret |= checkIntegerOption(GameOptions.ALARM_BONUS_BUY,
|
||||
GameOptions.GAMEOPTIONS_MAP, 20);
|
||||
ret |= checkIntegerOption(GameOptions.ALARM_BONUS_SELL,
|
||||
GameOptions.GAMEOPTIONS_MAP, 20);
|
||||
ret |= checkIntegerOption(GameOptions.ALARM_BONUS_GIFT,
|
||||
GameOptions.GAMEOPTIONS_MAP, 40);
|
||||
// end @compat 0.11.6
|
||||
|
||||
// SAVEGAME_VERSION == 14
|
||||
|
@ -2875,7 +2881,7 @@ public final class Specification {
|
|||
addAbstractOption(option);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// Serialization
|
||||
|
@ -3020,7 +3026,7 @@ public final class Specification {
|
|||
ChildReader reader = readerMap.get(childName);
|
||||
if (reader == null) {
|
||||
logger.warning("No reader found for: " + childName);
|
||||
} else {
|
||||
} else {
|
||||
reader.readChildren(xr);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -78,6 +78,15 @@ public class GameOptions {
|
|||
public static final String DEMAND_PROBABILITY
|
||||
= "model.option.demandProbability";
|
||||
|
||||
public static final String ALARM_BONUS_BUY
|
||||
= "model.option.alarmBonusBuy";
|
||||
|
||||
public static final String ALARM_BONUS_SELL
|
||||
= "model.option.alarmBonusSell";
|
||||
|
||||
public static final String ALARM_BONUS_GIFT
|
||||
= "model.option.alarmBonusGift";
|
||||
|
||||
/** Maximum number of goods a native settlement will offer for sale. */
|
||||
public static final String SETTLEMENT_NUMBER_OF_GOODS_TO_SELL
|
||||
= "model.option.settlementNumberOfGoodsToSell";
|
||||
|
|
|
@ -180,7 +180,7 @@ public final class InGameController extends Controller {
|
|||
public void setRandom(Random random) {
|
||||
this.random = random;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the timeout for this game.
|
||||
*
|
||||
|
@ -190,7 +190,7 @@ public final class InGameController extends Controller {
|
|||
final boolean single = getFreeColServer().getSinglePlayer();
|
||||
return FreeCol.getTimeout(single);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Debug support
|
||||
|
||||
|
@ -398,13 +398,15 @@ public final class InGameController extends Controller {
|
|||
*/
|
||||
private void csBuy(Unit unit, Goods goods, int price,
|
||||
ServerIndianSettlement sis, ChangeSet cs) {
|
||||
final int alarmBonus = -Math.round(price * 0.01f * getGame().getSpecification()
|
||||
.getInteger(GameOptions.ALARM_BONUS_BUY));
|
||||
final ServerPlayer owner = (ServerPlayer)unit.getOwner();
|
||||
csVisit(owner, sis, 0, cs);
|
||||
GoodsLocation.moveGoods(sis, goods.getType(), goods.getAmount(), unit);
|
||||
cs.add(See.perhaps(), unit);
|
||||
sis.getOwner().modifyGold(price);
|
||||
owner.modifyGold(-price);
|
||||
sis.csModifyAlarm(owner, -price/50, true, cs);
|
||||
sis.csModifyAlarm(owner, alarmBonus, true, cs);
|
||||
sis.updateWantedGoods();
|
||||
final Tile tile = sis.getTile();
|
||||
tile.updateIndianSettlement(owner);
|
||||
|
@ -427,12 +429,14 @@ public final class InGameController extends Controller {
|
|||
private void csSell(Unit unit, Goods goods, int price,
|
||||
ServerIndianSettlement sis, ChangeSet cs) {
|
||||
final ServerPlayer owner = (ServerPlayer)unit.getOwner();
|
||||
final int alarmBonus = -Math.round(price * 0.001f * getGame().getSpecification()
|
||||
.getInteger(GameOptions.ALARM_BONUS_SELL));
|
||||
csVisit(owner, sis, 0, cs);
|
||||
GoodsLocation.moveGoods(unit, goods.getType(), goods.getAmount(), sis);
|
||||
cs.add(See.perhaps(), unit);
|
||||
sis.getOwner().modifyGold(-price);
|
||||
owner.modifyGold(price);
|
||||
sis.csModifyAlarm(owner, -price/50, true, cs);
|
||||
sis.csModifyAlarm(owner, alarmBonus, true, cs);
|
||||
sis.updateWantedGoods();
|
||||
final Tile tile = sis.getTile();
|
||||
tile.updateIndianSettlement(owner);
|
||||
|
@ -457,18 +461,20 @@ public final class InGameController extends Controller {
|
|||
private void csGift(Unit unit, Goods goods, int price,
|
||||
ServerIndianSettlement sis, ChangeSet cs) {
|
||||
final ServerPlayer owner = (ServerPlayer)unit.getOwner();
|
||||
final int alarmBonus = -Math.round(price * 0.001f * getGame().getSpecification()
|
||||
.getInteger(GameOptions.ALARM_BONUS_GIFT));
|
||||
csVisit(owner, sis, 0, cs);
|
||||
GoodsLocation.moveGoods(unit, goods.getType(), goods.getAmount(), sis);
|
||||
cs.add(See.perhaps(), unit);
|
||||
sis.csModifyAlarm(owner, -price/50, true, cs);
|
||||
sis.csModifyAlarm(owner, alarmBonus, true, cs);
|
||||
sis.updateWantedGoods();
|
||||
final Tile tile = sis.getTile();
|
||||
tile.updateIndianSettlement(owner);
|
||||
cs.add(See.only(owner), tile);
|
||||
logger.finest(owner.getSuffix() + " " + unit + " gives " + goods
|
||||
+ " at " + sis.getName());
|
||||
+ " at " + sis.getName() + " worth " + price);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Visits a native settlement, possibly scouting it full if it is
|
||||
* as a result of a scout actually asking to speak to the chief,
|
||||
|
@ -684,7 +690,7 @@ public final class InGameController extends Controller {
|
|||
randomInt(logger, "Tax act goods", random, 6))
|
||||
.addName("%newWorld%", serverPlayer.getNewLandName());
|
||||
}
|
||||
cs.add(See.only(serverPlayer),
|
||||
cs.add(See.only(serverPlayer),
|
||||
new MonarchActionMessage(action, template, monarchKey)
|
||||
.setTax(taxRaise));
|
||||
new MonarchSession(serverPlayer, action, taxRaise, goods);
|
||||
|
@ -740,7 +746,7 @@ public final class InGameController extends Controller {
|
|||
if (enemies.isEmpty()) break;
|
||||
Player enemy = getRandomMember(logger, "Choose enemy",
|
||||
enemies, random);
|
||||
List<AbstractUnit> warSupport
|
||||
List<AbstractUnit> warSupport
|
||||
= monarch.getWarSupport(enemy, random);
|
||||
int warGold = 0;
|
||||
if (!warSupport.isEmpty()) {
|
||||
|
@ -1438,7 +1444,7 @@ public final class InGameController extends Controller {
|
|||
}
|
||||
serverPlayer.csLoseLocation(europe, cs);
|
||||
serverPlayer.reinitialiseMarket();
|
||||
|
||||
|
||||
// Create the REF.
|
||||
ServerPlayer refPlayer = createREFPlayer(serverPlayer);
|
||||
cs.addPlayers(Collections.singletonList(refPlayer));
|
||||
|
@ -1563,7 +1569,7 @@ public final class InGameController extends Controller {
|
|||
int mercPrice = monarch.loadMercenaryForce(random, mercs);
|
||||
serverPlayer.csMercenaries(mercPrice, mercs,
|
||||
Monarch.MonarchAction.HESSIAN_MERCENARIES, random, cs);
|
||||
|
||||
|
||||
// Pity to have to update such a heavy object as the player,
|
||||
// but we do this, at most, once per player. Other players
|
||||
// only need a partial player update and the stance change.
|
||||
|
@ -1663,9 +1669,12 @@ public final class InGameController extends Controller {
|
|||
cs.add(See.perhaps(), unit);
|
||||
if (settlement instanceof ServerIndianSettlement) {
|
||||
ServerIndianSettlement sis = (ServerIndianSettlement)settlement;
|
||||
final int alarmBonus = -Math.round(sis.getPriceToBuy(goods)
|
||||
* 0.001f * getGame().getSpecification()
|
||||
.getInteger(GameOptions.ALARM_BONUS_GIFT));
|
||||
|
||||
csVisit(serverPlayer, sis, 0, cs);
|
||||
sis.csModifyAlarm(serverPlayer, -sis.getPriceToBuy(goods) / 50,
|
||||
true, cs);
|
||||
sis.csModifyAlarm(serverPlayer, alarmBonus, true, cs);
|
||||
sis.updateWantedGoods();
|
||||
tile.updateIndianSettlement(serverPlayer);
|
||||
cs.add(See.only(serverPlayer), tile);
|
||||
|
@ -1857,7 +1866,7 @@ public final class InGameController extends Controller {
|
|||
} else {
|
||||
logger.info("Continuing diplomacy session: " + session
|
||||
+ " from " + ourUnit);
|
||||
}
|
||||
}
|
||||
ServerPlayer otherPlayer = (ServerPlayer)otherColony.getOwner();
|
||||
serverPlayer.csDiplomacy(session, agreement, cs);
|
||||
getGame().sendToOthers(serverPlayer, cs);
|
||||
|
@ -1886,7 +1895,7 @@ public final class InGameController extends Controller {
|
|||
} else {
|
||||
logger.info("Continuing diplomacy session: " + session
|
||||
+ " from " + ourColony);
|
||||
}
|
||||
}
|
||||
ServerPlayer otherPlayer = (ServerPlayer)otherUnit.getOwner();
|
||||
serverPlayer.csDiplomacy(session, agreement, cs);
|
||||
getGame().sendToOthers(serverPlayer, cs);
|
||||
|
@ -2331,7 +2340,7 @@ public final class InGameController extends Controller {
|
|||
|
||||
// Always show the tile the unit was on
|
||||
cs.add(See.perhaps().always(serverPlayer), unit.getTile());
|
||||
|
||||
|
||||
sis.csChangeMissionary(unit, cs);//+vis(serverPlayer)
|
||||
break;
|
||||
}
|
||||
|
@ -3015,7 +3024,7 @@ public final class InGameController extends Controller {
|
|||
return serverPlayer.clientError("Session already open for: " + nt);
|
||||
} else if (action != NativeTradeAction.OPEN && session == null) {
|
||||
return serverPlayer.clientError("No session found for: " + nt);
|
||||
}
|
||||
}
|
||||
|
||||
ChangeSet cs = new ChangeSet();
|
||||
NativeTradeItem item;
|
||||
|
@ -3077,7 +3086,7 @@ public final class InGameController extends Controller {
|
|||
cs.add(See.only(otherPlayer),
|
||||
new NativeTradeMessage(action, nt));
|
||||
break;
|
||||
|
||||
|
||||
case GIFT: // Check goods, forward
|
||||
item = nt.getItem();
|
||||
nt.mergeFrom(session.getNativeTrade());
|
||||
|
@ -3112,7 +3121,7 @@ public final class InGameController extends Controller {
|
|||
cs.add(See.only(otherPlayer),
|
||||
new NativeTradeMessage(action, nt));
|
||||
break;
|
||||
|
||||
|
||||
case ACK_BUY: // Buy succeeded, update goods, inform player
|
||||
item = nt.getItem();
|
||||
csBuy(unit, item.getGoods(), item.getPrice(),
|
||||
|
@ -3164,9 +3173,9 @@ public final class InGameController extends Controller {
|
|||
unit.setMovesLeft(0); // Clear moves again on hagglers
|
||||
cs.addPartial(See.only(otherPlayer), unit,
|
||||
"movesLeft", String.valueOf(unit.getMovesLeft()));
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
return serverPlayer.clientError("Bogus action: " + action);
|
||||
}
|
||||
|
@ -3359,7 +3368,7 @@ public final class InGameController extends Controller {
|
|||
+ " at " + colony);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Just update the whole tile, including for other players
|
||||
// which might see colony population change.
|
||||
return new ChangeSet().add(See.perhaps(), tile);
|
||||
|
|
Loading…
Reference in New Issue