From 87677089ff74e6e0ca7c6d4f64ce6fcc5e6712c5 Mon Sep 17 00:00:00 2001 From: David Lewis Date: Sun, 3 Sep 2017 16:45:46 -0700 Subject: [PATCH] Rename visible strings from Indian to Native --- data/strings/FreeColMessages.properties | 524 ++++++++++++------------ doc/FreeCol.tex | 68 +-- doc/developer.tex | 10 +- 3 files changed, 301 insertions(+), 301 deletions(-) diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties index 7d2badbac..3475a8208 100644 --- a/data/strings/FreeColMessages.properties +++ b/data/strings/FreeColMessages.properties @@ -453,7 +453,7 @@ reportHighScoresAction.name=High Scores reportHistoryAction.accelerator=shift F3 reportHistoryAction.name=History Report reportIndianAction.accelerator=F5 -reportIndianAction.name=Indian Advisor +reportIndianAction.name=Native Advisor reportLabourAction.accelerator=F2 reportLabourAction.name=Labor Advisor reportMilitaryAction.accelerator=F7 @@ -1194,7 +1194,7 @@ model.option.autoEndTurn.name=Auto End Turn model.option.autoEndTurn.shortDescription=Automatically ends the turn when there are no more units to be moved. model.option.showEndTurnDialog.name=End Turn Dialog model.option.showEndTurnDialog.shortDescription=Show the end turn dialog if some units could still move. -model.option.indianDemandResponse.name=Response to Indian Demands +model.option.indianDemandResponse.name=Response to Native Demands model.option.indianDemandResponse.shortDescription=What to do when the natives ask for or demand goods. clientOptions.other.indianDemandResponse.ask.name=Ask clientOptions.other.indianDemandResponse.ask.shortDescription=Ask you what to do @@ -1338,7 +1338,7 @@ model.ability.moveToEurope.name=Move to Europe model.ability.moveToEurope.shortDescription=This tile allows units to move to Europe model.ability.multipleAttacks.name=Multiple attacks model.ability.multipleAttacks.shortDescription=This unit can attack multiple times -model.ability.native.name=Indian +model.ability.native.name=Native model.ability.native.shortDescription=Native American model.ability.navalUnit.name=Naval unit model.ability.navalUnit.shortDescription=This unit is a naval unit. @@ -1599,7 +1599,7 @@ model.foundingFather.jacobFugger.text=Extremely wealthy German merchant and bank model.foundingFather.jacobFugger.birthAndDeath=1459-1525 model.foundingFather.peterMinuit.name=Peter Minuit -model.foundingFather.peterMinuit.description=Indians no longer demand payment for their land. +model.foundingFather.peterMinuit.description=Natives no longer demand payment for their land. model.foundingFather.peterMinuit.text=Bought what later became known as Manhattan Island from Native Americans for about 60 Dutch guilders. He later would colonize the Delaware Bay area as well. model.foundingFather.peterMinuit.birthAndDeath=1580-1638 @@ -1669,7 +1669,7 @@ model.foundingFather.thomasJefferson.text=A powerful voice of Patriotism, Jeffer model.foundingFather.thomasJefferson.birthAndDeath=1743-1826 model.foundingFather.pocahontas.name=Pocahontas -model.foundingFather.pocahontas.description=All tension levels between you and natives are removed and Indian alarm is generated half as fast. +model.foundingFather.pocahontas.description=All tension levels between you and natives are removed and Native alarm is generated half as fast. model.foundingFather.pocahontas.text=A peacemaker between early Jamestown settlers and the Native Americans. She is credited with sending food and other supplies to starving colonists there during harsh times. She later converted to Christianity and married an Englishman. model.foundingFather.pocahontas.birthAndDeath=1595-1617 @@ -1700,17 +1700,17 @@ model.foundingFather.williamPenn.birthAndDeath=1644-1718 model.foundingFather.fatherJeanDeBrebeuf.name=Father Jean de Brebeuf model.foundingFather.fatherJeanDeBrebeuf.description=All missionaries function as experts. -model.foundingFather.fatherJeanDeBrebeuf.text=Befriended the Huron Indians and converted many to Christianity. Died at the hands of the Iroquois who had finally defeated their enemy, the Hurons. +model.foundingFather.fatherJeanDeBrebeuf.text=Befriended the Huron Natives and converted many to Christianity. Died at the hands of the Iroquois who had finally defeated their enemy, the Hurons. model.foundingFather.fatherJeanDeBrebeuf.birthAndDeath=1593-1649 model.foundingFather.juanDeSepulveda.name=Juan de Sepulveda -model.foundingFather.juanDeSepulveda.description=Increases the chance that the population of a subjugated Indian settlement will "convert" and join your colonies by 20%. -model.foundingFather.juanDeSepulveda.text=A Spanish theologian who spoke out for the conquest of Indian lands and forced evangelization of the natives. +model.foundingFather.juanDeSepulveda.description=Increases the chance that the population of a subjugated Native settlement will "convert" and join your colonies by 20%. +model.foundingFather.juanDeSepulveda.text=A Spanish theologian who spoke out for the conquest of Native lands and forced evangelization of the natives. model.foundingFather.juanDeSepulveda.birthAndDeath=1781-1872 model.foundingFather.bartolomeDeLasCasas.name=Bartolome de las Casas -model.foundingFather.bartolomeDeLasCasas.description=All existing Indian converts are converted to free colonists. -model.foundingFather.bartolomeDeLasCasas.text=A Catholic Priest who traveled the Indies converting Indians and chastising Spain for their treatment of the Natives. +model.foundingFather.bartolomeDeLasCasas.description=All existing Native converts are converted to free colonists. +model.foundingFather.bartolomeDeLasCasas.text=A Catholic Priest who traveled the Indies converting Natives and chastising Spain for their treatment of the Natives. model.foundingFather.bartolomeDeLasCasas.birthAndDeath=1474-1566 # Founding fathers types @@ -2109,15 +2109,15 @@ model.unit.expertSilverMiner.description=The Expert Silver Miner produces more s model.unit.firebrandPreacher.name={{plural:%number%|one=Firebrand Preacher|other=Firebrand Preachers|default=Firebrand Preacher}} model.unit.firebrandPreacher.description=The Firebrand Preacher increases religious unrest in Europe (symbolized by Crosses), which in turn increases emigration to the New World. model.unit.freeColonist.name={{plural:%number%|one=Free Colonist|other=Free Colonists|default=Free Colonist}} -model.unit.freeColonist.description=The Free Colonist is a greenhorn without any particular skills. However, Free Colonists can become skilled units by working on your colony tiles, or by visiting Indian settlements. They can also be promoted to Veteran Soldiers, or educated in colonies that have built a school. +model.unit.freeColonist.description=The Free Colonist is a greenhorn without any particular skills. However, Free Colonists can become skilled units by working on your colony tiles, or by visiting Native settlements. They can also be promoted to Veteran Soldiers, or educated in colonies that have built a school. model.unit.hardyPioneer.name={{plural:%number%|one=Hardy Pioneer|other=Hardy Pioneers|default=Hardy Pioneer}} model.unit.hardyPioneer.description=The Hardy Pioneer excels at clearing forests, plowing fields and building roads. model.unit.indenturedServant.name={{plural:%number%|one=Indentured Servant|other=Indentured Servants|default=Indentured Servant}} model.unit.indenturedServant.description=The Indentured Servant is well suited for outdoor work, but less suited for indoor work. He may become a Free Colonist through promotion or education. -model.unit.indianConvert.name={{plural:%number%|one=Indian Convert|other=Indian Converts|default=Indian Convert}} -model.unit.indianConvert.description=The Indian Convert is a native who has joined one of your colonies. He is skilled at all kinds of outdoor work, but unskilled at indoor work. As soon as Bartolome de las Casas joins the Continental Congress, all Indian Converts become Free Colonists. +model.unit.indianConvert.name={{plural:%number%|one=Native Convert|other=Native Converts|default=Native Convert}} +model.unit.indianConvert.description=The Native Convert is a native who has joined one of your colonies. He is skilled at all kinds of outdoor work, but unskilled at indoor work. As soon as Bartolome de las Casas joins the Continental Congress, all Native Converts become Free Colonists. model.unit.jesuitMissionary.name={{plural:%number%|one=Jesuit Missionary|other=Jesuit Missionaries|default=Jesuit Missionary}} -model.unit.jesuitMissionary.description=The Jesuit Missionary is able to establish a mission in an Indian settlement and is especially skilled at converting Indians. +model.unit.jesuitMissionary.description=The Jesuit Missionary is able to establish a mission in a Native settlement and is especially skilled at converting Natives. model.unit.masterBlacksmith.name={{plural:%number%|one=Master Blacksmith|other=Master Blacksmiths|default=Master Blacksmith}} model.unit.masterBlacksmith.description=The Master Blacksmith forges tools from ore. model.unit.masterCarpenter.name={{plural:%number%|one=Master Carpenter|other=Master Carpenters|default=Master Carpenter}} @@ -2141,7 +2141,7 @@ model.unit.masterWeaver.description=The Master Weaver turns cotton into cloth. model.unit.pettyCriminal.name={{plural:%number%|one=Petty Criminal|other=Petty Criminals|default=Petty Criminal}} model.unit.pettyCriminal.description=The Petty Criminal is suited for outdoor work, but unsuited for indoor work. He may become an Indentured Servant through promotion or education. model.unit.seasonedScout.name={{plural:%number%|one=Seasoned Scout|other=Seasoned Scouts|default=Seasoned Scout}} -model.unit.seasonedScout.description=The Seasoned Scout is best at exploring the New World, particularly Indian settlements and Lost City Rumors. +model.unit.seasonedScout.description=The Seasoned Scout is best at exploring the New World, particularly Native settlements and Lost City Rumors. model.unit.veteranSoldier.name={{plural:%number%|one=Veteran Soldier|other=Veteran Soldiers|default=Veteran Soldier}} model.unit.veteranSoldier.description=The Veteran Soldier is an experienced military unit. Any Free Colonist may be promoted to a Veteran Soldier after winning a battle. @@ -2165,7 +2165,7 @@ model.unit.artillery.description=Artillery is good at attacking and defending co model.unit.damagedArtillery.name={{plural:%number%|one=Damaged piece of Artillery|other=Damaged pieces of Artillery|default=Damaged Artillery}} model.unit.damagedArtillery.description=Damaged Artillery is like Artillery in every way, only weaker. model.unit.treasureTrain.name={{plural:%number%|one=Treasure Train|other=Treasure Trains|default=Treasure Train}} -model.unit.treasureTrain.description=The sole purpose of the Treasure Train is to transport the gold found in the ruins of a Lost City, or plundered from an Indian settlement. If you move it into one of your colonies, the Crown will offer to transport it to Europe for a reasonable fee. If you have a Galleon, you can move it to Europe yourself. +model.unit.treasureTrain.description=The sole purpose of the Treasure Train is to transport the gold found in the ruins of a Lost City, or plundered from an Native settlement. If you move it into one of your colonies, the Crown will offer to transport it to Europe for a reasonable fee. If you have a Galleon, you can move it to Europe yourself. model.unit.wagonTrain.name={{plural:%number%|one=Wagon Train|other=Wagon Trains|default=Wagon Train}} model.unit.wagonTrain.description=The Wagon Train is able to carry up to 200 units of goods over land. You can use it to trade with other players, or to move goods between your own colonies. @@ -2357,7 +2357,7 @@ model.messageType.combatResult.name=Combat Results model.messageType.default.name=Messages model.messageType.demands.name=Native Demands model.messageType.foreignDiplomacy.name=Foreign Diplomacy -model.messageType.giftGoods.name=Indian Gifts +model.messageType.giftGoods.name=Native Gifts model.messageType.goodsMovement.name=Goods Movement model.messageType.governmentEfficiency.name=Government Efficiency model.messageType.lostCityRumour.name=Lost City Rumors @@ -2382,7 +2382,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 @@ -2782,7 +2782,7 @@ info.enterSomeText=Please enter some text. info.newLanguageSelected=Setting the language to %language%. You will need to restart the game for the changes to fully take effect. missionarySettlement.establish=Establish Mission missionarySettlement.heresy=Denounce as Heresy -missionarySettlement.incite=Incite Indians +missionarySettlement.incite=Incite Natives missionarySettlement.question=With what purpose would you like to enter %settlement%? nameColony.notUnique=You already have a colony named %name%! nameColony.text=Please suggest a name for our new colony: @@ -3684,7 +3684,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 @@ -4165,7 +4165,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 @@ -5737,13 +5737,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 @@ -5758,21 +5758,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 @@ -5780,7 +5780,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 @@ -5894,147 +5894,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 @@ -6541,29 +6541,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 @@ -6572,17 +6572,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 @@ -6594,21 +6594,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 @@ -6623,7 +6623,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 @@ -6640,27 +6640,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‘ @@ -6677,7 +6677,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 @@ -6871,15 +6871,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 @@ -6890,11 +6890,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 @@ -6919,78 +6919,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 @@ -6998,10 +6998,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 @@ -7038,30 +7038,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 @@ -7069,11 +7069,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 @@ -7081,7 +7081,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 @@ -7089,13 +7089,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 @@ -7103,22 +7103,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 @@ -7150,7 +7150,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 diff --git a/doc/FreeCol.tex b/doc/FreeCol.tex index 8d0d6eb6b..ba5fa6309 100644 --- a/doc/FreeCol.tex +++ b/doc/FreeCol.tex @@ -1082,8 +1082,8 @@ have already been built, and which building is currently being built. Congress}{Continental Congress}, you are also informed about the number of Founding Fathers, the current tax and the current Sons of Liberty membership of your opponents. -\item The \Report{Indian Advisor} tells you about your relations with -the various Indian nations, and the number of settlements they +\item The \Report{Native Advisor} tells you about your relations with +the various Native nations, and the number of settlements they possess. \item The \Report{Continental Congress Advisor} tells you which Founding Fathers are already present in the \hyperlink{Continental @@ -1344,7 +1344,7 @@ orange shields. The letter indicates the current state of the unit: If the unit is a foreign naval unit, the shield will display a number instead. This is the number of holds this unit is using. -Indian Settlements display at least two shields: The colour of the +Native Settlements display at least two shields: The colour of the first shield indicates the nation this settlement belongs to. A $*$ on this shield indicates that this settlement is the nation's capital, a $-$ that it is not. The second shield, which bears an exclamation mark @@ -1882,7 +1882,7 @@ particularly valuable. \hypertarget{Native Settlements}{\section{Native Settlements}} The New World is by no means an uninhabited country. Various tribes of -Indians already live there, and make use of the land. When your +Natives already live there, and make use of the land. When your colonists arrive, you will have to decide whether you will attempt to peacefully coexist with the natives, or to wage war. Beware that their culture is unlike that of Europe, and whenever your peoples come @@ -1959,7 +1959,7 @@ update the skill and goods information, but the special benefits are only available to the first scout (of any nation) that visits (or any unit, if the ``Chief contact'' option is set). Settlements which are unscouted to the best of your knowledge are decorated with a dollar -sign on the settlement tile popup and Indian Advisor. +sign on the settlement tile popup and Native Advisor. \hyperlink{Free Colonist}{Free Colonists} and \hyperlink{Indentured Servant}{Indentured Servants} may enter a settlement in order to learn @@ -1977,7 +1977,7 @@ mission. The presence of a Mission will reduce tension between the natives and your colonists. In time, some of the natives may also convert and join -your colonies as \hyperlink{Indian Convert}{Indian Converts}. If the +your colonies as \hyperlink{Native Convert}{Native Converts}. If the settlement already contains the mission of another European country, your missionary may denounce the teachings of that mission as a heresy. If he is successful, the natives will burn down the old @@ -2132,7 +2132,7 @@ if the colony can also produce ore, which can be refined to produce tools. However, ore is not as important as lumber. Some of the tiles may be owned by other European powers, or claimed by -Indians. Building a colony too close to other settlements is not a +Natives. Building a colony too close to other settlements is not a good idea, unless you plan to conquer or destroy these settlements. Keeping your own colonies close together is a good strategy, however, as long as you avoid sharing tiles between several colonies as far as @@ -2550,7 +2550,7 @@ World. Several dozen different units are available in FreeCol, but not all units are available to all players. Some units are available only to -\textbf{Indian Players}, some units are only available to +\textbf{Native Players}, some units are only available to \textbf{European Players}, and other units are available only to the \textbf{Royal Expeditionary Force}. @@ -2614,10 +2614,10 @@ The more advanced buildings you can construct in the your colonies require not only lumber but also \hyperlink{Tools}{Tools}, which are produced from \hyperlink{Ore}{Ore}. This is the job the \Unit{Master Blacksmith} excels in. Tools are also used by your \Unit{Pioneer} to -clear forests, to plow fields and to build roads, but none of your -other colonists can match the outdoors skills of your -\Unit{Hardy Pioneer}. And finally, Tools are required for the -production of \hyperlink{Muskets}{Muskets}, a demanding task best +clear forests, to plow fields and to build roads, but none of your +other colonists can match the outdoors skills of your +\Unit{Hardy Pioneer}. And finally, Tools are required for the +production of \hyperlink{Muskets}{Muskets}, a demanding task best left to the \Unit{Master Gunsmith}. All your units are able to explore the New World, but the colonist @@ -2638,10 +2638,10 @@ churches and maybe even a the natives. The \Unit{Jesuit Missionary}, however, is much more accomplished at the job. -The converted natives may join your colonies as \Unit{Indian +The converted natives may join your colonies as \Unit{Native Convert}s. They are unskilled at all jobs within the colony, but more skilled than your Free Colonists at producing food and New World -Goods such as sugar, tobacco, cotton and furs. Indian Converts can not +Goods such as sugar, tobacco, cotton and furs. Native Converts can not be upgraded through \hyperlink{Skills and Education}{Education}, but they become Free Colonists as soon as \hyperlink{Bartolome de las Casas}{Bartolom{\'e} de las Casas} joins the \hyperlink{Continental @@ -2728,7 +2728,7 @@ Regular}{Colonial Regulars} and \hyperlink{Colonial Cavalry}{Colonial Cavalry}. The natives also have two types of units that you can not recruit, -namely the \Unit{Indian Brave} and the \Unit{Indian Dragoon}. These are +namely the \Unit{Native Brave} and the \Unit{Native Dragoon}. These are strong fighting units that can also carry up to 100 units of goods each. @@ -2763,7 +2763,7 @@ without it they have no special abilities: fields and cut down forests. Even the Hardy Pioneer is unable to do so without suitable equipment. -\item Only a unit equipped with horses is able to scout Indian +\item Only a unit equipped with horses is able to scout Native settlements and foreign colonies. Even the Seasoned Scout can't do that without being mounted. @@ -2772,7 +2772,7 @@ without it they have no special abilities: without muskets they have no advantage. \item Only a unit equipped with a bible is commissioned as a - missionary and able to establish a mission in an Indian + missionary and able to establish a mission in an Native settlement. Even the Jesuit Missionary is unable to do so without a bible. If a Jesuit Missionary is equipped with tools, muskets or horses, he loses his bible. If that happens, the Jesuit Missionary @@ -2780,7 +2780,7 @@ without it they have no special abilities: \end{itemize} Of course, units that do not represent people, such as ships, wagon -trains and treasure trains, can not be equipped. The Indian Convert is +trains and treasure trains, can not be equipped. The Native Convert is another unit that can not be equipped. You can equip a unit by selecting the appropriate menu item from the @@ -2811,7 +2811,7 @@ Planter}{Master Tobacco Planters}, as well as the \hyperlink{Expert Fur Trapper}{Expert Fur Trappers}, can not be recruited in Europe. At the beginning of the game, these skills can only be learned at -Indian Settlements, or through experience. If you put a Free Colonist +Native Settlements, or through experience. If you put a Free Colonist to work outside of the colony for a long time without changing his work assignment, he may learn the necessary skill and become an expert. This does not work for the more complicated jobs within the @@ -2851,20 +2851,20 @@ Servants may also become Free Colonists by winning a battle and being Veteran Soldiers, and after the Declaration of Independence, these may be promoted to Colonial Regulars. -Indian units are more productive than free colonists when working +Native units are more productive than free colonists when working outside of the colony, and less productive when working inside a -building. Indian units can not become free colonists through -education, but all Indian units become free colonists as soon as +building. Native units can not become free colonists through +education, but all Native units become free colonists as soon as \hyperlink{Bartolome de las Casas}{Bartolom\'e de las Casas} joins the \hyperlink{Continental Congress}{Continental Congress}. -However, Indian Converts that join your colonies {\em after} +However, Native Converts that join your colonies {\em after} Bartolom\'e de las Casas has been elected to the Continental Congress will always remain converts and can not be upgraded. -\hyperlink{Scout}{Scouts} can explore the New World and enter Indian +\hyperlink{Scout}{Scouts} can explore the New World and enter Native Settlements in order to speak with the tribal chiefs. A scout entering -an Indian Settlement may become a \hyperlink{Seasoned Scout}{Seasoned +an Native Settlement may become a \hyperlink{Seasoned Scout}{Seasoned Scout} through experience. A colonist investigating a \hyperlink{Lost City Rumours}{Lost City Rumours} may also be upgraded to a Seasoned Scout, unless that unit already has another skill. @@ -2975,10 +2975,10 @@ Bonuses and penalties for land units: Fort or Fortress is increased by 100\%, 150\% and 200\%, respectively. \item \hypertarget{Artillery Bonus}{Artillery Bonus}: the defensive - power of artillery in a colony defending against an Indian raid is + power of artillery in a colony defending against an Native raid is increased by 50\%. \item \hypertarget{Ambush Penalty}{Ambush Penalty}: the defensive - power of your units when defending against Indians, and of the units + power of your units when defending against Natives, and of the units of the Royal Expeditionary Force when defending against your units is reduced by the defence bonus of the defender's tile. \end{itemize} @@ -3014,7 +3014,7 @@ in effect are dropped. \Wikipedia{Jacob_Fugger} \Father{Peter Minuit} (1580--1638) bought what later became known as Manhattan Island from Native Americans for about 60 Dutch guilders. He later colonized the Delware Bay area as well. As soon as Peter Minuit -is elected to the Continental Congress, the Indians no longer demand +is elected to the Continental Congress, the Natives no longer demand payment for their land. \Wikipedia{Peter_Minuit} \Father{Peter Stuyvesant} (1592--1672) was appointed Governor General @@ -3121,7 +3121,7 @@ Jamestown settlers and the Native Americans. She is credited with sending food and other supplies to starving colonists there during harsh times. She later converted to Christianity and married an Englishman. When Pocahontas joins the Continental Congress, all -tension levels between you and natives are removed and Indian alarm is +tension levels between you and natives are removed and Native alarm is generated half as fast. \Wikipedia{Pocahontas} \Father{Thomas Paine} (1737--1809) inspired colonists with his pen at @@ -3160,24 +3160,24 @@ a haven to fellow Quakers. The election of William Penn increases cross production in all colonies by 50\%. \Wikipedia{William_Penn} \FFather{Father Jean de Brebeuf}{Father Jean de Br\'ebeuf} (1593--1649) -befriended the Huron Indians and converted many to Christianity. He +befriended the Huron Natives and converted many to Christianity. He died at the hands of the Iroquois who had finally defeated their enemy, the Hurons. With Jean de Brebeuf a member of the Continental Congress, all missionaries function as experts. \Wikipedia{Jean_de_Brebeuf} \FFather{Juan de Sepulveda}{Juan Gin\'es de Sep\'ulveda} (1781--1872) -was a Spanish theologian who spoke out for the conquest of Indian +was a Spanish theologian who spoke out for the conquest of Native lands and forced evangelization of the natives. The election of Juan de Sepulveda to the Continental Congress increases the chance that a -subjugated Indian settlement will ``convert'' and join a +subjugated Native settlement will ``convert'' and join a colony. \Wikipedia{Juan_Gines_de_Sepulveda} \FFather{Bartolome de las Casas}{Bartolom\'e de las Casas} (1474--1566) was a Catholic Priest who traveled the Indies converting -Indians and chastising Spain for their treatment of the Natives. When +Natives and chastising Spain for their treatment of the Natives. When Bartolom\'e de las Casas joins the Continental Congress, all existing -Indian converts become free +Native converts become free colonists. \Wikipedia{Bartolome_de_las_Casas} diff --git a/doc/developer.tex b/doc/developer.tex index 02f1df19a..b21c841e1 100644 --- a/doc/developer.tex +++ b/doc/developer.tex @@ -411,7 +411,7 @@ recommended for a release. Uploads to sourceforge use \texttt{sftp}. \item Start a clean compile, run all tests and verify the specification(s). You can do that by calling \verb+ant prepare-commit+. - + \item Call \verb+ant dist+ in order to build all packages. You will be prompted for the version of this release. Alternatively, you can specify the version on the command line, by with something like: @@ -437,7 +437,7 @@ recommended for a release. Uploads to sourceforge use \texttt{sftp}. \item Upload the packages to \verb+sftp://frs.sourceforge.net/+. A script \verb|bin/release.sh| is provided that does this job, - including rebuilding and uploading the manual and JavaDoc. + including rebuilding and uploading the manual and JavaDoc. \item Write a release announcement (see previous versions for comparison). Include information on savegame compatibility with @@ -660,7 +660,7 @@ The unit can be born in a colony, provided that enough food is available. \ability{model.ability.bornInIndianSettlement} \affectsUnit -The unit can be born in an Indian settlement, provided that enough food is available. +The unit can be born in an Native settlement, provided that enough food is available. \ability{model.ability.build} \affectsBuilding @@ -924,7 +924,7 @@ Goods of this type contribute to the player's immigration points. \modifier{model.modifier.landPaymentModifier} \affectsPlayer -The player can buy Indian land at a reduced price. +The player can buy Native land at a reduced price. \modifier{model.modifier.liberty} \textit{Affects: Player\\Provided by: Goods Type} @@ -1007,7 +1007,7 @@ other files that implement the required changes. \texttt{mod.xml} simply contains: \texttt{} where the identifier is some unique name (distinct from other existing mods). The \texttt{FreeColMessages.properties} file should contain at -minimum entries for \texttt{mod.}\emph{identifier}\texttt{.name} +minimum entries for \texttt{mod.}\emph{identifier}\texttt{.name} and \texttt{mod.}\emph{identifier}\texttt{.shortDescription}, so that the mod selection dialog can display the mod correctly. Other messages needed by the mod belong in \texttt{ModMessages.properties}.