From 64d55c59516a21974170e78f5a45192484972f4a Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sat, 13 Dec 2014 14:23:10 +0000
Subject: Corrected a number of ship names, long names don't work well with the
 ui.

---
 base/ini/ships.ini | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'base')

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 18e1ea3..2429a3d 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -194,7 +194,7 @@ info=and a beam cannon mount to fight frigates and other small capital ships.
 
 [ship]
 label=custodian
-name=Custodian-class colonial cruiser
+name=Custodian
 template=ship_cruiser
 model=maps/colonial/custodian
 jumpdrive=yes
@@ -211,14 +211,14 @@ strafe	= 1
 turn	= 15000
 roll	= 7000
 
-info=The Custodian-class cruiser is the Independent Colonies most valued long-range fighter carrier. Equipped with a jumpdrive and a sizable launch bay,
+info=The Custodian class cruiser is the Independent Colonies most valued long-range fighter carrier. Equipped with a jumpdrive and a sizable launch bay,
 info=this carrier can deploy several wings of fighters to wherever conflict requires a swift resolution.
 
 ; ---- Goliath ----------------------------------------------------- ;
 
 [ship]
 label=goliath
-name=Goliath-class colonial battleship
+name=Goliath
 template=ship_battleship
 model=maps/colonial/goliath
 jumpdrive=yes
@@ -235,7 +235,7 @@ strafe	= 1
 turn	= 25000
 roll	=10000
 
-info=The Goliath-class battleship is the primary assault warship of the Colonial Militia.
+info=The Goliath class battleship is the primary assault warship of the Colonial Militia.
 info=Although aging, its proven design continues to stand strong against opposition.
 
 ; ---- Oldlancer --------------------------------------------------- ;
@@ -311,7 +311,7 @@ roll    = 55
 ; TODO move ship to 'research' faction
 ;
 label=tyson
-name=Tyson Deep-Space Explorer
+name=Tyson
 template=ship_frigate
 model=maps/colonial/tyson
 jumpdrive=yes
@@ -328,7 +328,7 @@ strafe  = 0.8
 turn    = 700
 roll    = 200
 
-info=The Tyson-class science vessel is on the forefront of Colonial scientific research.
+info=The Tyson class 'Deep-Space Explorer' science vessel is on the forefront of Colonial scientific research.
 
 
 ; ------------------------------------------------------------------ ;
@@ -347,7 +347,7 @@ info=The Tyson-class science vessel is on the forefront of Colonial scientific r
 
 [ship]
 label=miningfreighter
-name=JMA Mining Freighter
+name=Mining Freighter
 template=ship_large
 model=maps/miners/freighter
 jumpdrive=no
@@ -400,7 +400,7 @@ roll    = 98
 
 [ship]
 label=miningdefender
-name=JMA Mining Defender
+name=Mining Defender
 template=ship_small
 model=maps/miners/defender
 jumpdrive=no
@@ -418,7 +418,7 @@ roll    = 8
 
 [ship]
 label=miningcruiser
-name=JMA Mining cruiser
+name=Mining cruiser
 template=ship_cruiser
 model=maps/miners/cruiser
 jumpdrive=yes
-- 
cgit v1.2.3