[Rails-commits] 18xx LocalisedText.properties,1.115,1.116

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

Update of /cvsroot/rails/18xx
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17119

Modified Files:
	LocalisedText.properties 
Log Message:
Various changes for 1835

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** LocalisedText.properties	3 Mar 2010 00:45:17 -0000	1.115
--- LocalisedText.properties	4 Mar 2010 22:08:48 -0000	1.116
***************
*** 267,270 ****
--- 267,271 ----
  MayNotYetOperate={0} may not yet operate: {1}% sold whereas {2}% required
  MERGE=MERGE
+ MergeOption=Merge {0} ({1}) into {2} for a {3}% share of {2}
  MergeMinorConfirm=Do you want to merge minor {0} to start company {1}?
  MERGE_MINOR_LOG={0} merges minor {1} into {2}, with {3} cash and {4} train(s)
***************
*** 489,492 ****
--- 490,494 ----
  TokenLayingHexMismatch=Token laid in {0} but special property is for {1}: mismatch
  TRADE_TREASURY_SHARES_TITLE=Rails: Game Status - TRADING TREASURY SHARES OF COMPANY {0}
+ TrainInfo={0}-train, price: {1}, quantity: {2}
  TrainsAvailable={0}-trains are now available.
  TrainsRusted=All {0}-trains have rusted and have been removed.