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

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

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

Modified Files:
	LocalisedText.properties 
Log Message:
CGR Formation round phase 1: repaying loans.

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** LocalisedText.properties	21 Jan 2009 20:18:23 -0000	1.67
--- LocalisedText.properties	4 Feb 2009 20:36:40 -0000	1.68
***************
*** 82,85 ****
--- 82,86 ----
  CompanyDoesNotOwnTrain=Company {0} does not own a {1}-train
  CompanyDoesNotPayDividend={0} does not pay a dividend
+ CompanyHasLoans={0} (president {1}) has {2} loans of {3}, total is {4}
  CompanyHasNoType=Company {0} has no type defined
  CompanyHasUnknownType=Company {0} has an undefined type {1}
***************
*** 295,299 ****
  Select=Select
  SelectCompanyToMergeMinorInto=Select major company to merge minor {0} into
! SelectLoansToRepay=Select number of loans to repay
  SelectMinorToMerge=Select the minor to merge to start company {0}
  SelectNoBid=Select, No Bid
--- 296,300 ----
  Select=Select
  SelectCompanyToMergeMinorInto=Select major company to merge minor {0} into
! SelectLoansToRepay=Select number of loans of {0} to repay
  SelectMinorToMerge=Select the minor to merge to start company {0}
  SelectNoBid=Select, No Bid
***************
*** 336,339 ****
--- 337,341 ----
  StartCompany={0}  (buy {1}% share for {2})
  StartCompanyFixed=Start {0} by buying {1}% share for {2}
+ StartCGRFormationRound=Starting CGR formation round. Starting player is {0}
  StartFinalMinorExchangeRound=Start of the Final Minor Company Exchange Round
  StartOfInitialRound=Start of initial round
***************
*** 405,408 ****
--- 407,411 ----
  WhichTrainToDiscard=Which train will you discard?
  WHICH_VARIANT=Select the {0} variant that you want to play
+ WillMergeInto={0} will merge into {1}
  WITHHOLD=Withhold
  WithOptional6Train=Add optional (3rd) 6-train
***************
*** 425,428 ****
--- 428,433 ----
  YOU_MUST_ADD_CASH=(you must add {0})
  YouAreBankrupt=You must still raise {0}, but you can\\'t sell any more shares, so you are Bankrupt!
+ YouCanRepayAllLoans={0} can repay all {1} loans of {2} and save it from merging into CGR 
+ YouCannotRepayAllLoans={0} can repay max. {1} out of {2} loans of {3}, but cannot save it from merging into CGR
  YouMustRaiseCash=You must raise {0} cash by selling shares