Merge branch 'develop' into trophies

data/missions/rothan/01 - rothan defence #1.json

@@ -160,7 +160,7 @@
 			"lines" : [
 				"MSG_BOX CSN Griffin;White Knights, the enemy tugs are already in position and are attaching tow ropes. They must not be allowed to get those fighters and pilots to the jumpgate.",
 				"MSG_BOX de Winter;Can you disable the gate remotely?",
-				"MSG_BOX CSN Griffin;Negative, the Pandorans have control. We're working take back command function. Stand by."
+				"MSG_BOX CSN Griffin;Negative, the Pandorans have control. We're working take back command functions. Stand by."
 			]
 		},
 		{

icons/tbftss.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Categories=Game;ActionGame;
+Name=TBFTSS : The Pandoran War
+Comment=Mission and Objective based 2D Space Shooter
+Icon=tbftss
+Exec=tbftss
+Terminal=false
+Type=Application

locale/tbftss.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TBFTSS: The Pandoran War\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 17:12:32+0000\n"
+"POT-Creation-Date: 2016-03-10 15:44:08+0000\n"
 "PO-Revision-Date: ???\n"
 "Last-Translator: ???\n"
 "Language-Team: ???\n"
@@ -928,6 +928,33 @@ msgstr ""
 msgid "We're taking a lot of damage here. Please assist."
 msgstr ""
 
+msgid "White Knights, the enemy tugs are already in position and are attaching tow ropes. They must not be allowed to get those fighters and pilots to the jumpgate."
+msgstr ""
+
+msgid "Can you disable the gate remotely?"
+msgstr ""
+
+msgid "Negative, the Pandorans have control. We're working take back command function. Stand by."
+msgstr ""
+
+msgid "Griffin, all enemy tugs have been dispatched."
+msgstr ""
+
+msgid "Good work, Commander. We've regained control of the gate. We're sending our own tugs through now."
+msgstr ""
+
+msgid "Estelle, I'm picking up incoming INF fighters."
+msgstr ""
+
+msgid "Hell! Protect the tugs. Make sure they get everyone home."
+msgstr ""
+
+msgid "Griffin, this is de Winter. Operation successful."
+msgstr ""
+
+msgid "I knew I could count on you, de Winter. Head back to Griffin."
+msgstr ""
+
 msgid "A simple test flight. Get used to piloting your fighter, without threat of attack or any other dangers to face. There are no objectives to complete in this mission, so you may quit it at any time and move on to the next one."
 msgstr ""
 

makefile

@@ -3,6 +3,8 @@ CC = gcc
 BIN_DIR = /usr/bin
 DATA_DIR = /opt/tbftss
 LOCALE_DIR = /usr/share/locale
+ICON_DIR = /usr/share/icons/hicolor
+DESKTOP_DIR = /usr/share/applications
 
 SEARCHPATH += src/plat/unix
 OBJS += unixInit.o
@@ -29,6 +31,11 @@ install:
 	cp -r manual $(DATA_DIR)
 	cp -r music $(DATA_DIR)
 	cp -r sound $(DATA_DIR)
+	cp -p icons/$(PROG)-16x16.png $(ICON_DIR)/16x16/apps/$(PROG).png
+	cp -p icons/$(PROG)-32x32.png $(ICON_DIR)/32x32/apps/$(PROG).png
+	cp -p icons/$(PROG)-64x64.png $(ICON_DIR)/64x64/apps/$(PROG).png
+	cp -p icons/$(PROG)-128x128.png $(ICON_DIR)/128x128/apps/$(PROG).png
+	cp -p icons/$(PROG).desktop $(DESKTOP_DIR)
 	
 	@for f in $(LOCALE_MO); do \
 		lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \
@@ -39,6 +46,11 @@ install:
 uninstall:
 	$(RM) $(BIN_DIR)/$(PROG)
 	$(RM) -rf $(DATA_DIR)
+	$(RM) $(ICON_DIR)/16x16/apps/$(PROG).png
+	$(RM) $(ICON_DIR)/32x32/apps/$(PROG).png
+	$(RM) $(ICON_DIR)/64x64/apps/$(PROG).png
+	$(RM) $(ICON_DIR)/128x128/apps/$(PROG).png
+	$(RM) $(DESKTOP_DIR)/$(PROG).desktop
 	
 	@for f in $(LOCALE_MO); do \
 		lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \