diff --git a/lib/framework/strres.c b/lib/framework/strres.c
index 6cf17bb4b..5a720bc3c 100644
--- a/lib/framework/strres.c
+++ b/lib/framework/strres.c
@@ -217,7 +217,7 @@ BOOL strresLoadFixedID(STR_RES *psRes, STR_ID *psID, UDWORD numID)
 
 
 /* Return the ID number for an ID string */
-BOOL strresGetIDNum(STR_RES *psRes, char *pIDStr, UDWORD *pIDNum)
+BOOL strresGetIDNum(STR_RES *psRes, const char *pIDStr, UDWORD *pIDNum)
 {
 	STR_ID	*psID;
 
diff --git a/lib/framework/strres.h b/lib/framework/strres.h
index 773a5f6fc..5ab0528c5 100644
--- a/lib/framework/strres.h
+++ b/lib/framework/strres.h
@@ -71,7 +71,7 @@ extern void strresReleaseIDStrings(STR_RES *psRes);
 extern BOOL strresLoadFixedID(STR_RES *psRes, STR_ID *psID, UDWORD numID);
 
 /* Return the ID number for an ID string */
-extern BOOL strresGetIDNum(STR_RES *psRes, char *pIDStr, UDWORD *pIDNum);
+extern BOOL strresGetIDNum(STR_RES *psRes, const char *pIDStr, UDWORD *pIDNum);
 
 /* Return the stored ID string that matches the string passed in */
 extern BOOL strresGetIDString(STR_RES *psRes, char *pIDStr, char **ppStoredID);
diff --git a/lib/widget/bar.h b/lib/widget/bar.h
index ec577172a..ed5cda610 100644
--- a/lib/widget/bar.h
+++ b/lib/widget/bar.h
@@ -40,7 +40,7 @@ typedef struct _w_bargraph
 	UWORD		iValue;				// Current value
 	UBYTE		majorCol;			// Colour for the major bar
 	UBYTE		minorCol;			// Colour for the minor bar
-	char		*pTip;				// The tool tip for the graph
+	const char	*pTip;				// The tool tip for the graph
 } W_BARGRAPH;
 
 /* Create a barGraph widget data structure */
diff --git a/lib/widget/editbox.c b/lib/widget/editbox.c
index e9ffcdf3f..f1fe99af1 100644
--- a/lib/widget/editbox.c
+++ b/lib/widget/editbox.c
@@ -581,7 +581,7 @@ void editBoxRun(W_EDITBOX *psWidget, W_CONTEXT *psContext)
 
 
 /* Set the current string for the edit box */
-void editBoxSetString(W_EDITBOX *psWidget, char *pText)
+void editBoxSetString(W_EDITBOX *psWidget, const char *pText)
 {
 	ASSERT( psWidget != NULL,
 		"editBoxSetString: Invalid edit box pointer" );
diff --git a/lib/widget/editbox.h b/lib/widget/editbox.h
index 610282276..408537527 100644
--- a/lib/widget/editbox.h
+++ b/lib/widget/editbox.h
@@ -65,7 +65,7 @@ extern void editBoxFree(W_EDITBOX *psWidget);
 extern void editBoxInitialise(W_EDITBOX *psWidget);
 
 /* Set the current string for the edit box */
-extern void editBoxSetString(W_EDITBOX *psWidget, char *pText);
+extern void editBoxSetString(W_EDITBOX *psWidget, const char *pText);
 
 /* Respond to loss of focus */
 extern void editBoxFocusLost(W_EDITBOX *psWidget);
diff --git a/lib/widget/form.h b/lib/widget/form.h
index 34325e150..037ce8b8a 100644
--- a/lib/widget/form.h
+++ b/lib/widget/form.h
@@ -118,7 +118,7 @@ typedef struct _w_clickform
 	FORM_BASE;
 
 	UDWORD		state;					// Button state of the form
-	char		*pTip;					// Tip for the form
+	const char	*pTip;					// Tip for the form
 	SWORD HilightAudioID;				// Audio ID for form clicked sound
 	SWORD ClickedAudioID;				// Audio ID for form hilighted sound
 	WIDGET_AUDIOCALLBACK AudioCallback;	// Pointer to audio callback function
diff --git a/lib/widget/label.h b/lib/widget/label.h
index 0ad990beb..89219bcf0 100644
--- a/lib/widget/label.h
+++ b/lib/widget/label.h
@@ -39,7 +39,7 @@ typedef struct _w_label
 	UDWORD		state;					// The current button state
 	char		aText[WIDG_MAXSTR];		// Text on the label
 	int FontID;
-	char		*pTip;					// The tool tip for the button
+	const char	*pTip;					// The tool tip for the button
 } W_LABEL;
 
 /* Create a button widget data structure */
diff --git a/lib/widget/widget.c b/lib/widget/widget.c
index bf59f79d2..5a902caf5 100644
--- a/lib/widget/widget.c
+++ b/lib/widget/widget.c
@@ -1292,7 +1292,7 @@ char *widgGetString(W_SCREEN *psScreen, UDWORD id)
 
 
 /* Set the text in a widget */
-void widgSetString(W_SCREEN *psScreen, UDWORD id, char *pText)
+void widgSetString(W_SCREEN *psScreen, UDWORD id, const char *pText)
 {
 	WIDGET	*psWidget;
 
diff --git a/lib/widget/widget.h b/lib/widget/widget.h
index 822ec5a28..6ab37ad7d 100644
--- a/lib/widget/widget.h
+++ b/lib/widget/widget.h
@@ -170,7 +170,7 @@ typedef struct _w_forminit
 	UWORD			tabMinorGap;						// The space between tabs
 	UWORD			numMajor;					// Number of major tabs
 	UWORD			aNumMinors[WFORM_MAXMAJOR];	// Number of minor tabs for each major
-	char			*pTip;						// Tool tip for the form itself
+	const char		*pTip;						// Tool tip for the form itself
 	char			*apMajorTips[WFORM_MAXMAJOR];	// Tool tips for the major tabs
 	char			*apMinorTips[WFORM_MAXMAJOR][WFORM_MAXMINOR];
 													// Tool tips for the minor tabs
@@ -184,8 +184,8 @@ typedef struct _w_labinit
 	/* The basic init entries */
 	WINIT_BASE;
 
-	char		*pText;			// label text
-	char		*pTip;			// Tool tip for the label.
+	const char		*pText;			// label text
+	const char		*pTip;			// Tool tip for the label.
 	int			FontID;			// ID of the IVIS font to use for this widget.
 } W_LABINIT;
 
@@ -230,7 +230,7 @@ typedef struct _w_barinit
 	UWORD		iRange;			// Maximum range
 	W_COLOURDEF	sCol;			// Bar colour
 	W_COLOURDEF	sMinorCol;		// Minor bar colour
-	char		*pTip;			// Tool tip text
+	const char	*pTip;			// Tool tip text
 } W_BARINIT;
 
 
@@ -327,7 +327,7 @@ extern void widgReveal(W_SCREEN *psScreen, UDWORD id);
 extern char *widgGetString(W_SCREEN *psScreen, UDWORD id);
 
 /* Set the text in a widget */
-extern void widgSetString(W_SCREEN *psScreen, UDWORD id, char *pText);
+extern void widgSetString(W_SCREEN *psScreen, UDWORD id, const char *pText);
 
 /* Set the current tabs for a tab form */
 extern void widgSetTabs(W_SCREEN *psScreen, UDWORD id, UWORD major, UWORD minor);
diff --git a/po/da.po b/po/da.po
index 0bce43659..0a83ec31d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: warzone-dev@gna.org\n"
-"POT-Creation-Date: 2007-04-09 16:43+0200\n"
+"POT-Creation-Date: 2007-04-10 00:05+0200\n"
 "PO-Revision-Date: 2007-04-03 22:35+0200\n"
 "Last-Translator: Christian Vest Hansen <karmazilla@gmail.com>\n"
 "Language-Team: Dansk <en@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/multiplay.c:2042 src/droid.c:5088
+#: src/multiplay.c:2042 src/droid.c:5035
 msgid "Green"
 msgstr "Grøn"
 
@@ -199,67 +199,67 @@ msgstr "Tilbage til hovedmenu"
 msgid "Continue Game"
 msgstr "Fortsæt"
 
-#: src/mission.c:3419 src/mission.c:3555 src/ingameop.c:417 src/frontend.c:540
+#: src/mission.c:3419 src/mission.c:3555 src/ingameop.c:417 src/frontend.c:516
 msgid "Load Saved Game"
 msgstr "Indlæs gemt spil"
 
-#: src/droid.c:320 src/droid.c:376
+#: src/droid.c:313 src/droid.c:369
 msgid "Unit Lost!"
 msgstr "Enhed tabt!"
 
-#: src/droid.c:2494
+#: src/droid.c:2487
 msgid "Structure Restored"
 msgstr "Bygning restoreret"
 
-#: src/droid.c:4741
+#: src/droid.c:4734
 #, c-format
 msgid "Group %d Selected - %d Unit(s)"
 msgstr "Gruppe %d valgt - %d Enheder"
 
-#: src/droid.c:4753
+#: src/droid.c:4746
 #, c-format
 msgid "%d Unit(s) Assigned to Group %d"
 msgstr "%d Enheder tildelt gruppe %d"
 
-#: src/droid.c:4765
+#: src/droid.c:4758
 #, c-format
 msgid "Centered on Group %d - %d Unit(s)"
 msgstr "Fokuseret på gruppe %d - %d Enheder"
 
-#: src/droid.c:4769
+#: src/droid.c:4762
 #, c-format
 msgid "Aligning with Group %d - %d Unit(s)"
 msgstr "Korigerede med gruppe %d - %d Enheder"
 
-#: src/droid.c:5086
+#: src/droid.c:5034
 msgid "Rookie"
 msgstr "Menig"
 
-#: src/droid.c:5090
+#: src/droid.c:5036
 msgid "Trained"
 msgstr "Sasjant"
 
-#: src/droid.c:5092
+#: src/droid.c:5037
 msgid "Regular"
 msgstr "Oversasjant"
 
-#: src/droid.c:5094
+#: src/droid.c:5038
 msgid "Professional"
 msgstr "Løjtnant"
 
-#: src/droid.c:5096
+#: src/droid.c:5039
 msgid "Veteran"
 msgstr "Kaptajn"
 
-#: src/droid.c:5098
+#: src/droid.c:5040
 msgid "Elite"
 msgstr "Major"
 
-#: src/droid.c:5100
+#: src/droid.c:5041
 msgid "Special"
 msgstr "Oberst"
 
-#: src/droid.c:5102
+#: src/droid.c:5042
 msgid "Hero"
 msgstr "General"
 
@@ -291,7 +291,7 @@ msgstr "INDSTILLINGER"
 msgid "Game"
 msgstr "Spil"
 
-#: src/multiint.c:927 src/frontend.c:786
+#: src/multiint.c:927 src/frontend.c:762
 msgid "Fog"
 msgstr "Tåge"
 
@@ -515,19 +515,19 @@ msgstr "Fortsæt spil"
 msgid "Quit"
 msgstr "Afbryd"
 
-#: src/ingameop.c:143 src/frontend.c:964
+#: src/ingameop.c:143 src/frontend.c:940
 msgid "Voice Volume"
 msgstr "Stemme volume"
 
-#: src/ingameop.c:148 src/frontend.c:968
+#: src/ingameop.c:148 src/frontend.c:944
 msgid "FX Volume"
 msgstr "Effekt volume"
 
-#: src/ingameop.c:153 src/frontend.c:972
+#: src/ingameop.c:153 src/frontend.c:948
 msgid "Music Volume"
 msgstr "Musik volume"
 
-#: src/ingameop.c:265 src/frontend.c:326
+#: src/ingameop.c:265 src/frontend.c:302
 msgid "Options"
 msgstr "Indstillinger"
 
@@ -643,154 +643,154 @@ msgstr "Elektronik"
 msgid "Command Turrets"
 msgstr "Kommandotårn"
 
-#: src/frontend.c:318
+#: src/frontend.c:294
 msgid "Single Player Campaign"
 msgstr "Solokampange"
 
-#: src/frontend.c:321 src/frontend.c:323
+#: src/frontend.c:297 src/frontend.c:299
 #, fuzzy
 msgid "Multi Player Game"
 msgstr "Flerbruger spil"
 
-#: src/frontend.c:325 src/frontend.c:385
+#: src/frontend.c:301 src/frontend.c:361
 msgid "Tutorial"
 msgstr "Tutorial"
 
-#: src/frontend.c:328
+#: src/frontend.c:304
 msgid "Quit Game"
 msgstr "Afslut spil"
 
-#: src/frontend.c:330
+#: src/frontend.c:306
 msgid "MAIN MENU"
 msgstr "HOVED MENU"
 
-#: src/frontend.c:386
+#: src/frontend.c:362
 msgid "Fast Play"
 msgstr "Hurtgigt spil"
 
-#: src/frontend.c:387
+#: src/frontend.c:363
 msgid "TUTORIALS"
 msgstr "TUTORIALS"
 
-#: src/frontend.c:446
+#: src/frontend.c:422
 msgid "Load Campaign"
 msgstr "Indlæs kampange"
 
-#: src/frontend.c:447
+#: src/frontend.c:423
 msgid "New Campaign"
 msgstr "Ny kampange"
 
-#: src/frontend.c:449
+#: src/frontend.c:425
 msgid "SINGLE PLAYER"
 msgstr "SOLO SPILLER"
 
-#: src/frontend.c:583
+#: src/frontend.c:559
 msgid "MULTI PLAYER"
 msgstr "FLER SPILLER"
 
-#: src/frontend.c:585
+#: src/frontend.c:561
 msgid "Host Game"
 msgstr "Udbyd spil"
 
-#: src/frontend.c:586
+#: src/frontend.c:562
 msgid "Join Game"
 msgstr "Forbind til vært"
 
-#: src/frontend.c:588
+#: src/frontend.c:564
 msgid "Force Editor"
 msgstr "Redigér styrke"
 
-#: src/frontend.c:589
+#: src/frontend.c:565
 msgid "One Player Skirmish"
 msgstr "Spil mod computeren"
 
-#: src/frontend.c:683 src/frontend.c:979 src/frontend.c:1088
+#: src/frontend.c:659 src/frontend.c:955 src/frontend.c:1064
 msgid "GAME OPTIONS"
 msgstr "SPIL INDSTILLINGER"
 
-#: src/frontend.c:684
+#: src/frontend.c:660
 msgid "Game Options"
 msgstr "Spil indstillinger"
 
-#: src/frontend.c:685
+#: src/frontend.c:661
 msgid "Graphics Options"
 msgstr "Grafik indstillinger"
 
-#: src/frontend.c:686
+#: src/frontend.c:662
 msgid "Audio Options"
 msgstr "Lyd indstillinger"
 
-#: src/frontend.c:687
+#: src/frontend.c:663
 msgid "Key Mappings"
 msgstr "Tastatur indstillinger"
 
-#: src/frontend.c:762
+#: src/frontend.c:738
 msgid "Reverse Mouse"
 msgstr "Omvendt mus"
 
-#: src/frontend.c:765 src/frontend.c:777 src/frontend.c:830 src/frontend.c:865
-#: src/frontend.c:879 src/frontend.c:915
+#: src/frontend.c:741 src/frontend.c:753 src/frontend.c:806 src/frontend.c:841
+#: src/frontend.c:855 src/frontend.c:891
 msgid "On"
 msgstr "Til"
 
-#: src/frontend.c:769 src/frontend.c:781 src/frontend.c:826 src/frontend.c:835
-#: src/frontend.c:860 src/frontend.c:874 src/frontend.c:910
+#: src/frontend.c:745 src/frontend.c:757 src/frontend.c:802 src/frontend.c:811
+#: src/frontend.c:836 src/frontend.c:850 src/frontend.c:886
 msgid "Off"
 msgstr "Fra"
 
-#: src/frontend.c:774
+#: src/frontend.c:750
 msgid "Screen Shake"
 msgstr "Ryst skærm"
 
-#: src/frontend.c:789 src/frontend.c:897
+#: src/frontend.c:765 src/frontend.c:873
 msgid "Mist"
 msgstr "Afstandståge"
 
-#: src/frontend.c:793 src/frontend.c:890
+#: src/frontend.c:769 src/frontend.c:866
 msgid "Fog Of War"
 msgstr "Krigståge"
 
-#: src/frontend.c:798
+#: src/frontend.c:774
 msgid "Video Playback"
 msgstr ""
 
-#: src/frontend.c:801 src/frontend.c:934
+#: src/frontend.c:777 src/frontend.c:910
 msgid "Full"
 msgstr "Fuldskærm"
 
-#: src/frontend.c:805 src/frontend.c:924
+#: src/frontend.c:781 src/frontend.c:900
 msgid "Windowed"
 msgstr "Vindue"
 
-#: src/frontend.c:808 src/frontend.c:929
+#: src/frontend.c:784 src/frontend.c:905
 msgid "Minimal"
 msgstr "Minimal"
 
-#: src/frontend.c:815 src/frontend.c:819
+#: src/frontend.c:791 src/frontend.c:795
 msgid "Subtitles"
 msgstr "Undertekster"
 
-#: src/frontend.c:1050
+#: src/frontend.c:1026
 msgid "Difficulty"
 msgstr "Sværhedsgræd"
 
-#: src/frontend.c:1054 src/frontend.c:1139
+#: src/frontend.c:1030 src/frontend.c:1115
 msgid "Easy"
 msgstr "Begynder"
 
-#: src/frontend.c:1057 src/frontend.c:1131
+#: src/frontend.c:1033 src/frontend.c:1107
 msgid "Normal"
 msgstr "Øvet"
 
-#: src/frontend.c:1061 src/frontend.c:1135
+#: src/frontend.c:1037 src/frontend.c:1111
 msgid "Hard"
 msgstr "Svær"
 
-#: src/frontend.c:1066
+#: src/frontend.c:1042
 msgid "Scroll Speed"
 msgstr "Kamera hastighed"
 
-#: src/frontend.c:1082
+#: src/frontend.c:1058
 msgid "Unit Colour"
 msgstr "Holdfarve"
 
diff --git a/po/de.po b/po/de.po
index 091510c12..125d0873f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: warzone-dev@gna.org\n"
-"POT-Creation-Date: 2007-04-09 16:43+0200\n"
+"POT-Creation-Date: 2007-04-10 00:05+0200\n"
 "PO-Revision-Date: 2007-04-05 21:02+0200\n"
 "Last-Translator: Dennis Schridde <devurandom@gna.org>\n"
 "Language-Team: Deutsch\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: src/multiplay.c:2042 src/droid.c:5088
+#: src/multiplay.c:2042 src/droid.c:5035
 msgid "Green"
 msgstr "Grün"
 
@@ -200,67 +200,67 @@ msgstr "Zurück zum Hauptmenu"
 msgid "Continue Game"
 msgstr "Spiel fortsetzen"
 
-#: src/mission.c:3419 src/mission.c:3555 src/ingameop.c:417 src/frontend.c:540
+#: src/mission.c:3419 src/mission.c:3555 src/ingameop.c:417 src/frontend.c:516
 msgid "Load Saved Game"
 msgstr "Speicherstand laden"
 
-#: src/droid.c:320 src/droid.c:376
+#: src/droid.c:313 src/droid.c:369
 msgid "Unit Lost!"
 msgstr "Einheit verloren!"
 
-#: src/droid.c:2494
+#: src/droid.c:2487
 msgid "Structure Restored"
 msgstr ""
 
-#: src/droid.c:4741
+#: src/droid.c:4734
 #, c-format
 msgid "Group %d Selected - %d Unit(s)"
 msgstr "Gruppe %d ausgewählt - %d Einheiten(s)"
 
-#: src/droid.c:4753
+#: src/droid.c:4746
 #, c-format
 msgid "%d Unit(s) Assigned to Group %d"
 msgstr ""
 
-#: src/droid.c:4765
+#: src/droid.c:4758
 #, c-format
 msgid "Centered on Group %d - %d Unit(s)"
 msgstr ""
 
-#: src/droid.c:4769
+#: src/droid.c:4762
 #, c-format
 msgid "Aligning with Group %d - %d Unit(s)"
 msgstr ""
 
-#: src/droid.c:5086
+#: src/droid.c:5034
 msgid "Rookie"
 msgstr ""
 
-#: src/droid.c:5090
+#: src/droid.c:5036
 msgid "Trained"
 msgstr ""
 
-#: src/droid.c:5092
+#: src/droid.c:5037
 msgid "Regular"
 msgstr ""
 
-#: src/droid.c:5094
+#: src/droid.c:5038
 msgid "Professional"
 msgstr ""
 
-#: src/droid.c:5096
+#: src/droid.c:5039
 msgid "Veteran"
 msgstr "Veteran"
 
-#: src/droid.c:5098
+#: src/droid.c:5040
 msgid "Elite"
 msgstr "Elite"
 
-#: src/droid.c:5100
+#: src/droid.c:5041
 msgid "Special"
 msgstr ""
 
-#: src/droid.c:5102
+#: src/droid.c:5042
 msgid "Hero"
 msgstr "Help"
 
@@ -292,7 +292,7 @@ msgstr ""
 msgid "Game"
 msgstr "Spiel"
 
-#: src/multiint.c:927 src/frontend.c:786
+#: src/multiint.c:927 src/frontend.c:762
 msgid "Fog"
 msgstr "Nebel"
 
@@ -516,19 +516,19 @@ msgstr "Spiel fortsetzen"
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/ingameop.c:143 src/frontend.c:964
+#: src/ingameop.c:143 src/frontend.c:940
 msgid "Voice Volume"
 msgstr "Sprachlautstärke"
 
-#: src/ingameop.c:148 src/frontend.c:968
+#: src/ingameop.c:148 src/frontend.c:944
 msgid "FX Volume"
 msgstr "Effektlautstärke"
 
-#: src/ingameop.c:153 src/frontend.c:972
+#: src/ingameop.c:153 src/frontend.c:948
 msgid "Music Volume"
 msgstr "Musiklautstärke"
 
-#: src/ingameop.c:265 src/frontend.c:326
+#: src/ingameop.c:265 src/frontend.c:302
 msgid "Options"
 msgstr "Optionen"
 
@@ -643,153 +643,153 @@ msgstr ""
 msgid "Command Turrets"
 msgstr "Kommando Türme"
 
-#: src/frontend.c:318
+#: src/frontend.c:294
 msgid "Single Player Campaign"
 msgstr "Einzelspieler Kampagne"
 
-#: src/frontend.c:321 src/frontend.c:323
+#: src/frontend.c:297 src/frontend.c:299
 msgid "Multi Player Game"
 msgstr "Mehrspieler Spiel"
 
-#: src/frontend.c:325 src/frontend.c:385
+#: src/frontend.c:301 src/frontend.c:361
 msgid "Tutorial"
 msgstr "Tutorial"
 
-#: src/frontend.c:328
+#: src/frontend.c:304
 msgid "Quit Game"
 msgstr "Spiel Beenden"
 
-#: src/frontend.c:330
+#: src/frontend.c:306
 msgid "MAIN MENU"
 msgstr "Hauptmenu"
 
-#: src/frontend.c:386
+#: src/frontend.c:362
 msgid "Fast Play"
 msgstr "Schnelles Spiel"
 
-#: src/frontend.c:387
+#: src/frontend.c:363
 msgid "TUTORIALS"
 msgstr "Tutorials"
 
-#: src/frontend.c:446
+#: src/frontend.c:422
 msgid "Load Campaign"
 msgstr "Kampagne laden"
 
-#: src/frontend.c:447
+#: src/frontend.c:423
 msgid "New Campaign"
 msgstr "Neue Kampagne"
 
-#: src/frontend.c:449
+#: src/frontend.c:425
 msgid "SINGLE PLAYER"
 msgstr "Einzelspieler"
 
-#: src/frontend.c:583
+#: src/frontend.c:559
 msgid "MULTI PLAYER"
 msgstr "Mehrspieler"
 
-#: src/frontend.c:585
+#: src/frontend.c:561
 msgid "Host Game"
 msgstr "Spiel hosten"
 
-#: src/frontend.c:586
+#: src/frontend.c:562
 msgid "Join Game"
 msgstr "Spiel beitreten"
 
-#: src/frontend.c:588
+#: src/frontend.c:564
 msgid "Force Editor"
 msgstr ""
 
-#: src/frontend.c:589
+#: src/frontend.c:565
 msgid "One Player Skirmish"
 msgstr "Einzelspieler Geplänkel"
 
-#: src/frontend.c:683 src/frontend.c:979 src/frontend.c:1088
+#: src/frontend.c:659 src/frontend.c:955 src/frontend.c:1064
 msgid "GAME OPTIONS"
 msgstr "Spieloptionen"
 
-#: src/frontend.c:684
+#: src/frontend.c:660
 msgid "Game Options"
 msgstr "Spieloptionen"
 
-#: src/frontend.c:685
+#: src/frontend.c:661
 msgid "Graphics Options"
 msgstr "Grafikeinstellungen"
 
-#: src/frontend.c:686
+#: src/frontend.c:662
 msgid "Audio Options"
 msgstr "Audioeinstellungen"
 
-#: src/frontend.c:687
+#: src/frontend.c:663
 msgid "Key Mappings"
 msgstr "Tastenzuordnung"
 
-#: src/frontend.c:762
+#: src/frontend.c:738
 msgid "Reverse Mouse"
 msgstr "Maus umkehren"
 
-#: src/frontend.c:765 src/frontend.c:777 src/frontend.c:830 src/frontend.c:865
-#: src/frontend.c:879 src/frontend.c:915
+#: src/frontend.c:741 src/frontend.c:753 src/frontend.c:806 src/frontend.c:841
+#: src/frontend.c:855 src/frontend.c:891
 msgid "On"
 msgstr "An"
 
-#: src/frontend.c:769 src/frontend.c:781 src/frontend.c:826 src/frontend.c:835
-#: src/frontend.c:860 src/frontend.c:874 src/frontend.c:910
+#: src/frontend.c:745 src/frontend.c:757 src/frontend.c:802 src/frontend.c:811
+#: src/frontend.c:836 src/frontend.c:850 src/frontend.c:886
 msgid "Off"
 msgstr "Aus"
 
-#: src/frontend.c:774
+#: src/frontend.c:750
 msgid "Screen Shake"
 msgstr "Bildschirm-wackeln"
 
-#: src/frontend.c:789 src/frontend.c:897
+#: src/frontend.c:765 src/frontend.c:873
 msgid "Mist"
 msgstr "Dunst"
 
-#: src/frontend.c:793 src/frontend.c:890
+#: src/frontend.c:769 src/frontend.c:866
 msgid "Fog Of War"
 msgstr "Nebel des Krieges"
 
-#: src/frontend.c:798
+#: src/frontend.c:774
 msgid "Video Playback"
 msgstr "Videowiedergabe"
 
-#: src/frontend.c:801 src/frontend.c:934
+#: src/frontend.c:777 src/frontend.c:910
 msgid "Full"
 msgstr "Vollbild"
 
-#: src/frontend.c:805 src/frontend.c:924
+#: src/frontend.c:781 src/frontend.c:900
 msgid "Windowed"
 msgstr "Fenster"
 
-#: src/frontend.c:808 src/frontend.c:929
+#: src/frontend.c:784 src/frontend.c:905
 msgid "Minimal"
 msgstr "Minimiert"
 
-#: src/frontend.c:815 src/frontend.c:819
+#: src/frontend.c:791 src/frontend.c:795
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/frontend.c:1050
+#: src/frontend.c:1026
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
-#: src/frontend.c:1054 src/frontend.c:1139
+#: src/frontend.c:1030 src/frontend.c:1115
 msgid "Easy"
 msgstr "Einfach"
 
-#: src/frontend.c:1057 src/frontend.c:1131
+#: src/frontend.c:1033 src/frontend.c:1107
 msgid "Normal"
 msgstr "Normal"
 
-#: src/frontend.c:1061 src/frontend.c:1135
+#: src/frontend.c:1037 src/frontend.c:1111
 msgid "Hard"
 msgstr "Schwer"
 
-#: src/frontend.c:1066
+#: src/frontend.c:1042
 msgid "Scroll Speed"
 msgstr "Scrollgeschwindigkeit"
 
-#: src/frontend.c:1082
+#: src/frontend.c:1058
 msgid "Unit Colour"
 msgstr "Einheitenfarbe"
 
diff --git a/po/nb.po b/po/nb.po
index aba74c303..e21079456 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Warzone 2100 TRUNK\n"
 "Report-Msgid-Bugs-To: warzone-dev@gna.org\n"
-"POT-Creation-Date: 2007-04-09 16:43+0200\n"
+"POT-Creation-Date: 2007-04-10 00:05+0200\n"
 "PO-Revision-Date: 2007-03-24 17:49+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/multiplay.c:2042 src/droid.c:5088
+#: src/multiplay.c:2042 src/droid.c:5035
 msgid "Green"
 msgstr ""
 
@@ -199,67 +199,67 @@ msgstr "Tilbake til hovedmeny"
 msgid "Continue Game"
 msgstr "Fortsett spill"
 
-#: src/mission.c:3419 src/mission.c:3555 src/ingameop.c:417 src/frontend.c:540
+#: src/mission.c:3419 src/mission.c:3555 src/ingameop.c:417 src/frontend.c:516
 msgid "Load Saved Game"
 msgstr ""
 
-#: src/droid.c:320 src/droid.c:376
+#: src/droid.c:313 src/droid.c:369
 msgid "Unit Lost!"
 msgstr ""
 
-#: src/droid.c:2494
+#: src/droid.c:2487
 msgid "Structure Restored"
 msgstr ""
 
-#: src/droid.c:4741
+#: src/droid.c:4734
 #, c-format
 msgid "Group %d Selected - %d Unit(s)"
 msgstr ""
 
-#: src/droid.c:4753
+#: src/droid.c:4746
 #, c-format
 msgid "%d Unit(s) Assigned to Group %d"
 msgstr ""
 
-#: src/droid.c:4765
+#: src/droid.c:4758
 #, c-format
 msgid "Centered on Group %d - %d Unit(s)"
 msgstr ""
 
-#: src/droid.c:4769
+#: src/droid.c:4762
 #, c-format
 msgid "Aligning with Group %d - %d Unit(s)"
 msgstr ""
 
-#: src/droid.c:5086
+#: src/droid.c:5034
 msgid "Rookie"
 msgstr ""
 
-#: src/droid.c:5090
+#: src/droid.c:5036
 msgid "Trained"
 msgstr ""
 
-#: src/droid.c:5092
+#: src/droid.c:5037
 msgid "Regular"
 msgstr ""
 
-#: src/droid.c:5094
+#: src/droid.c:5038
 msgid "Professional"
 msgstr ""
 
-#: src/droid.c:5096
+#: src/droid.c:5039
 msgid "Veteran"
 msgstr ""
 
-#: src/droid.c:5098
+#: src/droid.c:5040
 msgid "Elite"
 msgstr ""
 
-#: src/droid.c:5100
+#: src/droid.c:5041
 msgid "Special"
 msgstr ""
 
-#: src/droid.c:5102
+#: src/droid.c:5042
 msgid "Hero"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr "ALTERNATIVER"
 msgid "Game"
 msgstr ""
 
-#: src/multiint.c:927 src/frontend.c:786
+#: src/multiint.c:927 src/frontend.c:762
 msgid "Fog"
 msgstr ""
 
@@ -517,19 +517,19 @@ msgstr "Nullstill hastighet"
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/ingameop.c:143 src/frontend.c:964
+#: src/ingameop.c:143 src/frontend.c:940
 msgid "Voice Volume"
 msgstr "Stemmevolum"
 
-#: src/ingameop.c:148 src/frontend.c:968
+#: src/ingameop.c:148 src/frontend.c:944
 msgid "FX Volume"
 msgstr "Lydeffektvolum"
 
-#: src/ingameop.c:153 src/frontend.c:972
+#: src/ingameop.c:153 src/frontend.c:948
 msgid "Music Volume"
 msgstr "Musikkvolum"
 
-#: src/ingameop.c:265 src/frontend.c:326
+#: src/ingameop.c:265 src/frontend.c:302
 msgid "Options"
 msgstr "Alternativer"
 
@@ -644,153 +644,153 @@ msgstr ""
 msgid "Command Turrets"
 msgstr ""
 
-#: src/frontend.c:318
+#: src/frontend.c:294
 msgid "Single Player Campaign"
 msgstr "Solospill"
 
-#: src/frontend.c:321 src/frontend.c:323
+#: src/frontend.c:297 src/frontend.c:299
 msgid "Multi Player Game"
 msgstr "Samspill"
 
-#: src/frontend.c:325 src/frontend.c:385
+#: src/frontend.c:301 src/frontend.c:361
 msgid "Tutorial"
 msgstr "Introduksjon"
 
-#: src/frontend.c:328
+#: src/frontend.c:304
 msgid "Quit Game"
 msgstr "Avslutt"
 
-#: src/frontend.c:330
+#: src/frontend.c:306
 msgid "MAIN MENU"
 msgstr "HOVEDMENY"
 
-#: src/frontend.c:386
+#: src/frontend.c:362
 msgid "Fast Play"
 msgstr ""
 
-#: src/frontend.c:387
+#: src/frontend.c:363
 msgid "TUTORIALS"
 msgstr "INTRODUKSJON"
 
-#: src/frontend.c:446
+#: src/frontend.c:422
 msgid "Load Campaign"
 msgstr ""
 
-#: src/frontend.c:447
+#: src/frontend.c:423
 msgid "New Campaign"
 msgstr ""
 
-#: src/frontend.c:449
+#: src/frontend.c:425
 msgid "SINGLE PLAYER"
 msgstr "SOLOSPILL"
 
-#: src/frontend.c:583
+#: src/frontend.c:559
 msgid "MULTI PLAYER"
 msgstr "SAMSPILL"
 
-#: src/frontend.c:585
+#: src/frontend.c:561
 msgid "Host Game"
 msgstr ""
 
-#: src/frontend.c:586
+#: src/frontend.c:562
 msgid "Join Game"
 msgstr "Bli med i spill"
 
-#: src/frontend.c:588
+#: src/frontend.c:564
 msgid "Force Editor"
 msgstr ""
 
-#: src/frontend.c:589
+#: src/frontend.c:565
 msgid "One Player Skirmish"
 msgstr ""
 
-#: src/frontend.c:683 src/frontend.c:979 src/frontend.c:1088
+#: src/frontend.c:659 src/frontend.c:955 src/frontend.c:1064
 msgid "GAME OPTIONS"
 msgstr "SPILLALTERNATIVER"
 
-#: src/frontend.c:684
+#: src/frontend.c:660
 msgid "Game Options"
 msgstr "Spillalternativer"
 
-#: src/frontend.c:685
+#: src/frontend.c:661
 msgid "Graphics Options"
 msgstr "Grafikkalternativer"
 
-#: src/frontend.c:686
+#: src/frontend.c:662
 msgid "Audio Options"
 msgstr "Lydalternativer"
 
-#: src/frontend.c:687
+#: src/frontend.c:663
 msgid "Key Mappings"
 msgstr ""
 
-#: src/frontend.c:762
+#: src/frontend.c:738
 msgid "Reverse Mouse"
 msgstr ""
 
-#: src/frontend.c:765 src/frontend.c:777 src/frontend.c:830 src/frontend.c:865
-#: src/frontend.c:879 src/frontend.c:915
+#: src/frontend.c:741 src/frontend.c:753 src/frontend.c:806 src/frontend.c:841
+#: src/frontend.c:855 src/frontend.c:891
 msgid "On"
 msgstr "På"
 
-#: src/frontend.c:769 src/frontend.c:781 src/frontend.c:826 src/frontend.c:835
-#: src/frontend.c:860 src/frontend.c:874 src/frontend.c:910
+#: src/frontend.c:745 src/frontend.c:757 src/frontend.c:802 src/frontend.c:811
+#: src/frontend.c:836 src/frontend.c:850 src/frontend.c:886
 msgid "Off"
 msgstr "Av"
 
-#: src/frontend.c:774
+#: src/frontend.c:750
 msgid "Screen Shake"
 msgstr ""
 
-#: src/frontend.c:789 src/frontend.c:897
+#: src/frontend.c:765 src/frontend.c:873
 msgid "Mist"
 msgstr ""
 
-#: src/frontend.c:793 src/frontend.c:890
+#: src/frontend.c:769 src/frontend.c:866
 msgid "Fog Of War"
 msgstr ""
 
-#: src/frontend.c:798
+#: src/frontend.c:774
 msgid "Video Playback"
 msgstr ""
 
-#: src/frontend.c:801 src/frontend.c:934
+#: src/frontend.c:777 src/frontend.c:910
 msgid "Full"
 msgstr ""
 
-#: src/frontend.c:805 src/frontend.c:924
+#: src/frontend.c:781 src/frontend.c:900
 msgid "Windowed"
 msgstr ""
 
-#: src/frontend.c:808 src/frontend.c:929
+#: src/frontend.c:784 src/frontend.c:905
 msgid "Minimal"
 msgstr ""
 
-#: src/frontend.c:815 src/frontend.c:819
+#: src/frontend.c:791 src/frontend.c:795
 msgid "Subtitles"
 msgstr ""
 
-#: src/frontend.c:1050
+#: src/frontend.c:1026
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
-#: src/frontend.c:1054 src/frontend.c:1139
+#: src/frontend.c:1030 src/frontend.c:1115
 msgid "Easy"
 msgstr "Enkel"
 
-#: src/frontend.c:1057 src/frontend.c:1131
+#: src/frontend.c:1033 src/frontend.c:1107
 msgid "Normal"
 msgstr "Normal"
 
-#: src/frontend.c:1061 src/frontend.c:1135
+#: src/frontend.c:1037 src/frontend.c:1111
 msgid "Hard"
 msgstr "Tøff"
 
-#: src/frontend.c:1066
+#: src/frontend.c:1042
 msgid "Scroll Speed"
 msgstr ""
 
-#: src/frontend.c:1082
+#: src/frontend.c:1058
 msgid "Unit Colour"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index d517b1275..e46232177 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Warzone 2100 TRUNK\n"
 "Report-Msgid-Bugs-To: warzone-dev@gna.org\n"
-"POT-Creation-Date: 2007-04-09 16:43+0200\n"
+"POT-Creation-Date: 2007-04-10 00:05+0200\n"
 "PO-Revision-Date: 2007-04-06 02:33+0100\n"
 "Last-Translator: Giel van Schijndel <me@mortis.eu>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/multiplay.c:2042 src/droid.c:5088
+#: src/multiplay.c:2042 src/droid.c:5035
 msgid "Green"
 msgstr "Groen"
 
@@ -202,70 +202,70 @@ msgstr "Afsluiten Naar Hoofdmenu"
 msgid "Continue Game"
 msgstr "Ga door met Spel"
 
-#: src/mission.c:3419 src/mission.c:3555 src/ingameop.c:417 src/frontend.c:540
+#: src/mission.c:3419 src/mission.c:3555 src/ingameop.c:417 src/frontend.c:516
 #, fuzzy
 msgid "Load Saved Game"
 msgstr "Laden Opgeslagen Spel"
 
-#: src/droid.c:320 src/droid.c:376
+#: src/droid.c:313 src/droid.c:369
 #, fuzzy
 msgid "Unit Lost!"
 msgstr "Eenheid verloren!"
 
-#: src/droid.c:2494
+#: src/droid.c:2487
 msgid "Structure Restored"
 msgstr ""
 
-#: src/droid.c:4741
+#: src/droid.c:4734
 #, c-format
 msgid "Group %d Selected - %d Unit(s)"
 msgstr "Groep %d geselecteerd - %d eenhe(e)d(en)"
 
-#: src/droid.c:4753
+#: src/droid.c:4746
 #, c-format
 msgid "%d Unit(s) Assigned to Group %d"
 msgstr ""
 
-#: src/droid.c:4765
+#: src/droid.c:4758
 #, c-format
 msgid "Centered on Group %d - %d Unit(s)"
 msgstr ""
 
-#: src/droid.c:4769
+#: src/droid.c:4762
 #, c-format
 msgid "Aligning with Group %d - %d Unit(s)"
 msgstr ""
 
-#: src/droid.c:5086
+#: src/droid.c:5034
 msgid "Rookie"
 msgstr "Groentje"
 
-#: src/droid.c:5090
+#: src/droid.c:5036
 msgid "Trained"
 msgstr ""
 
-#: src/droid.c:5092
+#: src/droid.c:5037
 msgid "Regular"
 msgstr ""
 
-#: src/droid.c:5094
+#: src/droid.c:5038
 msgid "Professional"
 msgstr ""
 
-#: src/droid.c:5096
+#: src/droid.c:5039
 msgid "Veteran"
 msgstr "Veteraan"
 
-#: src/droid.c:5098
+#: src/droid.c:5040
 msgid "Elite"
 msgstr "Elite"
 
-#: src/droid.c:5100
+#: src/droid.c:5041
 #, fuzzy
 msgid "Special"
 msgstr "Speciaal"
 
-#: src/droid.c:5102
+#: src/droid.c:5042
 msgid "Hero"
 msgstr "Held"
 
@@ -299,7 +299,7 @@ msgstr "INSTELLINGEN"
 msgid "Game"
 msgstr "Spel"
 
-#: src/multiint.c:927 src/frontend.c:786
+#: src/multiint.c:927 src/frontend.c:762
 msgid "Fog"
 msgstr "Mist"
 
@@ -523,19 +523,19 @@ msgstr "Hervat Spel"
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/ingameop.c:143 src/frontend.c:964
+#: src/ingameop.c:143 src/frontend.c:940
 msgid "Voice Volume"
 msgstr "Stem Volume"
 
-#: src/ingameop.c:148 src/frontend.c:968
+#: src/ingameop.c:148 src/frontend.c:944
 msgid "FX Volume"
 msgstr "Effecten Volume"
 
-#: src/ingameop.c:153 src/frontend.c:972
+#: src/ingameop.c:153 src/frontend.c:948
 msgid "Music Volume"
 msgstr "Muziek Volume"
 
-#: src/ingameop.c:265 src/frontend.c:326
+#: src/ingameop.c:265 src/frontend.c:302
 msgid "Options"
 msgstr "Instellingen"
 
@@ -652,153 +652,153 @@ msgstr ""
 msgid "Command Turrets"
 msgstr ""
 
-#: src/frontend.c:318
+#: src/frontend.c:294
 msgid "Single Player Campaign"
 msgstr ""
 
-#: src/frontend.c:321 src/frontend.c:323
+#: src/frontend.c:297 src/frontend.c:299
 msgid "Multi Player Game"
 msgstr ""
 
-#: src/frontend.c:325 src/frontend.c:385
+#: src/frontend.c:301 src/frontend.c:361
 msgid "Tutorial"
 msgstr ""
 
-#: src/frontend.c:328
+#: src/frontend.c:304
 msgid "Quit Game"
 msgstr "Spel Afsluiten"
 
-#: src/frontend.c:330
+#: src/frontend.c:306
 msgid "MAIN MENU"
 msgstr "HOOFDMENU"
 
-#: src/frontend.c:386
+#: src/frontend.c:362
 msgid "Fast Play"
 msgstr "Snel Spelen"
 
-#: src/frontend.c:387
+#: src/frontend.c:363
 msgid "TUTORIALS"
 msgstr ""
 
-#: src/frontend.c:446
+#: src/frontend.c:422
 msgid "Load Campaign"
 msgstr ""
 
-#: src/frontend.c:447
+#: src/frontend.c:423
 msgid "New Campaign"
 msgstr ""
 
-#: src/frontend.c:449
+#: src/frontend.c:425
 msgid "SINGLE PLAYER"
 msgstr ""
 
-#: src/frontend.c:583
+#: src/frontend.c:559
 msgid "MULTI PLAYER"
 msgstr ""
 
-#: src/frontend.c:585
+#: src/frontend.c:561
 msgid "Host Game"
 msgstr ""
 
-#: src/frontend.c:586
+#: src/frontend.c:562
 msgid "Join Game"
 msgstr ""
 
-#: src/frontend.c:588
+#: src/frontend.c:564
 msgid "Force Editor"
 msgstr "Strijdkrachten Bewerker"
 
-#: src/frontend.c:589
+#: src/frontend.c:565
 msgid "One Player Skirmish"
 msgstr ""
 
-#: src/frontend.c:683 src/frontend.c:979 src/frontend.c:1088
+#: src/frontend.c:659 src/frontend.c:955 src/frontend.c:1064
 msgid "GAME OPTIONS"
 msgstr "SPEL INSTELLINGEN"
 
-#: src/frontend.c:684
+#: src/frontend.c:660
 msgid "Game Options"
 msgstr "Spel Instellingen"
 
-#: src/frontend.c:685
+#: src/frontend.c:661
 msgid "Graphics Options"
 msgstr "Grafische Instellingen"
 
-#: src/frontend.c:686
+#: src/frontend.c:662
 msgid "Audio Options"
 msgstr "Geluid Instellingen"
 
-#: src/frontend.c:687
+#: src/frontend.c:663
 msgid "Key Mappings"
 msgstr ""
 
-#: src/frontend.c:762
+#: src/frontend.c:738
 msgid "Reverse Mouse"
 msgstr "Muisknoppen Omwisselen"
 
-#: src/frontend.c:765 src/frontend.c:777 src/frontend.c:830 src/frontend.c:865
-#: src/frontend.c:879 src/frontend.c:915
+#: src/frontend.c:741 src/frontend.c:753 src/frontend.c:806 src/frontend.c:841
+#: src/frontend.c:855 src/frontend.c:891
 msgid "On"
 msgstr "Aan"
 
-#: src/frontend.c:769 src/frontend.c:781 src/frontend.c:826 src/frontend.c:835
-#: src/frontend.c:860 src/frontend.c:874 src/frontend.c:910
+#: src/frontend.c:745 src/frontend.c:757 src/frontend.c:802 src/frontend.c:811
+#: src/frontend.c:836 src/frontend.c:850 src/frontend.c:886
 msgid "Off"
 msgstr "Uit"
 
-#: src/frontend.c:774
+#: src/frontend.c:750
 msgid "Screen Shake"
 msgstr ""
 
-#: src/frontend.c:789 src/frontend.c:897
+#: src/frontend.c:765 src/frontend.c:873
 msgid "Mist"
 msgstr "Nevel"
 
-#: src/frontend.c:793 src/frontend.c:890
+#: src/frontend.c:769 src/frontend.c:866
 msgid "Fog Of War"
 msgstr ""
 
-#: src/frontend.c:798
+#: src/frontend.c:774
 msgid "Video Playback"
 msgstr ""
 
-#: src/frontend.c:801 src/frontend.c:934
+#: src/frontend.c:777 src/frontend.c:910
 msgid "Full"
 msgstr ""
 
-#: src/frontend.c:805 src/frontend.c:924
+#: src/frontend.c:781 src/frontend.c:900
 msgid "Windowed"
 msgstr ""
 
-#: src/frontend.c:808 src/frontend.c:929
+#: src/frontend.c:784 src/frontend.c:905
 msgid "Minimal"
 msgstr ""
 
-#: src/frontend.c:815 src/frontend.c:819
+#: src/frontend.c:791 src/frontend.c:795
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: src/frontend.c:1050
+#: src/frontend.c:1026
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
-#: src/frontend.c:1054 src/frontend.c:1139
+#: src/frontend.c:1030 src/frontend.c:1115
 msgid "Easy"
 msgstr "Makkelijk"
 
-#: src/frontend.c:1057 src/frontend.c:1131
+#: src/frontend.c:1033 src/frontend.c:1107
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/frontend.c:1061 src/frontend.c:1135
+#: src/frontend.c:1037 src/frontend.c:1111
 msgid "Hard"
 msgstr "Moeilijk"
 
-#: src/frontend.c:1066
+#: src/frontend.c:1042
 msgid "Scroll Speed"
 msgstr ""
 
-#: src/frontend.c:1082
+#: src/frontend.c:1058
 msgid "Unit Colour"
 msgstr ""
 
diff --git a/src/design.c b/src/design.c
index 3ff46c599..801d85d1a 100644
--- a/src/design.c
+++ b/src/design.c
@@ -1537,7 +1537,7 @@ intChooseSystemStats( DROID_TEMPLATE *psTemplate )
 /* set SHOWTEMPLATENAME to 0 to show template components in edit box */
 #define SHOWTEMPLATENAME	0
 
-static char *GetDefaultTemplateName(DROID_TEMPLATE *psTemplate)
+static const char *GetDefaultTemplateName(DROID_TEMPLATE *psTemplate)
 {
 	COMP_BASE_STATS		*psStats;
 	char				*pStr;
diff --git a/src/droid.c b/src/droid.c
index 5d0c7350b..caf65c15e 100644
--- a/src/droid.c
+++ b/src/droid.c
@@ -38,7 +38,7 @@
 #include "visibility.h"
 #include "map.h"
 #include "drive.h"
-//#include "droid.h"
+#include "droid.h"
 //#include "objmem.h"
 #include "hci.h"
 #include "lib/gamelib/gtime.h"
@@ -134,15 +134,8 @@ DROID	*psLastDroidHit;
 void	groupConsoleInformOfSelection( UDWORD groupNumber );
 void	groupConsoleInformOfCreation( UDWORD groupNumber );
 void	groupConsoleInformOfCentering( UDWORD groupNumber );
-void	setSelectedGroup(UDWORD groupNumber);
-void assignDroidsToGroup(UDWORD	playerNumber, UDWORD groupNumber);
 void	droidUpdateRecoil( DROID *psDroid );
-BOOL activateGroup(UDWORD playerNumber, UDWORD groupNumber);
-BOOL activateGroupAndMove(UDWORD playerNumber, UDWORD groupNumber);
-void droidSetBits(DROID_TEMPLATE *pTemplate,DROID *psDroid);
-BOOL	pickATile2(UDWORD *x, UDWORD *y, UDWORD numIterations);
 UDWORD	getBound(UDWORD level);
-char	*getDroidNameForRank(UDWORD rank);
 
 
 /*time to move to a new location (when building foundation) */
@@ -2762,9 +2755,9 @@ BOOL droidUpdateDroidRepair(DROID *psRepairDroid)
 }
 
 /* load the Droid stats for the components from the Access database */
-BOOL loadDroidTemplates(char *pDroidData, UDWORD bufferSize)
+BOOL loadDroidTemplates(const char *pDroidData, UDWORD bufferSize)
 {
-	char				*pStartDroidData;
+	const char				*pStartDroidData;
         int cnt;
 	UDWORD				NumDroids = 0, i, player;
 	char				componentName[MAX_NAME_SIZE];
@@ -3315,9 +3308,9 @@ DROID_TYPE droidTemplateType(DROID_TEMPLATE *psTemplate)
 
 //Load the weapons assigned to Droids in the Access database
 //Watermelon:reads 3 WeaponName for now?
-BOOL loadDroidWeapons(char *pWeaponData, UDWORD bufferSize)
+BOOL loadDroidWeapons(const char *pWeaponData, UDWORD bufferSize)
 {
-	char				*pStartWeaponData;
+	const char			*pStartWeaponData;
 	UDWORD				NumWeapons = 0, i, player;
 	char				WeaponName[MAX_NAME_SIZE], TemplateName[MAX_NAME_SIZE];
 	//Watermelon:TODO:fix this temp naming one day,WeaponName[DROID_MAXWEAPS][MAX_NAME_SIZE] causes stack corruption
@@ -5030,107 +5023,64 @@ BOOL selectDroidByID(UDWORD id, UDWORD player)
 	return FALSE;
 }
 
+typedef struct
+{
+	UDWORD      kills;  // required minimum amount of kills to reach this rank
+	const char* name;   // name of this rank
+} RANK_MAP;
+
+static const RANK_MAP arrRank[] =
+{
+	{0,   _("Rookie")},
+	{4,   _("Green")},
+	{8,   _("Trained")},
+	{16,  _("Regular")},
+	{32,  _("Professional")},
+	{64,  _("Veteran")},
+	{128, _("Elite")},
+	{256, _("Special")},
+	{512, _("Hero")},
+};
+
 UDWORD	getDroidLevel(DROID *psDroid)
 {
+	UDWORD i;
+	static const UDWORD end = sizeof(arrRank) / sizeof(RANK_MAP);
+
 	if (psDroid->droidType == DROID_COMMAND ||
 		psDroid->droidType == DROID_SENSOR)
 	{
 		return cmdDroidGetLevel(psDroid);
 	}
-	else if(psDroid->numKills <4)
+
+	// Search through the array of ranks until one is found
+	// which requires more kills than the droid has.
+	// Then fall back to the previous rank.
+	for (i = 1; i != end; ++i)
 	{
-		return(0);
-	}
-	else if(psDroid->numKills<8)
-	{
-		return(1);
-	}
-	else if(psDroid->numKills<16)
-	{
-		return(2);
-	}
-	else if(psDroid->numKills<32)
-	{
-		return(3);
-	}
-	else if(psDroid->numKills<64)
-	{
-		return(4);
-	}
-	else if(psDroid->numKills<128)
-	{
-		return(5);
-	}
-	else if(psDroid->numKills<256)
-	{
-		return(6);
-	}
-	else if(psDroid->numKills<512)
-	{
-		return(7);
-	}
-	else
-	{
-		return(8);
+		if (psDroid->numKills < arrRank[i].kills)
+		{
+			return i - 1;
+		}
 	}
+
+	// If the criteria of the last rank are met, then select the last one
+	return end - 1;
 }
 
 
 
-char	*getDroidNameForRank(UDWORD rank)
+const char *getDroidNameForRank(UDWORD rank)
 {
-
-switch(rank)
-{
-	case 0:
-		return _("Rookie");
-	case 1:
-		return _("Green");
-	case 2:
-		return _("Trained");
-	case 3:
-		return _("Regular");
-	case 4:
-		return _("Professional");
-	case 5:
-		return _("Veteran");
-	case 6:
-		return _("Elite");
-	case 7:
-		return _("Special");
-	case 8:
-		return _("Hero");
-	}
-
-	return NULL;
+	ASSERT( rank < (sizeof(arrRank) / sizeof(RANK_MAP)),
+	        "getDroidNameForRank: given rank number (%d) out of bounds, we only have %d ranks\n", rank, (sizeof(arrRank) / sizeof(RANK_MAP)) );
+	
+	return arrRank[rank].name;
 }
 
-char	*getDroidLevelName(DROID *psDroid)
+const char *getDroidLevelName(DROID *psDroid)
 {
 	return(getDroidNameForRank(getDroidLevel(psDroid)));
-	/*
-	switch (getDroidLevel(psDroid))
-	{
-	case 0:
-		return _("Rookie");
-	case 1:
-		return _("Green");
-	case 2:
-		return _("Trained");
-	case 3:
-		return _("Regular");
-	case 4:
-		return _("Professional");
-	case 5:
-		return _("Veteran");
-	case 6:
-		return _("Elite");
-	case 7:
-		return _("Special");
-	case 8:
-		return _("Hero");
-	}
-	*/
 }
 
 UDWORD	getNumDroidsForLevel(UDWORD	level)
diff --git a/src/droid.h b/src/droid.h
index db7842ee7..f0ae3fc18 100644
--- a/src/droid.h
+++ b/src/droid.h
@@ -90,8 +90,8 @@ extern void	removeDroidBase(DROID *psDel);
 // this only does anything if the naybor list is out of date
 extern void droidGetNaybors(DROID *psDroid);
 
-extern BOOL loadDroidTemplates(char *pDroidData, UDWORD bufferSize);
-extern BOOL loadDroidWeapons(char *pWeaponData, UDWORD bufferSize);
+extern BOOL loadDroidTemplates(const char *pDroidData, UDWORD bufferSize);
+extern BOOL loadDroidWeapons(const char *pWeaponData, UDWORD bufferSize);
 
 /*initialise the template build and power points */
 extern void initTemplatePoints(void);
@@ -244,7 +244,7 @@ extern BOOL selectDroidByID(UDWORD id, UDWORD player);
 
 /* Droid experience stuff */
 extern UDWORD	getDroidLevel(DROID *psDroid);
-char	*getDroidLevelName(DROID *psDroid);
+extern const char *getDroidLevelName(DROID *psDroid);
 
 // Get a droid's name.
 extern char *droidGetName(DROID *psDroid);
@@ -378,7 +378,7 @@ direct fire. Also check numVTOLattackRuns for the weapon is not zero - return
 TRUE if valid weapon*/
 extern BOOL checkValidWeaponForProp(DROID_TEMPLATE *psTemplate);
 
-extern char	*getDroidNameForRank(UDWORD rank);
+extern const char *getDroidNameForRank(UDWORD rank);
 
 /*called when a Template is deleted in the Design screen*/
 extern void deleteTemplateFromProduction(DROID_TEMPLATE *psTemplate, UBYTE player);
diff --git a/src/frontend.c b/src/frontend.c
index 9674fd0b6..64426e497 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -74,46 +74,22 @@ BOOL			bUsingSlider   = FALSE;
 // ////////////////////////////////////////////////////////////////////////////
 // Function Definitions
 
-void		processFrontendSnap		(BOOL bHideCursor);
-void		changeTitleMode			(tMode mode);
 BOOL		startTitleMenu			(void);
-BOOL		runTitleMenu			(void);
 void		startSinglePlayerMenu	(void);
-BOOL		runSinglePlayerMenu		(void);
-//BOOL		runDemoMenu				(void);
-//BOOL		startDemoMenu			(void);
 BOOL		startTutorialMenu		(void);
-BOOL		runTutorialMenu			(void);
 BOOL		startMultiPlayerMenu	(void);
-BOOL		runMultiPlayerMenu		(void);
 BOOL		startOptionsMenu		(void);
-BOOL		runOptionsMenu			(void);
 BOOL		startGameOptionsMenu	(void);
-BOOL		runGameOptionsMenu		(void);
 BOOL		startGameOptions2Menu	(void);
-BOOL		runGameOptions2Menu		(void);
 BOOL		startGameOptions3Menu	(void);
-BOOL		runGameOptions3Menu		(void);
-//BOOL		startVideoOptionsMenu	(void);
-//BOOL		runVideoOptionsMenu		(void);
-//BOOL		startGraphicsOptionsMenu(void);
-//BOOL		runGraphicsptionsMenu	(void);
 
-void		addTopForm				(void);
 void		removeTopForm			(void);
-void		addBottomForm			(void);
 void		removeBottomForm		(void);
-void		addBackdrop				(void);
 void		removeBackdrop			(void);
 
-void		addTextButton			(UDWORD id,  UDWORD PosX, UDWORD PosY, char *txt,BOOL bAlignLeft,BOOL bGrey);
 void 		addText					(int FontID,UDWORD FormID,UDWORD id,  UDWORD PosX, UDWORD PosY, char *txt, UDWORD attachID,BOOL *State);
-void		addSideText				(UDWORD id,  UDWORD PosX, UDWORD PosY, char *txt);
-void		addFESlider				(UDWORD id, UDWORD parent, UDWORD x,UDWORD y,UDWORD stops,UDWORD pos,UDWORD attachID);
 
-void		displayLogo				(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
 static void	displayTitleBitmap		(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
-void		displayTextOption		(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
 void		displayTextAt270		(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
 static void	displayBigSlider		(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
 
@@ -1332,7 +1308,7 @@ void removeTopForm( void )
 }
 
 // ////////////////////////////////////////////////////////////////////////////
-void addTextButton(UDWORD id,  UDWORD PosX, UDWORD PosY, char *txt,BOOL bAlign,BOOL bGrey)
+void addTextButton(UDWORD id,  UDWORD PosX, UDWORD PosY, const char *txt,BOOL bAlign,BOOL bGrey)
 {
 	W_BUTINIT		sButInit;
 	memset(&sButInit, 0, sizeof(W_BUTINIT));
@@ -1396,7 +1372,7 @@ void addFESlider(UDWORD id, UDWORD parent, UDWORD x,UDWORD y,UDWORD stops,UDWORD
 }
 
 // ////////////////////////////////////////////////////////////////////////////
-void addSideText(UDWORD id,  UDWORD PosX, UDWORD PosY, char *txt)
+void addSideText(UDWORD id,  UDWORD PosX, UDWORD PosY, const char *txt)
 {
 	W_LABINIT	sLabInit;
 	memset(&sLabInit, 0, sizeof(W_LABINIT));
diff --git a/src/frontend.h b/src/frontend.h
index a6b65668b..6354d5edc 100644
--- a/src/frontend.h
+++ b/src/frontend.h
@@ -78,8 +78,6 @@ extern BOOL startTitleMenu			(void);
 extern BOOL runTitleMenu			(void);
 extern BOOL runSinglePlayerMenu		(void);
 extern BOOL runMultiPlayerMenu		(void);
-//extern BOOL runVideoOptionsMenu		(void);
-//extern BOOL runGraphicsOptionsMenu	(void);
 extern BOOL runGameOptionsMenu		(void);
 extern BOOL runDemoMenu				(void);
 extern BOOL runOptionsMenu			(void);
@@ -90,8 +88,8 @@ extern void processFrontendSnap		(BOOL bHideCursor);
 extern void addTopForm				(void);
 extern void addBottomForm			(void);
 extern void addBackdrop				(void);
-extern void	addTextButton			(UDWORD id,  UDWORD PosX, UDWORD PosY, char *txt,BOOL bAlignLeft,BOOL bGrey);
-extern void	addSideText				(UDWORD id,  UDWORD PosX, UDWORD PosY, char *txt);
+extern void	addTextButton			(UDWORD id,  UDWORD PosX, UDWORD PosY, const char *txt,BOOL bAlignLeft,BOOL bGrey);
+extern void	addSideText				(UDWORD id,  UDWORD PosX, UDWORD PosY, const char *txt);
 extern void addFESlider				(UDWORD id, UDWORD parent, UDWORD x,UDWORD y,UDWORD stops,UDWORD pos,UDWORD attachID );
 
 extern void	displayLogo				(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
diff --git a/src/loadsave.c b/src/loadsave.c
index 5d99ac78f..13202636b 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -91,7 +91,7 @@ void drawBlueBox				(UDWORD x,UDWORD y, UDWORD w, UDWORD h);
 BOOL closeLoadSave				(void);
 BOOL runLoadSave				(BOOL bResetMissionWidgets);
 BOOL displayLoadSave			(void);
-static BOOL _addLoadSave		(BOOL bLoad, const char *sSearchPath, const char *sExtension, char *title);
+static BOOL _addLoadSave		(BOOL bLoad, const char *sSearchPath, const char *sExtension, const char *title);
 static BOOL _runLoadSave		(BOOL bResetMissionWidgets);
 static void displayLoadBanner	(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
 static void displayLoadSlot		(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
@@ -127,7 +127,7 @@ BOOL saveMidMission(void)
 }
 
 // ////////////////////////////////////////////////////////////////////////////
-BOOL addLoadSave(LOADSAVE_MODE mode, const char *sSearchPath, const char *sExtension, char *title)
+BOOL addLoadSave(LOADSAVE_MODE mode, const char *sSearchPath, const char *sExtension, const char *title)
 {
 BOOL bLoad;
 
@@ -154,7 +154,7 @@ BOOL bLoad;
 //****************************************************************************************
 // Load menu/save menu?
 //*****************************************************************************************
-static BOOL _addLoadSave(BOOL bLoad, const char *sSearchPath, const char *sExtension, char *title)
+static BOOL _addLoadSave(BOOL bLoad, const char *sSearchPath, const char *sExtension, const char *title)
 {
 	W_FORMINIT		sFormInit;
 	W_BUTINIT		sButInit;
diff --git a/src/loadsave.h b/src/loadsave.h
index c39723595..cda5828c0 100644
--- a/src/loadsave.h
+++ b/src/loadsave.h
@@ -63,7 +63,7 @@ extern BOOL		bRequestLoad;
 
 extern void		drawBlueBox		(UDWORD x,UDWORD y, UDWORD w, UDWORD h);
 
-extern BOOL		addLoadSave(LOADSAVE_MODE mode, const char *defaultdir, const char *extension, char *title);
+extern BOOL		addLoadSave(LOADSAVE_MODE mode, const char *defaultdir, const char *extension, const char *title);
 extern BOOL		closeLoadSave	(void);
 extern BOOL		runLoadSave		(BOOL bResetMissionWidgets);
 extern BOOL		displayLoadSave	(void);
diff --git a/src/multiint.c b/src/multiint.c
index b5a590fc0..4506dc392 100644
--- a/src/multiint.c
+++ b/src/multiint.c
@@ -148,7 +148,7 @@ static UDWORD hideTime=0;
 // widget functions
 BOOL		addMultiBut					(W_SCREEN *screen, UDWORD formid,UDWORD id,UDWORD x, UDWORD y, UDWORD width, UDWORD height,UDWORD tipres,UDWORD norm, UDWORD hi,BOOL showmouseover);
 BOOL		addMultiEditBox				(UDWORD formid,UDWORD id,UDWORD x, UDWORD y, UDWORD tip, char tipres[128],UDWORD icon,UDWORD iconid);
-static void addBlueForm					(UDWORD parent,UDWORD id,char *txt,UDWORD x,UDWORD y,UDWORD w,UDWORD h);
+static void addBlueForm					(UDWORD parent,UDWORD id, const char *txt,UDWORD x,UDWORD y,UDWORD w,UDWORD h);
 
 // Drawing Functions
 void		displayChatEdit				(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
@@ -807,7 +807,7 @@ void startGameFind(void)
 
 // ////////////////////////////////////////////////////////////////////////////
 
-static void addBlueForm(UDWORD parent,UDWORD id,char *txt,UDWORD x,UDWORD y,UDWORD w,UDWORD h)
+static void addBlueForm(UDWORD parent,UDWORD id, const char *txt,UDWORD x,UDWORD y,UDWORD w,UDWORD h)
 {
 	W_FORMINIT	sFormInit;
 	W_LABINIT	sLabInit;
diff --git a/src/stats.c b/src/stats.c
index db7d236dc..cf8835f78 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -316,9 +316,9 @@ BOOL statsShutDown(void)
 
 
 /* Return the number of newlines in a file buffer */
-UDWORD numCR(char *pFileBuffer, UDWORD fileSize)
+UDWORD numCR(const char *pFileBuffer, UDWORD fileSize)
 {
-	UDWORD  lines=0;//, filePos=0;
+	UDWORD  lines=0;
 
 	while (fileSize-- > 0)
 	{
diff --git a/src/stats.h b/src/stats.h
index 3a5f69d2c..e64ba4037 100644
--- a/src/stats.h
+++ b/src/stats.h
@@ -150,7 +150,7 @@ extern UWORD weaponROF(WEAPON_STATS *psStat);
 *		Load stats functions
 *******************************************************************************/
 /* Return the number of newlines in a file buffer */
-extern UDWORD numCR(char *pFileBuffer, UDWORD fileSize);
+extern UDWORD numCR(const char *pFileBuffer, UDWORD fileSize);
 
 /*Load the weapon stats from the file exported from Access*/
 extern BOOL loadWeaponStats(char *pWeaponData, UDWORD bufferSize);