[Rails-commits] 18xx LocalisedText.properties,1.68,1.69

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29969

Modified Files:
	LocalisedText.properties 
Log Message:
1856 CGR formation round

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** LocalisedText.properties	4 Feb 2009 20:36:40 -0000	1.68
--- LocalisedText.properties	4 May 2009 20:29:15 -0000	1.69
***************
*** 38,41 ****
--- 38,43 ----
  BuysTrainUsingSP={0} buys a {1}-train from {2} for {3} using {4}.
  CASH=Cash
+ CanOperate={0} can operate this round
+ CannotOperate={0} cannot operate this round
  CannotBuyAnything={0} cannot buy anything
  CERT_NAME={0} {1}% share
***************
*** 57,60 ****
--- 59,63 ----
  CannotDumpPresidency=Cannot dump presidency
  CannotDumpTrainBuyingPresidency=Cannot dump presidency of train buying company
+ CannotExchangeTokens={0} cannot {1}: {2}
  CannotLayBaseTokenOn={0} cannot lay a base token on {1} for {2}: {3}
  CannotLayTileOn={0} cannot lay tile {1} on {2} for {3}: {4}
***************
*** 108,112 ****
  DestinationReached={0} has reached its destination hex {1}
  DestinationsReached=Destinations reached
! DestinationsReachedPrompt=Select companies that have reached their destinations 
  DiscardTrain=Discard {0}-train
  DoesNotExist=Item does not exist
--- 111,116 ----
  DestinationReached={0} has reached its destination hex {1}
  DestinationsReached=Destinations reached
! DestinationsReachedPrompt=Select companies that have reached their destinations
! DiscardsBaseToken={0} discards a {1} base token on {2}
  DiscardTrain=Discard {0}-train
  DoesNotExist=Item does not exist
***************
*** 126,129 ****
--- 130,138 ----
  EndOfOperatingRound=End of Operating Round {0}
  EnterRevenue=Enter the earnings of the operating company
+ ExchangesBaseToken={0} exchanges a {1} base token on {2}
+ ExchangeableToken=Hex {1} {2}, city {3} (with tracks to {4}) [was {0} token]
+ ExchangeTokens=Exchange tokens
+ ExchangeTokensPrompt1=Select {0} cities where {1} will exchange a base token
+ ExchangeTokensPrompt2=Select {0} through {1} cities where {2} will exchange a base token
  ExchangesTrain={0} exchanges a {1}-train for a {2}-train from {3} for {4}
  ExtraTile= You can lay an unconnected tile on {0}.
***************
*** 153,156 ****
--- 162,167 ----
  GetNoShareForMinor={0} does not get a share for Minor {1}, which closes
  HasFirstTurn={0} has the first turn 
+ HasMergedShares={0} has exchanged {1} old shares for {2} {3} shares
+ HasPutShareInPool={0} has put one remaining share in the pool
  HAS_TOO_MANY_TRAINS={0}: company {1} has too many trains. Which train do you discard?
  HasTooManyTrains={0} has too many trains ({1}, limit is {2}). Select one train to discard.
***************
*** 200,203 ****
--- 211,215 ----
  MapWindowORTitle=Rails: Map, Operating Round {0} or {1}
  MARKET=Stock Market
+ MayDiscardTrain={0} may voluntarily discard a train 
  MayNotBuyAndSell={0} may not both buy and sell shares
  MayNotYetOperate={0} may not yet operate: {1}% sold whereas {2}% required
***************
*** 216,219 ****
--- 228,232 ----
  NEW=New
  NewGame=New Game
+ NoBaseTokenExchange={0} does not exchange a token on {1}
  NoDumping=Cannot dump presidency
  NoGameOptions=This game has no options
***************
*** 342,346 ****
  StartOfPhase=Start of phase {0}.
  StartPacketHasNoClass=Start packet {0} has no class defined.
! StartStockRound=Start of Stock Round
  Status_Unavailable=Currently unavailable
  Status_Biddable=Click to bid on this item
--- 355,359 ----
  StartOfPhase=Start of phase {0}.
  StartPacketHasNoClass=Start packet {0} has no class defined.
! StartStockRound=Start of Stock Round {0}
  Status_Unavailable=Currently unavailable
  Status_Biddable=Click to bid on this item
***************
*** 422,425 ****
--- 435,439 ----
  WrongActionNoTrainBuyingCost=Wrong action, expected train buying cost
  WrongCompany=Wrong company: {0} (expected {1})
+ WrongNumberOfTokensExchanged: {0} must exchange {1} through {2} tokens but did {3}
  WrongPhase=Wrong phase {0}
  WrongPlayer=Wrong player {0} - {1} has the turn