Merge branch 'master' of https://github.com/kronosaur/Transcendence

kronosaur · Jun 21, 2018 · d8b0201 · d8b0201
2 parents 7e43a1f + e2058c9
commit d8b0201
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/TransCore/CommonwealthMining.xml b/TransCore/CommonwealthMining.xml
@@ -1013,7 +1013,7 @@
 
 				"Outlaw miners have staked an illegal claim to %targetName%
 				in this system. We want you to go out there and terminate their claim.
-				We'll pay you %reward if you succeed.
+				We'll pay you %reward% if you succeed.
 
 				"Do we have a deal?"
 
@@ -1036,7 +1036,7 @@
 			</Text>
 			<Text id="SuccessDebrief">
 				(msnTranslate gSource 'textSuccessDebrief {
-					payment: (fmtCurrency 'credit (msnGetData gSource 'reward))
+					reward: (fmtCurrency 'credit (msnGetData gSource 'reward))
 					})
 			</Text>
 			<Text id="textSuccessDebrief">

diff --git a/TransCore/CommonwealthShips.xml b/TransCore/CommonwealthShips.xml
@@ -746,7 +746,7 @@
 			transport Eisele; transport Fincke; transport Gagarin; transport Helms;
 			transport Irwin; transport Jing; transport Kolodin; transport Liu;
 			transport McDivitt; transport Noguchi; transport Ochoa; transport Payette;
-			transport Resnik; transport Schmitt; transport Titov; tranport Volk;
+			transport Resnik; transport Schmitt; transport Titov; transport Volk;
 			transport Williams; transport Yegorov
 		</Names>
 

diff --git a/TransCore/KSMissionC01.xml b/TransCore/KSMissionC01.xml
@@ -356,7 +356,7 @@
 			<Text id="InProgress:underAttack">
 
 				The command center is filled with men and women shouting orders and counter-orders.
-				The constant drone of sirens is punctuated frequently by concussive blow of explosions.
+				The constant drone of sirens is punctuated frequently by the concussive blow of explosions.
 
 				A woman shouts at you, "Get out of here and make yourself useful!"
 

diff --git a/TransCore/RPGDockServices.xml b/TransCore/RPGDockServices.xml
@@ -1402,7 +1402,7 @@
 						(needed (scrGetData gScreen 'fuelNeeded))
 						(afford (scrGetData gScreen 'fuelAfford))
 						(descID (switch
-							(and  (gr needed afford) (= (afford) 1))
+							(and  (gr needed afford) (= afford 1))
 								"descRefuelConfirm:onlyAffordOne"
 							(gr needed afford)
 								"descRefuelConfirm:onlyAffordSome"