Menu
▾
▴
[Freecol-commits] SF.net SVN: freecol:[9880] freecol/trunk
|
From: <mp...@us...> - 2012-06-05 11:14:18
|
Revision: 9880
http://freecol.svn.sourceforge.net/freecol/?rev=9880&view=rev
Author: mpope
Date: 2012-06-05 11:14:06 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
Implement ship names. Names contributed by izzieliu.
Modified Paths:
--------------
freecol/trunk/data/strings/FreeColMessages.properties
freecol/trunk/src/net/sf/freecol/client/gui/i18n/Messages.java
freecol/trunk/src/net/sf/freecol/common/model/Player.java
freecol/trunk/src/net/sf/freecol/server/control/InGameController.java
freecol/trunk/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
freecol/trunk/src/net/sf/freecol/server/model/ServerColony.java
Modified: freecol/trunk/data/strings/FreeColMessages.properties
===================================================================
--- freecol/trunk/data/strings/FreeColMessages.properties 2012-06-05 10:29:40 UTC (rev 9879)
+++ freecol/trunk/data/strings/FreeColMessages.properties 2012-06-05 11:14:06 UTC (rev 9880)
@@ -247,6 +247,7 @@
Colony=Colony
Settlement=Settlement
NewWorld=New World
+Ship=Ship
LoadingSavegame.title=Loading Save game
LoadingSavegame.singlePlayer=Single player
@@ -2711,12 +2712,7 @@
# --9-- Colony Names and Misc
-shipName.0.0=Famous ship
-shipName.1.0=Mayflower
-shipName.2.0=Goéland
-shipName.3.0=Santa Maria
-
-# Dutch colony names:
+# Dutch colony names
model.nation.dutch.settlementName.0=New Amsterdam
model.nation.dutch.settlementName.1=Fort Orange
model.nation.dutch.settlementName.2=Fort Nassau
@@ -2779,7 +2775,148 @@
model.nation.dutch.region.land.9=Plaat
model.nation.dutch.region.land.10=Bouvery
-# English colony names:
+# Dutch ship names
+model.nation.dutch.ship.0=Halve Maen
+# Henry Hudson, New York
+model.nation.dutch.ship.1=Abrahams Offerhande
+model.nation.dutch.ship.2=Aker
+model.nation.dutch.ship.3=Angel Gabriel
+model.nation.dutch.ship.4=Bever
+model.nation.dutch.ship.5=Blauwe Duif
+model.nation.dutch.ship.6=Blauwen Haen
+model.nation.dutch.ship.7=Blijde Boodschap
+model.nation.dutch.ship.8=Bonte Coe
+model.nation.dutch.ship.9=Bonte Koe
+model.nation.dutch.ship.10=Brandaris
+model.nation.dutch.ship.11=Brant van Toyen
+model.nation.dutch.ship.12=Bruynvisch
+model.nation.dutch.ship.13=Calmer Sleutel
+model.nation.dutch.ship.14=Coninck David
+model.nation.dutch.ship.15=Coninck Salomon
+model.nation.dutch.ship.16=Coopman
+model.nation.dutch.ship.17=Doel
+model.nation.dutch.ship.18=Dolphijn
+model.nation.dutch.ship.19=Draetvadt
+model.nation.dutch.ship.20=Drie Koningen
+model.nation.dutch.ship.21=Eekhoorntje
+model.nation.dutch.ship.22=Eenhoorn
+model.nation.dutch.ship.23=Elbinck
+model.nation.dutch.ship.24=Eyckenboom
+model.nation.dutch.ship.25=Faem
+model.nation.dutch.ship.26=Fortuyn
+#christiaensen
+model.nation.dutch.ship.27=Gekruyste Hart
+model.nation.dutch.ship.28=Gelderlant
+model.nation.dutch.ship.29=Gelderse Blom
+model.nation.dutch.ship.30=Gideon
+model.nation.dutch.ship.31=Goede Faem
+model.nation.dutch.ship.32=Goede Hoop
+model.nation.dutch.ship.33=Gratie
+model.nation.dutch.ship.34=Groote Christoffel
+model.nation.dutch.ship.35=Groote Gerrit
+model.nation.dutch.ship.36=Gulden Arent
+model.nation.dutch.ship.37=Halve Maen
+#hudson
+model.nation.dutch.ship.38=Haring
+model.nation.dutch.ship.39=Hoff van Cleef
+model.nation.dutch.ship.40=Hoop
+model.nation.dutch.ship.41=Houttuin
+model.nation.dutch.ship.42=Jager
+model.nation.dutch.ship.43=Jonge Tobias
+#mossel
+model.nation.dutch.ship.44=Juffrouw Leonora
+model.nation.dutch.ship.45=Kath
+model.nation.dutch.ship.46=Kock
+model.nation.dutch.ship.47=Koe
+model.nation.dutch.ship.48=Liefde
+model.nation.dutch.ship.49=Mackreel
+model.nation.dutch.ship.50=Maecht van Enckhuysen
+model.nation.dutch.ship.51=Malckmeyt or Melckmeyt
+model.nation.dutch.ship.52=Margriet
+model.nation.dutch.ship.53=Meeuwken
+model.nation.dutch.ship.54=Merimin
+model.nation.dutch.ship.55=Moesman
+model.nation.dutch.ship.56=Nachtegael
+model.nation.dutch.ship.57=Naerden
+model.nation.dutch.ship.58=Neptunus
+#sval
+model.nation.dutch.ship.59=Nieu Nederlandt
+model.nation.dutch.ship.60=Nieu Neerlantsche Fortuyn
+model.nation.dutch.ship.61=Nieu Swol
+model.nation.dutch.ship.62=Nieuwer Amster
+model.nation.dutch.ship.63=Noorthollandt
+model.nation.dutch.ship.64=Onrust
+#american-built
+model.nation.dutch.ship.65=Oranjeboom
+model.nation.dutch.ship.66=Ouwde Wagen
+model.nation.dutch.ship.67=Paerel
+model.nation.dutch.ship.68=Pauwe
+model.nation.dutch.ship.69=Peereboom
+model.nation.dutch.ship.70=Pijnappel
+model.nation.dutch.ship.71=Posthoorn
+model.nation.dutch.ship.72=Purmerlander Kerck
+model.nation.dutch.ship.73=Reael
+model.nation.dutch.ship.74=Rensselaerwijck
+model.nation.dutch.ship.75=Roode Roosenboom
+model.nation.dutch.ship.76=Salm
+model.nation.dutch.ship.77=Schaekerloo
+model.nation.dutch.ship.78=Schaep
+model.nation.dutch.ship.79=Schildpad
+model.nation.dutch.ship.80=Schotsen Duytsman
+model.nation.dutch.ship.81=Sevenster
+model.nation.dutch.ship.82=Sint Beninjo
+model.nation.dutch.ship.83=Sint Jacob
+model.nation.dutch.ship.84=Sint Jan Baptist
+model.nation.dutch.ship.85=Sint Joris
+model.nation.dutch.ship.86=Sint Martijn
+model.nation.dutch.ship.87=Sint Pieter
+#rijser
+model.nation.dutch.ship.88=Soutberch
+model.nation.dutch.ship.89=Sphera Mundi
+model.nation.dutch.ship.90=Statijn
+model.nation.dutch.ship.91=Swanenburch
+model.nation.dutch.ship.92=Swarte Arent
+model.nation.dutch.ship.93=Swarte Beer
+model.nation.dutch.ship.94=Swarte Paert
+model.nation.dutch.ship.95=Swol
+model.nation.dutch.ship.96=T'Amandare
+model.nation.dutch.ship.97=Trouw
+model.nation.dutch.ship.98=Tyjger
+#block
+model.nation.dutch.ship.99=Valckenier
+model.nation.dutch.ship.100=Vergulde Beer
+model.nation.dutch.ship.101=Vergulde Bever
+model.nation.dutch.ship.102=Vergulde Meulen
+model.nation.dutch.ship.103=Vergulde Otter
+model.nation.dutch.ship.104=Vergulde Sonne
+model.nation.dutch.ship.105=Vergulde Star
+model.nation.dutch.ship.106=Visscher
+model.nation.dutch.ship.107=Vogel Struys
+model.nation.dutch.ship.108=Vogelgrijp
+model.nation.dutch.ship.109=Vogelsangh
+model.nation.dutch.ship.110=Vos
+model.nation.dutch.ship.111=Vosje
+model.nation.dutch.ship.112=Waegh
+model.nation.dutch.ship.113=Walvis
+model.nation.dutch.ship.114=Wapen de Amsterdam
+model.nation.dutch.ship.115=Wapen van Leeuwarden
+model.nation.dutch.ship.116=Wapen van Nieu Nederlandt
+model.nation.dutch.ship.117=Wapen van Noorwegen
+model.nation.dutch.ship.118=Wapen van Rensselaerswijck
+model.nation.dutch.ship.119=Wasbleecker
+model.nation.dutch.ship.120=Waterhond
+model.nation.dutch.ship.121=Westindische Raven
+model.nation.dutch.ship.122=Witte Doffer
+model.nation.dutch.ship.123=Witte Duyf
+model.nation.dutch.ship.124=Witte Kloodt
+model.nation.dutch.ship.125=Witte Paert
+model.nation.dutch.ship.126=Witte Valk
+model.nation.dutch.ship.127=Zeehond
+model.nation.dutch.ship.128=Zwarte Raaf
+model.nation.dutch.ship.129=de Eendracht
+
+
+# English colony names
model.nation.english.settlementName.0=Jamestown
model.nation.english.settlementName.1=Plymouth
model.nation.english.settlementName.2=Roanoke
@@ -2848,8 +2985,187 @@
model.nation.english.region.mountain.8=Coast Range
model.nation.english.region.mountain.9=Cascade Mountains
+# English ship names
+model.nation.english.ship.0=Matthew
+# J. Cabot, Newfoundland
+model.nation.english.ship.1=Abigall
+model.nation.english.ship.2=Aduenture
+model.nation.english.ship.3=Ambroſe
+model.nation.english.ship.4=An Fraunces
+model.nation.english.ship.5=Angel
+model.nation.english.ship.6=Ann and Sarah
+model.nation.english.ship.7=Anne
+model.nation.english.ship.8=Anne Aucher
+#gilbert 1
+model.nation.english.ship.9=Arbella
+model.nation.english.ship.10=Armenell
+model.nation.english.ship.11=Ayde
+#frobisher 2
+model.nation.english.ship.12=Bachelor's Delight
+model.nation.english.ship.13=Beare
+model.nation.english.ship.14=Bleſſing
+model.nation.english.ship.15=Bonauenture
+model.nation.english.ship.16=Bonny Beſſie
+model.nation.english.ship.17=Braue
+#roanoke 2
+model.nation.english.ship.18=Carliſle
+model.nation.english.ship.19=Catch
+#supply 3
+model.nation.english.ship.20=Charity
+model.nation.english.ship.21=Charls
+#foxe
+model.nation.english.ship.22=Coach
+model.nation.english.ship.23=Concord
+#gosnold
+model.nation.english.ship.24=Content
+model.nation.english.ship.25=Crane
+model.nation.english.ship.26=Darling
+model.nation.english.ship.27=De-La-Warre
+model.nation.english.ship.28=Defiance
+model.nation.english.ship.29=Delight
+model.nation.english.ship.30=Deliuerance
+model.nation.english.ship.31=Diana
+model.nation.english.ship.32=Dionyſe
+#frobisher 3
+model.nation.english.ship.33=Discouerie
+#hudson
+model.nation.english.ship.34=Dorothie
+model.nation.english.ship.35=Dorſet
+model.nation.english.ship.36=Doue
+model.nation.english.ship.37=Due Return
+model.nation.english.ship.38=Duty
+model.nation.english.ship.39=Eaglet
+#stannard
+model.nation.english.ship.40=Elizabeth
+model.nation.english.ship.41=Ellen
+#davis 3
+model.nation.english.ship.42=Emanuell
+model.nation.english.ship.43=Ffaulcon
+model.nation.english.ship.44=Ffortune
+model.nation.english.ship.45=Ffraunces
+model.nation.english.ship.46=Ffurthurance
+model.nation.english.ship.47=Foresight
+model.nation.english.ship.48=Gabriell
+#frobisher 1
+model.nation.english.ship.49=Garland
+#hawkins 2
+model.nation.english.ship.50=George
+model.nation.english.ship.51=Gift
+model.nation.english.ship.52=Gift of God
+model.nation.english.ship.53=God Speed
+#weymouth
+model.nation.english.ship.54=Golden Hinde
+model.nation.english.ship.55=Great Hopewel
+model.nation.english.ship.56=Harts-eaſe
+#hall
+model.nation.english.ship.57=Henrietta Maria
+model.nation.english.ship.58=Herckules
+model.nation.english.ship.59=Hoapwell
+model.nation.english.ship.60=Hoppe
+model.nation.english.ship.61=Imploy
+model.nation.english.ship.62=Iudith
+#hawkins 3
+model.nation.english.ship.63=Jacob
+model.nation.english.ship.64=James
+model.nation.english.ship.65=Jewel
+model.nation.english.ship.66=Joan Bonauenture
+model.nation.english.ship.67=John and Francis
+model.nation.english.ship.68=Joſeph
+model.nation.english.ship.69=Little James
+model.nation.english.ship.70=Loyalty
+model.nation.english.ship.71=Lyon
+#grenville / ralegh
+model.nation.english.ship.72=Lyons Whelp
+#hawkeridge
+model.nation.english.ship.73=Margaret
+model.nation.english.ship.74=Margaret and John
+model.nation.english.ship.75=Marmaduke
+model.nation.english.ship.76=Mary and John
+model.nation.english.ship.77=Mary Guilford
+#rut
+model.nation.english.ship.78=Mary Roſe
+#hawkins 1
+model.nation.english.ship.79=May-Flower
+model.nation.english.ship.80=Mermayde
+#davis 2
+model.nation.english.ship.81=Messenger
+#gillam
+model.nation.english.ship.82=Moone
+model.nation.english.ship.83=Moonelight
+model.nation.english.ship.84=Mooneſhine
+model.nation.english.ship.85=Mychaell
+model.nation.english.ship.86=Neptune
+model.nation.english.ship.87=Nonpareill
+model.nation.english.ship.88=Nonſuch
+model.nation.english.ship.89=North Starre
+model.nation.english.ship.90=Patience
+model.nation.english.ship.91=Pelickan
+#drake
+model.nation.english.ship.92=Phoenix
+model.nation.english.ship.93=Plough
+model.nation.english.ship.94=Porkupine
+model.nation.english.ship.95=Primroſe
+#frobisher 4
+model.nation.english.ship.96=Proſperous
+model.nation.english.ship.97=Quittance
+model.nation.english.ship.98=Rainbouu
+model.nation.english.ship.99=Ralegh
+#gilbert 3
+model.nation.english.ship.100=Red Lyon
+model.nation.english.ship.101=Relief
+model.nation.english.ship.102=Resolution
+#button
+model.nation.english.ship.103=Return
+model.nation.english.ship.104=Reuenge
+model.nation.english.ship.105=Richard
+#pre-1645
+model.nation.english.ship.106=Roe
+model.nation.english.ship.107=Rowbuck
+#roanoke 1
+model.nation.english.ship.108=Salomon
+#hawkins 1
+model.nation.english.ship.109=Sampſon
+model.nation.english.ship.110=Samuel
+model.nation.english.ship.111=Sarah
+model.nation.english.ship.112=Sarah Conſtant
+#virginia
+model.nation.english.ship.113=Sea Flower
+model.nation.english.ship.114=Searchthrift
+#burrough
+model.nation.english.ship.115=Southampton
+model.nation.english.ship.116=Sparrow
+model.nation.english.ship.117=Sparrow-Hawk
+model.nation.english.ship.118=Speed Well
+model.nation.english.ship.119=Squirrel
+#gilbert 2
+model.nation.english.ship.120=Star
+model.nation.english.ship.121=Sturgeon
+model.nation.english.ship.122=Succeſs
+model.nation.english.ship.123=Sunneſhine
+#davis 1
+model.nation.english.ship.124=Supply
+model.nation.english.ship.125=Suſan
+model.nation.english.ship.126=Swallow
+model.nation.english.ship.127=Swan
+model.nation.english.ship.128=Swan of Barnſtable
+model.nation.english.ship.129=Swiftſure
+model.nation.english.ship.130=Talbot
+model.nation.english.ship.131=Tempurance
+model.nation.english.ship.132=Thomas
+model.nation.english.ship.133=Thomas and John
+model.nation.english.ship.134=Thomas Alline
+model.nation.english.ship.135=Treasurer
+model.nation.english.ship.136=Tyger
+#hawkins 2
+model.nation.english.ship.137=Vnity of Deal
+model.nation.english.ship.138=Waruuick
+model.nation.english.ship.139=Whale
+model.nation.english.ship.140=William and Francis
+model.nation.english.ship.141=William and John
+model.nation.english.ship.142=Yonas
-# French colony names:
+
+# French colony names
model.nation.french.settlementName.0=Quebec
model.nation.french.settlementName.1=Montreal
model.nation.french.settlementName.2=Basse-Terre
@@ -2917,7 +3233,7 @@
model.nation.french.settlementName.64=Portage la Prairie
model.nation.french.settlementName.65=St. Boniface
-# French region names:
+# French region names
model.nation.french.region.land.1=Acadie
model.nation.french.region.land.2=Louisiane
model.nation.french.region.land.3=Pays d'en Hauts
@@ -2946,8 +3262,78 @@
model.nation.french.region.mountain.9=Massif du Mont-Mégantic
model.nation.french.region.mountain.10=Pic Champlain
+# French ship names
+model.nation.french.ship.0=Grande Hermine
+# J. Cartier, Quebec
+model.nation.french.ship.1=L'Anne-Madeleine
+model.nation.french.ship.2=L'Espoir
+#grenville
+model.nation.french.ship.3=L'Estendue
+model.nation.french.ship.4=L'Émérillon
+model.nation.french.ship.5=La Bonne-Aventure
+model.nation.french.ship.6=La Bonne-Renommée
+model.nation.french.ship.7=La Cardinale
+model.nation.french.ship.8=La Charlotte
+model.nation.french.ship.9=La Couronne
+model.nation.french.ship.10=La Dauphine
+#verrazzano
+model.nation.french.ship.11=La Flamengue
+model.nation.french.ship.12=La Grande-Hermine
+#cartier
+model.nation.french.ship.13=La Grande-Roberge
+#villegaignon
+model.nation.french.ship.14=La Lèchefraye
+model.nation.french.ship.15=La Marie des Bonnes Nouvelles
+model.nation.french.ship.16=La Marye
+model.nation.french.ship.17=La Michelle
+model.nation.french.ship.18=La Normanda
+model.nation.french.ship.19=La Pensée
+#aubert
+model.nation.french.ship.20=La Perle
+model.nation.french.ship.21=La Petite-Hermine
+model.nation.french.ship.22=La Petite-Roberge
+model.nation.french.ship.23=La Rosée
+model.nation.french.ship.24=La Sainte-Anne
+model.nation.french.ship.25=La Salamandre
+model.nation.french.ship.26=La Sibille
+#misc
+model.nation.french.ship.27=La Trinité
+#ribault
+model.nation.french.ship.28=La Valentine
+#roberval
+model.nation.french.ship.29=La Vicaille
+#kertk
+model.nation.french.ship.30=La Victoire
+model.nation.french.ship.31=La Vierge
+model.nation.french.ship.32=Le Bastien
+model.nation.french.ship.33=Le Bonaventure
+#court
+model.nation.french.ship.34=Le Catholique
+#d'enambuc
+model.nation.french.ship.35=Le Corbin
+#bardeliere
+model.nation.french.ship.36=Le Don-de-Dieu
+model.nation.french.ship.37=Le Flibot
+model.nation.french.ship.38=Le Griffon
+#la sale
+model.nation.french.ship.39=Le Jacques
+model.nation.french.ship.40=Le Jonas
+#champlain
+model.nation.french.ship.41=Le Lion Couronné
+model.nation.french.ship.42=Le Lévrier
+model.nation.french.ship.43=Le Prince
+model.nation.french.ship.44=Le Régent
+#razilli
+model.nation.french.ship.45=Le Sacre
+#parmentier
+model.nation.french.ship.46=Le Saint-Brieuc
+model.nation.french.ship.47=Le Saint-François
+model.nation.french.ship.48=Le Saint-Georges
+model.nation.french.ship.49=Le Saint-Louis
+model.nation.french.ship.50=Le Vicaire
-# Spanish colony names:
+
+# Spanish colony names
model.nation.spanish.settlementName.0=Isabella
model.nation.spanish.settlementName.1=Santo Domingo
model.nation.spanish.settlementName.2=San Salvador
@@ -3005,7 +3391,142 @@
model.nation.spanish.region.mountain.4=Sierra de la Macarena
model.nation.spanish.region.mountain.5=Cordillera de la Costa
+# Spanish ships
+model.nation.spanish.ship.0=La Santa María
+#...de la Inmaculada Concepción, C. Columbus, Caribbean
+model.nation.spanish.ship.1=Concepcion
+model.nation.spanish.ship.2=El Correo
+model.nation.spanish.ship.3=La Bonial
+model.nation.spanish.ship.4=La Cardera
+model.nation.spanish.ship.5=La Castilla
+model.nation.spanish.ship.6=La Colina
+model.nation.spanish.ship.7=La Fraila
+model.nation.spanish.ship.8=La Gallarda
+model.nation.spanish.ship.9=La Gallega
+model.nation.spanish.ship.10=La Garza
+#Bermudez
+model.nation.spanish.ship.11=La Gorda
+model.nation.spanish.ship.12=La Gutierra
+model.nation.spanish.ship.13=La India
+model.nation.spanish.ship.14=La Niña
+model.nation.spanish.ship.15=La Pinta
+model.nation.spanish.ship.16=La Prieta
+model.nation.spanish.ship.17=La Quintera
+model.nation.spanish.ship.18=La Rabida
+model.nation.spanish.ship.19=La Rodgria
+model.nation.spanish.ship.20=La Triana
+model.nation.spanish.ship.21=La Vaqueña
+model.nation.spanish.ship.22=La Vieja
+model.nation.spanish.ship.23=La Vizcayna
+#Columbus 4
+model.nation.spanish.ship.24=Magdalena
+model.nation.spanish.ship.25=Marigalante
+# Columbus 2
+model.nation.spanish.ship.26=Sa. Maria de Guya
+#Columbus 3
+model.nation.spanish.ship.27=Sa. Maria de la Antigua
+#Ojeda 2
+model.nation.spanish.ship.28=Sa. Maria de la Concepcion
+#Cortez
+model.nation.spanish.ship.29=Sa. Maria de la Consolacion
+model.nation.spanish.ship.30=Sa. Maria de la Grenada
+model.nation.spanish.ship.31=San Cristóbal
+#Ponce de Leon
+model.nation.spanish.ship.32=Sanct Joan
+model.nation.spanish.ship.33=Sant Antonio
+model.nation.spanish.ship.34=Sant Iago
+model.nation.spanish.ship.35=Santa Ana
+model.nation.spanish.ship.36=Santa Clara
+model.nation.spanish.ship.37=Santa Cruz
+model.nation.spanish.ship.38=Santiago de Palos
+model.nation.spanish.ship.39=Trinidad
+#Magellan
+model.nation.spanish.ship.40=Victoria
+model.nation.spanish.ship.41=Ysabelita
+#Pinzon and Solis
+
+# Danish colony names
+model.nation.danish.settlementName.0=Christiansted
+model.nation.danish.settlementName.1=Charlotte Amalie
+model.nation.danish.settlementName.2=Cruz Bay
+model.nation.danish.settlementName.3=Frederiksted
+model.nation.danish.settlementName.4=Anna's Retreat
+model.nation.danish.settlementName.5=Charlotte Amalie West
+model.nation.danish.settlementName.6=Fort Frederik
+model.nation.danish.settlementName.7=Godthåb
+model.nation.danish.settlementName.8=Nanortalik
+model.nation.danish.settlementName.9=Danmark Havn
+model.nation.danish.settlementName.10=Nord
+model.nation.danish.settlementName.11=Scoresbysund
+
+# Danish region names
+model.nation.danish.region.land.1=Danish West Indies
+model.nation.danish.region.land.2=Greenland
+model.nation.danish.region.land.3=St. Thomas
+model.nation.danish.region.land.4=St. John
+model.nation.danish.region.land.5=St. Croix
+model.nation.danish.region.land.6=Water Island
+model.nation.danish.region.river.1=Salt River
+model.nation.danish.region.river.2=Kangia
+model.nation.danish.region.river.3=Karra
+model.nation.danish.region.mountain.1=Gunnbjørn Fjeld
+model.nation.danish.region.mountain.2=Snebordet
+model.nation.danish.region.mountain.3=Petermann Bjerg
+model.nation.danish.region.mountain.4=Valhaltinde
+model.nation.danish.region.mountain.5=Savtakkerne
+model.nation.danish.region.mountain.6=Rigny Bjerg
+
+# Danish ship names
+model.nation.danish.ship.0=Haabet
+# Hans Egede, Greenland
+model.nation.danish.ship.1=Cornelia
+model.nation.danish.ship.2=Cronede Griff
+model.nation.danish.ship.3=Den Unge Tobias
+# w india co
+model.nation.danish.ship.4=Den forgyldte Krone
+model.nation.danish.ship.5=Drache
+model.nation.danish.ship.6=Egle Sophia
+#misc
+model.nation.danish.ship.7=Enhed
+model.nation.danish.ship.8=Enhiørningen
+#munk
+model.nation.danish.ship.9=Falcon
+model.nation.danish.ship.10=Fortuna
+#smit
+model.nation.danish.ship.11=Fred
+model.nation.danish.ship.12=Fuchs
+model.nation.danish.ship.13=Gabriel
+#kruse
+model.nation.danish.ship.14=Gilliflowre
+model.nation.danish.ship.15=Grønlandske Kat
+model.nation.danish.ship.16=Gyldenlöffuen
+model.nation.danish.ship.17=Gyldenlöves Waaben
+model.nation.danish.ship.18=Haabeth
+#egede
+model.nation.danish.ship.19=Hafmandan
+model.nation.danish.ship.20=Hunden
+model.nation.danish.ship.21=Jægeren
+model.nation.danish.ship.22=Katten
+model.nation.danish.ship.23=Kiöbenhavns Nye Waaben
+model.nation.danish.ship.24=Lamprenen
+model.nation.danish.ship.25=Laurwigen
+model.nation.danish.ship.26=Löffuen
+model.nation.danish.ship.27=Madame Thormölen
+model.nation.danish.ship.28=Maria
+model.nation.danish.ship.29=Mercurius
+model.nation.danish.ship.30=Neptunus
+model.nation.danish.ship.31=Nyborg
+model.nation.danish.ship.32=Pelicanen
+model.nation.danish.ship.33=Sankt Thomas
+model.nation.danish.ship.34=Sankt Vincent
+model.nation.danish.ship.35=Trost
+#expeditions
+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
+
+
# Portuguese colony names
model.nation.portuguese.settlementName.0=Sao Vicente
model.nation.portuguese.settlementName.1=Vila Velha
@@ -3070,7 +3591,6 @@
model.nation.portuguese.region.river.18=Napo
model.nation.portuguese.region.river.19=Tigre
model.nation.portuguese.region.river.20=Branco
-# Mountains are missing
model.nation.portuguese.region.mountain.1=Serra da Estrela
model.nation.portuguese.region.mountain.2=Serra do Morião
model.nation.portuguese.region.mountain.3=Serra de Santa Bárbara
@@ -3081,6 +3601,53 @@
model.nation.portuguese.region.mountain.8=Serra da Coroa
model.nation.portuguese.region.mountain.9=Serra de Sintra
+# Portuguese ship names
+model.nation.portuguese.ship.0=El Rei
+# P.A. Cabral's 2d ship, Brazil, flagship unknown
+model.nation.portuguese.ship.1=Anunciada
+model.nation.portuguese.ship.2=Batecabello
+model.nation.portuguese.ship.3=Bella
+model.nation.portuguese.ship.4=Bretoa
+model.nation.portuguese.ship.5=Bérrio
+model.nation.portuguese.ship.6=Catharina Dias
+model.nation.portuguese.ship.7=Concepão
+model.nation.portuguese.ship.8=Esphera
+model.nation.portuguese.ship.9=Estrella
+model.nation.portuguese.ship.10=Faial
+model.nation.portuguese.ship.11=Fradeza
+model.nation.portuguese.ship.12=Garrida
+model.nation.portuguese.ship.13=India
+model.nation.portuguese.ship.14=Judia
+#almeida
+model.nation.portuguese.ship.15=Julioa
+model.nation.portuguese.ship.16=Leitoa Nova
+model.nation.portuguese.ship.17=Lionarda
+model.nation.portuguese.ship.18=Madalena
+model.nation.portuguese.ship.19=Nossa Senhora da Anunciação
+model.nation.portuguese.ship.20=Nunciá
+model.nation.portuguese.ship.21=Rainha
+model.nation.portuguese.ship.22=Salta na Palha
+model.nation.portuguese.ship.23=Sant'Iago
+model.nation.portuguese.ship.24=Santa Elena
+model.nation.portuguese.ship.25=Santa Marta
+model.nation.portuguese.ship.26=Santo António
+model.nation.portuguese.ship.27=São Cristóvão
+#albuquerque, dias
+model.nation.portuguese.ship.28=São Gabriel
+#da gama 1
+model.nation.portuguese.ship.29=São Jerónimo
+#da gama 2
+model.nation.portuguese.ship.30=São Jorge
+model.nation.portuguese.ship.31=São João
+model.nation.portuguese.ship.32=São Miguel
+model.nation.portuguese.ship.33=São Pantaleão
+model.nation.portuguese.ship.34=São Paulo
+model.nation.portuguese.ship.35=São Pedro
+#cabral
+model.nation.portuguese.ship.36=São Rafael
+model.nation.portuguese.ship.37=Vera Cruz
+
+
# Russian colony names
model.nation.russian.settlementName.0=Unalaska
model.nation.russian.settlementName.1=Three Saints Bay
@@ -3123,7 +3690,69 @@
model.nation.russian.region.mountain.4=Bolshaya Gora
model.nation.russian.region.mountain.5=Saint Elias
+# Russian ship names
+model.nation.russian.ship.0=Sviatoi Gavriil
+# Ivan Fyodorov, Alaska
+model.nation.russian.ship.1=Abo
+model.nation.russian.ship.2=Aklansk
+#expedition
+model.nation.russian.ship.3=Amerika
+model.nation.russian.ship.4=Anadyr'
+model.nation.russian.ship.5=Apollon
+model.nation.russian.ship.6=Arkhangel Mikhail
+#spanberg 1733
+model.nation.russian.ship.7=Avos'
+model.nation.russian.ship.8=Baikal
+model.nation.russian.ship.9=Blagonamerennyi
+model.nation.russian.ship.10=Bol'sheretsk
+model.nation.russian.ship.11=Cherniyi Orel
+model.nation.russian.ship.12=Dobroe Namerenie
+model.nation.russian.ship.13=Dvina
+model.nation.russian.ship.14=Fortuna
+#fleet
+model.nation.russian.ship.15=Gizhiga
+model.nation.russian.ship.16=Irtysh
+model.nation.russian.ship.17=Kad'yak
+model.nation.russian.ship.18=Kamchatka
+model.nation.russian.ship.19=Krotkii
+model.nation.russian.ship.20=Ladoga
+model.nation.russian.ship.21=Lev
+model.nation.russian.ship.22=Moller
+model.nation.russian.ship.23=Nadezhda
+model.nation.russian.ship.24=Nataliya
+#lebedev-lastochkina
+model.nation.russian.ship.25=Nikolai
+model.nation.russian.ship.26=Odissyeya
+model.nation.russian.ship.27=Okhota
+model.nation.russian.ship.28=Okhotsk
+#krasheninnikov 1737
+model.nation.russian.ship.29=Otkrytie
+model.nation.russian.ship.30=Pallas
+#billings 1785
+model.nation.russian.ship.31=Predpriyatie
+model.nation.russian.ship.32=Senyavin
+model.nation.russian.ship.33=Severnoi Divizii
+model.nation.russian.ship.34=Slava Rossii
+model.nation.russian.ship.35=Svyatoi Ioann
+model.nation.russian.ship.36=Svyatoi Pavel
+model.nation.russian.ship.37=Svyatoi Petr
+#2d kamchatka 1733
+model.nation.russian.ship.38=Svyatoi Yekaterina
+#krenitsyn 1764
+model.nation.russian.ship.39=Svyatoi Yelisaveta
+model.nation.russian.ship.40=Svyatoi Zotik
+model.nation.russian.ship.41=Velikoe Lamskoe More
+model.nation.russian.ship.42=Vostochnyi Gavriil
+model.nation.russian.ship.43=Vostok
+#plotnitskii
+model.nation.russian.ship.44=Yasashna
+model.nation.russian.ship.45=Yekaterina
+model.nation.russian.ship.46=Yelisaveta
+model.nation.russian.ship.47=Yunona
+#company
+model.nation.russian.ship.48=Zakharii
+
# Swedish colony names
model.nation.swedish.settlementName.0=Christina
model.nation.swedish.settlementName.1=Finland
@@ -3156,40 +3785,34 @@
model.nation.swedish.region.river.2=Schuylen Kyl
model.nation.swedish.region.river.3=Minquas Kyl
model.nation.swedish.region.river.4=Fiske Kyl
+#TODO: mountains are missing
+# Swedish ship names
+model.nation.swedish.ship.0=Kalmar Nyckel
+# Peter Minuit, Delaware
+model.nation.swedish.ship.1=Calmare Nyckel
+#Nya Sverige
+model.nation.swedish.ship.2=Charitas
+model.nation.swedish.ship.3=Christina
+#Africa
+model.nation.swedish.ship.4=Elisabeth
+model.nation.swedish.ship.5=Enigheten
+#St Barts
+model.nation.swedish.ship.6=Fama
+model.nation.swedish.ship.7=Freedenburg
+model.nation.swedish.ship.8=Grippen
+model.nation.swedish.ship.9=Gyllene Hajen
+model.nation.swedish.ship.10=Hoffi
+model.nation.swedish.ship.11=Kattan
+model.nation.swedish.ship.12=Mercurius
+model.nation.swedish.ship.13=Onlyfer
+model.nation.swedish.ship.14=Sprengeporten
+model.nation.swedish.ship.15=Stockholm
+model.nation.swedish.ship.16=Suanen
+model.nation.swedish.ship.17=Vogel Grip
+model.nation.swedish.ship.18=Örnen
-# Danish colony names
-model.nation.danish.settlementName.0=Christiansted
-model.nation.danish.settlementName.1=Charlotte Amalie
-model.nation.danish.settlementName.2=Cruz Bay
-model.nation.danish.settlementName.3=Frederiksted
-model.nation.danish.settlementName.4=Anna's Retreat
-model.nation.danish.settlementName.5=Charlotte Amalie West
-model.nation.danish.settlementName.6=Fort Frederik
-model.nation.danish.settlementName.7=Godthåb
-model.nation.danish.settlementName.8=Nanortalik
-model.nation.danish.settlementName.9=Danmark Havn
-model.nation.danish.settlementName.10=Nord
-model.nation.danish.settlementName.11=Scoresbysund
-# Danish region names
-model.nation.danish.region.land.1=Danish West Indies
-model.nation.danish.region.land.2=Greenland
-model.nation.danish.region.land.3=St. Thomas
-model.nation.danish.region.land.4=St. John
-model.nation.danish.region.land.5=St. Croix
-model.nation.danish.region.land.6=Water Island
-model.nation.danish.region.river.1=Salt River
-model.nation.danish.region.river.2=Kangia
-model.nation.danish.region.river.3=Karra
-model.nation.danish.region.mountain.1=Gunnbjørn Fjeld
-model.nation.danish.region.mountain.2=Snebordet
-model.nation.danish.region.mountain.3=Petermann Bjerg
-model.nation.danish.region.mountain.4=Valhaltinde
-model.nation.danish.region.mountain.5=Savtakkerne
-model.nation.danish.region.mountain.6=Rigny Bjerg
-
-
model.region.arctic=Arctic
model.region.antarctic=Antarctic
model.region.inlandlakes=The Great Lakes
Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/Messages.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/Messages.java 2012-06-05 10:29:40 UTC (rev 9879)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/Messages.java 2012-06-05 11:14:06 UTC (rev 9880)
@@ -728,6 +728,21 @@
}
/**
+ * Collects all the names with a given prefix.
+ *
+ * @param prefix The prefix to check.
+ * @param names A list to fill with the names found.
+ */
+ private static void collectNames(String prefix, List<String> names) {
+ String name;
+ int i = 0;
+ while (Messages.containsKey(name = prefix + Integer.toString(i))) {
+ names.add(Messages.message(name));
+ i++;
+ }
+ }
+
+ /**
* Gets a list of settlement names and a fallback prefix for a player.
*
* @param player The <code>Player</code> to get names for.
@@ -735,23 +750,34 @@
* fallback prefix.
*/
public static List<String> getSettlementNames(Player player) {
- final String prefix = player.getNationID() + ".settlementName.";
List<String> names = new ArrayList<String>();
// Fallback prefix first
names.add(message((player.isEuropean()) ? "Colony" : "Settlement"));
- // Collect all the names
- int i = 0;
- while (Messages.containsKey(prefix + Integer.toString(i))) {
- names.add(Messages.message(prefix + Integer.toString(i)));
- i++;
- }
+ // Collect the rest
+ collectNames(player.getNationID() + ".settlementName.", names);
+ return names;
+ }
+ /**
+ * Gets a list of ship names and a fallback prefix for a player.
+ *
+ * @param player The <code>Player</code> to get names for.
+ * @return A list of ship names, with the first being the fallback prefix.
+ */
+ public static List<String> getShipNames(Player player) {
+ final String prefix = player.getNationID() + ".ship.";
+ List<String> names = new ArrayList<String>();
+
+ // Fallback prefix first
+ names.add(message("Ship"));
+
+ // Collect the rest
+ collectNames(prefix, names);
return names;
}
-
/**
* Loads a new resource file into the current message bundle.
*
@@ -821,6 +847,4 @@
}
return -1;
}
-
-
}
Modified: freecol/trunk/src/net/sf/freecol/common/model/Player.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/common/model/Player.java 2012-06-05 10:29:40 UTC (rev 9879)
+++ freecol/trunk/src/net/sf/freecol/common/model/Player.java 2012-06-05 11:14:06 UTC (rev 9880)
@@ -377,6 +377,13 @@
protected String capitalName = null;
protected String settlementFallback = null;
+ /**
+ * A cache of ship names, including a fallback ship name prefix.
+ * Does not need to be serialized.
+ */
+ protected List<String> shipNames = null;
+ protected String shipFallback = null;
+
public static final Comparator<Player> playerComparator = new Comparator<Player>() {
public int compare(Player player1, Player player2) {
@@ -897,6 +904,72 @@
}
/**
+ * Installs suitable ships names into the player name cache.
+ * Optionally shuffles all but the first name so so as to provide
+ * a stable starting ship name.
+ *
+ * @param names A list of ship names with the fallback prefix first.
+ * @param random A <code>Random</code> number source.
+ */
+ private void initializeShipNames(Random random) {
+ if (shipNames == null) {
+ shipNames = new ArrayList<String>();
+ shipNames.addAll(Messages.getShipNames(this));
+ shipFallback = (shipNames.isEmpty()) ? null
+ : shipNames.remove(0);
+ String startingShip = (shipNames.isEmpty()) ? null
+ : shipNames.remove(0);
+ if (random != null) {
+ Collections.shuffle(shipNames, random);
+ }
+ if (startingShip != null) shipNames.add(0, startingShip);
+ logger.info("Installed " + shipNames.size()
+ + " ship names for player " + this.toString());
+ }
+ }
+
+ /**
+ * Gets a new name for a unit.
+ * Currently only names naval units, not specific to type.
+ * TODO: specific names for types.
+ *
+ * @param type The <code>UnitType</code> to choose a name for.
+ * @param random A pseudo-random number source.
+ * @return A name for the unit, or null if not available.
+ */
+ public String getUnitName(UnitType type, Random random) {
+ String name;
+
+ if (!type.isNaval()) return null;
+
+ // Collect all the names of existing naval units.
+ List<String> navalNames = new ArrayList<String>();
+ for (Unit u : getUnits()) {
+ if (u.isNaval() && u.getName() != null) {
+ navalNames.add(u.getName());
+ }
+ }
+
+ // Find a new name in the installed ship names if possible.
+ if (shipNames == null) initializeShipNames(random);
+ int n = 0;
+ while (!shipNames.isEmpty()) {
+ name = shipNames.remove(0);
+ if (!navalNames.contains(name)) return name;
+ }
+
+ // Fallback method
+ if (shipFallback != null) {
+ final String base = shipFallback + "-";
+ int i = 0;
+ while (navalNames.contains(name = base + Integer.toString(i))) i++;
+ return name;
+ }
+
+ return null;
+ }
+
+ /**
* Returns the type of this player.
*
* @return The player type.
Modified: freecol/trunk/src/net/sf/freecol/server/control/InGameController.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/server/control/InGameController.java 2012-06-05 10:29:40 UTC (rev 9879)
+++ freecol/trunk/src/net/sf/freecol/server/control/InGameController.java 2012-06-05 11:14:06 UTC (rev 9880)
@@ -3481,7 +3481,8 @@
return DOMMessage.clientError("Not enough gold to train " + type);
}
- new ServerUnit(getGame(), europe, serverPlayer, type);
+ Unit unit = new ServerUnit(getGame(), europe, serverPlayer, type);
+ unit.setName(serverPlayer.getUnitName(type, random));
serverPlayer.modifyGold(-price);
((ServerEurope) europe).increasePrice(type, price);
Modified: freecol/trunk/src/net/sf/freecol/server/generator/SimpleMapGenerator.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/server/generator/SimpleMapGenerator.java 2012-06-05 10:29:40 UTC (rev 9879)
+++ freecol/trunk/src/net/sf/freecol/server/generator/SimpleMapGenerator.java 2012-06-05 11:14:06 UTC (rev 9880)
@@ -763,12 +763,15 @@
List<AbstractUnit> unitList = ((EuropeanNationType) player.getNationType())
.getStartingUnits();
for (AbstractUnit startingUnit : unitList) {
- Unit newUnit = new ServerUnit(game, null, player,
- startingUnit.getUnitType(spec),
+ UnitType type = startingUnit.getUnitType(spec);
+ Unit newUnit = new ServerUnit(game, null, player, type,
startingUnit.getEquipment(spec));
- if (newUnit.canCarryUnits() && newUnit.isNaval()) {
- newUnit.setState(Unit.UnitState.ACTIVE);
- carriers.add(newUnit);
+ newUnit.setName(player.getUnitName(type, random));
+ if (newUnit.isNaval()) {
+ if (newUnit.canCarryUnits()) {
+ newUnit.setState(Unit.UnitState.ACTIVE);
+ carriers.add(newUnit);
+ }
} else {
newUnit.setState(Unit.UnitState.SENTRY);
passengers.add(newUnit);
Modified: freecol/trunk/src/net/sf/freecol/server/model/ServerColony.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/server/model/ServerColony.java 2012-06-05 10:29:40 UTC (rev 9879)
+++ freecol/trunk/src/net/sf/freecol/server/model/ServerColony.java 2012-06-05 11:14:06 UTC (rev 9880)
@@ -531,8 +531,8 @@
*/
private Unit csBuildUnit(BuildQueue<? extends BuildableType> buildQueue,
Random random, ChangeSet cs) {
- Unit unit = new ServerUnit(getGame(), getTile(), owner,
- (UnitType) buildQueue.getCurrentlyBuilding());
+ UnitType type = (UnitType)buildQueue.getCurrentlyBuilding();
+ Unit unit = new ServerUnit(getGame(), getTile(), owner, type);
if (unit.hasAbility(Ability.BORN_IN_COLONY)) {
cs.addMessage(See.only((ServerPlayer) owner),
new ModelMessage(ModelMessage.MessageType.UNIT_ADDED,
@@ -540,6 +540,7 @@
this, unit)
.addName("%colony%", getName()));
} else {
+ unit.setName(owner.getUnitName(type, random));
cs.addMessage(See.only((ServerPlayer) owner),
new ModelMessage(ModelMessage.MessageType.UNIT_ADDED,
"model.colony.unitReady",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
