[Rails-commits] 18xx .classpath, 1.14, 1.15 LocalisedText.properties, 1.123, 1.124

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

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

Modified Files:
	.classpath LocalisedText.properties 
Log Message:
Fixes to get excess train discard before prussion formation on buying the first 4-train in 1835.
And personalizing the Prussian formation prompts.

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** LocalisedText.properties	28 Mar 2010 17:06:32 -0000	1.123
--- LocalisedText.properties	28 Mar 2010 20:14:20 -0000	1.124
***************
*** 282,286 ****
  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)
  Message=Message
--- 282,286 ----
  MERGE=MERGE
  MergeOption=Merge {0} ({1}) into {2} for a {3}% share of {2}
! MergeMinorConfirm={0}, do you want to merge minor {1} to start company {2}?
  MERGE_MINOR_LOG={0} merges minor {1} into {2}, with {3} cash and {4} train(s)
  Message=Message
***************
*** 417,421 ****
  SelectLoansToRepay=Select number of loans of {0} to repay
  SelectMinorToMerge=Select the minor to merge to start company {0}
! SelectCompaniesToFold=Select any companies to fold into {0}
  SelectNoBid=Select, No Bid
  SelectTrain=Select a train and press OK, or press Done.
--- 417,421 ----
  SelectLoansToRepay=Select number of loans of {0} to repay
  SelectMinorToMerge=Select the minor to merge to start company {0}
! SelectCompaniesToFold={0}, select any companies to fold into {1}
  SelectNoBid=Select, No Bid
  SelectTrain=Select a train and press OK, or press Done.

Index: .classpath
===================================================================
RCS file: /cvsroot/rails/18xx/.classpath,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** .classpath	28 Feb 2010 21:38:05 -0000	1.14
--- .classpath	28 Mar 2010 20:14:20 -0000	1.15
***************
*** 31,34 ****
--- 31,35 ----
  	<classpathentry path="lib/batik-1.6/batik-ttf2svg.jar" exported="true" kind="lib"/>
  	<classpathentry path="lib/log4j-1.2/log4j-1.2.14.jar" exported="true" kind="lib"/>
+ 	<classpathentry path="C:/Java/eclipse521/plugins/org.junit_3.8.2.v20090203-1005/junit.jar" kind="lib"/>
  	<classpathentry path="classes" kind="output"/>
  </classpath>