[Rails-commits] 18xx LocalisedText.properties,1.88,1.89

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

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

Modified Files:
	LocalisedText.properties 
Log Message:
Added MERGE

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** LocalisedText.properties	30 Dec 2009 18:38:05 -0000	1.88
--- LocalisedText.properties	1 Jan 2010 14:02:49 -0000	1.89
***************
*** 233,236 ****
--- 233,237 ----
  MayNotBuyAndSell={0} may not both buy and sell shares
  MayNotYetOperate={0} may not yet operate: {1}% sold whereas {2}% required
+ MERGE=MERGE
  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)