From: Erik V. <ev...@us...> - 2010-02-28 21:38:13
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7856 Modified Files: LocalisedText.properties .classpath Log Message: 1835 Prussian start & side effects Index: LocalisedText.properties =================================================================== RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** LocalisedText.properties 23 Feb 2010 22:21:40 -0000 1.112 --- LocalisedText.properties 28 Feb 2010 21:38:05 -0000 1.113 *************** *** 73,76 **** --- 73,77 ---- CannotLayBaseTokenOn={0} cannot lay a base token on {1} for {2}: {3} CannotLayTileOn={0} cannot lay tile {1} on {2} for {3}: {4} + CannotMerge={0} cannot merge into {1}: {2} CannotPayOutRevenue={0} cannot pay out revenue of {1}: {2} CannotProcessRevenue=Cannot process revenue {0} of {1}: {2} *************** *** 187,191 **** GameReportTitle=Rails: Game Report GameSetupFailed=Game setup from file {0} failed ! GetShareForMinor={0} gets a {1}% share of {2} from {3} in exchange for Minor {4} GetNoShareForMinor={0} does not get a share for Minor {1}, which closes Has={0} has {1} --- 188,192 ---- GameReportTitle=Rails: Game Report GameSetupFailed=Game setup from file {0} failed ! GetShareForMinor={0} gets a {1}% share of {2} from {3} in exchange for {4} GetNoShareForMinor={0} does not get a share for Minor {1}, which closes Has={0} has {1} *************** *** 273,276 **** --- 274,278 ---- NEW=New NewGame=New Game + No=No NoBaseTokenExchange={0} does not exchange the {1} base token on {2} noCost=no cost *************** *** 389,392 **** --- 391,395 ---- 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. *************** *** 525,528 **** --- 528,532 ---- WrongPlayer=Wrong player {0} - {1} has the turn WrongStartItem=Wrong start item {0}, expected {1} + Yes=Yes YOU_MAY_ADD_CASH=(you may add up to {0}) YOU_MUST_ADD_CASH=(you must add {0}) Index: .classpath =================================================================== RCS file: /cvsroot/rails/18xx/.classpath,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** .classpath 9 Oct 2007 21:45:38 -0000 1.13 --- .classpath 28 Feb 2010 21:38:05 -0000 1.14 *************** *** 1,34 **** <?xml version="1.0" encoding="UTF-8"?> <classpath> ! <classpathentry kind="src" path=""/> ! <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-transcoder.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-dom.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-bridge.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-util.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-gvt.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-script.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-ext.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-awt-util.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/extensions/batik-squiggle-ext.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-css.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-extension.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-gui-util.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-parser.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-svg-dom.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-svggen.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-swing.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-xml.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/js.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/pdf-transcoder.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/xerces_2_5_0.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/xml-apis.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik-rasterizer.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik-slideshow.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik-squiggle.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik-svgpp.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik-ttf2svg.jar"/> ! <classpathentry exported="true" kind="lib" path="lib/log4j-1.2/log4j-1.2.14.jar"/> ! <classpathentry kind="output" path="classes"/> </classpath> --- 1,34 ---- <?xml version="1.0" encoding="UTF-8"?> <classpath> ! <classpathentry path="" kind="src"/> ! <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" exported="true" kind="con"/> ! <classpathentry path="lib/batik-1.6/batik.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-transcoder.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-dom.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-bridge.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-util.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-gvt.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-script.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-ext.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-awt-util.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/extensions/batik-squiggle-ext.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-css.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-extension.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-gui-util.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-parser.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-svg-dom.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-svggen.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-swing.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/batik-xml.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/js.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/pdf-transcoder.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/xerces_2_5_0.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/lib/xml-apis.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/batik-rasterizer.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/batik-slideshow.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/batik-squiggle.jar" exported="true" kind="lib"/> ! <classpathentry path="lib/batik-1.6/batik-svgpp.jar" exported="true" kind="lib"/> ! <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="classes" kind="output"/> </classpath> |